482 files changed, 55690 insertions, 31195 deletions

diff --git a/.gitattributes b/.gitattributes
index 36620d50f5..1df99d85bf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,6 @@
 # Properly detect languages on Github
 *.h linguist-language=cpp
+*.inc linguist-language=cpp
 drivers/* linguist-vendored
 
 *.cpp eol=lf
diff --git a/SConstruct b/SConstruct
index 038d42f946..d168820f66 100644
--- a/SConstruct
+++ b/SConstruct
@@ -73,11 +73,12 @@ env_base.android_java_dirs=[]
 env_base.android_res_dirs=[]
 env_base.android_aidl_dirs=[]
 env_base.android_jni_dirs=[]
+env_base.android_default_config=[]
 env_base.android_manifest_chunk=""
 env_base.android_permission_chunk=""
 env_base.android_appattributes_chunk=""
 env_base.disabled_modules=[]
-
+env_base.use_ptrcall=False
 env_base.split_drivers=False
 
 
@@ -88,6 +89,7 @@ env_base.__class__.android_add_java_dir=methods.android_add_java_dir
 env_base.__class__.android_add_res_dir=methods.android_add_res_dir
 env_base.__class__.android_add_aidl_dir=methods.android_add_aidl_dir
 env_base.__class__.android_add_jni_dir=methods.android_add_jni_dir
+env_base.__class__.android_add_default_config=methods.android_add_default_config
 env_base.__class__.android_add_to_manifest = methods.android_add_to_manifest
 env_base.__class__.android_add_to_permissions = methods.android_add_to_permissions
 env_base.__class__.android_add_to_attributes = methods.android_add_to_attributes
@@ -112,6 +114,7 @@ if profile:
 
 opts=Variables(customs, ARGUMENTS)
 opts.Add('target', 'Compile Target (debug/release_debug/release).', "debug")
+opts.Add('arch', 'Platform dependent architecture (arm/arm64/x86/x64/mips/etc)', "")
 opts.Add('bits', 'Compile Target Bits (default/32/64/fat).', "default")
 opts.Add('platform','Platform: '+str(platform_list)+'.',"")
 opts.Add('p','Platform (same as platform=).',"")
@@ -143,6 +146,7 @@ opts.Add('unix_global_settings_path', 'unix-specific path to system-wide setting
 opts.Add('disable_3d', 'Disable 3D nodes for smaller executable (yes/no)', "no")
 opts.Add('disable_advanced_gui', 'Disable advance 3D gui nodes and behaviors (yes/no)', "no")
 opts.Add('colored', 'Enable colored output for the compilation (yes/no)', 'no')
+opts.Add('deprecated','Enable deprecated features (yes/no)','yes')
 opts.Add('extra_suffix', 'Custom extra suffix added to the base filename of all generated binary files.', '')
 opts.Add('vsproj', 'Generate Visual Studio Project. (yes/no)', 'no')
 
@@ -178,6 +182,9 @@ if (env_base['target']=='debug'):
 	env_base.Append(CPPFLAGS=['-DDEBUG_MEMORY_ALLOC']);
 	env_base.Append(CPPFLAGS=['-DSCI_NAMESPACE'])
 
+if (env_base['deprecated']!='no'):
+	env_base.Append(CPPFLAGS=['-DENABLE_DEPRECATED']);
+
 env_base.platforms = {}
 
 
@@ -276,7 +283,9 @@ if selected_platform in platform_list:
 		else:
 			suffix+=".debug"
 
-	if (env["bits"]=="32"):
+	if env["arch"] != "":
+		suffix += "."+env["arch"]
+	elif (env["bits"]=="32"):
 		suffix+=".32"
 	elif (env["bits"]=="64"):
 		suffix+=".64"
@@ -310,6 +319,9 @@ if selected_platform in platform_list:
 		sys.modules.pop('config')
 
 
+	if (env.use_ptrcall):
+		env.Append(CPPFLAGS=['-DPTRCALL_ENABLED']);
+
 	if (env['musepack']=='yes'):
 		env.Append(CPPFLAGS=['-DMUSEPACK_ENABLED']);
 
diff --git a/bin/tests/test_math.cpp b/bin/tests/test_math.cpp
index 22d14ada34..8e08969fa4 100644
--- a/bin/tests/test_math.cpp
+++ b/bin/tests/test_math.cpp
@@ -40,6 +40,9 @@
 #include "scene/resources/texture.h"
 #include "vmap.h"
 #include "os/os.h"
+
+#include "method_ptrcall.h"
+
 namespace TestMath {
 
 
@@ -105,8 +108,12 @@ uint32_t ihash3( uint32_t a)
     return a;
 }
 
+
+
+
 MainLoop* test() {
 
+	return NULL;
 
 	{
 
@@ -118,10 +125,7 @@ MainLoop* test() {
 		for (List<StringName>::Element *E=tl.front();E;E=E->next()) {
 
 			Vector<uint8_t> m5b = E->get().operator String().md5_buffer();
-			uint32_t *ub = (uint32_t*)m5b.ptr();
-			//hashes.push_back(ihash(ihash2(ihash3(*ub))));
 			hashes.push_back(hashes.size());
-			//hashes.push_back(E->get().hash());
 
 		}
 
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp
index ace7e7c7b7..6edc292b62 100644
--- a/core/bind/core_bind.cpp
+++ b/core/bind/core_bind.cpp
@@ -435,6 +435,18 @@ String _OS::get_locale() const {
 	return OS::get_singleton()->get_locale();
 }
 
+String _OS::get_latin_keyboard_variant() const {
+	switch( OS::get_singleton()->get_latin_keyboard_variant() ) {
+		case OS::LATIN_KEYBOARD_QWERTY: return "QWERTY";
+		case OS::LATIN_KEYBOARD_QWERTZ: return "QWERTZ";
+		case OS::LATIN_KEYBOARD_AZERTY: return "AZERTY";
+		case OS::LATIN_KEYBOARD_QZERTY: return "QZERTY";
+		case OS::LATIN_KEYBOARD_DVORAK: return "DVORAK";
+		case OS::LATIN_KEYBOARD_NEO   : return "NEO";
+		default: return "ERROR";
+	}
+}
+
 String _OS::get_model_name() const {
 
     return OS::get_singleton()->get_model_name();
@@ -1097,6 +1109,7 @@ void _OS::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("get_ticks_msec"),&_OS::get_ticks_msec);
 	ObjectTypeDB::bind_method(_MD("get_splash_tick_msec"),&_OS::get_splash_tick_msec);
 	ObjectTypeDB::bind_method(_MD("get_locale"),&_OS::get_locale);
+	ObjectTypeDB::bind_method(_MD("get_latin_keyboard_variant"),&_OS::get_latin_keyboard_variant);
 	ObjectTypeDB::bind_method(_MD("get_model_name"),&_OS::get_model_name);
 
 	ObjectTypeDB::bind_method(_MD("get_custom_level"),&_OS::get_custom_level);
diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h
index 856d942d02..5bd427578a 100644
--- a/core/bind/core_bind.h
+++ b/core/bind/core_bind.h
@@ -192,6 +192,8 @@ public:
 	Vector<String> get_cmdline_args();
 
 	String get_locale() const;
+	String get_latin_keyboard_variant() const;
+
 	String get_model_name() const;
 	MainLoop *get_main_loop() const;
 
diff --git a/core/event_queue.cpp b/core/event_queue.cpp
index 53638c5431..958ef41132 100644
--- a/core/event_queue.cpp
+++ b/core/event_queue.cpp
@@ -92,7 +92,7 @@ Error EventQueue::push_call(uint32_t p_instance_ID, const StringName& p_method,
 		*v=p_arg5;
 	}
 
-	if (buffer_max_used>buffer_end);
+	if (buffer_end > buffer_max_used)
 		buffer_max_used=buffer_end;
 
 	return OK;
diff --git a/core/hq2x.cpp b/core/hq2x.cpp
index 6495c77b2a..7ebb505d64 100644
--- a/core/hq2x.cpp
+++ b/core/hq2x.cpp
@@ -91,7 +91,7 @@ _FORCE_INLINE_ static bool isDifferent(
 #define HQX_MIX_2(C0,C1,W0,W1) \
 	((((C0 & MASK_RB) * W0 + (C1 & MASK_RB) * W1) / (W0 + W1)) & MASK_RB) | \
 	((((C0 & MASK_G)  * W0 + (C1 & MASK_G)  * W1) / (W0 + W1)) & MASK_G)  | \
-	(((((C0 & MASK_A) >> 8)  * W0 + ((C1 & MASK_A) >> 8) * W1) / (W0 + W1)) << 8) & MASK_A
+	((((((C0 & MASK_A) >> 8)  * W0 + ((C1 & MASK_A) >> 8) * W1) / (W0 + W1)) << 8) & MASK_A)
 
 /**
  * @brief Mixes three colors using the given weights.
@@ -99,7 +99,7 @@ _FORCE_INLINE_ static bool isDifferent(
 #define HQX_MIX_3(C0,C1,C2,W0,W1,W2) \
 	((((C0 & MASK_RB) * W0 + (C1 & MASK_RB) * W1 + (C2 & MASK_RB) * W2) / (W0 + W1 + W2)) & MASK_RB) | \
 	((((C0 & MASK_G)  * W0 + (C1 & MASK_G)  * W1 + (C2 & MASK_G)  * W2) / (W0 + W1 + W2)) & MASK_G)  | \
-	(((((C0 & MASK_A) >> 8) * W0 + ((C1 & MASK_A) >> 8) * W1 + ((C2 & MASK_A) >> 8) * W2) / (W0 + W1 + W2)) << 8) & MASK_A
+	((((((C0 & MASK_A) >> 8) * W0 + ((C1 & MASK_A) >> 8) * W1 + ((C2 & MASK_A) >> 8) * W2) / (W0 + W1 + W2)) << 8) & MASK_A)
 
 
 #define MIX_00_4				*output = w[4];
diff --git a/core/image_quantize.cpp b/core/image_quantize.cpp
index b8d4658fda..f6fe7a88a0 100644
--- a/core/image_quantize.cpp
+++ b/core/image_quantize.cpp
@@ -59,7 +59,6 @@ int Image::MCBlock::get_longest_axis_index() const {
 	for(int i=0;i<4;i++) {
 
 		int d = max_color.color.col[i]-min_color.color.col[i];
-		//printf(" ai:%i - %i\n",i,d);
 		if (d>max_dist) {
 			max_index=i;
 			max_dist=d;
@@ -71,13 +70,11 @@ int Image::MCBlock::get_longest_axis_index() const {
 int Image::MCBlock::get_longest_axis_length() const {
 
 	int max_dist=-1;
-	int max_index=0;
 
 	for(int i=0;i<4;i++) {
 
 		int d = max_color.color.col[i]-min_color.color.col[i];
 		if (d>max_dist) {
-			max_index=i;
 			max_dist=d;
 		}
 	}
@@ -117,8 +114,6 @@ void Image::MCBlock::shrink() {
 
 void Image::quantize() {
 
-	Image::Format orig_format=format;
-
 	bool has_alpha = detect_alpha()!=ALPHA_NONE;
 
 	bool quantize_fast=OS::get_singleton()->has_environment("QUANTIZE_FAST");
diff --git a/core/io/http_client.cpp b/core/io/http_client.cpp
index 0dfae6584b..2a831dd992 100644
--- a/core/io/http_client.cpp
+++ b/core/io/http_client.cpp
@@ -29,8 +29,6 @@
 #include "http_client.h"
 #include "io/stream_peer_ssl.h"
 
-VARIANT_ENUM_CAST(HTTPClient::Status);
-
 
 Error HTTPClient::connect(const String &p_host, int p_port, bool p_ssl,bool p_verify_host){
 
diff --git a/core/io/http_client.h b/core/io/http_client.h
index ceb0273a7d..32d2e72101 100644
--- a/core/io/http_client.h
+++ b/core/io/http_client.h
@@ -201,5 +201,6 @@ public:
 };
 
 VARIANT_ENUM_CAST(HTTPClient::Method);
+VARIANT_ENUM_CAST(HTTPClient::Status);
 
 #endif // HTTP_CLIENT_H
diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp
index 60617e1237..c9bd38c654 100644
--- a/core/io/marshalls.cpp
+++ b/core/io/marshalls.cpp
@@ -685,7 +685,6 @@ Error decode_variant(Variant& r_variant,const uint8_t *p_buffer, int p_len,int *
 			if (count) {
 				varray.resize(count);
 				DVector<Vector2>::Write w = varray.write();
-				const float *r = (const float*)buf;
 
 				for(int i=0;i<(int)count;i++) {
 
@@ -724,7 +723,6 @@ Error decode_variant(Variant& r_variant,const uint8_t *p_buffer, int p_len,int *
 			if (count) {
 				varray.resize(count);
 				DVector<Vector3>::Write w = varray.write();
-				const float *r = (const float*)buf;
 
 				for(int i=0;i<(int)count;i++) {
 
@@ -764,7 +762,6 @@ Error decode_variant(Variant& r_variant,const uint8_t *p_buffer, int p_len,int *
 			if (count) {
 				carray.resize(count);
 				DVector<Color>::Write w = carray.write();
-				const float *r = (const float*)buf;
 
 				for(int i=0;i<(int)count;i++) {
 
diff --git a/core/io/resource_format_xml.cpp b/core/io/resource_format_xml.cpp
index a42a922baf..0d545b16f5 100644
--- a/core/io/resource_format_xml.cpp
+++ b/core/io/resource_format_xml.cpp
@@ -1862,8 +1862,6 @@ void ResourceInteractiveLoaderXML::open(FileAccess *p_f) {
 	}
 
 	int major = version.get_slicec('.',0).to_int();
-	int minor = version.get_slicec('.',1).to_int();
-
 	if (major>VERSION_MAJOR) {
 
 		error=ERR_FILE_UNRECOGNIZED;
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp
index 1bb80e74eb..f414f85df8 100644
--- a/core/io/resource_loader.cpp
+++ b/core/io/resource_loader.cpp
@@ -443,7 +443,6 @@ String ResourceLoader::get_resource_type(const String &p_path) {
 	String remapped_path = PathRemap::get_singleton()->get_remap(local_path);
 	String extension=remapped_path.extension();
 
-	bool found=false;
 	for (int i=0;i<loader_count;i++) {
 
 		String result = loader[i]->get_resource_type(local_path);
diff --git a/core/io/translation_loader_po.cpp b/core/io/translation_loader_po.cpp
index 4ddb276a27..a22c57b941 100644
--- a/core/io/translation_loader_po.cpp
+++ b/core/io/translation_loader_po.cpp
@@ -47,7 +47,6 @@ RES TranslationLoaderPO::load_translation(FileAccess *f, Error *r_error, const S
 	String msg_id;
 	String msg_str;
 	String config;
-	int msg_line=0;
 
 	if (r_error)
 		*r_error=ERR_FILE_CORRUPT;
@@ -97,7 +96,6 @@ RES TranslationLoaderPO::load_translation(FileAccess *f, Error *r_error, const S
 			status=STATUS_READING_ID;
 			msg_id="";
 			msg_str="";
-			msg_line=line;
 		}
 
 		if (l.begins_with("msgstr")) {
@@ -111,7 +109,6 @@ RES TranslationLoaderPO::load_translation(FileAccess *f, Error *r_error, const S
 
 			l=l.substr(6,l.length()).strip_edges();
 			status=STATUS_READING_STRING;
-			msg_line=line;
 		}
 
 		if (l=="" || l.begins_with("#")) {
diff --git a/core/make_binders.py b/core/make_binders.py
index 93371dc0a3..c14f07ac83 100644
--- a/core/make_binders.py
+++ b/core/make_binders.py
@@ -48,7 +48,13 @@ public:
 		$ifnoret return Variant();$
 	}
 
+#ifdef PTRCALL_ENABLED
+	virtual void ptrcall(Object*p_object,const void** p_args,void *r_ret) {
 
+		T *instance=p_object->cast_to<T>();
+		$ifret PtrToArg<R>::encode( $ (instance->*method)($arg, PtrToArg<P@>::convert(p_args[@-1])$) $ifret ,r_ret)$ ;
+	}
+#endif
 	MethodBind$argc$$ifret R$$ifconst C$ () {
 #ifdef DEBUG_METHODS_ENABLED
 		_set_const($ifconst true$$ifnoconst false$);
@@ -121,7 +127,12 @@ public:
 		$ifret return Variant(ret);$
 		$ifnoret return Variant();$
 	}
-
+#ifdef PTRCALL_ENABLED
+	virtual void ptrcall(Object*p_object,const void** p_args,void *r_ret) {
+		__UnexistingClass *instance = (__UnexistingClass*)p_object;
+		$ifret PtrToArg<R>::encode( $ (instance->*method)($arg, PtrToArg<P@>::convert(p_args[@-1])$) $ifret ,r_ret) $ ;
+	}
+#endif
 	MethodBind$argc$$ifret R$$ifconst C$ () {
 #ifdef DEBUG_METHODS_ENABLED
 		_set_const($ifconst true$$ifnoconst false$);
@@ -243,10 +254,3 @@ def run(target, source, env):
 	f=open(target[1].path,"w")
 	f.write(text_ext)
 	f.close()
-
-
-
-
-
-
-
diff --git a/core/math/bsp_tree.h b/core/math/bsp_tree.h
index 2bfc26b51e..6c36d80e3e 100644
--- a/core/math/bsp_tree.h
+++ b/core/math/bsp_tree.h
@@ -34,8 +34,8 @@
 #include "face3.h"
 #include "vector.h"
 #include "dvector.h"
-
 #include "variant.h"
+#include "method_ptrcall.h"
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
 */
@@ -138,4 +138,29 @@ bool BSP_Tree::convex_is_inside(const T& p_convex) const {
 }
 
 
+#ifdef PTRCALL_ENABLED
+
+
+template<>
+struct PtrToArg<BSP_Tree> {
+	_FORCE_INLINE_ static BSP_Tree convert(const void* p_ptr) {
+		BSP_Tree s( Variant( *reinterpret_cast<const Dictionary*>(p_ptr) ) );
+		return s;
+	}
+	_FORCE_INLINE_ static void encode(BSP_Tree p_val,void* p_ptr) {
+		Dictionary *d = reinterpret_cast<Dictionary*>(p_ptr);
+		*d=Variant(p_val);
+	}
+};
+
+template<>
+struct PtrToArg<const BSP_Tree&> {
+	_FORCE_INLINE_ static BSP_Tree convert(const void* p_ptr) {
+		BSP_Tree s( Variant( *reinterpret_cast<const Dictionary*>(p_ptr) ) );
+		return s;
+	}
+};
+
+#endif
+
 #endif
diff --git a/core/math/face3.h b/core/math/face3.h
index bc34be9935..3a81da74db 100644
--- a/core/math/face3.h
+++ b/core/math/face3.h
@@ -264,4 +264,6 @@ bool Face3::intersects_aabb2(const AABB& p_aabb) const {
 }
 
 
+//this sucks...
+
 #endif // FACE3_H
diff --git a/core/math/triangle_mesh.cpp b/core/math/triangle_mesh.cpp
index adb9861092..7aea32a8a0 100644
--- a/core/math/triangle_mesh.cpp
+++ b/core/math/triangle_mesh.cpp
@@ -195,9 +195,6 @@ Vector3 TriangleMesh::get_area_normal(const AABB& p_aabb) const {
 	int n_count=0;
 	Vector3 n;
 
-	//for(int i=0;i<max_depth;i++)
-	//	stack[i]=0;
-
 	int level=0;
 
 	DVector<Triangle>::Read trianglesr = triangles.read();
@@ -205,7 +202,6 @@ Vector3 TriangleMesh::get_area_normal(const AABB& p_aabb) const {
 	DVector<BVH>::Read bvhr=bvh.read();
 
 	const Triangle *triangleptr=trianglesr.ptr();
-	const Vector3 *vertexptr=verticesr.ptr();
 	int pos=bvh.size()-1;
 	const BVH *bvhptr = bvhr.ptr();
 
@@ -301,14 +297,7 @@ bool TriangleMesh::intersect_segment(const Vector3& p_begin,const Vector3& p_end
 	real_t d=1e10;
 	bool inters=false;
 
-	//for(int i=0;i<max_depth;i++)
-	//	stack[i]=0;
-
 	int level=0;
-	//AABB ray_aabb;
-	//ray_aabb.pos=p_begin;
-	//ray_aabb.expand_to(p_end);
-
 
 	DVector<Triangle>::Read trianglesr = triangles.read();
 	DVector<Vector3>::Read verticesr=vertices.read();
@@ -431,9 +420,6 @@ bool TriangleMesh::intersect_ray(const Vector3& p_begin,const Vector3& p_dir,Vec
 	real_t d=1e20;
 	bool inters=false;
 
-	//for(int i=0;i<max_depth;i++)
-	//	stack[i]=0;
-
 	int level=0;
 
 	DVector<Triangle>::Read trianglesr = triangles.read();
diff --git a/core/message_queue.cpp b/core/message_queue.cpp
index c69021f4f0..f3daa46c3d 100644
--- a/core/message_queue.cpp
+++ b/core/message_queue.cpp
@@ -320,7 +320,7 @@ void MessageQueue::_call_function(Object* p_target, const StringName& p_func, co
 void MessageQueue::flush() {
 
 
-	if (buffer_max_used<buffer_end); {
+	if (buffer_end > buffer_max_used) {
 		buffer_max_used=buffer_end;
 		//statistics();
 	}
diff --git a/core/method_bind.h b/core/method_bind.h
index 48848c5848..30a848270d 100644
--- a/core/method_bind.h
+++ b/core/method_bind.h
@@ -33,6 +33,7 @@
 #include "variant.h"
 #include "object.h"
 #include <stdio.h>
+#include "method_ptrcall.h"
 
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
@@ -85,6 +86,32 @@ struct VariantCaster<const T&> {
 	(VariantCaster<P##m_idx>::cast( (m_idx-1)>=p_arg_count?get_default_argument(m_idx-1):*p_args[m_idx-1] ))
 
 //SIMPLE_NUMERIC_TYPE is used to avoid a warning on Variant::get_type_for
+
+#ifdef PTRCALL_ENABLED
+
+
+#define VARIANT_ENUM_CAST( m_enum ) \
+SIMPLE_NUMERIC_TYPE( m_enum );\
+template<> \
+struct VariantCaster<m_enum> {\
+\
+	static _FORCE_INLINE_ m_enum cast(const Variant& p_variant) {\
+		return (m_enum)p_variant.operator int();\
+	}\
+};\
+template<>\
+struct PtrToArg< m_enum > {\
+	_FORCE_INLINE_ static m_enum convert(const void* p_ptr) {\
+		return m_enum(*reinterpret_cast<const int*>(p_ptr));\
+	}\
+	_FORCE_INLINE_ static void encode(m_enum p_val,const void* p_ptr) {\
+		*(int*)p_ptr=p_val;\
+	}\
+};
+
+#else
+
+
 #define VARIANT_ENUM_CAST( m_enum ) \
 SIMPLE_NUMERIC_TYPE( m_enum );\
 template<> \
@@ -96,6 +123,9 @@ struct VariantCaster<m_enum> {\
 };
 
 
+#endif
+
+
 #define CHECK_ARG(m_arg)\
 	if ((m_arg-1)<p_arg_count) {\
 		Variant::Type argtype=get_argument_type(m_arg-1);\
@@ -222,6 +252,11 @@ public:
 	}
 #endif
 	virtual Variant call(Object* p_object,const Variant** p_args,int p_arg_count, Variant::CallError& r_error)=0;
+
+#ifdef PTRCALL_ENABLED
+	virtual void ptrcall(Object* p_object,const void** p_args,void* r_ret)=0;
+#endif
+
 	StringName get_name() const;
 	void set_name(const StringName& p_name);
 	_FORCE_INLINE_ int get_method_id() const { return method_id; }
@@ -277,6 +312,11 @@ public:
 #endif
 	}
 
+#ifdef PTRCALL_ENABLED
+	virtual void ptrcall(Object* p_object,const void** p_args,void* r_ret) {} //todo
+#endif
+
+
 	void set_method(NativeCall p_method) { call_method=p_method; }
 	virtual bool is_const() const { return false; }
 	virtual String get_instance_type() const { return T::get_type_static(); }
diff --git a/core/method_ptrcall.h b/core/method_ptrcall.h
new file mode 100644
index 0000000000..e38d59fd8f
--- /dev/null
+++ b/core/method_ptrcall.h
@@ -0,0 +1,354 @@
+#ifndef METHOD_PTRCALL_H
+#define METHOD_PTRCALL_H
+
+#include "typedefs.h"
+#include "math_2d.h"
+#include "variant.h"
+
+#ifdef PTRCALL_ENABLED
+
+template<class T>
+struct PtrToArg {
+
+};
+
+#define MAKE_PTRARG(m_type) \
+template<>\
+struct PtrToArg<m_type> {\
+	_FORCE_INLINE_ static m_type convert(const void* p_ptr) {\
+		return *reinterpret_cast<const m_type*>(p_ptr);\
+	}\
+	_FORCE_INLINE_ static void encode(m_type p_val, void* p_ptr) {\
+		*((m_type*)p_ptr)=p_val;\
+	}\
+};\
+template<>\
+struct PtrToArg<const m_type&> {\
+	_FORCE_INLINE_ static m_type convert(const void* p_ptr) {\
+		return *reinterpret_cast<const m_type*>(p_ptr);\
+	}\
+	_FORCE_INLINE_ static void encode(m_type p_val, void* p_ptr) {\
+		*((m_type*)p_ptr)=p_val;\
+	}\
+}
+
+
+#define MAKE_PTRARGR(m_type,m_ret) \
+template<>\
+struct PtrToArg<m_type> {\
+	_FORCE_INLINE_ static m_type convert(const void* p_ptr) {\
+		return *reinterpret_cast<const m_type*>(p_ptr);\
+	}\
+	_FORCE_INLINE_ static void encode(m_type p_val, void* p_ptr) {\
+		*((m_ret*)p_ptr)=p_val;\
+	}\
+};\
+template<>\
+struct PtrToArg<const m_type&> {\
+	_FORCE_INLINE_ static m_type convert(const void* p_ptr) {\
+		return *reinterpret_cast<const m_type*>(p_ptr);\
+	}\
+	_FORCE_INLINE_ static void encode(m_type p_val, void* p_ptr) {\
+		*((m_ret*)p_ptr)=p_val;\
+	}\
+}
+
+
+
+MAKE_PTRARG(bool);
+MAKE_PTRARGR(uint8_t,int);
+MAKE_PTRARGR(int8_t,int);
+MAKE_PTRARGR(uint16_t,int);
+MAKE_PTRARGR(int16_t,int);
+MAKE_PTRARGR(uint32_t,int);
+MAKE_PTRARGR(int32_t,int);
+MAKE_PTRARGR(int64_t,int);
+MAKE_PTRARGR(uint64_t,int);
+MAKE_PTRARG(float);
+MAKE_PTRARGR(double,float);
+
+MAKE_PTRARG(String);
+MAKE_PTRARG(Vector2);
+MAKE_PTRARG(Rect2);
+MAKE_PTRARG(Vector3);
+MAKE_PTRARG(Matrix32);
+MAKE_PTRARG(Plane);
+MAKE_PTRARG(Quat);
+MAKE_PTRARG(AABB);
+MAKE_PTRARG(Matrix3);
+MAKE_PTRARG(Transform);
+MAKE_PTRARG(Color);
+MAKE_PTRARG(Image);
+MAKE_PTRARG(NodePath);
+MAKE_PTRARG(RID);
+MAKE_PTRARG(InputEvent);
+MAKE_PTRARG(Dictionary);
+MAKE_PTRARG(Array);
+MAKE_PTRARG(ByteArray);
+MAKE_PTRARG(IntArray);
+MAKE_PTRARG(RealArray);
+MAKE_PTRARG(StringArray);
+MAKE_PTRARG(Vector2Array);
+MAKE_PTRARG(Vector3Array);
+MAKE_PTRARG(ColorArray);
+MAKE_PTRARG(Variant);
+
+
+//this is for Object
+
+template<class T>
+struct PtrToArg< T* > {
+
+	_FORCE_INLINE_ static T* convert(const void* p_ptr) {
+
+		return const_cast<T*>(reinterpret_cast<const T*>(p_ptr));
+	}
+
+	_FORCE_INLINE_ static void encode(T* p_var, void* p_ptr) {
+
+		*((T**)p_ptr)=p_var;
+	}
+
+};
+
+template<class T>
+struct PtrToArg< const T* > {
+
+	_FORCE_INLINE_ static const T* convert(const void* p_ptr) {
+
+		return reinterpret_cast<const T*>(p_ptr);
+	}
+
+	_FORCE_INLINE_ static void encode(T* p_var, void* p_ptr) {
+
+		*((T**)p_ptr)=p_var;
+	}
+
+};
+
+
+//this is for the special cases used by Variant
+
+#define MAKE_VECARG(m_type) \
+template<>\
+struct PtrToArg<Vector<m_type> > {\
+	_FORCE_INLINE_ static Vector<m_type> convert(const void* p_ptr) {\
+		const DVector<m_type> *dvs = reinterpret_cast<const DVector<m_type> *>(p_ptr);\
+		Vector<m_type> ret;\
+		int len = dvs->size();\
+		ret.resize(len);\
+		{\
+			DVector<m_type>::Read r=dvs->read();\
+			for(int i=0;i<len;i++) {\
+				ret[i]=r[i];\
+			}\
+		}		\
+		return ret;\
+	}\
+	_FORCE_INLINE_ static void encode(Vector<m_type> p_vec, void* p_ptr) {\
+		DVector<m_type> *dv = reinterpret_cast<DVector<m_type> *>(p_ptr);\
+		int len=p_vec.size();\
+		dv->resize(len);\
+		{\
+			DVector<m_type>::Write w=dv->write();\
+			for(int i=0;i<len;i++) {\
+				w[i]=p_vec[i];\
+			}\
+		}	\
+	}\
+};\
+template<>\
+struct PtrToArg<const Vector<m_type>& > {\
+	_FORCE_INLINE_ static Vector<m_type> convert(const void* p_ptr) {\
+		const DVector<m_type> *dvs = reinterpret_cast<const DVector<m_type> *>(p_ptr);\
+		Vector<m_type> ret;\
+		int len = dvs->size();\
+		ret.resize(len);\
+		{\
+			DVector<m_type>::Read r=dvs->read();\
+			for(int i=0;i<len;i++) {\
+				ret[i]=r[i];\
+			}\
+		}		\
+		return ret;\
+	}\
+}
+
+MAKE_VECARG(String);
+MAKE_VECARG(uint8_t);
+MAKE_VECARG(int);
+MAKE_VECARG(float);
+MAKE_VECARG(Vector2);
+MAKE_VECARG(Vector3);
+MAKE_VECARG(Color);
+
+//for stuff that gets converted to Array vectors
+#define MAKE_VECARR(m_type) \
+template<>\
+struct PtrToArg<Vector<m_type> > {\
+	_FORCE_INLINE_ static Vector<m_type> convert(const void* p_ptr) {\
+		const Array *arr = reinterpret_cast<const Array *>(p_ptr);\
+		Vector<m_type> ret;\
+		int len = arr->size();\
+		ret.resize(len);\
+		for(int i=0;i<len;i++) {\
+			ret[i]=(*arr)[i];\
+		}\
+		return ret;\
+	}\
+	_FORCE_INLINE_ static void encode(Vector<m_type> p_vec, void* p_ptr) {\
+		Array *arr = reinterpret_cast<Array *>(p_ptr);\
+		int len = p_vec.size();\
+		arr->resize(len);\
+		for(int i=0;i<len;i++) {\
+			(*arr)[i]=p_vec[i];\
+		}\
+	}	\
+};\
+template<>\
+struct PtrToArg<const Vector<m_type>& > {\
+	_FORCE_INLINE_ static Vector<m_type> convert(const void* p_ptr) {\
+		const Array *arr = reinterpret_cast<const Array *>(p_ptr);\
+		Vector<m_type> ret;\
+		int len = arr->size();\
+		ret.resize(len);\
+		for(int i=0;i<len;i++) {\
+			ret[i]=(*arr)[i];\
+		}\
+		return ret;\
+	}\
+}
+
+
+MAKE_VECARR(Variant);
+MAKE_VECARR(RID);
+MAKE_VECARR(Plane);
+
+#define MAKE_DVECARR(m_type) \
+template<>\
+struct PtrToArg<DVector<m_type> > {\
+	_FORCE_INLINE_ static DVector<m_type> convert(const void* p_ptr) {\
+		const Array *arr = reinterpret_cast<const Array *>(p_ptr);\
+		DVector<m_type> ret;\
+		int len = arr->size();\
+		ret.resize(len);\
+		{\
+			DVector<m_type>::Write w=ret.write();\
+			for(int i=0;i<len;i++) {\
+				w[i]=(*arr)[i];\
+			}\
+		}\
+		return ret;\
+	}\
+	_FORCE_INLINE_ static void encode(DVector<m_type> p_vec, void* p_ptr) {\
+		Array *arr = reinterpret_cast<Array *>(p_ptr);\
+		int len = p_vec.size();\
+		arr->resize(len);\
+		{\
+			DVector<m_type>::Read r=p_vec.read();\
+			for(int i=0;i<len;i++) {\
+				(*arr)[i]=r[i];\
+			}\
+		}\
+	}	\
+};\
+template<>\
+struct PtrToArg<const DVector<m_type>& > {\
+	_FORCE_INLINE_ static DVector<m_type> convert(const void* p_ptr) {\
+	const Array *arr = reinterpret_cast<const Array *>(p_ptr);\
+	DVector<m_type> ret;\
+	int len = arr->size();\
+	ret.resize(len);\
+	{\
+		DVector<m_type>::Write w=ret.write();\
+		for(int i=0;i<len;i++) {\
+			w[i]=(*arr)[i];\
+		}\
+	}\
+	return ret;\
+	}\
+}
+
+MAKE_DVECARR(Plane);
+//for special case StringName
+
+#define MAKE_STRINGCONV(m_type) \
+template<>\
+struct PtrToArg<m_type> {\
+	_FORCE_INLINE_ static m_type convert(const void* p_ptr) {\
+		m_type s = *reinterpret_cast<const String*>(p_ptr);\
+		return s;\
+	}\
+	_FORCE_INLINE_ static void encode(m_type p_vec, void* p_ptr) {\
+		String *arr = reinterpret_cast<String *>(p_ptr);\
+		*arr=p_vec;\
+	}\
+};\
+\
+template<>\
+struct PtrToArg<const m_type&> {\
+	_FORCE_INLINE_ static m_type convert(const void* p_ptr) {\
+		m_type s = *reinterpret_cast<const String*>(p_ptr);\
+		return s;\
+	}\
+}
+
+MAKE_STRINGCONV(StringName);
+MAKE_STRINGCONV(IP_Address);
+
+template<>
+struct PtrToArg<DVector<Face3> > {
+	_FORCE_INLINE_ static DVector<Face3> convert(const void* p_ptr) {
+		const DVector<Vector3> *dvs = reinterpret_cast<const DVector<Vector3> *>(p_ptr);
+		DVector<Face3> ret;
+		int len = dvs->size()/3;
+		ret.resize(len);
+		{
+			DVector<Vector3>::Read r=dvs->read();
+			DVector<Face3>::Write w=ret.write();
+			for(int i=0;i<len;i++) {
+				w[i].vertex[0]=r[i*3+0];
+				w[i].vertex[1]=r[i*3+1];
+				w[i].vertex[2]=r[i*3+2];
+			}
+		}
+		return ret;
+	}
+	_FORCE_INLINE_ static void encode(DVector<Face3> p_vec, void* p_ptr) {\
+		DVector<Vector3> *arr = reinterpret_cast<DVector<Vector3> *>(p_ptr);\
+		int len = p_vec.size();\
+		arr->resize(len*3);\
+		{\
+			DVector<Face3>::Read r=p_vec.read();\
+			DVector<Vector3>::Write w=arr->write();\
+			for(int i=0;i<len;i++) {\
+				w[i*3+0]=r[i].vertex[0];\
+				w[i*3+1]=r[i].vertex[1];\
+				w[i*3+2]=r[i].vertex[2];\
+			}\
+		}\
+	}	\
+};
+template<>
+struct PtrToArg<const DVector<Face3>& > {
+	_FORCE_INLINE_ static DVector<Face3> convert(const void* p_ptr) {
+		const DVector<Vector3> *dvs = reinterpret_cast<const DVector<Vector3> *>(p_ptr);
+		DVector<Face3> ret;
+		int len = dvs->size()/3;
+		ret.resize(len);
+		{
+			DVector<Vector3>::Read r=dvs->read();
+			DVector<Face3>::Write w=ret.write();
+			for(int i=0;i<len;i++) {
+				w[i].vertex[0]=r[i*3+0];
+				w[i].vertex[1]=r[i*3+1];
+				w[i].vertex[2]=r[i*3+2];
+			}
+		}
+		return ret;
+	}
+};
+
+
+#endif // METHOD_PTRCALL_H
+#endif
diff --git a/core/object.cpp b/core/object.cpp
index 34d6d8487a..dc3d531927 100644
--- a/core/object.cpp
+++ b/core/object.cpp
@@ -1320,14 +1320,16 @@ Array Object::_get_signal_connection_list(const String& p_signal) const{
 	for (List<Connection>::Element *E=conns.front();E;E=E->next()) {
 
 		Connection &c=E->get();
-		Dictionary rc;
-		rc["signal"]=c.signal;
-		rc["method"]=c.method;
-		rc["source"]=c.source;
-		rc["target"]=c.target;
-		rc["binds"]=c.binds;
-		rc["flags"]=c.flags;
-		ret.push_back(rc);
+		if (c.signal == p_signal){
+			Dictionary rc;
+			rc["signal"]=c.signal;
+			rc["method"]=c.method;
+			rc["source"]=c.source;
+			rc["target"]=c.target;
+			rc["binds"]=c.binds;
+			rc["flags"]=c.flags;
+			ret.push_back(rc);
+		}
 	}
 
 	return ret;
@@ -1493,7 +1495,7 @@ void Object::disconnect(const StringName& p_signal, Object *p_to_object, const S
 		ERR_EXPLAIN("Disconnecting nonexistent signal '"+p_signal+"', slot: "+itos(target._id)+":"+target.method);
 		ERR_FAIL();
 	}
-	int prev = p_to_object->connections.size();
+
 	p_to_object->connections.erase(s->slot_map[target].cE);
 	s->slot_map.erase(target);
 
diff --git a/core/os/input_event.cpp b/core/os/input_event.cpp
index 2d47645a66..8c79657c64 100644
--- a/core/os/input_event.cpp
+++ b/core/os/input_event.cpp
@@ -199,3 +199,62 @@ uint32_t InputEventKey::get_scancode_with_modifiers() const {
 	return sc;
 
 }
+
+InputEvent InputEvent::xform_by(const Matrix32& p_xform) const {
+
+
+	InputEvent ev=*this;
+
+	switch(ev.type) {
+
+		case InputEvent::MOUSE_BUTTON: {
+
+			Vector2 g = p_xform.xform(Vector2(ev.mouse_button.global_x,ev.mouse_button.global_y));
+			Vector2 l = p_xform.xform(Vector2(ev.mouse_button.x,ev.mouse_button.y));
+			ev.mouse_button.x=l.x;
+			ev.mouse_button.y=l.y;
+			ev.mouse_button.global_x=g.x;
+			ev.mouse_button.global_y=g.y;
+
+		} break;
+		case InputEvent::MOUSE_MOTION: {
+
+			Vector2 g = p_xform.xform(Vector2(ev.mouse_motion.global_x,ev.mouse_motion.global_y));
+			Vector2 l = p_xform.xform(Vector2(ev.mouse_motion.x,ev.mouse_motion.y));
+			Vector2 r = p_xform.basis_xform(Vector2(ev.mouse_motion.relative_x,ev.mouse_motion.relative_y));
+			Vector2 s = p_xform.basis_xform(Vector2(ev.mouse_motion.speed_x,ev.mouse_motion.speed_y));
+			ev.mouse_motion.x=l.x;
+			ev.mouse_motion.y=l.y;
+			ev.mouse_motion.global_x=g.x;
+			ev.mouse_motion.global_y=g.y;
+			ev.mouse_motion.relative_x=r.x;
+			ev.mouse_motion.relative_y=r.y;
+			ev.mouse_motion.speed_x=s.x;
+			ev.mouse_motion.speed_y=s.y;
+
+		} break;
+		case InputEvent::SCREEN_TOUCH: {
+
+
+			Vector2 t = p_xform.xform(Vector2(ev.screen_touch.x,ev.screen_touch.y));
+			ev.screen_touch.x=t.x;
+			ev.screen_touch.y=t.y;
+
+		} break;
+		case InputEvent::SCREEN_DRAG: {
+
+
+			Vector2 t = p_xform.xform(Vector2(ev.screen_drag.x,ev.screen_drag.y));
+			Vector2 r = p_xform.basis_xform(Vector2(ev.screen_drag.relative_x,ev.screen_drag.relative_y));
+			Vector2 s = p_xform.basis_xform(Vector2(ev.screen_drag.speed_x,ev.screen_drag.speed_y));
+			ev.screen_drag.x=t.x;
+			ev.screen_drag.y=t.y;
+			ev.screen_drag.relative_x=r.x;
+			ev.screen_drag.relative_y=r.y;
+			ev.screen_drag.speed_x=s.x;
+			ev.screen_drag.speed_y=s.y;
+		} break;
+	}
+
+	return ev;
+}
diff --git a/core/os/input_event.h b/core/os/input_event.h
index 0588374790..1c4f1dcf96 100644
--- a/core/os/input_event.h
+++ b/core/os/input_event.h
@@ -33,7 +33,7 @@
 #include "typedefs.h"
 #include "os/copymem.h"
 #include "ustring.h"
-
+#include "math_2d.h"
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
 */
@@ -297,6 +297,8 @@ struct InputEvent {
 	bool is_echo() const;
 	void set_as_action(const String& p_action, bool p_pressed);
 
+
+	InputEvent xform_by(const Matrix32& p_xform) const;
 	bool operator==(const InputEvent &p_event) const;
 	operator String() const;
 	InputEvent() { zeromem(this,sizeof(InputEvent)); }
diff --git a/core/os/thread.h b/core/os/thread.h
index 7349b83dbc..5f0ec707f2 100644
--- a/core/os/thread.h
+++ b/core/os/thread.h
@@ -39,6 +39,8 @@
 
 typedef void (*ThreadCreateCallback)(void *p_userdata);
 
+
+
 class Thread {
 public:
 
@@ -65,15 +67,14 @@ protected:
 	static void (*wait_to_finish_func)(Thread*);
 	static Error (*set_name_func)(const String&);
 
-    friend class Main;
+	friend class Main;
 
-    static ID _main_thread_id;
+	static ID _main_thread_id;
 
 
 	Thread();
 public:
 
-
 	virtual ID get_ID() const=0;
 
 	static Error set_name(const String &p_name);
diff --git a/core/path_db.cpp b/core/path_db.cpp
index 7545088978..0956c4cd3f 100644
--- a/core/path_db.cpp
+++ b/core/path_db.cpp
@@ -329,7 +329,6 @@ NodePath::NodePath(const String& p_path) {
 	Vector<StringName> subpath;
 
 	int absolute=(path[0]=='/')?1:0;;
-	bool valid=false;
 	bool last_is_slash=true;
 	int slices=0;
 	int subpath_pos=path.find(":");
@@ -373,7 +372,6 @@ NodePath::NodePath(const String& p_path) {
 			if (last_is_slash)
 				slices++;
 
-			valid=true;
 			last_is_slash=false;
 		}
 	}
diff --git a/core/path_remap.cpp b/core/path_remap.cpp
index d4cb883f41..8f189187f2 100644
--- a/core/path_remap.cpp
+++ b/core/path_remap.cpp
@@ -59,12 +59,20 @@ String PathRemap::get_remap(const String& p_from) const {
 		return p_from;
 	} else {
 
+		const RemapData *ptr2=NULL;
+
 		String locale = TranslationServer::get_singleton()->get_locale();
 
 		if (ptr->locale.has(locale)) {
 			if (OS::get_singleton()->is_stdout_verbose())
 				print_line("remap found: "+p_from+" -> "+ptr->locale[locale]);
-			return ptr->locale[locale];
+
+			ptr2=remap.getptr(ptr->locale[locale]);
+
+			if (ptr2 && ptr2->always!=String()) //may have atlas or export remap too
+				return ptr2->always;
+			else
+				return ptr->locale[locale];
 		}
 
 		int p = locale.find("_");
@@ -73,7 +81,14 @@ String PathRemap::get_remap(const String& p_from) const {
 			if (ptr->locale.has(locale)) {
 				if (OS::get_singleton()->is_stdout_verbose())
 					print_line("remap found: "+p_from+" -> "+ptr->locale[locale]);
-				return ptr->locale[locale];
+
+				ptr2=remap.getptr(ptr->locale[locale]);
+
+				if (ptr2 && ptr2->always!=String()) //may have atlas or export remap too
+					return ptr2->always;
+				else
+					return ptr->locale[locale];
+
 			}
 		}
 
diff --git a/core/pool_allocator.cpp b/core/pool_allocator.cpp
index 849fd75f50..9f5fcf5f50 100644
--- a/core/pool_allocator.cpp
+++ b/core/pool_allocator.cpp
@@ -372,7 +372,6 @@ Error PoolAllocator::resize(ID p_mem,int p_new_size) {
 	}
 
 	//p_new_size = align(p_new_size)
-	int _total = pool_size; // - static_area_size;
 	int _free = free_mem; // - static_area_size;
 
 	if ((_free + aligned(e->len)) - alloc_size < 0) {
diff --git a/core/reference.cpp b/core/reference.cpp
index 90bafd0a9c..34f36a5735 100644
--- a/core/reference.cpp
+++ b/core/reference.cpp
@@ -27,7 +27,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "reference.h"
-
+#include "script_language.h"
 
 
 bool Reference::init_ref() {
@@ -66,11 +66,21 @@ int Reference::reference_get_count() const {
 void Reference::reference(){
 
 	refcount.ref();
+	if (get_script_instance()) {
+		get_script_instance()->refcount_incremented();
+	}
 
 }
 bool Reference::unreference(){
 
-	return refcount.unref();
+	bool die = refcount.unref();
+
+	if (get_script_instance()) {
+		die = die && get_script_instance()->refcount_decremented();
+	}
+
+	return die;
+
 }
 
 Reference::Reference() {
diff --git a/core/reference.h b/core/reference.h
index 8bfbf19ab6..89e9627b77 100644
--- a/core/reference.h
+++ b/core/reference.h
@@ -329,6 +329,62 @@ public:
 	WeakRef();
 };
 
+#ifdef PTRCALL_ENABLED
+
+template<class T>
+struct PtrToArg< Ref<T> > {
+
+	_FORCE_INLINE_ static Ref<T> convert(const void* p_ptr) {
+
+		return Ref<T>(reinterpret_cast<const T*>(p_ptr));
+	}
+
+	_FORCE_INLINE_ static void encode(Ref<T> p_val,const void* p_ptr) {
+
+		*(Ref<Reference>*)p_ptr=p_val;
+	}
+
+};
+
+
+template<class T>
+struct PtrToArg< const Ref<T>& > {
+
+	_FORCE_INLINE_ static Ref<T> convert(const void* p_ptr) {
+
+		return Ref<T>(reinterpret_cast<const T*>(p_ptr));
+	}
+
+};
 
 
+//this is for RefPtr
+
+template<>
+struct PtrToArg< RefPtr > {
+
+	_FORCE_INLINE_ static RefPtr convert(const void* p_ptr) {
+
+		return Ref<Reference>(reinterpret_cast<const Reference*>(p_ptr)).get_ref_ptr();
+	}
+
+	_FORCE_INLINE_ static void encode(RefPtr p_val,const void* p_ptr) {
+
+		Ref<Reference> r = p_val;
+		*(Ref<Reference>*)p_ptr=r;
+	}
+
+};
+
+template<>
+struct PtrToArg< const RefPtr& > {
+
+	_FORCE_INLINE_ static RefPtr convert(const void* p_ptr) {
+
+		return Ref<Reference>(reinterpret_cast<const Reference*>(p_ptr)).get_ref_ptr();
+	}
+
+};
+
+#endif
 #endif // REFERENCE_H
diff --git a/core/resource.cpp b/core/resource.cpp
index 97dee3e1d7..b80ec7012d 100644
--- a/core/resource.cpp
+++ b/core/resource.cpp
@@ -30,7 +30,7 @@
 #include "core_string_names.h"
 #include <stdio.h>
 #include "os/file_access.h"
-
+#include "io/resource_loader.h"
 
 void ResourceImportMetadata::set_editor(const String& p_editor) {
 
@@ -218,14 +218,36 @@ String Resource::get_name() const {
 	return name;
 }
 
-bool Resource::can_reload_from_file() {
+bool Resource::editor_can_reload_from_file() {
 
-	return false;
+	return true; //by default yes
 }
 
 void Resource::reload_from_file() {
 
 
+	String path=get_path();
+	if (!path.is_resource_file())
+		return;
+
+	Ref<Resource> s = ResourceLoader::load(path,get_type(),true);
+
+	if (!s.is_valid())
+		return;
+
+	List<PropertyInfo> pi;
+	s->get_property_list(&pi);
+
+	for (List<PropertyInfo>::Element *E=pi.front();E;E=E->next()) {
+
+		if (!(E->get().usage&PROPERTY_USAGE_STORAGE))
+			continue;
+		if (E->get().name=="resource/path")
+			continue; //do not change path
+
+		set(E->get().name,s->get(E->get().name));
+
+	}
 }
 
 
diff --git a/core/resource.h b/core/resource.h
index 958414f62b..0673a4e89d 100644
--- a/core/resource.h
+++ b/core/resource.h
@@ -121,7 +121,7 @@ protected:
 	void _take_over_path(const String& p_path);
 public:
 
-	virtual bool can_reload_from_file();
+	virtual bool editor_can_reload_from_file();
 	virtual void reload_from_file();
 
 	void register_owner(Object *p_owner);
diff --git a/core/script_language.cpp b/core/script_language.cpp
index 68a694398a..75d8b6d285 100644
--- a/core/script_language.cpp
+++ b/core/script_language.cpp
@@ -85,6 +85,20 @@ void ScriptServer::register_language(ScriptLanguage *p_language) {
 	_languages[_language_count++]=p_language;
 }
 
+void ScriptServer::unregister_language(ScriptLanguage *p_language) {
+
+
+	for(int i=0;i<_language_count;i++) {
+		if (_languages[i]==p_language) {
+			_language_count--;
+			if (i<_language_count) {
+				SWAP(_languages[i],_languages[_language_count]);
+			}
+			return;
+		}
+	}
+}
+
 void ScriptServer::init_languages() {
 
 	for(int i=0;i<_language_count;i++) {
@@ -102,6 +116,22 @@ bool ScriptServer::is_reload_scripts_on_save_enabled() {
 	return reload_scripts_on_save;
 }
 
+void ScriptServer::thread_enter() {
+
+	for(int i=0;i<_language_count;i++) {
+		_languages[i]->thread_enter();
+	}
+}
+
+void ScriptServer::thread_exit() {
+
+	for(int i=0;i<_language_count;i++) {
+		_languages[i]->thread_exit();
+	}
+
+}
+
+
 void ScriptInstance::get_property_state(List<Pair<StringName, Variant> > &state) {
 
 	List<PropertyInfo> pinfo;
diff --git a/core/script_language.h b/core/script_language.h
index 478ebd88ed..6d75b83aaf 100644
--- a/core/script_language.h
+++ b/core/script_language.h
@@ -55,10 +55,14 @@ public:
 	static int get_language_count();
 	static ScriptLanguage *get_language(int p_idx);
 	static void register_language(ScriptLanguage *p_language);
+	static void unregister_language(ScriptLanguage *p_language);
 
 	static void set_reload_scripts_on_save(bool p_enable);
 	static bool is_reload_scripts_on_save_enabled();
 
+	static void thread_enter();
+	static void thread_exit();
+
 	static void init_languages();
 };
 
@@ -74,6 +78,7 @@ class Script : public Resource {
 
 protected:
 
+	virtual bool editor_can_reload_from_file() { return false; } // this is handled by editor better
 	void _notification( int p_what);
 	static void _bind_methods();
 
@@ -128,6 +133,12 @@ public:
 	virtual void call_multilevel_reversed(const StringName& p_method,const Variant** p_args,int p_argcount);
 	virtual void notification(int p_notification)=0;
 
+	//this is used by script languages that keep a reference counter of their own
+	//you can make make Ref<> not die when it reaches zero, so deleting the reference
+	//depends entirely from the script
+
+	virtual void refcount_incremented() {}
+	virtual bool refcount_decremented() { return true; } //return true if it can die
 
 	virtual Ref<Script> get_script() const=0;
 
@@ -176,6 +187,12 @@ public:
 	virtual void auto_indent_code(String& p_code,int p_from_line,int p_to_line) const=0;
 	virtual void add_global_constant(const StringName& p_variable,const Variant& p_value)=0;
 
+	/* MULTITHREAD FUNCTIONS */
+
+	//some VMs need to be notified of thread creation/exiting to allocate a stack
+	virtual void thread_enter() {}
+	virtual void thread_exit() {}
+
 	/* DEBUGGER FUNCTIONS */
 
 	virtual String debug_get_error() const=0;
diff --git a/core/typedefs.h b/core/typedefs.h
index 6f9bb58958..30a75e66da 100644
--- a/core/typedefs.h
+++ b/core/typedefs.h
@@ -296,5 +296,6 @@ struct _GlobalLock {
 #define __STR(m_index) __STRX(m_index)
 
 
+
 #endif  /* typedefs.h */
 
diff --git a/core/ustring.cpp b/core/ustring.cpp
index ea9a9d903e..6788ada1bb 100644
--- a/core/ustring.cpp
+++ b/core/ustring.cpp
@@ -257,13 +257,10 @@ bool String::operator==(const StrRange &p_range) const {
 		return true;
 
 	const CharType *c_str=p_range.c_str;
-
-	int l=length();
-
-	const CharType *dst = p_range.c_str;
+	const CharType *dst = &operator[](0);
 
 	/* Compare char by char */
-	for (int i=0;i<l;i++) {
+	for (int i=0;i<len;i++) {
 
 		if (c_str[i]!=dst[i])
 			return false;
@@ -2419,6 +2416,23 @@ Vector<uint8_t> String::md5_buffer() const {
 	return ret;
 };
 
+Vector<uint8_t> String::sha256_buffer() const {
+	CharString cs = utf8();
+	unsigned char hash[32];
+	sha256_context ctx;
+	sha256_init(&ctx);
+	sha256_hash(&ctx, (unsigned char*)cs.ptr(), cs.length());
+	sha256_done(&ctx, hash);
+
+	Vector<uint8_t> ret;
+	ret.resize(32);
+	for (int i = 0; i < 32; i++) {
+		ret[i] = hash[i];
+	}
+
+	return ret;
+}
+
 
 String String::insert(int p_at_pos,String p_string) const {
 
@@ -3822,7 +3836,6 @@ String String::lpad(int min_length, const String& character) const {
 String String::sprintf(const Array& values, bool* error) const {
 	String formatted;
 	CharType* self = (CharType*)c_str();
-	int num_items = values.size();
 	bool in_format = false;
 	int value_index = 0;
 	int min_chars;
diff --git a/core/ustring.h b/core/ustring.h
index 692cb4e37d..bb57b11d88 100644
--- a/core/ustring.h
+++ b/core/ustring.h
@@ -196,6 +196,7 @@ public:
 	String md5_text() const;
 	String sha256_text() const;
 	Vector<uint8_t> md5_buffer() const;
+	Vector<uint8_t> sha256_buffer() const;
 
 	inline bool empty() const { return length() == 0; }
 
diff --git a/core/variant.cpp b/core/variant.cpp
index 81d10f379a..31321dc0f3 100644
--- a/core/variant.cpp
+++ b/core/variant.cpp
@@ -1559,72 +1559,78 @@ Variant::operator String() const {
 		case VECTOR2_ARRAY: {
 
 			DVector<Vector2> vec = operator DVector<Vector2>();
-			String str;
+			String str("[");
 			for(int i=0;i<vec.size();i++) {
 
 				if (i>0)
 					str+=", ";
 				str=str+Variant( vec[i] );
 			}
+			str += "]";
 			return str;
 		} break;
 		case VECTOR3_ARRAY: {
 
 			DVector<Vector3> vec = operator DVector<Vector3>();
-			String str;
+			String str("[");
 			for(int i=0;i<vec.size();i++) {
 
 				if (i>0)
 					str+=", ";
 				str=str+Variant( vec[i] );
 			}
+			str += "]";
 			return str;
 		} break;
 		case STRING_ARRAY: {
 
 			DVector<String> vec = operator DVector<String>();
-			String str;
+			String str("[");
 			for(int i=0;i<vec.size();i++) {
 
 				if (i>0)
 					str+=", ";
 				str=str+vec[i];
 			}
+			str += "]";
 			return str;
 		} break;
 		case INT_ARRAY: {
 
 			DVector<int> vec = operator DVector<int>();
-			String str;
+			String str("[");
 			for(int i=0;i<vec.size();i++) {
 
 				if (i>0)
 					str+=", ";
 				str=str+itos(vec[i]);
 			}
+			str += "]";
 			return str;
 		} break;
 		case REAL_ARRAY: {
 
 			DVector<real_t> vec = operator DVector<real_t>();
-			String str;
+			String str("[");
 			for(int i=0;i<vec.size();i++) {
 
 				if (i>0)
 					str+=", ";
 				str=str+rtos(vec[i]);
 			}
+			str += "]";
 			return str;
 		} break;
 		case ARRAY: {
 
 			Array arr = operator Array();
-			String str;
+			String str("[");
 			for (int i=0; i<arr.size(); i++) {
 				if (i)
 					str+=", ";
 				str += String(arr[i]);
 			};
+			str += "]";
 			return str;
 
 		} break;
diff --git a/core/variant_call.cpp b/core/variant_call.cpp
index 84015d2b04..7da4cef115 100644
--- a/core/variant_call.cpp
+++ b/core/variant_call.cpp
@@ -271,6 +271,7 @@ static void _call_##m_type##_##m_method(Variant& r_ret,Variant& p_self,const Var
 	VCALL_LOCALMEM0R(String,md5_text);
 	VCALL_LOCALMEM0R(String,sha256_text);
 	VCALL_LOCALMEM0R(String,md5_buffer);
+	VCALL_LOCALMEM0R(String,sha256_buffer);
 	VCALL_LOCALMEM0R(String,empty);
 	VCALL_LOCALMEM0R(String,is_abs_path);
 	VCALL_LOCALMEM0R(String,is_rel_path);
@@ -511,56 +512,77 @@ static void _call_##m_type##_##m_method(Variant& r_ret,Variant& p_self,const Var
 	VCALL_LOCALMEM1R(ByteArray,get);
 	VCALL_LOCALMEM1(ByteArray,push_back);
 	VCALL_LOCALMEM1(ByteArray,resize);
+	VCALL_LOCALMEM2R(ByteArray,insert);
+	VCALL_LOCALMEM1(ByteArray,remove);
 	VCALL_LOCALMEM1(ByteArray,append);
 	VCALL_LOCALMEM1(ByteArray,append_array);
+	VCALL_LOCALMEM0(ByteArray,invert);
 
 	VCALL_LOCALMEM0R(IntArray,size);
 	VCALL_LOCALMEM2(IntArray,set);
 	VCALL_LOCALMEM1R(IntArray,get);
 	VCALL_LOCALMEM1(IntArray,push_back);
 	VCALL_LOCALMEM1(IntArray,resize);
+	VCALL_LOCALMEM2R(IntArray,insert);
+	VCALL_LOCALMEM1(IntArray,remove);
 	VCALL_LOCALMEM1(IntArray,append);
 	VCALL_LOCALMEM1(IntArray,append_array);
+	VCALL_LOCALMEM0(IntArray,invert);
 
 	VCALL_LOCALMEM0R(RealArray,size);
 	VCALL_LOCALMEM2(RealArray,set);
 	VCALL_LOCALMEM1R(RealArray,get);
 	VCALL_LOCALMEM1(RealArray,push_back);
 	VCALL_LOCALMEM1(RealArray,resize);
+	VCALL_LOCALMEM2R(RealArray,insert);
+	VCALL_LOCALMEM1(RealArray,remove);
 	VCALL_LOCALMEM1(RealArray,append);
 	VCALL_LOCALMEM1(RealArray,append_array);
+	VCALL_LOCALMEM0(RealArray,invert);
 
 	VCALL_LOCALMEM0R(StringArray,size);
 	VCALL_LOCALMEM2(StringArray,set);
 	VCALL_LOCALMEM1R(StringArray,get);
 	VCALL_LOCALMEM1(StringArray,push_back);
 	VCALL_LOCALMEM1(StringArray,resize);
+	VCALL_LOCALMEM2R(StringArray,insert);
+	VCALL_LOCALMEM1(StringArray,remove);
 	VCALL_LOCALMEM1(StringArray,append);
 	VCALL_LOCALMEM1(StringArray,append_array);
+	VCALL_LOCALMEM0(StringArray,invert);
 
 	VCALL_LOCALMEM0R(Vector2Array,size);
 	VCALL_LOCALMEM2(Vector2Array,set);
 	VCALL_LOCALMEM1R(Vector2Array,get);
 	VCALL_LOCALMEM1(Vector2Array,push_back);
 	VCALL_LOCALMEM1(Vector2Array,resize);
+	VCALL_LOCALMEM2R(Vector2Array,insert);
+	VCALL_LOCALMEM1(Vector2Array,remove);
 	VCALL_LOCALMEM1(Vector2Array,append);
 	VCALL_LOCALMEM1(Vector2Array,append_array);
+	VCALL_LOCALMEM0(Vector2Array,invert);
 
 	VCALL_LOCALMEM0R(Vector3Array,size);
 	VCALL_LOCALMEM2(Vector3Array,set);
 	VCALL_LOCALMEM1R(Vector3Array,get);
 	VCALL_LOCALMEM1(Vector3Array,push_back);
 	VCALL_LOCALMEM1(Vector3Array,resize);
+	VCALL_LOCALMEM2R(Vector3Array,insert);
+	VCALL_LOCALMEM1(Vector3Array,remove);
 	VCALL_LOCALMEM1(Vector3Array,append);
 	VCALL_LOCALMEM1(Vector3Array,append_array);
+	VCALL_LOCALMEM0(Vector3Array,invert);
 
 	VCALL_LOCALMEM0R(ColorArray,size);
 	VCALL_LOCALMEM2(ColorArray,set);
 	VCALL_LOCALMEM1R(ColorArray,get);
 	VCALL_LOCALMEM1(ColorArray,push_back);
 	VCALL_LOCALMEM1(ColorArray,resize);
+	VCALL_LOCALMEM2R(ColorArray,insert);
+	VCALL_LOCALMEM1(ColorArray,remove);
 	VCALL_LOCALMEM1(ColorArray,append);
 	VCALL_LOCALMEM1(ColorArray,append_array);
+	VCALL_LOCALMEM0(ColorArray,invert);
 
 #define VCALL_PTR0(m_type,m_method)\
 static void _call_##m_type##_##m_method(Variant& r_ret,Variant& p_self,const Variant** p_args) { reinterpret_cast<m_type*>(p_self._data._ptr)->m_method(); }
@@ -925,10 +947,22 @@ static void _call_##m_type##_##m_method(Variant& r_ret,Variant& p_self,const Var
 	struct ConstantData {
 
 		Map<StringName,int> value;
+#ifdef DEBUG_ENABLED
+		List<StringName> value_ordered;
+#endif
 	};
 
 	static ConstantData* constant_data;
 
+	static void add_constant(int p_type, StringName p_constant_name, int p_constant_value) {
+
+		constant_data[p_type].value[p_constant_name] = p_constant_value;
+#ifdef DEBUG_ENABLED
+		constant_data[p_type].value_ordered.push_back(p_constant_name);
+#endif
+
+	}
+
 };
 
 _VariantCall::TypeFunc* _VariantCall::type_funcs=NULL;
@@ -1219,9 +1253,15 @@ void Variant::get_numeric_constants_for_type(Variant::Type p_type, List<StringNa
 
 	_VariantCall::ConstantData& cd = _VariantCall::constant_data[p_type];
 
+#ifdef DEBUG_ENABLED
+	for(List<StringName>::Element *E=cd.value_ordered.front();E;E=E->next()) {
+
+		p_constants->push_back(E->get());
+#else
 	for(Map<StringName,int>::Element *E=cd.value.front();E;E=E->next()) {
 
 		p_constants->push_back(E->key());
+#endif
 	}
 }
 
@@ -1308,6 +1348,7 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl
 	ADDFUNC0(STRING,STRING,String,md5_text,varray());
 	ADDFUNC0(STRING,STRING,String,sha256_text,varray());
 	ADDFUNC0(STRING,RAW_ARRAY,String,md5_buffer,varray());
+	ADDFUNC0(STRING,RAW_ARRAY,String,sha256_buffer,varray());
 	ADDFUNC0(STRING,BOOL,String,empty,varray());
 	ADDFUNC0(STRING,BOOL,String,is_abs_path,varray());
 	ADDFUNC0(STRING,BOOL,String,is_rel_path,varray());
@@ -1484,9 +1525,13 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl
 
 	ADDFUNC0(RAW_ARRAY,INT,ByteArray,size,varray());
 	ADDFUNC2(RAW_ARRAY,NIL,ByteArray,set,INT,"idx",INT,"byte",varray());
-	//ADDFUNC1(RAW_ARRAY,INT,ByteArray,get,INT,"idx",varray());
 	ADDFUNC1(RAW_ARRAY,NIL,ByteArray,push_back,INT,"byte",varray());
+	ADDFUNC1(RAW_ARRAY,NIL,ByteArray,append,INT,"byte",varray());
+	ADDFUNC1(RAW_ARRAY,NIL,ByteArray,append_array,RAW_ARRAY,"array",varray());
+	ADDFUNC1(RAW_ARRAY,NIL,ByteArray,remove,INT,"idx",varray());
+	ADDFUNC2(RAW_ARRAY,INT,ByteArray,insert,INT,"idx",INT,"byte",varray());
 	ADDFUNC1(RAW_ARRAY,NIL,ByteArray,resize,INT,"idx",varray());
+	ADDFUNC0(RAW_ARRAY,NIL,ByteArray,invert,varray());
 
 	ADDFUNC0(RAW_ARRAY,STRING,ByteArray,get_string_from_ascii,varray());
 	ADDFUNC0(RAW_ARRAY,STRING,ByteArray,get_string_from_utf8,varray());
@@ -1494,39 +1539,63 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl
 
 	ADDFUNC0(INT_ARRAY,INT,IntArray,size,varray());
 	ADDFUNC2(INT_ARRAY,NIL,IntArray,set,INT,"idx",INT,"integer",varray());
-	//ADDFUNC1(INT_ARRAY,INT,IntArray,get,INT,"idx",varray());
 	ADDFUNC1(INT_ARRAY,NIL,IntArray,push_back,INT,"integer",varray());
+	ADDFUNC1(INT_ARRAY,NIL,IntArray,append,INT,"integer",varray());
+	ADDFUNC1(INT_ARRAY,NIL,IntArray,append_array,INT_ARRAY,"array",varray());
+	ADDFUNC1(INT_ARRAY,NIL,IntArray,remove,INT,"idx",varray());
+	ADDFUNC2(INT_ARRAY,INT,IntArray,insert,INT,"idx",INT,"integer",varray());
 	ADDFUNC1(INT_ARRAY,NIL,IntArray,resize,INT,"idx",varray());
+	ADDFUNC0(INT_ARRAY,NIL,IntArray,invert,varray());
 
 	ADDFUNC0(REAL_ARRAY,INT,RealArray,size,varray());
 	ADDFUNC2(REAL_ARRAY,NIL,RealArray,set,INT,"idx",REAL,"value",varray());
-	//ADDFUNC1(REAL_ARRAY,REAL,RealArray,get,INT,"idx",varray());
 	ADDFUNC1(REAL_ARRAY,NIL,RealArray,push_back,REAL,"value",varray());
+	ADDFUNC1(REAL_ARRAY,NIL,RealArray,append,REAL,"value",varray());
+	ADDFUNC1(REAL_ARRAY,NIL,RealArray,append_array,REAL_ARRAY,"array",varray());
+	ADDFUNC1(REAL_ARRAY,NIL,RealArray,remove,INT,"idx",varray());
+	ADDFUNC2(REAL_ARRAY,INT,RealArray,insert,INT,"idx",REAL,"value",varray());
 	ADDFUNC1(REAL_ARRAY,NIL,RealArray,resize,INT,"idx",varray());
+	ADDFUNC0(REAL_ARRAY,NIL,RealArray,invert,varray());
 
 	ADDFUNC0(STRING_ARRAY,INT,StringArray,size,varray());
 	ADDFUNC2(STRING_ARRAY,NIL,StringArray,set,INT,"idx",STRING,"string",varray());
-	//ADDFUNC1(STRING_ARRAY,STRING,StringArray,get,INT,"idx",varray());
 	ADDFUNC1(STRING_ARRAY,NIL,StringArray,push_back,STRING,"string",varray());
+	ADDFUNC1(STRING_ARRAY,NIL,StringArray,append,STRING,"string",varray());
+	ADDFUNC1(STRING_ARRAY,NIL,StringArray,append_array,STRING_ARRAY,"array",varray());
+	ADDFUNC1(STRING_ARRAY,NIL,StringArray,remove,INT,"idx",varray());
+	ADDFUNC2(STRING_ARRAY,INT,StringArray,insert,INT,"idx",STRING,"string",varray());
 	ADDFUNC1(STRING_ARRAY,NIL,StringArray,resize,INT,"idx",varray());
+	ADDFUNC0(STRING_ARRAY,NIL,StringArray,invert,varray());
 
 	ADDFUNC0(VECTOR2_ARRAY,INT,Vector2Array,size,varray());
 	ADDFUNC2(VECTOR2_ARRAY,NIL,Vector2Array,set,INT,"idx",VECTOR2,"vector2",varray());
-	//ADDFUNC1(VECTOR2_ARRAY,VECTOR2,Vector2Array,get,INT,"idx",varray());
 	ADDFUNC1(VECTOR2_ARRAY,NIL,Vector2Array,push_back,VECTOR2,"vector2",varray());
+	ADDFUNC1(VECTOR2_ARRAY,NIL,Vector2Array,append,VECTOR2,"vector2",varray());
+	ADDFUNC1(VECTOR2_ARRAY,NIL,Vector2Array,append_array,VECTOR2_ARRAY,"array",varray());
+	ADDFUNC1(VECTOR2_ARRAY,NIL,Vector2Array,remove,INT,"idx",varray());
+	ADDFUNC2(VECTOR2_ARRAY,INT,Vector2Array,insert,INT,"idx",VECTOR2,"vector2",varray());
 	ADDFUNC1(VECTOR2_ARRAY,NIL,Vector2Array,resize,INT,"idx",varray());
+	ADDFUNC0(VECTOR2_ARRAY,NIL,Vector2Array,invert,varray());
 
 	ADDFUNC0(VECTOR3_ARRAY,INT,Vector3Array,size,varray());
 	ADDFUNC2(VECTOR3_ARRAY,NIL,Vector3Array,set,INT,"idx",VECTOR3,"vector3",varray());
-	//ADDFUNC1(VECTOR3_ARRAY,VECTOR3,Vector3Array,get,INT,"idx",varray());
 	ADDFUNC1(VECTOR3_ARRAY,NIL,Vector3Array,push_back,VECTOR3,"vector3",varray());
+	ADDFUNC1(VECTOR3_ARRAY,NIL,Vector3Array,append,VECTOR3,"vector3",varray());
+	ADDFUNC1(VECTOR3_ARRAY,NIL,Vector3Array,append_array,VECTOR3_ARRAY,"array",varray());
+	ADDFUNC1(VECTOR3_ARRAY,NIL,Vector3Array,remove,INT,"idx",varray());
+	ADDFUNC2(VECTOR3_ARRAY,INT,Vector3Array,insert,INT,"idx",VECTOR3,"vector3",varray());
 	ADDFUNC1(VECTOR3_ARRAY,NIL,Vector3Array,resize,INT,"idx",varray());
+	ADDFUNC0(VECTOR3_ARRAY,NIL,Vector3Array,invert,varray());
 
 	ADDFUNC0(COLOR_ARRAY,INT,ColorArray,size,varray());
 	ADDFUNC2(COLOR_ARRAY,NIL,ColorArray,set,INT,"idx",COLOR,"color",varray());
-	//ADDFUNC1(COLOR_ARRAY,COLOR,ColorArray,get,INT,"idx",varray());
 	ADDFUNC1(COLOR_ARRAY,NIL,ColorArray,push_back,COLOR,"color",varray());
+	ADDFUNC1(COLOR_ARRAY,NIL,ColorArray,append,COLOR,"color",varray());
+	ADDFUNC1(COLOR_ARRAY,NIL,ColorArray,append_array,COLOR_ARRAY,"array",varray());
+	ADDFUNC1(COLOR_ARRAY,NIL,ColorArray,remove,INT,"idx",varray());
+	ADDFUNC2(COLOR_ARRAY,INT,ColorArray,insert,INT,"idx",COLOR,"color",varray());
 	ADDFUNC1(COLOR_ARRAY,NIL,ColorArray,resize,INT,"idx",varray());
+	ADDFUNC0(COLOR_ARRAY,NIL,ColorArray,invert,varray());
 
 	//pointerbased
 
@@ -1598,10 +1667,10 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl
 
 	ADDFUNC0(INPUT_EVENT,BOOL,InputEvent,is_pressed,varray());
 	ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action,STRING,"action",varray());
-	ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action_pressed,STRING,"is_action_pressed",varray());
-	ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action_released,STRING,"is_action_released",varray());
+	ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action_pressed,STRING,"action",varray());
+	ADDFUNC1(INPUT_EVENT,BOOL,InputEvent,is_action_released,STRING,"action",varray());
 	ADDFUNC0(INPUT_EVENT,BOOL,InputEvent,is_echo,varray());
-    ADDFUNC2(INPUT_EVENT,NIL,InputEvent,set_as_action,STRING,"action",BOOL,"pressed",varray());
+	ADDFUNC2(INPUT_EVENT,NIL,InputEvent,set_as_action,STRING,"action",BOOL,"pressed",varray());
 
 	/* REGISTER CONSTRUCTORS */
 
@@ -1620,7 +1689,7 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl
 	_VariantCall::add_constructor(_VariantCall::Plane_init3,Variant::PLANE,"normal",Variant::VECTOR3,"d",Variant::REAL);
 
 	_VariantCall::add_constructor(_VariantCall::Quat_init1,Variant::QUAT,"x",Variant::REAL,"y",Variant::REAL,"z",Variant::REAL,"w",Variant::REAL);
-    _VariantCall::add_constructor(_VariantCall::Quat_init2,Variant::QUAT,"axis",Variant::VECTOR3,"angle",Variant::REAL);
+	_VariantCall::add_constructor(_VariantCall::Quat_init2,Variant::QUAT,"axis",Variant::VECTOR3,"angle",Variant::REAL);
 
 	_VariantCall::add_constructor(_VariantCall::Color_init1,Variant::COLOR,"r",Variant::REAL,"g",Variant::REAL,"b",Variant::REAL,"a",Variant::REAL);
 	_VariantCall::add_constructor(_VariantCall::Color_init2,Variant::COLOR,"r",Variant::REAL,"g",Variant::REAL,"b",Variant::REAL);
@@ -1637,54 +1706,54 @@ _VariantCall::addfunc(Variant::m_vtype,Variant::m_ret,_SCS(#m_method),VCALL(m_cl
 
 	/* REGISTER CONSTANTS */
 
-	_VariantCall::constant_data[Variant::VECTOR3].value["AXIS_X"]=Vector3::AXIS_X;
-	_VariantCall::constant_data[Variant::VECTOR3].value["AXIS_Y"]=Vector3::AXIS_Y;
-	_VariantCall::constant_data[Variant::VECTOR3].value["AXIS_Z"]=Vector3::AXIS_Z;
-
-	_VariantCall::constant_data[Variant::INPUT_EVENT].value["NONE"]=InputEvent::NONE;
-	_VariantCall::constant_data[Variant::INPUT_EVENT].value["KEY"]=InputEvent::KEY;
-	_VariantCall::constant_data[Variant::INPUT_EVENT].value["MOUSE_MOTION"]=InputEvent::MOUSE_MOTION;
-	_VariantCall::constant_data[Variant::INPUT_EVENT].value["MOUSE_BUTTON"]=InputEvent::MOUSE_BUTTON;
-	_VariantCall::constant_data[Variant::INPUT_EVENT].value["JOYSTICK_MOTION"]=InputEvent::JOYSTICK_MOTION;
-	_VariantCall::constant_data[Variant::INPUT_EVENT].value["JOYSTICK_BUTTON"]=InputEvent::JOYSTICK_BUTTON;
-	_VariantCall::constant_data[Variant::INPUT_EVENT].value["SCREEN_TOUCH"]=InputEvent::SCREEN_TOUCH;
-	_VariantCall::constant_data[Variant::INPUT_EVENT].value["SCREEN_DRAG"]=InputEvent::SCREEN_DRAG;
-	_VariantCall::constant_data[Variant::INPUT_EVENT].value["ACTION"]=InputEvent::ACTION;
-
-	_VariantCall::constant_data[Variant::IMAGE].value["COMPRESS_BC"]=Image::COMPRESS_BC;
-	_VariantCall::constant_data[Variant::IMAGE].value["COMPRESS_PVRTC2"]=Image::COMPRESS_PVRTC2;
-	_VariantCall::constant_data[Variant::IMAGE].value["COMPRESS_PVRTC4"]=Image::COMPRESS_PVRTC4;
-	_VariantCall::constant_data[Variant::IMAGE].value["COMPRESS_ETC"]=Image::COMPRESS_ETC;
-
-
-
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_GRAYSCALE"]=Image::FORMAT_GRAYSCALE;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_INTENSITY"]=Image::FORMAT_INTENSITY;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_GRAYSCALE_ALPHA"]=Image::FORMAT_GRAYSCALE_ALPHA;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_RGB"]=Image::FORMAT_RGB;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_RGBA"]=Image::FORMAT_RGBA;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_INDEXED"]=Image::FORMAT_INDEXED;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_INDEXED_ALPHA"]=Image::FORMAT_INDEXED_ALPHA;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_YUV_422"]=Image::FORMAT_YUV_422;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_YUV_444"]=Image::FORMAT_YUV_444;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_BC1"]=Image::FORMAT_BC1;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_BC2"]=Image::FORMAT_BC2;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_BC3"]=Image::FORMAT_BC3;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_BC4"]=Image::FORMAT_BC4;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_BC5"]=Image::FORMAT_BC5;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_PVRTC2"]=Image::FORMAT_PVRTC2;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_PVRTC2_ALPHA"]=Image::FORMAT_PVRTC2_ALPHA;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_PVRTC4"]=Image::FORMAT_PVRTC4;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_PVRTC4_ALPHA"]=Image::FORMAT_PVRTC4_ALPHA;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_ETC"]=Image::FORMAT_ETC;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_ATC"]=Image::FORMAT_ATC;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_ATC_ALPHA_EXPLICIT"]=Image::FORMAT_ATC_ALPHA_EXPLICIT;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_ATC_ALPHA_INTERPOLATED"]=Image::FORMAT_ATC_ALPHA_INTERPOLATED;
-	_VariantCall::constant_data[Variant::IMAGE].value["FORMAT_CUSTOM"]=Image::FORMAT_CUSTOM;
-
-	_VariantCall::constant_data[Variant::IMAGE].value["INTERPOLATE_NEAREST"]=Image::INTERPOLATE_NEAREST;
-	_VariantCall::constant_data[Variant::IMAGE].value["INTERPOLATE_BILINEAR"]=Image::INTERPOLATE_BILINEAR;
-	_VariantCall::constant_data[Variant::IMAGE].value["INTERPOLATE_CUBIC"]=Image::INTERPOLATE_CUBIC;
+	_VariantCall::add_constant(Variant::VECTOR3,"AXIS_X",Vector3::AXIS_X);
+	_VariantCall::add_constant(Variant::VECTOR3,"AXIS_Y",Vector3::AXIS_Y);
+	_VariantCall::add_constant(Variant::VECTOR3,"AXIS_Z",Vector3::AXIS_Z);
+
+
+	_VariantCall::add_constant(Variant::INPUT_EVENT,"NONE",InputEvent::NONE);
+	_VariantCall::add_constant(Variant::INPUT_EVENT,"KEY",InputEvent::KEY);
+	_VariantCall::add_constant(Variant::INPUT_EVENT,"MOUSE_MOTION",InputEvent::MOUSE_MOTION);
+	_VariantCall::add_constant(Variant::INPUT_EVENT,"MOUSE_BUTTON",InputEvent::MOUSE_BUTTON);
+	_VariantCall::add_constant(Variant::INPUT_EVENT,"JOYSTICK_MOTION",InputEvent::JOYSTICK_MOTION);
+	_VariantCall::add_constant(Variant::INPUT_EVENT,"JOYSTICK_BUTTON",InputEvent::JOYSTICK_BUTTON);
+	_VariantCall::add_constant(Variant::INPUT_EVENT,"SCREEN_TOUCH",InputEvent::SCREEN_TOUCH);
+	_VariantCall::add_constant(Variant::INPUT_EVENT,"SCREEN_DRAG",InputEvent::SCREEN_DRAG);
+	_VariantCall::add_constant(Variant::INPUT_EVENT,"ACTION",InputEvent::ACTION);
+
+
+	_VariantCall::add_constant(Variant::IMAGE,"COMPRESS_BC",Image::COMPRESS_BC);
+	_VariantCall::add_constant(Variant::IMAGE,"COMPRESS_PVRTC2",Image::COMPRESS_PVRTC2);
+	_VariantCall::add_constant(Variant::IMAGE,"COMPRESS_PVRTC4",Image::COMPRESS_PVRTC4);
+	_VariantCall::add_constant(Variant::IMAGE,"COMPRESS_ETC",Image::COMPRESS_ETC);
+
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_GRAYSCALE",Image::FORMAT_GRAYSCALE);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_INTENSITY",Image::FORMAT_INTENSITY);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_GRAYSCALE_ALPHA",Image::FORMAT_GRAYSCALE_ALPHA);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_RGB",Image::FORMAT_RGB);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_RGBA",Image::FORMAT_RGBA);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_INDEXED",Image::FORMAT_INDEXED);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_INDEXED_ALPHA",Image::FORMAT_INDEXED_ALPHA);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_YUV_422",Image::FORMAT_YUV_422);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_YUV_444",Image::FORMAT_YUV_444);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_BC1",Image::FORMAT_BC1);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_BC2",Image::FORMAT_BC2);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_BC3",Image::FORMAT_BC3);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_BC4",Image::FORMAT_BC4);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_BC5",Image::FORMAT_BC5);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_PVRTC2",Image::FORMAT_PVRTC2);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_PVRTC2_ALPHA",Image::FORMAT_PVRTC2_ALPHA);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_PVRTC4",Image::FORMAT_PVRTC4);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_PVRTC4_ALPHA",Image::FORMAT_PVRTC4_ALPHA);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_ETC",Image::FORMAT_ETC);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_ATC",Image::FORMAT_ATC);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_ATC_ALPHA_EXPLICIT",Image::FORMAT_ATC_ALPHA_EXPLICIT);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_ATC_ALPHA_INTERPOLATED",Image::FORMAT_ATC_ALPHA_INTERPOLATED);
+	_VariantCall::add_constant(Variant::IMAGE,"FORMAT_CUSTOM",Image::FORMAT_CUSTOM);
+
+	_VariantCall::add_constant(Variant::IMAGE,"INTERPOLATE_NEAREST",Image::INTERPOLATE_NEAREST);
+	_VariantCall::add_constant(Variant::IMAGE,"INTERPOLATE_BILINEAR",Image::INTERPOLATE_BILINEAR);
+	_VariantCall::add_constant(Variant::IMAGE,"INTERPOLATE_CUBIC",Image::INTERPOLATE_CUBIC);
 }
 
 void unregister_variant_methods() {
diff --git a/core/variant_op.cpp b/core/variant_op.cpp
index 9f706e75cf..9182dcde1a 100644
--- a/core/variant_op.cpp
+++ b/core/variant_op.cpp
@@ -477,7 +477,7 @@ void Variant::evaluate(const Operator& p_op, const Variant& p_a, const Variant&
 					DEFAULT_OP_FAIL(MATRIX32);
 					DEFAULT_OP_LOCALMEM(+,VECTOR3,Vector3);
 					DEFAULT_OP_FAIL(PLANE);
-					DEFAULT_OP_FAIL(QUAT);
+					DEFAULT_OP_LOCALMEM(+, QUAT, Quat);
 					DEFAULT_OP_FAIL(_AABB);
 					DEFAULT_OP_FAIL(MATRIX3);
 					DEFAULT_OP_FAIL(TRANSFORM);
@@ -535,7 +535,7 @@ void Variant::evaluate(const Operator& p_op, const Variant& p_a, const Variant&
 				DEFAULT_OP_FAIL(MATRIX32);
 				DEFAULT_OP_LOCALMEM(-,VECTOR3,Vector3);
 				DEFAULT_OP_FAIL(PLANE);
-				DEFAULT_OP_FAIL(QUAT);
+				DEFAULT_OP_LOCALMEM(-, QUAT, Quat);
 				DEFAULT_OP_FAIL(_AABB);
 				DEFAULT_OP_FAIL(MATRIX3);
 				DEFAULT_OP_FAIL(TRANSFORM);
@@ -597,6 +597,9 @@ void Variant::evaluate(const Operator& p_op, const Variant& p_a, const Variant&
 
 							_RETURN( *reinterpret_cast<const Quat*>(p_a._data._mem) * *reinterpret_cast<const Quat*>(p_b._data._mem) );
 						} break;
+						case REAL: {
+							_RETURN( *reinterpret_cast<const Quat*>(p_a._data._mem) * p_b._data._real);
+						} break;
 					};
 					r_valid=false;
 					return;
@@ -699,7 +702,13 @@ void Variant::evaluate(const Operator& p_op, const Variant& p_a, const Variant&
 				DEFAULT_OP_FAIL(MATRIX32);
 				DEFAULT_OP_LOCALMEM_NUM(/,VECTOR3,Vector3);
 				DEFAULT_OP_FAIL(PLANE);
-				DEFAULT_OP_FAIL(QUAT);
+				case QUAT: {
+					if (p_b.type != REAL) {
+						r_valid = false;
+						return;
+					}
+					_RETURN( *reinterpret_cast<const Quat*>(p_a._data._mem) / p_b._data._real);
+				} break;
 				DEFAULT_OP_FAIL(_AABB);
 				DEFAULT_OP_FAIL(MATRIX3);
 				DEFAULT_OP_FAIL(TRANSFORM);
@@ -2902,6 +2911,14 @@ bool Variant::iter_init(Variant& r_iter,bool &valid) const {
 			return ret;
 		} break;
 
+		case STRING: {
+
+			const String *str=reinterpret_cast<const String*>(_data._mem);
+			if (str->empty())
+				return false;
+			r_iter = 0;
+			return true;
+		} break;
 		case DICTIONARY: {
 
 			const Dictionary *dic=reinterpret_cast<const Dictionary*>(_data._mem);
@@ -3019,6 +3036,17 @@ bool Variant::iter_next(Variant& r_iter,bool &valid) const {
 
 			return ret;
 		} break;
+
+		case STRING: {
+
+			const String *str=reinterpret_cast<const String*>(_data._mem);
+			int idx = r_iter;
+			idx++;
+			if (idx >= str->size())
+				return false;
+			r_iter = idx;
+			return true;
+		} break;
 		case DICTIONARY: {
 
 			const Dictionary *dic=reinterpret_cast<const Dictionary*>(_data._mem);
@@ -3149,6 +3177,11 @@ Variant Variant::iter_get(const Variant& r_iter,bool &r_valid) const {
 			return ret;
 		} break;
 
+		case STRING: {
+
+			const String *str=reinterpret_cast<const String*>(_data._mem);
+			return str->substr(r_iter,1);
+		} break;
 		case DICTIONARY: {
 
 			return r_iter; //iterator is the same as the key
diff --git a/doc/base/classes.xml b/doc/base/classes.xml
index 5f7e995099..dd00a0312c 100644
--- a/doc/base/classes.xml
+++ b/doc/base/classes.xml
@@ -2,64 +2,43 @@
 <doc version="2.1.alpha.custom_build" name="Engine Types">
 <class name="@GDScript" category="Core">
 	<brief_description>
-	Built-in GDScript functions.
+		Built-in GDScript functions.
 	</brief_description>
 	<description>
-	This contains the list of built-in gdscript functions. Mostly math functions and other utilities. Everything else is expanded by objects.
+		This contains the list of built-in gdscript functions. Mostly math functions and other utilities. Everything else is expanded by objects.
 	</description>
 	<methods>
-		<method name="sin">
-			<return type="float">
+		<method name="Color8">
+			<return type="Color">
 			</return>
-			<argument index="0" name="s" type="float">
+			<argument index="0" name="r8" type="int">
 			</argument>
-			<description>
-			Standard sine function.
-			</description>
-		</method>
-		<method name="cos">
-			<return type="float">
-			</return>
-			<argument index="0" name="s" type="float">
+			<argument index="1" name="g8" type="int">
 			</argument>
-			<description>
-			Standard cosine function.
-			</description>
-		</method>
-		<method name="tan">
-			<return type="float">
-			</return>
-			<argument index="0" name="s" type="float">
+			<argument index="2" name="b8" type="int">
 			</argument>
-			<description>
-			Standard tangent function.
-			</description>
-		</method>
-		<method name="sinh">
-			<return type="float">
-			</return>
-			<argument index="0" name="s" type="float">
+			<argument index="3" name="a8" type="int">
 			</argument>
 			<description>
-			Hyperbolic sine.
+				Make a color from red, green, blue and alpha. Arguments can range from 0 to 255.
 			</description>
 		</method>
-		<method name="cosh">
+		<method name="abs">
 			<return type="float">
 			</return>
 			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-			Hyperbolic cosine.
+				Remove sign (works for integer and float).
 			</description>
 		</method>
-		<method name="tanh">
+		<method name="acos">
 			<return type="float">
 			</return>
 			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-			Hyperbolic tangent.
+				Arc-cosine.
 			</description>
 		</method>
 		<method name="asin">
@@ -68,16 +47,16 @@
 			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-			Arc-sine.
+				Arc-sine.
 			</description>
 		</method>
-		<method name="acos">
-			<return type="float">
+		<method name="assert">
+			<return type="Nil">
 			</return>
-			<argument index="0" name="s" type="float">
+			<argument index="0" name="condition" type="bool">
 			</argument>
 			<description>
-			Arc-cosine.
+				Assert that the condition is true. If the condition is false, generates an error.
 			</description>
 		</method>
 		<method name="atan">
@@ -86,7 +65,7 @@
 			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-			Arc-tangent.
+				Arc-tangent.
 			</description>
 		</method>
 		<method name="atan2">
@@ -97,128 +76,116 @@
 			<argument index="1" name="y" type="float">
 			</argument>
 			<description>
-			Arc-tangent that takes a 2D vector as argument, returns the full -pi to +pi range.
+				Arc-tangent that takes a 2D vector as argument, returns the full -pi to +pi range.
 			</description>
 		</method>
-		<method name="sqrt">
-			<return type="float">
+		<method name="bytes2var">
+			<return type="Variant">
 			</return>
-			<argument index="0" name="s" type="float">
+			<argument index="0" name="bytes" type="RawArray">
 			</argument>
 			<description>
-			Square root.
+				Decode a byte array back to a value.
 			</description>
 		</method>
-		<method name="fmod">
+		<method name="ceil">
 			<return type="float">
 			</return>
-			<argument index="0" name="x" type="float">
-			</argument>
-			<argument index="1" name="y" type="float">
+			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-			Module (remainder of x/y).
+				Ceiling (rounds up to nearest integer).
 			</description>
 		</method>
-		<method name="fposmod">
+		<method name="clamp">
 			<return type="float">
 			</return>
-			<argument index="0" name="x" type="float">
+			<argument index="0" name="val" type="float">
 			</argument>
-			<argument index="1" name="y" type="float">
+			<argument index="1" name="min" type="float">
 			</argument>
-			<description>
-			Module (remainder of x/y) that wraps equally in positive and negative.
-			</description>
-		</method>
-		<method name="floor">
-			<return type="float">
-			</return>
-			<argument index="0" name="s" type="float">
+			<argument index="2" name="max" type="float">
 			</argument>
 			<description>
-			Floor (rounds down to nearest integer).
+				Clamp both values to a range.
 			</description>
 		</method>
-		<method name="ceil">
-			<return type="float">
+		<method name="convert">
+			<return type="Object">
 			</return>
-			<argument index="0" name="s" type="float">
+			<argument index="0" name="what" type="Variant">
 			</argument>
-			<description>
-			Ceiling (rounds up to nearest integer).
-			</description>
-		</method>
-		<method name="round">
-			<return type="float">
-			</return>
-			<argument index="0" name="s" type="float">
+			<argument index="1" name="type" type="int">
 			</argument>
 			<description>
-			Round to nearest integer.
+				Convert from a type to another in the best way possible. The "type" parameter uses the enum TYPE_* in [@Global Scope].
 			</description>
 		</method>
-		<method name="abs">
+		<method name="cos">
 			<return type="float">
 			</return>
 			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-			Remove sign (works for integer and float).
+				Standard cosine function.
 			</description>
 		</method>
-		<method name="sign">
+		<method name="cosh">
 			<return type="float">
 			</return>
 			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-			Return sign (-1 or +1).
+				Hyperbolic cosine.
 			</description>
 		</method>
-		<method name="pow">
+		<method name="db2linear">
 			<return type="float">
 			</return>
-			<argument index="0" name="x" type="float">
-			</argument>
-			<argument index="1" name="y" type="float">
+			<argument index="0" name="db" type="float">
 			</argument>
 			<description>
-			Power function, x elevate to y.
+				Convert from decibels to linear energy (audio).
 			</description>
 		</method>
-		<method name="log">
+		<method name="decimals">
 			<return type="float">
 			</return>
-			<argument index="0" name="s" type="float">
+			<argument index="0" name="step" type="float">
 			</argument>
 			<description>
-			Natural logarithm.
+				Return the amount of decimals in the floating point value.
 			</description>
 		</method>
-		<method name="exp">
+		<method name="dectime">
 			<return type="float">
 			</return>
-			<argument index="0" name="s" type="float">
+			<argument index="0" name="value" type="float">
+			</argument>
+			<argument index="1" name="amount" type="float">
+			</argument>
+			<argument index="2" name="step" type="float">
 			</argument>
 			<description>
-			Exponential logarithm.
+				Decreases time by a specified amount.
 			</description>
 		</method>
-		<method name="is_nan">
+		<method name="deg2rad">
 			<return type="float">
 			</return>
-			<argument index="0" name="s" type="float">
+			<argument index="0" name="deg" type="float">
 			</argument>
 			<description>
+				Convert from degrees to radians.
 			</description>
 		</method>
-		<method name="is_inf">
-			<return type="float">
+		<method name="dict2inst">
+			<return type="Object">
 			</return>
-			<argument index="0" name="s" type="float">
+			<argument index="0" name="dict" type="Dictionary">
 			</argument>
 			<description>
+				Convert a previously converted instances to dictionary back into an instance. Useful for deserializing.
 			</description>
 		</method>
 		<method name="ease">
@@ -229,121 +196,114 @@
 			<argument index="1" name="curve" type="float">
 			</argument>
 			<description>
-			Easing function, based on exponent. 0 is constant, 1 is linear, 0 to 1 is ease-in, 1+ is ease out. Negative values are in-out/out in.
+				Easing function, based on exponent. 0 is constant, 1 is linear, 0 to 1 is ease-in, 1+ is ease out. Negative values are in-out/out in.
 			</description>
 		</method>
-		<method name="decimals">
+		<method name="exp">
 			<return type="float">
 			</return>
-			<argument index="0" name="step" type="float">
+			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-			Return the amount of decimals in the floating point value.
+				Exponential logarithm.
 			</description>
 		</method>
-		<method name="stepify">
+		<method name="floor">
 			<return type="float">
 			</return>
 			<argument index="0" name="s" type="float">
 			</argument>
-			<argument index="1" name="step" type="float">
-			</argument>
 			<description>
-			Snap float value to a given step.
+				Floor (rounds down to nearest integer).
 			</description>
 		</method>
-		<method name="lerp">
+		<method name="fmod">
 			<return type="float">
 			</return>
-			<argument index="0" name="from" type="float">
-			</argument>
-			<argument index="1" name="to" type="float">
+			<argument index="0" name="x" type="float">
 			</argument>
-			<argument index="2" name="weight" type="float">
+			<argument index="1" name="y" type="float">
 			</argument>
 			<description>
-			Linear interpolates between two values by a normalized value.
+				Module (remainder of x/y).
 			</description>
 		</method>
-		<method name="dectime">
+		<method name="fposmod">
 			<return type="float">
 			</return>
-			<argument index="0" name="value" type="float">
-			</argument>
-			<argument index="1" name="amount" type="float">
+			<argument index="0" name="x" type="float">
 			</argument>
-			<argument index="2" name="step" type="float">
+			<argument index="1" name="y" type="float">
 			</argument>
 			<description>
-			Decreases time by a specified amount.
+				Module (remainder of x/y) that wraps equally in positive and negative.
 			</description>
 		</method>
-		<method name="randomize">
-			<return type="Nil">
+		<method name="funcref">
+			<return type="FuncRef">
 			</return>
+			<argument index="0" name="instance" type="Object">
+			</argument>
+			<argument index="1" name="funcname" type="String">
+			</argument>
 			<description>
-			Reset the seed of the random number generator with a new, different one.
+				Return a reference to the specified function.
 			</description>
 		</method>
-		<method name="randi">
+		<method name="hash">
 			<return type="int">
 			</return>
+			<argument index="0" name="var:Variant" type="Variant">
+			</argument>
 			<description>
-			Random 32 bits value (integer). To obtain a value	from 0 to N, you can use remainder, like (for random from 0 to 19): randi() % 20.
-			</description>
-		</method>
-		<method name="randf">
-			<return type="float">
-			</return>
-			<description>
-			Random value (0 to 1 float).
+				Hash the variable passed and return an integer.
 			</description>
 		</method>
-		<method name="rand_range">
-			<return type="float">
+		<method name="inst2dict">
+			<return type="Dictionary">
 			</return>
-			<argument index="0" name="from" type="float">
-			</argument>
-			<argument index="1" name="to" type="float">
+			<argument index="0" name="inst" type="Object">
 			</argument>
 			<description>
-			Random range, any floating point value between 'from' and 'to'
+				Convert a script class instance to a dictionary (useful for serializing).
 			</description>
 		</method>
-		<method name="seed">
-			<return type="Nil">
+		<method name="instance_from_id">
+			<return type="Object">
 			</return>
-			<argument index="0" name="seed" type="int">
+			<argument index="0" name="instance_id" type="int">
 			</argument>
 			<description>
-			Set seed for the random number generator.
+				Get an object by its ID.
 			</description>
 		</method>
-		<method name="rand_seed">
-			<return type="Array">
+		<method name="is_inf">
+			<return type="float">
 			</return>
-			<argument index="0" name="seed" type="int">
+			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-			Random from seed, pass a seed and an array with both number and new seed is returned.
 			</description>
 		</method>
-		<method name="deg2rad">
+		<method name="is_nan">
 			<return type="float">
 			</return>
-			<argument index="0" name="deg" type="float">
+			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-			Convert from degrees to radians.
 			</description>
 		</method>
-		<method name="rad2deg">
+		<method name="lerp">
 			<return type="float">
 			</return>
-			<argument index="0" name="rad" type="float">
+			<argument index="0" name="from" type="float">
+			</argument>
+			<argument index="1" name="to" type="float">
+			</argument>
+			<argument index="2" name="weight" type="float">
 			</argument>
 			<description>
-			Convert from radians to degrees.
+				Linear interpolates between two values by a normalized value.
 			</description>
 		</method>
 		<method name="linear2db">
@@ -352,30 +312,28 @@
 			<argument index="0" name="nrg" type="float">
 			</argument>
 			<description>
-			Convert from linear energy to decibels (audio).
+				Convert from linear energy to decibels (audio).
 			</description>
 		</method>
-		<method name="db2linear">
-			<return type="float">
+		<method name="load">
+			<return type="Resource">
 			</return>
-			<argument index="0" name="db" type="float">
+			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
-			Convert from decibels to linear energy (audio).
+				Load a resource from the filesystem, pass a valid path as argument.
 			</description>
 		</method>
-		<method name="max">
+		<method name="log">
 			<return type="float">
 			</return>
-			<argument index="0" name="a" type="float">
-			</argument>
-			<argument index="1" name="b" type="float">
+			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-			Return the maximum of two values.
+				Natural logarithm.
 			</description>
 		</method>
-		<method name="min">
+		<method name="max">
 			<return type="float">
 			</return>
 			<argument index="0" name="a" type="float">
@@ -383,20 +341,18 @@
 			<argument index="1" name="b" type="float">
 			</argument>
 			<description>
-			Return the minimum of two values.
+				Return the maximum of two values.
 			</description>
 		</method>
-		<method name="clamp">
+		<method name="min">
 			<return type="float">
 			</return>
-			<argument index="0" name="val" type="float">
-			</argument>
-			<argument index="1" name="min" type="float">
+			<argument index="0" name="a" type="float">
 			</argument>
-			<argument index="2" name="max" type="float">
+			<argument index="1" name="b" type="float">
 			</argument>
 			<description>
-			Clamp both values to a range.
+				Return the minimum of two values.
 			</description>
 		</method>
 		<method name="nearest_po2">
@@ -405,61 +361,59 @@
 			<argument index="0" name="val" type="int">
 			</argument>
 			<description>
-			Return the nearest larger power of 2 for an integer.
+				Return the nearest larger power of 2 for an integer.
 			</description>
 		</method>
-		<method name="weakref">
-			<return type="WeakRef">
+		<method name="pow">
+			<return type="float">
 			</return>
-			<argument index="0" name="obj" type="Object">
+			<argument index="0" name="x" type="float">
+			</argument>
+			<argument index="1" name="y" type="float">
 			</argument>
 			<description>
-			Return a weak reference to an object.
+				Power function, x elevate to y.
 			</description>
 		</method>
-		<method name="funcref">
-			<return type="FuncRef">
+		<method name="preload">
+			<return type="Resource">
 			</return>
-			<argument index="0" name="instance" type="Object">
-			</argument>
-			<argument index="1" name="funcname" type="String">
+			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
-			Return a reference to the specified function.
+				Preload a resource from the filesystem. The resource is loaded during script parsing.
 			</description>
 		</method>
-		<method name="convert">
-			<return type="Object">
+		<method name="print">
+			<return type="Nil">
 			</return>
 			<argument index="0" name="what" type="Variant">
 			</argument>
-			<argument index="1" name="type" type="int">
+			<argument index="1" name="..." type="Variant">
 			</argument>
 			<description>
-			Convert from a type to another in the best way possible. The "type" parameter uses the enum TYPE_* in [@Global Scope].
+				Print one or more arguments to strings in the best way possible to a console line.
 			</description>
 		</method>
-		<method name="typeof">
-			<return type="int">
+		<method name="print_stack">
+			<return type="Nil">
 			</return>
-			<argument index="0" name="what" type="Variant">
-			</argument>
 			<description>
-			Return the internal type of the given Variant object, using the TYPE_* enum in [@Global Scope].
+				Print a stack track at code location, only works when running with debugger turned on.
 			</description>
 		</method>
-		<method name="str">
-			<return type="String">
+		<method name="printerr">
+			<return type="Nil">
 			</return>
 			<argument index="0" name="what" type="Variant">
 			</argument>
 			<argument index="1" name="..." type="Variant">
 			</argument>
 			<description>
-			Convert one or more arguments to strings in the best way possible.
+				Print one or more arguments to strings in the best way possible to standard error line.
 			</description>
 		</method>
-		<method name="print">
+		<method name="printraw">
 			<return type="Nil">
 			</return>
 			<argument index="0" name="what" type="Variant">
@@ -467,10 +421,10 @@
 			<argument index="1" name="..." type="Variant">
 			</argument>
 			<description>
-			Print one or more arguments to strings in the best way possible to a console line.
+				Print one or more arguments to strings in the best way possible to console. No newline is added at the end.
 			</description>
 		</method>
-		<method name="printt">
+		<method name="prints">
 			<return type="Nil">
 			</return>
 			<argument index="0" name="what" type="Variant">
@@ -478,10 +432,10 @@
 			<argument index="1" name="..." type="Variant">
 			</argument>
 			<description>
-			Print one or more arguments to the console with a tab between each argument.
+				Print one or more arguments to the console with a space between each argument.
 			</description>
 		</method>
-		<method name="prints">
+		<method name="printt">
 			<return type="Nil">
 			</return>
 			<argument index="0" name="what" type="Variant">
@@ -489,65 +443,57 @@
 			<argument index="1" name="..." type="Variant">
 			</argument>
 			<description>
-			Print one or more arguments to the console with a space between each argument.
+				Print one or more arguments to the console with a tab between each argument.
 			</description>
 		</method>
-		<method name="printerr">
-			<return type="Nil">
+		<method name="rad2deg">
+			<return type="float">
 			</return>
-			<argument index="0" name="what" type="Variant">
-			</argument>
-			<argument index="1" name="..." type="Variant">
+			<argument index="0" name="rad" type="float">
 			</argument>
 			<description>
-			Print one or more arguments to strings in the best way possible to standard error line.
+				Convert from radians to degrees.
 			</description>
 		</method>
-		<method name="printraw">
-			<return type="Nil">
+		<method name="rand_range">
+			<return type="float">
 			</return>
-			<argument index="0" name="what" type="Variant">
+			<argument index="0" name="from" type="float">
 			</argument>
-			<argument index="1" name="..." type="Variant">
+			<argument index="1" name="to" type="float">
 			</argument>
 			<description>
-			Print one or more arguments to strings in the best way possible to console. No newline is added at the end.
+				Random range, any floating point value between 'from' and 'to'
 			</description>
 		</method>
-		<method name="var2str">
-			<return type="String">
+		<method name="rand_seed">
+			<return type="Array">
 			</return>
-			<argument index="0" name="var" type="Variant">
+			<argument index="0" name="seed" type="int">
 			</argument>
 			<description>
-			Convert a value to a formatted string that can later be parsed using [method str2var].
+				Random from seed, pass a seed and an array with both number and new seed is returned.
 			</description>
 		</method>
-		<method name="str2var">
-			<return type="Variant">
+		<method name="randf">
+			<return type="float">
 			</return>
-			<argument index="0" name="string" type="String">
-			</argument>
 			<description>
-			Convert a formatted string that was returned by [method var2str] to the original value.
+				Random value (0 to 1 float).
 			</description>
 		</method>
-		<method name="var2bytes">
-			<return type="RawArray">
+		<method name="randi">
+			<return type="int">
 			</return>
-			<argument index="0" name="var" type="Variant">
-			</argument>
 			<description>
-			Encode a variable value to a byte array.
+				Random 32 bits value (integer). To obtain a value	from 0 to N, you can use remainder, like (for random from 0 to 19): randi() % 20.
 			</description>
 		</method>
-		<method name="bytes2var">
-			<return type="Variant">
+		<method name="randomize">
+			<return type="Nil">
 			</return>
-			<argument index="0" name="bytes" type="RawArray">
-			</argument>
 			<description>
-			Decode a byte array back to a value.
+				Reset the seed of the random number generator with a new, different one.
 			</description>
 		</method>
 		<method name="range">
@@ -556,105 +502,166 @@
 			<argument index="0" name="..." type="Variant">
 			</argument>
 			<description>
-			Return an array with the given range. Range can be 1 argument N (0 to N-1), two arguments (initial, final-1) or three arguments (initial, final-1, increment).
+				Return an array with the given range. Range can be 1 argument N (0 to N-1), two arguments (initial, final-1) or three arguments (initial, final-1, increment).
 			</description>
 		</method>
-		<method name="load">
-			<return type="Resource">
+		<method name="round">
+			<return type="float">
 			</return>
-			<argument index="0" name="path" type="String">
+			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-			Load a resource from the filesystem, pass a valid path as argument.
+				Round to nearest integer.
 			</description>
 		</method>
-		<method name="inst2dict">
-			<return type="Dictionary">
+		<method name="seed">
+			<return type="Nil">
 			</return>
-			<argument index="0" name="inst" type="Object">
+			<argument index="0" name="seed" type="int">
 			</argument>
 			<description>
-			Convert a script class instance to a dictionary (useful for serializing).
+				Set seed for the random number generator.
 			</description>
 		</method>
-		<method name="dict2inst">
-			<return type="Object">
+		<method name="sign">
+			<return type="float">
 			</return>
-			<argument index="0" name="dict" type="Dictionary">
+			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-			Convert a previously converted instances to dictionary back into an instance. Useful for deserializing.
+				Return sign (-1 or +1).
 			</description>
 		</method>
-		<method name="hash">
-			<return type="int">
+		<method name="sin">
+			<return type="float">
 			</return>
-			<argument index="0" name="var:Variant" type="Variant">
+			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-			Hash the variable passed and return an integer.
+				Standard sine function.
 			</description>
 		</method>
-		<method name="Color8">
-			<return type="Color">
+		<method name="sinh">
+			<return type="float">
 			</return>
-			<argument index="0" name="r8" type="int">
+			<argument index="0" name="s" type="float">
 			</argument>
-			<argument index="1" name="g8" type="int">
+			<description>
+				Hyperbolic sine.
+			</description>
+		</method>
+		<method name="sqrt">
+			<return type="float">
+			</return>
+			<argument index="0" name="s" type="float">
 			</argument>
-			<argument index="2" name="b8" type="int">
+			<description>
+				Square root.
+			</description>
+		</method>
+		<method name="stepify">
+			<return type="float">
+			</return>
+			<argument index="0" name="s" type="float">
 			</argument>
-			<argument index="3" name="a8" type="int">
+			<argument index="1" name="step" type="float">
 			</argument>
 			<description>
-			Make a color from red, green, blue and alpha. Arguments can range from 0 to 255.
+				Snap float value to a given step.
 			</description>
 		</method>
-		<method name="print_stack">
-			<return type="Nil">
+		<method name="str">
+			<return type="String">
 			</return>
+			<argument index="0" name="what" type="Variant">
+			</argument>
+			<argument index="1" name="..." type="Variant">
+			</argument>
 			<description>
-			Print a stack track at code location, only works when running with debugger turned on.
+				Convert one or more arguments to strings in the best way possible.
 			</description>
 		</method>
-		<method name="instance_from_id">
-			<return type="Object">
+		<method name="str2var">
+			<return type="Variant">
 			</return>
-			<argument index="0" name="instance_id" type="int">
+			<argument index="0" name="string" type="String">
 			</argument>
 			<description>
-			Get an object by its ID.
+				Convert a formatted string that was returned by [method var2str] to the original value.
 			</description>
 		</method>
-		<method name="preload">
-			<return type="Resource">
+		<method name="tan">
+			<return type="float">
 			</return>
-			<argument index="0" name="path" type="String">
+			<argument index="0" name="s" type="float">
 			</argument>
 			<description>
-			Preload a resource from the filesystem. The resource is loaded during script parsing.
+				Standard tangent function.
 			</description>
 		</method>
-		<method name="yield">
-			<return type="Nil">
+		<method name="tanh">
+			<return type="float">
 			</return>
-			<argument index="0" name="object" type="Object">
+			<argument index="0" name="s" type="float">
 			</argument>
-			<argument index="1" name="signal" type="String">
+			<description>
+				Hyperbolic tangent.
+			</description>
+		</method>
+		<method name="type_exists">
+			<return type="bool">
+			</return>
+			<argument index="0" name="type" type="String">
 			</argument>
 			<description>
-			Stop the function execution and return the current state. Call resume on the state to resume execution. This makes the state invalid.
-			Returns anything that was passed to the resume function call.
-			If passed an object and a signal, the execution is resumed when the object's signal is emmited.
 			</description>
 		</method>
-		<method name="assert">
+		<method name="typeof">
+			<return type="int">
+			</return>
+			<argument index="0" name="what" type="Variant">
+			</argument>
+			<description>
+				Return the internal type of the given Variant object, using the TYPE_* enum in [@Global Scope].
+			</description>
+		</method>
+		<method name="var2bytes">
+			<return type="RawArray">
+			</return>
+			<argument index="0" name="var" type="Variant">
+			</argument>
+			<description>
+				Encode a variable value to a byte array.
+			</description>
+		</method>
+		<method name="var2str">
+			<return type="String">
+			</return>
+			<argument index="0" name="var" type="Variant">
+			</argument>
+			<description>
+				Convert a value to a formatted string that can later be parsed using [method str2var].
+			</description>
+		</method>
+		<method name="weakref">
+			<return type="WeakRef">
+			</return>
+			<argument index="0" name="obj" type="Object">
+			</argument>
+			<description>
+				Return a weak reference to an object.
+			</description>
+		</method>
+		<method name="yield">
 			<return type="Nil">
 			</return>
-			<argument index="0" name="condition" type="bool">
+			<argument index="0" name="object" type="Object">
+			</argument>
+			<argument index="1" name="signal" type="String">
 			</argument>
 			<description>
-			Assert that the condition is true. If the condition is false, generates an error.
+				Stop the function execution and return the current state. Call resume on the state to resume execution. This makes the state invalid.
+				Returns anything that was passed to the resume function call. If passed an object and a signal, the execution is resumed when the object's signal is emmited.
 			</description>
 		</method>
 	</methods>
@@ -666,47 +673,29 @@
 </class>
 <class name="@Global Scope" category="Core">
 	<brief_description>
-	Global scope constants and variables.
+		Global scope constants and variables.
 	</brief_description>
 	<description>
-	Global scope constants and variables. This is all that resides in the globals, constants regarding error codes, scancodes, property hints, etc. It's not much.
-	Singletons are also documented here, since they can be accessed from anywhere.
+		Global scope constants and variables. This is all that resides in the globals, constants regarding error codes, scancodes, property hints, etc. It's not much.
+		Singletons are also documented here, since they can be accessed from anywhere.
 	</description>
 	<methods>
 	</methods>
 	<members>
-		<member name="Performance" type="Performance">
-			[Performance] singleton
-		</member>
-		<member name="Globals" type="Globals">
-			[Globals] singleton
+		<member name="AS" type="AudioServer">
+			[AudioServer] singleton
 		</member>
-		<member name="IP" type="IP">
-			[IP] singleton
+		<member name="AudioServer" type="AudioServer">
+			[AudioServer] singleton
 		</member>
 		<member name="Geometry" type="Geometry">
 			[Geometry] singleton
 		</member>
-		<member name="ResourceLoader" type="ResourceLoader">
-			[ResourceLoader] singleton
-		</member>
-		<member name="ResourceSaver" type="ResourceSaver">
-			[ResourceSaver] singleton
-		</member>
-		<member name="PathRemap" type="PathRemap">
-			[PathRemap] singleton
-		</member>
-		<member name="OS" type="OS">
-			[OS] singleton
-		</member>
-		<member name="Marshalls" type="Reference">
-			[Marshalls] singleton
-		</member>
-		<member name="TranslationServer" type="TranslationServer">
-			[TranslationServer] singleton
+		<member name="Globals" type="Globals">
+			[Globals] singleton
 		</member>
-		<member name="TS" type="TranslationServer">
-			[TranslationServer] singleton
+		<member name="IP" type="IP">
+			[IP] singleton
 		</member>
 		<member name="Input" type="Input">
 			[Input] singleton
@@ -714,42 +703,60 @@
 		<member name="InputMap" type="InputMap">
 			[InputMap] singleton
 		</member>
-		<member name="VisualServer" type="VisualServer">
-			[VisualServer] singleton
+		<member name="Marshalls" type="Reference">
+			[Marshalls] singleton
 		</member>
-		<member name="VS" type="VisualServer">
-			[VisualServer] singleton
+		<member name="OS" type="OS">
+			[OS] singleton
 		</member>
-		<member name="AudioServer" type="AudioServer">
-			[AudioServer] singleton
+		<member name="PS" type="PhysicsServer">
+			[PhysicsServer] singleton
 		</member>
-		<member name="AS" type="AudioServer">
-			[AudioServer] singleton
+		<member name="PS2D" type="Physics2DServer">
+			[Physics2DServer] singleton
 		</member>
-		<member name="PhysicsServer" type="PhysicsServer">
-			[PhysicsServer] singleton
+		<member name="PathRemap" type="PathRemap">
+			[PathRemap] singleton
 		</member>
-		<member name="PS" type="PhysicsServer">
-			[PhysicsServer] singleton
+		<member name="Performance" type="Performance">
+			[Performance] singleton
 		</member>
 		<member name="Physics2DServer" type="Physics2DServer">
 			[Physics2DServer] singleton
 		</member>
-		<member name="PS2D" type="Physics2DServer">
-			[Physics2DServer] singleton
+		<member name="PhysicsServer" type="PhysicsServer">
+			[PhysicsServer] singleton
 		</member>
-		<member name="SpatialSoundServer" type="SpatialSoundServer">
-			[SpatialSoundServer] singleton
+		<member name="ResourceLoader" type="ResourceLoader">
+			[ResourceLoader] singleton
+		</member>
+		<member name="ResourceSaver" type="ResourceSaver">
+			[ResourceSaver] singleton
 		</member>
 		<member name="SS" type="SpatialSoundServer">
 			[SpatialSoundServer] singleton
 		</member>
-		<member name="SpatialSound2DServer" type="SpatialSound2DServer">
+		<member name="SS2D" type="SpatialSound2DServer">
 			[SpatialSound2DServer] singleton
 		</member>
-		<member name="SS2D" type="SpatialSound2DServer">
+		<member name="SpatialSound2DServer" type="SpatialSound2DServer">
 			[SpatialSound2DServer] singleton
 		</member>
+		<member name="SpatialSoundServer" type="SpatialSoundServer">
+			[SpatialSoundServer] singleton
+		</member>
+		<member name="TS" type="TranslationServer">
+			[TranslationServer] singleton
+		</member>
+		<member name="TranslationServer" type="TranslationServer">
+			[TranslationServer] singleton
+		</member>
+		<member name="VS" type="VisualServer">
+			[VisualServer] singleton
+		</member>
+		<member name="VisualServer" type="VisualServer">
+			[VisualServer] singleton
+		</member>
 	</members>
 	<constants>
 		<constant name="MARGIN_LEFT" value="0">
@@ -1940,19 +1947,30 @@
 </class>
 <class name="AABB" category="Built-In Types">
 	<brief_description>
-	Axis-Aligned Bounding Box.
+		Axis-Aligned Bounding Box.
 	</brief_description>
 	<description>
-	AABB provides an 3D Axis-Aligned Bounding Box. It consists of a position, a size, and several utility functions. It is typically used for simple (fast) overlap tests.
+		AABB provides an 3D Axis-Aligned Bounding Box. It consists of a position, a size, and several utility functions. It is typically used for simple (fast) overlap tests.
 	</description>
 	<methods>
+		<method name="AABB">
+			<return type="AABB">
+			</return>
+			<argument index="0" name="pos" type="Vector3">
+			</argument>
+			<argument index="1" name="size" type="Vector3">
+			</argument>
+			<description>
+				Optional constructor, accepts position and size.
+			</description>
+		</method>
 		<method name="encloses">
 			<return type="bool">
 			</return>
 			<argument index="0" name="with" type="AABB">
 			</argument>
 			<description>
-			Return true if this [AABB] completely encloses another one.
+				Return true if this [AABB] completely encloses another one.
 			</description>
 		</method>
 		<method name="expand">
@@ -1961,14 +1979,14 @@
 			<argument index="0" name="to_point" type="Vector3">
 			</argument>
 			<description>
-			Return this [AABB] expanded to include a given point.
+				Return this [AABB] expanded to include a given point.
 			</description>
 		</method>
 		<method name="get_area">
 			<return type="float">
 			</return>
 			<description>
-			Get the area of the [AABB].
+				Get the area of the [AABB].
 			</description>
 		</method>
 		<method name="get_endpoint">
@@ -1977,49 +1995,49 @@
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Get the position of the 8 endpoints of the [AABB] in space.
+				Get the position of the 8 endpoints of the [AABB] in space.
 			</description>
 		</method>
 		<method name="get_longest_axis">
 			<return type="Vector3">
 			</return>
 			<description>
-			Return the normalized longest axis of the [AABB].
+				Return the normalized longest axis of the [AABB].
 			</description>
 		</method>
 		<method name="get_longest_axis_index">
 			<return type="int">
 			</return>
 			<description>
-			Return the index of the longest axis of the [AABB] (according to [Vector3]::AXIS* enum).
+				Return the index of the longest axis of the [AABB] (according to [Vector3]::AXIS* enum).
 			</description>
 		</method>
 		<method name="get_longest_axis_size">
 			<return type="float">
 			</return>
 			<description>
-			Return the scalar length of the longest axis of the [AABB].
+				Return the scalar length of the longest axis of the [AABB].
 			</description>
 		</method>
 		<method name="get_shortest_axis">
 			<return type="Vector3">
 			</return>
 			<description>
-			Return the normalized shortest axis of the [AABB].
+				Return the normalized shortest axis of the [AABB].
 			</description>
 		</method>
 		<method name="get_shortest_axis_index">
 			<return type="int">
 			</return>
 			<description>
-			Return the index of the shortest axis of the [AABB] (according to [Vector3]::AXIS* enum).
+				Return the index of the shortest axis of the [AABB] (according to [Vector3]::AXIS* enum).
 			</description>
 		</method>
 		<method name="get_shortest_axis_size">
 			<return type="float">
 			</return>
 			<description>
-			Return the scalar length of the shortest axis of the [AABB].
+				Return the scalar length of the shortest axis of the [AABB].
 			</description>
 		</method>
 		<method name="get_support">
@@ -2028,7 +2046,7 @@
 			<argument index="0" name="dir" type="Vector3">
 			</argument>
 			<description>
-			Return the support point in a given direction. This is useful for collision detection algorithms.
+				Return the support point in a given direction. This is useful for collision detection algorithms.
 			</description>
 		</method>
 		<method name="grow">
@@ -2037,21 +2055,21 @@
 			<argument index="0" name="by" type="float">
 			</argument>
 			<description>
-			Return a copy of the [AABB] grown a given amount of units towards all the sides.
+				Return a copy of the [AABB] grown a given amount of units towards all the sides.
 			</description>
 		</method>
 		<method name="has_no_area">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if the [AABB] is flat or empty.
+				Return true if the [AABB] is flat or empty.
 			</description>
 		</method>
 		<method name="has_no_surface">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if the [AABB] is empty.
+				Return true if the [AABB] is empty.
 			</description>
 		</method>
 		<method name="has_point">
@@ -2060,7 +2078,7 @@
 			<argument index="0" name="point" type="Vector3">
 			</argument>
 			<description>
-			Return true if the [AABB] contains a point.
+				Return true if the [AABB] contains a point.
 			</description>
 		</method>
 		<method name="intersection">
@@ -2069,7 +2087,7 @@
 			<argument index="0" name="with" type="AABB">
 			</argument>
 			<description>
-			Return the intersection between two [AABB]. An empty AABB (size 0,0,0) is returned on failure.
+				Return the intersection between two [AABB]. An empty AABB (size 0,0,0) is returned on failure.
 			</description>
 		</method>
 		<method name="intersects">
@@ -2078,7 +2096,7 @@
 			<argument index="0" name="with" type="AABB">
 			</argument>
 			<description>
-			Return true if the [AABB] overlaps with another.
+				Return true if the [AABB] overlaps with another.
 			</description>
 		</method>
 		<method name="intersects_plane">
@@ -2087,7 +2105,7 @@
 			<argument index="0" name="plane" type="Plane">
 			</argument>
 			<description>
-			Return true if the [AABB] is at both sides of a plane.
+				Return true if the [AABB] is at both sides of a plane.
 			</description>
 		</method>
 		<method name="intersects_segment">
@@ -2098,7 +2116,7 @@
 			<argument index="1" name="to" type="Vector3">
 			</argument>
 			<description>
-			Return true if the [AABB] intersects the line segment between from and to
+				Return true if the [AABB] intersects the line segment between from and to
 			</description>
 		</method>
 		<method name="merge">
@@ -2107,92 +2125,81 @@
 			<argument index="0" name="with" type="AABB">
 			</argument>
 			<description>
-			Combine this [AABB] with another, a larger one is returned that contains both.
-			</description>
-		</method>
-		<method name="AABB">
-			<return type="AABB">
-			</return>
-			<argument index="0" name="pos" type="Vector3">
-			</argument>
-			<argument index="1" name="size" type="Vector3">
-			</argument>
-			<description>
-			Optional constructor, accepts position and size.
+				Combine this [AABB] with another, a larger one is returned that contains both.
 			</description>
 		</method>
 	</methods>
 	<members>
+		<member name="end" type="Vector3">
+			Ending corner.
+		</member>
 		<member name="pos" type="Vector3">
 			Position (starting corner).
 		</member>
 		<member name="size" type="Vector3">
 			Size from position to end.
 		</member>
-		<member name="end" type="Vector3">
-			Ending corner.
-		</member>
 	</members>
 	<constants>
 	</constants>
 </class>
 <class name="AcceptDialog" inherits="WindowDialog" category="Core">
 	<brief_description>
-	Base dialog for user notification.
+		Base dialog for user notification.
 	</brief_description>
 	<description>
-	This dialog is useful for small notifications to the user about an event. It can only be accepted or closed, with the same result.
+		This dialog is useful for small notifications to the user about an event. It can only be accepted or closed, with the same result.
 	</description>
 	<methods>
-		<method name="get_ok">
-			<return type="Object">
+		<method name="add_button">
+			<return type="Button">
 			</return>
+			<argument index="0" name="text" type="String">
+			</argument>
+			<argument index="1" name="right" type="bool" default="false">
+			</argument>
+			<argument index="2" name="action" type="String" default="&quot;&quot;">
+			</argument>
 			<description>
-			Return the OK Button.
+				Add custom button to the dialog and return the created button.
+				The button titled with [i]text[/i] and the [i]action[/i] will be passed to [custom_action] signal when it is pressed.
 			</description>
 		</method>
-		<method name="get_label">
-			<return type="Object">
+		<method name="add_cancel">
+			<return type="Button">
 			</return>
-			<description>
-			Return the label used for built-in text.
-			</description>
-		</method>
-		<method name="set_hide_on_ok">
-			<argument index="0" name="enabled" type="bool">
+			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			Set whether the dialog is hidden when accepted (default true).
+				Add custom cancel button to the dialog and return the created button.
 			</description>
 		</method>
 		<method name="get_hide_on_ok" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if the dialog will be hidden when accepted (default true).
+				Return true if the dialog will be hidden when accepted (default true).
 			</description>
 		</method>
-		<method name="add_button">
-			<return type="Button">
+		<method name="get_label">
+			<return type="Object">
 			</return>
-			<argument index="0" name="text" type="String">
-			</argument>
-			<argument index="1" name="right" type="bool" default="false">
-			</argument>
-			<argument index="2" name="action" type="String" default="&quot;&quot;">
-			</argument>
 			<description>
-			Add custom button to the dialog and return the created button.
-			The button titled with [i]text[/i] and the [i]action[/i] will be passed to [custom_action] signal when it is pressed.
+				Return the label used for built-in text.
 			</description>
 		</method>
-		<method name="add_cancel">
-			<return type="Button">
+		<method name="get_ok">
+			<return type="Object">
 			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
 			<description>
-			Add custom cancel button to the dialog and return the created button.
+				Return the OK Button.
+			</description>
+		</method>
+		<method name="get_text" qualifiers="const">
+			<return type="String">
+			</return>
+			<description>
+				Return the built-in label text.
 			</description>
 		</method>
 		<method name="register_text_enter">
@@ -2201,35 +2208,35 @@
 			<argument index="0" name="line_edit" type="Object">
 			</argument>
 			<description>
-			Register a [LineEdit] in the dialog. When the enter key is pressed, the dialog will be accepted.
+				Register a [LineEdit] in the dialog. When the enter key is pressed, the dialog will be accepted.
 			</description>
 		</method>
-		<method name="set_text">
-			<argument index="0" name="text" type="String">
+		<method name="set_hide_on_ok">
+			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
-			Set the built-in label text.
+				Set whether the dialog is hidden when accepted (default true).
 			</description>
 		</method>
-		<method name="get_text" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="set_text">
+			<argument index="0" name="text" type="String">
+			</argument>
 			<description>
-			Return the built-in label text.
+				Set the built-in label text.
 			</description>
 		</method>
 	</methods>
 	<signals>
 		<signal name="confirmed">
 			<description>
-			Emitted when accepted.
+				Emitted when accepted.
 			</description>
 		</signal>
 		<signal name="custom_action">
 			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
-			Emitted with a custom button is added.
+				Emitted with a custom button is added.
 			</description>
 		</signal>
 	</signals>
@@ -2238,143 +2245,143 @@
 </class>
 <class name="AnimatedSprite" inherits="Node2D" category="Core">
 	<brief_description>
-	Sprite node that can use multiple textures for animation.
+		Sprite node that can use multiple textures for animation.
 	</brief_description>
 	<description>
-	Sprite node that can use multiple textures for animation.
+		Sprite node that can use multiple textures for animation.
 	</description>
 	<methods>
-		<method name="set_sprite_frames">
-			<argument index="0" name="sprite_frames" type="SpriteFrames">
-			</argument>
+		<method name="get_animation" qualifiers="const">
+			<return type="String">
+			</return>
 			<description>
-			Set the [SpriteFrames] resource, which contains all frames.
 			</description>
 		</method>
-		<method name="get_sprite_frames" qualifiers="const">
-			<return type="SpriteFrames">
+		<method name="get_frame" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Get the [SpriteFrames] resource, which contains all frames.
+				Return the visible frame index.
 			</description>
 		</method>
-		<method name="set_animation">
-			<argument index="0" name="animation" type="String">
-			</argument>
+		<method name="get_modulate" qualifiers="const">
+			<return type="Color">
+			</return>
 			<description>
+				Return the color modulation for this sprite.
 			</description>
 		</method>
-		<method name="get_animation" qualifiers="const">
-			<return type="String">
+		<method name="get_offset" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<description>
+				Return the offset of the sprite in the node origin.
 			</description>
 		</method>
-		<method name="play">
-			<argument index="0" name="anim" type="String" default="&quot;&quot;">
-			</argument>
+		<method name="get_sprite_frames" qualifiers="const">
+			<return type="SpriteFrames">
+			</return>
 			<description>
+				Get the [SpriteFrames] resource, which contains all frames.
 			</description>
 		</method>
-		<method name="stop">
+		<method name="is_centered" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
+				Return true when centered. See [method set_centered].
 			</description>
 		</method>
-		<method name="is_playing" qualifiers="const">
+		<method name="is_flipped_h" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
+				Return true if sprite is flipped horizontally.
 			</description>
 		</method>
-		<method name="set_centered">
-			<argument index="0" name="centered" type="bool">
-			</argument>
+		<method name="is_flipped_v" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			When turned on, offset at (0,0) is the center of the sprite, when off, the top-left corner is.
+				Return true if sprite is flipped vertically.
 			</description>
 		</method>
-		<method name="is_centered" qualifiers="const">
+		<method name="is_playing" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true when centered. See [method set_centered].
 			</description>
 		</method>
-		<method name="set_offset">
-			<argument index="0" name="offset" type="Vector2">
+		<method name="play">
+			<argument index="0" name="anim" type="String" default="&quot;&quot;">
 			</argument>
 			<description>
-			Set the offset of the sprite in the node origin. Position varies depending on whether it is centered or not.
 			</description>
 		</method>
-		<method name="get_offset" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_animation">
+			<argument index="0" name="animation" type="String">
+			</argument>
 			<description>
-			Return the offset of the sprite in the node origin.
 			</description>
 		</method>
-		<method name="set_flip_h">
-			<argument index="0" name="flip_h" type="bool">
+		<method name="set_centered">
+			<argument index="0" name="centered" type="bool">
 			</argument>
 			<description>
-			If true, sprite is flipped horizontally.
+				When turned on, offset at (0,0) is the center of the sprite, when off, the top-left corner is.
 			</description>
 		</method>
-		<method name="is_flipped_h" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_flip_h">
+			<argument index="0" name="flip_h" type="bool">
+			</argument>
 			<description>
-			Return true if sprite is flipped horizontally.
+				If true, sprite is flipped horizontally.
 			</description>
 		</method>
 		<method name="set_flip_v">
 			<argument index="0" name="flip_v" type="bool">
 			</argument>
 			<description>
-			If true, sprite is flipped vertically.
+				If true, sprite is flipped vertically.
 			</description>
 		</method>
-		<method name="is_flipped_v" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_frame">
+			<argument index="0" name="frame" type="int">
+			</argument>
 			<description>
-			Return true if sprite is flipped vertically.
+				Set the visible sprite frame index (from the list of frames inside the [SpriteFrames] resource).
 			</description>
 		</method>
-		<method name="set_frame">
-			<argument index="0" name="frame" type="int">
+		<method name="set_modulate">
+			<argument index="0" name="modulate" type="Color">
 			</argument>
 			<description>
-			Set the visible sprite frame index (from the list of frames inside the [SpriteFrames] resource).
+				Change the color modulation (multiplication) for this sprite.
 			</description>
 		</method>
-		<method name="get_frame" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_offset">
+			<argument index="0" name="offset" type="Vector2">
+			</argument>
 			<description>
-			Return the visible frame index.
+				Set the offset of the sprite in the node origin. Position varies depending on whether it is centered or not.
 			</description>
 		</method>
-		<method name="set_modulate">
-			<argument index="0" name="modulate" type="Color">
+		<method name="set_sprite_frames">
+			<argument index="0" name="sprite_frames" type="SpriteFrames">
 			</argument>
 			<description>
-			Change the color modulation (multiplication) for this sprite.
+				Set the [SpriteFrames] resource, which contains all frames.
 			</description>
 		</method>
-		<method name="get_modulate" qualifiers="const">
-			<return type="Color">
-			</return>
+		<method name="stop">
 			<description>
-			Return the color modulation for this sprite.
 			</description>
 		</method>
 	</methods>
 	<signals>
 		<signal name="frame_changed">
 			<description>
-			Emmited when frame is changed.
+				Emmited when frame is changed.
 			</description>
 		</signal>
 	</signals>
@@ -2387,26 +2394,26 @@
 	<description>
 	</description>
 	<methods>
-		<method name="set_sprite_frames">
-			<argument index="0" name="sprite_frames" type="SpriteFrames">
-			</argument>
+		<method name="get_animation" qualifiers="const">
+			<return type="String">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_sprite_frames" qualifiers="const">
-			<return type="SpriteFrames">
+		<method name="get_frame" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_animation">
-			<argument index="0" name="animation" type="String">
-			</argument>
+		<method name="get_sprite_frames" qualifiers="const">
+			<return type="SpriteFrames">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_animation" qualifiers="const">
-			<return type="String">
+		<method name="is_playing" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
@@ -2417,25 +2424,25 @@
 			<description>
 			</description>
 		</method>
-		<method name="stop">
+		<method name="set_animation">
+			<argument index="0" name="animation" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_playing" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_frame">
+			<argument index="0" name="frame" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_frame">
-			<argument index="0" name="frame" type="int">
+		<method name="set_sprite_frames">
+			<argument index="0" name="sprite_frames" type="SpriteFrames">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_frame" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="stop">
 			<description>
 			</description>
 		</method>
@@ -2451,11 +2458,11 @@
 </class>
 <class name="Animation" inherits="Resource" category="Core">
 	<brief_description>
-	Contains data used to animate everything in the engine.
+		Contains data used to animate everything in the engine.
 	</brief_description>
 	<description>
-	An Animation resource contains data used to animate everything in the engine. Animations are divided into tracks, and each track must be linked to a node. The state of that node can be changed through time, by adding timed keys (events) to the track.
-	Animations are just data containers, and must be added to odes such as an [AnimationPlayer] or [AnimationTreePlayer] to be played back.
+		An Animation resource contains data used to animate everything in the engine. Animations are divided into tracks, and each track must be linked to a node. The state of that node can be changed through time, by adding timed keys (events) to the track.
+		Animations are just data containers, and must be added to odes such as an [AnimationPlayer] or [AnimationTreePlayer] to be played back.
 	</description>
 	<methods>
 		<method name="add_track">
@@ -2466,151 +2473,131 @@
 			<argument index="1" name="at_pos" type="int" default="-1">
 			</argument>
 			<description>
-			Add a track to the Animation. The track type must be specified as any of the values in the TYPE_* enumeration.
+				Add a track to the Animation. The track type must be specified as any of the values in the TYPE_* enumeration.
 			</description>
 		</method>
-		<method name="remove_track">
-			<argument index="0" name="idx" type="int">
-			</argument>
+		<method name="clear">
 			<description>
-			Remove a track by specifying the track index.
+				Clear the animation (clear all tracks and reset all).
 			</description>
 		</method>
-		<method name="get_track_count" qualifiers="const">
+		<method name="find_track" qualifiers="const">
 			<return type="int">
 			</return>
+			<argument index="0" name="path" type="NodePath">
+			</argument>
 			<description>
-			Return the amount of tracks in the animation.
 			</description>
 		</method>
-		<method name="track_get_type" qualifiers="const">
-			<return type="int">
+		<method name="get_length" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
-			Get the type of a track.
+				Return the total length of the animation (in seconds).
 			</description>
 		</method>
-		<method name="track_get_path" qualifiers="const">
-			<return type="NodePath">
+		<method name="get_step" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
-			Get the path of a track. for more information on the path format, see [method track_set_path]
 			</description>
 		</method>
-		<method name="track_set_path">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="path" type="NodePath">
-			</argument>
+		<method name="get_track_count" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the path of a track. Paths must be valid scene-tree paths to a node, and must be specified starting from the parent node of the node that will reproduce the animation. Tracks that control properties or bones must append their name after the path, separated by ":". Example: "character/skeleton:ankle" or "character/mesh:transform/local"
+				Return the amount of tracks in the animation.
 			</description>
 		</method>
-		<method name="find_track" qualifiers="const">
-			<return type="int">
+		<method name="has_loop" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="path" type="NodePath">
-			</argument>
 			<description>
+				Return whether the animation has the loop flag set.
 			</description>
 		</method>
-		<method name="track_move_up">
+		<method name="method_track_get_key_indices" qualifiers="const">
+			<return type="IntArray">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
+			<argument index="1" name="time_sec" type="float">
+			</argument>
+			<argument index="2" name="delta" type="float">
+			</argument>
 			<description>
-			Move a track up.
+				Return all the key indices of a method track, given a position and delta time.
 			</description>
 		</method>
-		<method name="track_move_down">
+		<method name="method_track_get_name" qualifiers="const">
+			<return type="String">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
+			<argument index="1" name="key_idx" type="int">
+			</argument>
 			<description>
-			Move a track down.
+				Return the method name of a method track.
 			</description>
 		</method>
-		<method name="transform_track_insert_key">
-			<return type="int">
+		<method name="method_track_get_params" qualifiers="const">
+			<return type="Array">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="time" type="float">
-			</argument>
-			<argument index="2" name="loc" type="Vector3">
-			</argument>
-			<argument index="3" name="rot" type="Quat">
-			</argument>
-			<argument index="4" name="scale" type="Vector3">
+			<argument index="1" name="key_idx" type="int">
 			</argument>
 			<description>
-			Insert a transform key for a transform track.
+				Return the arguments values to be called on a method track for a given key in a given track.
 			</description>
 		</method>
-		<method name="track_insert_key">
+		<method name="remove_track">
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="time" type="float">
-			</argument>
-			<argument index="2" name="key" type="Variant">
-			</argument>
-			<argument index="3" name="transition" type="float" default="1">
-			</argument>
 			<description>
-			Insert a generic key in a given track.
+				Remove a track by specifying the track index.
 			</description>
 		</method>
-		<method name="track_remove_key">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="key_idx" type="int">
+		<method name="set_length">
+			<argument index="0" name="time_sec" type="float">
 			</argument>
 			<description>
-			Remove a key by index in a given track.
+				Set the total length of the animation (in seconds). Note that length is not delimited by the last key, as this one may be before or after the end to ensure correct interpolation and looping.
 			</description>
 		</method>
-		<method name="track_remove_key_at_pos">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="pos" type="float">
+		<method name="set_loop">
+			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
-			Remove a key by position (seconds) in a given track.
+				Set a flag indicating that the animation must loop. This is uses for correct interpolation of animation cycles, and for hinting the player that it must restart the animation.
 			</description>
 		</method>
-		<method name="track_set_key_value">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="key" type="int">
-			</argument>
-			<argument index="2" name="value" type="Variant">
+		<method name="set_step">
+			<argument index="0" name="size_sec" type="float">
 			</argument>
 			<description>
-			Set the value of an existing key.
 			</description>
 		</method>
-		<method name="track_set_key_transition">
+		<method name="track_find_key" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="key_idx" type="int">
+			<argument index="1" name="time" type="float">
 			</argument>
-			<argument index="2" name="transition" type="float">
+			<argument index="2" name="exact" type="bool" default="false">
 			</argument>
 			<description>
-			Set the transition curve (easing) for a specific key (see built-in math function "ease").
+				Find the key index by time in a given track. Optionally, only find it if the exact time is given.
 			</description>
 		</method>
-		<method name="track_get_key_transition" qualifiers="const">
-			<return type="float">
+		<method name="track_get_interpolation_type" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="key_idx" type="int">
-			</argument>
 			<description>
-			Return the transition curve (easing) for a specific key (see built-in math function "ease").
+				Return the interpolation type of a given track, from the INTERPOLATION_* enum.
 			</description>
 		</method>
 		<method name="track_get_key_count" qualifiers="const">
@@ -2619,19 +2606,21 @@
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Return the amount of keys in a given track.
+				Return the amount of keys in a given track.
 			</description>
 		</method>
-		<method name="track_get_key_value" qualifiers="const">
+		<method name="track_get_key_time" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<argument index="1" name="key_idx" type="int">
 			</argument>
 			<description>
-			Return the value of a given key in a given track.
+				Return the time at which the key is located.
 			</description>
 		</method>
-		<method name="track_get_key_time" qualifiers="const">
+		<method name="track_get_key_transition" qualifiers="const">
 			<return type="float">
 			</return>
 			<argument index="0" name="idx" type="int">
@@ -2639,160 +2628,192 @@
 			<argument index="1" name="key_idx" type="int">
 			</argument>
 			<description>
-			Return the time at which the key is located.
+				Return the transition curve (easing) for a specific key (see built-in math function "ease").
 			</description>
 		</method>
-		<method name="track_find_key" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="track_get_key_value" qualifiers="const">
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="time" type="float">
-			</argument>
-			<argument index="2" name="exact" type="bool" default="false">
+			<argument index="1" name="key_idx" type="int">
 			</argument>
 			<description>
-			Find the key index by time in a given track. Optionally, only find it if the exact time is given.
+				Return the value of a given key in a given track.
 			</description>
 		</method>
-		<method name="track_set_interpolation_type">
+		<method name="track_get_path" qualifiers="const">
+			<return type="NodePath">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="interpolation" type="int">
-			</argument>
 			<description>
-			Set the interpolation type of a given track, from the INTERPOLATION_* enum.
+				Get the path of a track. for more information on the path format, see [method track_set_path]
 			</description>
 		</method>
-		<method name="track_get_interpolation_type" qualifiers="const">
+		<method name="track_get_type" qualifiers="const">
 			<return type="int">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Return the interpolation type of a given track, from the INTERPOLATION_* enum.
+				Get the type of a track.
 			</description>
 		</method>
-		<method name="transform_track_interpolate" qualifiers="const">
-			<return type="Array">
-			</return>
+		<method name="track_insert_key">
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="time_sec" type="float">
+			<argument index="1" name="time" type="float">
+			</argument>
+			<argument index="2" name="key" type="Variant">
+			</argument>
+			<argument index="3" name="transition" type="float" default="1">
 			</argument>
 			<description>
-			Return the interpolated value of a transform track at a given time (in seconds). An array consisting of 3 elements: position ([Vector3]), rotation ([Quat]) and scale ([Vector3]).
+				Insert a generic key in a given track.
 			</description>
 		</method>
-		<method name="value_track_set_continuous">
+		<method name="track_is_imported" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="continuous" type="bool">
-			</argument>
 			<description>
-			Enable or disable interpolation for a whole track. By default tracks are interpolated.
 			</description>
 		</method>
-		<method name="value_track_is_continuous" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="track_move_down">
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Return whether interpolation is enabled or disabled for a whole track. By default tracks are interpolated.
+				Move a track down.
 			</description>
 		</method>
-		<method name="value_track_get_key_indices" qualifiers="const">
-			<return type="IntArray">
-			</return>
+		<method name="track_move_up">
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="time_sec" type="float">
+			<description>
+				Move a track up.
+			</description>
+		</method>
+		<method name="track_remove_key">
+			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="2" name="delta" type="float">
+			<argument index="1" name="key_idx" type="int">
 			</argument>
 			<description>
-			Return all the key indices of a value track, given a position and delta time.
+				Remove a key by index in a given track.
 			</description>
 		</method>
-		<method name="method_track_get_key_indices" qualifiers="const">
-			<return type="IntArray">
-			</return>
+		<method name="track_remove_key_at_pos">
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="time_sec" type="float">
+			<argument index="1" name="pos" type="float">
 			</argument>
-			<argument index="2" name="delta" type="float">
+			<description>
+				Remove a key by position (seconds) in a given track.
+			</description>
+		</method>
+		<method name="track_set_imported">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="imported" type="bool">
 			</argument>
 			<description>
-			Return all the key indices of a method track, given a position and delta time.
 			</description>
 		</method>
-		<method name="method_track_get_name" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="track_set_interpolation_type">
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="key_idx" type="int">
+			<argument index="1" name="interpolation" type="int">
 			</argument>
 			<description>
-			Return the method name of a method track.
+				Set the interpolation type of a given track, from the INTERPOLATION_* enum.
 			</description>
 		</method>
-		<method name="method_track_get_params" qualifiers="const">
-			<return type="Array">
-			</return>
+		<method name="track_set_key_transition">
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<argument index="1" name="key_idx" type="int">
 			</argument>
+			<argument index="2" name="transition" type="float">
+			</argument>
 			<description>
-			Return the arguments values to be called on a method track for a given key in a given track.
+				Set the transition curve (easing) for a specific key (see built-in math function "ease").
 			</description>
 		</method>
-		<method name="set_length">
-			<argument index="0" name="time_sec" type="float">
+		<method name="track_set_key_value">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="key" type="int">
+			</argument>
+			<argument index="2" name="value" type="Variant">
 			</argument>
 			<description>
-			Set the total length of the animation (in seconds). Note that length is not delimited by the last key, as this one may be before or after the end to ensure correct interpolation and looping.
+				Set the value of an existing key.
 			</description>
 		</method>
-		<method name="get_length" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="track_set_path">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="path" type="NodePath">
+			</argument>
 			<description>
-			Return the total length of the animation (in seconds).
+				Set the path of a track. Paths must be valid scene-tree paths to a node, and must be specified starting from the parent node of the node that will reproduce the animation. Tracks that control properties or bones must append their name after the path, separated by ":". Example: "character/skeleton:ankle" or "character/mesh:transform/local"
 			</description>
 		</method>
-		<method name="set_loop">
-			<argument index="0" name="enabled" type="bool">
+		<method name="transform_track_insert_key">
+			<return type="int">
+			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="time" type="float">
+			</argument>
+			<argument index="2" name="loc" type="Vector3">
+			</argument>
+			<argument index="3" name="rot" type="Quat">
+			</argument>
+			<argument index="4" name="scale" type="Vector3">
 			</argument>
 			<description>
-			Set a flag indicating that the animation must loop. This is uses for correct interpolation of animation cycles, and for hinting the player that it must restart the animation.
+				Insert a transform key for a transform track.
 			</description>
 		</method>
-		<method name="has_loop" qualifiers="const">
-			<return type="bool">
+		<method name="transform_track_interpolate" qualifiers="const">
+			<return type="Array">
 			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="time_sec" type="float">
+			</argument>
 			<description>
-			Return whether the animation has the loop flag set.
+				Return the interpolated value of a transform track at a given time (in seconds). An array consisting of 3 elements: position ([Vector3]), rotation ([Quat]) and scale ([Vector3]).
 			</description>
 		</method>
-		<method name="set_step">
-			<argument index="0" name="size_sec" type="float">
+		<method name="value_track_get_key_indices" qualifiers="const">
+			<return type="IntArray">
+			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="time_sec" type="float">
+			</argument>
+			<argument index="2" name="delta" type="float">
 			</argument>
 			<description>
+				Return all the key indices of a value track, given a position and delta time.
 			</description>
 		</method>
-		<method name="get_step" qualifiers="const">
-			<return type="float">
+		<method name="value_track_get_update_mode" qualifiers="const">
+			<return type="int">
 			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="clear">
+		<method name="value_track_set_update_mode">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="mode" type="int">
+			</argument>
 			<description>
-			Clear the animation (clear all tracks and reset all).
 			</description>
 		</method>
 	</methods>
@@ -2815,14 +2836,20 @@
 		<constant name="INTERPOLATION_CUBIC" value="2">
 			Cubic interpolation.
 		</constant>
+		<constant name="UPDATE_CONTINUOUS" value="0">
+		</constant>
+		<constant name="UPDATE_DISCRETE" value="1">
+		</constant>
+		<constant name="UPDATE_TRIGGER" value="2">
+		</constant>
 	</constants>
 </class>
 <class name="AnimationPlayer" inherits="Node" category="Core">
 	<brief_description>
-	Container and player of [Animation] resources.
+		Container and player of [Animation] resources.
 	</brief_description>
 	<description>
-	An animation player is used for general purpose playback of [Animation] resources. It contains a dictionary of animations (referenced by name) and custom blend times between their transitions. Additionally, animations can be played and blended in different channels.
+		An animation player is used for general purpose playback of [Animation] resources. It contains a dictionary of animations (referenced by name) and custom blend times between their transitions. Additionally, animations can be played and blended in different channels.
 	</description>
 	<methods>
 		<method name="add_animation">
@@ -2833,32 +2860,49 @@
 			<argument index="1" name="animation" type="Animation">
 			</argument>
 			<description>
-			Add an animation resource to the player, which will be later referenced by the "name" argument.
+				Add an animation resource to the player, which will be later referenced by the "name" argument.
 			</description>
 		</method>
-		<method name="remove_animation">
-			<argument index="0" name="name" type="String">
+		<method name="advance">
+			<argument index="0" name="delta" type="float">
 			</argument>
 			<description>
-			Remove an animation from the player (by supplying the same name used to add it).
+				Used to skip ahead or skip back in an animation. Delta is the time in seconds to skip.
 			</description>
 		</method>
-		<method name="rename_animation">
-			<argument index="0" name="name" type="String">
+		<method name="animation_get_next" qualifiers="const">
+			<return type="String">
+			</return>
+			<argument index="0" name="anim_from" type="String">
 			</argument>
-			<argument index="1" name="newname" type="String">
+			<description>
+			</description>
+		</method>
+		<method name="animation_set_next">
+			<argument index="0" name="anim_from" type="String">
+			</argument>
+			<argument index="1" name="anim_to" type="String">
 			</argument>
 			<description>
-			Rename an existing animation.
 			</description>
 		</method>
-		<method name="has_animation" qualifiers="const">
-			<return type="bool">
+		<method name="clear_caches">
+			<description>
+				The animation player creates caches for faster access to the nodes it will animate. However, if a specific node is removed, it may not notice it, so clear_caches will force the player to search for the nodes again.
+			</description>
+		</method>
+		<method name="clear_queue">
+			<description>
+				If animations are queued to play, clear them.
+			</description>
+		</method>
+		<method name="find_animation" qualifiers="const">
+			<return type="String">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="animation" type="Animation">
 			</argument>
 			<description>
-			Request whether an [Animation] name exist within the player.
+				Find an animation name by resource.
 			</description>
 		</method>
 		<method name="get_animation" qualifiers="const">
@@ -2867,41 +2911,28 @@
 			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			Get an [Animation] resource by requesting a name.
+				Get an [Animation] resource by requesting a name.
 			</description>
 		</method>
 		<method name="get_animation_list" qualifiers="const">
 			<return type="StringArray">
 			</return>
 			<description>
-			Get the list of names of the animations stored in the player.
+				Get the list of names of the animations stored in the player.
 			</description>
 		</method>
-		<method name="animation_set_next">
-			<argument index="0" name="anim_from" type="String">
-			</argument>
-			<argument index="1" name="anim_to" type="String">
-			</argument>
+		<method name="get_animation_process_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
+				Return the mode in which the animation player processes. See [method set_animation_process_mode].
 			</description>
 		</method>
-		<method name="animation_get_next" qualifiers="const">
+		<method name="get_autoplay" qualifiers="const">
 			<return type="String">
 			</return>
-			<argument index="0" name="anim_from" type="String">
-			</argument>
 			<description>
-			</description>
-		</method>
-		<method name="set_blend_time">
-			<argument index="0" name="anim_from" type="String">
-			</argument>
-			<argument index="1" name="anim_to" type="String">
-			</argument>
-			<argument index="2" name="sec" type="float">
-			</argument>
-			<description>
-			Specify a blend time (in seconds) between two animations, referenced by their names.
+				Return the name of the animation that will be automatically played when the scene is loaded.
 			</description>
 		</method>
 		<method name="get_blend_time" qualifiers="const">
@@ -2912,145 +2943,124 @@
 			<argument index="1" name="anim_to" type="String">
 			</argument>
 			<description>
-			Get the blend time between two animations, referenced by their names.
+				Get the blend time between two animations, referenced by their names.
 			</description>
 		</method>
-		<method name="set_default_blend_time">
-			<argument index="0" name="sec" type="float">
-			</argument>
+		<method name="get_current_animation" qualifiers="const">
+			<return type="String">
+			</return>
 			<description>
-			Set the default blend time between animations.
+				Return the name of the animation being played.
 			</description>
 		</method>
-		<method name="get_default_blend_time" qualifiers="const">
+		<method name="get_current_animation_length" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the default blend time between animations.
-			</description>
-		</method>
-		<method name="play">
-			<argument index="0" name="name" type="String" default="&quot;&quot;">
-			</argument>
-			<argument index="1" name="custom_blend" type="float" default="-1">
-			</argument>
-			<argument index="2" name="custom_speed" type="float" default="1">
-			</argument>
-			<argument index="3" name="from_end" type="bool" default="false">
-			</argument>
-			<description>
-			Play a given animation by the animation name. Custom speed and blend times can be set. If custom speed is negative (-1), 'from_end' being true can play the animation backwards.
+				Get the length (in seconds) of the currently being played animation.
 			</description>
 		</method>
-		<method name="play_backwards">
-			<argument index="0" name="name" type="String" default="&quot;&quot;">
-			</argument>
-			<argument index="1" name="custom_blend" type="float" default="-1">
-			</argument>
-			<description>
-			Play a given animation by the animation name in reverse.
-			</description>
-		</method>
-		<method name="stop">
-			<argument index="0" name="reset" type="bool" default="true">
-			</argument>
+		<method name="get_current_animation_pos" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Stop the currently playing animation.
+				Get the position (in seconds) of the currently being played animation.
 			</description>
 		</method>
-		<method name="stop_all">
+		<method name="get_default_blend_time" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Stop playback of animations (deprecated).
+				Return the default blend time between animations.
 			</description>
 		</method>
-		<method name="is_playing" qualifiers="const">
-			<return type="bool">
+		<method name="get_pos" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return whether an animation is playing.
+				Return the playback position (in seconds) in an animation channel (or channel 0 if none is provided).
 			</description>
 		</method>
-		<method name="set_current_animation">
-			<argument index="0" name="anim" type="String">
-			</argument>
+		<method name="get_root" qualifiers="const">
+			<return type="NodePath">
+			</return>
 			<description>
-			Set the current animation (even if no playback occurs). Using set_current_animation() and set_active() are similar to calling play().
+				Return path to root node (see [method set_root]).
 			</description>
 		</method>
-		<method name="get_current_animation" qualifiers="const">
-			<return type="String">
+		<method name="get_speed" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return the name of the animation being played.
+				Get the speed scaling ratio in a given animation channel (or channel 0 if none is provided). Default ratio is [i]1[/i] (no scaling).
 			</description>
 		</method>
-		<method name="queue">
+		<method name="has_animation" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			Queue an animation for playback once the current one is done.
-			</description>
-		</method>
-		<method name="clear_queue">
-			<description>
-			If animations are queued to play, clear them.
+				Request whether an [Animation] name exist within the player.
 			</description>
 		</method>
-		<method name="set_active">
-			<argument index="0" name="active" type="bool">
-			</argument>
+		<method name="is_active" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the player as active (playing). If false, it
-			will do nothing.
+				Return true if the player is active.
 			</description>
 		</method>
-		<method name="is_active" qualifiers="const">
+		<method name="is_playing" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if the player is active.
+				Return whether an animation is playing.
 			</description>
 		</method>
-		<method name="set_speed">
-			<argument index="0" name="speed" type="float">
+		<method name="play">
+			<argument index="0" name="name" type="String" default="&quot;&quot;">
+			</argument>
+			<argument index="1" name="custom_blend" type="float" default="-1">
+			</argument>
+			<argument index="2" name="custom_speed" type="float" default="1">
+			</argument>
+			<argument index="3" name="from_end" type="bool" default="false">
 			</argument>
 			<description>
-			Set a speed scaling ratio in a given animation channel (or channel 0 if none is provided). Default ratio is [i]1[/i] (no scaling).
+				Play a given animation by the animation name. Custom speed and blend times can be set. If custom speed is negative (-1), 'from_end' being true can play the animation backwards.
 			</description>
 		</method>
-		<method name="get_speed" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="play_backwards">
+			<argument index="0" name="name" type="String" default="&quot;&quot;">
+			</argument>
+			<argument index="1" name="custom_blend" type="float" default="-1">
+			</argument>
 			<description>
-			Get the speed scaling ratio in a given animation channel (or channel 0 if none is provided). Default ratio is [i]1[/i] (no scaling).
+				Play a given animation by the animation name in reverse.
 			</description>
 		</method>
-		<method name="set_autoplay">
+		<method name="queue">
 			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			Set the name of the animation that will be automatically played when the scene is loaded.
+				Queue an animation for playback once the current one is done.
 			</description>
 		</method>
-		<method name="get_autoplay" qualifiers="const">
-			<return type="String">
-			</return>
-			<description>
-			Return the name of the animation that will be automatically played when the scene is loaded.
-			</description>
-		</method>
-		<method name="set_root">
-			<argument index="0" name="path" type="NodePath">
+		<method name="remove_animation">
+			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			AnimationPlayer resolves animation track paths from this node (which is relative to itself), by default root is "..", but it can be changed.
+				Remove an animation from the player (by supplying the same name used to add it).
 			</description>
 		</method>
-		<method name="get_root" qualifiers="const">
-			<return type="NodePath">
-			</return>
+		<method name="rename_animation">
+			<argument index="0" name="name" type="String">
+			</argument>
+			<argument index="1" name="newname" type="String">
+			</argument>
 			<description>
-			Return path to root node (see [method set_root]).
+				Rename an existing animation.
 			</description>
 		</method>
 		<method name="seek">
@@ -3059,86 +3069,102 @@
 			<argument index="1" name="update" type="bool" default="false">
 			</argument>
 			<description>
-			Seek the animation to a given position in time (in seconds). If 'update' is true, the animation will be updated too, otherwise it will be updated at process time.
+				Seek the animation to a given position in time (in seconds). If 'update' is true, the animation will be updated too, otherwise it will be updated at process time.
 			</description>
 		</method>
-		<method name="get_pos" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_active">
+			<argument index="0" name="active" type="bool">
+			</argument>
 			<description>
-			Return the playback position (in seconds) in an animation channel (or channel 0 if none is provided).
+				Set the player as active (playing). If false, it will do nothing.
 			</description>
 		</method>
-		<method name="find_animation" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="animation" type="Animation">
+		<method name="set_animation_process_mode">
+			<argument index="0" name="mode" type="int">
 			</argument>
 			<description>
-			Find an animation name by resource.
+				Set the mode in which the animation player processes. By default, it processes on idle time (framerate dependent), but using fixed time works well for animating static collision bodies in 2D and 3D. See enum ANIMATION_PROCESS_*.
 			</description>
 		</method>
-		<method name="clear_caches">
+		<method name="set_autoplay">
+			<argument index="0" name="name" type="String">
+			</argument>
 			<description>
-			The animation player creates caches for faster access to the nodes it will animate. However, if a specific node is removed, it may not notice it, so clear_caches will force the player to search for the nodes again.
+				Set the name of the animation that will be automatically played when the scene is loaded.
 			</description>
 		</method>
-		<method name="set_animation_process_mode">
-			<argument index="0" name="mode" type="int">
+		<method name="set_blend_time">
+			<argument index="0" name="anim_from" type="String">
+			</argument>
+			<argument index="1" name="anim_to" type="String">
+			</argument>
+			<argument index="2" name="sec" type="float">
 			</argument>
 			<description>
-			Set the mode in which the animation player processes. By default, it processes on idle time (framerate dependent), but using fixed time works well for animating static collision bodies in 2D and 3D. See enum ANIMATION_PROCESS_*.
+				Specify a blend time (in seconds) between two animations, referenced by their names.
 			</description>
 		</method>
-		<method name="get_animation_process_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_current_animation">
+			<argument index="0" name="anim" type="String">
+			</argument>
 			<description>
-			Return the mode in which the animation player processes. See [method set_animation_process_mode].
+				Set the current animation (even if no playback occurs). Using set_current_animation() and set_active() are similar to calling play().
 			</description>
 		</method>
-		<method name="get_current_animation_pos" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_default_blend_time">
+			<argument index="0" name="sec" type="float">
+			</argument>
 			<description>
-			Get the position (in seconds) of the currently being played animation.
+				Set the default blend time between animations.
 			</description>
 		</method>
-		<method name="get_current_animation_length" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_root">
+			<argument index="0" name="path" type="NodePath">
+			</argument>
 			<description>
-			Get the length (in seconds) of the currently being played animation.
+				AnimationPlayer resolves animation track paths from this node (which is relative to itself), by default root is "..", but it can be changed.
 			</description>
 		</method>
-		<method name="advance">
-			<argument index="0" name="delta" type="float">
+		<method name="set_speed">
+			<argument index="0" name="speed" type="float">
 			</argument>
 			<description>
-			Used to skip ahead or skip back in an animation. Delta is the time in seconds to skip.
+				Set a speed scaling ratio in a given animation channel (or channel 0 if none is provided). Default ratio is [i]1[/i] (no scaling).
 			</description>
 		</method>
-	</methods>
-	<signals>
-		<signal name="animation_started">
-			<argument index="0" name="name" type="String">
+		<method name="stop">
+			<argument index="0" name="reset" type="bool" default="true">
 			</argument>
 			<description>
-			Notifies when an animation starts playing.
+				Stop the currently playing animation.
 			</description>
-		</signal>
+		</method>
+		<method name="stop_all">
+			<description>
+				Stop playback of animations (deprecated).
+			</description>
+		</method>
+	</methods>
+	<signals>
 		<signal name="animation_changed">
 			<argument index="0" name="old_name" type="String">
 			</argument>
 			<argument index="1" name="new_name" type="String">
 			</argument>
 			<description>
-			If the currently being played animation changes, this signal will notify of such change.
+				If the currently being played animation changes, this signal will notify of such change.
+			</description>
+		</signal>
+		<signal name="animation_started">
+			<argument index="0" name="name" type="String">
+			</argument>
+			<description>
+				Notifies when an animation starts playing.
 			</description>
 		</signal>
 		<signal name="finished">
 			<description>
-			Notifies when an animation finished playing.
+				Notifies when an animation finished playing.
 			</description>
 		</signal>
 	</signals>
@@ -3153,10 +3179,10 @@
 </class>
 <class name="AnimationTreePlayer" inherits="Node" category="Core">
 	<brief_description>
-	Animation Player that uses a node graph for the blending.
+		Animation Player that uses a node graph for the blending.
 	</brief_description>
 	<description>
-	Animation Player that uses a node graph for the blending. This kind of player is very useful when animating character or other skeleton based rigs, because it can combine several animations to form a desired pose.
+		Animation Player that uses a node graph for the blending. This kind of player is very useful when animating character or other skeleton based rigs, because it can combine several animations to form a desired pose.
 	</description>
 	<methods>
 		<method name="add_node">
@@ -3165,56 +3191,29 @@
 			<argument index="1" name="id" type="String">
 			</argument>
 			<description>
-			Add a node of a given type in the graph with given id.
-			</description>
-		</method>
-		<method name="node_exists" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="node" type="String">
-			</argument>
-			<description>
-			Check if a node exists (by name).
-			</description>
-		</method>
-		<method name="node_rename">
-			<return type="int">
-			</return>
-			<argument index="0" name="node" type="String">
-			</argument>
-			<argument index="1" name="new_name" type="String">
-			</argument>
-			<description>
-			Rename a node in the graph.
+				Add a node of a given type in the graph with given id.
 			</description>
 		</method>
-		<method name="node_get_type" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="id" type="String">
+		<method name="advance">
+			<argument index="0" name="delta" type="float">
 			</argument>
 			<description>
-			Get the node type, will return from NODE_* enum.
 			</description>
 		</method>
-		<method name="node_get_input_count" qualifiers="const">
-			<return type="int">
+		<method name="animation_node_get_animation" qualifiers="const">
+			<return type="Animation">
 			</return>
 			<argument index="0" name="id" type="String">
 			</argument>
 			<description>
-			Return the input count for a given node. Different types of nodes have different amount of inputs.
 			</description>
 		</method>
-		<method name="node_get_input_source" qualifiers="const">
+		<method name="animation_node_get_master_animation" qualifiers="const">
 			<return type="String">
 			</return>
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="idx" type="int">
-			</argument>
 			<description>
-			Return the input source for a given node input.
 			</description>
 		</method>
 		<method name="animation_node_set_animation">
@@ -3223,14 +3222,16 @@
 			<argument index="1" name="animation" type="Animation">
 			</argument>
 			<description>
-			Set the animation for an animation node.
+				Set the animation for an animation node.
 			</description>
 		</method>
-		<method name="animation_node_get_animation" qualifiers="const">
-			<return type="Animation">
-			</return>
+		<method name="animation_node_set_filter_path">
 			<argument index="0" name="id" type="String">
 			</argument>
+			<argument index="1" name="path" type="NodePath">
+			</argument>
+			<argument index="2" name="enable" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -3242,33 +3243,33 @@
 			<description>
 			</description>
 		</method>
-		<method name="animation_node_get_master_animation" qualifiers="const">
-			<return type="String">
+		<method name="blend2_node_get_amount" qualifiers="const">
+			<return type="float">
 			</return>
 			<argument index="0" name="id" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="animation_node_set_filter_path">
+		<method name="blend2_node_set_amount">
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="path" type="NodePath">
-			</argument>
-			<argument index="2" name="enable" type="bool">
+			<argument index="1" name="blend" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="oneshot_node_set_fadein_time">
+		<method name="blend2_node_set_filter_path">
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="time_sec" type="float">
+			<argument index="1" name="path" type="NodePath">
+			</argument>
+			<argument index="2" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="oneshot_node_get_fadein_time" qualifiers="const">
+		<method name="blend3_node_get_amount" qualifiers="const">
 			<return type="float">
 			</return>
 			<argument index="0" name="id" type="String">
@@ -3276,97 +3277,97 @@
 			<description>
 			</description>
 		</method>
-		<method name="oneshot_node_set_fadeout_time">
+		<method name="blend3_node_set_amount">
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="time_sec" type="float">
+			<argument index="1" name="blend" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="oneshot_node_get_fadeout_time" qualifiers="const">
-			<return type="float">
+		<method name="blend4_node_get_amount" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<argument index="0" name="id" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="oneshot_node_set_autorestart">
+		<method name="blend4_node_set_amount">
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="enable" type="bool">
+			<argument index="1" name="blend" type="Vector2">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="oneshot_node_set_autorestart_delay">
+		<method name="connect">
+			<return type="int">
+			</return>
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="delay_sec" type="float">
+			<argument index="1" name="dst_id" type="String">
+			</argument>
+			<argument index="2" name="dst_input_idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="oneshot_node_set_autorestart_random_delay">
+		<method name="disconnect">
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="rand_sec" type="float">
+			<argument index="1" name="dst_input_idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="oneshot_node_has_autorestart" qualifiers="const">
-			<return type="bool">
+		<method name="get_animation_process_mode" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="id" type="String">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="oneshot_node_get_autorestart_delay" qualifiers="const">
-			<return type="float">
+		<method name="get_base_path" qualifiers="const">
+			<return type="NodePath">
 			</return>
-			<argument index="0" name="id" type="String">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="oneshot_node_get_autorestart_random_delay" qualifiers="const">
-			<return type="float">
+		<method name="get_master_player" qualifiers="const">
+			<return type="NodePath">
 			</return>
-			<argument index="0" name="id" type="String">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="oneshot_node_start">
-			<argument index="0" name="id" type="String">
-			</argument>
+		<method name="get_node_list">
+			<return type="StringArray">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="oneshot_node_stop">
-			<argument index="0" name="id" type="String">
-			</argument>
+		<method name="is_active" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="oneshot_node_is_active" qualifiers="const">
+		<method name="is_connected" qualifiers="const">
 			<return type="bool">
 			</return>
 			<argument index="0" name="id" type="String">
 			</argument>
+			<argument index="1" name="dst_id" type="String">
+			</argument>
+			<argument index="2" name="dst_input_idx" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="oneshot_node_set_filter_path">
+		<method name="mix_node_get_amount" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="path" type="NodePath">
-			</argument>
-			<argument index="2" name="enable" type="bool">
-			</argument>
 			<description>
 			</description>
 		</method>
@@ -3378,81 +3379,88 @@
 			<description>
 			</description>
 		</method>
-		<method name="mix_node_get_amount" qualifiers="const">
-			<return type="float">
+		<method name="node_exists" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="id" type="String">
+			<argument index="0" name="node" type="String">
 			</argument>
 			<description>
+				Check if a node exists (by name).
 			</description>
 		</method>
-		<method name="blend2_node_set_amount">
+		<method name="node_get_input_count" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="blend" type="float">
-			</argument>
 			<description>
+				Return the input count for a given node. Different types of nodes have different amount of inputs.
 			</description>
 		</method>
-		<method name="blend2_node_get_amount" qualifiers="const">
-			<return type="float">
+		<method name="node_get_input_source" qualifiers="const">
+			<return type="String">
 			</return>
 			<argument index="0" name="id" type="String">
 			</argument>
+			<argument index="1" name="idx" type="int">
+			</argument>
 			<description>
+				Return the input source for a given node input.
 			</description>
 		</method>
-		<method name="blend2_node_set_filter_path">
+		<method name="node_get_pos" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="path" type="NodePath">
-			</argument>
-			<argument index="2" name="enable" type="bool">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="blend3_node_set_amount">
+		<method name="node_get_type" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="blend" type="float">
-			</argument>
 			<description>
+				Get the node type, will return from NODE_* enum.
 			</description>
 		</method>
-		<method name="blend3_node_get_amount" qualifiers="const">
-			<return type="float">
+		<method name="node_rename">
+			<return type="int">
 			</return>
-			<argument index="0" name="id" type="String">
+			<argument index="0" name="node" type="String">
+			</argument>
+			<argument index="1" name="new_name" type="String">
 			</argument>
 			<description>
+				Rename a node in the graph.
 			</description>
 		</method>
-		<method name="blend4_node_set_amount">
+		<method name="node_set_pos">
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="blend" type="Vector2">
+			<argument index="1" name="screen_pos" type="Vector2">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="blend4_node_get_amount" qualifiers="const">
-			<return type="Vector2">
+		<method name="oneshot_node_get_autorestart_delay" qualifiers="const">
+			<return type="float">
 			</return>
 			<argument index="0" name="id" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="timescale_node_set_scale">
+		<method name="oneshot_node_get_autorestart_random_delay" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="scale" type="float">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="timescale_node_get_scale" qualifiers="const">
+		<method name="oneshot_node_get_fadein_time" qualifiers="const">
 			<return type="float">
 			</return>
 			<argument index="0" name="id" type="String">
@@ -3460,59 +3468,55 @@
 			<description>
 			</description>
 		</method>
-		<method name="timeseek_node_seek">
+		<method name="oneshot_node_get_fadeout_time" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="pos_sec" type="float">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="transition_node_set_input_count">
+		<method name="oneshot_node_has_autorestart" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="count" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="transition_node_get_input_count" qualifiers="const">
-			<return type="int">
+		<method name="oneshot_node_is_active" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="id" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="transition_node_delete_input">
+		<method name="oneshot_node_set_autorestart">
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="input_idx" type="int">
+			<argument index="1" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="transition_node_set_input_auto_advance">
+		<method name="oneshot_node_set_autorestart_delay">
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="input_idx" type="int">
-			</argument>
-			<argument index="2" name="enable" type="bool">
+			<argument index="1" name="delay_sec" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="transition_node_has_input_auto_advance" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="oneshot_node_set_autorestart_random_delay">
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="input_idx" type="int">
+			<argument index="1" name="rand_sec" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="transition_node_set_xfade_time">
+		<method name="oneshot_node_set_fadein_time">
 			<argument index="0" name="id" type="String">
 			</argument>
 			<argument index="1" name="time_sec" type="float">
@@ -3520,43 +3524,37 @@
 			<description>
 			</description>
 		</method>
-		<method name="transition_node_get_xfade_time" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="oneshot_node_set_fadeout_time">
 			<argument index="0" name="id" type="String">
 			</argument>
+			<argument index="1" name="time_sec" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="transition_node_set_current">
+		<method name="oneshot_node_set_filter_path">
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="input_idx" type="int">
+			<argument index="1" name="path" type="NodePath">
+			</argument>
+			<argument index="2" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="transition_node_get_current" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="oneshot_node_start">
 			<argument index="0" name="id" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="node_set_pos">
+		<method name="oneshot_node_stop">
 			<argument index="0" name="id" type="String">
 			</argument>
-			<argument index="1" name="screen_pos" type="Vector2">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="node_get_pos" qualifiers="const">
-			<return type="Vector2">
-			</return>
-			<argument index="0" name="id" type="String">
-			</argument>
+		<method name="recompute_caches">
 			<description>
 			</description>
 		</method>
@@ -3566,103 +3564,131 @@
 			<description>
 			</description>
 		</method>
-		<method name="connect">
-			<return type="int">
-			</return>
-			<argument index="0" name="id" type="String">
-			</argument>
-			<argument index="1" name="dst_id" type="String">
-			</argument>
-			<argument index="2" name="dst_input_idx" type="int">
-			</argument>
+		<method name="reset">
 			<description>
 			</description>
 		</method>
-		<method name="is_connected" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="id" type="String">
-			</argument>
-			<argument index="1" name="dst_id" type="String">
-			</argument>
-			<argument index="2" name="dst_input_idx" type="int">
+		<method name="set_active">
+			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="disconnect">
-			<argument index="0" name="id" type="String">
+		<method name="set_animation_process_mode">
+			<argument index="0" name="mode" type="int">
 			</argument>
-			<argument index="1" name="dst_input_idx" type="int">
+			<description>
+			</description>
+		</method>
+		<method name="set_base_path">
+			<argument index="0" name="path" type="NodePath">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_active">
-			<argument index="0" name="enabled" type="bool">
+		<method name="set_master_player">
+			<argument index="0" name="nodepath" type="NodePath">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_active" qualifiers="const">
-			<return type="bool">
+		<method name="timescale_node_get_scale" qualifiers="const">
+			<return type="float">
 			</return>
+			<argument index="0" name="id" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_base_path">
-			<argument index="0" name="path" type="NodePath">
+		<method name="timescale_node_set_scale">
+			<argument index="0" name="id" type="String">
+			</argument>
+			<argument index="1" name="scale" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_base_path" qualifiers="const">
-			<return type="NodePath">
-			</return>
+		<method name="timeseek_node_seek">
+			<argument index="0" name="id" type="String">
+			</argument>
+			<argument index="1" name="pos_sec" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_master_player">
-			<argument index="0" name="nodepath" type="NodePath">
+		<method name="transition_node_delete_input">
+			<argument index="0" name="id" type="String">
+			</argument>
+			<argument index="1" name="input_idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_master_player" qualifiers="const">
-			<return type="NodePath">
+		<method name="transition_node_get_current" qualifiers="const">
+			<return type="int">
 			</return>
+			<argument index="0" name="id" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_node_list">
-			<return type="StringArray">
+		<method name="transition_node_get_input_count" qualifiers="const">
+			<return type="int">
 			</return>
+			<argument index="0" name="id" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_animation_process_mode">
-			<argument index="0" name="mode" type="int">
+		<method name="transition_node_get_xfade_time" qualifiers="const">
+			<return type="float">
+			</return>
+			<argument index="0" name="id" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_animation_process_mode" qualifiers="const">
-			<return type="int">
+		<method name="transition_node_has_input_auto_advance" qualifiers="const">
+			<return type="bool">
 			</return>
+			<argument index="0" name="id" type="String">
+			</argument>
+			<argument index="1" name="input_idx" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="advance">
-			<argument index="0" name="delta" type="float">
+		<method name="transition_node_set_current">
+			<argument index="0" name="id" type="String">
+			</argument>
+			<argument index="1" name="input_idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="reset">
+		<method name="transition_node_set_input_auto_advance">
+			<argument index="0" name="id" type="String">
+			</argument>
+			<argument index="1" name="input_idx" type="int">
+			</argument>
+			<argument index="2" name="enable" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="recompute_caches">
+		<method name="transition_node_set_input_count">
+			<argument index="0" name="id" type="String">
+			</argument>
+			<argument index="1" name="count" type="int">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="transition_node_set_xfade_time">
+			<argument index="0" name="id" type="String">
+			</argument>
+			<argument index="1" name="time_sec" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -3692,162 +3718,159 @@
 </class>
 <class name="Area" inherits="CollisionObject" category="Core">
 	<brief_description>
-	General purpose area detection and influence for 3D physics.
+		General purpose area detection and influence for 3D physics.
 	</brief_description>
 	<description>
-	General purpose area detection for 3D physics. Areas can be used for detection of objects that enter/exit them, as well as overriding space parameters (changing gravity, damping, etc). For this, use any space override different from AREA_SPACE_OVERRIDE_DISABLE and point gravity at the center of mass.
+		General purpose area detection for 3D physics. Areas can be used for detection of objects that enter/exit them, as well as overriding space parameters (changing gravity, damping, etc). For this, use any space override different from AREA_SPACE_OVERRIDE_DISABLE and point gravity at the center of mass.
 	</description>
 	<methods>
-		<method name="set_space_override_mode">
-			<argument index="0" name="enable" type="int">
-			</argument>
+		<method name="get_angular_damp" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the space override mode. This mode controls how an area affects gravity and damp.
-			AREA_SPACE_OVERRIDE_DISABLED: This area does not affect gravity/damp. These are generally areas that exist only to detect collisions, and objects entering or exiting them.
-			AREA_SPACE_OVERRIDE_COMBINE: This area adds its gravity/damp values to whatever has been calculated so far. This way, many overlapping areas can combine their physics to make interesting effects.
-			AREA_SPACE_OVERRIDE_COMBINE_REPLACE: This area adds its gravity/damp values to whatever has been calculated so far. Then stops taking into account the rest of the areas, even the default one.
-			AREA_SPACE_OVERRIDE_REPLACE: This area replaces any gravity/damp, even the default one, and stops taking into account the rest of the areas.
-			AREA_SPACE_OVERRIDE_REPLACE_COMBINE: This area replaces any gravity/damp calculated so far, but keeps calculating the rest of the areas, down to the default one.
+				Return the angular damp rate.
 			</description>
 		</method>
-		<method name="get_space_override_mode" qualifiers="const">
+		<method name="get_collision_mask" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the space override mode.
+				Return the physics layers this area can scan for collisions.
 			</description>
 		</method>
-		<method name="set_gravity_is_point">
-			<argument index="0" name="enable" type="bool">
-			</argument>
-			<description>
-			When overriding space parameters, this method sets whether this area has a center of gravity. To set/get the location of the center of gravity, use [method set_gravity_vector]/[method get_gravity_vector].
-			</description>
-		</method>
-		<method name="is_gravity_a_point" qualifiers="const">
+		<method name="get_collision_mask_bit" qualifiers="const">
 			<return type="bool">
 			</return>
+			<argument index="0" name="bit" type="int">
+			</argument>
 			<description>
-			Return whether gravity is a point. A point gravity will attract objects towards it, as opposed to a gravity vector, which moves them in a given direction.
+				Return an individual bit on the collision mask.
 			</description>
 		</method>
-		<method name="set_gravity_distance_scale">
-			<argument index="0" name="distance_scale" type="float">
-			</argument>
+		<method name="get_gravity" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the falloff factor for point gravity. The greater this value is, the faster the strength of gravity decreases with the square of distance.
+				Return the gravity intensity.
 			</description>
 		</method>
 		<method name="get_gravity_distance_scale" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the falloff factor for point gravity.
+				Return the falloff factor for point gravity.
 			</description>
 		</method>
-		<method name="set_gravity_vector">
-			<argument index="0" name="vector" type="Vector3">
-			</argument>
+		<method name="get_gravity_vector" qualifiers="const">
+			<return type="Vector3">
+			</return>
 			<description>
-			Set the gravity vector. This vector does not have to be normalized.
-			If gravity is a point (see [method is_gravity_a_point]), this will be the attraction center.
+				Return the gravity vector. If gravity is a point (see [method is_gravity_a_point]), this will be the attraction center.
 			</description>
 		</method>
-		<method name="get_gravity_vector" qualifiers="const">
-			<return type="Vector3">
+		<method name="get_layer_mask" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the gravity vector. If gravity is a point (see [method is_gravity_a_point]), this will be the attraction center.
+				Return the physics layer this area is in.
 			</description>
 		</method>
-		<method name="set_gravity">
-			<argument index="0" name="gravity" type="float">
+		<method name="get_layer_mask_bit" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="bit" type="int">
 			</argument>
 			<description>
-			Set the gravity intensity. This is useful to alter the force of gravity without altering its direction.
-			This value multiplies the gravity vector, whether it is the given vector ([method set_gravity_vector]), or a calculated one (when using a center of gravity).
+				Return an individual bit on the layer mask.
 			</description>
 		</method>
-		<method name="get_gravity" qualifiers="const">
+		<method name="get_linear_damp" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the gravity intensity.
+				Return the linear damp rate.
 			</description>
 		</method>
-		<method name="set_angular_damp">
-			<argument index="0" name="angular_damp" type="float">
-			</argument>
+		<method name="get_overlapping_areas" qualifiers="const">
+			<return type="Array">
+			</return>
 			<description>
-			Set the rate at which objects stop spinning in this area, if there are not any other forces making it spin. The value is a fraction of its current speed, lost per second. Thus, a value of 1.0 should mean stopping immediately, and 0.0 means the object never stops.
-			In practice, as the fraction of speed lost gets smaller with each frame, a value of 1.0 does not mean the object will stop in exactly one second. Only when the physics calculations are done at 1 frame per second, it does stop in a second.
+				Return a list of the areas that are totally or partially inside this area.
 			</description>
 		</method>
-		<method name="get_angular_damp" qualifiers="const">
+		<method name="get_overlapping_bodies" qualifiers="const">
+			<return type="Array">
+			</return>
+			<description>
+				Return a list of the bodies ([PhysicsBody]) that are totally or partially inside this area.
+			</description>
+		</method>
+		<method name="get_priority" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the angular damp rate.
+				Return the processing order of this area.
 			</description>
 		</method>
-		<method name="set_linear_damp">
-			<argument index="0" name="linear_damp" type="float">
-			</argument>
+		<method name="get_space_override_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the rate at which objects stop moving in this area, if there are not any other forces moving it. The value is a fraction of its current speed, lost per second. Thus, a value of 1.0 should mean stopping immediately, and 0.0 means the object never stops.
-			In practice, as the fraction of speed lost gets smaller with each frame, a value of 1.0 does not mean the object will stop in exactly one second. Only when the physics calculations are done at 1 frame per second, it does stop in a second.
+				Return the space override mode.
 			</description>
 		</method>
-		<method name="get_linear_damp" qualifiers="const">
-			<return type="float">
+		<method name="is_gravity_a_point" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the linear damp rate.
+				Return whether gravity is a point. A point gravity will attract objects towards it, as opposed to a gravity vector, which moves them in a given direction.
 			</description>
 		</method>
-		<method name="set_priority">
-			<argument index="0" name="priority" type="float">
-			</argument>
+		<method name="is_monitorable" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the order in which the area is processed. Greater values mean the area gets processed first. This is useful for areas which have an space override different from AREA_SPACE_OVERRIDE_DISABLED or AREA_SPACE_OVERRIDE_COMBINE, as they replace values, and are thus order-dependent.
-			Areas with the same priority value get evaluated in an unpredictable order, and should be differentiated if evaluation order is to be important.
+				Return whether this area can be detected by other, monitoring, areas.
 			</description>
 		</method>
-		<method name="get_priority" qualifiers="const">
-			<return type="float">
+		<method name="is_monitoring_enabled" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the processing order of this area.
+				Return whether this area detects bodies/areas entering/exiting it.
 			</description>
 		</method>
-		<method name="set_collision_mask">
-			<argument index="0" name="collision_mask" type="int">
+		<method name="overlaps_area" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="area" type="Object">
 			</argument>
 			<description>
-			Set the physics layers this area can scan for collisions.
+				Return whether the area passed is totally or partially inside this area.
 			</description>
 		</method>
-		<method name="get_collision_mask" qualifiers="const">
-			<return type="int">
+		<method name="overlaps_body" qualifiers="const">
+			<return type="bool">
 			</return>
+			<argument index="0" name="body" type="Object">
+			</argument>
 			<description>
-			Return the physics layers this area can scan for collisions.
+				Return whether the body passed is totally or partially inside this area.
 			</description>
 		</method>
-		<method name="set_layer_mask">
-			<argument index="0" name="layer_mask" type="int">
+		<method name="set_angular_damp">
+			<argument index="0" name="angular_damp" type="float">
 			</argument>
 			<description>
-			Set the physics layers this area is in.
-			Collidable objects can exist in any of 32 different layers. These layers are not visual, but more of a tagging system instead. A collidable can use these layers/tags to select with which objects it can collide, using [method set_collision_mask].
-			A contact is detected if object A is in any of the layers that object B scans, or object B is in any layer scanned by object A.
+				Set the rate at which objects stop spinning in this area, if there are not any other forces making it spin. The value is a fraction of its current speed, lost per second. Thus, a value of 1.0 should mean stopping immediately, and 0.0 means the object never stops.
+				In practice, as the fraction of speed lost gets smaller with each frame, a value of 1.0 does not mean the object will stop in exactly one second. Only when the physics calculations are done at 1 frame per second, it does stop in a second.
 			</description>
 		</method>
-		<method name="get_layer_mask" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_collision_mask">
+			<argument index="0" name="collision_mask" type="int">
+			</argument>
 			<description>
-			Return the physics layer this area is in.
+				Set the physics layers this area can scan for collisions.
 			</description>
 		</method>
 		<method name="set_collision_mask_bit">
@@ -3856,126 +3879,129 @@
 			<argument index="1" name="value" type="bool">
 			</argument>
 			<description>
-			Set/clear individual bits on the collision mask. This makes selecting the areas scanned easier.
+				Set/clear individual bits on the collision mask. This makes selecting the areas scanned easier.
 			</description>
 		</method>
-		<method name="get_collision_mask_bit" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="bit" type="int">
+		<method name="set_enable_monitoring">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Return an individual bit on the collision mask.
+				Set whether this area can detect bodies/areas entering/exiting it.
 			</description>
 		</method>
-		<method name="set_layer_mask_bit">
-			<argument index="0" name="bit" type="int">
-			</argument>
-			<argument index="1" name="value" type="bool">
+		<method name="set_gravity">
+			<argument index="0" name="gravity" type="float">
 			</argument>
 			<description>
-			Set/clear individual bits on the layer mask. This makes getting an area in/out of only one layer easier.
+				Set the gravity intensity. This is useful to alter the force of gravity without altering its direction.
+				This value multiplies the gravity vector, whether it is the given vector ([method set_gravity_vector]), or a calculated one (when using a center of gravity).
 			</description>
 		</method>
-		<method name="get_layer_mask_bit" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="bit" type="int">
+		<method name="set_gravity_distance_scale">
+			<argument index="0" name="distance_scale" type="float">
 			</argument>
 			<description>
-			Return an individual bit on the layer mask.
+				Set the falloff factor for point gravity. The greater this value is, the faster the strength of gravity decreases with the square of distance.
 			</description>
 		</method>
-		<method name="set_monitorable">
+		<method name="set_gravity_is_point">
 			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Set whether this area can be detected by other, monitoring, areas. Only areas need to be marked as monitorable. Bodies are always so.
+				When overriding space parameters, this method sets whether this area has a center of gravity. To set/get the location of the center of gravity, use [method set_gravity_vector]/[method get_gravity_vector].
 			</description>
 		</method>
-		<method name="is_monitorable" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_gravity_vector">
+			<argument index="0" name="vector" type="Vector3">
+			</argument>
 			<description>
-			Return whether this area can be detected by other, monitoring, areas.
+				Set the gravity vector. This vector does not have to be normalized.
+				If gravity is a point (see [method is_gravity_a_point]), this will be the attraction center.
 			</description>
 		</method>
-		<method name="set_enable_monitoring">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_layer_mask">
+			<argument index="0" name="layer_mask" type="int">
 			</argument>
 			<description>
-			Set whether this area can detect bodies/areas entering/exiting it.
+				Set the physics layers this area is in.
+				Collidable objects can exist in any of 32 different layers. These layers are not visual, but more of a tagging system instead. A collidable can use these layers/tags to select with which objects it can collide, using [method set_collision_mask].
+				A contact is detected if object A is in any of the layers that object B scans, or object B is in any layer scanned by object A.
 			</description>
 		</method>
-		<method name="is_monitoring_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_layer_mask_bit">
+			<argument index="0" name="bit" type="int">
+			</argument>
+			<argument index="1" name="value" type="bool">
+			</argument>
 			<description>
-			Return whether this area detects bodies/areas entering/exiting it.
+				Set/clear individual bits on the layer mask. This makes getting an area in/out of only one layer easier.
 			</description>
 		</method>
-		<method name="get_overlapping_bodies" qualifiers="const">
-			<return type="Array">
-			</return>
+		<method name="set_linear_damp">
+			<argument index="0" name="linear_damp" type="float">
+			</argument>
 			<description>
-			Return a list of the bodies ([PhysicsBody]) that are totally or partially inside this area.
+				Set the rate at which objects stop moving in this area, if there are not any other forces moving it. The value is a fraction of its current speed, lost per second. Thus, a value of 1.0 should mean stopping immediately, and 0.0 means the object never stops.
+				In practice, as the fraction of speed lost gets smaller with each frame, a value of 1.0 does not mean the object will stop in exactly one second. Only when the physics calculations are done at 1 frame per second, it does stop in a second.
 			</description>
 		</method>
-		<method name="get_overlapping_areas" qualifiers="const">
-			<return type="Array">
-			</return>
+		<method name="set_monitorable">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Return a list of the areas that are totally or partially inside this area.
+				Set whether this area can be detected by other, monitoring, areas. Only areas need to be marked as monitorable. Bodies are always so.
 			</description>
 		</method>
-		<method name="overlaps_body" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="body" type="Object">
+		<method name="set_priority">
+			<argument index="0" name="priority" type="float">
 			</argument>
 			<description>
-			Return whether the body passed is totally or partially inside this area.
+				Set the order in which the area is processed. Greater values mean the area gets processed first. This is useful for areas which have an space override different from AREA_SPACE_OVERRIDE_DISABLED or AREA_SPACE_OVERRIDE_COMBINE, as they replace values, and are thus order-dependent.
+				Areas with the same priority value get evaluated in an unpredictable order, and should be differentiated if evaluation order is to be important.
 			</description>
 		</method>
-		<method name="overlaps_area" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="area" type="Object">
+		<method name="set_space_override_mode">
+			<argument index="0" name="enable" type="int">
 			</argument>
 			<description>
-			Return whether the area passed is totally or partially inside this area.
+				Set the space override mode. This mode controls how an area affects gravity and damp.
+				AREA_SPACE_OVERRIDE_DISABLED: This area does not affect gravity/damp. These are generally areas that exist only to detect collisions, and objects entering or exiting them.
+				AREA_SPACE_OVERRIDE_COMBINE: This area adds its gravity/damp values to whatever has been calculated so far. This way, many overlapping areas can combine their physics to make interesting effects.
+				AREA_SPACE_OVERRIDE_COMBINE_REPLACE: This area adds its gravity/damp values to whatever has been calculated so far. Then stops taking into account the rest of the areas, even the default one.
+				AREA_SPACE_OVERRIDE_REPLACE: This area replaces any gravity/damp, even the default one, and stops taking into account the rest of the areas.
+				AREA_SPACE_OVERRIDE_REPLACE_COMBINE: This area replaces any gravity/damp calculated so far, but keeps calculating the rest of the areas, down to the default one.
 			</description>
 		</method>
 	</methods>
 	<signals>
-		<signal name="body_enter">
-			<argument index="0" name="body" type="Object">
+		<signal name="area_enter">
+			<argument index="0" name="area" type="Object">
 			</argument>
 			<description>
-			This signal is triggered only once when a body enters this area. The only parameter passed is the body that entered this area.
+				This signal is triggered only once when an area enters this area. The only parameter passed is the area that entered this area.
 			</description>
 		</signal>
-		<signal name="body_enter_shape">
-			<argument index="0" name="body_id" type="int">
+		<signal name="area_enter_shape">
+			<argument index="0" name="area_id" type="int">
 			</argument>
-			<argument index="1" name="body" type="Object">
+			<argument index="1" name="area" type="Object">
 			</argument>
-			<argument index="2" name="body_shape" type="int">
+			<argument index="2" name="area_shape" type="int">
 			</argument>
 			<argument index="3" name="area_shape" type="int">
 			</argument>
 			<description>
-			This signal triggers only once when a body enters this area. The first parameter is the body's [RID]. The second one is the body as an object. The third one is the index of the shape of the body that entered this area, and the fourth one is the index of the shape in this area that reported the entering.
+				This signal triggers only once when an area enters this area. The first parameter is the area's [RID]. The second one is the area as an object. The third one is the index of the shape entering this area, and the fourth one is the index of the shape in this area that reported the entering.
 			</description>
 		</signal>
-		<signal name="area_enter">
+		<signal name="area_exit">
 			<argument index="0" name="area" type="Object">
 			</argument>
 			<description>
-			This signal is triggered only once when an area enters this area. The only parameter passed is the area that entered this area.
+				This signal is triggered only once when an area exits this area. The only parameter passed is the area that exited this area.
 			</description>
 		</signal>
-		<signal name="area_enter_shape">
+		<signal name="area_exit_shape">
 			<argument index="0" name="area_id" type="int">
 			</argument>
 			<argument index="1" name="area" type="Object">
@@ -3985,17 +4011,17 @@
 			<argument index="3" name="area_shape" type="int">
 			</argument>
 			<description>
-			This signal triggers only once when an area enters this area. The first parameter is the area's [RID]. The second one is the area as an object. The third one is the index of the shape entering this area, and the fourth one is the index of the shape in this area that reported the entering.
+				This signal triggers only once when an area exits this area. The first parameter is the area's [RID]. The second one is the area as an object. The third one is the index of the shape entering this area, and the fourth one is the index of the shape in this area that reported the entering.
 			</description>
 		</signal>
-		<signal name="body_exit">
+		<signal name="body_enter">
 			<argument index="0" name="body" type="Object">
 			</argument>
 			<description>
-			This signal is triggered only once when a body exits this area. The only parameter passed is the body that exited this area.
+				This signal is triggered only once when a body enters this area. The only parameter passed is the body that entered this area.
 			</description>
 		</signal>
-		<signal name="body_exit_shape">
+		<signal name="body_enter_shape">
 			<argument index="0" name="body_id" type="int">
 			</argument>
 			<argument index="1" name="body" type="Object">
@@ -4005,27 +4031,27 @@
 			<argument index="3" name="area_shape" type="int">
 			</argument>
 			<description>
-			This signal triggers only once when a body exits this area. The first parameter is the body's [RID]. The second one is the body as an object. The third one is the index of the shape exiting this area, and the fourth one is the index of the shape in this area that reported the exit.
+				This signal triggers only once when a body enters this area. The first parameter is the body's [RID]. The second one is the body as an object. The third one is the index of the shape of the body that entered this area, and the fourth one is the index of the shape in this area that reported the entering.
 			</description>
 		</signal>
-		<signal name="area_exit">
-			<argument index="0" name="area" type="Object">
+		<signal name="body_exit">
+			<argument index="0" name="body" type="Object">
 			</argument>
 			<description>
-			This signal is triggered only once when an area exits this area. The only parameter passed is the area that exited this area.
+				This signal is triggered only once when a body exits this area. The only parameter passed is the body that exited this area.
 			</description>
 		</signal>
-		<signal name="area_exit_shape">
-			<argument index="0" name="area_id" type="int">
+		<signal name="body_exit_shape">
+			<argument index="0" name="body_id" type="int">
 			</argument>
-			<argument index="1" name="area" type="Object">
+			<argument index="1" name="body" type="Object">
 			</argument>
-			<argument index="2" name="area_shape" type="int">
+			<argument index="2" name="body_shape" type="int">
 			</argument>
 			<argument index="3" name="area_shape" type="int">
 			</argument>
 			<description>
-			This signal triggers only once when an area exits this area. The first parameter is the area's [RID]. The second one is the area as an object. The third one is the index of the shape entering this area, and the fourth one is the index of the shape in this area that reported the entering.
+				This signal triggers only once when a body exits this area. The first parameter is the body's [RID]. The second one is the body as an object. The third one is the index of the shape exiting this area, and the fourth one is the index of the shape in this area that reported the exit.
 			</description>
 		</signal>
 	</signals>
@@ -4034,162 +4060,159 @@
 </class>
 <class name="Area2D" inherits="CollisionObject2D" category="Core">
 	<brief_description>
-	General purpose area detection and influence for 2D physics.
+		General purpose area detection and influence for 2D physics.
 	</brief_description>
 	<description>
-	General purpose area detection for 2D physics. Areas can be used for detection of objects that enter/exit them, as well as overriding space parameters (changing gravity, damping, etc). For this, use any space override different from AREA_SPACE_OVERRIDE_DISABLE and point gravity at the center of mass.
+		General purpose area detection for 2D physics. Areas can be used for detection of objects that enter/exit them, as well as overriding space parameters (changing gravity, damping, etc). For this, use any space override different from AREA_SPACE_OVERRIDE_DISABLE and point gravity at the center of mass.
 	</description>
 	<methods>
-		<method name="set_space_override_mode">
-			<argument index="0" name="enable" type="int">
-			</argument>
+		<method name="get_angular_damp" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the space override mode. This mode controls how an area affects gravity and damp.
-			AREA_SPACE_OVERRIDE_DISABLED: This area does not affect gravity/damp. These are generally areas that exist only to detect collisions, and objects entering or exiting them.
-			AREA_SPACE_OVERRIDE_COMBINE: This area adds its gravity/damp values to whatever has been calculated so far. This way, many overlapping areas can combine their physics to make interesting effects.
-			AREA_SPACE_OVERRIDE_COMBINE_REPLACE: This area adds its gravity/damp values to whatever has been calculated so far. Then stops taking into account the rest of the areas, even the default one.
-			AREA_SPACE_OVERRIDE_REPLACE: This area replaces any gravity/damp, even the default one, and stops taking into account the rest of the areas.
-			AREA_SPACE_OVERRIDE_REPLACE_COMBINE: This area replaces any gravity/damp calculated so far, but keeps calculating the rest of the areas, down to the default one.
+				Return the angular damp rate.
 			</description>
 		</method>
-		<method name="get_space_override_mode" qualifiers="const">
+		<method name="get_collision_mask" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the space override mode.
+				Return the physics layers this area can scan for collisions.
 			</description>
 		</method>
-		<method name="set_gravity_is_point">
-			<argument index="0" name="enable" type="bool">
-			</argument>
-			<description>
-			When overriding space parameters, this method sets whether this area has a center of gravity. To set/get the location of the center of gravity, use [method set_gravity_vector]/[method get_gravity_vector].
-			</description>
-		</method>
-		<method name="is_gravity_a_point" qualifiers="const">
+		<method name="get_collision_mask_bit" qualifiers="const">
 			<return type="bool">
 			</return>
+			<argument index="0" name="bit" type="int">
+			</argument>
 			<description>
-			Return whether gravity is a point. A point gravity will attract objects towards it, as opposed to a gravity vector, which moves them in a given direction.
+				Return an individual bit on the collision mask.
 			</description>
 		</method>
-		<method name="set_gravity_distance_scale">
-			<argument index="0" name="distance_scale" type="float">
-			</argument>
+		<method name="get_gravity" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the falloff factor for point gravity. The greater this value is, the faster the strength of gravity decreases with the square of distance.
+				Return the gravity intensity.
 			</description>
 		</method>
 		<method name="get_gravity_distance_scale" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the falloff factor for point gravity.
+				Return the falloff factor for point gravity.
 			</description>
 		</method>
-		<method name="set_gravity_vector">
-			<argument index="0" name="vector" type="Vector2">
-			</argument>
+		<method name="get_gravity_vector" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
-			Set the gravity vector. This vector does not have to be normalized.
-			If gravity is a point (see [method is_gravity_a_point]), this will be the attraction center.
+				Return the gravity vector. If gravity is a point (see [method is_gravity_a_point]), this will be the attraction center.
 			</description>
 		</method>
-		<method name="get_gravity_vector" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_layer_mask" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the gravity vector. If gravity is a point (see [method is_gravity_a_point]), this will be the attraction center.
+				Return the physics layer this area is in.
 			</description>
 		</method>
-		<method name="set_gravity">
-			<argument index="0" name="gravity" type="float">
+		<method name="get_layer_mask_bit" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="bit" type="int">
 			</argument>
 			<description>
-			Set the gravity intensity. This is useful to alter the force of gravity without altering its direction.
-			This value multiplies the gravity vector, whether it is the given vector ([method set_gravity_vector]), or a calculated one (when using a center of gravity).
+				Return an individual bit on the layer mask.
 			</description>
 		</method>
-		<method name="get_gravity" qualifiers="const">
+		<method name="get_linear_damp" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the gravity intensity.
+				Return the linear damp rate.
 			</description>
 		</method>
-		<method name="set_linear_damp">
-			<argument index="0" name="linear_damp" type="float">
-			</argument>
+		<method name="get_overlapping_areas" qualifiers="const">
+			<return type="Array">
+			</return>
 			<description>
-			Set the rate at which objects stop moving in this area, if there are not any other forces moving it. The value is a fraction of its current speed, lost per second. Thus, a value of 1.0 should mean stopping immediately, and 0.0 means the object never stops.
-			In practice, as the fraction of speed lost gets smaller with each frame, a value of 1.0 does not mean the object will stop in exactly one second. Only when the physics calculations are done at 1 frame per second, it does stop in a second.
+				Return a list of the areas that are totally or partially inside this area.
 			</description>
 		</method>
-		<method name="get_linear_damp" qualifiers="const">
+		<method name="get_overlapping_bodies" qualifiers="const">
+			<return type="Array">
+			</return>
+			<description>
+				Return a list of the bodies ([PhysicsBody2D]) that are totally or partially inside this area.
+			</description>
+		</method>
+		<method name="get_priority" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the linear damp rate.
+				Return the processing order of this area.
 			</description>
 		</method>
-		<method name="set_angular_damp">
-			<argument index="0" name="angular_damp" type="float">
-			</argument>
+		<method name="get_space_override_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the rate at which objects stop spinning in this area, if there are not any other forces making it spin. The value is a fraction of its current speed, lost per second. Thus, a value of 1.0 should mean stopping immediately, and 0.0 means the object never stops.
-			In practice, as the fraction of speed lost gets smaller with each frame, a value of 1.0 does not mean the object will stop in exactly one second. Only when the physics calculations are done at 1 frame per second, it does stop in a second.
+				Return the space override mode.
 			</description>
 		</method>
-		<method name="get_angular_damp" qualifiers="const">
-			<return type="float">
+		<method name="is_gravity_a_point" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the angular damp rate.
+				Return whether gravity is a point. A point gravity will attract objects towards it, as opposed to a gravity vector, which moves them in a given direction.
 			</description>
 		</method>
-		<method name="set_priority">
-			<argument index="0" name="priority" type="float">
-			</argument>
+		<method name="is_monitorable" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the order in which the area is processed. Greater values mean the area gets processed first. This is useful for areas which have an space override different from AREA_SPACE_OVERRIDE_DISABLED or AREA_SPACE_OVERRIDE_COMBINE, as they replace values, and are thus order-dependent.
-			Areas with the same priority value get evaluated in an unpredictable order, and should be differentiated if evaluation order is to be important.
+				Return whether this area can be detected by other, monitoring, areas.
 			</description>
 		</method>
-		<method name="get_priority" qualifiers="const">
-			<return type="float">
+		<method name="is_monitoring_enabled" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the processing order of this area.
+				Return whether this area detects bodies/areas entering/exiting it.
 			</description>
 		</method>
-		<method name="set_collision_mask">
-			<argument index="0" name="collision_mask" type="int">
+		<method name="overlaps_area" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="area" type="Object">
 			</argument>
 			<description>
-			Set the physics layers this area can scan for collisions.
+				Return whether the area passed is totally or partially inside this area.
 			</description>
 		</method>
-		<method name="get_collision_mask" qualifiers="const">
-			<return type="int">
+		<method name="overlaps_body" qualifiers="const">
+			<return type="bool">
 			</return>
+			<argument index="0" name="body" type="Object">
+			</argument>
 			<description>
-			Return the physics layers this area can scan for collisions.
+				Return whether the body passed is totally or partially inside this area.
 			</description>
 		</method>
-		<method name="set_layer_mask">
-			<argument index="0" name="layer_mask" type="int">
+		<method name="set_angular_damp">
+			<argument index="0" name="angular_damp" type="float">
 			</argument>
 			<description>
-			Set the physics layers this area is in.
-			Collidable objects can exist in any of 32 different layers. These layers are not visual, but more of a tagging system instead. A collidable can use these layers/tags to select with which objects it can collide, using [method set_collision_mask].
-			A contact is detected if object A is in any of the layers that object B scans, or object B is in any layer scanned by object A.
+				Set the rate at which objects stop spinning in this area, if there are not any other forces making it spin. The value is a fraction of its current speed, lost per second. Thus, a value of 1.0 should mean stopping immediately, and 0.0 means the object never stops.
+				In practice, as the fraction of speed lost gets smaller with each frame, a value of 1.0 does not mean the object will stop in exactly one second. Only when the physics calculations are done at 1 frame per second, it does stop in a second.
 			</description>
 		</method>
-		<method name="get_layer_mask" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_collision_mask">
+			<argument index="0" name="collision_mask" type="int">
+			</argument>
 			<description>
-			Return the physics layer this area is in.
+				Set the physics layers this area can scan for collisions.
 			</description>
 		</method>
 		<method name="set_collision_mask_bit">
@@ -4198,126 +4221,129 @@
 			<argument index="1" name="value" type="bool">
 			</argument>
 			<description>
-			Set/clear individual bits on the collision mask. This makes selecting the areas scanned easier.
+				Set/clear individual bits on the collision mask. This makes selecting the areas scanned easier.
 			</description>
 		</method>
-		<method name="get_collision_mask_bit" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="bit" type="int">
+		<method name="set_enable_monitoring">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Return an individual bit on the collision mask.
+				Set whether this area can detect bodies/areas entering/exiting it.
 			</description>
 		</method>
-		<method name="set_layer_mask_bit">
-			<argument index="0" name="bit" type="int">
-			</argument>
-			<argument index="1" name="value" type="bool">
+		<method name="set_gravity">
+			<argument index="0" name="gravity" type="float">
 			</argument>
 			<description>
-			Set/clear individual bits on the layer mask. This makes getting an area in/out of only one layer easier.
+				Set the gravity intensity. This is useful to alter the force of gravity without altering its direction.
+				This value multiplies the gravity vector, whether it is the given vector ([method set_gravity_vector]), or a calculated one (when using a center of gravity).
 			</description>
 		</method>
-		<method name="get_layer_mask_bit" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="bit" type="int">
+		<method name="set_gravity_distance_scale">
+			<argument index="0" name="distance_scale" type="float">
 			</argument>
 			<description>
-			Return an individual bit on the layer mask.
+				Set the falloff factor for point gravity. The greater this value is, the faster the strength of gravity decreases with the square of distance.
 			</description>
 		</method>
-		<method name="set_enable_monitoring">
+		<method name="set_gravity_is_point">
 			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Set whether this area can detect bodies/areas entering/exiting it.
+				When overriding space parameters, this method sets whether this area has a center of gravity. To set/get the location of the center of gravity, use [method set_gravity_vector]/[method get_gravity_vector].
 			</description>
 		</method>
-		<method name="is_monitoring_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_gravity_vector">
+			<argument index="0" name="vector" type="Vector2">
+			</argument>
 			<description>
-			Return whether this area detects bodies/areas entering/exiting it.
+				Set the gravity vector. This vector does not have to be normalized.
+				If gravity is a point (see [method is_gravity_a_point]), this will be the attraction center.
 			</description>
 		</method>
-		<method name="set_monitorable">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_layer_mask">
+			<argument index="0" name="layer_mask" type="int">
 			</argument>
 			<description>
-			Set whether this area can be detected by other, monitoring, areas. Only areas need to be marked as monitorable. Bodies are always so.
+				Set the physics layers this area is in.
+				Collidable objects can exist in any of 32 different layers. These layers are not visual, but more of a tagging system instead. A collidable can use these layers/tags to select with which objects it can collide, using [method set_collision_mask].
+				A contact is detected if object A is in any of the layers that object B scans, or object B is in any layer scanned by object A.
 			</description>
 		</method>
-		<method name="is_monitorable" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_layer_mask_bit">
+			<argument index="0" name="bit" type="int">
+			</argument>
+			<argument index="1" name="value" type="bool">
+			</argument>
 			<description>
-			Return whether this area can be detected by other, monitoring, areas.
+				Set/clear individual bits on the layer mask. This makes getting an area in/out of only one layer easier.
 			</description>
 		</method>
-		<method name="get_overlapping_bodies" qualifiers="const">
-			<return type="Array">
-			</return>
+		<method name="set_linear_damp">
+			<argument index="0" name="linear_damp" type="float">
+			</argument>
 			<description>
-			Return a list of the bodies ([PhysicsBody2D]) that are totally or partially inside this area.
+				Set the rate at which objects stop moving in this area, if there are not any other forces moving it. The value is a fraction of its current speed, lost per second. Thus, a value of 1.0 should mean stopping immediately, and 0.0 means the object never stops.
+				In practice, as the fraction of speed lost gets smaller with each frame, a value of 1.0 does not mean the object will stop in exactly one second. Only when the physics calculations are done at 1 frame per second, it does stop in a second.
 			</description>
 		</method>
-		<method name="get_overlapping_areas" qualifiers="const">
-			<return type="Array">
-			</return>
+		<method name="set_monitorable">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Return a list of the areas that are totally or partially inside this area.
+				Set whether this area can be detected by other, monitoring, areas. Only areas need to be marked as monitorable. Bodies are always so.
 			</description>
 		</method>
-		<method name="overlaps_body" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="body" type="Object">
+		<method name="set_priority">
+			<argument index="0" name="priority" type="float">
 			</argument>
 			<description>
-			Return whether the body passed is totally or partially inside this area.
+				Set the order in which the area is processed. Greater values mean the area gets processed first. This is useful for areas which have an space override different from AREA_SPACE_OVERRIDE_DISABLED or AREA_SPACE_OVERRIDE_COMBINE, as they replace values, and are thus order-dependent.
+				Areas with the same priority value get evaluated in an unpredictable order, and should be differentiated if evaluation order is to be important.
 			</description>
 		</method>
-		<method name="overlaps_area" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="area" type="Object">
+		<method name="set_space_override_mode">
+			<argument index="0" name="enable" type="int">
 			</argument>
 			<description>
-			Return whether the area passed is totally or partially inside this area.
+				Set the space override mode. This mode controls how an area affects gravity and damp.
+				AREA_SPACE_OVERRIDE_DISABLED: This area does not affect gravity/damp. These are generally areas that exist only to detect collisions, and objects entering or exiting them.
+				AREA_SPACE_OVERRIDE_COMBINE: This area adds its gravity/damp values to whatever has been calculated so far. This way, many overlapping areas can combine their physics to make interesting effects.
+				AREA_SPACE_OVERRIDE_COMBINE_REPLACE: This area adds its gravity/damp values to whatever has been calculated so far. Then stops taking into account the rest of the areas, even the default one.
+				AREA_SPACE_OVERRIDE_REPLACE: This area replaces any gravity/damp, even the default one, and stops taking into account the rest of the areas.
+				AREA_SPACE_OVERRIDE_REPLACE_COMBINE: This area replaces any gravity/damp calculated so far, but keeps calculating the rest of the areas, down to the default one.
 			</description>
 		</method>
 	</methods>
 	<signals>
-		<signal name="body_enter">
-			<argument index="0" name="body" type="Object">
+		<signal name="area_enter">
+			<argument index="0" name="area" type="Object">
 			</argument>
 			<description>
-			This signal is triggered only once when a body enters this area. The only parameter passed is the body that entered this area.
+				This signal is triggered only once when an area enters this area. The only parameter passed is the area that entered this area.
 			</description>
 		</signal>
-		<signal name="body_enter_shape">
-			<argument index="0" name="body_id" type="int">
+		<signal name="area_enter_shape">
+			<argument index="0" name="area_id" type="int">
 			</argument>
-			<argument index="1" name="body" type="Object">
+			<argument index="1" name="area" type="Object">
 			</argument>
-			<argument index="2" name="body_shape" type="int">
+			<argument index="2" name="area_shape" type="int">
 			</argument>
 			<argument index="3" name="area_shape" type="int">
 			</argument>
 			<description>
-			This signal triggers only once when a body enters this area. The first parameter is the body's [RID]. The second one is the body as an object. The third one is the index of the shape of the body that entered this area, and the fourth one is the index of the shape in this area that reported the entering.
+				This signal triggers only once when an area enters this area. The first parameter is the area's [RID]. The second one is the area as an object. The third one is the index of the shape entering this area, and the fourth one is the index of the shape in this area that reported the entering.
 			</description>
 		</signal>
-		<signal name="area_enter">
+		<signal name="area_exit">
 			<argument index="0" name="area" type="Object">
 			</argument>
 			<description>
-			This signal is triggered only once when an area enters this area. The only parameter passed is the area that entered this area.
+				This signal is triggered only once when an area exits this area. The only parameter passed is the area that exited this area.
 			</description>
 		</signal>
-		<signal name="area_enter_shape">
+		<signal name="area_exit_shape">
 			<argument index="0" name="area_id" type="int">
 			</argument>
 			<argument index="1" name="area" type="Object">
@@ -4327,17 +4353,17 @@
 			<argument index="3" name="area_shape" type="int">
 			</argument>
 			<description>
-			This signal triggers only once when an area enters this area. The first parameter is the area's [RID]. The second one is the area as an object. The third one is the index of the shape entering this area, and the fourth one is the index of the shape in this area that reported the entering.
+				This signal triggers only once when an area exits this area. The first parameter is the area's [RID]. The second one is the area as an object. The third one is the index of the shape entering this area, and the fourth one is the index of the shape in this area that reported the entering.
 			</description>
 		</signal>
-		<signal name="body_exit">
+		<signal name="body_enter">
 			<argument index="0" name="body" type="Object">
 			</argument>
 			<description>
-			This signal is triggered only once when a body exits this area. The only parameter passed is the body that exited this area.
+				This signal is triggered only once when a body enters this area. The only parameter passed is the body that entered this area.
 			</description>
 		</signal>
-		<signal name="body_exit_shape">
+		<signal name="body_enter_shape">
 			<argument index="0" name="body_id" type="int">
 			</argument>
 			<argument index="1" name="body" type="Object">
@@ -4347,27 +4373,27 @@
 			<argument index="3" name="area_shape" type="int">
 			</argument>
 			<description>
-			This signal triggers only once when a body exits this area. The first parameter is the body's [RID]. The second one is the body as an object. The third one is the index of the shape exiting this area, and the fourth one is the index of the shape in this area that reported the exit.
+				This signal triggers only once when a body enters this area. The first parameter is the body's [RID]. The second one is the body as an object. The third one is the index of the shape of the body that entered this area, and the fourth one is the index of the shape in this area that reported the entering.
 			</description>
 		</signal>
-		<signal name="area_exit">
-			<argument index="0" name="area" type="Object">
+		<signal name="body_exit">
+			<argument index="0" name="body" type="Object">
 			</argument>
 			<description>
-			This signal is triggered only once when an area exits this area. The only parameter passed is the area that exited this area.
+				This signal is triggered only once when a body exits this area. The only parameter passed is the body that exited this area.
 			</description>
 		</signal>
-		<signal name="area_exit_shape">
-			<argument index="0" name="area_id" type="int">
+		<signal name="body_exit_shape">
+			<argument index="0" name="body_id" type="int">
 			</argument>
-			<argument index="1" name="area" type="Object">
+			<argument index="1" name="body" type="Object">
 			</argument>
-			<argument index="2" name="area_shape" type="int">
+			<argument index="2" name="body_shape" type="int">
 			</argument>
 			<argument index="3" name="area_shape" type="int">
 			</argument>
 			<description>
-			This signal triggers only once when an area exits this area. The first parameter is the area's [RID]. The second one is the area as an object. The third one is the index of the shape entering this area, and the fourth one is the index of the shape in this area that reported the entering.
+				This signal triggers only once when a body exits this area. The first parameter is the body's [RID]. The second one is the body as an object. The third one is the index of the shape exiting this area, and the fourth one is the index of the shape in this area that reported the exit.
 			</description>
 		</signal>
 	</signals>
@@ -4376,22 +4402,85 @@
 </class>
 <class name="Array" category="Built-In Types">
 	<brief_description>
-	Generic array datatype.
+		Generic array datatype.
 	</brief_description>
 	<description>
-	Generic array, contains several elements of any type, accessible by numerical index starting at 0. Negative indices can be used to count from the right, like in Python. Arrays are always passed by reference.
+		Generic array, contains several elements of any type, accessible by numerical index starting at 0. Negative indices can be used to count from the right, like in Python. Arrays are always passed by reference.
 	</description>
 	<methods>
+		<method name="Array">
+			<return type="Array">
+			</return>
+			<argument index="0" name="from" type="ColorArray">
+			</argument>
+			<description>
+				Construct an array from a [RawArray].
+			</description>
+		</method>
+		<method name="Array">
+			<return type="Array">
+			</return>
+			<argument index="0" name="from" type="Vector3Array">
+			</argument>
+			<description>
+				Construct an array from a [RawArray].
+			</description>
+		</method>
+		<method name="Array">
+			<return type="Array">
+			</return>
+			<argument index="0" name="from" type="Vector2Array">
+			</argument>
+			<description>
+				Construct an array from a [RawArray].
+			</description>
+		</method>
+		<method name="Array">
+			<return type="Array">
+			</return>
+			<argument index="0" name="from" type="StringArray">
+			</argument>
+			<description>
+				Construct an array from a [RawArray].
+			</description>
+		</method>
+		<method name="Array">
+			<return type="Array">
+			</return>
+			<argument index="0" name="from" type="RealArray">
+			</argument>
+			<description>
+				Construct an array from a [RawArray].
+			</description>
+		</method>
+		<method name="Array">
+			<return type="Array">
+			</return>
+			<argument index="0" name="from" type="IntArray">
+			</argument>
+			<description>
+				Construct an array from a [RawArray].
+			</description>
+		</method>
+		<method name="Array">
+			<return type="Array">
+			</return>
+			<argument index="0" name="from" type="RawArray">
+			</argument>
+			<description>
+				Construct an array from a [RawArray].
+			</description>
+		</method>
 		<method name="append">
 			<argument index="0" name="value" type="var">
 			</argument>
 			<description>
-			Append an element at the end of the array (alias of [method push_back]).
+				Append an element at the end of the array (alias of [method push_back]).
 			</description>
 		</method>
 		<method name="clear">
 			<description>
-			Clear the array (resize to 0).
+				Clear the array (resize to 0).
 			</description>
 		</method>
 		<method name="count">
@@ -4400,21 +4489,21 @@
 			<argument index="0" name="value" type="var">
 			</argument>
 			<description>
-			Return the amount of times an element is in the array.
+				Return the amount of times an element is in the array.
 			</description>
 		</method>
 		<method name="empty">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if the array is empty (size==0).
+				Return true if the array is empty (size==0).
 			</description>
 		</method>
 		<method name="erase">
 			<argument index="0" name="value" type="var">
 			</argument>
 			<description>
-			Remove the first occurrence of a value from the array.
+				Remove the first occurrence of a value from the array.
 			</description>
 		</method>
 		<method name="find">
@@ -4425,7 +4514,7 @@
 			<argument index="1" name="from" type="int" default="0">
 			</argument>
 			<description>
-			Searches the array for a value and returns its index or -1 if not found. Optionally, the initial search index can be passed.
+				Searches the array for a value and returns its index or -1 if not found. Optionally, the initial search index can be passed.
 			</description>
 		</method>
 		<method name="find_last">
@@ -4434,14 +4523,14 @@
 			<argument index="0" name="value" type="var">
 			</argument>
 			<description>
-			Searches the array in reverse order for a value and returns its index or -1 if not found.
+				Searches the array in reverse order for a value and returns its index or -1 if not found.
 			</description>
 		</method>
 		<method name="hash">
 			<return type="int">
 			</return>
 			<description>
-			Return a hashed integer value representing the array contents.
+				Return a hashed integer value representing the array contents.
 			</description>
 		</method>
 		<method name="insert">
@@ -4450,57 +4539,57 @@
 			<argument index="1" name="value" type="var">
 			</argument>
 			<description>
-			Insert a new element at a given position in the array. The position must be valid, or at the end of the array (pos==size()).
+				Insert a new element at a given position in the array. The position must be valid, or at the end of the array (pos==size()).
 			</description>
 		</method>
 		<method name="invert">
 			<description>
-			Reverse the order of the elements in the array (so first element will now be the last).
+				Reverse the order of the elements in the array (so first element will now be the last).
 			</description>
 		</method>
 		<method name="is_shared">
 			<return type="bool">
 			</return>
 			<description>
-			Get whether this is a shared array instance.
+				Get whether this is a shared array instance.
 			</description>
 		</method>
 		<method name="pop_back">
 			<description>
-			Remove the last element of the array.
+				Remove the last element of the array.
 			</description>
 		</method>
 		<method name="pop_front">
 			<description>
-			Remove the first element of the array.
+				Remove the first element of the array.
 			</description>
 		</method>
 		<method name="push_back">
 			<argument index="0" name="value" type="var">
 			</argument>
 			<description>
-			Append an element at the end of the array.
+				Append an element at the end of the array.
 			</description>
 		</method>
 		<method name="push_front">
 			<argument index="0" name="value" type="var">
 			</argument>
 			<description>
-			Add an element at the beginning of the array.
+				Add an element at the beginning of the array.
 			</description>
 		</method>
 		<method name="remove">
 			<argument index="0" name="pos" type="int">
 			</argument>
 			<description>
-			Remove an element from the array by index.
+				Remove an element from the array by index.
 			</description>
 		</method>
 		<method name="resize">
 			<argument index="0" name="pos" type="int">
 			</argument>
 			<description>
-			Resize the array to contain a different number of elements. If the array size is smaller, elements are cleared, if bigger, new elements are Null.
+				Resize the array to contain a different number of elements. If the array size is smaller, elements are cleared, if bigger, new elements are Null.
 			</description>
 		</method>
 		<method name="rfind">
@@ -4511,19 +4600,19 @@
 			<argument index="1" name="from" type="int" default="-1">
 			</argument>
 			<description>
-			Searches the array in reverse order. Optionally, a start search index can be passed. If negative, the start index is considered relative to the end of the array.
+				Searches the array in reverse order. Optionally, a start search index can be passed. If negative, the start index is considered relative to the end of the array.
 			</description>
 		</method>
 		<method name="size">
 			<return type="int">
 			</return>
 			<description>
-			Return the amount of elements in the array.
+				Return the amount of elements in the array.
 			</description>
 		</method>
 		<method name="sort">
 			<description>
-			Sort the array using natural order.
+				Sort the array using natural order.
 			</description>
 		</method>
 		<method name="sort_custom">
@@ -4532,130 +4621,101 @@
 			<argument index="1" name="func" type="String">
 			</argument>
 			<description>
-			Sort the array using a custom method. The arguments are an object that holds the method and the name of such method. The custom method receives two arguments (a pair of elements from the array) and must return true if the first argument is less than the second, and return false otherwise.
+				Sort the array using a custom method. The arguments are an object that holds the method and the name of such method. The custom method receives two arguments (a pair of elements from the array) and must return true if the first argument is less than the second, and return false otherwise.
 			</description>
 		</method>
-		<method name="Array">
-			<return type="Array">
+	</methods>
+	<constants>
+	</constants>
+</class>
+<class name="AtlasTexture" inherits="Texture" category="Core">
+	<brief_description>
+	</brief_description>
+	<description>
+	</description>
+	<methods>
+		<method name="get_atlas" qualifiers="const">
+			<return type="Texture">
 			</return>
-			<argument index="0" name="from" type="RawArray">
-			</argument>
 			<description>
-			Construct an array from a [RawArray].
 			</description>
 		</method>
-		<method name="Array">
-			<return type="Array">
+		<method name="get_margin" qualifiers="const">
+			<return type="Rect2">
 			</return>
-			<argument index="0" name="from" type="IntArray">
-			</argument>
 			<description>
-			Construct an array from a [RawArray].
 			</description>
 		</method>
-		<method name="Array">
-			<return type="Array">
+		<method name="get_region" qualifiers="const">
+			<return type="Rect2">
 			</return>
-			<argument index="0" name="from" type="RealArray">
-			</argument>
 			<description>
-			Construct an array from a [RawArray].
 			</description>
 		</method>
-		<method name="Array">
-			<return type="Array">
-			</return>
-			<argument index="0" name="from" type="StringArray">
+		<method name="set_atlas">
+			<argument index="0" name="atlas" type="Texture">
 			</argument>
 			<description>
-			Construct an array from a [RawArray].
 			</description>
 		</method>
-		<method name="Array">
-			<return type="Array">
-			</return>
-			<argument index="0" name="from" type="Vector2Array">
+		<method name="set_margin">
+			<argument index="0" name="margin" type="Rect2">
 			</argument>
 			<description>
-			Construct an array from a [RawArray].
 			</description>
 		</method>
-		<method name="Array">
-			<return type="Array">
-			</return>
-			<argument index="0" name="from" type="Vector3Array">
+		<method name="set_region">
+			<argument index="0" name="region" type="Rect2">
 			</argument>
 			<description>
-			Construct an array from a [RawArray].
 			</description>
 		</method>
-		<method name="Array">
-			<return type="Array">
-			</return>
-			<argument index="0" name="from" type="ColorArray">
-			</argument>
+	</methods>
+	<signals>
+		<signal name="atlas_changed">
 			<description>
-			Construct an array from a [RawArray].
 			</description>
-		</method>
-	</methods>
+		</signal>
+	</signals>
 	<constants>
 	</constants>
 </class>
-<class name="AtlasTexture" inherits="Texture" category="Core">
+<class name="AudioServer" inherits="Object" category="Core">
 	<brief_description>
+		Server interface for low level audio access.
 	</brief_description>
 	<description>
+		AudioServer is a low level server interface for audio access. It is in charge of creating sample data (playable audio) as well as its playback via a voice interface.
 	</description>
 	<methods>
-		<method name="set_atlas">
-			<argument index="0" name="atlas" type="Texture">
+		<method name="free_rid">
+			<argument index="0" name="rid" type="RID">
 			</argument>
 			<description>
+				Free a [RID] resource.
 			</description>
 		</method>
-		<method name="get_atlas" qualifiers="const">
-			<return type="Texture">
+		<method name="get_event_voice_global_volume_scale" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
+				Return the global scale for event-based stream playback.
 			</description>
 		</method>
-		<method name="set_region">
-			<argument index="0" name="region" type="Rect2">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_region" qualifiers="const">
-			<return type="Rect2">
+		<method name="get_fx_global_volume_scale" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
+				Return the global scale for all voices.
 			</description>
 		</method>
-		<method name="set_margin">
-			<argument index="0" name="margin" type="Rect2">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_margin" qualifiers="const">
-			<return type="Rect2">
+		<method name="get_stream_global_volume_scale" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
+				Return the global scale for stream playback.
 			</description>
 		</method>
-	</methods>
-	<constants>
-	</constants>
-</class>
-<class name="AudioServer" inherits="Object" category="Core">
-	<brief_description>
-	Server interface for low level audio access.
-	</brief_description>
-	<description>
-	AudioServer is a low level server interface for audio access. It is in charge of creating sample data (playable audio) as well as its playback via a voice interface.
-	</description>
-	<methods>
 		<method name="sample_create">
 			<return type="RID">
 			</return>
@@ -4666,17 +4726,17 @@
 			<argument index="2" name="length" type="int">
 			</argument>
 			<description>
-			Create an audio sample, return a [RID] referencing it. The sample will be created with a given format (from the SAMPLE_FORMAT_* enum), a total length (in samples, not bytes), in either stereo or mono.
-			Even if a stereo sample consists of a left sample and a right sample, it still counts as one sample for length purposes.
+				Create an audio sample, return a [RID] referencing it. The sample will be created with a given format (from the SAMPLE_FORMAT_* enum), a total length (in samples, not bytes), in either stereo or mono.
+				Even if a stereo sample consists of a left sample and a right sample, it still counts as one sample for length purposes.
 			</description>
 		</method>
-		<method name="sample_set_description">
+		<method name="sample_get_data" qualifiers="const">
+			<return type="RawArray">
+			</return>
 			<argument index="0" name="sample" type="RID">
 			</argument>
-			<argument index="1" name="description" type="String">
-			</argument>
 			<description>
-			Set the description of an audio sample. Mainly used for organization.
+				Return the sample data as an array of bytes. The length will be the expected length in bytes.
 			</description>
 		</method>
 		<method name="sample_get_description" qualifiers="const">
@@ -4685,7 +4745,7 @@
 			<argument index="0" name="sample" type="RID">
 			</argument>
 			<description>
-			Return the description of an audio sample. Mainly used for organization.
+				Return the description of an audio sample. Mainly used for organization.
 			</description>
 		</method>
 		<method name="sample_get_format" qualifiers="const">
@@ -4694,16 +4754,7 @@
 			<argument index="0" name="sample" type="RID">
 			</argument>
 			<description>
-			Return the format of the audio sample, in the form of the SAMPLE_FORMAT_* enum.
-			</description>
-		</method>
-		<method name="sample_is_stereo" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="sample" type="RID">
-			</argument>
-			<description>
-			Return whether the sample is stereo (2 channels).
+				Return the format of the audio sample, in the form of the SAMPLE_FORMAT_* enum.
 			</description>
 		</method>
 		<method name="sample_get_length" qualifiers="const">
@@ -4712,76 +4763,74 @@
 			<argument index="0" name="sample" type="RID">
 			</argument>
 			<description>
-			Return the length in samples (not bytes) of the audio sample. Even if a stereo sample consists of a left sample and a right sample, it still counts as one sample for length purposes.
+				Return the length in samples (not bytes) of the audio sample. Even if a stereo sample consists of a left sample and a right sample, it still counts as one sample for length purposes.
 			</description>
 		</method>
-		<method name="sample_set_signed_data">
+		<method name="sample_get_loop_begin" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="sample" type="RID">
 			</argument>
-			<argument index="1" name="data" type="RealArray">
-			</argument>
 			<description>
-			Set the sample data for a given sample as an array of floats. The length must be equal to the sample length or an error will be produced.
-			For this method, a stereo sample is made from two samples. Thus, in case of a stereo sample, the array length must be twice the length returned by [method sample_get_length].
-			Trying to alter a SAMPLE_FORMAT_IMA_ADPCM sample is not supported. It will throw an error to the console, but will not alter the sample data.
+				Return the initial loop point of a sample. Only has effect if sample loop is enabled. See [method sample_set_loop_format].
 			</description>
 		</method>
-		<method name="sample_set_data">
+		<method name="sample_get_loop_end" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="sample" type="RID">
 			</argument>
-			<argument index="1" name="data" type="RawArray">
-			</argument>
 			<description>
-			Set the sample data for a given sample as an array of bytes. The length must be equal to the sample length expected in bytes or an error will be produced. The byte length can be calculated as follows:
-			Get the sample length ([method sample_get_length]).
-			If the sample format is SAMPLE_FORMAT_PCM16, multiply it by 2.
-			If the sample format is SAMPLE_FORMAT_IMA_ADPCM, divide it by 2 (rounding any fraction up), then add 4.
-			If the sample is stereo ([method sample_is_stereo]), multiply it by 2.
+				Return the final loop point of a sample. Only has effect if sample loop is enabled. See [method sample_set_loop_format].
 			</description>
 		</method>
-		<method name="sample_get_data" qualifiers="const">
-			<return type="RawArray">
+		<method name="sample_get_loop_format" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="sample" type="RID">
 			</argument>
 			<description>
-			Return the sample data as an array of bytes. The length will be the expected length in bytes.
+				Return the loop format for a sample, as a value from the SAMPLE_LOOP_* enum.
 			</description>
 		</method>
-		<method name="sample_set_mix_rate">
+		<method name="sample_get_mix_rate" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="sample" type="RID">
 			</argument>
-			<argument index="1" name="mix_rate" type="int">
-			</argument>
 			<description>
-			Change the default mix rate of a given sample.
+				Return the mix rate of the given sample.
 			</description>
 		</method>
-		<method name="sample_get_mix_rate" qualifiers="const">
-			<return type="int">
+		<method name="sample_is_stereo" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="sample" type="RID">
 			</argument>
 			<description>
-			Return the mix rate of the given sample.
+				Return whether the sample is stereo (2 channels).
 			</description>
 		</method>
-		<method name="sample_set_loop_format">
+		<method name="sample_set_data">
 			<argument index="0" name="sample" type="RID">
 			</argument>
-			<argument index="1" name="loop_format" type="int">
+			<argument index="1" name="data" type="RawArray">
 			</argument>
 			<description>
-			Set the loop format for a sample from the SAMPLE_LOOP_* enum. As a warning, Ping Pong loops may not be available on some hardware-mixing platforms.
+				Set the sample data for a given sample as an array of bytes. The length must be equal to the sample length expected in bytes or an error will be produced. The byte length can be calculated as follows:
+				Get the sample length ([method sample_get_length]).
+				If the sample format is SAMPLE_FORMAT_PCM16, multiply it by 2.
+				If the sample format is SAMPLE_FORMAT_IMA_ADPCM, divide it by 2 (rounding any fraction up), then add 4.
+				If the sample is stereo ([method sample_is_stereo]), multiply it by 2.
 			</description>
 		</method>
-		<method name="sample_get_loop_format" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="sample_set_description">
 			<argument index="0" name="sample" type="RID">
 			</argument>
+			<argument index="1" name="description" type="String">
+			</argument>
 			<description>
-			Return the loop format for a sample, as a value from the SAMPLE_LOOP_* enum.
+				Set the description of an audio sample. Mainly used for organization.
 			</description>
 		</method>
 		<method name="sample_set_loop_begin">
@@ -4790,16 +4839,7 @@
 			<argument index="1" name="pos" type="int">
 			</argument>
 			<description>
-			Set the initial loop point of a sample. Only has effect if sample loop is enabled. See [method sample_set_loop_format].
-			</description>
-		</method>
-		<method name="sample_get_loop_begin" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="sample" type="RID">
-			</argument>
-			<description>
-			Return the initial loop point of a sample. Only has effect if sample loop is enabled. See [method sample_set_loop_format].
+				Set the initial loop point of a sample. Only has effect if sample loop is enabled. See [method sample_set_loop_format].
 			</description>
 		</method>
 		<method name="sample_set_loop_end">
@@ -4808,179 +4848,145 @@
 			<argument index="1" name="pos" type="int">
 			</argument>
 			<description>
-			Set the final loop point of a sample. Only has effect if sample loop is enabled. See [method sample_set_loop_format].
+				Set the final loop point of a sample. Only has effect if sample loop is enabled. See [method sample_set_loop_format].
 			</description>
 		</method>
-		<method name="sample_get_loop_end" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="sample_set_loop_format">
 			<argument index="0" name="sample" type="RID">
 			</argument>
-			<description>
-			Return the final loop point of a sample. Only has effect if sample loop is enabled. See [method sample_set_loop_format].
-			</description>
-		</method>
-		<method name="voice_create">
-			<return type="RID">
-			</return>
-			<description>
-			Allocate a voice for playback. Voices are persistent. A voice can play a single sample at the same time. See [method sample_create].
-			</description>
-		</method>
-		<method name="voice_play">
-			<argument index="0" name="voice" type="RID">
-			</argument>
-			<argument index="1" name="sample" type="RID">
+			<argument index="1" name="loop_format" type="int">
 			</argument>
 			<description>
-			Start playback of a given voice using a given sample. If the voice was already playing it will be restarted.
+				Set the loop format for a sample from the SAMPLE_LOOP_* enum. As a warning, Ping Pong loops may not be available on some hardware-mixing platforms.
 			</description>
 		</method>
-		<method name="voice_set_volume">
-			<argument index="0" name="voice" type="RID">
+		<method name="sample_set_mix_rate">
+			<argument index="0" name="sample" type="RID">
 			</argument>
-			<argument index="1" name="volume" type="float">
+			<argument index="1" name="mix_rate" type="int">
 			</argument>
 			<description>
-			Change the volume of a currently playing voice. Volume is expressed as linear gain where 0.0 is mute and 1.0 is default.
+				Change the default mix rate of a given sample.
 			</description>
 		</method>
-		<method name="voice_set_pan">
-			<argument index="0" name="voice" type="RID">
-			</argument>
-			<argument index="1" name="pan" type="float">
-			</argument>
-			<argument index="2" name="depth" type="float" default="0">
+		<method name="sample_set_signed_data">
+			<argument index="0" name="sample" type="RID">
 			</argument>
-			<argument index="3" name="height" type="float" default="0">
+			<argument index="1" name="data" type="RealArray">
 			</argument>
 			<description>
-			Change the pan of a currently playing voice and, optionally, the depth and height for a positional/3D sound. Panning values are expressed within the -1 to +1 range.
+				Set the sample data for a given sample as an array of floats. The length must be equal to the sample length or an error will be produced.
+				For this method, a stereo sample is made from two samples. Thus, in case of a stereo sample, the array length must be twice the length returned by [method sample_get_length].
+				Trying to alter a SAMPLE_FORMAT_IMA_ADPCM sample is not supported. It will throw an error to the console, but will not alter the sample data.
 			</description>
 		</method>
-		<method name="voice_set_filter">
-			<argument index="0" name="voice" type="RID">
-			</argument>
-			<argument index="1" name="type" type="int">
-			</argument>
-			<argument index="2" name="cutoff" type="float">
-			</argument>
-			<argument index="3" name="resonance" type="float">
-			</argument>
-			<argument index="4" name="gain" type="float" default="0">
+		<method name="set_event_voice_global_volume_scale">
+			<argument index="0" name="scale" type="float">
 			</argument>
 			<description>
-			Set a resonant filter post processing for the voice. Filter type is a value from the FILTER_* enum.
+				Set global scale for event-based stream ([EventStream]) playback. Default is 1.0.
 			</description>
 		</method>
-		<method name="voice_set_chorus">
-			<argument index="0" name="voice" type="RID">
-			</argument>
-			<argument index="1" name="chorus" type="float">
+		<method name="set_fx_global_volume_scale">
+			<argument index="0" name="scale" type="float">
 			</argument>
 			<description>
-			Set chorus send post processing for the voice (from 0 to 1).
+				Set global scale for all voices (not including streams). Default is 1.0.
 			</description>
 		</method>
-		<method name="voice_set_reverb">
-			<argument index="0" name="voice" type="RID">
-			</argument>
-			<argument index="1" name="room" type="int">
-			</argument>
-			<argument index="2" name="reverb" type="float">
+		<method name="set_stream_global_volume_scale">
+			<argument index="0" name="scale" type="float">
 			</argument>
 			<description>
-			Set the reverb send post processing for the voice (from 0 to 1) and the reverb type, from the REVERB_* enum.
+				Set global scale for stream playback. Default is 1.0.
 			</description>
 		</method>
-		<method name="voice_set_mix_rate">
-			<argument index="0" name="voice" type="RID">
-			</argument>
-			<argument index="1" name="rate" type="int">
-			</argument>
+		<method name="voice_create">
+			<return type="RID">
+			</return>
 			<description>
-			Set a different playback mix rate for the given voice.
+				Allocate a voice for playback. Voices are persistent. A voice can play a single sample at the same time. See [method sample_create].
 			</description>
 		</method>
-		<method name="voice_set_positional">
+		<method name="voice_get_chorus" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="voice" type="RID">
 			</argument>
-			<argument index="1" name="enabled" type="bool">
-			</argument>
 			<description>
-			Set whether a given voice is positional. This is only interpreted as a hint and used for backends that may support binaural encoding.
+				Return the current chorus send for a given voice (0 to 1).
 			</description>
 		</method>
-		<method name="voice_get_volume" qualifiers="const">
+		<method name="voice_get_filter_cutoff" qualifiers="const">
 			<return type="float">
 			</return>
 			<argument index="0" name="voice" type="RID">
 			</argument>
 			<description>
-			Return the current volume for a given voice.
+				Return the current filter cutoff (in hz) for a given voice.
 			</description>
 		</method>
-		<method name="voice_get_pan" qualifiers="const">
+		<method name="voice_get_filter_resonance" qualifiers="const">
 			<return type="float">
 			</return>
 			<argument index="0" name="voice" type="RID">
 			</argument>
 			<description>
-			Return the current pan for a given voice (-1 to +1 range).
+				Return the current filter resonance for a given voice.
 			</description>
 		</method>
-		<method name="voice_get_pan_height" qualifiers="const">
-			<return type="float">
+		<method name="voice_get_filter_type" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="voice" type="RID">
 			</argument>
 			<description>
-			Return the current pan height for a given voice (-1 to +1 range).
+				Return the current selected filter type for a given voice, from the FILTER_* enum.
 			</description>
 		</method>
-		<method name="voice_get_pan_depth" qualifiers="const">
-			<return type="float">
+		<method name="voice_get_mix_rate" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="voice" type="RID">
 			</argument>
 			<description>
-			Return the current pan depth for a given voice (-1 to +1 range).
+				Return the current mix rate for a given voice.
 			</description>
 		</method>
-		<method name="voice_get_filter_type" qualifiers="const">
-			<return type="int">
+		<method name="voice_get_pan" qualifiers="const">
+			<return type="float">
 			</return>
 			<argument index="0" name="voice" type="RID">
 			</argument>
 			<description>
-			Return the current selected filter type for a given voice, from the FILTER_* enum.
+				Return the current pan for a given voice (-1 to +1 range).
 			</description>
 		</method>
-		<method name="voice_get_filter_cutoff" qualifiers="const">
+		<method name="voice_get_pan_depth" qualifiers="const">
 			<return type="float">
 			</return>
 			<argument index="0" name="voice" type="RID">
 			</argument>
 			<description>
-			Return the current filter cutoff (in hz) for a given voice.
+				Return the current pan depth for a given voice (-1 to +1 range).
 			</description>
 		</method>
-		<method name="voice_get_filter_resonance" qualifiers="const">
+		<method name="voice_get_pan_height" qualifiers="const">
 			<return type="float">
 			</return>
 			<argument index="0" name="voice" type="RID">
 			</argument>
 			<description>
-			Return the current filter resonance for a given voice.
+				Return the current pan height for a given voice (-1 to +1 range).
 			</description>
 		</method>
-		<method name="voice_get_chorus" qualifiers="const">
+		<method name="voice_get_reverb" qualifiers="const">
 			<return type="float">
 			</return>
 			<argument index="0" name="voice" type="RID">
 			</argument>
 			<description>
-			Return the current chorus send for a given voice (0 to 1).
+				Return the current reverb send for a given voice (0 to 1).
 			</description>
 		</method>
 		<method name="voice_get_reverb_type" qualifiers="const">
@@ -4989,90 +4995,116 @@
 			<argument index="0" name="voice" type="RID">
 			</argument>
 			<description>
-			Return the current reverb type for a given voice from the REVERB_* enum.
+				Return the current reverb type for a given voice from the REVERB_* enum.
 			</description>
 		</method>
-		<method name="voice_get_reverb" qualifiers="const">
+		<method name="voice_get_volume" qualifiers="const">
 			<return type="float">
 			</return>
 			<argument index="0" name="voice" type="RID">
 			</argument>
 			<description>
-			Return the current reverb send for a given voice (0 to 1).
+				Return the current volume for a given voice.
 			</description>
 		</method>
-		<method name="voice_get_mix_rate" qualifiers="const">
-			<return type="int">
+		<method name="voice_is_positional" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="voice" type="RID">
 			</argument>
 			<description>
-			Return the current mix rate for a given voice.
+				Return whether the current voice is positional. See [method voice_set_positional].
 			</description>
 		</method>
-		<method name="voice_is_positional" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="voice_play">
 			<argument index="0" name="voice" type="RID">
 			</argument>
+			<argument index="1" name="sample" type="RID">
+			</argument>
 			<description>
-			Return whether the current voice is positional. See [method voice_set_positional].
+				Start playback of a given voice using a given sample. If the voice was already playing it will be restarted.
 			</description>
 		</method>
-		<method name="voice_stop">
+		<method name="voice_set_chorus">
 			<argument index="0" name="voice" type="RID">
 			</argument>
+			<argument index="1" name="chorus" type="float">
+			</argument>
 			<description>
-			Stop a given voice.
+				Set chorus send post processing for the voice (from 0 to 1).
 			</description>
 		</method>
-		<method name="free_rid">
-			<argument index="0" name="rid" type="RID">
+		<method name="voice_set_filter">
+			<argument index="0" name="voice" type="RID">
+			</argument>
+			<argument index="1" name="type" type="int">
+			</argument>
+			<argument index="2" name="cutoff" type="float">
+			</argument>
+			<argument index="3" name="resonance" type="float">
+			</argument>
+			<argument index="4" name="gain" type="float" default="0">
 			</argument>
 			<description>
-			Free a [RID] resource.
+				Set a resonant filter post processing for the voice. Filter type is a value from the FILTER_* enum.
 			</description>
 		</method>
-		<method name="set_stream_global_volume_scale">
-			<argument index="0" name="scale" type="float">
+		<method name="voice_set_mix_rate">
+			<argument index="0" name="voice" type="RID">
+			</argument>
+			<argument index="1" name="rate" type="int">
 			</argument>
 			<description>
-			Set global scale for stream playback. Default is 1.0.
+				Set a different playback mix rate for the given voice.
 			</description>
 		</method>
-		<method name="get_stream_global_volume_scale" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="voice_set_pan">
+			<argument index="0" name="voice" type="RID">
+			</argument>
+			<argument index="1" name="pan" type="float">
+			</argument>
+			<argument index="2" name="depth" type="float" default="0">
+			</argument>
+			<argument index="3" name="height" type="float" default="0">
+			</argument>
 			<description>
-			Return the global scale for stream playback.
+				Change the pan of a currently playing voice and, optionally, the depth and height for a positional/3D sound. Panning values are expressed within the -1 to +1 range.
 			</description>
 		</method>
-		<method name="set_fx_global_volume_scale">
-			<argument index="0" name="scale" type="float">
+		<method name="voice_set_positional">
+			<argument index="0" name="voice" type="RID">
+			</argument>
+			<argument index="1" name="enabled" type="bool">
 			</argument>
 			<description>
-			Set global scale for all voices (not including streams). Default is 1.0.
+				Set whether a given voice is positional. This is only interpreted as a hint and used for backends that may support binaural encoding.
 			</description>
 		</method>
-		<method name="get_fx_global_volume_scale" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="voice_set_reverb">
+			<argument index="0" name="voice" type="RID">
+			</argument>
+			<argument index="1" name="room" type="int">
+			</argument>
+			<argument index="2" name="reverb" type="float">
+			</argument>
 			<description>
-			Return the global scale for all voices.
+				Set the reverb send post processing for the voice (from 0 to 1) and the reverb type, from the REVERB_* enum.
 			</description>
 		</method>
-		<method name="set_event_voice_global_volume_scale">
-			<argument index="0" name="scale" type="float">
+		<method name="voice_set_volume">
+			<argument index="0" name="voice" type="RID">
+			</argument>
+			<argument index="1" name="volume" type="float">
 			</argument>
 			<description>
-			Set global scale for event-based stream ([EventStream]) playback. Default is 1.0.
+				Change the volume of a currently playing voice. Volume is expressed as linear gain where 0.0 is mute and 1.0 is default.
 			</description>
 		</method>
-		<method name="get_event_voice_global_volume_scale" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="voice_stop">
+			<argument index="0" name="voice" type="RID">
+			</argument>
 			<description>
-			Return the global scale for event-based stream playback.
+				Stop a given voice.
 			</description>
 		</method>
 	</methods>
@@ -5129,11 +5161,11 @@
 </class>
 <class name="AudioServerSW" inherits="AudioServer" category="Core">
 	<brief_description>
-	Software implementation of [AudioServer].
+		Software implementation of [AudioServer].
 	</brief_description>
 	<description>
-	This is a software audio server. It does not use any kind of hardware acceleration.
-	This class does not expose any new method.
+		This is a software audio server. It does not use any kind of hardware acceleration.
+		This class does not expose any new method.
 	</description>
 	<methods>
 	</methods>
@@ -5142,10 +5174,10 @@
 </class>
 <class name="AudioStream" inherits="Resource" category="Core">
 	<brief_description>
-	Base class for audio streams.
+		Base class for audio streams.
 	</brief_description>
 	<description>
-	Base class for audio streams. Audio streams are used for music playback, or other types of streamed sounds that don't fit or require more flexibility than a [Sample].
+		Base class for audio streams. Audio streams are used for music playback, or other types of streamed sounds that don't fit or require more flexibility than a [Sample].
 	</description>
 	<methods>
 	</methods>
@@ -5154,10 +5186,10 @@
 </class>
 <class name="AudioStreamMPC" inherits="AudioStream" category="Core">
 	<brief_description>
-	MusePack audio stream driver.
+		MusePack audio stream driver.
 	</brief_description>
 	<description>
-	MusePack audio stream driver.
+		MusePack audio stream driver.
 	</description>
 	<methods>
 	</methods>
@@ -5166,10 +5198,10 @@
 </class>
 <class name="AudioStreamOGGVorbis" inherits="AudioStream" category="Core">
 	<brief_description>
-	OGG Vorbis audio stream driver.
+		OGG Vorbis audio stream driver.
 	</brief_description>
 	<description>
-	OGG Vorbis audio stream driver.
+		OGG Vorbis audio stream driver.
 	</description>
 	<methods>
 	</methods>
@@ -5178,10 +5210,10 @@
 </class>
 <class name="AudioStreamOpus" inherits="AudioStream" category="Core">
 	<brief_description>
-	Opus Codec audio stream driver.
+		Opus Codec audio stream driver.
 	</brief_description>
 	<description>
-	Opus Codec audio stream driver.
+		Opus Codec audio stream driver.
 	</description>
 	<methods>
 	</methods>
@@ -5194,73 +5226,73 @@
 	<description>
 	</description>
 	<methods>
-		<method name="play">
-			<argument index="0" name="from_pos_sec" type="float" default="0">
-			</argument>
+		<method name="get_channels" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="stop">
+		<method name="get_length" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="is_playing" qualifiers="const">
-			<return type="bool">
+		<method name="get_loop_count" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_loop">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
+		<method name="get_minimum_buffer_size" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="has_loop" qualifiers="const">
-			<return type="bool">
+		<method name="get_mix_rate" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_loop_count" qualifiers="const">
-			<return type="int">
+		<method name="get_pos" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="seek_pos">
-			<argument index="0" name="pos" type="float">
-			</argument>
+		<method name="has_loop" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_pos" qualifiers="const">
-			<return type="float">
+		<method name="is_playing" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_length" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="play">
+			<argument index="0" name="from_pos_sec" type="float" default="0">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_channels" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="seek_pos">
+			<argument index="0" name="pos" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_mix_rate" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_loop">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_minimum_buffer_size" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="stop">
 			<description>
 			</description>
 		</method>
@@ -5270,10 +5302,10 @@
 </class>
 <class name="AudioStreamSpeex" inherits="AudioStream" category="Core">
 	<brief_description>
-	Speex audio stream driver.
+		Speex audio stream driver.
 	</brief_description>
 	<description>
-	Speex audio stream driver. Speex is very useful for compressed speech. It allows loading a very large amount of speech in memory at little IO/latency cost.
+		Speex audio stream driver. Speex is very useful for compressed speech. It allows loading a very large amount of speech in memory at little IO/latency cost.
 	</description>
 	<methods>
 	</methods>
@@ -5282,38 +5314,38 @@
 </class>
 <class name="BackBufferCopy" inherits="Node2D" category="Core">
 	<brief_description>
-	Copies a region of the screen (or the whole screen) to a buffer so it can be accessed with the texscreen() shader instruction.
+		Copies a region of the screen (or the whole screen) to a buffer so it can be accessed with the texscreen() shader instruction.
 	</brief_description>
 	<description>
-	Node for back-buffering the currently displayed screen. The region defined in the BackBufferCopy node is bufferized with the content of the screen it covers, or the entire screen according to the copy mode set. Accessing this buffer is done with the texscreen() shader instruction.
+		Node for back-buffering the currently displayed screen. The region defined in the BackBufferCopy node is bufferized with the content of the screen it covers, or the entire screen according to the copy mode set. Accessing this buffer is done with the texscreen() shader instruction.
 	</description>
 	<methods>
-		<method name="set_rect">
-			<argument index="0" name="rect" type="Rect2">
-			</argument>
+		<method name="get_copy_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Defines the area covered by the BackBufferCopy.
+				Return the copy mode currently applied to the BackBufferCopy (refer to constants section).
 			</description>
 		</method>
 		<method name="get_rect" qualifiers="const">
 			<return type="Rect2">
 			</return>
 			<description>
-			Return the area covered by the BackBufferCopy.
+				Return the area covered by the BackBufferCopy.
 			</description>
 		</method>
 		<method name="set_copy_mode">
 			<argument index="0" name="copy_mode" type="int">
 			</argument>
 			<description>
-			Set the copy mode of the BackBufferCopy (refer to constants section).
+				Set the copy mode of the BackBufferCopy (refer to constants section).
 			</description>
 		</method>
-		<method name="get_copy_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_rect">
+			<argument index="0" name="rect" type="Rect2">
+			</argument>
 			<description>
-			Return the copy mode currently applied to the BackBufferCopy (refer to constants section).
+				Defines the area covered by the BackBufferCopy.
 			</description>
 		</method>
 	</methods>
@@ -5335,87 +5367,83 @@
 	<description>
 	</description>
 	<methods>
-		<method name="set_mode">
-			<argument index="0" name="mode" type="int">
+		<method name="add_lightmap">
+			<argument index="0" name="texture" type="Texture">
+			</argument>
+			<argument index="1" name="gen_size" type="Vector2">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="clear_lightmaps">
 			<description>
 			</description>
 		</method>
-		<method name="set_octree">
-			<argument index="0" name="octree" type="RawArray">
+		<method name="erase_lightmap">
+			<argument index="0" name="id" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_octree" qualifiers="const">
-			<return type="RawArray">
+		<method name="get_ao_radius" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_light">
-			<argument index="0" name="light" type="RawArray">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_light" qualifiers="const">
-			<return type="RawArray">
+		<method name="get_ao_strength" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_sampler_octree">
-			<argument index="0" name="sampler_octree" type="IntArray">
+		<method name="get_bake_flag" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="flag" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_sampler_octree" qualifiers="const">
-			<return type="IntArray">
+		<method name="get_bounces" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="add_lightmap">
-			<argument index="0" name="texture" type="Texture">
-			</argument>
-			<argument index="1" name="gen_size" type="Vector2">
-			</argument>
+		<method name="get_cell_extra_margin" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="erase_lightmap">
-			<argument index="0" name="id" type="int">
-			</argument>
+		<method name="get_cell_subdivision" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="clear_lightmaps">
+		<method name="get_edge_damp" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_cell_subdivision">
-			<argument index="0" name="cell_subdivision" type="int">
-			</argument>
+		<method name="get_energy_multiplier" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_cell_subdivision" qualifiers="const">
+		<method name="get_format" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_initial_lattice_subdiv">
-			<argument index="0" name="cell_subdivision" type="int">
-			</argument>
+		<method name="get_gamma_adjust" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -5425,210 +5453,214 @@
 			<description>
 			</description>
 		</method>
-		<method name="set_plot_size">
-			<argument index="0" name="plot_size" type="float">
-			</argument>
+		<method name="get_light" qualifiers="const">
+			<return type="RawArray">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_plot_size" qualifiers="const">
-			<return type="float">
+		<method name="get_mode" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_bounces">
-			<argument index="0" name="bounces" type="int">
-			</argument>
+		<method name="get_normal_damp" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_bounces" qualifiers="const">
-			<return type="int">
+		<method name="get_octree" qualifiers="const">
+			<return type="RawArray">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_cell_extra_margin">
-			<argument index="0" name="cell_extra_margin" type="float">
-			</argument>
+		<method name="get_plot_size" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_cell_extra_margin" qualifiers="const">
-			<return type="float">
+		<method name="get_realtime_color" qualifiers="const">
+			<return type="Color">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_edge_damp">
-			<argument index="0" name="edge_damp" type="float">
-			</argument>
+		<method name="get_realtime_color_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_edge_damp" qualifiers="const">
+		<method name="get_realtime_energy" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_normal_damp">
-			<argument index="0" name="normal_damp" type="float">
-			</argument>
+		<method name="get_sampler_octree" qualifiers="const">
+			<return type="IntArray">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_normal_damp" qualifiers="const">
+		<method name="get_saturation" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_tint">
-			<argument index="0" name="tint" type="float">
-			</argument>
+		<method name="get_tint" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_tint" qualifiers="const">
-			<return type="float">
+		<method name="get_transfer_lightmaps_only_to_uv2" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_saturation">
-			<argument index="0" name="saturation" type="float">
+		<method name="set_ao_radius">
+			<argument index="0" name="ao_radius" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_saturation" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_ao_strength">
+			<argument index="0" name="ao_strength" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_ao_radius">
-			<argument index="0" name="ao_radius" type="float">
+		<method name="set_bake_flag">
+			<argument index="0" name="flag" type="int">
+			</argument>
+			<argument index="1" name="enabled" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_ao_radius" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_bounces">
+			<argument index="0" name="bounces" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_ao_strength">
-			<argument index="0" name="ao_strength" type="float">
+		<method name="set_cell_extra_margin">
+			<argument index="0" name="cell_extra_margin" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_ao_strength" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_cell_subdivision">
+			<argument index="0" name="cell_subdivision" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_realtime_color_enabled">
-			<argument index="0" name="enabled" type="bool">
+		<method name="set_edge_damp">
+			<argument index="0" name="edge_damp" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_realtime_color_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_energy_multiplier">
+			<argument index="0" name="energy_multiplier" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_realtime_color">
-			<argument index="0" name="tint" type="Color">
+		<method name="set_format">
+			<argument index="0" name="format" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_realtime_color" qualifiers="const">
-			<return type="Color">
-			</return>
+		<method name="set_gamma_adjust">
+			<argument index="0" name="gamma_adjust" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_realtime_energy">
-			<argument index="0" name="energy" type="float">
+		<method name="set_initial_lattice_subdiv">
+			<argument index="0" name="cell_subdivision" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_realtime_energy" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_light">
+			<argument index="0" name="light" type="RawArray">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_format">
-			<argument index="0" name="format" type="int">
+		<method name="set_mode">
+			<argument index="0" name="mode" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_format" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_normal_damp">
+			<argument index="0" name="normal_damp" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_transfer_lightmaps_only_to_uv2">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_octree">
+			<argument index="0" name="octree" type="RawArray">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_transfer_lightmaps_only_to_uv2" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_plot_size">
+			<argument index="0" name="plot_size" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_energy_multiplier">
-			<argument index="0" name="energy_multiplier" type="float">
+		<method name="set_realtime_color">
+			<argument index="0" name="tint" type="Color">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_energy_multiplier" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_realtime_color_enabled">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_gamma_adjust">
-			<argument index="0" name="gamma_adjust" type="float">
+		<method name="set_realtime_energy">
+			<argument index="0" name="energy" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_gamma_adjust" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_sampler_octree">
+			<argument index="0" name="sampler_octree" type="IntArray">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_bake_flag">
-			<argument index="0" name="flag" type="int">
+		<method name="set_saturation">
+			<argument index="0" name="saturation" type="float">
 			</argument>
-			<argument index="1" name="enabled" type="bool">
+			<description>
+			</description>
+		</method>
+		<method name="set_tint">
+			<argument index="0" name="tint" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_bake_flag" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="flag" type="int">
+		<method name="set_transfer_lightmaps_only_to_uv2">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
@@ -5657,12 +5689,6 @@
 	<description>
 	</description>
 	<methods>
-		<method name="set_baked_light">
-			<argument index="0" name="baked_light" type="Object">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_baked_light" qualifiers="const">
 			<return type="Object">
 			</return>
@@ -5675,6 +5701,12 @@
 			<description>
 			</description>
 		</method>
+		<method name="set_baked_light">
+			<argument index="0" name="baked_light" type="Object">
+			</argument>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<signals>
 		<signal name="baked_light_changed">
@@ -5691,19 +5723,25 @@
 	<description>
 	</description>
 	<methods>
-		<method name="set_param">
+		<method name="get_param" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="param" type="int">
 			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_param" qualifiers="const">
-			<return type="float">
+		<method name="get_resolution" qualifiers="const">
+			<return type="int">
 			</return>
+			<description>
+			</description>
+		</method>
+		<method name="set_param">
 			<argument index="0" name="param" type="int">
 			</argument>
+			<argument index="1" name="value" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -5713,12 +5751,6 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_resolution" qualifiers="const">
-			<return type="int">
-			</return>
-			<description>
-			</description>
-		</method>
 	</methods>
 	<constants>
 		<constant name="PARAM_RADIUS" value="0">
@@ -5735,106 +5767,105 @@
 </class>
 <class name="BaseButton" inherits="Control" category="Core">
 	<brief_description>
-	Provides a base class for different kinds of buttons.
+		Provides a base class for different kinds of buttons.
 	</brief_description>
 	<description>
-	BaseButton is the abstract base class for buttons, so it shouldn't be used directly (It doesn't display anything). Other types of buttons inherit from it.
+		BaseButton is the abstract base class for buttons, so it shouldn't be used directly (It doesn't display anything). Other types of buttons inherit from it.
 	</description>
 	<methods>
 		<method name="_pressed" qualifiers="virtual">
 			<description>
-			Called when button is pressed.
+				Called when button is pressed.
 			</description>
 		</method>
 		<method name="_toggled" qualifiers="virtual">
 			<argument index="0" name="pressed" type="bool">
 			</argument>
 			<description>
-			Called when button is toggled (only if toggle_mode is active).
+				Called when button is toggled (only if toggle_mode is active).
 			</description>
 		</method>
-		<method name="set_pressed">
-			<argument index="0" name="pressed" type="bool">
-			</argument>
+		<method name="get_click_on_press" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the button to pressed state (only if toggle_mode is active).
+				Return the state of the click_on_press property (see [method set_click_on_press]).
 			</description>
 		</method>
-		<method name="is_pressed" qualifiers="const">
-			<return type="bool">
+		<method name="get_draw_mode" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			If toggle_mode is active, return whether the button is toggled. If toggle_mode is not active, return whether the button is pressed down.
+				Return the visual state used to draw the button. This is useful mainly when implementing your own draw code by either overriding _draw() or connecting to "draw" signal. The visual state of the button is defined by the DRAW_* enum.
 			</description>
 		</method>
-		<method name="is_hovered" qualifiers="const">
-			<return type="bool">
+		<method name="get_enabled_focus_mode" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return true if mouse entered the button before it exit.
+				Returns focus access mode used when switching between enabled/disabled (see [method Control.set_focus_mode] and [method set_disabled]).
 			</description>
 		</method>
-		<method name="set_toggle_mode">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
+		<method name="get_shortcut" qualifiers="const">
+			<return type="Object">
+			</return>
 			<description>
-			Set the button toggle_mode property. Toggle mode makes the button flip state between pressed and unpressed each time its area is clicked.
 			</description>
 		</method>
-		<method name="is_toggle_mode" qualifiers="const">
+		<method name="is_disabled" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return the toggle_mode property (see [method set_toggle_mode]).
+				Return whether the button is in disabled state (see [method set_disabled]).
 			</description>
 		</method>
-		<method name="set_disabled">
-			<argument index="0" name="disabled" type="bool">
-			</argument>
+		<method name="is_hovered" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the button into disabled state. When a button is disabled, it can't be clicked or toggled.
+				Return true if mouse entered the button before it exit.
 			</description>
 		</method>
-		<method name="is_disabled" qualifiers="const">
+		<method name="is_pressed" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return whether the button is in disabled state (see [method set_disabled]).
+				If toggle_mode is active, return whether the button is toggled. If toggle_mode is not active, return whether the button is pressed down.
 			</description>
 		</method>
-		<method name="set_click_on_press">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="is_toggle_mode" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the button click_on_press mode. This mode generates click events when a mouse button or key is just pressed (by default events are generated when the button/keys are released and both press and release occur in the visual area of the Button).
+				Return the toggle_mode property (see [method set_toggle_mode]).
 			</description>
 		</method>
-		<method name="get_click_on_press" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_click_on_press">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Return the state of the click_on_press property (see [method set_click_on_press]).
+				Set the button click_on_press mode. This mode generates click events when a mouse button or key is just pressed (by default events are generated when the button/keys are released and both press and release occur in the visual area of the Button).
 			</description>
 		</method>
-		<method name="get_draw_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_disabled">
+			<argument index="0" name="disabled" type="bool">
+			</argument>
 			<description>
-			Return the visual state used to draw the button. This is useful mainly when implementing your own draw code by either overriding _draw() or connecting to "draw" signal. The visual state of the button is defined by the DRAW_* enum.
+				Set the button into disabled state. When a button is disabled, it can't be clicked or toggled.
 			</description>
 		</method>
 		<method name="set_enabled_focus_mode">
 			<argument index="0" name="mode" type="int">
 			</argument>
 			<description>
-			Sets the focus access mode to use when switching between enabled/disabled (see [method Control.set_focus_mode] and [method set_disabled]).
+				Sets the focus access mode to use when switching between enabled/disabled (see [method Control.set_focus_mode] and [method set_disabled]).
 			</description>
 		</method>
-		<method name="get_enabled_focus_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_pressed">
+			<argument index="0" name="pressed" type="bool">
+			</argument>
 			<description>
-			Returns focus access mode used when switching between enabled/disabled (see [method Control.set_focus_mode] and [method set_disabled]).
+				Set the button to pressed state (only if toggle_mode is active).
 			</description>
 		</method>
 		<method name="set_shortcut">
@@ -5843,29 +5874,30 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_shortcut" qualifiers="const">
-			<return type="Object">
-			</return>
+		<method name="set_toggle_mode">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
+				Set the button toggle_mode property. Toggle mode makes the button flip state between pressed and unpressed each time its area is clicked.
 			</description>
 		</method>
 	</methods>
 	<signals>
+		<signal name="pressed">
+			<description>
+				This signal is emitted every time the button is pressed or toggled.
+			</description>
+		</signal>
 		<signal name="released">
 			<description>
-			This signal is emitted when the button was released.
+				This signal is emitted when the button was released.
 			</description>
 		</signal>
 		<signal name="toggled">
 			<argument index="0" name="pressed" type="bool">
 			</argument>
 			<description>
-			This signal is emitted when the button was just toggled between pressed and normal states (only if toggle_mode is active). The new state is contained in the [i]pressed[/i] argument.
-			</description>
-		</signal>
-		<signal name="pressed">
-			<description>
-			This signal is emitted every time the button is pressed or toggled.
+				This signal is emitted when the button was just toggled between pressed and normal states (only if toggle_mode is active). The new state is contained in the [i]pressed[/i] argument.
 			</description>
 		</signal>
 	</signals>
@@ -5902,14 +5934,6 @@
 			<description>
 			</description>
 		</method>
-		<method name="set_bit">
-			<argument index="0" name="pos" type="Vector2">
-			</argument>
-			<argument index="1" name="bit" type="bool">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_bit" qualifiers="const">
 			<return type="bool">
 			</return>
@@ -5918,11 +5942,9 @@
 			<description>
 			</description>
 		</method>
-		<method name="set_bit_rect">
-			<argument index="0" name="p_rect" type="Rect2">
-			</argument>
-			<argument index="1" name="bit" type="bool">
-			</argument>
+		<method name="get_size" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -5932,9 +5954,19 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_size" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_bit">
+			<argument index="0" name="pos" type="Vector2">
+			</argument>
+			<argument index="1" name="bit" type="bool">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_bit_rect">
+			<argument index="0" name="p_rect" type="Rect2">
+			</argument>
+			<argument index="1" name="bit" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -5948,26 +5980,19 @@
 	<description>
 	</description>
 	<methods>
-		<method name="create_from_fnt">
-			<return type="int">
-			</return>
-			<argument index="0" name="path" type="String">
+		<method name="add_char">
+			<argument index="0" name="character" type="int">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="set_height">
-			<argument index="0" name="px" type="float">
+			<argument index="1" name="texture" type="int">
 			</argument>
-			<description>
-			Set the total font height (ascent plus descent) in pixels.
-			</description>
-		</method>
-		<method name="set_ascent">
-			<argument index="0" name="px" type="float">
+			<argument index="2" name="rect" type="Rect2">
+			</argument>
+			<argument index="3" name="align" type="Vector2" default="Vector2(0,0)">
+			</argument>
+			<argument index="4" name="advance" type="float" default="-1">
 			</argument>
 			<description>
-			Set the font ascent (number of pixels above the baseline).
+				Add a character to the font, where [i]character[/i] is the unicode value, [i]texture[/i] is the texture index, [i]rect[/i] is the region in the texture (in pixels!), [i]align[/i] is the (optional) alignment for the character and [i]advance[/i] is the (optional) advance.
 			</description>
 		</method>
 		<method name="add_kerning_pair">
@@ -5978,46 +6003,55 @@
 			<argument index="2" name="kerning" type="int">
 			</argument>
 			<description>
-			Add a kerning pair to the [BitmapFont] as a difference. Kerning pairs are special cases where a typeface advance is determined by the next character.
+				Add a kerning pair to the [BitmapFont] as a difference. Kerning pairs are special cases where a typeface advance is determined by the next character.
 			</description>
 		</method>
-		<method name="get_kerning_pair" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="char_a" type="int">
-			</argument>
-			<argument index="1" name="char_b" type="int">
+		<method name="add_texture">
+			<argument index="0" name="texture" type="Texture">
 			</argument>
 			<description>
-			Return a kerning pair as a difference.
+				Add a texture to the [BitmapFont].
 			</description>
 		</method>
-		<method name="add_texture">
-			<argument index="0" name="texture" type="Texture">
-			</argument>
+		<method name="clear">
 			<description>
-			Add a texture to the [BitmapFont].
+				Clear all the font data.
 			</description>
 		</method>
-		<method name="add_char">
-			<argument index="0" name="character" type="int">
-			</argument>
-			<argument index="1" name="texture" type="int">
-			</argument>
-			<argument index="2" name="rect" type="Rect2">
+		<method name="create_from_fnt">
+			<return type="int">
+			</return>
+			<argument index="0" name="path" type="String">
 			</argument>
-			<argument index="3" name="align" type="Vector2" default="Vector2(0,0)">
+			<description>
+			</description>
+		</method>
+		<method name="get_char_size" qualifiers="const">
+			<return type="Vector2">
+			</return>
+			<argument index="0" name="char" type="int">
 			</argument>
-			<argument index="4" name="advance" type="float" default="-1">
+			<argument index="1" name="next" type="int" default="0">
 			</argument>
 			<description>
-			Add a character to the font, where [i]character[/i] is the unicode value, [i]texture[/i] is the texture index, [i]rect[/i] is the region in the texture (in pixels!), [i]align[/i] is the (optional) alignment for the character and [i]advance[/i] is the (optional) advance.
+				Return the size of a character, optionally taking kerning into account if the next character is provided.
 			</description>
 		</method>
-		<method name="get_texture_count" qualifiers="const">
+		<method name="get_fallback" qualifiers="const">
+			<return type="Object">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="get_kerning_pair" qualifiers="const">
 			<return type="int">
 			</return>
+			<argument index="0" name="char_a" type="int">
+			</argument>
+			<argument index="1" name="char_b" type="int">
+			</argument>
 			<description>
+				Return a kerning pair as a difference.
 			</description>
 		</method>
 		<method name="get_texture" qualifiers="const">
@@ -6028,26 +6062,23 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_char_size" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_texture_count" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="char" type="int">
-			</argument>
-			<argument index="1" name="next" type="int" default="0">
-			</argument>
 			<description>
-			Return the size of a character, optionally taking kerning into account if the next character is provided.
 			</description>
 		</method>
-		<method name="set_distance_field_hint">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_ascent">
+			<argument index="0" name="px" type="float">
 			</argument>
 			<description>
+				Set the font ascent (number of pixels above the baseline).
 			</description>
 		</method>
-		<method name="clear">
+		<method name="set_distance_field_hint">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Clear all the font data.
 			</description>
 		</method>
 		<method name="set_fallback">
@@ -6056,10 +6087,11 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_fallback" qualifiers="const">
-			<return type="Object">
-			</return>
+		<method name="set_height">
+			<argument index="0" name="px" type="float">
+			</argument>
 			<description>
+				Set the total font height (ascent plus descent) in pixels.
 			</description>
 		</method>
 	</methods>
@@ -6068,10 +6100,10 @@
 </class>
 <class name="BoneAttachment" inherits="Spatial" category="Core">
 	<brief_description>
-	A node that will attach to a bone.
+		A node that will attach to a bone.
 	</brief_description>
 	<description>
-	This node must be the child of a [Skeleton] node. You can then select a bone for this node to attach to. The BoneAttachment node will copy the transform of the selected bone.
+		This node must be the child of a [Skeleton] node. You can then select a bone for this node to attach to. The BoneAttachment node will copy the transform of the selected bone.
 	</description>
 	<methods>
 	</methods>
@@ -6080,32 +6112,32 @@
 </class>
 <class name="BoxContainer" inherits="Container" category="Core">
 	<brief_description>
-	Base class for Box containers.
+		Base class for Box containers.
 	</brief_description>
 	<description>
-	Base class for Box containers. It arranges children controls vertically or horizontally, and rearranges them automatically when their minimum size changes.
+		Base class for Box containers. It arranges children controls vertically or horizontally, and rearranges them automatically when their minimum size changes.
 	</description>
 	<methods>
 		<method name="add_spacer">
 			<argument index="0" name="begin" type="bool">
 			</argument>
 			<description>
-			Add a control to the box as a spacer.
-			If [i]begin[/i] is true the spacer control will be inserted in front of other children.
+				Add a control to the box as a spacer.
+				If [i]begin[/i] is true the spacer control will be inserted in front of other children.
 			</description>
 		</method>
 		<method name="get_alignment" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the alignment of children in the container.
+				Return the alignment of children in the container.
 			</description>
 		</method>
 		<method name="set_alignment">
 			<argument index="0" name="alignment" type="int">
 			</argument>
 			<description>
-			Set the alignment of children in the container(Must be one of ALIGN_BEGIN, ALIGN_CENTER or ALIGN_END).
+				Set the alignment of children in the container(Must be one of ALIGN_BEGIN, ALIGN_CENTER or ALIGN_END).
 			</description>
 		</method>
 	</methods>
@@ -6123,24 +6155,24 @@
 </class>
 <class name="BoxShape" inherits="Shape" category="Core">
 	<brief_description>
-	Box shape resource.
+		Box shape resource.
 	</brief_description>
 	<description>
-	Box shape resource, which can be set into a [PhysicsBody] or area.
+		Box shape resource, which can be set into a [PhysicsBody] or area.
 	</description>
 	<methods>
-		<method name="set_extents">
-			<argument index="0" name="extents" type="Vector3">
-			</argument>
-			<description>
-			Set the half extents for the shape.
-			</description>
-		</method>
 		<method name="get_extents" qualifiers="const">
 			<return type="Vector3">
 			</return>
 			<description>
-			Return the half extents of the shape.
+				Return the half extents of the shape.
+			</description>
+		</method>
+		<method name="set_extents">
+			<argument index="0" name="extents" type="Vector3">
+			</argument>
+			<description>
+				Set the half extents for the shape.
 			</description>
 		</method>
 	</methods>
@@ -6149,80 +6181,80 @@
 </class>
 <class name="Button" inherits="BaseButton" category="Core">
 	<brief_description>
-	Standard themed Button.
+		Standard themed Button.
 	</brief_description>
 	<description>
-	Button is the standard themed button. It can contain text and an icon, and will display them according to the current [Theme].
+		Button is the standard themed button. It can contain text and an icon, and will display them according to the current [Theme].
 	</description>
 	<methods>
-		<method name="set_text">
-			<argument index="0" name="text" type="String">
-			</argument>
+		<method name="get_button_icon" qualifiers="const">
+			<return type="Texture">
+			</return>
+			<description>
+				Return the button icon.
+			</description>
+		</method>
+		<method name="get_clip_text" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the button text, which will be displayed inside the button area.
+				Return the state of the [i]clip_text[/i] property (see [method set_clip_text])
 			</description>
 		</method>
 		<method name="get_text" qualifiers="const">
 			<return type="String">
 			</return>
 			<description>
-			Return the button text.
+				Return the button text.
 			</description>
 		</method>
-		<method name="set_button_icon">
-			<argument index="0" name="texture" type="Texture">
-			</argument>
+		<method name="get_text_align" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the icon that will be displayed next to the text inside the button area.
+				Return the text alignment policy.
 			</description>
 		</method>
-		<method name="get_button_icon" qualifiers="const">
-			<return type="Texture">
+		<method name="is_flat" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the button icon.
+				Return the state of the [i]flat[/i] property (see [method set_flat]).
 			</description>
 		</method>
-		<method name="set_flat">
-			<argument index="0" name="enabled" type="bool">
+		<method name="set_button_icon">
+			<argument index="0" name="texture" type="Texture">
 			</argument>
 			<description>
-			Set the [i]flat[/i] property of a Button. Flat buttons don't display decoration unless hovered or pressed.
+				Set the icon that will be displayed next to the text inside the button area.
 			</description>
 		</method>
 		<method name="set_clip_text">
 			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
-			Set the [i]clip_text[/i] property of a Button. When this property is enabled, text that is too large to fit the button is clipped, when disabled (default) the Button will always be wide enough to hold the text.
+				Set the [i]clip_text[/i] property of a Button. When this property is enabled, text that is too large to fit the button is clipped, when disabled (default) the Button will always be wide enough to hold the text.
 			</description>
 		</method>
-		<method name="get_clip_text" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
-			Return the state of the [i]clip_text[/i] property (see [method set_clip_text])
-			</description>
-		</method>
-		<method name="set_text_align">
-			<argument index="0" name="align" type="int">
+		<method name="set_flat">
+			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
-			Set the text alignment policy, using one of the ALIGN_* constants.
+				Set the [i]flat[/i] property of a Button. Flat buttons don't display decoration unless hovered or pressed.
 			</description>
 		</method>
-		<method name="get_text_align" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_text">
+			<argument index="0" name="text" type="String">
+			</argument>
 			<description>
-			Return the text alignment policy.
+				Set the button text, which will be displayed inside the button area.
 			</description>
 		</method>
-		<method name="is_flat" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_text_align">
+			<argument index="0" name="align" type="int">
+			</argument>
 			<description>
-			Return the state of the [i]flat[/i] property (see [method set_flat]).
+				Set the text alignment policy, using one of the ALIGN_* constants.
 			</description>
 		</method>
 	</methods>
@@ -6238,44 +6270,44 @@
 		</constant>
 	</constants>
 	<theme_items>
-		<theme_item name="hseparation" type="int">
+		<theme_item name="disabled" type="StyleBox">
 		</theme_item>
-		<theme_item name="font_color_disabled" type="Color">
+		<theme_item name="focus" type="StyleBox">
+		</theme_item>
+		<theme_item name="font" type="Font">
 		</theme_item>
 		<theme_item name="font_color" type="Color">
 		</theme_item>
+		<theme_item name="font_color_disabled" type="Color">
+		</theme_item>
 		<theme_item name="font_color_hover" type="Color">
 		</theme_item>
 		<theme_item name="font_color_pressed" type="Color">
 		</theme_item>
-		<theme_item name="font" type="Font">
-		</theme_item>
 		<theme_item name="hover" type="StyleBox">
 		</theme_item>
-		<theme_item name="pressed" type="StyleBox">
-		</theme_item>
-		<theme_item name="focus" type="StyleBox">
-		</theme_item>
-		<theme_item name="disabled" type="StyleBox">
+		<theme_item name="hseparation" type="int">
 		</theme_item>
 		<theme_item name="normal" type="StyleBox">
 		</theme_item>
+		<theme_item name="pressed" type="StyleBox">
+		</theme_item>
 	</theme_items>
 </class>
 <class name="ButtonArray" inherits="Control" category="Core">
 	<brief_description>
-	Array of Buttons.
+		Array of Buttons.
 	</brief_description>
 	<description>
-	Array of Buttons. A ButtonArray is useful to have an array of buttons laid out vertically or horizontally. Only one button can be selected, and is referenced by its index in the array (first button is 0, second button is 1, etc.).
-	This is useful [i]e.g.[/i] for joypad-friendly interfaces and option menus.
+		Array of Buttons. A ButtonArray is useful to have an array of buttons laid out vertically or horizontally. Only one button can be selected, and is referenced by its index in the array (first button is 0, second button is 1, etc.).
+		This is useful [i]e.g.[/i] for joypad-friendly interfaces and option menus.
 	</description>
 	<methods>
 		<method name="add_button">
 			<argument index="0" name="text" type="String">
 			</argument>
 			<description>
-			Append a new button to the array, with the specified text.
+				Append a new button to the array, with the specified text.
 			</description>
 		</method>
 		<method name="add_icon_button">
@@ -6284,34 +6316,26 @@
 			<argument index="1" name="text" type="String" default="&quot;&quot;">
 			</argument>
 			<description>
-			Append a new button to the array, with the specified icon and text.
+				Append a new button to the array, with the specified icon and text.
 			</description>
 		</method>
-		<method name="set_button_text">
-			<argument index="0" name="button_idx" type="int">
-			</argument>
-			<argument index="1" name="text" type="String">
-			</argument>
+		<method name="clear">
 			<description>
-			Define the text of the specified button.
+				Remove all buttons from the array.
 			</description>
 		</method>
-		<method name="set_button_icon">
+		<method name="erase_button">
 			<argument index="0" name="button_idx" type="int">
 			</argument>
-			<argument index="1" name="icon" type="Texture">
-			</argument>
 			<description>
-			Set the icon of the specified button.
+				Remove the specified button in the array.
 			</description>
 		</method>
-		<method name="get_button_text" qualifiers="const">
-			<return type="String">
+		<method name="get_button_count" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="button_idx" type="int">
-			</argument>
 			<description>
-			Return the text of the specified button.
+				Return the amount of buttons in the array.
 			</description>
 		</method>
 		<method name="get_button_icon" qualifiers="const">
@@ -6320,47 +6344,55 @@
 			<argument index="0" name="button_idx" type="int">
 			</argument>
 			<description>
-			Return the icon of the specified button.
+				Return the icon of the specified button.
 			</description>
 		</method>
-		<method name="get_button_count" qualifiers="const">
-			<return type="int">
+		<method name="get_button_text" qualifiers="const">
+			<return type="String">
 			</return>
+			<argument index="0" name="button_idx" type="int">
+			</argument>
 			<description>
-			Return the amount of buttons in the array.
+				Return the text of the specified button.
 			</description>
 		</method>
-		<method name="get_selected" qualifiers="const">
+		<method name="get_hovered" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the index of the currently selected button in the array.
+				Return the index of the currently hovered button in the array.
 			</description>
 		</method>
-		<method name="get_hovered" qualifiers="const">
+		<method name="get_selected" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the index of the currently hovered button in the array.
+				Return the index of the currently selected button in the array.
 			</description>
 		</method>
-		<method name="set_selected">
+		<method name="set_button_icon">
 			<argument index="0" name="button_idx" type="int">
 			</argument>
+			<argument index="1" name="icon" type="Texture">
+			</argument>
 			<description>
-			Select a button in the array based on the given index.
+				Set the icon of the specified button.
 			</description>
 		</method>
-		<method name="erase_button">
+		<method name="set_button_text">
 			<argument index="0" name="button_idx" type="int">
 			</argument>
+			<argument index="1" name="text" type="String">
+			</argument>
 			<description>
-			Remove the specified button in the array.
+				Define the text of the specified button.
 			</description>
 		</method>
-		<method name="clear">
+		<method name="set_selected">
+			<argument index="0" name="button_idx" type="int">
+			</argument>
 			<description>
-			Remove all buttons from the array.
+				Select a button in the array based on the given index.
 			</description>
 		</method>
 	</methods>
@@ -6369,7 +6401,7 @@
 			<argument index="0" name="button_idx" type="int">
 			</argument>
 			<description>
-			A button has been selected, its index is given as the argument.
+				A button has been selected, its index is given as the argument.
 			</description>
 		</signal>
 	</signals>
@@ -6393,45 +6425,45 @@
 </class>
 <class name="ButtonGroup" inherits="BoxContainer" category="Core">
 	<brief_description>
-	Group of Buttons.
+		Group of Buttons.
 	</brief_description>
 	<description>
-	Group of [Button]. All direct and indirect children buttons become radios. Only one allows being pressed.
+		Group of [Button]. All direct and indirect children buttons become radios. Only one allows being pressed.
 	</description>
 	<methods>
-		<method name="get_pressed_button" qualifiers="const">
-			<return type="BaseButton">
+		<method name="get_button_list" qualifiers="const">
+			<return type="Array">
 			</return>
 			<description>
-			Return the pressed button.
+				Return the list of all the buttons in the group.
 			</description>
 		</method>
-		<method name="get_pressed_button_index" qualifiers="const">
-			<return type="int">
+		<method name="get_focused_button" qualifiers="const">
+			<return type="BaseButton">
 			</return>
 			<description>
-			Return the index of the pressed button (by tree order).
+				Return the focused button.
 			</description>
 		</method>
-		<method name="get_focused_button" qualifiers="const">
+		<method name="get_pressed_button" qualifiers="const">
 			<return type="BaseButton">
 			</return>
 			<description>
-			Return the focused button.
+				Return the pressed button.
 			</description>
 		</method>
-		<method name="get_button_list" qualifiers="const">
-			<return type="Array">
+		<method name="get_pressed_button_index" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the list of all the buttons in the group.
+				Return the index of the pressed button (by tree order).
 			</description>
 		</method>
 		<method name="set_pressed_button">
 			<argument index="0" name="button" type="BaseButton">
 			</argument>
 			<description>
-			Set the button to be pressed.
+				Set the button to be pressed.
 			</description>
 		</method>
 	</methods>
@@ -6444,91 +6476,68 @@
 </class>
 <class name="Camera" inherits="Spatial" category="Core">
 	<brief_description>
-	Camera node, displays from a point of view.
+		Camera node, displays from a point of view.
 	</brief_description>
 	<description>
-	Camera is a special node that displays what is visible from its current location. Cameras register themselves in the nearest [Viewport] node (when ascending the tree). Only one camera can be active per viewport. If no viewport is available ascending the tree, the Camera will register in the global viewport. In other words, a Camera just provides [i]3D[/i] display capabilities to a [Viewport], and, without one, a scene registered in that [Viewport] (or higher viewports) can't be displayed.
+		Camera is a special node that displays what is visible from its current location. Cameras register themselves in the nearest [Viewport] node (when ascending the tree). Only one camera can be active per viewport. If no viewport is available ascending the tree, the Camera will register in the global viewport. In other words, a Camera just provides [i]3D[/i] display capabilities to a [Viewport], and, without one, a scene registered in that [Viewport] (or higher viewports) can't be displayed.
 	</description>
 	<methods>
-		<method name="project_ray_normal" qualifiers="const">
-			<return type="Vector3">
-			</return>
-			<argument index="0" name="screen_point" type="Vector2">
-			</argument>
+		<method name="clear_current">
 			<description>
-			Return a normal vector in worldspace, that is the result of projecting a point on the [Viewport] rectangle by the camera projection. This is useful for casting rays in the form of (origin,normal) for object intersection or picking.
 			</description>
 		</method>
-		<method name="project_local_ray_normal" qualifiers="const">
-			<return type="Vector3">
+		<method name="get_camera_transform" qualifiers="const">
+			<return type="Transform">
 			</return>
-			<argument index="0" name="screen_point" type="Vector2">
-			</argument>
 			<description>
+				Get the camera transform. Subclassed cameras (such as CharacterCamera) may provide different transforms than the [Node] transform.
 			</description>
 		</method>
-		<method name="project_ray_origin" qualifiers="const">
-			<return type="Vector3">
+		<method name="get_environment" qualifiers="const">
+			<return type="Environment">
 			</return>
-			<argument index="0" name="screen_point" type="Vector2">
-			</argument>
 			<description>
-			Return a 3D position in worldspace, that is the result of projecting a point on the [Viewport] rectangle by the camera projection. This is useful for casting rays in the form of (origin,normal) for object intersection or picking.
 			</description>
 		</method>
-		<method name="unproject_position" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_fov" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="world_point" type="Vector3">
-			</argument>
 			<description>
-			Return how a 3D point in worldspace maps to a 2D coordinate in the [Viewport] rectangle.
 			</description>
 		</method>
-		<method name="is_position_behind" qualifiers="const">
-			<return type="bool">
+		<method name="get_keep_aspect_mode" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="world_point" type="Vector3">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="project_position" qualifiers="const">
-			<return type="Vector3">
+		<method name="get_projection" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="screen_point" type="Vector2">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_perspective">
-			<argument index="0" name="fov" type="float">
-			</argument>
-			<argument index="1" name="z_near" type="float">
-			</argument>
-			<argument index="2" name="z_far" type="float">
-			</argument>
+		<method name="get_size" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the camera projection to perspective mode, by specifying a [i]FOV[/i] Y angle in degrees (FOV means Field of View), and the [i]near[/i] and [i]far[/i] clip planes in worldspace units.
 			</description>
 		</method>
-		<method name="set_orthogonal">
-			<argument index="0" name="size" type="float">
-			</argument>
-			<argument index="1" name="z_near" type="float">
-			</argument>
-			<argument index="2" name="z_far" type="float">
-			</argument>
+		<method name="get_visible_layers" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the camera projection to orthogonal mode, by specifying a width and the [i]near[/i] and [i]far[/i] clip planes in worldspace units. (As a hint, 2D games often use this projection, with values specified in pixels)
 			</description>
 		</method>
-		<method name="make_current">
+		<method name="get_zfar" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Make this camera the current Camera for the [Viewport] (see class description). If the Camera Node is outside the scene tree, it will attempt to become current once it's added.
 			</description>
 		</method>
-		<method name="clear_current">
+		<method name="get_znear" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -6536,80 +6545,103 @@
 			<return type="bool">
 			</return>
 			<description>
-			Return whether the Camera is the current one in the [Viewport], or plans to become current (if outside the scene tree).
+				Return whether the Camera is the current one in the [Viewport], or plans to become current (if outside the scene tree).
 			</description>
 		</method>
-		<method name="get_camera_transform" qualifiers="const">
-			<return type="Transform">
+		<method name="is_position_behind" qualifiers="const">
+			<return type="bool">
 			</return>
+			<argument index="0" name="world_point" type="Vector3">
+			</argument>
 			<description>
-			Get the camera transform. Subclassed cameras (such as CharacterCamera) may provide different transforms than the [Node] transform.
 			</description>
 		</method>
-		<method name="get_fov" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="make_current">
 			<description>
+				Make this camera the current Camera for the [Viewport] (see class description). If the Camera Node is outside the scene tree, it will attempt to become current once it's added.
 			</description>
 		</method>
-		<method name="get_size" qualifiers="const">
-			<return type="float">
+		<method name="project_local_ray_normal" qualifiers="const">
+			<return type="Vector3">
 			</return>
+			<argument index="0" name="screen_point" type="Vector2">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_zfar" qualifiers="const">
-			<return type="float">
+		<method name="project_position" qualifiers="const">
+			<return type="Vector3">
 			</return>
+			<argument index="0" name="screen_point" type="Vector2">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_znear" qualifiers="const">
-			<return type="float">
+		<method name="project_ray_normal" qualifiers="const">
+			<return type="Vector3">
 			</return>
+			<argument index="0" name="screen_point" type="Vector2">
+			</argument>
 			<description>
+				Return a normal vector in worldspace, that is the result of projecting a point on the [Viewport] rectangle by the camera projection. This is useful for casting rays in the form of (origin,normal) for object intersection or picking.
 			</description>
 		</method>
-		<method name="get_projection" qualifiers="const">
-			<return type="int">
+		<method name="project_ray_origin" qualifiers="const">
+			<return type="Vector3">
 			</return>
+			<argument index="0" name="screen_point" type="Vector2">
+			</argument>
 			<description>
+				Return a 3D position in worldspace, that is the result of projecting a point on the [Viewport] rectangle by the camera projection. This is useful for casting rays in the form of (origin,normal) for object intersection or picking.
 			</description>
 		</method>
-		<method name="set_visible_layers">
-			<argument index="0" name="mask" type="int">
+		<method name="set_environment">
+			<argument index="0" name="env" type="Environment">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_visible_layers" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_keep_aspect_mode">
+			<argument index="0" name="mode" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_environment">
-			<argument index="0" name="env" type="Environment">
+		<method name="set_orthogonal">
+			<argument index="0" name="size" type="float">
+			</argument>
+			<argument index="1" name="z_near" type="float">
+			</argument>
+			<argument index="2" name="z_far" type="float">
 			</argument>
 			<description>
+				Set the camera projection to orthogonal mode, by specifying a width and the [i]near[/i] and [i]far[/i] clip planes in worldspace units. (As a hint, 2D games often use this projection, with values specified in pixels)
 			</description>
 		</method>
-		<method name="get_environment" qualifiers="const">
-			<return type="Environment">
-			</return>
+		<method name="set_perspective">
+			<argument index="0" name="fov" type="float">
+			</argument>
+			<argument index="1" name="z_near" type="float">
+			</argument>
+			<argument index="2" name="z_far" type="float">
+			</argument>
 			<description>
+				Set the camera projection to perspective mode, by specifying a [i]FOV[/i] Y angle in degrees (FOV means Field of View), and the [i]near[/i] and [i]far[/i] clip planes in worldspace units.
 			</description>
 		</method>
-		<method name="set_keep_aspect_mode">
-			<argument index="0" name="mode" type="int">
+		<method name="set_visible_layers">
+			<argument index="0" name="mask" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_keep_aspect_mode" qualifiers="const">
-			<return type="int">
+		<method name="unproject_position" qualifiers="const">
+			<return type="Vector2">
 			</return>
+			<argument index="0" name="world_point" type="Vector3">
+			</argument>
 			<description>
+				Return how a 3D point in worldspace maps to a 2D coordinate in the [Viewport] rectangle.
 			</description>
 		</method>
 	</methods>
@@ -6628,31 +6660,31 @@
 </class>
 <class name="Camera2D" inherits="Node2D" category="Core">
 	<brief_description>
-	Camera node for 2D scenes.
+		Camera node for 2D scenes.
 	</brief_description>
 	<description>
-	Camera node for 2D scenes. It forces the screen (current layer) to scroll following this node. This makes it easier (and faster) to program scrollable scenes than manually changing the position of [CanvasItem] based nodes.
-	This node is intended to be a simple helper get get things going quickly and it may happen often that more functionality is desired to change how the camera works. To make your own custom camera node, simply inherit from [Node2D] and change the transform of the canvas by calling get_viewport().set_canvas_transform(m) in [Viewport].
+		Camera node for 2D scenes. It forces the screen (current layer) to scroll following this node. This makes it easier (and faster) to program scrollable scenes than manually changing the position of [CanvasItem] based nodes.
+		This node is intended to be a simple helper get get things going quickly and it may happen often that more functionality is desired to change how the camera works. To make your own custom camera node, simply inherit from [Node2D] and change the transform of the canvas by calling get_viewport().set_canvas_transform(m) in [Viewport].
 	</description>
 	<methods>
-		<method name="set_offset">
-			<argument index="0" name="offset" type="Vector2">
-			</argument>
+		<method name="clear_current">
 			<description>
-			Set the scroll offset. Useful for looking around or camera shake animations.
 			</description>
 		</method>
-		<method name="get_offset" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="force_update_scroll">
 			<description>
-			Return the scroll offset.
+				Force the camera to update scroll immediately.
 			</description>
 		</method>
-		<method name="set_anchor_mode">
-			<argument index="0" name="anchor_mode" type="int">
-			</argument>
+		<method name="reset_smoothing">
 			<description>
+			Set the camera's position immediately to its current smoothing destination.
+			This has no effect if smoothing is disabled.
+			</description>
+		</method>
+		<method name="align">
+			<description>
+			Align the camera to the tracked node
 			</description>
 		</method>
 		<method name="get_anchor_mode" qualifiers="const">
@@ -6661,67 +6693,78 @@
 			<description>
 			</description>
 		</method>
-		<method name="set_rotating">
-			<argument index="0" name="rotating" type="bool">
-			</argument>
+		<method name="get_camera_pos" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
+				Return the camera position.
 			</description>
 		</method>
-		<method name="is_rotating" qualifiers="const">
-			<return type="bool">
+		<method name="get_camera_screen_center" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="make_current">
+		<method name="get_drag_margin" qualifiers="const">
+			<return type="float">
+			</return>
+			<argument index="0" name="margin" type="int">
+			</argument>
 			<description>
-			Make this the current 2D camera for the scene (viewport and layer), in case there's many cameras in the scene.
+				Return the margins needed to drag the camera (see [method set_drag_margin]).
 			</description>
 		</method>
-		<method name="clear_current">
+		<method name="get_follow_smoothing" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="is_current" qualifiers="const">
-			<return type="bool">
+		<method name="get_h_offset" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return true of this is the current camera (see [method make_current]).
 			</description>
 		</method>
-		<method name="set_limit">
+		<method name="get_limit" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="margin" type="int">
 			</argument>
-			<argument index="1" name="limit" type="int">
-			</argument>
 			<description>
-			Set the scrolling limit in pixels.
+				Return the scrolling limit in pixels.
 			</description>
 		</method>
-		<method name="get_limit" qualifiers="const">
-			<return type="int">
+		<method name="get_offset" qualifiers="const">
+			<return type="Vector2">
 			</return>
-			<argument index="0" name="margin" type="int">
-			</argument>
 			<description>
-			Return the scrolling limit in pixels.
+				Return the scroll offset.
 			</description>
 		</method>
-		<method name="set_v_drag_enabled">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
+		<method name="get_v_offset" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="is_v_drag_enabled" qualifiers="const">
+		<method name="get_zoom" qualifiers="const">
+			<return type="Vector2">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="is_current" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
+				Return true of this is the current camera (see [method make_current]).
 			</description>
 		</method>
-		<method name="set_h_drag_enabled">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
+		<method name="is_follow_smoothing_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -6731,27 +6774,26 @@
 			<description>
 			</description>
 		</method>
-		<method name="set_v_offset">
-			<argument index="0" name="ofs" type="float">
-			</argument>
+		<method name="is_rotating" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_v_offset" qualifiers="const">
-			<return type="float">
+		<method name="is_v_drag_enabled" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_h_offset">
-			<argument index="0" name="ofs" type="float">
-			</argument>
+		<method name="make_current">
 			<description>
+				Make this the current 2D camera for the scene (viewport and layer), in case there's many cameras in the scene.
 			</description>
 		</method>
-		<method name="get_h_offset" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_anchor_mode">
+			<argument index="0" name="anchor_mode" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -6761,70 +6803,71 @@
 			<argument index="1" name="drag_margin" type="float">
 			</argument>
 			<description>
-			Set the margins needed to drag the camera (relative to the screen size). Margin uses the MARGIN_* enum. Drag margins of 0,0,0,0 will keep the camera at the center of the screen, while drag margins of 1,1,1,1 will only move when the camera is at the edges.
+				Set the margins needed to drag the camera (relative to the screen size). Margin uses the MARGIN_* enum. Drag margins of 0,0,0,0 will keep the camera at the center of the screen, while drag margins of 1,1,1,1 will only move when the camera is at the edges.
 			</description>
 		</method>
-		<method name="get_drag_margin" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="margin" type="int">
+		<method name="set_enable_follow_smoothing">
+			<argument index="0" name="follow_smoothing" type="bool">
 			</argument>
 			<description>
-			Return the margins needed to drag the camera (see [method set_drag_margin]).
 			</description>
 		</method>
-		<method name="get_camera_pos" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_follow_smoothing">
+			<argument index="0" name="follow_smoothing" type="float">
+			</argument>
 			<description>
-			Return the camera position.
 			</description>
 		</method>
-		<method name="get_camera_screen_center" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_h_drag_enabled">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_zoom">
-			<argument index="0" name="zoom" type="Vector2">
+		<method name="set_h_offset">
+			<argument index="0" name="ofs" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_zoom" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_limit">
+			<argument index="0" name="margin" type="int">
+			</argument>
+			<argument index="1" name="limit" type="int">
+			</argument>
 			<description>
+				Set the scrolling limit in pixels.
 			</description>
 		</method>
-		<method name="set_follow_smoothing">
-			<argument index="0" name="follow_smoothing" type="float">
+		<method name="set_offset">
+			<argument index="0" name="offset" type="Vector2">
 			</argument>
 			<description>
+				Set the scroll offset. Useful for looking around or camera shake animations.
 			</description>
 		</method>
-		<method name="get_follow_smoothing" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_rotating">
+			<argument index="0" name="rotating" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_enable_follow_smoothing">
-			<argument index="0" name="follow_smoothing" type="bool">
+		<method name="set_v_drag_enabled">
+			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_follow_smoothing_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_v_offset">
+			<argument index="0" name="ofs" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="force_update_scroll">
+		<method name="set_zoom">
+			<argument index="0" name="zoom" type="Vector2">
+			</argument>
 			<description>
-			Force the camera to update scroll immediately.
 			</description>
 		</method>
 	</methods>
@@ -6837,213 +6880,151 @@
 </class>
 <class name="CanvasItem" inherits="Node" category="Core">
 	<brief_description>
-	Base class of anything 2D.
+		Base class of anything 2D.
 	</brief_description>
 	<description>
-	Base class of anything 2D. Canvas items are laid out in a tree and children inherit and extend the transform of their parent. CanvasItem is extended by [Control], for anything GUI related, and by [Node2D] for anything 2D engine related.
-	Any CanvasItem can draw. For this, the "update" function must be called, then NOTIFICATION_DRAW will be received on idle time to request redraw. Because of this, canvas items don't need to be redraw on every frame, improving the performance significantly. Several functions for drawing on the CanvasItem are provided (see draw_* functions). They can only be used inside the notification, signal or _draw() overrides function, though.
-	Canvas items are draw in tree order. By default, children are on top of their parents so a root CanvasItem will be drawn behind everything (this can be changed per item though).
-	Canvas items can also be hidden (hiding also their subtree). They provide many means for changing standard parameters such as opacity (for it and the subtree) and self opacity, blend mode.
-	Ultimately, a transform notification can be requested, which will notify the node that its global position changed in case the parent tree changed.
+		Base class of anything 2D. Canvas items are laid out in a tree and children inherit and extend the transform of their parent. CanvasItem is extended by [Control], for anything GUI related, and by [Node2D] for anything 2D engine related.
+		Any CanvasItem can draw. For this, the "update" function must be called, then NOTIFICATION_DRAW will be received on idle time to request redraw. Because of this, canvas items don't need to be redraw on every frame, improving the performance significantly. Several functions for drawing on the CanvasItem are provided (see draw_* functions). They can only be used inside the notification, signal or _draw() overrides function, though.
+		Canvas items are draw in tree order. By default, children are on top of their parents so a root CanvasItem will be drawn behind everything (this can be changed per item though).
+		Canvas items can also be hidden (hiding also their subtree). They provide many means for changing standard parameters such as opacity (for it and the subtree) and self opacity, blend mode.
+		Ultimately, a transform notification can be requested, which will notify the node that its global position changed in case the parent tree changed.
 	</description>
 	<methods>
 		<method name="_draw" qualifiers="virtual">
 			<description>
-			Called (if exists) to draw the canvas item.
+				Called (if exists) to draw the canvas item.
 			</description>
 		</method>
-		<method name="edit_set_state">
-			<argument index="0" name="state" type="Variant">
+		<method name="draw_char">
+			<return type="float">
+			</return>
+			<argument index="0" name="font" type="Font">
 			</argument>
-			<description>
-			Used for editing, returns an opaque value representing the transform state.
-			</description>
-		</method>
-		<method name="edit_get" qualifiers="const">
-			<description>
-			</description>
-		</method>
-		<method name="edit_set_rect">
-			<argument index="0" name="rect" type="Rect2">
+			<argument index="1" name="pos" type="Vector2">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="edit_rotate">
-			<argument index="0" name="degrees" type="float">
+			<argument index="2" name="char" type="String">
 			</argument>
-			<description>
-			Used for editing, handle rotation.
-			</description>
-		</method>
-		<method name="get_item_rect" qualifiers="const">
-			<return type="Rect2">
-			</return>
-			<description>
-			Return a rect containing the editable contents of the item.
-			</description>
-		</method>
-		<method name="get_item_and_children_rect" qualifiers="const">
-			<return type="Rect2">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="get_canvas_item" qualifiers="const">
-			<return type="RID">
-			</return>
-			<description>
-			Return the canvas item RID used by [VisualServer] for this item.
-			</description>
-		</method>
-		<method name="is_visible" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
-			Return true if this CanvasItem is visible. It may be invisible because itself or a parent canvas item is hidden.
-			</description>
-		</method>
-		<method name="is_hidden" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
-			Return true if this CanvasItem is hidden. Note that the CanvasItem may not be visible, but as long as it's not hidden ([method hide] called) the function will return false.
-			</description>
-		</method>
-		<method name="show">
-			<description>
-			Show the CanvasItem currently hidden.
-			</description>
-		</method>
-		<method name="hide">
-			<description>
-			Hide the CanvasItem currently visible.
-			</description>
-		</method>
-		<method name="set_hidden">
-			<argument index="0" name="hidden" type="bool">
+			<argument index="3" name="next" type="String">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="update">
-			<description>
-			Queue the CanvasItem for update. NOTIFICATION_DRAW will be called on idle time to request redraw.
-			</description>
-		</method>
-		<method name="set_as_toplevel">
-			<argument index="0" name="enable" type="bool">
+			<argument index="4" name="modulate" type="Color" default="Color(1,1,1,1)">
 			</argument>
 			<description>
-			Set as toplevel. This means that it will not inherit transform from parent canvas items.
-			</description>
-		</method>
-		<method name="is_set_as_toplevel" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
-			Return if set as toplevel. See [method set_as_toplevel].
+				Draw a string character using a custom font. Returns the advance, depending on the char width and kerning with an optional next char.
 			</description>
 		</method>
-		<method name="set_blend_mode">
-			<argument index="0" name="blend_mode" type="int">
+		<method name="draw_circle">
+			<argument index="0" name="pos" type="Vector2">
 			</argument>
-			<description>
-			Set the blending mode from enum BLEND_MODE_*.
-			</description>
-		</method>
-		<method name="get_blend_mode" qualifiers="const">
-			<return type="int">
-			</return>
-			<description>
-			Return the current blending mode from enum BLEND_MODE_*.
-			</description>
-		</method>
-		<method name="set_light_mask">
-			<argument index="0" name="light_mask" type="int">
+			<argument index="1" name="radius" type="float">
+			</argument>
+			<argument index="2" name="color" type="Color">
 			</argument>
 			<description>
+				Draw a colored circle.
 			</description>
 		</method>
-		<method name="get_light_mask" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="draw_colored_polygon">
+			<argument index="0" name="points" type="Vector2Array">
+			</argument>
+			<argument index="1" name="color" type="Color">
+			</argument>
+			<argument index="2" name="uvs" type="Vector2Array" default="Vector2Array([])">
+			</argument>
+			<argument index="3" name="texture" type="Texture" default="NULL">
+			</argument>
 			<description>
+				Draw a colored polygon of any amount of points, convex or concave.
 			</description>
 		</method>
-		<method name="set_opacity">
-			<argument index="0" name="opacity" type="float">
+		<method name="draw_line">
+			<argument index="0" name="from" type="Vector2">
+			</argument>
+			<argument index="1" name="to" type="Vector2">
+			</argument>
+			<argument index="2" name="color" type="Color">
+			</argument>
+			<argument index="3" name="width" type="float" default="1">
 			</argument>
 			<description>
-			Set canvas item opacity. This will affect the canvas item and all the children.
+				Draw a line from a 2D point to another, with a given color and width.
 			</description>
 		</method>
-		<method name="get_opacity" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="draw_polygon">
+			<argument index="0" name="points" type="Vector2Array">
+			</argument>
+			<argument index="1" name="colors" type="ColorArray">
+			</argument>
+			<argument index="2" name="uvs" type="Vector2Array" default="Vector2Array([])">
+			</argument>
+			<argument index="3" name="texture" type="Texture" default="NULL">
+			</argument>
 			<description>
-			Return the canvas item opacity. This affects the canvas item and all the children.
+				Draw a polygon of any amount of points, convex or concave.
 			</description>
 		</method>
-		<method name="set_self_opacity">
-			<argument index="0" name="self_opacity" type="float">
+		<method name="draw_primitive">
+			<argument index="0" name="points" type="Vector2Array">
+			</argument>
+			<argument index="1" name="colors" type="ColorArray">
+			</argument>
+			<argument index="2" name="uvs" type="Vector2Array">
+			</argument>
+			<argument index="3" name="texture" type="Texture" default="NULL">
+			</argument>
+			<argument index="4" name="width" type="float" default="1">
 			</argument>
 			<description>
-			Set canvas item self-opacity. This does not affect the opacity of children items.
+				Draw a custom primitive, 1 point for a point, 2 points for a line, 3 points for a triangle and 4 points for a quad.
 			</description>
 		</method>
-		<method name="get_self_opacity" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="draw_rect">
+			<argument index="0" name="rect" type="Rect2">
+			</argument>
+			<argument index="1" name="color" type="Color">
+			</argument>
 			<description>
-			Return the canvas item self-opacity.
+				Draw a colored rectangle.
 			</description>
 		</method>
-		<method name="set_draw_behind_parent">
-			<argument index="0" name="enable" type="bool">
+		<method name="draw_set_transform">
+			<argument index="0" name="pos" type="Vector2">
+			</argument>
+			<argument index="1" name="rot" type="float">
+			</argument>
+			<argument index="2" name="scale" type="Vector2">
 			</argument>
 			<description>
-			Sets whether the canvas item is drawn behind its parent.
+				Set a custom transform for drawing. Anything drawn afterwards will be transformed by this.
 			</description>
 		</method>
-		<method name="is_draw_behind_parent_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="draw_set_transform_matrix">
+			<argument index="0" name="xform" type="Matrix32">
+			</argument>
 			<description>
-			Return whether the item is drawn behind its parent.
 			</description>
 		</method>
-		<method name="draw_line">
-			<argument index="0" name="from" type="Vector2">
-			</argument>
-			<argument index="1" name="to" type="Vector2">
+		<method name="draw_string">
+			<argument index="0" name="font" type="Font">
 			</argument>
-			<argument index="2" name="color" type="Color">
+			<argument index="1" name="pos" type="Vector2">
 			</argument>
-			<argument index="3" name="width" type="float" default="1">
+			<argument index="2" name="text" type="String">
 			</argument>
-			<description>
-			Draw a line from a 2D point to another, with a given color and width.
-			</description>
-		</method>
-		<method name="draw_rect">
-			<argument index="0" name="rect" type="Rect2">
+			<argument index="3" name="modulate" type="Color" default="Color(1,1,1,1)">
 			</argument>
-			<argument index="1" name="color" type="Color">
+			<argument index="4" name="clip_w" type="int" default="-1">
 			</argument>
 			<description>
-			Draw a colored rectangle.
+				Draw a string using a custom font.
 			</description>
 		</method>
-		<method name="draw_circle">
-			<argument index="0" name="pos" type="Vector2">
-			</argument>
-			<argument index="1" name="radius" type="float">
+		<method name="draw_style_box">
+			<argument index="0" name="style_box" type="StyleBox">
 			</argument>
-			<argument index="2" name="color" type="Color">
+			<argument index="1" name="rect" type="Rect2">
 			</argument>
 			<description>
-			Draw a colored circle.
+				Draw a styled rectangle.
 			</description>
 		</method>
 		<method name="draw_texture">
@@ -7054,7 +7035,7 @@
 			<argument index="2" name="modulate" type="Color" default="Color(1,1,1,1)">
 			</argument>
 			<description>
-			Draw a texture at a given position.
+				Draw a texture at a given position.
 			</description>
 		</method>
 		<method name="draw_texture_rect">
@@ -7069,7 +7050,7 @@
 			<argument index="4" name="transpose" type="bool" default="false">
 			</argument>
 			<description>
-			Draw a textured rectangle at a given position, optionally modulated by a color. Transpose swaps the x and y coordinates when reading the texture.
+				Draw a textured rectangle at a given position, optionally modulated by a color. Transpose swaps the x and y coordinates when reading the texture.
 			</description>
 		</method>
 		<method name="draw_texture_rect_region">
@@ -7084,184 +7065,200 @@
 			<argument index="4" name="transpose" type="bool" default="false">
 			</argument>
 			<description>
-			Draw a textured rectangle region at a given position, optionally modulated by a color. Transpose swaps the x and y coordinates when reading the texture.
+				Draw a textured rectangle region at a given position, optionally modulated by a color. Transpose swaps the x and y coordinates when reading the texture.
 			</description>
 		</method>
-		<method name="draw_style_box">
-			<argument index="0" name="style_box" type="StyleBox">
-			</argument>
-			<argument index="1" name="rect" type="Rect2">
-			</argument>
+		<method name="edit_get_state" qualifiers="const">
+			<return type="Variant">
+			</return>
 			<description>
-			Draw a styled rectangle.
+				Used for editing, returns an opaque value representing the transform state.
 			</description>
 		</method>
-		<method name="draw_primitive">
-			<argument index="0" name="points" type="Vector2Array">
-			</argument>
-			<argument index="1" name="colors" type="ColorArray">
-			</argument>
-			<argument index="2" name="uvs" type="Vector2Array">
-			</argument>
-			<argument index="3" name="texture" type="Texture" default="NULL">
-			</argument>
-			<argument index="4" name="width" type="float" default="1">
+		<method name="edit_rotate">
+			<argument index="0" name="degrees" type="float">
 			</argument>
 			<description>
-			Draw a custom primitive, 1 point for a point, 2 points for a line, 3 points for a triangle and 4 points for a quad.
+				Used for editing, handle rotation.
 			</description>
 		</method>
-		<method name="draw_polygon">
-			<argument index="0" name="points" type="Vector2Array">
-			</argument>
-			<argument index="1" name="colors" type="ColorArray">
-			</argument>
-			<argument index="2" name="uvs" type="Vector2Array" default="Vector2Array()">
-			</argument>
-			<argument index="3" name="texture" type="Texture" default="NULL">
+		<method name="edit_set_rect">
+			<argument index="0" name="rect" type="Rect2">
 			</argument>
 			<description>
-			Draw a polygon of any amount of points, convex or concave.
 			</description>
 		</method>
-		<method name="draw_colored_polygon">
-			<argument index="0" name="points" type="Vector2Array">
-			</argument>
-			<argument index="1" name="color" type="Color">
-			</argument>
-			<argument index="2" name="uvs" type="Vector2Array" default="Vector2Array()">
-			</argument>
-			<argument index="3" name="texture" type="Texture" default="NULL">
+		<method name="edit_set_state">
+			<argument index="0" name="state" type="Variant">
 			</argument>
 			<description>
-			Draw a colored polygon of any amount of points, convex or concave.
+				Set the transform state of this CanvasItem. For [Node2D], this is an [Array] with (in order) a [Vector2] for position, a float for rotation and another [Vector2] for scale. For [Control] this is a [Rect2] with the position and size.
 			</description>
 		</method>
-		<method name="draw_string">
-			<argument index="0" name="font" type="Font">
-			</argument>
-			<argument index="1" name="pos" type="Vector2">
-			</argument>
-			<argument index="2" name="text" type="String">
-			</argument>
-			<argument index="3" name="modulate" type="Color" default="Color(1,1,1,1)">
-			</argument>
-			<argument index="4" name="clip_w" type="int" default="-1">
-			</argument>
+		<method name="get_blend_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Draw a string using a custom font.
+				Return the current blending mode from enum BLEND_MODE_*.
 			</description>
 		</method>
-		<method name="draw_char">
-			<return type="float">
+		<method name="get_canvas" qualifiers="const">
+			<return type="RID">
 			</return>
-			<argument index="0" name="font" type="Font">
-			</argument>
-			<argument index="1" name="pos" type="Vector2">
-			</argument>
-			<argument index="2" name="char" type="String">
-			</argument>
-			<argument index="3" name="next" type="String">
-			</argument>
-			<argument index="4" name="modulate" type="Color" default="Color(1,1,1,1)">
-			</argument>
 			<description>
-			Draw a string character using a custom font. Returns the advance, depending on the char width and kerning with an optional next char.
+				Return the [RID] of the [World2D] canvas where this item is in.
 			</description>
 		</method>
-		<method name="draw_set_transform">
-			<argument index="0" name="pos" type="Vector2">
-			</argument>
-			<argument index="1" name="rot" type="float">
-			</argument>
-			<argument index="2" name="scale" type="Vector2">
-			</argument>
+		<method name="get_canvas_item" qualifiers="const">
+			<return type="RID">
+			</return>
 			<description>
-			Set a custom transform for drawing. Anything drawn afterwards will be transformed by this.
+				Return the canvas item RID used by [VisualServer] for this item.
 			</description>
 		</method>
-		<method name="get_transform" qualifiers="const">
+		<method name="get_canvas_transform" qualifiers="const">
 			<return type="Matrix32">
 			</return>
 			<description>
+				Get the transform matrix of this item's canvas.
+			</description>
+		</method>
+		<method name="get_global_mouse_pos" qualifiers="const">
+			<return type="Vector2">
+			</return>
+			<description>
+				Get the global position of the mouse.
 			</description>
 		</method>
 		<method name="get_global_transform" qualifiers="const">
 			<return type="Matrix32">
 			</return>
 			<description>
+				Get the global transform matrix of this item.
 			</description>
 		</method>
 		<method name="get_global_transform_with_canvas" qualifiers="const">
 			<return type="Matrix32">
 			</return>
 			<description>
+				Get the global transform matrix of this item in relation to the canvas.
 			</description>
 		</method>
-		<method name="get_viewport_transform" qualifiers="const">
-			<return type="Matrix32">
+		<method name="get_item_and_children_rect" qualifiers="const">
+			<return type="Rect2">
 			</return>
 			<description>
+				Get a [Rect2] with the boundaries of this item and its children.
 			</description>
 		</method>
-		<method name="get_viewport_rect" qualifiers="const">
+		<method name="get_item_rect" qualifiers="const">
 			<return type="Rect2">
 			</return>
 			<description>
+				Return a rect containing the editable boundaries of the item.
 			</description>
 		</method>
-		<method name="get_canvas_transform" qualifiers="const">
-			<return type="Matrix32">
+		<method name="get_light_mask" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
+				Get this item's light mask number.
 			</description>
 		</method>
 		<method name="get_local_mouse_pos" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
+				Get the mouse position relative to this item's position.
 			</description>
 		</method>
-		<method name="get_global_mouse_pos" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_material" qualifiers="const">
+			<return type="CanvasItemMaterial">
 			</return>
 			<description>
+				Get the material of this item.
 			</description>
 		</method>
-		<method name="get_canvas" qualifiers="const">
-			<return type="RID">
+		<method name="get_opacity" qualifiers="const">
+			<return type="float">
+			</return>
+			<description>
+				Return the canvas item opacity. This affects the canvas item and all the children.
+			</description>
+		</method>
+		<method name="get_self_opacity" qualifiers="const">
+			<return type="float">
+			</return>
+			<description>
+				Return the canvas item self-opacity.
+			</description>
+		</method>
+		<method name="get_transform" qualifiers="const">
+			<return type="Matrix32">
+			</return>
+			<description>
+				Get the transform matrix of this item.
+			</description>
+		</method>
+		<method name="get_use_parent_material" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+				Get whether this item uses its parent's material.
+			</description>
+		</method>
+		<method name="get_viewport_rect" qualifiers="const">
+			<return type="Rect2">
 			</return>
 			<description>
+				Get the viewport's boundaries as a [Rect2].
+			</description>
+		</method>
+		<method name="get_viewport_transform" qualifiers="const">
+			<return type="Matrix32">
+			</return>
+			<description>
+				Get this item's transform in relation to the viewport.
 			</description>
 		</method>
 		<method name="get_world_2d" qualifiers="const">
 			<return type="Object">
 			</return>
 			<description>
+				Get the [World2D] where this item is in.
 			</description>
 		</method>
-		<method name="set_material">
-			<argument index="0" name="material" type="CanvasItemMaterial">
-			</argument>
+		<method name="hide">
 			<description>
+				Hide the CanvasItem currently visible.
 			</description>
 		</method>
-		<method name="get_material" qualifiers="const">
-			<return type="CanvasItemMaterial">
+		<method name="is_draw_behind_parent_enabled" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
+				Return whether the item is drawn behind its parent.
 			</description>
 		</method>
-		<method name="set_use_parent_material">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="is_hidden" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
+				Return true if this CanvasItem is hidden. Note that the CanvasItem may not be visible, but as long as it's not hidden ([method hide] called) the function will return false.
 			</description>
 		</method>
-		<method name="get_use_parent_material" qualifiers="const">
+		<method name="is_set_as_toplevel" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
+				Return if set as toplevel. See [method set_as_toplevel].
+			</description>
+		</method>
+		<method name="is_visible" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+				Return true if this CanvasItem is visible. It may be invisible because itself or a parent canvas item is hidden.
 			</description>
 		</method>
 		<method name="make_input_local" qualifiers="const">
@@ -7270,28 +7267,102 @@
 			<argument index="0" name="event" type="InputEvent">
 			</argument>
 			<description>
+				Takes a global input event and convert to this item's coordinate system.
+			</description>
+		</method>
+		<method name="set_as_toplevel">
+			<argument index="0" name="enable" type="bool">
+			</argument>
+			<description>
+				Set as top level. This means that it will not inherit transform from parent canvas items.
+			</description>
+		</method>
+		<method name="set_blend_mode">
+			<argument index="0" name="blend_mode" type="int">
+			</argument>
+			<description>
+				Set the blending mode from enum BLEND_MODE_*.
+			</description>
+		</method>
+		<method name="set_draw_behind_parent">
+			<argument index="0" name="enable" type="bool">
+			</argument>
+			<description>
+				Set whether the canvas item is drawn behind its parent.
+			</description>
+		</method>
+		<method name="set_hidden">
+			<argument index="0" name="hidden" type="bool">
+			</argument>
+			<description>
+				Set whether this item should be hidden or not. Note that no matter what is set here this item won't be shown if its parent or grandparents nodes are also hidden. A hidden CanvasItem make all children hidden too.
+			</description>
+		</method>
+		<method name="set_light_mask">
+			<argument index="0" name="light_mask" type="int">
+			</argument>
+			<description>
+				Set the ligtht mask number of this item.
+			</description>
+		</method>
+		<method name="set_material">
+			<argument index="0" name="material" type="CanvasItemMaterial">
+			</argument>
+			<description>
+				Set the material of this item.
+			</description>
+		</method>
+		<method name="set_opacity">
+			<argument index="0" name="opacity" type="float">
+			</argument>
+			<description>
+				Set canvas item opacity. This will affect the canvas item and all the children.
+			</description>
+		</method>
+		<method name="set_self_opacity">
+			<argument index="0" name="self_opacity" type="float">
+			</argument>
+			<description>
+				Set canvas item self-opacity. This does not affect the opacity of children items.
+			</description>
+		</method>
+		<method name="set_use_parent_material">
+			<argument index="0" name="enable" type="bool">
+			</argument>
+			<description>
+				Set whether or not this item should use its parent's material.
+			</description>
+		</method>
+		<method name="show">
+			<description>
+				Show the CanvasItem currently hidden.
+			</description>
+		</method>
+		<method name="update">
+			<description>
+				Queue the CanvasItem for update. [code]NOTIFICATION_DRAW[/code] will be called on idle time to request redraw.
 			</description>
 		</method>
 	</methods>
 	<signals>
-		<signal name="item_rect_changed">
+		<signal name="draw">
 			<description>
-			Emitted when the item rect has changed.
+				Emitted when the CanvasItem must redraw. This can only be connected realtime, as deferred will not allow drawing.
 			</description>
 		</signal>
-		<signal name="draw">
+		<signal name="hide">
 			<description>
-			Emitted when the CanvasItem must redraw. This can only be connected realtime, as deferred will not allow drawing.
+				Emitted when becoming hidden.
 			</description>
 		</signal>
-		<signal name="visibility_changed">
+		<signal name="item_rect_changed">
 			<description>
-			Emitted when the visibility (hidden/visible) changes.
+				Emitted when the item rect has changed.
 			</description>
 		</signal>
-		<signal name="hide">
+		<signal name="visibility_changed">
 			<description>
-			Emitted when becoming hidden.
+				Emitted when the visibility (hidden/visible) changes.
 			</description>
 		</signal>
 	</signals>
@@ -7334,29 +7405,35 @@
 	<description>
 	</description>
 	<methods>
-		<method name="set_shader">
-			<argument index="0" name="shader" type="Shader">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_shader" qualifiers="const">
 			<return type="Shader">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_shader_param">
+		<method name="get_shader_param" qualifiers="const">
 			<argument index="0" name="param" type="String">
 			</argument>
-			<argument index="1" name="value" type="Variant">
+			<description>
+			</description>
+		</method>
+		<method name="get_shading_mode" qualifiers="const">
+			<return type="int">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="set_shader">
+			<argument index="0" name="shader" type="Shader">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_shader_param" qualifiers="const">
+		<method name="set_shader_param">
 			<argument index="0" name="param" type="String">
 			</argument>
+			<argument index="1" name="value" type="Variant">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -7366,12 +7443,6 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_shading_mode" qualifiers="const">
-			<return type="int">
-			</return>
-			<description>
-			</description>
-		</method>
 	</methods>
 	<constants>
 		<constant name="SHADING_NORMAL" value="0">
@@ -7404,108 +7475,108 @@
 </class>
 <class name="CanvasLayer" inherits="Node" category="Core">
 	<brief_description>
-	Canvas Item layer.
+		Canvas Item layer.
 	</brief_description>
 	<description>
-	Canvas Item layer. [CanvasItem] nodes that are direct or indirect children of a [CanvasLayer] will be drawn in that layer. The layer is a numeric index that defines the draw order. The default 2D scene renders with index 0, so a [CanvasLayer] with index -1 will be drawn below, and one with index 1 will be drawn above. This is very useful for HUDs (in layer 1+ or above), or backgrounds (in layer -1 or below).
+		Canvas Item layer. [CanvasItem] nodes that are direct or indirect children of a [CanvasLayer] will be drawn in that layer. The layer is a numeric index that defines the draw order. The default 2D scene renders with index 0, so a [CanvasLayer] with index -1 will be drawn below, and one with index 1 will be drawn above. This is very useful for HUDs (in layer 1+ or above), or backgrounds (in layer -1 or below).
 	</description>
 	<methods>
-		<method name="set_layer">
-			<argument index="0" name="layer" type="int">
-			</argument>
-			<description>
-			Set the layer index, determines the draw order, a lower value will be below a higher one.
-			</description>
-		</method>
 		<method name="get_layer" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the layer index, determines the draw order, a lower value will be below a higher one.
+				Return the layer index, determines the draw order, a lower value will be below a higher one.
 			</description>
 		</method>
-		<method name="set_transform">
-			<argument index="0" name="transform" type="Matrix32">
-			</argument>
+		<method name="get_offset" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
-			Set the base transform for this layer.
+				Return the base offset for this layer (helper).
 			</description>
 		</method>
-		<method name="get_transform" qualifiers="const">
-			<return type="Matrix32">
+		<method name="get_rotation" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return the base transform for this layer.
+				Return the base rotation for this layer (helper).
 			</description>
 		</method>
-		<method name="set_offset">
-			<argument index="0" name="offset" type="Vector2">
-			</argument>
+		<method name="get_rotationd" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the base offset for this layer (helper).
+				Get rotation of the layer in degree.
 			</description>
 		</method>
-		<method name="get_offset" qualifiers="const">
+		<method name="get_scale" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
-			Return the base offset for this layer (helper).
+				Return the base scale for this layer (helper).
 			</description>
 		</method>
-		<method name="set_rotation">
-			<argument index="0" name="radians" type="float">
-			</argument>
+		<method name="get_transform" qualifiers="const">
+			<return type="Matrix32">
+			</return>
 			<description>
-			Set the base rotation for this layer (helper).
+				Return the base transform for this layer.
 			</description>
 		</method>
-		<method name="get_rotation" qualifiers="const">
-			<return type="float">
+		<method name="get_viewport" qualifiers="const">
+			<return type="RID">
 			</return>
 			<description>
-			Return the base rotation for this layer (helper).
+				Return the viewport RID for this layer.
 			</description>
 		</method>
-		<method name="set_rotationd">
-			<argument index="0" name="degrees" type="float">
+		<method name="get_world_2d" qualifiers="const">
+			<return type="World2D">
+			</return>
+			<description>
+				Return the [World2D] used by this layer.
+			</description>
+		</method>
+		<method name="set_layer">
+			<argument index="0" name="layer" type="int">
 			</argument>
 			<description>
-			Set rotation of the layer in degree.
+				Set the layer index, determines the draw order, a lower value will be below a higher one.
 			</description>
 		</method>
-		<method name="get_rotationd" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_offset">
+			<argument index="0" name="offset" type="Vector2">
+			</argument>
 			<description>
-			Get rotation of the layer in degree.
+				Set the base offset for this layer (helper).
 			</description>
 		</method>
-		<method name="set_scale">
-			<argument index="0" name="scale" type="Vector2">
+		<method name="set_rotation">
+			<argument index="0" name="radians" type="float">
 			</argument>
 			<description>
-			Set the base scale for this layer (helper).
+				Set the base rotation for this layer (helper).
 			</description>
 		</method>
-		<method name="get_scale" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_rotationd">
+			<argument index="0" name="degrees" type="float">
+			</argument>
 			<description>
-			Return the base scale for this layer (helper).
+				Set rotation of the layer in degree.
 			</description>
 		</method>
-		<method name="get_world_2d" qualifiers="const">
-			<return type="World2D">
-			</return>
+		<method name="set_scale">
+			<argument index="0" name="scale" type="Vector2">
+			</argument>
 			<description>
-			Return the [World2D] used by this layer.
+				Set the base scale for this layer (helper).
 			</description>
 		</method>
-		<method name="get_viewport" qualifiers="const">
-			<return type="RID">
-			</return>
+		<method name="set_transform">
+			<argument index="0" name="transform" type="Matrix32">
+			</argument>
 			<description>
-			Return the viewport RID for this layer.
+				Set the base transform for this layer.
 			</description>
 		</method>
 	</methods>
@@ -7514,24 +7585,24 @@
 </class>
 <class name="CanvasModulate" inherits="Node2D" category="Core">
 	<brief_description>
-	Tint the entire canvas
+		Tint the entire canvas
 	</brief_description>
 	<description>
-	CanvasModulate tints the canvas elements using its asigned color
+		CanvasModulate tints the canvas elements using its asigned color
 	</description>
 	<methods>
-		<method name="set_color">
-			<argument index="0" name="color" type="Color">
-			</argument>
-			<description>
-			Sets the canvas tint color
-			</description>
-		</method>
 		<method name="get_color" qualifiers="const">
 			<return type="Color">
 			</return>
 			<description>
-			Gets the canvas tint color
+				Gets the canvas tint color
+			</description>
+		</method>
+		<method name="set_color">
+			<argument index="0" name="color" type="Color">
+			</argument>
+			<description>
+				Sets the canvas tint color
 			</description>
 		</method>
 	</methods>
@@ -7540,38 +7611,38 @@
 </class>
 <class name="CapsuleShape" inherits="Shape" category="Core">
 	<brief_description>
-	Capsule shape resource.
+		Capsule shape resource.
 	</brief_description>
 	<description>
-	Capsule shape resource, which can be set into a [PhysicsBody] or area.
+		Capsule shape resource, which can be set into a [PhysicsBody] or area.
 	</description>
 	<methods>
-		<method name="set_radius">
-			<argument index="0" name="radius" type="float">
-			</argument>
+		<method name="get_height" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the capsule radius.
+				Return the capsule height.
 			</description>
 		</method>
 		<method name="get_radius" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the capsule radius.
+				Return the capsule radius.
 			</description>
 		</method>
 		<method name="set_height">
 			<argument index="0" name="height" type="float">
 			</argument>
 			<description>
-			Set the capsule height.
+				Set the capsule height.
 			</description>
 		</method>
-		<method name="get_height" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_radius">
+			<argument index="0" name="radius" type="float">
+			</argument>
 			<description>
-			Return the capsule height.
+				Set the capsule radius.
 			</description>
 		</method>
 	</methods>
@@ -7580,38 +7651,38 @@
 </class>
 <class name="CapsuleShape2D" inherits="Shape2D" category="Core">
 	<brief_description>
-	Capsule 2D shape resource for physics.
+		Capsule 2D shape resource for physics.
 	</brief_description>
 	<description>
-	Capsule 2D shape resource for physics. A capsule (or sometimes called "pill") is like a line grown in all directions. It has a radius and a height, and is often useful for modeling biped characters.
+		Capsule 2D shape resource for physics. A capsule (or sometimes called "pill") is like a line grown in all directions. It has a radius and a height, and is often useful for modeling biped characters.
 	</description>
 	<methods>
-		<method name="set_radius">
-			<argument index="0" name="radius" type="float">
-			</argument>
+		<method name="get_height" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the radius of the [CapsuleShape2D].
+				Return the height of the [CapsuleShape2D].
 			</description>
 		</method>
 		<method name="get_radius" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the radius of the [CapsuleShape2D].
+				Return the radius of the [CapsuleShape2D].
 			</description>
 		</method>
 		<method name="set_height">
 			<argument index="0" name="height" type="float">
 			</argument>
 			<description>
-			Set the height of the [CapsuleShape2D].
+				Set the height of the [CapsuleShape2D].
 			</description>
 		</method>
-		<method name="get_height" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_radius">
+			<argument index="0" name="radius" type="float">
+			</argument>
 			<description>
-			Return the height of the [CapsuleShape2D].
+				Set the radius of the [CapsuleShape2D].
 			</description>
 		</method>
 	</methods>
@@ -7620,24 +7691,24 @@
 </class>
 <class name="CenterContainer" inherits="Container" category="Core">
 	<brief_description>
-	Keeps children controls centered.
+		Keeps children controls centered.
 	</brief_description>
 	<description>
-	CenterContainer Keeps children controls centered. This container keeps all children to their minimum size, in the center.
+		CenterContainer Keeps children controls centered. This container keeps all children to their minimum size, in the center.
 	</description>
 	<methods>
-		<method name="set_use_top_left">
-			<argument index="0" name="enable" type="bool">
-			</argument>
-			<description>
-			This function will anchor the container children to the top left corner of the the container boundaries, moving all its children to that position, (the children new center will be the top left corner of the container).
-			</description>
-		</method>
 		<method name="is_using_top_left" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Should put children to the top left corner instead of center of the container.
+				Should put children to the top left corner instead of center of the container.
+			</description>
+		</method>
+		<method name="set_use_top_left">
+			<argument index="0" name="enable" type="bool">
+			</argument>
+			<description>
+				This function will anchor the container children to the top left corner of the the container boundaries, moving all its children to that position, (the children new center will be the top left corner of the container).
 			</description>
 		</method>
 	</methods>
@@ -7646,10 +7717,10 @@
 </class>
 <class name="CheckBox" inherits="Button" category="Core">
 	<brief_description>
-	Binary choice user interface widget
+		Binary choice user interface widget
 	</brief_description>
 	<description>
-	A checkbox allows the user to make a binary choice (choosing only one of two posible options), for example Answer 'yes' or 'no'.
+		A checkbox allows the user to make a binary choice (choosing only one of two posible options), for example Answer 'yes' or 'no'.
 	</description>
 	<methods>
 	</methods>
@@ -7658,44 +7729,44 @@
 	<theme_items>
 		<theme_item name="check_vadjust" type="int">
 		</theme_item>
-		<theme_item name="hseparation" type="int">
+		<theme_item name="checked" type="Texture">
 		</theme_item>
-		<theme_item name="font_color_disabled" type="Color">
+		<theme_item name="disabled" type="StyleBox">
 		</theme_item>
-		<theme_item name="font_color" type="Color">
+		<theme_item name="focus" type="StyleBox">
 		</theme_item>
-		<theme_item name="font_color_hover" type="Color">
+		<theme_item name="font" type="Font">
 		</theme_item>
-		<theme_item name="font_color_pressed" type="Color">
+		<theme_item name="font_color" type="Color">
 		</theme_item>
-		<theme_item name="radio_checked" type="Texture">
+		<theme_item name="font_color_disabled" type="Color">
 		</theme_item>
-		<theme_item name="checked" type="Texture">
+		<theme_item name="font_color_hover" type="Color">
 		</theme_item>
-		<theme_item name="radio_unchecked" type="Texture">
+		<theme_item name="font_color_pressed" type="Color">
 		</theme_item>
-		<theme_item name="unchecked" type="Texture">
+		<theme_item name="hover" type="StyleBox">
 		</theme_item>
-		<theme_item name="font" type="Font">
+		<theme_item name="hseparation" type="int">
 		</theme_item>
-		<theme_item name="hover" type="StyleBox">
+		<theme_item name="normal" type="StyleBox">
 		</theme_item>
 		<theme_item name="pressed" type="StyleBox">
 		</theme_item>
-		<theme_item name="focus" type="StyleBox">
+		<theme_item name="radio_checked" type="Texture">
 		</theme_item>
-		<theme_item name="disabled" type="StyleBox">
+		<theme_item name="radio_unchecked" type="Texture">
 		</theme_item>
-		<theme_item name="normal" type="StyleBox">
+		<theme_item name="unchecked" type="Texture">
 		</theme_item>
 	</theme_items>
 </class>
 <class name="CheckButton" inherits="Button" category="Core">
 	<brief_description>
-	Checkable button.
+		Checkable button.
 	</brief_description>
 	<description>
-	CheckButton is a toggle button displayed as a check field.
+		CheckButton is a toggle button displayed as a check field.
 	</description>
 	<methods>
 	</methods>
@@ -7704,54 +7775,54 @@
 	<theme_items>
 		<theme_item name="check_vadjust" type="int">
 		</theme_item>
-		<theme_item name="hseparation" type="int">
+		<theme_item name="disabled" type="StyleBox">
 		</theme_item>
-		<theme_item name="font_color_disabled" type="Color">
+		<theme_item name="focus" type="StyleBox">
+		</theme_item>
+		<theme_item name="font" type="Font">
 		</theme_item>
 		<theme_item name="font_color" type="Color">
 		</theme_item>
+		<theme_item name="font_color_disabled" type="Color">
+		</theme_item>
 		<theme_item name="font_color_hover" type="Color">
 		</theme_item>
 		<theme_item name="font_color_pressed" type="Color">
 		</theme_item>
-		<theme_item name="off" type="Texture">
-		</theme_item>
-		<theme_item name="on" type="Texture">
-		</theme_item>
-		<theme_item name="font" type="Font">
-		</theme_item>
 		<theme_item name="hover" type="StyleBox">
 		</theme_item>
-		<theme_item name="pressed" type="StyleBox">
+		<theme_item name="hseparation" type="int">
 		</theme_item>
-		<theme_item name="focus" type="StyleBox">
+		<theme_item name="normal" type="StyleBox">
 		</theme_item>
-		<theme_item name="disabled" type="StyleBox">
+		<theme_item name="off" type="Texture">
 		</theme_item>
-		<theme_item name="normal" type="StyleBox">
+		<theme_item name="on" type="Texture">
+		</theme_item>
+		<theme_item name="pressed" type="StyleBox">
 		</theme_item>
 	</theme_items>
 </class>
 <class name="CircleShape2D" inherits="Shape2D" category="Core">
 	<brief_description>
-	Circular Shape for 2D Physics.
+		Circular Shape for 2D Physics.
 	</brief_description>
 	<description>
-	Circular Shape for 2D Physics. This shape is useful for modeling balls or small characters and it's collision detection with everything else is very fast.
+		Circular Shape for 2D Physics. This shape is useful for modeling balls or small characters and it's collision detection with everything else is very fast.
 	</description>
 	<methods>
-		<method name="set_radius">
-			<argument index="0" name="radius" type="float">
-			</argument>
-			<description>
-			Set the radius of the circle shape.
-			</description>
-		</method>
 		<method name="get_radius" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the radius of the circle shape.
+				Return the radius of the circle shape.
+			</description>
+		</method>
+		<method name="set_radius">
+			<argument index="0" name="radius" type="float">
+			</argument>
+			<description>
+				Set the radius of the circle shape.
 			</description>
 		</method>
 	</methods>
@@ -7786,54 +7857,52 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_shape_count" qualifiers="const">
-			<return type="int">
+		<method name="clear_shapes">
+			<description>
+			</description>
+		</method>
+		<method name="get_capture_input_on_drag" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_shape">
-			<argument index="0" name="shape_idx" type="int">
-			</argument>
-			<argument index="1" name="shape" type="Shape">
-			</argument>
+		<method name="get_rid" qualifiers="const">
+			<return type="RID">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_shape_transform">
+		<method name="get_shape" qualifiers="const">
+			<return type="Shape">
+			</return>
 			<argument index="0" name="shape_idx" type="int">
 			</argument>
-			<argument index="1" name="transform" type="Transform">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_shape_as_trigger">
-			<argument index="0" name="shape_idx" type="int">
-			</argument>
-			<argument index="1" name="enable" type="bool">
-			</argument>
+		<method name="get_shape_count" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="is_shape_set_as_trigger" qualifiers="const">
-			<return type="bool">
+		<method name="get_shape_transform" qualifiers="const">
+			<return type="Transform">
 			</return>
 			<argument index="0" name="shape_idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_shape" qualifiers="const">
-			<return type="Shape">
+		<method name="is_ray_pickable" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="shape_idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_shape_transform" qualifiers="const">
-			<return type="Transform">
+		<method name="is_shape_set_as_trigger" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="shape_idx" type="int">
 			</argument>
@@ -7846,7 +7915,9 @@
 			<description>
 			</description>
 		</method>
-		<method name="clear_shapes">
+		<method name="set_capture_input_on_drag">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -7856,36 +7927,32 @@
 			<description>
 			</description>
 		</method>
-		<method name="is_ray_pickable" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="set_capture_input_on_drag">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_shape">
+			<argument index="0" name="shape_idx" type="int">
+			</argument>
+			<argument index="1" name="shape" type="Shape">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_capture_input_on_drag" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_shape_as_trigger">
+			<argument index="0" name="shape_idx" type="int">
+			</argument>
+			<argument index="1" name="enable" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_rid" qualifiers="const">
-			<return type="RID">
-			</return>
+		<method name="set_shape_transform">
+			<argument index="0" name="shape_idx" type="int">
+			</argument>
+			<argument index="1" name="transform" type="Transform">
+			</argument>
 			<description>
 			</description>
 		</method>
 	</methods>
 	<signals>
-		<signal name="mouse_enter">
-			<description>
-			</description>
-		</signal>
 		<signal name="input_event">
 			<argument index="0" name="camera" type="Object">
 			</argument>
@@ -7900,6 +7967,10 @@
 			<description>
 			</description>
 		</signal>
+		<signal name="mouse_enter">
+			<description>
+			</description>
+		</signal>
 		<signal name="mouse_exit">
 			<description>
 			</description>
@@ -7910,10 +7981,10 @@
 </class>
 <class name="CollisionObject2D" inherits="Node2D" category="Core">
 	<brief_description>
-	Base node for 2D collisionables.
+		Base node for 2D collisionables.
 	</brief_description>
 	<description>
-	CollisionObject2D is the base class for 2D physics collisionables. They can hold any number of 2D collision shapes. Usually, they are edited by placing [CollisionShape2D] and/or [CollisionPolygon2D] nodes as children. Such nodes are for reference and not present outside the editor, so code should use the regular shape API.
+		CollisionObject2D is the base class for 2D physics collisionables. They can hold any number of 2D collision shapes. Usually, they are edited by placing [CollisionShape2D] and/or [CollisionPolygon2D] nodes as children. Such nodes are for reference and not present outside the editor, so code should use the regular shape API.
 	</description>
 	<methods>
 		<method name="_input_event" qualifiers="virtual">
@@ -7924,7 +7995,7 @@
 			<argument index="2" name="shape_idx" type="int">
 			</argument>
 			<description>
-			This method can be used to override normal input processing. The first parameter is the viewport where the event took place. The second holds the input event received, and the third the shape of this object where it happened.
+				This method can be used to override normal input processing. The first parameter is the viewport where the event took place. The second holds the input event received, and the third the shape of this object where it happened.
 			</description>
 		</method>
 		<method name="add_shape">
@@ -7933,59 +8004,51 @@
 			<argument index="1" name="transform" type="Matrix32" default="1,0, 0,1, 0,0">
 			</argument>
 			<description>
-			Add a [Shape2D] to the collision body, with a given custom transform.
+				Add a [Shape2D] to the collision body, with a given custom transform.
 			</description>
 		</method>
-		<method name="get_shape_count" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="clear_shapes">
 			<description>
-			Return the amount of shapes in the collision body. Because a [CollisionPolygon2D] can generate more than one [Shape2D], the amount returned does not have to match the sum of [CollisionShape2D] and [CollisionPolygon2D].
+				Remove all shapes.
 			</description>
 		</method>
-		<method name="set_shape">
-			<argument index="0" name="shape_idx" type="int">
-			</argument>
-			<argument index="1" name="shape" type="Shape">
-			</argument>
+		<method name="get_rid" qualifiers="const">
+			<return type="RID">
+			</return>
 			<description>
-			Change a shape in the collision body.
+				Return the RID of this object.
 			</description>
 		</method>
-		<method name="set_shape_transform">
+		<method name="get_shape" qualifiers="const">
+			<return type="Shape2D">
+			</return>
 			<argument index="0" name="shape_idx" type="int">
 			</argument>
-			<argument index="1" name="transform" type="Matrix32">
-			</argument>
 			<description>
-			Change the shape transform in the collision body.
+				Return the shape in the given index.
 			</description>
 		</method>
-		<method name="set_shape_as_trigger">
-			<argument index="0" name="shape_idx" type="int">
-			</argument>
-			<argument index="1" name="enable" type="bool">
-			</argument>
+		<method name="get_shape_count" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set whether a shape is a trigger. A trigger shape detects collisions, but is otherwise unaffected by physics (i.e. colliding objects will not get blocked).
+				Return the amount of shapes in the collision body. Because a [CollisionPolygon2D] can generate more than one [Shape2D], the amount returned does not have to match the sum of [CollisionShape2D] and [CollisionPolygon2D].
 			</description>
 		</method>
-		<method name="get_shape" qualifiers="const">
-			<return type="Shape2D">
+		<method name="get_shape_transform" qualifiers="const">
+			<return type="Matrix32">
 			</return>
 			<argument index="0" name="shape_idx" type="int">
 			</argument>
 			<description>
-			Return the shape in the given index.
+				Return the shape transform in the given index.
 			</description>
 		</method>
-		<method name="get_shape_transform" qualifiers="const">
-			<return type="Matrix32">
+		<method name="is_pickable" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="shape_idx" type="int">
-			</argument>
 			<description>
-			Return the shape transform in the given index.
+				Return whether this object is pickable.
 			</description>
 		</method>
 		<method name="is_shape_set_as_trigger" qualifiers="const">
@@ -7994,49 +8057,52 @@
 			<argument index="0" name="shape_idx" type="int">
 			</argument>
 			<description>
-			Return whether a shape is a trigger. A trigger shape detects collisions, but is otherwise unaffected by physics (i.e. colliding objects will not get blocked).
+				Return whether a shape is a trigger. A trigger shape detects collisions, but is otherwise unaffected by physics (i.e. colliding objects will not get blocked).
 			</description>
 		</method>
 		<method name="remove_shape">
 			<argument index="0" name="shape_idx" type="int">
 			</argument>
 			<description>
-			Remove the shape in the given index.
+				Remove the shape in the given index.
 			</description>
 		</method>
-		<method name="clear_shapes">
+		<method name="set_pickable">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
-			Remove all shapes.
+				Set whether this object is pickable. A pickable object can detect the mouse pointer enter/leave it and, if the mouse is inside it, report input events.
 			</description>
 		</method>
-		<method name="get_rid" qualifiers="const">
-			<return type="RID">
-			</return>
+		<method name="set_shape">
+			<argument index="0" name="shape_idx" type="int">
+			</argument>
+			<argument index="1" name="shape" type="Shape">
+			</argument>
 			<description>
-			Return the RID of this object.
+				Change a shape in the collision body.
 			</description>
 		</method>
-		<method name="set_pickable">
-			<argument index="0" name="enabled" type="bool">
+		<method name="set_shape_as_trigger">
+			<argument index="0" name="shape_idx" type="int">
+			</argument>
+			<argument index="1" name="enable" type="bool">
 			</argument>
 			<description>
-			Set whether this object is pickable. A pickable object can detect the mouse pointer enter/leave it and, if the mouse is inside it, report input events.
+				Set whether a shape is a trigger. A trigger shape detects collisions, but is otherwise unaffected by physics (i.e. colliding objects will not get blocked).
 			</description>
 		</method>
-		<method name="is_pickable" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_shape_transform">
+			<argument index="0" name="shape_idx" type="int">
+			</argument>
+			<argument index="1" name="transform" type="Matrix32">
+			</argument>
 			<description>
-			Return whether this object is pickable.
+				Change the shape transform in the collision body.
 			</description>
 		</method>
 	</methods>
 	<signals>
-		<signal name="mouse_enter">
-			<description>
-			This event fires only once when the mouse pointer enters any shape of this object.
-			</description>
-		</signal>
 		<signal name="input_event">
 			<argument index="0" name="viewport" type="Object">
 			</argument>
@@ -8045,12 +8111,17 @@
 			<argument index="2" name="shape_idx" type="int">
 			</argument>
 			<description>
-			This signal triggers when an input event fires over a shape. The first parameter is the viewport where the event took place. The second holds the input event received, and the third the shape of this object where it happened.
+				This signal triggers when an input event fires over a shape. The first parameter is the viewport where the event took place. The second holds the input event received, and the third the shape of this object where it happened.
+			</description>
+		</signal>
+		<signal name="mouse_enter">
+			<description>
+				This event fires only once when the mouse pointer enters any shape of this object.
 			</description>
 		</signal>
 		<signal name="mouse_exit">
 			<description>
-			This event fires only once when the mouse pointer exits all shapes of this object.
+				This event fires only once when the mouse pointer exits all shapes of this object.
 			</description>
 		</signal>
 	</signals>
@@ -8063,21 +8134,21 @@
 	<description>
 	</description>
 	<methods>
-		<method name="set_build_mode">
-			<argument index="0" name="build_mode" type="int">
-			</argument>
+		<method name="get_build_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_build_mode" qualifiers="const">
+		<method name="get_collision_object_first_shape" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_depth">
-			<argument index="0" name="depth" type="float">
-			</argument>
+		<method name="get_collision_object_last_shape" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -8087,27 +8158,27 @@
 			<description>
 			</description>
 		</method>
-		<method name="set_polygon">
-			<argument index="0" name="polygon" type="Vector2Array">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_polygon" qualifiers="const">
 			<return type="Vector2Array">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_collision_object_first_shape" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_build_mode">
+			<argument index="0" name="build_mode" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_collision_object_last_shape" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_depth">
+			<argument index="0" name="depth" type="float">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_polygon">
+			<argument index="0" name="polygon" type="Vector2Array">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -8117,69 +8188,69 @@
 </class>
 <class name="CollisionPolygon2D" inherits="Node2D" category="Core">
 	<brief_description>
-	Editor-only class for easy editing of collision polygons.
+		Editor-only class for easy editing of collision polygons.
 	</brief_description>
 	<description>
-	Editor-only class. This is not present when running the game. It's used in the editor to properly edit and position collision shapes in [CollisionObject2D]. This is not accessible from regular code. This class is for editing custom shape polygons.
+		Editor-only class. This is not present when running the game. It's used in the editor to properly edit and position collision shapes in [CollisionObject2D]. This is not accessible from regular code. This class is for editing custom shape polygons.
 	</description>
 	<methods>
-		<method name="set_polygon">
-			<argument index="0" name="polygon" type="Vector2Array">
-			</argument>
-			<description>
-			Set the array of points forming the polygon.
-			When editing the point list via the editor, depending on [method get_build_mode], it has to be a list of points (for [code]build_mode==0[/code]), or a list of lines (for [code]build_mode==1[/code]). In the second case, the even elements of the array define the start point of the line, and the odd elements the end point.
-			</description>
-		</method>
-		<method name="get_polygon" qualifiers="const">
-			<return type="Vector2Array">
+		<method name="get_build_mode" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the list of points that define the polygon.
+				Return whether the polygon is a [ConvexPolygonShape2D] ([code]build_mode==0[/code]), or a [ConcavePolygonShape2D] ([code]build_mode==1[/code]).
 			</description>
 		</method>
-		<method name="set_build_mode">
-			<argument index="0" name="build_mode" type="int">
-			</argument>
+		<method name="get_collision_object_first_shape" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set whether the polygon is to be a [ConvexPolygonShape2D] ([code]build_mode==0[/code]), or a [ConcavePolygonShape2D] ([code]build_mode==1[/code]).
+				Return the index of the first shape generated by the editor.
+				When [code]build_mode[/code] is set to generate convex polygons, the shape shown in the editor may be decomposed into many convex polygons. In that case, a range of indexes is needed to directly access the [Shape2D].
+				When [code]build_mode[/code] is set to generate concave polygons, there is only one [Shape2D] generated, so the start index and the end index are the same.
 			</description>
 		</method>
-		<method name="get_build_mode" qualifiers="const">
+		<method name="get_collision_object_last_shape" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return whether the polygon is a [ConvexPolygonShape2D] ([code]build_mode==0[/code]), or a [ConcavePolygonShape2D] ([code]build_mode==1[/code]).
+				Return the index of the last shape generated by the editor.
 			</description>
 		</method>
-		<method name="set_trigger">
-			<argument index="0" name="trigger" type="bool">
-			</argument>
+		<method name="get_polygon" qualifiers="const">
+			<return type="Vector2Array">
+			</return>
 			<description>
-			Set whether this polygon is a trigger. A trigger polygon detects collisions, but is otherwise unaffected by physics (i.e. colliding objects will not get blocked).
+				Return the list of points that define the polygon.
 			</description>
 		</method>
 		<method name="is_trigger" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return whether this polygon is a trigger.
+				Return whether this polygon is a trigger.
 			</description>
 		</method>
-		<method name="get_collision_object_first_shape" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_build_mode">
+			<argument index="0" name="build_mode" type="int">
+			</argument>
 			<description>
-			Return the index of the first shape generated by the editor.
-			When [code]build_mode[/code] is set to generate convex polygons, the shape shown in the editor may be decomposed into many convex polygons. In that case, a range of indexes is needed to directly access the [Shape2D].
-			When [code]build_mode[/code] is set to generate concave polygons, there is only one [Shape2D] generated, so the start index and the end index are the same.
+				Set whether the polygon is to be a [ConvexPolygonShape2D] ([code]build_mode==0[/code]), or a [ConcavePolygonShape2D] ([code]build_mode==1[/code]).
 			</description>
 		</method>
-		<method name="get_collision_object_last_shape" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_polygon">
+			<argument index="0" name="polygon" type="Vector2Array">
+			</argument>
 			<description>
-			Return the index of the last shape generated by the editor.
+				Set the array of points forming the polygon.
+				When editing the point list via the editor, depending on [method get_build_mode], it has to be a list of points (for [code]build_mode==0[/code]), or a list of lines (for [code]build_mode==1[/code]). In the second case, the even elements of the array define the start point of the line, and the odd elements the end point.
+			</description>
+		</method>
+		<method name="set_trigger">
+			<argument index="0" name="trigger" type="bool">
+			</argument>
+			<description>
+				Set whether this polygon is a trigger. A trigger polygon detects collisions, but is otherwise unaffected by physics (i.e. colliding objects will not get blocked).
 			</description>
 		</method>
 	</methods>
@@ -8192,15 +8263,9 @@
 	<description>
 	</description>
 	<methods>
-		<method name="resource_changed">
-			<argument index="0" name="resource" type="Object">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="set_shape">
-			<argument index="0" name="shape" type="Object">
-			</argument>
+		<method name="get_collision_object_shape_index" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -8210,12 +8275,6 @@
 			<description>
 			</description>
 		</method>
-		<method name="set_trigger">
-			<argument index="0" name="enable" type="bool">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="is_trigger" qualifiers="const">
 			<return type="bool">
 			</return>
@@ -8226,9 +8285,21 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_collision_object_shape_index" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="resource_changed">
+			<argument index="0" name="resource" type="Object">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_shape">
+			<argument index="0" name="shape" type="Object">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_trigger">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -8238,45 +8309,45 @@
 </class>
 <class name="CollisionShape2D" inherits="Node2D" category="Core">
 	<brief_description>
-	Editor-only class for easy editing of shapes.
+		Editor-only class for easy editing of shapes.
 	</brief_description>
 	<description>
-	Editor-only class. This is not present when running the game. It's used in the editor to properly edit and position collision shapes in [CollisionObject2D]. This is not accessible from regular code.
+		Editor-only class. This is not present when running the game. It's used in the editor to properly edit and position collision shapes in [CollisionObject2D]. This is not accessible from regular code.
 	</description>
 	<methods>
-		<method name="set_shape">
-			<argument index="0" name="shape" type="Object">
-			</argument>
+		<method name="get_collision_object_shape_index" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set this shape's [Shape2D]. This will not appear as a node, but can be directly edited as a property.
+				Return the index of this shape inside its container [CollisionObject2D]. This can be used to directly access the underlying [Shape2D].
 			</description>
 		</method>
 		<method name="get_shape" qualifiers="const">
 			<return type="Object">
 			</return>
 			<description>
-			Return this shape's [Shape2D].
-			</description>
-		</method>
-		<method name="set_trigger">
-			<argument index="0" name="enable" type="bool">
-			</argument>
-			<description>
-			Set whether this shape is a trigger. A trigger shape detects collisions, but is otherwise unaffected by physics (i.e. will not block movement of colliding objects).
+				Return this shape's [Shape2D].
 			</description>
 		</method>
 		<method name="is_trigger" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return whether this shape is a trigger.
+				Return whether this shape is a trigger.
 			</description>
 		</method>
-		<method name="get_collision_object_shape_index" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_shape">
+			<argument index="0" name="shape" type="Object">
+			</argument>
 			<description>
-			Return the index of this shape inside its container [CollisionObject2D]. This can be used to directly access the underlying [Shape2D].
+				Set this shape's [Shape2D]. This will not appear as a node, but can be directly edited as a property.
+			</description>
+		</method>
+		<method name="set_trigger">
+			<argument index="0" name="enable" type="bool">
+			</argument>
+			<description>
+				Set whether this shape is a trigger. A trigger shape detects collisions, but is otherwise unaffected by physics (i.e. will not block movement of colliding objects).
 			</description>
 		</method>
 	</methods>
@@ -8285,156 +8356,156 @@
 </class>
 <class name="Color" category="Built-In Types">
 	<brief_description>
-	Color in RGBA format.
+		Color in RGBA format.
 	</brief_description>
 	<description>
-	A color is represented as red, green and blue (r,g,b) components. Additionally, "a" represents the alpha component, often used for transparency. Values are in floating point and usually range from 0 to 1.  Some methods (such as set_modulate() ) may accept values &gt; 1.
+		A color is represented as red, green and blue (r,g,b) components. Additionally, "a" represents the alpha component, often used for transparency. Values are in floating point and usually range from 0 to 1.  Some methods (such as set_modulate() ) may accept values &gt; 1.
 	</description>
 	<methods>
-		<method name="blend">
+		<method name="Color">
 			<return type="Color">
 			</return>
-			<argument index="0" name="over" type="Color">
+			<argument index="0" name="r" type="float">
+			</argument>
+			<argument index="1" name="g" type="float">
+			</argument>
+			<argument index="2" name="b" type="float">
+			</argument>
+			<argument index="3" name="a" type="float">
 			</argument>
 			<description>
-			Return a new color blended with anothor one.
+				Construct the color from an RGBA profile.
 			</description>
 		</method>
-		<method name="contrasted">
+		<method name="Color">
 			<return type="Color">
 			</return>
+			<argument index="0" name="r" type="float">
+			</argument>
+			<argument index="1" name="g" type="float">
+			</argument>
+			<argument index="2" name="b" type="float">
+			</argument>
 			<description>
-			Return the most contrasting color with this one.
+				Construct the color from an RGBA profile.
 			</description>
 		</method>
-		<method name="gray">
-			<return type="float">
+		<method name="Color">
+			<return type="Color">
 			</return>
+			<argument index="0" name="from" type="int">
+			</argument>
 			<description>
-			Convert the color to gray.
+				Construct the color from an RGBA profile.
 			</description>
 		</method>
-		<method name="inverted">
+		<method name="Color">
 			<return type="Color">
 			</return>
+			<argument index="0" name="from" type="String">
+			</argument>
 			<description>
-			Return the inverted color (1-r, 1-g, 1-b, 1-a).
+				Construct the color from an RGBA profile.
 			</description>
 		</method>
-		<method name="linear_interpolate">
+		<method name="blend">
 			<return type="Color">
 			</return>
-			<argument index="0" name="b" type="Color">
-			</argument>
-			<argument index="1" name="t" type="float">
+			<argument index="0" name="over" type="Color">
 			</argument>
 			<description>
-			Return the linear interpolation with another color.
+				Return a new color blended with anothor one.
 			</description>
 		</method>
-		<method name="to_32">
-			<return type="int">
+		<method name="contrasted">
+			<return type="Color">
 			</return>
 			<description>
-			Convert the color to a 32 its integer (each byte represents a RGBA).
+				Return the most contrasting color with this one.
 			</description>
 		</method>
-		<method name="to_ARGB32">
-			<return type="int">
+		<method name="gray">
+			<return type="float">
 			</return>
 			<description>
-			Convert color to ARGB32, more compatible with DirectX.
+				Convert the color to gray.
 			</description>
 		</method>
-		<method name="to_html">
-			<return type="String">
+		<method name="inverted">
+			<return type="Color">
 			</return>
-			<argument index="0" name="with_alpha" type="bool" default="True">
-			</argument>
 			<description>
-			Return the HTML hexadecimal color string.
+				Return the inverted color (1-r, 1-g, 1-b, 1-a).
 			</description>
 		</method>
-		<method name="Color">
+		<method name="linear_interpolate">
 			<return type="Color">
 			</return>
-			<argument index="0" name="r" type="float">
-			</argument>
-			<argument index="1" name="g" type="float">
-			</argument>
-			<argument index="2" name="b" type="float">
+			<argument index="0" name="b" type="Color">
 			</argument>
-			<argument index="3" name="a" type="float">
+			<argument index="1" name="t" type="float">
 			</argument>
 			<description>
-			Construct the color from an RGBA profile.
+				Return the linear interpolation with another color.
 			</description>
 		</method>
-		<method name="Color">
-			<return type="Color">
+		<method name="to_32">
+			<return type="int">
 			</return>
-			<argument index="0" name="r" type="float">
-			</argument>
-			<argument index="1" name="g" type="float">
-			</argument>
-			<argument index="2" name="b" type="float">
-			</argument>
 			<description>
-			Construct the color from an RGBA profile.
+				Convert the color to a 32 its integer (each byte represents a RGBA).
 			</description>
 		</method>
-		<method name="Color">
-			<return type="Color">
+		<method name="to_ARGB32">
+			<return type="int">
 			</return>
-			<argument index="0" name="from" type="int">
-			</argument>
 			<description>
-			Construct the color from an RGBA profile.
+				Convert color to ARGB32, more compatible with DirectX.
 			</description>
 		</method>
-		<method name="Color">
-			<return type="Color">
+		<method name="to_html">
+			<return type="String">
 			</return>
-			<argument index="0" name="from" type="String">
+			<argument index="0" name="with_alpha" type="bool" default="True">
 			</argument>
 			<description>
-			Construct the color from an RGBA profile.
+				Return the HTML hexadecimal color string.
 			</description>
 		</method>
 	</methods>
 	<members>
-		<member name="r" type="float">
-			Red (0 to 1)
+		<member name="a" type="float">
+			Alpha (0 to 1)
 		</member>
-		<member name="g" type="float">
-			Green (0 to 1)
+		<member name="a8" type="int">
+			Alpha (0 to 255)
 		</member>
 		<member name="b" type="float">
 			Blue (0 to 1)
 		</member>
-		<member name="a" type="float">
-			Alpha (0 to 1)
+		<member name="b8" type="int">
+			Blue (0 to 255)
+		</member>
+		<member name="g" type="float">
+			Green (0 to 1)
+		</member>
+		<member name="g8" type="int">
+			Green (0 to 255)
 		</member>
 		<member name="h" type="float">
 			Hue (0 to 1)
 		</member>
-		<member name="s" type="float">
-			Saturation (0 to 1)
-		</member>
-		<member name="v" type="float">
-			Value (0 to 1)
+		<member name="r" type="float">
+			Red (0 to 1)
 		</member>
 		<member name="r8" type="int">
 			Red (0 to 255)
 		</member>
-		<member name="g8" type="int">
-			Green (0 to 255)
-		</member>
-		<member name="b8" type="int">
-			Blue (0 to 255)
+		<member name="s" type="float">
+			Saturation (0 to 1)
 		</member>
-		<member name="a8" type="int">
-			Alpha (0 to 255)
+		<member name="v" type="float">
+			Value (0 to 1)
 		</member>
 	</members>
 	<constants>
@@ -8442,24 +8513,70 @@
 </class>
 <class name="ColorArray" category="Built-In Types">
 	<brief_description>
-	Array of Colors
+		Array of Colors
 	</brief_description>
 	<description>
-	Array of Color, can only contains colors. Optimized for memory usage, can't fragment the memory.
+		Array of Color, can only contains colors. Optimized for memory usage, can't fragment the memory.
 	</description>
 	<methods>
+		<method name="ColorArray">
+			<return type="ColorArray">
+			</return>
+			<argument index="0" name="from" type="Array">
+			</argument>
+			<description>
+				Create from a generic array.
+			</description>
+		</method>
+		<method name="append">
+			<argument index="0" name="color" type="Color">
+			</argument>
+			<description>
+				Append an element at the end of the array (alias of [method push_back]).
+			</description>
+		</method>
+		<method name="append_array">
+			<argument index="0" name="array" type="ColorArray">
+			</argument>
+			<description>
+				Append an [ColorArray] at the end of this array.
+			</description>
+		</method>
+		<method name="insert">
+			<return type="int">
+			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="color" type="Color">
+			</argument>
+			<description>
+				Insert a new element at a given position in the array. The position must be valid, or at the end of the array (pos==size()).
+			</description>
+		</method>
+		<method name="invert">
+			<description>
+				Reverse the order of the elements in the array (so first element will now be the last).
+			</description>
+		</method>
 		<method name="push_back">
 			<argument index="0" name="color" type="Color">
 			</argument>
 			<description>
-			Append a value to the array.
+				Append a value to the array.
+			</description>
+		</method>
+		<method name="remove">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<description>
+				Remove an element from the array by index.
 			</description>
 		</method>
 		<method name="resize">
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Set the size of the [ColorArray]. If larger than the current size it will reserve some space beforehand, and if it is smaller it will cut off the array.
+				Set the size of the [ColorArray]. If larger than the current size it will reserve some space beforehand, and if it is smaller it will cut off the array.
 			</description>
 		</method>
 		<method name="set">
@@ -8468,23 +8585,14 @@
 			<argument index="1" name="color" type="Color">
 			</argument>
 			<description>
-			Change the [Color] at the given index.
+				Change the [Color] at the given index.
 			</description>
 		</method>
 		<method name="size">
 			<return type="int">
 			</return>
 			<description>
-			Return the array size.
-			</description>
-		</method>
-		<method name="ColorArray">
-			<return type="ColorArray">
-			</return>
-			<argument index="0" name="from" type="Array">
-			</argument>
-			<description>
-			Create from a generic array.
+				Return the array size.
 			</description>
 		</method>
 	</methods>
@@ -8493,59 +8601,59 @@
 </class>
 <class name="ColorPicker" inherits="BoxContainer" category="Core">
 	<brief_description>
-	Color picker control.
+		Color picker control.
 	</brief_description>
 	<description>
-	This is a simple color picker [Control]. It's useful for selecting a color from an RGB/RGBA colorspace.
+		This is a simple color picker [Control]. It's useful for selecting a color from an RGB/RGBA colorspace.
 	</description>
 	<methods>
-		<method name="set_color">
-			<argument index="0" name="color" type="Color">
+		<method name="add_preset">
+			<argument index="0" name="arg0" type="Color">
 			</argument>
 			<description>
-			Select the current color.
+				Adds the current selected to color to a list of colors (presets), the presets will be displayed in the color picker and the user will be able to select them, notice that the presets list is only for this color picker.
 			</description>
 		</method>
 		<method name="get_color" qualifiers="const">
 			<return type="Color">
 			</return>
 			<description>
-			Return the current (edited) color.
+				Return the current (edited) color.
 			</description>
 		</method>
-		<method name="set_raw_mode">
-			<argument index="0" name="mode" type="bool">
-			</argument>
+		<method name="is_editing_alpha" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			When set to true, every color channel will be represented as a value from 0 to 1, insetead of 0, 255.
+				Returns whether the color has transparency or not.
 			</description>
 		</method>
 		<method name="is_raw_mode" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Returns whether this color picker is in raw mode or not
+				Returns whether this color picker is in raw mode or not
 			</description>
 		</method>
-		<method name="set_edit_alpha">
-			<argument index="0" name="show" type="bool">
+		<method name="set_color">
+			<argument index="0" name="color" type="Color">
 			</argument>
 			<description>
-			Set true if you want the color to have an alpha channel (transparency), or false if you want a solid color.
+				Select the current color.
 			</description>
 		</method>
-		<method name="is_editing_alpha" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_edit_alpha">
+			<argument index="0" name="show" type="bool">
+			</argument>
 			<description>
-			Returns whether the color has transparency or not.
+				Set true if you want the color to have an alpha channel (transparency), or false if you want a solid color.
 			</description>
 		</method>
-		<method name="add_preset">
-			<argument index="0" name="arg0" type="Color">
+		<method name="set_raw_mode">
+			<argument index="0" name="mode" type="bool">
 			</argument>
 			<description>
-			Adds the current selected to color to a list of colors (presets), the presets will be displayed in the color picker and the user will be able to select them, notice that the presets list is only for this color picker.
+				When set to true, every color channel will be represented as a value from 0 to 1, insetead of 0, 255.
 			</description>
 		</method>
 	</methods>
@@ -8554,63 +8662,69 @@
 			<argument index="0" name="color" type="Color">
 			</argument>
 			<description>
-			Emitted when the color is changed.
+				Emitted when the color is changed.
 			</description>
 		</signal>
 	</signals>
 	<constants>
 	</constants>
 	<theme_items>
-		<theme_item name="value_width" type="int">
-		</theme_item>
-		<theme_item name="value_height" type="int">
+		<theme_item name="add_preset" type="Texture">
 		</theme_item>
 		<theme_item name="color_width" type="int">
 		</theme_item>
-		<theme_item name="label_width" type="int">
-		</theme_item>
 		<theme_item name="hseparator" type="int">
 		</theme_item>
-		<theme_item name="add_preset" type="Texture">
+		<theme_item name="label_width" type="int">
 		</theme_item>
 		<theme_item name="screen_picker" type="Texture">
 		</theme_item>
+		<theme_item name="value_height" type="int">
+		</theme_item>
+		<theme_item name="value_width" type="int">
+		</theme_item>
 	</theme_items>
 </class>
 <class name="ColorPickerButton" inherits="Button" category="Core">
 	<brief_description>
-	Button that pops out a [ColorPicker]
+		Button that pops out a [ColorPicker]
 	</brief_description>
 	<description>
-	Encapsulates a [ColorPicker] making it accesible by pressing a button, pressing the button will toggle the [ColorPicker] visibility
+		Encapsulates a [ColorPicker] making it accesible by pressing a button, pressing the button will toggle the [ColorPicker] visibility
 	</description>
 	<methods>
-		<method name="set_color">
-			<argument index="0" name="color" type="Color">
-			</argument>
-			<description>
-			Sets the current color
-			</description>
-		</method>
 		<method name="get_color" qualifiers="const">
 			<return type="Color">
 			</return>
 			<description>
-			Gets the current color
+				Gets the current color
 			</description>
 		</method>
-		<method name="set_edit_alpha">
-			<argument index="0" name="show" type="bool">
-			</argument>
+		<method name="get_picker">
+			<return type="ColorPicker">
+			</return>
 			<description>
-			See [method ColorPicker.set_edit_alpha]
 			</description>
 		</method>
 		<method name="is_editing_alpha" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			See [method ColorPicker.is_edit_alpha]
+				See [method ColorPicker.is_edit_alpha]
+			</description>
+		</method>
+		<method name="set_color">
+			<argument index="0" name="color" type="Color">
+			</argument>
+			<description>
+				Sets the current color
+			</description>
+		</method>
+		<method name="set_edit_alpha">
+			<argument index="0" name="show" type="bool">
+			</argument>
+			<description>
+				See [method ColorPicker.set_edit_alpha]
 			</description>
 		</method>
 	</methods>
@@ -8619,43 +8733,43 @@
 			<argument index="0" name="color" type="Color">
 			</argument>
 			<description>
-			Emitted when the color is changed.
+				Emitted when the color is changed.
 			</description>
 		</signal>
 	</signals>
 	<constants>
 	</constants>
 	<theme_items>
-		<theme_item name="hseparation" type="int">
+		<theme_item name="disabled" type="StyleBox">
 		</theme_item>
-		<theme_item name="font_color_disabled" type="Color">
+		<theme_item name="focus" type="StyleBox">
+		</theme_item>
+		<theme_item name="font" type="Font">
 		</theme_item>
 		<theme_item name="font_color" type="Color">
 		</theme_item>
+		<theme_item name="font_color_disabled" type="Color">
+		</theme_item>
 		<theme_item name="font_color_hover" type="Color">
 		</theme_item>
 		<theme_item name="font_color_pressed" type="Color">
 		</theme_item>
-		<theme_item name="font" type="Font">
-		</theme_item>
 		<theme_item name="hover" type="StyleBox">
 		</theme_item>
-		<theme_item name="pressed" type="StyleBox">
-		</theme_item>
-		<theme_item name="focus" type="StyleBox">
-		</theme_item>
-		<theme_item name="disabled" type="StyleBox">
+		<theme_item name="hseparation" type="int">
 		</theme_item>
 		<theme_item name="normal" type="StyleBox">
 		</theme_item>
+		<theme_item name="pressed" type="StyleBox">
+		</theme_item>
 	</theme_items>
 </class>
 <class name="ColorRamp" inherits="Resource" category="Core">
 	<brief_description>
-	Color interpolator node
+		Color interpolator node
 	</brief_description>
 	<description>
-	Given a set of colors, this node will interpolate them in order, meaning, that if you have color 1, color 2 and color3, the ramp will interpolate (generate the colors between two colors) from color 1 to color 2 and from color 2 to color 3. Initially the ramp will have 2 colors (black and white), one (black) at ramp lower offset offset 0 and the other (white) at the ramp higher offset 1.
+		Given a set of colors, this node will interpolate them in order, meaning, that if you have color 1, color 2 and color3, the ramp will interpolate (generate the colors between two colors) from color 1 to color 2 and from color 2 to color 3. Initially the ramp will have 2 colors (black and white), one (black) at ramp lower offset offset 0 and the other (white) at the ramp higher offset 1.
 	</description>
 	<methods>
 		<method name="add_point">
@@ -8664,23 +8778,23 @@
 			<argument index="1" name="color" type="Color">
 			</argument>
 			<description>
-			Adds the specified color to the end of the ramp, with the specified offset
+				Adds the specified color to the end of the ramp, with the specified offset
 			</description>
 		</method>
-		<method name="remove_point">
-			<argument index="0" name="offset" type="int">
+		<method name="get_color" qualifiers="const">
+			<return type="Color">
+			</return>
+			<argument index="0" name="point" type="int">
 			</argument>
 			<description>
-			Removes the color at the index [i]offset[/i]
+				Returns the color of the ramp color at index [i]point[/i]
 			</description>
 		</method>
-		<method name="set_offset">
-			<argument index="0" name="point" type="int">
-			</argument>
-			<argument index="1" name="offset" type="float">
-			</argument>
+		<method name="get_colors" qualifiers="const">
+			<return type="ColorArray">
+			</return>
 			<description>
-			Sets the offset for the ramp color at index [i]point[/i]
+				Returns the colors in the ramp
 			</description>
 		</method>
 		<method name="get_offset" qualifiers="const">
@@ -8689,25 +8803,21 @@
 			<argument index="0" name="point" type="int">
 			</argument>
 			<description>
-			Returns the offset of the ramp color at index [i]point[/i]
+				Returns the offset of the ramp color at index [i]point[/i]
 			</description>
 		</method>
-		<method name="set_color">
-			<argument index="0" name="point" type="int">
-			</argument>
-			<argument index="1" name="color" type="Color">
-			</argument>
+		<method name="get_offsets" qualifiers="const">
+			<return type="RealArray">
+			</return>
 			<description>
-			Sets the color of the ramp color at index [i]point[/i]
+				Returns the offsets for the colors in this ramp
 			</description>
 		</method>
-		<method name="get_color" qualifiers="const">
-			<return type="Color">
+		<method name="get_point_count" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="point" type="int">
-			</argument>
 			<description>
-			Returns the color of the ramp color at index [i]point[/i]
+				Returns the number of colors in the ramp
 			</description>
 		</method>
 		<method name="interpolate">
@@ -8716,42 +8826,46 @@
 			<argument index="0" name="offset" type="float">
 			</argument>
 			<description>
-			Returns the interpolated color specified by [i]offset[/i]
+				Returns the interpolated color specified by [i]offset[/i]
 			</description>
 		</method>
-		<method name="get_point_count" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="remove_point">
+			<argument index="0" name="offset" type="int">
+			</argument>
 			<description>
-			Returns the number of colors in the ramp
+				Removes the color at the index [i]offset[/i]
 			</description>
 		</method>
-		<method name="set_offsets">
-			<argument index="0" name="offsets" type="RealArray">
+		<method name="set_color">
+			<argument index="0" name="point" type="int">
+			</argument>
+			<argument index="1" name="color" type="Color">
 			</argument>
 			<description>
-			Sets the offset for the specified amount of elements. Calling this function with a different number of elements than previously defined causes the ramp to resize its colors and offsets array to accomodate the new elements, all new colors will be black by default.
+				Sets the color of the ramp color at index [i]point[/i]
 			</description>
 		</method>
-		<method name="get_offsets" qualifiers="const">
-			<return type="RealArray">
-			</return>
+		<method name="set_colors">
+			<argument index="0" name="colors" type="ColorArray">
+			</argument>
 			<description>
-			Returns the offsets for the colors in this ramp
+				Sets the colors for the specified amount of elements. Calling this function with a different number of elements than previously defined causes the ramp to resize its colors and offsets array to accomodate the new elements.
 			</description>
 		</method>
-		<method name="set_colors">
-			<argument index="0" name="colors" type="ColorArray">
+		<method name="set_offset">
+			<argument index="0" name="point" type="int">
+			</argument>
+			<argument index="1" name="offset" type="float">
 			</argument>
 			<description>
-			Sets the colors for the specified amount of elements. Calling this function with a different number of elements than previously defined causes the ramp to resize its colors and offsets array to accomodate the new elements.
+				Sets the offset for the ramp color at index [i]point[/i]
 			</description>
 		</method>
-		<method name="get_colors" qualifiers="const">
-			<return type="ColorArray">
-			</return>
+		<method name="set_offsets">
+			<argument index="0" name="offsets" type="RealArray">
+			</argument>
 			<description>
-			Returns the colors in the ramp
+				Sets the offset for the specified amount of elements. Calling this function with a different number of elements than previously defined causes the ramp to resize its colors and offsets array to accomodate the new elements, all new colors will be black by default.
 			</description>
 		</method>
 	</methods>
@@ -8760,24 +8874,24 @@
 </class>
 <class name="ConcavePolygonShape" inherits="Shape" category="Core">
 	<brief_description>
-	Concave polygon shape.
+		Concave polygon shape.
 	</brief_description>
 	<description>
-	Concave polygon shape resource, which can be set into a [PhysicsBody] or area. This shape is created by feeding a list of triangles.
+		Concave polygon shape resource, which can be set into a [PhysicsBody] or area. This shape is created by feeding a list of triangles.
 	</description>
 	<methods>
-		<method name="set_faces">
-			<argument index="0" name="faces" type="Vector3Array">
-			</argument>
-			<description>
-			Set the faces (an array of triangles).
-			</description>
-		</method>
 		<method name="get_faces" qualifiers="const">
 			<return type="Vector3Array">
 			</return>
 			<description>
-			Return the faces (an array of triangles).
+				Return the faces (an array of triangles).
+			</description>
+		</method>
+		<method name="set_faces">
+			<argument index="0" name="faces" type="Vector3Array">
+			</argument>
+			<description>
+				Set the faces (an array of triangles).
 			</description>
 		</method>
 	</methods>
@@ -8786,25 +8900,25 @@
 </class>
 <class name="ConcavePolygonShape2D" inherits="Shape2D" category="Core">
 	<brief_description>
-	Concave polygon 2D shape resource for physics.
+		Concave polygon 2D shape resource for physics.
 	</brief_description>
 	<description>
-	Concave polygon 2D shape resource for physics. It is made out of segments and is very optimal for complex polygonal concave collisions. It is really not advised to use for [RigidBody2D] nodes. A CollisionPolygon2D in convex decomposition mode (solids) or several convex objects are advised for that instead. Otherwise, a concave polygon 2D shape is better for static collisions.
-	The main difference between a [ConvexPolygonShape2D] and a [ConcavePolygonShape2D] is that a concave polygon assumes it is concave and uses a more complex method of collision detection, and a convex one forces itself to be convex in order to speed up collision detection.
+		Concave polygon 2D shape resource for physics. It is made out of segments and is very optimal for complex polygonal concave collisions. It is really not advised to use for [RigidBody2D] nodes. A CollisionPolygon2D in convex decomposition mode (solids) or several convex objects are advised for that instead. Otherwise, a concave polygon 2D shape is better for static collisions.
+		The main difference between a [ConvexPolygonShape2D] and a [ConcavePolygonShape2D] is that a concave polygon assumes it is concave and uses a more complex method of collision detection, and a convex one forces itself to be convex in order to speed up collision detection.
 	</description>
 	<methods>
-		<method name="set_segments">
-			<argument index="0" name="segments" type="Vector2Array">
-			</argument>
-			<description>
-			Set the array of segments.
-			</description>
-		</method>
 		<method name="get_segments" qualifiers="const">
 			<return type="Vector2Array">
 			</return>
 			<description>
-			Return the array of segments.
+				Return the array of segments.
+			</description>
+		</method>
+		<method name="set_segments">
+			<argument index="0" name="segments" type="Vector2Array">
+			</argument>
+			<description>
+				Set the array of segments.
 			</description>
 		</method>
 	</methods>
@@ -8817,19 +8931,19 @@
 	<description>
 	</description>
 	<methods>
-		<method name="set_param">
+		<method name="get_param" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="param" type="int">
 			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_param" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_param">
 			<argument index="0" name="param" type="int">
 			</argument>
+			<argument index="1" name="value" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -8851,34 +8965,39 @@
 </class>
 <class name="ConfigFile" inherits="Reference" category="Core">
 	<brief_description>
-	Helper class to handle INI-style files.
+		Helper class to handle INI-style files.
 	</brief_description>
 	<description>
-	This helper class can be used to store [Variant] values on the filesystem using an INI-style formatting. The stored values as referenced by a section and a key. The stored data can be saved to or parsed from a file, though ConfigFile objects can also be used directly with accessing the filesystem.
-	The following example shows how to parse a INI-style file from the system, read its contents and store new values in it:
-	[codeblock]
-	var config = ConfigFile.new()
-	var err = config.load("user://settings.cfg")
-	if err == OK: # if not, something went wrong with the file loading
-	    # Look for the display/width pair, and default to 1024 if missing
-	    var screen_width = get_value("display", "width", 1024)
-	    # Store a variable if and only it hasn't been defined yet
-		if not config.has_section_key("audio", "mute"):
-		    config.set_value("audio", "mute", false)
-	    # Save the changes by overwriting the previous file
-		config.save("user://settings.cfg")
-	[/codeblock]
+		This helper class can be used to store [Variant] values on the filesystem using an INI-style formatting. The stored values as referenced by a section and a key. The stored data can be saved to or parsed from a file, though ConfigFile objects can also be used directly with accessing the filesystem.
+		The following example shows how to parse a INI-style file from the system, read its contents and store new values in it:
+		[codeblock]
+		var config = ConfigFile.new()
+		var err = config.load("user://settings.cfg")
+		if err == OK: # if not, something went wrong with the file loading
+		    # Look for the display/width pair, and default to 1024 if missing
+		    var screen_width = get_value("display", "width", 1024)
+		    # Store a variable if and only it hasn't been defined yet
+		    if not config.has_section_key("audio", "mute"):
+		        config.set_value("audio", "mute", false)
+		    # Save the changes by overwriting the previous file
+		    config.save("user://settings.cfg")
+		[/codeblock]
 	</description>
 	<methods>
-		<method name="set_value">
+		<method name="get_section_keys" qualifiers="const">
+			<return type="StringArray">
+			</return>
 			<argument index="0" name="section" type="String">
 			</argument>
-			<argument index="1" name="key" type="String">
-			</argument>
-			<argument index="2" name="value" type="Variant">
-			</argument>
 			<description>
-			Assign a value to the specified key of the the specified section. If the section and/or the key do not exist, they are created. Passing a [code]NULL[/code] value deletes the specified key if it exists (and deletes the section if it ends up empty once the key has been removed).
+				Return an array of all defined key identifiers in the specified section.
+			</description>
+		</method>
+		<method name="get_sections" qualifiers="const">
+			<return type="StringArray">
+			</return>
+			<description>
+				Return an array of all defined section identifiers.
 			</description>
 		</method>
 		<method name="get_value" qualifiers="const">
@@ -8891,7 +9010,7 @@
 			<argument index="2" name="default" type="Variant" default="NULL">
 			</argument>
 			<description>
-			Return the current value for the specified section and key. If the section and/or the key do not exist, the method returns the value of the optional [i]default[/i] argument (and thus [code]NULL[/code] if not specified).
+				Return the current value for the specified section and key. If the section and/or the key do not exist, the method returns the value of the optional [i]default[/i] argument (and thus [code]NULL[/code] if not specified).
 			</description>
 		</method>
 		<method name="has_section" qualifiers="const">
@@ -8900,7 +9019,7 @@
 			<argument index="0" name="section" type="String">
 			</argument>
 			<description>
-			Check if the specified section exists.
+				Check if the specified section exists.
 			</description>
 		</method>
 		<method name="has_section_key" qualifiers="const">
@@ -8911,23 +9030,7 @@
 			<argument index="1" name="key" type="String">
 			</argument>
 			<description>
-			Check if the specified section-key pair exists.
-			</description>
-		</method>
-		<method name="get_sections" qualifiers="const">
-			<return type="StringArray">
-			</return>
-			<description>
-			Return an array of all defined section identifiers.
-			</description>
-		</method>
-		<method name="get_section_keys" qualifiers="const">
-			<return type="StringArray">
-			</return>
-			<argument index="0" name="section" type="String">
-			</argument>
-			<description>
-			Return an array of all defined key identifiers in the specified section.
+				Check if the specified section-key pair exists.
 			</description>
 		</method>
 		<method name="load">
@@ -8936,7 +9039,7 @@
 			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
-			Load the config file specified as a parameter. The file's contents are parsed and loaded in the ConfigFile object from which the method was called. The return value is one of the OK, FAILED or ERR_* constants listed in [@Global Scope] (if the load was successful, it returns OK).
+				Load the config file specified as a parameter. The file's contents are parsed and loaded in the ConfigFile object from which the method was called. The return value is one of the OK, FAILED or ERR_* constants listed in [@Global Scope] (if the load was successful, it returns OK).
 			</description>
 		</method>
 		<method name="save">
@@ -8945,8 +9048,19 @@
 			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
-			Save the contents of the ConfigFile object to the file specified as a parameter. The output file uses an INI-style structure.
-			The return value is one of the OK, FAILED or ERR_* constants listed in [@Global Scope] (if the save was successful, it returns OK).
+				Save the contents of the ConfigFile object to the file specified as a parameter. The output file uses an INI-style structure.
+				The return value is one of the OK, FAILED or ERR_* constants listed in [@Global Scope] (if the save was successful, it returns OK).
+			</description>
+		</method>
+		<method name="set_value">
+			<argument index="0" name="section" type="String">
+			</argument>
+			<argument index="1" name="key" type="String">
+			</argument>
+			<argument index="2" name="value" type="Variant">
+			</argument>
+			<description>
+				Assign a value to the specified key of the the specified section. If the section and/or the key do not exist, they are created. Passing a [code]NULL[/code] value deletes the specified key if it exists (and deletes the section if it ends up empty once the key has been removed).
 			</description>
 		</method>
 	</methods>
@@ -8955,17 +9069,17 @@
 </class>
 <class name="ConfirmationDialog" inherits="AcceptDialog" category="Core">
 	<brief_description>
-	Dialog for confirmation of actions.
+		Dialog for confirmation of actions.
 	</brief_description>
 	<description>
-	Dialog for confirmation of actions. This dialog inherits from [AcceptDialog], but has by default an OK and Cancel button (in host OS order).
+		Dialog for confirmation of actions. This dialog inherits from [AcceptDialog], but has by default an OK and Cancel button (in host OS order).
 	</description>
 	<methods>
 		<method name="get_cancel">
 			<return type="Button">
 			</return>
 			<description>
-			Return the cancel button.
+				Return the cancel button.
 			</description>
 		</method>
 	</methods>
@@ -8974,32 +9088,32 @@
 </class>
 <class name="Container" inherits="Control" category="Core">
 	<brief_description>
-	Base node for containers.
+		Base node for containers.
 	</brief_description>
 	<description>
-	Base node for containers. A [Container] contains other controls and automatically arranges them in a certain way.
-	A Control can inherit this to create custom container classes.
+		Base node for containers. A [Container] contains other controls and automatically arranges them in a certain way.
+		A Control can inherit this to create custom container classes.
 	</description>
 	<methods>
-		<method name="queue_sort">
-			<description>
-			Queue resort of the contained children. This is called automatically anyway, but can be called upon request.
-			</description>
-		</method>
 		<method name="fit_child_in_rect">
 			<argument index="0" name="child" type="Control">
 			</argument>
 			<argument index="1" name="rect" type="Rect2">
 			</argument>
 			<description>
-			Fit a child control in a given rect. This is mainly a helper for creating custom container classes.
+				Fit a child control in a given rect. This is mainly a helper for creating custom container classes.
+			</description>
+		</method>
+		<method name="queue_sort">
+			<description>
+				Queue resort of the contained children. This is called automatically anyway, but can be called upon request.
 			</description>
 		</method>
 	</methods>
 	<signals>
 		<signal name="sort_children">
 			<description>
-			Emitted when sorting the children is needed.
+				Emitted when sorting the children is needed.
 			</description>
 		</signal>
 	</signals>
@@ -9011,240 +9125,216 @@
 </class>
 <class name="Control" inherits="CanvasItem" category="Core">
 	<brief_description>
-	Control is the base node for all the GUI components.
+		Control is the base node for all the GUI components.
 	</brief_description>
 	<description>
-	Control is the base class Node for all the GUI components. Every GUI component inherits from it, directly or indirectly. In this way, sections of the scene tree made of contiguous control nodes, become user interfaces.
-	Controls are relative to the parent position and size by using anchors and margins. This ensures that they can adapt easily in most situation to changing dialog and screen sizes. When more flexibility is desired, [Container] derived nodes can be used.
-	Anchors work by defining which margin do they follow, and a value relative to it. Allowed anchoring modes are ANCHOR_BEGIN, where the margin is relative to the top or left margins of the parent (in pixels), ANCHOR_END for the right and bottom margins of the parent and ANCHOR_RATIO, which is a ratio from 0 to 1 in the parent range.
-	Input device events ([InputEvent]) are first sent to the root controls via the [method Node._input], which distribute it through the tree, then delivers them to the adequate one (under cursor or keyboard focus based) by calling [method MainLoop._input_event]. There is no need to enable input processing on controls to receive such events. To ensure that no one else will receive the event (not even [method Node._unhandled_input]), the control can accept it by calling [method accept_event].
-	Only one control can hold the keyboard focus (receiving keyboard events), for that the control must define the focus mode with [method set_focus_mode]. Focus is lost when another control gains it, or the current focus owner is hidden.
-	It is sometimes desired for a control to ignore mouse/pointer events. This is often the case when placing other controls on top of a button, in such cases. Calling [method set_ignore_mouse] enables this function.
-	Finally, controls are skinned according to a [Theme]. Setting a [Theme] on a control will propagate all the skinning down the tree. Optionally, skinning can be overridden per each control by calling the add_*_override functions, or from the editor.
+		Control is the base class Node for all the GUI components. Every GUI component inherits from it, directly or indirectly. In this way, sections of the scene tree made of contiguous control nodes, become user interfaces.
+		Controls are relative to the parent position and size by using anchors and margins. This ensures that they can adapt easily in most situation to changing dialog and screen sizes. When more flexibility is desired, [Container] derived nodes can be used.
+		Anchors work by defining which margin do they follow, and a value relative to it. Allowed anchoring modes are ANCHOR_BEGIN, where the margin is relative to the top or left margins of the parent (in pixels), ANCHOR_END for the right and bottom margins of the parent and ANCHOR_RATIO, which is a ratio from 0 to 1 in the parent range.
+		Input device events ([InputEvent]) are first sent to the root controls via the [method Node._input], which distribute it through the tree, then delivers them to the adequate one (under cursor or keyboard focus based) by calling [method MainLoop._input_event]. There is no need to enable input processing on controls to receive such events. To ensure that no one else will receive the event (not even [method Node._unhandled_input]), the control can accept it by calling [method accept_event].
+		Only one control can hold the keyboard focus (receiving keyboard events), for that the control must define the focus mode with [method set_focus_mode]. Focus is lost when another control gains it, or the current focus owner is hidden.
+		It is sometimes desired for a control to ignore mouse/pointer events. This is often the case when placing other controls on top of a button, in such cases. Calling [method set_ignore_mouse] enables this function.
+		Finally, controls are skinned according to a [Theme]. Setting a [Theme] on a control will propagate all the skinning down the tree. Optionally, skinning can be overridden per each control by calling the add_*_override functions, or from the editor.
 	</description>
 	<methods>
 		<method name="_input_event" qualifiers="virtual">
 			<argument index="0" name="event" type="InputEvent">
 			</argument>
 			<description>
-			Called when an input event reaches the control.
+				Called when an input event reaches the control.
 			</description>
 		</method>
-		<method name="can_drop_data" qualifiers="virtual">
-			<return type="bool">
-			</return>
-			<argument index="0" name="pos" type="Vector2">
-			</argument>
-			<argument index="1" name="data" type="Variant">
-			</argument>
+		<method name="accept_event">
 			<description>
+				Handles the event, no other control will receive it and it will not be sent to nodes waiting on [method Node._unhandled_input] or [method Node._unhandled_key_input].
 			</description>
 		</method>
-		<method name="drop_data" qualifiers="virtual">
-			<argument index="0" name="pos" type="Vector2">
+		<method name="add_color_override">
+			<argument index="0" name="name" type="String">
 			</argument>
-			<argument index="1" name="data" type="Variant">
+			<argument index="1" name="color" type="Color">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_drag_data" qualifiers="virtual">
-			<return type="Object">
-			</return>
-			<argument index="0" name="pos" type="Vector2">
+		<method name="add_constant_override">
+			<argument index="0" name="name" type="String">
+			</argument>
+			<argument index="1" name="constant" type="int">
 			</argument>
 			<description>
+				Override a single constant (integer) in the theme of this Control. If constant equals Theme.INVALID_CONSTANT, override is cleared.
 			</description>
 		</method>
-		<method name="get_minimum_size" qualifiers="virtual">
-			<return type="Vector2">
-			</return>
-			<description>
-			Return the minimum size this Control can shrink to. A control will never be displayed or resized smaller than its minimum size.
-			</description>
-		</method>
-		<method name="accept_event">
-			<description>
-			Handles the event, no other control will receive it and it will not be sent to nodes waiting on [method Node._unhandled_input] or [method Node._unhandled_key_input].
-			</description>
-		</method>
-		<method name="get_minimum_size" qualifiers="const">
-			<return type="Vector2">
-			</return>
-			<description>
-			Return the minimum size this Control can shrink to. A control will never be displayed or resized smaller than its minimum size.
-			</description>
-		</method>
-		<method name="get_combined_minimum_size" qualifiers="const">
-			<return type="Vector2">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="set_anchor">
-			<argument index="0" name="margin" type="int">
-			</argument>
-			<argument index="1" name="anchor_mode" type="int">
+		<method name="add_font_override">
+			<argument index="0" name="name" type="String">
 			</argument>
-			<argument index="2" name="keep_margin" type="bool" default="false">
+			<argument index="1" name="font" type="Font">
 			</argument>
 			<description>
-			Change the anchor (ANCHOR_BEGIN, ANCHOR_END, ANCHOR_RATIO) type for a margin (MARGIN_LEFT, MARGIN_TOP, MARGIN_RIGHT, MARGIN_BOTTOM). Changing the anchor mode converts the current margin offset from the previous anchor mode to the new one, so margin offsets ([method set_margin]) must be done after setting anchors, or at the same time ([method set_anchor_and_margin])
-
-			Additionally, [code]keep_margin[/code] controls whether margins should be left the same, or changed to keep the same position and size on-screen.
+				Override a single font (font) in the theme of this Control. If font is empty, override is cleared.
 			</description>
 		</method>
-		<method name="get_anchor" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="margin" type="int">
+		<method name="add_icon_override">
+			<argument index="0" name="name" type="String">
+			</argument>
+			<argument index="1" name="texture" type="Texture">
 			</argument>
 			<description>
-			Return the anchor type (ANCHOR_BEGIN, ANCHOR_END, ANCHOR_RATIO) for a given margin (MARGIN_LEFT, MARGIN_TOP, MARGIN_RIGHT, MARGIN_BOTTOM).
+				Override a single icon ([Texture]) in the theme of this Control. If texture is empty, override is cleared.
 			</description>
 		</method>
-		<method name="set_margin">
-			<argument index="0" name="margin" type="int">
+		<method name="add_shader_override">
+			<argument index="0" name="name" type="String">
 			</argument>
-			<argument index="1" name="offset" type="float">
+			<argument index="1" name="shader" type="Shader">
 			</argument>
 			<description>
-			Set a margin offset. Margin can be one of (MARGIN_LEFT, MARGIN_TOP, MARGIN_RIGHT, MARGIN_BOTTOM). Offset value being set depends on the anchor mode.
 			</description>
 		</method>
-		<method name="set_anchor_and_margin">
-			<argument index="0" name="margin" type="int">
-			</argument>
-			<argument index="1" name="anchor_mode" type="int">
+		<method name="add_style_override">
+			<argument index="0" name="name" type="String">
 			</argument>
-			<argument index="2" name="offset" type="float">
+			<argument index="1" name="stylebox" type="StyleBox">
 			</argument>
 			<description>
-			Change the anchor (ANCHOR_BEGIN, ANCHOR_END, ANCHOR_RATIO) type for a margin (MARGIN_LEFT, MARGIN_TOP, MARGIN_RIGHT, MARGIN_BOTTOM), and also set its offset. This is a helper (see [method set_anchor] and [method set_margin]).
+				Override a single stylebox ([Stylebox]) in the theme of this Control. If stylebox is empty, override is cleared.
 			</description>
 		</method>
-		<method name="set_begin">
+		<method name="can_drop_data" qualifiers="virtual">
+			<return type="bool">
+			</return>
 			<argument index="0" name="pos" type="Vector2">
 			</argument>
-			<description>
-			Sets MARGIN_LEFT and MARGIN_TOP at the same time. This is a helper (see [method set_margin]).
-			</description>
-		</method>
-		<method name="set_end">
-			<argument index="0" name="pos" type="Vector2">
+			<argument index="1" name="data" type="Variant">
 			</argument>
 			<description>
-			Sets MARGIN_RIGHT and MARGIN_BOTTOM at the same time. This is a helper (see [method set_margin]).
 			</description>
 		</method>
-		<method name="set_pos">
+		<method name="drop_data" qualifiers="virtual">
 			<argument index="0" name="pos" type="Vector2">
 			</argument>
-			<description>
-			Move the Control to a new position, relative to the top-left corner of the parent Control, changing all margins if needed and without changing current anchor mode. This is a helper (see [method set_margin]).
-			</description>
-		</method>
-		<method name="set_size">
-			<argument index="0" name="size" type="Vector2">
+			<argument index="1" name="data" type="Variant">
 			</argument>
 			<description>
-			Changes MARGIN_RIGHT and MARGIN_BOTTOM to fit a given size. This is a helper (see [method set_margin]).
 			</description>
 		</method>
-		<method name="set_custom_minimum_size">
-			<argument index="0" name="size" type="Vector2">
+		<method name="force_drag">
+			<argument index="0" name="data" type="Variant">
+			</argument>
+			<argument index="1" name="preview" type="Object">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_global_pos">
-			<argument index="0" name="pos" type="Vector2">
+		<method name="get_anchor" qualifiers="const">
+			<return type="int">
+			</return>
+			<argument index="0" name="margin" type="int">
 			</argument>
 			<description>
-			Move the Control to a new position, relative to the top-left corner of the [i]window[/i] Control, and without changing current anchor mode. (see [method set_margin]).
+				Return the anchor type (ANCHOR_BEGIN, ANCHOR_END, ANCHOR_RATIO) for a given margin (MARGIN_LEFT, MARGIN_TOP, MARGIN_RIGHT, MARGIN_BOTTOM).
 			</description>
 		</method>
-		<method name="set_rotation">
-			<argument index="0" name="radians" type="float">
-			</argument>
+		<method name="get_begin" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_rotation_deg">
-			<argument index="0" name="degrees" type="float">
+		<method name="get_color" qualifiers="const">
+			<return type="Color">
+			</return>
+			<argument index="0" name="name" type="String">
+			</argument>
+			<argument index="1" name="type" type="String" default="&quot;&quot;">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_scale">
-			<argument index="0" name="scale" type="Vector2">
-			</argument>
+		<method name="get_combined_minimum_size" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_margin" qualifiers="const">
-			<return type="float">
+		<method name="get_constant" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="margin" type="int">
+			<argument index="0" name="name" type="String">
+			</argument>
+			<argument index="1" name="type" type="String" default="&quot;&quot;">
 			</argument>
 			<description>
-			Return a margin offset. Margin can be one of (MARGIN_LEFT, MARGIN_TOP, MARGIN_RIGHT, MARGIN_BOTTOM). Offset value being returned depends on the anchor mode.
 			</description>
 		</method>
-		<method name="get_begin" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_cursor_shape" qualifiers="const">
+			<return type="int">
 			</return>
+			<argument index="0" name="pos" type="Vector2" default="Vector2(0,0)">
+			</argument>
 			<description>
+				Return the cursor shape at a certain position in the control.
 			</description>
 		</method>
-		<method name="get_end" qualifiers="const">
+		<method name="get_custom_minimum_size" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
-			Returns MARGIN_LEFT and MARGIN_TOP at the same time. This is a helper (see [method set_margin]).
 			</description>
 		</method>
-		<method name="get_pos" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_default_cursor_shape" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Returns the Control position, relative to the top-left corner of the parent Control and independent of the anchor mode.
+				Return the default cursor shape for this control. See enum CURSOR_* for the list of shapes.
 			</description>
 		</method>
-		<method name="get_size" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_drag_data" qualifiers="virtual">
+			<return type="Object">
 			</return>
+			<argument index="0" name="pos" type="Vector2">
+			</argument>
 			<description>
-			Returns the size of the Control, computed from all margins, however the size returned will [b]never be smaller than the minimum size reported by [method get_minimum_size][/b]. This means that even if end position of the Control rectangle is smaller than the begin position, the Control will still display and interact correctly. (see description, [method get_minimum_size], [method set_margin], [method set_anchor]).
 			</description>
 		</method>
-		<method name="get_rotation" qualifiers="const">
-			<return type="float">
+		<method name="get_end" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<description>
+				Returns MARGIN_LEFT and MARGIN_TOP at the same time. This is a helper (see [method set_margin]).
 			</description>
 		</method>
-		<method name="get_rotation_deg" qualifiers="const">
-			<return type="float">
+		<method name="get_focus_mode" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
+				Returns the focus access mode for the control (FOCUS_NONE, FOCUS_CLICK, FOCUS_ALL) (see [method set_focus_mode]).
 			</description>
 		</method>
-		<method name="get_scale" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_focus_neighbour" qualifiers="const">
+			<return type="NodePath">
 			</return>
+			<argument index="0" name="margin" type="int">
+			</argument>
 			<description>
+				Return the forced neighbour for moving the input focus to. When pressing TAB or directional/joypad directions focus is moved to the next control in that direction. However, the neighbour to move to can be forced with this function.
 			</description>
 		</method>
-		<method name="get_custom_minimum_size" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_focus_owner" qualifiers="const">
+			<return type="Control">
 			</return>
 			<description>
+				Return which control is owning the keyboard focus, or null if no one.
 			</description>
 		</method>
-		<method name="get_parent_area_size" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_font" qualifiers="const">
+			<return type="Font">
 			</return>
+			<argument index="0" name="name" type="String">
+			</argument>
+			<argument index="1" name="type" type="String" default="&quot;&quot;">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -9252,185 +9342,176 @@
 			<return type="Vector2">
 			</return>
 			<description>
-			Returns the Control position, relative to the top-left corner of the parent Control and independent of the anchor mode.
+				Returns the Control position, relative to the top-left corner of the parent Control and independent of the anchor mode.
 			</description>
 		</method>
-		<method name="get_rect" qualifiers="const">
+		<method name="get_global_rect" qualifiers="const">
 			<return type="Rect2">
 			</return>
 			<description>
-			Return position and size of the Control, relative to the top-left corner of the parent Control. This is a helper (see [method get_pos], [method get_size]).
+				Return position and size of the Control, relative to the top-left corner of the [i]window[/i] Control. This is a helper (see [method get_global_pos], [method get_size]).
 			</description>
 		</method>
-		<method name="get_global_rect" qualifiers="const">
-			<return type="Rect2">
+		<method name="get_h_size_flags" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return position and size of the Control, relative to the top-left corner of the [i]window[/i] Control. This is a helper (see [method get_global_pos], [method get_size]).
+				Hint for containers, return horizontal positioning flags.
 			</description>
 		</method>
-		<method name="set_area_as_parent_rect">
-			<argument index="0" name="margin" type="int" default="0">
+		<method name="get_icon" qualifiers="const">
+			<return type="Texture">
+			</return>
+			<argument index="0" name="name" type="String">
 			</argument>
-			<description>
-			Change all margins and anchors, so this Control always takes up the same area as the parent Control. This is a helper (see [method set_anchor], [method set_margin]).
-			</description>
-		</method>
-		<method name="show_modal">
-			<argument index="0" name="exclusive" type="bool" default="false">
+			<argument index="1" name="type" type="String" default="&quot;&quot;">
 			</argument>
 			<description>
-			Display a Control as modal. Control must be a subwindow. Modal controls capture the input signals until closed or the area outside them is accessed. When a modal control loses focus, or the ESC key is pressed, they automatically hide. Modal controls are used extensively for popup dialogs and menus.
 			</description>
 		</method>
-		<method name="set_focus_mode">
-			<argument index="0" name="mode" type="int">
+		<method name="get_margin" qualifiers="const">
+			<return type="float">
+			</return>
+			<argument index="0" name="margin" type="int">
 			</argument>
 			<description>
-			Set the focus access mode for the control (FOCUS_NONE, FOCUS_CLICK, FOCUS_ALL). Only one Control can be focused at the same time, and it will receive keyboard signals.
+				Return a margin offset. Margin can be one of (MARGIN_LEFT, MARGIN_TOP, MARGIN_RIGHT, MARGIN_BOTTOM). Offset value being returned depends on the anchor mode.
 			</description>
 		</method>
-		<method name="get_focus_mode" qualifiers="const">
-			<return type="int">
+		<method name="get_minimum_size" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<description>
-			Returns the focus access mode for the control (FOCUS_NONE, FOCUS_CLICK, FOCUS_ALL) (see [method set_focus_mode]).
+				Return the minimum size this Control can shrink to. A control will never be displayed or resized smaller than its minimum size.
 			</description>
 		</method>
-		<method name="has_focus" qualifiers="const">
-			<return type="bool">
+		<method name="get_minimum_size" qualifiers="virtual">
+			<return type="Vector2">
 			</return>
 			<description>
-			Return whether the Control is the current focused control (see [method set_focus_mode]).
+				Return the minimum size this Control can shrink to. A control will never be displayed or resized smaller than its minimum size.
 			</description>
 		</method>
-		<method name="grab_focus">
+		<method name="get_parent_area_size" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
-			Steal the focus from another control and become the focused control (see [method set_focus_mode]).
 			</description>
 		</method>
-		<method name="release_focus">
+		<method name="get_parent_control" qualifiers="const">
+			<return type="Control">
+			</return>
 			<description>
-			Give up the focus, no other control will be able to receive keyboard input.
 			</description>
 		</method>
-		<method name="get_focus_owner" qualifiers="const">
-			<return type="Control">
+		<method name="get_pos" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<description>
-			Return which control is owning the keyboard focus, or null if no one.
+				Returns the Control position, relative to the top-left corner of the parent Control and independent of the anchor mode.
 			</description>
 		</method>
-		<method name="set_h_size_flags">
-			<argument index="0" name="flags" type="int">
-			</argument>
+		<method name="get_rect" qualifiers="const">
+			<return type="Rect2">
+			</return>
 			<description>
-			Hint for containers, set horizontal positioning flags.
+				Return position and size of the Control, relative to the top-left corner of the parent Control. This is a helper (see [method get_pos], [method get_size]).
 			</description>
 		</method>
-		<method name="get_h_size_flags" qualifiers="const">
-			<return type="int">
+		<method name="get_rotation" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Hint for containers, return horizontal positioning flags.
 			</description>
 		</method>
-		<method name="set_stretch_ratio">
-			<argument index="0" name="ratio" type="float">
-			</argument>
+		<method name="get_rotation_deg" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Hint for containers, set the stretch ratio. This value is relative to other stretch ratio, so if this control has 2 and another has 1, this one will be twice as big.
 			</description>
 		</method>
-		<method name="get_stretch_ratio" qualifiers="const">
-			<return type="float">
+		<method name="get_scale" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<description>
-			Hint for containers, return the stretch ratio. This value is relative to other stretch ratio, so if this control has 2 and another has 1, this one will be twice as big.
 			</description>
 		</method>
-		<method name="set_v_size_flags">
-			<argument index="0" name="flags" type="int">
-			</argument>
+		<method name="get_size" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
-			Hint for containers, set vertical positioning flags.
+				Returns the size of the Control, computed from all margins, however the size returned will [b]never be smaller than the minimum size reported by [method get_minimum_size][/b]. This means that even if end position of the Control rectangle is smaller than the begin position, the Control will still display and interact correctly. (see description, [method get_minimum_size], [method set_margin], [method set_anchor]).
 			</description>
 		</method>
-		<method name="get_v_size_flags" qualifiers="const">
-			<return type="int">
+		<method name="get_stretch_ratio" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Hint for containers, return vertical positioning flags.
+				Hint for containers, return the stretch ratio. This value is relative to other stretch ratio, so if this control has 2 and another has 1, this one will be twice as big.
 			</description>
 		</method>
-		<method name="set_theme">
-			<argument index="0" name="theme" type="Theme">
+		<method name="get_stylebox" qualifiers="const">
+			<return type="StyleBox">
+			</return>
+			<argument index="0" name="name" type="String">
+			</argument>
+			<argument index="1" name="type" type="String" default="&quot;&quot;">
 			</argument>
 			<description>
-			Override whole the [Theme] for this Control and all its children controls.
 			</description>
 		</method>
 		<method name="get_theme" qualifiers="const">
 			<return type="Theme">
 			</return>
 			<description>
-			Return a [Theme] override, if one exists (see [method set_theme]).
+				Return a [Theme] override, if one exists (see [method set_theme]).
 			</description>
 		</method>
-		<method name="add_icon_override">
-			<argument index="0" name="name" type="String">
-			</argument>
-			<argument index="1" name="texture" type="Texture">
+		<method name="get_tooltip" qualifiers="const">
+			<return type="String">
+			</return>
+			<argument index="0" name="atpos" type="Vector2" default="Vector2(0,0)">
 			</argument>
 			<description>
-			Override a single icon ([Texture]) in the theme of this Control. If texture is empty, override is cleared.
+				Return the tooltip, which will appear when the cursor is resting over this control.
 			</description>
 		</method>
-		<method name="add_shader_override">
-			<argument index="0" name="name" type="String">
-			</argument>
-			<argument index="1" name="shader" type="Shader">
-			</argument>
+		<method name="get_v_size_flags" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
+				Hint for containers, return vertical positioning flags.
 			</description>
 		</method>
-		<method name="add_style_override">
-			<argument index="0" name="name" type="String">
-			</argument>
-			<argument index="1" name="stylebox" type="StyleBox">
-			</argument>
+		<method name="grab_click_focus">
 			<description>
-			Override a single stylebox ([Stylebox]) in the theme of this Control. If stylebox is empty, override is cleared.
 			</description>
 		</method>
-		<method name="add_font_override">
-			<argument index="0" name="name" type="String">
-			</argument>
-			<argument index="1" name="font" type="Font">
-			</argument>
+		<method name="grab_focus">
 			<description>
-			Override a single font (font) in the theme of this Control. If font is empty, override is cleared.
+				Steal the focus from another control and become the focused control (see [method set_focus_mode]).
 			</description>
 		</method>
-		<method name="add_color_override">
+		<method name="has_color" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
-			<argument index="1" name="color" type="Color">
+			<argument index="1" name="type" type="String" default="&quot;&quot;">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="add_constant_override">
+		<method name="has_color_override" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
-			<argument index="1" name="constant" type="int">
-			</argument>
 			<description>
-			Override a single constant (integer) in the theme of this Control. If constant equals Theme.INVALID_CONSTANT, override is cleared.
 			</description>
 		</method>
-		<method name="get_icon" qualifiers="const">
-			<return type="Texture">
+		<method name="has_constant" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
@@ -9439,18 +9520,23 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_stylebox" qualifiers="const">
-			<return type="StyleBox">
+		<method name="has_constant_override" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
-			<argument index="1" name="type" type="String" default="&quot;&quot;">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_font" qualifiers="const">
-			<return type="Font">
+		<method name="has_focus" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+				Return whether the Control is the current focused control (see [method set_focus_mode]).
+			</description>
+		</method>
+		<method name="has_font" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
@@ -9459,18 +9545,16 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_color" qualifiers="const">
-			<return type="Color">
+		<method name="has_font_override" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
-			<argument index="1" name="type" type="String" default="&quot;&quot;">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_constant" qualifiers="const">
-			<return type="int">
+		<method name="has_icon" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
@@ -9487,15 +9571,17 @@
 			<description>
 			</description>
 		</method>
-		<method name="has_stylebox_override" qualifiers="const">
+		<method name="has_stylebox" qualifiers="const">
 			<return type="bool">
 			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
+			<argument index="1" name="type" type="String" default="&quot;&quot;">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="has_font_override" qualifiers="const">
+		<method name="has_stylebox_override" qualifiers="const">
 			<return type="bool">
 			</return>
 			<argument index="0" name="name" type="String">
@@ -9503,115 +9589,102 @@
 			<description>
 			</description>
 		</method>
-		<method name="has_color_override" qualifiers="const">
+		<method name="is_ignoring_mouse" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
 			<description>
+				Return if the control is ignoring mouse events (even touchpad events send mouse events).
 			</description>
 		</method>
-		<method name="has_constant_override" qualifiers="const">
+		<method name="is_stopping_mouse" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="has_icon" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
-			<argument index="1" name="type" type="String" default="&quot;&quot;">
-			</argument>
+		<method name="minimum_size_changed">
 			<description>
 			</description>
 		</method>
-		<method name="has_stylebox" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
-			<argument index="1" name="type" type="String" default="&quot;&quot;">
-			</argument>
+		<method name="release_focus">
 			<description>
+				Give up the focus, no other control will be able to receive keyboard input.
 			</description>
 		</method>
-		<method name="has_font" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="name" type="String">
+		<method name="set_anchor">
+			<argument index="0" name="margin" type="int">
 			</argument>
-			<argument index="1" name="type" type="String" default="&quot;&quot;">
+			<argument index="1" name="anchor_mode" type="int">
+			</argument>
+			<argument index="2" name="keep_margin" type="bool" default="false">
 			</argument>
 			<description>
+				Change the anchor (ANCHOR_BEGIN, ANCHOR_END, ANCHOR_RATIO) type for a margin (MARGIN_LEFT, MARGIN_TOP, MARGIN_RIGHT, MARGIN_BOTTOM). Changing the anchor mode converts the current margin offset from the previous anchor mode to the new one, so margin offsets ([method set_margin]) must be done after setting anchors, or at the same time ([method set_anchor_and_margin])
+				Additionally, [code]keep_margin[/code] controls whether margins should be left the same, or changed to keep the same position and size on-screen.
 			</description>
 		</method>
-		<method name="has_color" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="name" type="String">
+		<method name="set_anchor_and_margin">
+			<argument index="0" name="margin" type="int">
 			</argument>
-			<argument index="1" name="type" type="String" default="&quot;&quot;">
+			<argument index="1" name="anchor_mode" type="int">
+			</argument>
+			<argument index="2" name="offset" type="float">
 			</argument>
 			<description>
+				Change the anchor (ANCHOR_BEGIN, ANCHOR_END, ANCHOR_RATIO) type for a margin (MARGIN_LEFT, MARGIN_TOP, MARGIN_RIGHT, MARGIN_BOTTOM), and also set its offset. This is a helper (see [method set_anchor] and [method set_margin]).
 			</description>
 		</method>
-		<method name="has_constant" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="name" type="String">
+		<method name="set_area_as_parent_rect">
+			<argument index="0" name="margin" type="int" default="0">
 			</argument>
-			<argument index="1" name="type" type="String" default="&quot;&quot;">
+			<description>
+				Change all margins and anchors, so this Control always takes up the same area as the parent Control. This is a helper (see [method set_anchor], [method set_margin]).
+			</description>
+		</method>
+		<method name="set_begin">
+			<argument index="0" name="pos" type="Vector2">
 			</argument>
 			<description>
+				Sets MARGIN_LEFT and MARGIN_TOP at the same time. This is a helper (see [method set_margin]).
 			</description>
 		</method>
-		<method name="get_parent_control" qualifiers="const">
-			<return type="Control">
-			</return>
+		<method name="set_custom_minimum_size">
+			<argument index="0" name="size" type="Vector2">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_tooltip">
-			<argument index="0" name="tooltip" type="String">
+		<method name="set_default_cursor_shape">
+			<argument index="0" name="shape" type="int">
 			</argument>
 			<description>
-			Set a tooltip, which will appear when the cursor is resting over this control.
+				Set the default cursor shape for this control. See enum CURSOR_* for the list of shapes.
 			</description>
 		</method>
-		<method name="get_tooltip" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="atpos" type="Vector2" default="Vector2(0,0)">
+		<method name="set_drag_forwarding">
+			<argument index="0" name="target" type="Control">
 			</argument>
 			<description>
-			Return the tooltip, which will appear when the cursor is resting over this control.
 			</description>
 		</method>
-		<method name="set_default_cursor_shape">
-			<argument index="0" name="shape" type="int">
+		<method name="set_drag_preview">
+			<argument index="0" name="control" type="Control">
 			</argument>
 			<description>
-			Set the default cursor shape for this control. See enum CURSOR_* for the list of shapes.
 			</description>
 		</method>
-		<method name="get_default_cursor_shape" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_end">
+			<argument index="0" name="pos" type="Vector2">
+			</argument>
 			<description>
-			Return the default cursor shape for this control. See enum CURSOR_* for the list of shapes.
+				Sets MARGIN_RIGHT and MARGIN_BOTTOM at the same time. This is a helper (see [method set_margin]).
 			</description>
 		</method>
-		<method name="get_cursor_shape" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="pos" type="Vector2" default="Vector2(0,0)">
+		<method name="set_focus_mode">
+			<argument index="0" name="mode" type="int">
 			</argument>
 			<description>
-			Return the cursor shape at a certain position in the control.
+				Set the focus access mode for the control (FOCUS_NONE, FOCUS_CLICK, FOCUS_ALL). Only one Control can be focused at the same time, and it will receive keyboard signals.
 			</description>
 		</method>
 		<method name="set_focus_neighbour">
@@ -9620,38 +9693,69 @@
 			<argument index="1" name="neighbour" type="NodePath">
 			</argument>
 			<description>
-			Force a neighbour for moving the input focus to. When pressing TAB or directional/joypad directions focus is moved to the next control in that direction. However, the neighbour to move to can be forced with this function.
+				Force a neighbour for moving the input focus to. When pressing TAB or directional/joypad directions focus is moved to the next control in that direction. However, the neighbour to move to can be forced with this function.
 			</description>
 		</method>
-		<method name="get_focus_neighbour" qualifiers="const">
-			<return type="NodePath">
-			</return>
-			<argument index="0" name="margin" type="int">
+		<method name="set_global_pos">
+			<argument index="0" name="pos" type="Vector2">
+			</argument>
+			<description>
+				Move the Control to a new position, relative to the top-left corner of the [i]window[/i] Control, and without changing current anchor mode. (see [method set_margin]).
+			</description>
+		</method>
+		<method name="set_h_size_flags">
+			<argument index="0" name="flags" type="int">
 			</argument>
 			<description>
-			Return the forced neighbour for moving the input focus to. When pressing TAB or directional/joypad directions focus is moved to the next control in that direction. However, the neighbour to move to can be forced with this function.
+				Hint for containers, set horizontal positioning flags.
 			</description>
 		</method>
 		<method name="set_ignore_mouse">
 			<argument index="0" name="ignore" type="bool">
 			</argument>
 			<description>
-			Ignore mouse events on this control (even touchpad events send mouse events).
+				Ignore mouse events on this control (even touchpad events send mouse events).
 			</description>
 		</method>
-		<method name="is_ignoring_mouse" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_margin">
+			<argument index="0" name="margin" type="int">
+			</argument>
+			<argument index="1" name="offset" type="float">
+			</argument>
 			<description>
-			Return if the control is ignoring mouse events (even touchpad events send mouse events).
+				Set a margin offset. Margin can be one of (MARGIN_LEFT, MARGIN_TOP, MARGIN_RIGHT, MARGIN_BOTTOM). Offset value being set depends on the anchor mode.
 			</description>
 		</method>
-		<method name="force_drag">
-			<argument index="0" name="data" type="Variant">
+		<method name="set_pos">
+			<argument index="0" name="pos" type="Vector2">
 			</argument>
-			<argument index="1" name="preview" type="Object">
+			<description>
+				Move the Control to a new position, relative to the top-left corner of the parent Control, changing all margins if needed and without changing current anchor mode. This is a helper (see [method set_margin]).
+			</description>
+		</method>
+		<method name="set_rotation">
+			<argument index="0" name="radians" type="float">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_rotation_deg">
+			<argument index="0" name="degrees" type="float">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_scale">
+			<argument index="0" name="scale" type="Vector2">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_size">
+			<argument index="0" name="size" type="Vector2">
 			</argument>
 			<description>
+				Changes MARGIN_RIGHT and MARGIN_BOTTOM to fit a given size. This is a helper (see [method set_margin]).
 			</description>
 		</method>
 		<method name="set_stop_mouse">
@@ -9660,35 +9764,44 @@
 			<description>
 			</description>
 		</method>
-		<method name="is_stopping_mouse" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_stretch_ratio">
+			<argument index="0" name="ratio" type="float">
+			</argument>
 			<description>
+				Hint for containers, set the stretch ratio. This value is relative to other stretch ratio, so if this control has 2 and another has 1, this one will be twice as big.
 			</description>
 		</method>
-		<method name="grab_click_focus">
+		<method name="set_theme">
+			<argument index="0" name="theme" type="Theme">
+			</argument>
 			<description>
+				Override whole the [Theme] for this Control and all its children controls.
 			</description>
 		</method>
-		<method name="set_drag_forwarding">
-			<argument index="0" name="target" type="Control">
+		<method name="set_tooltip">
+			<argument index="0" name="tooltip" type="String">
 			</argument>
 			<description>
+				Set a tooltip, which will appear when the cursor is resting over this control.
 			</description>
 		</method>
-		<method name="set_drag_preview">
-			<argument index="0" name="control" type="Control">
+		<method name="set_v_size_flags">
+			<argument index="0" name="flags" type="int">
 			</argument>
 			<description>
+				Hint for containers, set vertical positioning flags.
 			</description>
 		</method>
-		<method name="warp_mouse">
-			<argument index="0" name="to_pos" type="Vector2">
+		<method name="show_modal">
+			<argument index="0" name="exclusive" type="bool" default="false">
 			</argument>
 			<description>
+				Display a Control as modal. Control must be a subwindow. Modal controls capture the input signals until closed or the area outside them is accessed. When a modal control loses focus, or the ESC key is pressed, they automatically hide. Modal controls are used extensively for popup dialogs and menus.
 			</description>
 		</method>
-		<method name="minimum_size_changed">
+		<method name="warp_mouse">
+			<argument index="0" name="to_pos" type="Vector2">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -9696,48 +9809,48 @@
 	<signals>
 		<signal name="focus_enter">
 			<description>
-			Emitted when keyboard focus is gained.
+				Emitted when keyboard focus is gained.
 			</description>
 		</signal>
-		<signal name="mouse_enter">
+		<signal name="focus_exit">
 			<description>
-			Emitted when the mouse enters the control area.
+				Emitted when the keyboard focus is lost.
 			</description>
 		</signal>
-		<signal name="resized">
+		<signal name="input_event">
+			<argument index="0" name="ev" type="InputEvent">
+			</argument>
 			<description>
-			Emitted when the control changed size.
+				Emitted when an input event is received. Connecting in realtime is recommended for accepting the events.
 			</description>
 		</signal>
 		<signal name="minimum_size_changed">
 			<description>
-			Emitted when the minimum size of the control changed.
+				Emitted when the minimum size of the control changed.
 			</description>
 		</signal>
-		<signal name="size_flags_changed">
+		<signal name="modal_close">
 			<description>
-			Emitted when the size flags changed.
 			</description>
 		</signal>
-		<signal name="focus_exit">
+		<signal name="mouse_enter">
 			<description>
-			Emitted when the keyboard focus is lost.
+				Emitted when the mouse enters the control area.
 			</description>
 		</signal>
-		<signal name="input_event">
-			<argument index="0" name="ev" type="InputEvent">
-			</argument>
+		<signal name="mouse_exit">
 			<description>
-			Emitted when an input event is received. Connecting in realtime is recommended for accepting the events.
+				Emitted when the mouse left the control area.
 			</description>
 		</signal>
-		<signal name="modal_close">
+		<signal name="resized">
 			<description>
+				Emitted when the control changed size.
 			</description>
 		</signal>
-		<signal name="mouse_exit">
+		<signal name="size_flags_changed">
 			<description>
-			Emitted when the mouse left the control area.
+				Emitted when the size flags changed.
 			</description>
 		</signal>
 	</signals>
@@ -9827,56 +9940,56 @@
 </class>
 <class name="ConvexPolygonShape" inherits="Shape" category="Core">
 	<brief_description>
-	Convex Polygon Shape.
+		Convex Polygon Shape.
 	</brief_description>
 	<description>
-	Convex polygon shape resource, which can be set into a [PhysicsBody] or area.
+		Convex polygon shape resource, which can be set into a [PhysicsBody] or area.
 	</description>
 	<methods>
-		<method name="set_points">
-			<argument index="0" name="points" type="Vector3Array">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_points" qualifiers="const">
 			<return type="Vector3Array">
 			</return>
 			<description>
 			</description>
 		</method>
+		<method name="set_points">
+			<argument index="0" name="points" type="Vector3Array">
+			</argument>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<constants>
 	</constants>
 </class>
 <class name="ConvexPolygonShape2D" inherits="Shape2D" category="Core">
 	<brief_description>
-	Convex Polygon Shape for 2D physics.
+		Convex Polygon Shape for 2D physics.
 	</brief_description>
 	<description>
-	Convex Polygon Shape for 2D physics. A convex polygon, whatever its shape, is internally decomposed into as many convex polygons as needed to ensure all collision checks against it are always done on convex polygons (which are faster to check).
-	The main difference between a [ConvexPolygonShape2D] and a [ConcavePolygonShape2D] is that a concave polygon assumes it is concave and uses a more complex method of collision detection, and a convex one forces itself to be convex in order to speed up collision detection.
+		Convex Polygon Shape for 2D physics. A convex polygon, whatever its shape, is internally decomposed into as many convex polygons as needed to ensure all collision checks against it are always done on convex polygons (which are faster to check).
+		The main difference between a [ConvexPolygonShape2D] and a [ConcavePolygonShape2D] is that a concave polygon assumes it is concave and uses a more complex method of collision detection, and a convex one forces itself to be convex in order to speed up collision detection.
 	</description>
 	<methods>
+		<method name="get_points" qualifiers="const">
+			<return type="Vector2Array">
+			</return>
+			<description>
+				Return a list of points in either clockwise or counter clockwise order, forming a convex polygon.
+			</description>
+		</method>
 		<method name="set_point_cloud">
 			<argument index="0" name="point_cloud" type="Vector2Array">
 			</argument>
 			<description>
-			Currently, this method does nothing.
+				Currently, this method does nothing.
 			</description>
 		</method>
 		<method name="set_points">
 			<argument index="0" name="points" type="Vector2Array">
 			</argument>
 			<description>
-			Set a list of points in either clockwise or counter clockwise order, forming a convex polygon.
-			</description>
-		</method>
-		<method name="get_points" qualifiers="const">
-			<return type="Vector2Array">
-			</return>
-			<description>
-			Return a list of points in either clockwise or counter clockwise order, forming a convex polygon.
+				Set a list of points in either clockwise or counter clockwise order, forming a convex polygon.
 			</description>
 		</method>
 	</methods>
@@ -9889,7 +10002,7 @@
 	<description>
 	</description>
 	<methods>
-		<method name="get_width" qualifiers="const">
+		<method name="get_flags" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
@@ -9901,32 +10014,18 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_rid" qualifiers="const">
-			<return type="RID">
+		<method name="get_lossy_storage_quality" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_flags">
-			<argument index="0" name="flags" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_flags" qualifiers="const">
-			<return type="int">
+		<method name="get_rid" qualifiers="const">
+			<return type="RID">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_side">
-			<argument index="0" name="side" type="int">
-			</argument>
-			<argument index="1" name="image" type="Image">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_side" qualifiers="const">
 			<return type="Image">
 			</return>
@@ -9935,27 +10034,41 @@
 			<description>
 			</description>
 		</method>
-		<method name="set_storage">
-			<argument index="0" name="mode" type="int">
-			</argument>
+		<method name="get_storage" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_storage" qualifiers="const">
+		<method name="get_width" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
+		<method name="set_flags">
+			<argument index="0" name="flags" type="int">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="set_lossy_storage_quality">
 			<argument index="0" name="quality" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_lossy_storage_quality" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_side">
+			<argument index="0" name="side" type="int">
+			</argument>
+			<argument index="1" name="image" type="Image">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_storage">
+			<argument index="0" name="mode" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -9991,20 +10104,13 @@
 </class>
 <class name="Curve2D" inherits="Resource" category="Core">
 	<brief_description>
-	Describes a Bezier curve in 2D space.
+		Describes a Bezier curve in 2D space.
 	</brief_description>
 	<description>
-	This class describes a Bezier curve in 2D space. It is mainly used to give a shape to a [Path2D], but can be manually sampled for other purposes.
-It keeps a cache of precalculated points along the curve, to speed further calculations up.
+		This class describes a Bezier curve in 2D space. It is mainly used to give a shape to a [Path2D], but can be manually sampled for other purposes.
+		It keeps a cache of precalculated points along the curve, to speed further calculations up.
 	</description>
 	<methods>
-		<method name="get_point_count" qualifiers="const">
-			<return type="int">
-			</return>
-			<description>
-			Returns the number of points describing the curve.
-			</description>
-		</method>
 		<method name="add_point">
 			<argument index="0" name="pos" type="Vector2">
 			</argument>
@@ -10015,53 +10121,45 @@ It keeps a cache of precalculated points along the curve, to speed further calcu
 			<argument index="3" name="atpos" type="int" default="-1">
 			</argument>
 			<description>
-			Adds a point to a curve, at position "pos", with control points "in" and "out".
-If "atpos" is given, the point is inserted before the point number "atpos", moving that point (and every point after) after the inserted point. If "atpos" is not given, or is an illegal value (atpos &lt;0 or atpos &gt;= [method get_point_count]), the point will be appended at the end of the point list.
+				Adds a point to a curve, at position "pos", with control points "in" and "out".
+				If "atpos" is given, the point is inserted before the point number "atpos", moving that point (and every point after) after the inserted point. If "atpos" is not given, or is an illegal value (atpos &lt;0 or atpos &gt;= [method get_point_count]), the point will be appended at the end of the point list.
 			</description>
 		</method>
-		<method name="set_point_pos">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="pos" type="Vector2">
-			</argument>
+		<method name="get_bake_interval" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Sets the position for the vertex "idx". If the index is out of bounds, the function sends an error to the console.
+				Returns the distance between two adjacent cached points.
 			</description>
 		</method>
-		<method name="get_point_pos" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_baked_length" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
-			Returns the position of the vertex "idx". If the index is out of bounds, the function sends an error to the console, and returns (0, 0).
+				Returns the total length of the curve, based on the cached points. Given enough density (see [method set_bake_interval]), it should be approximate enough.
 			</description>
 		</method>
-		<method name="set_point_in">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="pos" type="Vector2">
-			</argument>
+		<method name="get_baked_points" qualifiers="const">
+			<return type="Vector2Array">
+			</return>
 			<description>
-			Sets the position of the control point leading to the vertex "idx". If the index is out of bounds, the function sends an error to the console.
+				Returns the cache of points as a [Vector2Array].
 			</description>
 		</method>
-		<method name="get_point_in" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_point_count" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
-			Returns the position of the control point leading to the vertex "idx". If the index is out of bounds, the function sends an error to the console, and returns (0, 0).
+				Returns the number of points describing the curve.
 			</description>
 		</method>
-		<method name="set_point_out">
+		<method name="get_point_in" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="pos" type="Vector2">
-			</argument>
 			<description>
-			Sets the position of the control point leading out of the vertex "idx". If the index is out of bounds, the function sends an error to the console.
+				Returns the position of the control point leading to the vertex "idx". If the index is out of bounds, the function sends an error to the console, and returns (0, 0).
 			</description>
 		</method>
 		<method name="get_point_out" qualifiers="const">
@@ -10070,14 +10168,16 @@ If "atpos" is given, the point is inserted before the point number "atpos", movi
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Returns the position of the control point leading out of the vertex "idx". If the index is out of bounds, the function sends an error to the console, and returns (0, 0).
+				Returns the position of the control point leading out of the vertex "idx". If the index is out of bounds, the function sends an error to the console, and returns (0, 0).
 			</description>
 		</method>
-		<method name="remove_point">
+		<method name="get_point_pos" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Deletes the point "idx" from the curve. Sends an error to the console if "idx" is out of bounds.
+				Returns the position of the vertex "idx". If the index is out of bounds, the function sends an error to the console, and returns (0, 0).
 			</description>
 		</method>
 		<method name="interpolate" qualifiers="const">
@@ -10088,8 +10188,21 @@ If "atpos" is given, the point is inserted before the point number "atpos", movi
 			<argument index="1" name="t" type="float">
 			</argument>
 			<description>
-			Returns the position between the vertex "idx" and the vertex "idx"+1, where "t" controls if the point is the first vertex (t = 0.0), the last vertex (t = 1.0), or in between. Values of "t" outside the range (0.0 &gt;= t  &lt;=1) give strange, but predictable results.
-If "idx" is out of bounds it is truncated to the first or last vertex, and "t" is ignored. If the curve has no points, the function sends an error to the console, and returns (0, 0).
+				Returns the position between the vertex "idx" and the vertex "idx"+1, where "t" controls if the point is the first vertex (t = 0.0), the last vertex (t = 1.0), or in between. Values of "t" outside the range (0.0 &gt;= t  &lt;=1) give strange, but predictable results.
+				If "idx" is out of bounds it is truncated to the first or last vertex, and "t" is ignored. If the curve has no points, the function sends an error to the console, and returns (0, 0).
+			</description>
+		</method>
+		<method name="interpolate_baked" qualifiers="const">
+			<return type="Vector2">
+			</return>
+			<argument index="0" name="offset" type="float">
+			</argument>
+			<argument index="1" name="cubic" type="bool" default="false">
+			</argument>
+			<description>
+				Returns a point within the curve at position "offset", where "offset" is measured as a pixel distance along the curve.
+				To do that, it finds the two cached points where the "offset" lies between, then interpolates the values. This interpolation is cubic if "cubic" is set to true, or linear if set to false.
+				Cubic interpolation tends to follow the curves better, but linear is faster (and often, precise enough).
 			</description>
 		</method>
 		<method name="interpolatef" qualifiers="const">
@@ -10098,48 +10211,48 @@ If "idx" is out of bounds it is truncated to the first or last vertex, and "t" i
 			<argument index="0" name="fofs" type="float">
 			</argument>
 			<description>
-			Returns the position at the vertex "fofs". It calls [method interpolate] using the integer part of fofs as "idx", and its fractional part as "t".
+				Returns the position at the vertex "fofs". It calls [method interpolate] using the integer part of fofs as "idx", and its fractional part as "t".
 			</description>
 		</method>
-		<method name="set_bake_interval">
-			<argument index="0" name="distance" type="float">
+		<method name="remove_point">
+			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Sets the distance in pixels between two adjacent cached points. Changing it forces the cache to be recomputed the next time a xxx_baked_xxx function is called. The less distance, the more points the cache will have, and the more memory it will consume, so use with care.
+				Deletes the point "idx" from the curve. Sends an error to the console if "idx" is out of bounds.
 			</description>
 		</method>
-		<method name="get_bake_interval" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_bake_interval">
+			<argument index="0" name="distance" type="float">
+			</argument>
 			<description>
-			Returns the distance between two adjacent cached points.
+				Sets the distance in pixels between two adjacent cached points. Changing it forces the cache to be recomputed the next time a xxx_baked_xxx function is called. The less distance, the more points the cache will have, and the more memory it will consume, so use with care.
 			</description>
 		</method>
-		<method name="get_baked_length" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_point_in">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="pos" type="Vector2">
+			</argument>
 			<description>
-			Returns the total length of the curve, based on the cached points. Given enough density (see [method set_bake_interval]), it should be approximate enough.
+				Sets the position of the control point leading to the vertex "idx". If the index is out of bounds, the function sends an error to the console.
 			</description>
 		</method>
-		<method name="interpolate_baked" qualifiers="const">
-			<return type="Vector2">
-			</return>
-			<argument index="0" name="offset" type="float">
+		<method name="set_point_out">
+			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="cubic" type="bool" default="false">
+			<argument index="1" name="pos" type="Vector2">
 			</argument>
 			<description>
-			Returns a point within the curve at position "offset", where "offset" is measured as a pixel distance along the curve.
-To do that, it finds the two cached points where the "offset" lies between, then interpolates the values. This interpolation is cubic if "cubic" is set to true, or linear if set to false.
-Cubic interpolation tends to follow the curves better, but linear is faster (and often, precise enough).
+				Sets the position of the control point leading out of the vertex "idx". If the index is out of bounds, the function sends an error to the console.
 			</description>
 		</method>
-		<method name="get_baked_points" qualifiers="const">
-			<return type="Vector2Array">
-			</return>
+		<method name="set_point_pos">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="pos" type="Vector2">
+			</argument>
 			<description>
-			Returns the cache of points as a [Vector2Array].
+				Sets the position for the vertex "idx". If the index is out of bounds, the function sends an error to the console.
 			</description>
 		</method>
 		<method name="tesselate" qualifiers="const">
@@ -10150,10 +10263,10 @@ Cubic interpolation tends to follow the curves better, but linear is faster (and
 			<argument index="1" name="tolerance_degrees" type="float" default="4">
 			</argument>
 			<description>
-			Returns a list of points along the curve, with a curvature controlled point density. That is, the curvier parts will have more points than the straighter parts.
-This approximation makes straight segments between each point, then subdivides those segments until the resulting shape is similar enough.
-"max_stages" controls how many subdivisions a curve segment may face before it is considered approximate enough. Each subdivision splits the segment in half, so the default 5 stages may mean up to 32 subdivisions per curve segment. Increase with care!
-"tolerance_degrees" controls how many degrees the midpoint of a segment may deviate from the real curve, before the segment has to be subdivided.
+				Returns a list of points along the curve, with a curvature controlled point density. That is, the curvier parts will have more points than the straighter parts.
+				This approximation makes straight segments between each point, then subdivides those segments until the resulting shape is similar enough.
+				"max_stages" controls how many subdivisions a curve segment may face before it is considered approximate enough. Each subdivision splits the segment in half, so the default 5 stages may mean up to 32 subdivisions per curve segment. Increase with care!
+				"tolerance_degrees" controls how many degrees the midpoint of a segment may deviate from the real curve, before the segment has to be subdivided.
 			</description>
 		</method>
 	</methods>
@@ -10162,20 +10275,13 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="Curve3D" inherits="Resource" category="Core">
 	<brief_description>
-	Describes a Bezier curve in 3D space.
+		Describes a Bezier curve in 3D space.
 	</brief_description>
 	<description>
-	This class describes a Bezier curve in 3D space. It is mainly used to give a shape to a [Path], but can be manually sampled for other purposes.
-It keeps a cache of precalculated points along the curve, to speed further calculations up.
+		This class describes a Bezier curve in 3D space. It is mainly used to give a shape to a [Path], but can be manually sampled for other purposes.
+		It keeps a cache of precalculated points along the curve, to speed further calculations up.
 	</description>
 	<methods>
-		<method name="get_point_count" qualifiers="const">
-			<return type="int">
-			</return>
-			<description>
-			Returns the number of points describing the curve.
-			</description>
-		</method>
 		<method name="add_point">
 			<argument index="0" name="pos" type="Vector3">
 			</argument>
@@ -10186,54 +10292,43 @@ It keeps a cache of precalculated points along the curve, to speed further calcu
 			<argument index="3" name="atpos" type="int" default="-1">
 			</argument>
 			<description>
-			Adds a point to a curve, at position "pos", with control points "in" and "out".
-If "atpos" is given, the point is inserted before the point number "atpos", moving that point (and every point after) after the inserted point. If "atpos" is not given, or is an illegal value (atpos &lt;0 or atpos &gt;= [method get_point_count]), the point will be appended at the end of the point list.
+				Adds a point to a curve, at position "pos", with control points "in" and "out".
+				If "atpos" is given, the point is inserted before the point number "atpos", moving that point (and every point after) after the inserted point. If "atpos" is not given, or is an illegal value (atpos &lt;0 or atpos &gt;= [method get_point_count]), the point will be appended at the end of the point list.
 			</description>
 		</method>
-		<method name="set_point_pos">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="pos" type="Vector3">
-			</argument>
+		<method name="get_bake_interval" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Sets the position for the vertex "idx". If the index is out of bounds, the function sends an error to the console.
+				Returns the distance between two adjacent cached points.
 			</description>
 		</method>
-		<method name="get_point_pos" qualifiers="const">
-			<return type="Vector3">
+		<method name="get_baked_length" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
-			Returns the position of the vertex "idx". If the index is out of bounds, the function sends an error to the console, and returns (0, 0, 0).
+				Returns the total length of the curve, based on the cached points. Given enough density (see [method set_bake_interval]), it should be approximate enough.
 			</description>
 		</method>
-		<method name="set_point_tilt">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="tilt" type="float">
-			</argument>
+		<method name="get_baked_points" qualifiers="const">
+			<return type="Vector3Array">
+			</return>
 			<description>
-			Sets the tilt angle in radians for the point "idx". If the index is out of bounds, the function sends an error to the console.
-The tilt controls the rotation along the look-at axis an object traveling the path would have. In the case of a curve controlling a [PathFollow], this tilt is an offset over the natural tilt the PathFollow calculates.
+				Returns the cache of points as a [Vector3Array].
 			</description>
 		</method>
-		<method name="get_point_tilt" qualifiers="const">
-			<return type="float">
+		<method name="get_baked_tilts" qualifiers="const">
+			<return type="RealArray">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
-			Returns the tilt angle in radians for the point "idx". If the index is out of bounds, the function sends an error to the console, and returns 0.
+				Returns the cache of tilts as a [RealArray].
 			</description>
 		</method>
-		<method name="set_point_in">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="pos" type="Vector3">
-			</argument>
+		<method name="get_point_count" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Sets the position of the control point leading to the vertex "idx". If the index is out of bounds, the function sends an error to the console.
+				Returns the number of points describing the curve.
 			</description>
 		</method>
 		<method name="get_point_in" qualifiers="const">
@@ -10242,32 +10337,34 @@ The tilt controls the rotation along the look-at axis an object traveling the pa
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Returns the position of the control point leading to the vertex "idx". If the index is out of bounds, the function sends an error to the console, and returns (0, 0, 0).
+				Returns the position of the control point leading to the vertex "idx". If the index is out of bounds, the function sends an error to the console, and returns (0, 0, 0).
 			</description>
 		</method>
-		<method name="set_point_out">
+		<method name="get_point_out" qualifiers="const">
+			<return type="Vector3">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="pos" type="Vector3">
-			</argument>
 			<description>
-			Sets the position of the control point leading out of the vertex "idx". If the index is out of bounds, the function sends an error to the console.
+				Returns the position of the control point leading out of the vertex "idx". If the index is out of bounds, the function sends an error to the console, and returns (0, 0, 0).
 			</description>
 		</method>
-		<method name="get_point_out" qualifiers="const">
+		<method name="get_point_pos" qualifiers="const">
 			<return type="Vector3">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Returns the position of the control point leading out of the vertex "idx". If the index is out of bounds, the function sends an error to the console, and returns (0, 0, 0).
+				Returns the position of the vertex "idx". If the index is out of bounds, the function sends an error to the console, and returns (0, 0, 0).
 			</description>
 		</method>
-		<method name="remove_point">
+		<method name="get_point_tilt" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Deletes the point "idx" from the curve. Sends an error to the console if "idx" is out of bounds.
+				Returns the tilt angle in radians for the point "idx". If the index is out of bounds, the function sends an error to the console, and returns 0.
 			</description>
 		</method>
 		<method name="interpolate" qualifiers="const">
@@ -10278,8 +10375,21 @@ The tilt controls the rotation along the look-at axis an object traveling the pa
 			<argument index="1" name="t" type="float">
 			</argument>
 			<description>
-			Returns the position between the vertex "idx" and the vertex "idx"+1, where "t" controls if the point is the first vertex (t = 0.0), the last vertex (t = 1.0), or in between. Values of "t" outside the range (0.0 &gt;= t  &lt;=1) give strange, but predictable results.
-If "idx" is out of bounds it is truncated to the first or last vertex, and "t" is ignored. If the curve has no points, the function sends an error to the console, and returns (0, 0, 0).
+				Returns the position between the vertex "idx" and the vertex "idx"+1, where "t" controls if the point is the first vertex (t = 0.0), the last vertex (t = 1.0), or in between. Values of "t" outside the range (0.0 &gt;= t  &lt;=1) give strange, but predictable results.
+				If "idx" is out of bounds it is truncated to the first or last vertex, and "t" is ignored. If the curve has no points, the function sends an error to the console, and returns (0, 0, 0).
+			</description>
+		</method>
+		<method name="interpolate_baked" qualifiers="const">
+			<return type="Vector3">
+			</return>
+			<argument index="0" name="offset" type="float">
+			</argument>
+			<argument index="1" name="cubic" type="bool" default="false">
+			</argument>
+			<description>
+				Returns a point within the curve at position "offset", where "offset" is measured as a distance in 3D units along the curve.
+				To do that, it finds the two cached points where the "offset" lies between, then interpolates the values. This interpolation is cubic if "cubic" is set to true, or linear if set to false.
+				Cubic interpolation tends to follow the curves better, but linear is faster (and often, precise enough).
 			</description>
 		</method>
 		<method name="interpolatef" qualifiers="const">
@@ -10288,55 +10398,58 @@ If "idx" is out of bounds it is truncated to the first or last vertex, and "t" i
 			<argument index="0" name="fofs" type="float">
 			</argument>
 			<description>
-			Returns the position at the vertex "fofs". It calls [method interpolate] using the integer part of fofs as "idx", and its fractional part as "t".
+				Returns the position at the vertex "fofs". It calls [method interpolate] using the integer part of fofs as "idx", and its fractional part as "t".
 			</description>
 		</method>
-		<method name="set_bake_interval">
-			<argument index="0" name="distance" type="float">
+		<method name="remove_point">
+			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Sets the distance in 3D units between two adjacent cached points. Changing it forces the cache to be recomputed the next time a xxx_baked_xxx function is called. The less distance, the more points the cache will have, and the more memory it will consume, so use with care.
+				Deletes the point "idx" from the curve. Sends an error to the console if "idx" is out of bounds.
 			</description>
 		</method>
-		<method name="get_bake_interval" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_bake_interval">
+			<argument index="0" name="distance" type="float">
+			</argument>
 			<description>
-			Returns the distance between two adjacent cached points.
+				Sets the distance in 3D units between two adjacent cached points. Changing it forces the cache to be recomputed the next time a xxx_baked_xxx function is called. The less distance, the more points the cache will have, and the more memory it will consume, so use with care.
 			</description>
 		</method>
-		<method name="get_baked_length" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_point_in">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="pos" type="Vector3">
+			</argument>
 			<description>
-			Returns the total length of the curve, based on the cached points. Given enough density (see [method set_bake_interval]), it should be approximate enough.
+				Sets the position of the control point leading to the vertex "idx". If the index is out of bounds, the function sends an error to the console.
 			</description>
 		</method>
-		<method name="interpolate_baked" qualifiers="const">
-			<return type="Vector3">
-			</return>
-			<argument index="0" name="offset" type="float">
+		<method name="set_point_out">
+			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="cubic" type="bool" default="false">
+			<argument index="1" name="pos" type="Vector3">
 			</argument>
 			<description>
-			Returns a point within the curve at position "offset", where "offset" is measured as a distance in 3D units along the curve.
-To do that, it finds the two cached points where the "offset" lies between, then interpolates the values. This interpolation is cubic if "cubic" is set to true, or linear if set to false.
-Cubic interpolation tends to follow the curves better, but linear is faster (and often, precise enough).
+				Sets the position of the control point leading out of the vertex "idx". If the index is out of bounds, the function sends an error to the console.
 			</description>
 		</method>
-		<method name="get_baked_points" qualifiers="const">
-			<return type="Vector3Array">
-			</return>
+		<method name="set_point_pos">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="pos" type="Vector3">
+			</argument>
 			<description>
-			Returns the cache of points as a [Vector3Array].
+				Sets the position for the vertex "idx". If the index is out of bounds, the function sends an error to the console.
 			</description>
 		</method>
-		<method name="get_baked_tilts" qualifiers="const">
-			<return type="RealArray">
-			</return>
+		<method name="set_point_tilt">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="tilt" type="float">
+			</argument>
 			<description>
-			Returns the cache of tilts as a [RealArray].
+				Sets the tilt angle in radians for the point "idx". If the index is out of bounds, the function sends an error to the console.
+				The tilt controls the rotation along the look-at axis an object traveling the path would have. In the case of a curve controlling a [PathFollow], this tilt is an offset over the natural tilt the PathFollow calculates.
 			</description>
 		</method>
 		<method name="tesselate" qualifiers="const">
@@ -10347,10 +10460,10 @@ Cubic interpolation tends to follow the curves better, but linear is faster (and
 			<argument index="1" name="tolerance_degrees" type="float" default="4">
 			</argument>
 			<description>
-			Returns a list of points along the curve, with a curvature controlled point density. That is, the curvier parts will have more points than the straighter parts.
-This approximation makes straight segments between each point, then subdivides those segments until the resulting shape is similar enough.
-"max_stages" controls how many subdivisions a curve segment may face before it is considered approximate enough. Each subdivision splits the segment in half, so the default 5 stages may mean up to 32 subdivisions per curve segment. Increase with care!
-"tolerance_degrees" controls how many degrees the midpoint of a segment may deviate from the real curve, before the segment has to be subdivided.
+				Returns a list of points along the curve, with a curvature controlled point density. That is, the curvier parts will have more points than the straighter parts.
+				This approximation makes straight segments between each point, then subdivides those segments until the resulting shape is similar enough.
+				"max_stages" controls how many subdivisions a curve segment may face before it is considered approximate enough. Each subdivision splits the segment in half, so the default 5 stages may mean up to 32 subdivisions per curve segment. Increase with care!
+				"tolerance_degrees" controls how many degrees the midpoint of a segment may deviate from the real curve, before the segment has to be subdivided.
 			</description>
 		</method>
 	</methods>
@@ -10359,66 +10472,66 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="DampedSpringJoint2D" inherits="Joint2D" category="Core">
 	<brief_description>
-	Damped spring constraint for 2D physics.
+		Damped spring constraint for 2D physics.
 	</brief_description>
 	<description>
-	Damped spring constraint for 2D physics. This resembles a spring joint that always wants to go back to a given length.
+		Damped spring constraint for 2D physics. This resembles a spring joint that always wants to go back to a given length.
 	</description>
 	<methods>
-		<method name="set_length">
-			<argument index="0" name="length" type="float">
-			</argument>
+		<method name="get_damping" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the maximum length of the spring joint.
+				Return the damping ratio of the spring joint. A value of 0 indicates an undamped spring, while 1 causes the system to reach equilibrium as fast as possible (critical damping).
 			</description>
 		</method>
 		<method name="get_length" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the maximum length of the spring joint.
+				Return the maximum length of the spring joint.
 			</description>
 		</method>
-		<method name="set_rest_length">
-			<argument index="0" name="rest_length" type="float">
-			</argument>
+		<method name="get_rest_length" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the resting length of the spring joint. The joint will always try to go to back this length when pulled apart.
+				Return the resting length of the spring joint. The joint will always try to go to back this length when pulled apart.
 			</description>
 		</method>
-		<method name="get_rest_length" qualifiers="const">
+		<method name="get_stiffness" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the resting length of the spring joint. The joint will always try to go to back this length when pulled apart.
+				Return the stiffness of the spring joint. The joint applies a force equal to the stiffness times the distance from its resting length.
 			</description>
 		</method>
-		<method name="set_stiffness">
-			<argument index="0" name="stiffness" type="float">
+		<method name="set_damping">
+			<argument index="0" name="damping" type="float">
 			</argument>
 			<description>
-			Set the stiffness of the spring joint. The joint applies a force equal to the stiffness times the distance from its resting length.
+				Set the damping ratio of the spring joint. A value of 0 indicates an undamped spring, while 1 causes the system to reach equilibrium as fast as possible (critical damping).
 			</description>
 		</method>
-		<method name="get_stiffness" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_length">
+			<argument index="0" name="length" type="float">
+			</argument>
 			<description>
-			Return the stiffness of the spring joint. The joint applies a force equal to the stiffness times the distance from its resting length.
+				Set the maximum length of the spring joint.
 			</description>
 		</method>
-		<method name="set_damping">
-			<argument index="0" name="damping" type="float">
+		<method name="set_rest_length">
+			<argument index="0" name="rest_length" type="float">
 			</argument>
 			<description>
-			Set the damping ratio of the spring joint. A value of 0 indicates an undamped spring, while 1 causes the system to reach equilibrium as fast as possible (critical damping).
+				Set the resting length of the spring joint. The joint will always try to go to back this length when pulled apart.
 			</description>
 		</method>
-		<method name="get_damping" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_stiffness">
+			<argument index="0" name="stiffness" type="float">
+			</argument>
 			<description>
-			Return the damping ratio of the spring joint. A value of 0 indicates an undamped spring, while 1 causes the system to reach equilibrium as fast as possible (critical damping).
+				Set the stiffness of the spring joint. The joint applies a force equal to the stiffness times the distance from its resting length.
 			</description>
 		</method>
 	</methods>
@@ -10427,29 +10540,29 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="Dictionary" category="Built-In Types">
 	<brief_description>
-	Dictionary type.
+		Dictionary type.
 	</brief_description>
 	<description>
-	Dictionary type. Associative container which contains values referenced by unique keys. Dictionaries are always passed by reference.
+		Dictionary type. Associative container which contains values referenced by unique keys. Dictionaries are always passed by reference.
 	</description>
 	<methods>
 		<method name="clear">
 			<description>
-			Clear the dictionary, removing all key/value pairs.
+				Clear the dictionary, removing all key/value pairs.
 			</description>
 		</method>
 		<method name="empty">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if the dictionary is empty.
+				Return true if the dictionary is empty.
 			</description>
 		</method>
 		<method name="erase">
 			<argument index="0" name="key" type="var">
 			</argument>
 			<description>
-			Erase a dictionary key/value pair by key.
+				Erase a dictionary key/value pair by key.
 			</description>
 		</method>
 		<method name="has">
@@ -10458,7 +10571,7 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="0" name="key" type="var">
 			</argument>
 			<description>
-			Return true if the dictionary has a given key.
+				Return true if the dictionary has a given key.
 			</description>
 		</method>
 		<method name="has_all">
@@ -10467,21 +10580,21 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="0" name="keys" type="Array">
 			</argument>
 			<description>
-			Return true if the dictionary has all of the keys in the given array.
+				Return true if the dictionary has all of the keys in the given array.
 			</description>
 		</method>
 		<method name="hash">
 			<return type="int">
 			</return>
 			<description>
-			Return a hashed integer value representing the dictionary contents.
+				Return a hashed integer value representing the dictionary contents.
 			</description>
 		</method>
 		<method name="keys">
 			<return type="Array">
 			</return>
 			<description>
-			Return the list of keys in the [Dictionary].
+				Return the list of keys in the [Dictionary].
 			</description>
 		</method>
 		<method name="parse_json">
@@ -10490,28 +10603,28 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="0" name="json" type="String">
 			</argument>
 			<description>
-			Parse json text to the dictionary. Return OK when successed or the error code when failed.
+				Parse json text to the dictionary. Return OK when successed or the error code when failed.
 			</description>
 		</method>
 		<method name="size">
 			<return type="int">
 			</return>
 			<description>
-			Return the size of the dictionary (in pairs).
+				Return the size of the dictionary (in pairs).
 			</description>
 		</method>
 		<method name="to_json">
 			<return type="String">
 			</return>
 			<description>
-			Return the dictionary as json text.
+				Return the dictionary as json text.
 			</description>
 		</method>
 		<method name="values">
 			<return type="Array">
 			</return>
 			<description>
-			Return the list of values in the [Dictionary].
+				Return the list of values in the [Dictionary].
 			</description>
 		</method>
 	</methods>
@@ -10520,37 +10633,37 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="DirectionalLight" inherits="Light" category="Core">
 	<brief_description>
-	Directional Light, such as the Sun or the Moon.
+		Directional Light, such as the Sun or the Moon.
 	</brief_description>
 	<description>
-	A DirectionalLight is a type of [Light] node that emits light constantly in one direction (the negative z axis of the node). It is used lights with strong intensity that are located far away from the scene to model sunlight or moonlight. The worldspace location of the DirectionalLight transform (origin) is ignored, only the basis is used do determine light direction.
+		A DirectionalLight is a type of [Light] node that emits light constantly in one direction (the negative z axis of the node). It is used lights with strong intensity that are located far away from the scene to model sunlight or moonlight. The worldspace location of the DirectionalLight transform (origin) is ignored, only the basis is used do determine light direction.
 	</description>
 	<methods>
-		<method name="set_shadow_mode">
-			<argument index="0" name="mode" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_shadow_mode" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_shadow_param">
+		<method name="get_shadow_param" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="param" type="int">
 			</argument>
-			<argument index="1" name="value" type="float">
+			<description>
+			</description>
+		</method>
+		<method name="set_shadow_mode">
+			<argument index="0" name="mode" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_shadow_param" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_shadow_param">
 			<argument index="0" name="param" type="int">
 			</argument>
+			<argument index="1" name="value" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -10574,70 +10687,80 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="Directory" inherits="Reference" category="Core">
 	<brief_description>
-	Type used to handle the filesystem.
+		Type used to handle the filesystem.
 	</brief_description>
 	<description>
-	Directory type. It is used to manage directories and their content (not restricted to the project folder).
-	Here is an example on how to iterate through the files of a directory:
-	[codeblock]
-	func dir_contents(path):
-	    var dir = Directory.new()
-	    if dir.open(path) == OK:
-	        dir.list_dir_begin()
-	        var file_name = dir.get_next()
-	        while (file_name != ""):
-	            if dir.current_is_dir():
-	                print("Found directory: " + file_name)
-	            else:
-	                print("Found file: " + file_name)
-	            file_name = dir.get_next()
-	    else:
-	        print("An error occurred when trying to access the path.")
-	[/codeblock]
+		Directory type. It is used to manage directories and their content (not restricted to the project folder).
+		Here is an example on how to iterate through the files of a directory:
+		[codeblock]
+		func dir_contents(path):
+		    var dir = Directory.new()
+		    if dir.open(path) == OK:
+		        dir.list_dir_begin()
+		        var file_name = dir.get_next()
+		        while (file_name != ""):
+		            if dir.current_is_dir():
+		                print("Found directory: " + file_name)
+		            else:
+		                print("Found file: " + file_name)
+		            file_name = dir.get_next()
+		    else:
+		        print("An error occurred when trying to access the path.")
+		[/codeblock]
 	</description>
 	<methods>
-		<method name="open">
+		<method name="change_dir">
 			<return type="Error">
 			</return>
-			<argument index="0" name="path" type="String">
+			<argument index="0" name="todir" type="String">
 			</argument>
 			<description>
-			Open an existing directory of the filesystem. The [i]path[/i] argument can be within the project tree ([code]res://folder[/code]), the user directory ([code]user://folder[/code]) or an absolute path of the user filesystem (e.g. [code]/tmp/folder[/code] or [code]C:\tmp\folder[/code]).
-			The method returns one of the error code constants defined in [@Global Scope] (OK or ERR_*).
+				Change the currently opened directory to the one passed as an argument. The argument can be relative to the current directory (e.g. [code]newdir[/code] or [code]../newdir[/code]), or an absolute path (e.g. [code]/tmp/newdir[/code] or [code]res://somedir/newdir[/code]).
+				The method returns one of the error code constants defined in [@Global Scope] (OK or ERR_*).
 			</description>
 		</method>
-		<method name="list_dir_begin">
-			<return type="bool">
+		<method name="copy">
+			<return type="Error">
 			</return>
+			<argument index="0" name="from" type="String">
+			</argument>
+			<argument index="1" name="to" type="String">
+			</argument>
 			<description>
-			Initialise the stream used to list all files and directories using the [method get_next] function, closing the current opened stream if needed. Once the stream has been processed, it should typically be closed with [method list_dir_end].
-			Return false if the stream could not be initialised.
+				Copy the [i]from[/i] file to the [i]to[/i] destination. Both arguments should be paths to files, either relative or absolute. If the destination file exists and is not access-protected, it will be overwritten.
+				Returns one of the error code constants defined in [@Global Scope] (OK, FAILED or ERR_*).
 			</description>
 		</method>
-		<method name="get_next">
-			<return type="String">
+		<method name="current_is_dir" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the next element (file or directory) in the current directory (including [code].[/code] and [code]..[/code]). The name of the file or directory is returned (and not its full path). Once the stream has been fully processed, the method returns an empty String and closes the stream automatically (i.e. [method list_dir_end] would not be mandatory in such a case).
+				Return whether the current item processed with the last [method get_next] call is a directory ([code].[/code] and [code]..[/code] are considered directories).
 			</description>
 		</method>
-		<method name="current_is_dir" qualifiers="const">
+		<method name="dir_exists">
 			<return type="bool">
 			</return>
+			<argument index="0" name="path" type="String">
+			</argument>
 			<description>
-			Return whether the current item processed with the last [method get_next] call is a directory ([code].[/code] and [code]..[/code] are considered directories).
+				Return whether the target directory exists. The argument can be relative to the current directory, or an absolute path.
 			</description>
 		</method>
-		<method name="list_dir_end">
+		<method name="file_exists">
+			<return type="bool">
+			</return>
+			<argument index="0" name="path" type="String">
+			</argument>
 			<description>
-			Close the current stream opened with [method list_dir_begin] (whether it has been fully processed with [method get_next] or not does not matter).
+				Return whether the target file exists. The argument can be relative to the current directory, or an absolute path.
 			</description>
 		</method>
-		<method name="get_drive_count">
-			<return type="int">
+		<method name="get_current_dir">
+			<return type="String">
 			</return>
 			<description>
-			On Windows, return the number of drives (partitions) mounted on the current filesystem. On other platforms, the method returns 0.
+				Return the absolute path to the currently opened directory (e.g. [code]res://folder[/code] or [code]C:\tmp\folder[/code]).
 			</description>
 		</method>
 		<method name="get_drive">
@@ -10646,81 +10769,81 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			On Windows, return the name of the drive (partition) passed as an argument (e.g. [code]C:[/code]). On other platforms, or if the requested drive does not existed, the method returns an empty String.
+				On Windows, return the name of the drive (partition) passed as an argument (e.g. [code]C:[/code]). On other platforms, or if the requested drive does not existed, the method returns an empty String.
 			</description>
 		</method>
-		<method name="change_dir">
-			<return type="Error">
+		<method name="get_drive_count">
+			<return type="int">
 			</return>
-			<argument index="0" name="todir" type="String">
-			</argument>
 			<description>
-			Change the currently opened directory to the one passed as an argument. The argument can be relative to the current directory (e.g. [code]newdir[/code] or [code]../newdir[/code]), or an absolute path (e.g. [code]/tmp/newdir[/code] or [code]res://somedir/newdir[/code]).
-			The method returns one of the error code constants defined in [@Global Scope] (OK or ERR_*).
+				On Windows, return the number of drives (partitions) mounted on the current filesystem. On other platforms, the method returns 0.
 			</description>
 		</method>
-		<method name="get_current_dir">
+		<method name="get_next">
 			<return type="String">
 			</return>
 			<description>
-			Return the absolute path to the currently opened directory (e.g. [code]res://folder[/code] or [code]C:\tmp\folder[/code]).
+				Return the next element (file or directory) in the current directory (including [code].[/code] and [code]..[/code]). The name of the file or directory is returned (and not its full path). Once the stream has been fully processed, the method returns an empty String and closes the stream automatically (i.e. [method list_dir_end] would not be mandatory in such a case).
 			</description>
 		</method>
-		<method name="make_dir">
-			<return type="Error">
+		<method name="get_space_left">
+			<return type="int">
 			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
 			<description>
-			Create a directory. The argument can be relative to the current directory, or an absolute path. The target directory should be placed in an already existing directory (to create the full path recursively, see [method make_dir_recursive]).
-			The method returns one of the error code constants defined in [@Global Scope] (OK, FAILED or ERR_*).
+				On Unix desktop systems, return the available space on the current directory's disk. On other platforms, this information is not available and the method returns 0 or -1.
 			</description>
 		</method>
-		<method name="make_dir_recursive">
-			<return type="Error">
+		<method name="list_dir_begin">
+			<return type="bool">
 			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
 			<description>
-			Create a target directory and all necessary intermediate directories in its path, by calling [method make_dir] recursively. The argument can be relative to the current directory, or an absolute path.
-			Returns one of the error code constants defined in [@Global Scope] (OK, FAILED or ERR_*).
+				Initialise the stream used to list all files and directories using the [method get_next] function, closing the current opened stream if needed. Once the stream has been processed, it should typically be closed with [method list_dir_end].
+				Return false if the stream could not be initialised.
 			</description>
 		</method>
-		<method name="file_exists">
-			<return type="bool">
+		<method name="list_dir_end">
+			<description>
+				Close the current stream opened with [method list_dir_begin] (whether it has been fully processed with [method get_next] or not does not matter).
+			</description>
+		</method>
+		<method name="make_dir">
+			<return type="Error">
 			</return>
 			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
-			Return whether the target file exists. The argument can be relative to the current directory, or an absolute path.
+				Create a directory. The argument can be relative to the current directory, or an absolute path. The target directory should be placed in an already existing directory (to create the full path recursively, see [method make_dir_recursive]).
+				The method returns one of the error code constants defined in [@Global Scope] (OK, FAILED or ERR_*).
 			</description>
 		</method>
-		<method name="dir_exists">
-			<return type="bool">
+		<method name="make_dir_recursive">
+			<return type="Error">
 			</return>
 			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
-			Return whether the target directory exists. The argument can be relative to the current directory, or an absolute path.
+				Create a target directory and all necessary intermediate directories in its path, by calling [method make_dir] recursively. The argument can be relative to the current directory, or an absolute path.
+				Return one of the error code constants defined in [@Global Scope] (OK, FAILED or ERR_*).
 			</description>
 		</method>
-		<method name="get_space_left">
-			<return type="int">
+		<method name="open">
+			<return type="Error">
 			</return>
+			<argument index="0" name="path" type="String">
+			</argument>
 			<description>
-			On Unix desktop systems, return the available space on the current directory's disk. On other platforms, this information is not available and the method returns 0 or -1.
+				Open an existing directory of the filesystem. The [i]path[/i] argument can be within the project tree ([code]res://folder[/code]), the user directory ([code]user://folder[/code]) or an absolute path of the user filesystem (e.g. [code]/tmp/folder[/code] or [code]C:\tmp\folder[/code]).
+				The method returns one of the error code constants defined in [@Global Scope] (OK or ERR_*).
 			</description>
 		</method>
-		<method name="copy">
+		<method name="remove">
 			<return type="Error">
 			</return>
-			<argument index="0" name="from" type="String">
-			</argument>
-			<argument index="1" name="to" type="String">
+			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
-			Copy the [i]from[/i] file to the [i]to[/i] destination. Both arguments should be paths to files, either relative or absolute. If the destination file exists and is not access-protected, it will be overwritten.
-			Returns one of the error code constants defined in [@Global Scope] (OK, FAILED or ERR_*).
+				Delete the target file or an empty directory. The argument can be relative to the current directory, or an absolute path. If the target directory is not empty, the operation will fail.
+				Return one of the error code constants defined in [@Global Scope] (OK or FAILED).
 			</description>
 		</method>
 		<method name="rename">
@@ -10731,18 +10854,8 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="1" name="to" type="String">
 			</argument>
 			<description>
-			Rename (move) the [i]from[/i] file to the [i]to[/i] destination. Both arguments should be paths to files, either relative or absolute. If the destination file exists and is not access-protected, it will be overwritten.
-			Returns one of the error code constants defined in [@Global Scope] (OK or FAILED).
-			</description>
-		</method>
-		<method name="remove">
-			<return type="Error">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
-			<description>
-			Delete the target file or an empty directory. The argument can be relative to the current directory, or an absolute path. If the target directory is not empty, the operation will fail.
-			Returns one of the error code constants defined in [@Global Scope] (OK or FAILED).
+				Rename (move) the [i]from[/i] file to the [i]to[/i] destination. Both arguments should be paths to files, either relative or absolute. If the destination file exists and is not access-protected, it will be overwritten.
+				Return one of the error code constants defined in [@Global Scope] (OK or FAILED).
 			</description>
 		</method>
 	</methods>
@@ -10755,21 +10868,29 @@ This approximation makes straight segments between each point, then subdivides t
 	<description>
 	</description>
 	<methods>
-		<method name="set_font_data">
+		<method name="add_fallback">
 			<argument index="0" name="data" type="DynamicFontData">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_font_data" qualifiers="const">
+		<method name="get_fallback" qualifiers="const">
 			<return type="DynamicFontData">
 			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_size">
-			<argument index="0" name="data" type="int">
-			</argument>
+		<method name="get_fallback_count" qualifiers="const">
+			<return type="int">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="get_font_data" qualifiers="const">
+			<return type="DynamicFontData">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -10779,8 +10900,8 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="add_fallback">
-			<argument index="0" name="data" type="DynamicFontData">
+		<method name="remove_fallback">
+			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
@@ -10793,26 +10914,18 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="get_fallback" qualifiers="const">
-			<return type="DynamicFontData">
-			</return>
-			<argument index="0" name="idx" type="int">
+		<method name="set_font_data">
+			<argument index="0" name="data" type="DynamicFontData">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="remove_fallback">
-			<argument index="0" name="idx" type="int">
+		<method name="set_size">
+			<argument index="0" name="data" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_fallback_count" qualifiers="const">
-			<return type="int">
-			</return>
-			<description>
-			</description>
-		</method>
 	</methods>
 	<constants>
 	</constants>
@@ -10823,17 +10936,28 @@ This approximation makes straight segments between each point, then subdivides t
 	<description>
 	</description>
 	<methods>
+		<method name="get_font_path" qualifiers="const">
+			<return type="String">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="set_font_path">
+			<argument index="0" name="path" type="String">
+			</argument>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<constants>
 	</constants>
 </class>
 <class name="EditorExportPlugin" inherits="Reference" category="Core">
 	<brief_description>
-	Editor plugin to control the export process.
+		Editor plugin to control the export process.
 	</brief_description>
 	<description>
-	This plugin is added into EditorImportExport and allows to modify
-	the behavior of the export process for individual files.
+		This plugin is added into EditorImportExport and allows to modify the behavior of the export process for individual files.
 	</description>
 	<methods>
 		<method name="custom_export" qualifiers="virtual">
@@ -10844,24 +10968,10 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="1" name="platform" type="EditorExportPlatform">
 			</argument>
 			<description>
-			This function is called for each file exported and
-			depending from the return value one of many things
-			might happen.
-
-			1) If returned value is null, the file is exported
-			as is.
-
-			2) If the returned value is a RawAray (array of
-			bytes), the content of that array becomes the new
-			file being exported.
-
-			3) If the file must also change it's name when
-			exported, then a [Dictionary] must be returned with
-			two fields: 'name' with the new filename and 'data'
-			with a [RawArray] containing the raw contents of the
-			file. Even if the name is changed, the run-time will
-			redirect the old file to the new file automatically
-			when accessed.
+				This function is called for each file exported and depending from the return value one of many things might happen.
+				1) If returned value is null, the file is exported as is.
+				2) If the returned value is a RawAray (array of bytes), the content of that array becomes the new file being exported.
+				3) If the file must also change it's name when exported, then a [Dictionary] must be returned with two fields: 'name' with the new filename and 'data' with a [RawArray] containing the raw contents of the file. Even if the name is changed, the run-time will redirect the old file to the new file automatically when accessed.
 			</description>
 		</method>
 	</methods>
@@ -10874,13 +10984,19 @@ This approximation makes straight segments between each point, then subdivides t
 	<description>
 	</description>
 	<methods>
+		<method name="add_filter">
+			<argument index="0" name="filter" type="String">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="clear_filters">
 			<description>
 			</description>
 		</method>
-		<method name="add_filter">
-			<argument index="0" name="filter" type="String">
-			</argument>
+		<method name="get_access" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -10902,38 +11018,36 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="set_current_dir">
-			<argument index="0" name="dir" type="String">
-			</argument>
+		<method name="get_display_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_current_file">
-			<argument index="0" name="file" type="String">
-			</argument>
+		<method name="get_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_current_path">
-			<argument index="0" name="path" type="String">
-			</argument>
+		<method name="get_vbox">
+			<return type="VBoxContainer">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_mode">
-			<argument index="0" name="mode" type="int">
-			</argument>
+		<method name="invalidate">
 			<description>
 			</description>
 		</method>
-		<method name="get_mode" qualifiers="const">
-			<return type="int">
+		<method name="is_overwrite_warning_disabled" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_vbox">
-			<return type="VBoxContainer">
+		<method name="is_showing_hidden_files" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
@@ -10944,21 +11058,27 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="get_access" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_current_dir">
+			<argument index="0" name="dir" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_show_hidden_files">
-			<argument index="0" name="show" type="bool">
+		<method name="set_current_file">
+			<argument index="0" name="file" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_showing_hidden_files" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_current_path">
+			<argument index="0" name="path" type="String">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_disable_overwrite_warning">
+			<argument index="0" name="disable" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -10968,24 +11088,20 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="get_display_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_mode">
+			<argument index="0" name="mode" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="invalidate">
+		<method name="set_show_hidden_files">
+			<argument index="0" name="show" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
 	</methods>
 	<signals>
-		<signal name="files_selected">
-			<argument index="0" name="paths" type="StringArray">
-			</argument>
-			<description>
-			</description>
-		</signal>
 		<signal name="dir_selected">
 			<argument index="0" name="dir" type="String">
 			</argument>
@@ -10998,6 +11114,12 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</signal>
+		<signal name="files_selected">
+			<argument index="0" name="paths" type="StringArray">
+			</argument>
+			<description>
+			</description>
+		</signal>
 	</signals>
 	<constants>
 		<constant name="MODE_OPEN_FILE" value="0">
@@ -11020,14 +11142,10 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="EditorImportPlugin" inherits="Reference" category="Core">
 	<brief_description>
-	Import plugin for editor
+		Import plugin for editor
 	</brief_description>
 	<description>
-	Import plugins make it easy to handle importing of external assets
-	into a project.
-
-	They way they work is not that obvious though, so please make sure
-	to read the documentation, tutorials and examples.
+		Import plugins make it easy to handle importing of external assets into a project. They way they work is not that obvious though, so please make sure to read the documentation, tutorials and examples.
 	</description>
 	<methods>
 		<method name="can_reimport_multiple_files" qualifiers="virtual">
@@ -11044,32 +11162,30 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="1" name="platform" type="EditorExportPlatform">
 			</argument>
 			<description>
-			Generally, files that are imported stay the same
-			when exported. The only exception is in some cases
-			when the file must be re-imported for different
-			platforms (ie. texture compression).
-
-			If you want to customize the export process, it's
-			recommended to use [EditorExportPlugin.custom_export]
-			instead.
+				Generally, files that are imported stay the same when exported. The only exception is in some cases when the file must be re-imported for different platforms (ie. texture compression).
+				If you want to customize the export process, it's recommended to use [method EditorExportPlugin.custom_export] instead.
+			</description>
+		</method>
+		<method name="expand_source_path">
+			<return type="String">
+			</return>
+			<argument index="0" name="path" type="String">
+			</argument>
+			<description>
 			</description>
 		</method>
 		<method name="get_name" qualifiers="virtual">
 			<return type="String">
 			</return>
 			<description>
-			Get the name of the import plugin, which will be
-			used to identify content imported by this plugin.
-
-			Try to use lowecase and underscores if possible.
+				Get the name of the import plugin, which will be used to identify content imported by this plugin. Try to use lowercase and underscores if possible.
 			</description>
 		</method>
 		<method name="get_visible_name" qualifiers="virtual">
 			<return type="String">
 			</return>
 			<description>
-			Visible name for this plugin, which will be shown on
-			the import menu.
+				Visible name for this plugin, which will be shown on the import menu.
 			</description>
 		</method>
 		<method name="import" qualifiers="virtual">
@@ -11080,51 +11196,21 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="1" name="from" type="ResourceImportMetadata">
 			</argument>
 			<description>
-			Perform an import of an external resources into the
-			project. This function is both called on import
-			(from the dialog) or re-import
-			(manual or automatic when external source files
-			changed).
-
-			An import process generally works like this:
-
-			1) Check the metadata for source files and options.
-			Metadata is either generated in the import dialog or
-			taken from an existing resource upon reimport.
-
-			2) Perform the import process into a new resource.
-			Some times the resource being re-imported may be already loaded
-			and in use, so checking for this by using
-			[ResourceLoader.has] is recommended. Otherwise
-			create a new resource.
-
-			3) Set the metadata from the argument into the existing or new
-			resource being created using
-			[Resource.set_import_metadata].
-
-			4) Save the resource into 'path' (function argument)
+				Perform an import of an external resources into the project. This function is both called on import (from the dialog) or re-import (manual or automatic when external source files changed).
+				An import process generally works like this:
+				1) Check the metadata for source files and options. Metadata is either generated in the import dialog or taken from an existing resource upon reimport.
+				2) Perform the import process into a new resource. Some times the resource being re-imported may be already loaded and in use, so checking for this by using [method ResourceLoader.has] is recommended. Otherwise create a new resource.
+				3) Set the metadata from the argument into the existing or new resource being created using [method Resource.set_import_metadata].
+				4) Save the resource into 'path' (function argument)
 			</description>
 		</method>
 		<method name="import_dialog" qualifiers="virtual">
 			<argument index="0" name="from" type="String">
 			</argument>
 			<description>
-			This function is called when either the user chooses
-			to import a resource of this type (Import menu), or
-			when the user chooses to re-import the resource
-			(from filesystem). In the later case, the path for
-			the existing file is supplied in the argument.
-
-			If the path is supplied, it is recommended to read
-			the import metadata with
-			[ResourceLoader.load_import_metadata] and fill in
-			the fields with the values contained there.
-
-			The dialog can be shown in any way (just use a
-			ConfirmationDialog and pop it up). Upon
-			confirmation, fill up a ResourceImportMetadata and
-			call the [EditorImportPlugin.import] function with
-			this information.
+				This function is called when either the user chooses to import a resource of this type (Import menu), or when the user chooses to re-import the resource (from filesystem). In the later case, the path for the existing file is supplied in the argument.
+				If the path is supplied, it is recommended to read the import metadata with [method ResourceLoader.load_import_metadata] and fill in the fields with the values contained there.
+				The dialog can be shown in any way (just use a ConfirmationDialog and pop it up). Upon confirmation, fill up a ResourceImportMetadata and call the [method EditorImportPlugin.import] function with this information.
 			</description>
 		</method>
 		<method name="import_from_drop" qualifiers="virtual">
@@ -11149,46 +11235,89 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="expand_source_path">
-			<return type="String">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
-			<description>
-			</description>
-		</method>
 	</methods>
 	<constants>
 	</constants>
 </class>
 <class name="EditorPlugin" inherits="Node" category="Core">
 	<brief_description>
-	Used by the editor to extend it's functionality.
+		Used by the editor to extend it's functionality.
 	</brief_description>
 	<description>
-	Plugins are used by the editor to extend functionality. The most
-	common types of plugins are those which edit a given node or
-	resource type, import plugins and export plugins.
+		Plugins are used by the editor to extend functionality. The most common types of plugins are those which edit a given node or resource type, import plugins and export plugins.
 	</description>
 	<methods>
+		<method name="add_control_to_bottom_panel">
+			<argument index="0" name="control" type="Control">
+			</argument>
+			<argument index="1" name="title" type="String">
+			</argument>
+			<description>
+				Add a control to the bottom panel (together with Output, Debug, Animation, etc). If your plugin is being removed, also make sure to remove your control by calling [method remove_control_from_bottom_panel].
+			</description>
+		</method>
+		<method name="add_control_to_container">
+			<argument index="0" name="container" type="int">
+			</argument>
+			<argument index="1" name="control" type="Control">
+			</argument>
+			<description>
+				Add a custom control to a container (see CONTAINER_* enum). There are many locations where custom controls can be added in the editor UI.
+				Please remember that you have to manage the visibility of your custom controls yourself (and likely hide it after adding it).
+				If your plugin is being removed, also make sure to remove your custom controls too.
+			</description>
+		</method>
+		<method name="add_control_to_dock">
+			<argument index="0" name="slot" type="int">
+			</argument>
+			<argument index="1" name="control" type="Control">
+			</argument>
+			<description>
+				Add the control to a specific dock slot (see DOCK_* enum for options).
+				If the dock is repositioned and as long as the plugin is active, the editor will save the dock position on further sessions.
+				If your plugin is being removed, also make sure to remove your control by calling [method remove_control_from_docks].
+			</description>
+		</method>
+		<method name="add_custom_type">
+			<argument index="0" name="type" type="String">
+			</argument>
+			<argument index="1" name="base" type="String">
+			</argument>
+			<argument index="2" name="script" type="Script">
+			</argument>
+			<argument index="3" name="icon" type="Texture">
+			</argument>
+			<description>
+				Add a custom type, which will appear in the list of nodes or resources. An icon can be optionally passed.
+				When given node or resource is selected, the base type will be instanced (ie, "Spatial", "Control", "Resource"), then the script will be loaded and set to this object.
+				You can use the [method EditorPlugin.handles] to check if your custom object is being edited by checking the script or using 'extends' keyword.
+				During run-time, this will be a simple object with a script so this function does not need to be called then.
+			</description>
+		</method>
+		<method name="add_export_plugin">
+			<argument index="0" name="plugin" type="EditorExportPlugin">
+			</argument>
+			<description>
+				Add an export plugin. Plugins of this kind can change files being exported. On exit don't forget to call [method remove_export_plugin].
+			</description>
+		</method>
+		<method name="add_import_plugin">
+			<argument index="0" name="plugin" type="EditorImportPlugin">
+			</argument>
+			<description>
+				Add an import plugin. These plugins manage importing external content (from outside the project) into formats the engine can understand.
+				On exit, don't forget to remove the plugin by calling [method remove_import_plugin]
+			</description>
+		</method>
 		<method name="apply_changes" qualifiers="virtual">
 			<description>
-			This method is called when the editor is about to
-			save the project, switch to another tab, etc. It
-			asks the plugin to apply any pending state changes
-			to ensure consistency.
-
-			This is used, for example, in shader editors to let
-			the plugin know that it must apply the shader code
-			being written by the user to the object.
+				This method is called when the editor is about to save the project, switch to another tab, etc. It asks the plugin to apply any pending state changes to ensure consistency.
+				This is used, for example, in shader editors to let the plugin know that it must apply the shader code being written by the user to the object.
 			</description>
 		</method>
 		<method name="clear" qualifiers="virtual">
 			<description>
-			Clear all the state and reset the object being
-			edited to zero. This ensures your plugin does not
-			keep editing a currently existing node, or a node
-			fromt the wrong scene.
+				Clear all the state and reset the object being edited to zero. This ensures your plugin does not keep editing a currently existing node, or a node from the wrong scene.
 			</description>
 		</method>
 		<method name="create_spatial_gizmo" qualifiers="virtual">
@@ -11197,18 +11326,14 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="0" name="for_spatial" type="Spatial">
 			</argument>
 			<description>
-			This is used for plugins that create gizmos used by
-			the spatial editor. Just check that the node passed
-			in the "for_spatial" argument matches your plugin.
+				This is used for plugins that create gizmos used by the spatial editor. Just check that the node passed in the "for_spatial" argument matches your plugin.
 			</description>
 		</method>
 		<method name="edit" qualifiers="virtual">
 			<argument index="0" name="object" type="Object">
 			</argument>
 			<description>
-			This function is used for plugins that edit specific
-			object types (nodes or resources). It requests the
-			editor to edit the given object.
+				This function is used for plugins that edit specific object types (nodes or resources). It requests the editor to edit the given object.
 			</description>
 		</method>
 		<method name="forward_input_event" qualifiers="virtual">
@@ -11217,13 +11342,8 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="0" name="event" type="InputEvent">
 			</argument>
 			<description>
-			This is a low level function for plugins that edit a given
-			object type derived from CanvasItem to capture the input in the 2D editor
-			viewport. The function is only being called if your
-			object is being edited.
-
-			Return true if you want to capture the input,
-			otherwise false.
+				This is a low level function for plugins that edit a given object type derived from CanvasItem to capture the input in the 2D editor viewport. The function is only being called if your object is being edited.
+				Return true if you want to capture the input, otherwise false.
 			</description>
 		</method>
 		<method name="forward_spatial_input_event" qualifiers="virtual">
@@ -11234,45 +11354,58 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="1" name="event" type="InputEvent">
 			</argument>
 			<description>
-			This is a low level function for plugins that edit a
-			given objet type derived from Spatial to capture the
-			input of the viewport. The function is only being
-			called if your object is being edited.
-
-			By using the [InputEvent] and the [Camera] arguments
-			it's pretty easy to do raycasts into space using
-			Camera functions.
-
-			Return true if you want to capture the input,
-			otherwise false.
+				This is a low level function for plugins that edit a given objet type derived from Spatial to capture the input of the viewport. The function is only being called if your object is being edited.
+				By using the [InputEvent] and the [Camera] arguments it's pretty easy to do raycasts into space using Camera functions.
+				Return true if you want to capture the input, otherwise false.
+			</description>
+		</method>
+		<method name="get_base_control">
+			<return type="Control">
+			</return>
+			<description>
+				Get a base control where it's safe to place dialogs. Many plugins open dialogs and they need a control as a base to make sure they use the editor icons and theme.
 			</description>
 		</method>
 		<method name="get_breakpoints" qualifiers="virtual">
 			<return type="StringArray">
 			</return>
 			<description>
-			This is for editors that edit script based objects.
-			You can return a list of breakpoints in the format
-			(script:line), for example: res://path_to_script.gd:25
+				This is for editors that edit script based objects. You can return a list of breakpoints in the format (script:line), for example: res://path_to_script.gd:25
+			</description>
+		</method>
+		<method name="get_editor_settings">
+			<return type="EditorSettings">
+			</return>
+			<description>
+				Get the general settings for the editor (the same window that appears in the Settings menu).
 			</description>
 		</method>
 		<method name="get_name" qualifiers="virtual">
 			<return type="String">
 			</return>
 			<description>
-			Get the name of the editor plugin. For main scren
-			plugins this is what will appear in the selector
-			(which by default is 2D, 3D, Script).
+				Get the name of the editor plugin. For main scren plugins this is what will appear in the selector (which by default is 2D, 3D, Script).
+			</description>
+		</method>
+		<method name="get_selection">
+			<return type="EditorSelection">
+			</return>
+			<description>
+				Get the object that handles the selection of nodes in the Scene Tree editor.
 			</description>
 		</method>
 		<method name="get_state" qualifiers="virtual">
 			<return type="Dictionary">
 			</return>
 			<description>
-			Get the state of your plugin editor. This is used
-			when saving the scene (so state is kept when opening
-			it again) and for switching tabs (so state can be
-			restored when the tab returns).
+				Get the state of your plugin editor. This is used when saving the scene (so state is kept when opening it again) and for switching tabs (so state can be restored when the tab returns).
+			</description>
+		</method>
+		<method name="get_undo_redo">
+			<return type="UndoRedo">
+			</return>
+			<description>
+				Get the undo/redo object. Most actions in the editor can be undoable, so use this object to make sure this happens when it's worth it.
 			</description>
 		</method>
 		<method name="handles" qualifiers="virtual">
@@ -11281,215 +11414,64 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="0" name="object" type="Object">
 			</argument>
 			<description>
-			Implement this function if your plugin edits a
-			specific type of object (Resource or Node). If you
-			return true, then you will get the functions
-			[EditorPlugin.edit] and [EditorPlugin.make_visible]
-			called when the editor requests them.
+				Implement this function if your plugin edits a specific type of object (Resource or Node). If you return true, then you will get the functions [method EditorPlugin.edit] and [method EditorPlugin.make_visible] called when the editor requests them.
 			</description>
 		</method>
 		<method name="has_main_screen" qualifiers="virtual">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if this is a main screen editor plugin
-			(it goes in the main screen selector together with
-			2D, 3D, Script).
+				Return true if this is a main screen editor plugin (it goes in the main screen selector together with 2D, 3D, Script).
 			</description>
 		</method>
 		<method name="make_visible" qualifiers="virtual">
 			<argument index="0" name="visible" type="bool">
 			</argument>
 			<description>
-			This function will be called when the editor is
-			requested to become visible. It is used for plugins
-			that edit a specific object type.
-
-			Remember that you have to manage the visibility of
-			all your editor controls manually.
-			</description>
-		</method>
-		<method name="set_state" qualifiers="virtual">
-			<argument index="0" name="state" type="Dictionary">
-			</argument>
-			<description>
-			Restore the state saved by [EditorPlugin.get_state].
-			</description>
-		</method>
-		<method name="add_control_to_container">
-			<argument index="0" name="container" type="int">
-			</argument>
-			<argument index="1" name="control" type="Control">
-			</argument>
-			<description>
-			Add a custom control to a container (see
-			CONTAINER_* enum). There are many locations where
-			custom controls can be added in the editor UI.
-
-			Please remember that you have to manage the
-			visibility of your custom controls yourself (and likely
-			hide it after adding it).
-
-			If your plugin is being removed, also make sure to
-			remove your custom controls too.
+				This function will be called when the editor is requested to become visible. It is used for plugins that edit a specific object type.
+				Remember that you have to manage the visibility of all your editor controls manually.
 			</description>
 		</method>
-		<method name="add_control_to_bottom_panel">
+		<method name="remove_control_from_bottom_panel">
 			<argument index="0" name="control" type="Control">
 			</argument>
-			<argument index="1" name="title" type="String">
-			</argument>
-			<description>
-			Add a control to the bottom panel (together with
-			Output, Debug, Animation, etc).
-
-			If your plugin is being removed, also make sure to
-			remove your control by calling [method
-			remove_control_from_bottom_panel].
-			</description>
-		</method>
-		<method name="add_control_to_dock">
-			<argument index="0" name="slot" type="int">
-			</argument>
-			<argument index="1" name="control" type="Control">
-			</argument>
 			<description>
-			Add the control to a specific dock slot (see DOCK_*
-			enum for options).
-
-			If the dock is repositioned and as long as the
-			plugin is active, the editor will save the dock
-			position on further sessions.
-
-			If your plugin is being removed, also make sure to
-			remove your control by calling [method
-			remove_control_from_docks].
+				Remove the control from the bottom panel. Don't forget to call this if you added one, so the editor can remove it cleanly.
 			</description>
 		</method>
 		<method name="remove_control_from_docks">
 			<argument index="0" name="control" type="Control">
 			</argument>
 			<description>
-			Remove the control from the dock. Don't forget to
-			call this if you added one, so the editor can save
-			the layout and remove it cleanly.
-			</description>
-		</method>
-		<method name="remove_control_from_bottom_panel">
-			<argument index="0" name="control" type="Control">
-			</argument>
-			<description>
-			Remove the control from the bottom panel. Don't forget
-			to call this if you added one, so the editor can
-			remove it cleanly.
-			</description>
-		</method>
-		<method name="add_custom_type">
-			<argument index="0" name="type" type="String">
-			</argument>
-			<argument index="1" name="base" type="String">
-			</argument>
-			<argument index="2" name="script" type="Script">
-			</argument>
-			<argument index="3" name="icon" type="Texture">
-			</argument>
-			<description>
-			Add a custom type, which will appear in the list of
-			nodes or resources. An icon can be optionally
-			passed.
-
-			When given node or resource is selected, the base
-			type will be instanced (ie, "Spatial", "Control",
-			"Resource"), then the script will be loaded and set
-			to this object.
-
-			You can use the [EditorPlugin.handles] to check if
-			your custom object is being edited by checking the
-			script or using 'extends' keyword.
-
-			During run-time, this will be a simple object with a
-			script so this function does not need to be called
-			then.
+				Remove the control from the dock. Don't forget to call this if you added one, so the editor can save the layout and remove it cleanly.
 			</description>
 		</method>
 		<method name="remove_custom_type">
 			<argument index="0" name="type" type="String">
 			</argument>
 			<description>
-			Remove a custom type added by
-			[EditorPlugin.add_custom_type]
+				Remove a custom type added by [method EditorPlugin.add_custom_type]
 			</description>
 		</method>
-		<method name="add_import_plugin">
-			<argument index="0" name="plugin" type="EditorImportPlugin">
+		<method name="remove_export_plugin">
+			<argument index="0" name="plugin" type="EditorExportPlugin">
 			</argument>
 			<description>
-			Add an import plugin. These plugins manage importing
-			external content (from outside the project) into
-			formats the engine can understand.
-
-			On exit, don't forget to remove the plugin by
-			calling [method remove_import_plugin]
+				Remove the export plugin, don't forget to call this on exit.
 			</description>
 		</method>
 		<method name="remove_import_plugin">
 			<argument index="0" name="plugin" type="EditorImportPlugin">
 			</argument>
 			<description>
-			Remove the import plugin, don't forget to call this
-			on exit.
-			</description>
-		</method>
-		<method name="add_export_plugin">
-			<argument index="0" name="plugin" type="EditorExportPlugin">
-			</argument>
-			<description>
-			Add an export plugin. Plugins of this kind can
-			change files being exported. On exit don't forget to
-			call [method remove_export_plugin].
+				Remove the import plugin, don't forget to call this on exit.
 			</description>
 		</method>
-		<method name="remove_export_plugin">
-			<argument index="0" name="plugin" type="EditorExportPlugin">
+		<method name="set_state" qualifiers="virtual">
+			<argument index="0" name="state" type="Dictionary">
 			</argument>
 			<description>
-			Remove the export plugin, don't forget to call this
-			on exit.
-			</description>
-		</method>
-		<method name="get_base_control">
-			<return type="Control">
-			</return>
-			<description>
-			Get a base control where it's safe to place dialogs.
-			Many plugins open dialogs and they need a control as
-			a base to make sure they use the editor icons and
-			theme.
-			</description>
-		</method>
-		<method name="get_undo_redo">
-			<return type="UndoRedo">
-			</return>
-			<description>
-			Get the undo/redo object. Most actions in the editor
-			can be undoable, so use this object to make sure
-			this happens when it's worth it.
-			</description>
-		</method>
-		<method name="get_selection">
-			<return type="EditorSelection">
-			</return>
-			<description>
-			Get the object that handles the selection of nodes
-			in the Scene Tree editor.
-			</description>
-		</method>
-		<method name="get_editor_settings">
-			<return type="EditorSettings">
-			</return>
-			<description>
-			Get the general settings for the editor (the same
-			window that appears in the Settings menu).
+				Restore the state saved by [method EditorPlugin.get_state].
 			</description>
 		</method>
 	</methods>
@@ -11530,23 +11512,18 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="EditorScenePostImport" inherits="Reference" category="Core">
 	<brief_description>
-	Base script for post-processing scenes being imported.
+		Base script for post-processing scenes being imported.
 	</brief_description>
 	<description>
-	These scripts can modify scenes after being imported by the 3D Scene
-	import option of the Import menu.
+		These scripts can modify scenes after being imported by the 3D Scene import option of the Import menu.
 	</description>
 	<methods>
 		<method name="post_import" qualifiers="virtual">
 			<argument index="0" name="scene" type="Object">
 			</argument>
 			<description>
-			This function is called upon import with the
-			imported scene.
-
-			Just do any changes desired to the scene and return
-			it. If null is returned, import will fail and throw
-			an error to the user.
+				This function is called upon import with the imported scene.
+				Just do any changes desired to the scene and return it. If null is returned, import will fail and throw an error to the user.
 			</description>
 		</method>
 	</methods>
@@ -11555,10 +11532,10 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="EditorScript" inherits="Reference" category="Core">
 	<brief_description>
-	Simple script to perform changes in the currently edited scene.
+		Simple script to perform changes in the currently edited scene.
 	</brief_description>
 	<description>
-	This script can be run from the Scene -&gt; Run Script menu option.
+		This script can be run from the Scene -&gt; Run Script menu option.
 	</description>
 	<methods>
 		<method name="_run" qualifiers="virtual">
@@ -11583,43 +11560,43 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="EditorSelection" inherits="Object" category="Core">
 	<brief_description>
-	Manages the SceneTree selection in the editor.
+		Manages the SceneTree selection in the editor.
 	</brief_description>
 	<description>
-	This object manages the SceneTree selection in the editor.
+		This object manages the SceneTree selection in the editor.
 	</description>
 	<methods>
-		<method name="clear">
-			<description>
-			Clear the selection.
-			</description>
-		</method>
 		<method name="add_node">
 			<argument index="0" name="node" type="Node">
 			</argument>
 			<description>
-			Add a node to the selection.
+				Add a node to the selection.
 			</description>
 		</method>
-		<method name="remove_node">
-			<argument index="0" name="node" type="Node">
-			</argument>
+		<method name="clear">
 			<description>
-			Remove a node from the selection.
+				Clear the selection.
 			</description>
 		</method>
 		<method name="get_selected_nodes">
 			<return type="Array">
 			</return>
 			<description>
-			Get the list of selectes nodes.
+				Get the list of selectes nodes.
+			</description>
+		</method>
+		<method name="remove_node">
+			<argument index="0" name="node" type="Node">
+			</argument>
+			<description>
+				Remove a node from the selection.
 			</description>
 		</method>
 	</methods>
 	<signals>
 		<signal name="selection_changed">
 			<description>
-			Emitted when the selection changes.
+				Emitted when the selection changes.
 			</description>
 		</signal>
 	</signals>
@@ -11628,81 +11605,67 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="EditorSettings" inherits="Resource" category="Core">
 	<brief_description>
-	Object that holds the project-independent editor settings.
+		Object that holds the project-independent editor settings.
 	</brief_description>
 	<description>
-	Object that holds the project-independent editor settings. These
-	settings are generally visible in the Editor Settings menu.
-
-	Accessing the settings is done by using the regular [Object] API,
-	such as.
-
-	settings.set(prop,value)
-
-	settings.get(prop)
-
-	list_of_settings = settings.get_property_list()
+		Object that holds the project-independent editor settings. These settings are generally visible in the Editor Settings menu.
+		Accessing the settings is done by using the regular [Object] API, such as:
+		[codeblock]
+		settings.set(prop,value)
+		settings.get(prop)
+		list_of_settings = settings.get_property_list()
+		[/codeblock]
 	</description>
 	<methods>
 		<method name="erase">
 			<argument index="0" name="property" type="String">
 			</argument>
 			<description>
-			Erase a given setting (pass full property path).
+				Erase a given setting (pass full property path).
 			</description>
 		</method>
-		<method name="get_settings_path" qualifiers="const">
-			<return type="String">
+		<method name="get_favorite_dirs" qualifiers="const">
+			<return type="StringArray">
 			</return>
 			<description>
-			Get the global settings path for the engine. Inside
-			this path you can find some standard paths such as:
-
-			settings/tmp - used for temporary storage of files
-
-			settings/templates - where export templates are
-			located
+				Get the list of favorite directories for this project.
 			</description>
 		</method>
 		<method name="get_project_settings_path" qualifiers="const">
 			<return type="String">
 			</return>
 			<description>
-			Get the specific project settings path. Projects all
-			have an unique sub-directory inside the settings
-			path where project specific settings are saved.
+				Get the specific project settings path. Projects all have an unique sub-directory inside the settings path where project specific settings are saved.
 			</description>
 		</method>
-		<method name="set_favorite_dirs">
-			<argument index="0" name="dirs" type="StringArray">
-			</argument>
+		<method name="get_recent_dirs" qualifiers="const">
+			<return type="StringArray">
+			</return>
 			<description>
-			Set the list of favorite directories for this
-			project.
+				Get the list of recently visited folders in the file dialog for this project.
 			</description>
 		</method>
-		<method name="get_favorite_dirs" qualifiers="const">
-			<return type="StringArray">
+		<method name="get_settings_path" qualifiers="const">
+			<return type="String">
 			</return>
 			<description>
-			Get the list of favorite directories for this
-			project.
+				Get the global settings path for the engine. Inside this path you can find some standard paths such as:
+				settings/tmp - used for temporary storage of files
+				settings/templates - where export templates are located
 			</description>
 		</method>
-		<method name="set_recent_dirs">
+		<method name="set_favorite_dirs">
 			<argument index="0" name="dirs" type="StringArray">
 			</argument>
 			<description>
-			Set the list of recently visited folders in the file
-			dialog for this project.
+				Set the list of favorite directories for this project.
 			</description>
 		</method>
-		<method name="get_recent_dirs" qualifiers="const">
-			<return type="StringArray">
-			</return>
+		<method name="set_recent_dirs">
+			<argument index="0" name="dirs" type="StringArray">
+			</argument>
 			<description>
-			Get the list of recently visited folders in the file
-			dialog for this project.
+				Set the list of recently visited folders in the file dialog for this project.
 			</description>
 		</method>
 	</methods>
@@ -11717,74 +11680,35 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="EditorSpatialGizmo" inherits="SpatialGizmo" category="Core">
 	<brief_description>
-	Custom gizmo for editing Spatial objects.
+		Custom gizmo for editing Spatial objects.
 	</brief_description>
 	<description>
-	Custom gizmo that is used for providing custom visualization and
-	editing (handles) for 3D Spatial objects. These are created by
-	[method EditorPlugin.create_spatial_gizmo].
+		Custom gizmo that is used for providing custom visualization and editing (handles) for 3D Spatial objects. These are created by [method EditorPlugin.create_spatial_gizmo].
 	</description>
 	<methods>
-		<method name="commit_handle" qualifiers="virtual">
-			<argument index="0" name="index" type="int">
-			</argument>
-			<argument index="1" name="restore" type="Variant">
-			</argument>
-			<argument index="2" name="cancel" type="bool">
-			</argument>
-			<description>
-			Commit a handle being edited (handles must have been
-			prevously added by [method add_handles]).
-
-			If the cancel parameter is true, an option to
-			restore the edited value to the original is
-			provided.
-			</description>
-		</method>
-		<method name="get_handle_name" qualifiers="virtual">
-			<return type="String">
-			</return>
-			<argument index="0" name="index" type="int">
+		<method name="add_collision_segments">
+			<argument index="0" name="segments" type="Vector3Array">
 			</argument>
 			<description>
-			Get the name of an edited handle (handles must have
-			been previously added by [method add_handles]).
-
-			Handles can be named for reference to the user when editing.
 			</description>
 		</method>
-		<method name="get_handle_value" qualifiers="virtual">
-			<return type="Variant">
-			</return>
-			<argument index="0" name="index" type="int">
+		<method name="add_collision_triangles">
+			<argument index="0" name="triangles" type="TriangleMesh">
 			</argument>
 			<description>
-			Get actual value of a handle. This value can be
-			anything and used for eventually undoing the motion
-			when calling [method commit_handle]
+				Add collision triangles to the gizmo for picking. A [TriangleMesh] can be generated from a regular [Mesh] too. Call this function during [method redraw].
 			</description>
 		</method>
-		<method name="redraw" qualifiers="virtual">
-			<description>
-			This function is called when the Spatial this gizmo
-			refers to changes (the [method Spatial.update_gizmo]
-			is called).
-			</description>
-		</method>
-		<method name="set_handle" qualifiers="virtual">
-			<argument index="0" name="index" type="int">
+		<method name="add_handles">
+			<argument index="0" name="handles" type="Vector3Array">
 			</argument>
-			<argument index="1" name="camera" type="Camera">
+			<argument index="1" name="billboard" type="bool" default="false">
 			</argument>
-			<argument index="2" name="point" type="Vector2">
+			<argument index="2" name="secondary" type="bool" default="false">
 			</argument>
 			<description>
-			This function is used when the user drags a gizmo
-			handle (previously added with [method add_handles])
-			in screen coordinates.
-
-			The [Camera] is also provided
-			so screen coordinates can be converted to raycasts.
+				Add a list of handles (points) which can be used to deform the object being edited.
+				There are virtual functions which will be called upon editing of these handles. Call this function during [method redraw].
 			</description>
 		</method>
 		<method name="add_lines">
@@ -11795,11 +11719,7 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="2" name="billboard" type="bool" default="false">
 			</argument>
 			<description>
-			Add lines to the gizmo (as sets of 2 points), with a
-			given material. The lines are used for visualizing
-			the gizmo.
-
-			Call this function during [method redraw].
+				Add lines to the gizmo (as sets of 2 points), with a given material. The lines are used for visualizing the gizmo. Call this function during [method redraw].
 			</description>
 		</method>
 		<method name="add_mesh">
@@ -11810,65 +11730,71 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="2" name="skeleton" type="RID" default="RID()">
 			</argument>
 			<description>
-			Add a mesh to the gizmo, this is used for
-			visualization.
-
-			Call this function during [method redraw].
+				Add a mesh to the gizmo, this is used for visualization. Call this function during [method redraw].
 			</description>
 		</method>
-		<method name="add_collision_segments">
-			<argument index="0" name="segments" type="Vector3Array">
+		<method name="add_unscaled_billboard">
+			<argument index="0" name="material" type="Material">
+			</argument>
+			<argument index="1" name="default_scale" type="float" default="1">
 			</argument>
 			<description>
+				Add an unscaled billboard for visualization. Call this function during [method redraw].
 			</description>
 		</method>
-		<method name="add_collision_triangles">
-			<argument index="0" name="triangles" type="TriangleMesh">
+		<method name="commit_handle" qualifiers="virtual">
+			<argument index="0" name="index" type="int">
+			</argument>
+			<argument index="1" name="restore" type="Variant">
+			</argument>
+			<argument index="2" name="cancel" type="bool">
 			</argument>
 			<description>
-			Add collision triangles to the gizmo for picking. A
-			[TriangleMesh] can be generated from a regular
-			[Mesh] too.
-
-			Call this function during [method redraw].
+				Commit a handle being edited (handles must have been prevously added by [method add_handles]).
+				If the cancel parameter is true, an option to restore the edited value to the original is provided.
 			</description>
 		</method>
-		<method name="add_unscaled_billboard">
-			<argument index="0" name="material" type="Material">
+		<method name="get_handle_name" qualifiers="virtual">
+			<return type="String">
+			</return>
+			<argument index="0" name="index" type="int">
 			</argument>
-			<argument index="1" name="default_scale" type="float" default="1">
+			<description>
+				Get the name of an edited handle (handles must have been previously added by [method add_handles]).
+				Handles can be named for reference to the user when editing.
+			</description>
+		</method>
+		<method name="get_handle_value" qualifiers="virtual">
+			<return type="Variant">
+			</return>
+			<argument index="0" name="index" type="int">
 			</argument>
 			<description>
-			Add an unscaled billboard for visualization.
-
-			Call this function during [method redraw].
+				Get actual value of a handle. This value can be anything and used for eventually undoing the motion when calling [method commit_handle]
 			</description>
 		</method>
-		<method name="add_handles">
-			<argument index="0" name="handles" type="Vector3Array">
+		<method name="redraw" qualifiers="virtual">
+			<description>
+				This function is called when the Spatial this gizmo refers to changes (the [method Spatial.update_gizmo] is called).
+			</description>
+		</method>
+		<method name="set_handle" qualifiers="virtual">
+			<argument index="0" name="index" type="int">
 			</argument>
-			<argument index="1" name="billboard" type="bool" default="false">
+			<argument index="1" name="camera" type="Camera">
 			</argument>
-			<argument index="2" name="secondary" type="bool" default="false">
+			<argument index="2" name="point" type="Vector2">
 			</argument>
 			<description>
-			Add a list of handles (points) which can be used to
-			deform the object being edited.
-
-			There are virtual functions which will be called
-			upon editing of these handles.
-
-			Call this function during [method redraw].
+				This function is used when the user drags a gizmo handle (previously added with [method add_handles]) in screen coordinates.
+				The [Camera] is also provided so screen coordinates can be converted to raycasts.
 			</description>
 		</method>
 		<method name="set_spatial_node">
 			<argument index="0" name="node" type="Spatial">
 			</argument>
 			<description>
-			Call this function once and upon creation of the
-			gizmo, otherwise no other function will work.
-
-			The argument is the node being edited by the gizmo.
+				Call this function once and upon creation of the gizmo, otherwise no other function will work. The argument is the node being edited by the gizmo.
 			</description>
 		</method>
 	</methods>
@@ -11881,19 +11807,13 @@ This approximation makes straight segments between each point, then subdivides t
 	<description>
 	</description>
 	<methods>
-		<method name="set_background">
-			<argument index="0" name="bgmode" type="int">
+		<method name="fx_get_param" qualifiers="const">
+			<argument index="0" name="param" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_background" qualifiers="const">
-			<return type="int">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="set_background_param">
+		<method name="fx_set_param">
 			<argument index="0" name="param" type="int">
 			</argument>
 			<argument index="1" name="value" type="Variant">
@@ -11901,16 +11821,14 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="get_background_param" qualifiers="const">
-			<argument index="0" name="param" type="int">
-			</argument>
+		<method name="get_background" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_enable_fx">
-			<argument index="0" name="effect" type="int">
-			</argument>
-			<argument index="1" name="enabled" type="bool">
+		<method name="get_background_param" qualifiers="const">
+			<argument index="0" name="param" type="int">
 			</argument>
 			<description>
 			</description>
@@ -11923,7 +11841,13 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="fx_set_param">
+		<method name="set_background">
+			<argument index="0" name="bgmode" type="int">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_background_param">
 			<argument index="0" name="param" type="int">
 			</argument>
 			<argument index="1" name="value" type="Variant">
@@ -11931,8 +11855,10 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="fx_get_param" qualifiers="const">
-			<argument index="0" name="param" type="int">
+		<method name="set_enable_fx">
+			<argument index="0" name="effect" type="int">
+			</argument>
+			<argument index="1" name="enabled" type="bool">
 			</argument>
 			<description>
 			</description>
@@ -12059,204 +11985,204 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="EventPlayer" inherits="Node" category="Core">
 	<brief_description>
-	Class for event stream playback.
+		Class for event stream playback.
 	</brief_description>
 	<description>
-	Class for event stream playback. Event streams are music expressed as a series of events (note on, note off, instrument change...), as opposed to audio streams, which are just audio data. Examples of event-based streams are MIDI files, or MOD music.
-	Currently, only MOD, S3M, IT, and XM music is supported.
+		Class for event stream playback. Event streams are music expressed as a series of events (note on, note off, instrument change...), as opposed to audio streams, which are just audio data. Examples of event-based streams are MIDI files, or MOD music.
+		Currently, only MOD, S3M, IT, and XM music is supported.
 	</description>
 	<methods>
-		<method name="set_stream">
-			<argument index="0" name="stream" type="EventStream">
+		<method name="get_channel_last_note_time" qualifiers="const">
+			<return type="float">
+			</return>
+			<argument index="0" name="channel" type="int">
 			</argument>
 			<description>
-			Set the [EventStream] this player will play.
+				Return the time at which the last note of a given channel in the stream plays.
 			</description>
 		</method>
-		<method name="get_stream" qualifiers="const">
-			<return type="EventStream">
+		<method name="get_channel_volume" qualifiers="const">
+			<return type="float">
 			</return>
+			<argument index="0" name="channel" type="int">
+			</argument>
 			<description>
-			Return the currently assigned stream.
+				Return the volume scale for an individual channel of the stream.
 			</description>
 		</method>
-		<method name="play">
+		<method name="get_length" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Play the currently assigned stream.
+				Return the song length. May be in seconds, but depends on the stream type.
 			</description>
 		</method>
-		<method name="stop">
+		<method name="get_loop_count" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Stop playing.
+				Return the number of times the playback has looped.
 			</description>
 		</method>
-		<method name="is_playing" qualifiers="const">
-			<return type="bool">
+		<method name="get_pitch_scale" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return whether this player is playing.
+				Return the pitch scale factor for this player.
 			</description>
 		</method>
-		<method name="set_paused">
-			<argument index="0" name="paused" type="bool">
-			</argument>
+		<method name="get_pos" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Pause stream playback.
+				Return the playback position. May be in seconds, but depends on the stream type.
 			</description>
 		</method>
-		<method name="is_paused" qualifiers="const">
-			<return type="bool">
+		<method name="get_stream" qualifiers="const">
+			<return type="EventStream">
 			</return>
 			<description>
-			Return whether the playback is currently paused.
+				Return the currently assigned stream.
 			</description>
 		</method>
-		<method name="set_loop">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
+		<method name="get_stream_name" qualifiers="const">
+			<return type="String">
+			</return>
 			<description>
-			Set whether the stream will be restarted at the end.
+				Return the name of the currently assigned stream. This is not the file name, but a field inside the file. If no stream is assigned, if returns "&lt;No Stream&gt;".
 			</description>
 		</method>
-		<method name="has_loop" qualifiers="const">
-			<return type="bool">
+		<method name="get_tempo_scale" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return whether this player will be restart the playback at the end.
+				Return the tempo multiplier.
 			</description>
 		</method>
-		<method name="set_volume">
-			<argument index="0" name="volume" type="float">
-			</argument>
+		<method name="get_volume" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the playback volume for this player. This is a float between 0.0 (silent) and 1.0 (full volume). Values over 1.0 may amplify sound even more, but may introduce distortion. Negative values may just invert the output waveform, which produces no audible difference.
-			The effect of these special values ultimately depends on the low-level implementation of the file format being played.
+				Return the playback volume for this player.
 			</description>
 		</method>
-		<method name="get_volume" qualifiers="const">
+		<method name="get_volume_db" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the playback volume for this player.
+				Return the playback volume for this player, in decibels.
 			</description>
 		</method>
-		<method name="set_pitch_scale">
-			<argument index="0" name="pitch_scale" type="float">
-			</argument>
+		<method name="has_autoplay" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the pitch multiplier for all sounds coming from this stream. A value of 2.0 shifts all pitches one octave up, and a value of 0.5 shifts pitches one octave down.
+				Return whether this player will start playing as soon as it enters the scene tree.
 			</description>
 		</method>
-		<method name="get_pitch_scale" qualifiers="const">
-			<return type="float">
+		<method name="has_loop" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the pitch scale factor for this player.
+				Return whether this player will be restart the playback at the end.
 			</description>
 		</method>
-		<method name="set_tempo_scale">
-			<argument index="0" name="tempo_scale" type="float">
-			</argument>
+		<method name="is_paused" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the tempo multiplier. This allows to slow down or speed up the music, without affecting its pitch.
+				Return whether the playback is currently paused.
 			</description>
 		</method>
-		<method name="get_tempo_scale" qualifiers="const">
-			<return type="float">
+		<method name="is_playing" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the tempo multiplier.
+				Return whether this player is playing.
 			</description>
 		</method>
-		<method name="set_volume_db">
-			<argument index="0" name="db" type="float">
-			</argument>
+		<method name="play">
 			<description>
-			Set the playback volume for this player, in decibels. This is a float between -80.0 (silent) and 0.0 (full volume). Values under -79.0 get truncated to -80, but values over 0.0 do not, so the warnings for over amplifying (see [method set_volume]) still apply.
+				Play the currently assigned stream.
 			</description>
 		</method>
-		<method name="get_volume_db" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="seek_pos">
+			<argument index="0" name="time" type="float">
+			</argument>
 			<description>
-			Return the playback volume for this player, in decibels.
+				Set the playback position. May be in seconds, but depends on the stream type.
 			</description>
 		</method>
-		<method name="get_stream_name" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="set_autoplay">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
-			Return the name of the currently assigned stream. This is not the file name, but a field inside the file. If no stream is assigned, if returns "&lt;No Stream&gt;".
+				Set whether this player will start playing as soon as it enters the scene tree.
 			</description>
 		</method>
-		<method name="get_loop_count" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_channel_volume">
+			<argument index="0" name="channel" type="int">
+			</argument>
+			<argument index="1" name="channel_volume" type="float">
+			</argument>
 			<description>
-			Return the number of times the playback has looped.
+				Set the volume scale for an individual channel of the stream, with the same value range as [method set_volume]. The channel number depends on the stream format. For example, MIDIs range from 0 to 15, and MODs from 0 to 63.
+				Many stream formats are multichannel, so this allows to affect only a part of the music.
 			</description>
 		</method>
-		<method name="get_pos" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_loop">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
-			Return the playback position. May be in seconds, but depends on the stream type.
+				Set whether the stream will be restarted at the end.
 			</description>
 		</method>
-		<method name="seek_pos">
-			<argument index="0" name="time" type="float">
+		<method name="set_paused">
+			<argument index="0" name="paused" type="bool">
 			</argument>
 			<description>
-			Set the playback position. May be in seconds, but depends on the stream type.
+				Pause stream playback.
 			</description>
 		</method>
-		<method name="get_length" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_pitch_scale">
+			<argument index="0" name="pitch_scale" type="float">
+			</argument>
 			<description>
-			Return the song length. May be in seconds, but depends on the stream type.
+				Set the pitch multiplier for all sounds coming from this stream. A value of 2.0 shifts all pitches one octave up, and a value of 0.5 shifts pitches one octave down.
 			</description>
 		</method>
-		<method name="set_autoplay">
-			<argument index="0" name="enabled" type="bool">
+		<method name="set_stream">
+			<argument index="0" name="stream" type="EventStream">
 			</argument>
 			<description>
-			Set whether this player will start playing as soon as it enters the scene tree.
+				Set the [EventStream] this player will play.
 			</description>
 		</method>
-		<method name="has_autoplay" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_tempo_scale">
+			<argument index="0" name="tempo_scale" type="float">
+			</argument>
 			<description>
-			Return whether this player will start playing as soon as it enters the scene tree.
+				Set the tempo multiplier. This allows to slow down or speed up the music, without affecting its pitch.
 			</description>
 		</method>
-		<method name="set_channel_volume">
-			<argument index="0" name="channel" type="int">
-			</argument>
-			<argument index="1" name="channel_volume" type="float">
+		<method name="set_volume">
+			<argument index="0" name="volume" type="float">
 			</argument>
 			<description>
-			Set the volume scale for an individual channel of the stream, with the same value range as [method set_volume]. The channel number depends on the stream format. For example, MIDIs range from 0 to 15, and MODs from 0 to 63.
-			Many stream formats are multichannel, so this allows to affect only a part of the music.
+				Set the playback volume for this player. This is a float between 0.0 (silent) and 1.0 (full volume). Values over 1.0 may amplify sound even more, but may introduce distortion. Negative values may just invert the output waveform, which produces no audible difference.
+				The effect of these special values ultimately depends on the low-level implementation of the file format being played.
 			</description>
 		</method>
-		<method name="get_channel_volume" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="channel" type="int">
+		<method name="set_volume_db">
+			<argument index="0" name="db" type="float">
 			</argument>
 			<description>
-			Return the volume scale for an individual channel of the stream.
+				Set the playback volume for this player, in decibels. This is a float between -80.0 (silent) and 0.0 (full volume). Values under -79.0 get truncated to -80, but values over 0.0 do not, so the warnings for over amplifying (see [method set_volume]) still apply.
 			</description>
 		</method>
-		<method name="get_channel_last_note_time" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="channel" type="int">
-			</argument>
+		<method name="stop">
 			<description>
-			Return the time at which the last note of a given channel in the stream plays.
+				Stop playing.
 			</description>
 		</method>
 	</methods>
@@ -12265,11 +12191,11 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="EventStream" inherits="Resource" category="Core">
 	<brief_description>
-	Base class for all event-based stream drivers.
+		Base class for all event-based stream drivers.
 	</brief_description>
 	<description>
-	Base class for all event-based stream drivers. Event streams are music expressed as a series of events (note on, note off, instrument change...), as opposed to audio streams, which are just audio data. Examples of event-based streams are MIDI files, of MOD music.
-	This class exposes no methods.
+		Base class for all event-based stream drivers. Event streams are music expressed as a series of events (note on, note off, instrument change...), as opposed to audio streams, which are just audio data. Examples of event-based streams are MIDI files, of MOD music.
+		This class exposes no methods.
 	</description>
 	<methods>
 	</methods>
@@ -12278,15 +12204,15 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="EventStreamChibi" inherits="EventStream" category="Core">
 	<brief_description>
-	Driver for MOD playback.
+		Driver for MOD playback.
 	</brief_description>
 	<description>
-	This driver plays MOD music. MOD music, as all event-based streams, is a music format defined by note events occurring at defined moments, instead of a stream of audio samples.
-	Currently, this driver supports the MOD, S3M, IT, and XM formats.
-	This class exposes no methods.
-	This class can return its playback position in seconds, but does not allow to set it, failing with only a console warning.
-	This class can not return its song length, returning 1.0 when queried.
-	This class does not limit its volume settings, allowing for overflow/distortion and wave inversion.
+		This driver plays MOD music. MOD music, as all event-based streams, is a music format defined by note events occurring at defined moments, instead of a stream of audio samples.
+		Currently, this driver supports the MOD, S3M, IT, and XM formats.
+		This class exposes no methods.
+		This class can return its playback position in seconds, but does not allow to set it, failing with only a console warning.
+		This class can not return its song length, returning 1.0 when queried.
+		This class does not limit its volume settings, allowing for overflow/distortion and wave inversion.
 	</description>
 	<methods>
 	</methods>
@@ -12295,192 +12221,171 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="File" inherits="Reference" category="Core">
 	<brief_description>
-	Type to handle file reading and writing operations.
-	</brief_description>
-	<description>
-	File type. This is used to permanently store data into the user device's file system and to read from it. This can be used to store game save data or player configuration files, for example.
-
-	Here's a sample on how to write and read from a file:
-
-	[codeblock]
-	func save(content):
-	    var file = File.new()
-	    file.open("user://save_game.dat", file.WRITE)
-	    file.store_string(content)
-	    file.close()
-
-	func load():
-	    var file = File.new()
-	    file.open("user://save_game.dat", file.READ)
-	    var content = file.get_as_text()
-	    file.close()
-	    return content
-	[/codeblock]
+		Type to handle file reading and writing operations.
+	</brief_description>
+	<description>
+		File type. This is used to permanently store data into the user device's file system and to read from it. This can be used to store game save data or player configuration files, for example.
+		Here's a sample on how to write and read from a file:
+		[codeblock]
+		func save(content):
+		    var file = File.new()
+		    file.open("user://save_game.dat", file.WRITE)
+		    file.store_string(content)
+		    file.close()
+		
+		func load():
+		    var file = File.new()
+		    file.open("user://save_game.dat", file.READ)
+		    var content = file.get_as_text()
+		    file.close()
+		    return content
+		[/codeblock]
 	</description>
 	<methods>
-		<method name="open_encrypted">
-			<return type="int">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
-			<argument index="1" name="mode_flags" type="int">
-			</argument>
-			<argument index="2" name="key" type="RawArray">
-			</argument>
+		<method name="close">
 			<description>
-			Open an encrypted file in write or read mode. You need to pass a binary key to encrypt/decrypt it.
+				Close the currently opened file.
 			</description>
 		</method>
-		<method name="open_encrypted_with_pass">
-			<return type="int">
+		<method name="eof_reached" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
-			<argument index="1" name="mode_flags" type="int">
-			</argument>
-			<argument index="2" name="pass" type="String">
-			</argument>
 			<description>
-			Open an encrypted file in write or read mode. You need to pass a password to encrypt/decrypt it.
+				Return whether the file cursor reached the end of the file.
 			</description>
 		</method>
-		<method name="open">
-			<return type="int">
+		<method name="file_exists" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="path" type="String">
 			</argument>
-			<argument index="1" name="flags" type="int">
-			</argument>
-			<description>
-			Open the file for writing or reading, depending on the flags.
-			</description>
-		</method>
-		<method name="close">
 			<description>
-			Close the currently opened file.
+				Get whether or not the file in the specified path exists.
 			</description>
 		</method>
-		<method name="is_open" qualifiers="const">
-			<return type="bool">
+		<method name="get_16" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return whether the file is currently opened.
+				Get the next 16 bits from the file as an integer.
 			</description>
 		</method>
-		<method name="seek">
-			<argument index="0" name="pos" type="int">
-			</argument>
+		<method name="get_32" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Change the file reading/writing cursor to the specified position (in bytes from the beginning of the file).
+				Get the next 32 bits from the file as an integer.
 			</description>
 		</method>
-		<method name="seek_end">
-			<argument index="0" name="pos" type="int" default="0">
-			</argument>
+		<method name="get_64" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Change the file reading/writing cursor to the specified position (in bytes from the end of the file). Note that this is an offset, so you should use negative numbers or the cursor will be at the end of the file.
+				Get the next 64 bits from the file as an integer.
 			</description>
 		</method>
-		<method name="get_pos" qualifiers="const">
+		<method name="get_8" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the file cursor position.
+				Get the next 8 bits from the file as an integer.
 			</description>
 		</method>
-		<method name="get_len" qualifiers="const">
-			<return type="int">
+		<method name="get_as_text" qualifiers="const">
+			<return type="String">
 			</return>
 			<description>
-			Return the size of the file in bytes.
+				Get the whole file as a [String].
 			</description>
 		</method>
-		<method name="eof_reached" qualifiers="const">
-			<return type="bool">
+		<method name="get_buffer" qualifiers="const">
+			<return type="RawArray">
 			</return>
+			<argument index="0" name="len" type="int">
+			</argument>
 			<description>
-			Return whether the file cursor reached the end of the file.
+				Get next len bytes of the file as a [RawArray].
 			</description>
 		</method>
-		<method name="get_8" qualifiers="const">
-			<return type="int">
+		<method name="get_csv_line" qualifiers="const">
+			<return type="StringArray">
 			</return>
+			<argument index="0" name="delim" type="String" default="&quot;,&quot;">
+			</argument>
 			<description>
-			Get the next 8 bits from the file as an integer.
+				Get the next value of the file in CSV (Comma Separated Values) format. You can pass a different delimiter to use other than the default "," (comma).
 			</description>
 		</method>
-		<method name="get_16" qualifiers="const">
-			<return type="int">
+		<method name="get_double" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Get the next 16 bits from the file as an integer.
+				Get the next 64 bits from the file as a floating point number.
 			</description>
 		</method>
-		<method name="get_32" qualifiers="const">
-			<return type="int">
+		<method name="get_endian_swap">
+			<return type="bool">
 			</return>
 			<description>
-			Get the next 32 bits from the file as an integer.
+				Get whether endian swap is enabled for this file.
 			</description>
 		</method>
-		<method name="get_64" qualifiers="const">
-			<return type="int">
+		<method name="get_error" qualifiers="const">
+			<return type="Error">
 			</return>
 			<description>
-			Get the next 64 bits from the file as an integer.
+				Get the last error that happened when trying to perform operations. Compare with the [code]ERR_FILE_*[/code] constants from [@Global Scope].
 			</description>
 		</method>
 		<method name="get_float" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Get the next 32 bits from the file as a floating point number.
+				Get the next 32 bits from the file as a floating point number.
 			</description>
 		</method>
-		<method name="get_double" qualifiers="const">
-			<return type="float">
+		<method name="get_len" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Get the next 64 bits from the file as a floating point number.
+				Return the size of the file in bytes.
 			</description>
 		</method>
-		<method name="get_real" qualifiers="const">
-			<return type="float">
+		<method name="get_line" qualifiers="const">
+			<return type="String">
 			</return>
 			<description>
-			Get the next bits from the file as a floating point number.
+				Get the next line of the file as a [String].
 			</description>
 		</method>
-		<method name="get_buffer" qualifiers="const">
-			<return type="RawArray">
+		<method name="get_md5" qualifiers="const">
+			<return type="String">
 			</return>
-			<argument index="0" name="len" type="int">
+			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
-			Get next len bytes of the file as a [RawArray].
+				Return a md5 String representing the file at the given path or an empty [String] on failure.
 			</description>
 		</method>
-		<method name="get_line" qualifiers="const">
+		<method name="get_pascal_string">
 			<return type="String">
 			</return>
 			<description>
-			Get the next line of the file as a [String].
+				Get a [String] saved in Pascal format from the file.
 			</description>
 		</method>
-		<method name="get_as_text" qualifiers="const">
-			<return type="String">
+		<method name="get_pos" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Get the whole file as a [String].
+				Return the file cursor position.
 			</description>
 		</method>
-		<method name="get_md5" qualifiers="const">
-			<return type="String">
+		<method name="get_real" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
 			<description>
-			Return a md5 String representing the file at the given path or an empty [String] on failure.
+				Get the next bits from the file as a floating point number.
 			</description>
 		</method>
 		<method name="get_sha256" qualifiers="const">
@@ -12489,144 +12394,162 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
-			Return a sha256 String representing the file at the given path or an empty [String] on failure.
+				Return a sha256 String representing the file at the given path or an empty [String] on failure.
 			</description>
 		</method>
-		<method name="get_endian_swap">
+		<method name="get_var" qualifiers="const">
+			<description>
+				Get the next Variant value from the file.
+			</description>
+		</method>
+		<method name="is_open" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Get whether endian swap is enabled for this file.
+				Return whether the file is currently opened.
 			</description>
 		</method>
-		<method name="set_endian_swap">
-			<argument index="0" name="enable" type="bool">
+		<method name="open">
+			<return type="int">
+			</return>
+			<argument index="0" name="path" type="String">
+			</argument>
+			<argument index="1" name="flags" type="int">
 			</argument>
 			<description>
-			Set whether to swap the endianess of the file. Enable this if you're dealing with files written in big endian machines.
-
-            Note that this is about the file format, not CPU type. This is always reseted to [code]false[/code] whenever you open the file.
+				Open the file for writing or reading, depending on the flags.
 			</description>
 		</method>
-		<method name="get_error" qualifiers="const">
-			<return type="Error">
+		<method name="open_encrypted">
+			<return type="int">
 			</return>
+			<argument index="0" name="path" type="String">
+			</argument>
+			<argument index="1" name="mode_flags" type="int">
+			</argument>
+			<argument index="2" name="key" type="RawArray">
+			</argument>
 			<description>
-			Get the last error that happened when trying to perform operations. Compare with the [code]ERR_FILE_*[/code] constants from [@Global Scope].
+				Open an encrypted file in write or read mode. You need to pass a binary key to encrypt/decrypt it.
 			</description>
 		</method>
-		<method name="get_var" qualifiers="const">
+		<method name="open_encrypted_with_pass">
+			<return type="int">
+			</return>
+			<argument index="0" name="path" type="String">
+			</argument>
+			<argument index="1" name="mode_flags" type="int">
+			</argument>
+			<argument index="2" name="pass" type="String">
+			</argument>
 			<description>
-			Get the next Variant value from the file.
+				Open an encrypted file in write or read mode. You need to pass a password to encrypt/decrypt it.
 			</description>
 		</method>
-		<method name="get_csv_line" qualifiers="const">
-			<return type="StringArray">
-			</return>
-			<argument index="0" name="delim" type="String" default="&quot;,&quot;">
+		<method name="seek">
+			<argument index="0" name="pos" type="int">
 			</argument>
 			<description>
-			Get the next value of the file in CSV (Comma Separated Values) format. You can pass a different delimiter to use other than the default "," (comma).
+				Change the file reading/writing cursor to the specified position (in bytes from the beginning of the file).
 			</description>
 		</method>
-		<method name="store_8">
-			<argument index="0" name="value" type="int">
+		<method name="seek_end">
+			<argument index="0" name="pos" type="int" default="0">
+			</argument>
+			<description>
+				Change the file reading/writing cursor to the specified position (in bytes from the end of the file). Note that this is an offset, so you should use negative numbers or the cursor will be at the end of the file.
+			</description>
+		</method>
+		<method name="set_endian_swap">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Store an integer as 8 bits in the file.
+				Set whether to swap the endianess of the file. Enable this if you're dealing with files written in big endian machines.
+				Note that this is about the file format, not CPU type. This is always reseted to [code]false[/code] whenever you open the file.
 			</description>
 		</method>
 		<method name="store_16">
 			<argument index="0" name="value" type="int">
 			</argument>
 			<description>
-			Store an integer as 16 bits in the file.
+				Store an integer as 16 bits in the file.
 			</description>
 		</method>
 		<method name="store_32">
 			<argument index="0" name="value" type="int">
 			</argument>
 			<description>
-			Store an integer as 32 bits in the file.
+				Store an integer as 32 bits in the file.
 			</description>
 		</method>
 		<method name="store_64">
 			<argument index="0" name="value" type="int">
 			</argument>
 			<description>
-			Store an integer as 64 bits in the file.
+				Store an integer as 64 bits in the file.
 			</description>
 		</method>
-		<method name="store_float">
-			<argument index="0" name="value" type="float">
+		<method name="store_8">
+			<argument index="0" name="value" type="int">
 			</argument>
 			<description>
-			Store a floating point number as 32 bits in the file.
+				Store an integer as 8 bits in the file.
 			</description>
 		</method>
-		<method name="store_double">
-			<argument index="0" name="value" type="float">
+		<method name="store_buffer">
+			<argument index="0" name="buffer" type="RawArray">
 			</argument>
 			<description>
-			Store a floating point number as 64 bits in the file.
+				Store the given array of bytes in the file.
 			</description>
 		</method>
-		<method name="store_real">
+		<method name="store_double">
 			<argument index="0" name="value" type="float">
 			</argument>
 			<description>
-			Store a floating point number in the file.
+				Store a floating point number as 64 bits in the file.
 			</description>
 		</method>
-		<method name="store_buffer">
-			<argument index="0" name="buffer" type="RawArray">
+		<method name="store_float">
+			<argument index="0" name="value" type="float">
 			</argument>
 			<description>
-			Store the given array of bytes in the file.
+				Store a floating point number as 32 bits in the file.
 			</description>
 		</method>
 		<method name="store_line">
 			<argument index="0" name="line" type="String">
 			</argument>
 			<description>
-			Store the given [String] as a line in the file.
+				Store the given [String] as a line in the file.
 			</description>
 		</method>
-		<method name="store_string">
+		<method name="store_pascal_string">
 			<argument index="0" name="string" type="String">
 			</argument>
 			<description>
-			Store the given [String] in the file.
+				Store the given [String] as a line in the file in Pascal format (i.e. also store the length of the string).
 			</description>
 		</method>
-		<method name="store_var">
-			<argument index="0" name="value" type="Variant">
+		<method name="store_real">
+			<argument index="0" name="value" type="float">
 			</argument>
 			<description>
-			Store any Variant value in the file.
+				Store a floating point number in the file.
 			</description>
 		</method>
-		<method name="store_pascal_string">
+		<method name="store_string">
 			<argument index="0" name="string" type="String">
 			</argument>
 			<description>
-			Store the given [String] as a line in the file in Pascal format (i.e. also store the length of the string).
+				Store the given [String] in the file.
 			</description>
 		</method>
-		<method name="get_pascal_string">
-			<return type="String">
-			</return>
-			<description>
-			Get a [String] saved in Pascal format from the file.
-			</description>
-		</method>
-		<method name="file_exists" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="path" type="String">
+		<method name="store_var">
+			<argument index="0" name="value" type="Variant">
 			</argument>
 			<description>
-			Get whether or not the file in the specified path exists.
+				Store any Variant value in the file.
 			</description>
 		</method>
 	</methods>
@@ -12647,141 +12570,141 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="FileDialog" inherits="ConfirmationDialog" category="Core">
 	<brief_description>
-	Dialog for selecting files or directories in the filesystem.
+		Dialog for selecting files or directories in the filesystem.
 	</brief_description>
 	<description>
-	FileDialog is a preset dialog used to choose files and directories in the filesystem. It supports filter masks.
+		FileDialog is a preset dialog used to choose files and directories in the filesystem. It supports filter masks.
 	</description>
 	<methods>
+		<method name="add_filter">
+			<argument index="0" name="filter" type="String">
+			</argument>
+			<description>
+				Add a custom filter. Filter format is: "mask ; description", example (C++): dialog-&gt;add_filter("*.png ; PNG Images");
+			</description>
+		</method>
 		<method name="clear_filters">
 			<description>
-			Clear all the added filters in the dialog.
+				Clear all the added filters in the dialog.
 			</description>
 		</method>
-		<method name="add_filter">
-			<argument index="0" name="filter" type="String">
-			</argument>
+		<method name="get_access" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Add a custom filter. Filter format is: "mask ; description", example (C++): dialog-&gt;add_filter("*.png ; PNG Images");
+				Return the file access permission of the dialog.
 			</description>
 		</method>
 		<method name="get_current_dir" qualifiers="const">
 			<return type="String">
 			</return>
 			<description>
-			Get the current working directory of the file dialog.
+				Get the current working directory of the file dialog.
 			</description>
 		</method>
 		<method name="get_current_file" qualifiers="const">
 			<return type="String">
 			</return>
 			<description>
-			Get the current selected file of the file dialog (empty if none).
+				Get the current selected file of the file dialog (empty if none).
 			</description>
 		</method>
 		<method name="get_current_path" qualifiers="const">
 			<return type="String">
 			</return>
 			<description>
-			Get the current selected path (directory and file) of the file dialog (empty if none).
+				Get the current selected path (directory and file) of the file dialog (empty if none).
 			</description>
 		</method>
-		<method name="set_current_dir">
-			<argument index="0" name="dir" type="String">
-			</argument>
-			<description>
-			Set the current working directory of the file dialog.
-			</description>
-		</method>
-		<method name="set_current_file">
-			<argument index="0" name="file" type="String">
-			</argument>
-			<description>
-			Set the current selected file name of the file dialog.
-			</description>
-		</method>
-		<method name="set_current_path">
-			<argument index="0" name="path" type="String">
-			</argument>
+		<method name="get_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the current selected file path of the file dialog.
+				Get the file dialog mode from the MODE_* enum.
 			</description>
 		</method>
-		<method name="set_mode">
-			<argument index="0" name="mode" type="int">
-			</argument>
+		<method name="get_vbox">
+			<return type="VBoxContainer">
+			</return>
 			<description>
-			Set the file dialog mode from the MODE_* enum.
+				Return the vertical box container of the dialog, custom controls can be added to it.
 			</description>
 		</method>
-		<method name="get_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="invalidate">
 			<description>
-			Get the file dialog mode from the MODE_* enum.
+				Invalidate and update the current dialog content list.
 			</description>
 		</method>
-		<method name="get_vbox">
-			<return type="VBoxContainer">
+		<method name="is_showing_hidden_files" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the vertical box container of the dialog, custom controls can be added to it.
+				Return true if the diaog allows show hidden files.
 			</description>
 		</method>
 		<method name="set_access">
 			<argument index="0" name="access" type="int">
 			</argument>
 			<description>
-			Set the file access permission of the dialog(Must be one of [ACCESS_RESOURCES], [ACCESS_USERDATA] or [ACCESS_FILESYSTEM]).
+				Set the file access permission of the dialog(Must be one of [ACCESS_RESOURCES], [ACCESS_USERDATA] or [ACCESS_FILESYSTEM]).
 			</description>
 		</method>
-		<method name="get_access" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_current_dir">
+			<argument index="0" name="dir" type="String">
+			</argument>
 			<description>
-			Return the file access permission of the dialog.
+				Set the current working directory of the file dialog.
 			</description>
 		</method>
-		<method name="set_show_hidden_files">
-			<argument index="0" name="show" type="bool">
+		<method name="set_current_file">
+			<argument index="0" name="file" type="String">
 			</argument>
 			<description>
-			Set the dialog should show hidden files.
+				Set the current selected file name of the file dialog.
 			</description>
 		</method>
-		<method name="is_showing_hidden_files" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_current_path">
+			<argument index="0" name="path" type="String">
+			</argument>
 			<description>
-			Return true if the diaog allows show hidden files.
+				Set the current selected file path of the file dialog.
 			</description>
 		</method>
-		<method name="invalidate">
+		<method name="set_mode">
+			<argument index="0" name="mode" type="int">
+			</argument>
 			<description>
-			Invalidate and update the current dialog content list.
+				Set the file dialog mode from the MODE_* enum.
 			</description>
 		</method>
-	</methods>
-	<signals>
-		<signal name="files_selected">
-			<argument index="0" name="paths" type="StringArray">
+		<method name="set_show_hidden_files">
+			<argument index="0" name="show" type="bool">
 			</argument>
 			<description>
-			Event emitted when the user selects multiple files.
+				Set the dialog should show hidden files.
 			</description>
-		</signal>
+		</method>
+	</methods>
+	<signals>
 		<signal name="dir_selected">
 			<argument index="0" name="dir" type="String">
 			</argument>
 			<description>
-			Event emitted when the user selects a directory.
+				Event emitted when the user selects a directory.
 			</description>
 		</signal>
 		<signal name="file_selected">
 			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
-			Event emitted when the user selects a file (double clicks it or presses the OK button).
+				Event emitted when the user selects a file (double clicks it or presses the OK button).
+			</description>
+		</signal>
+		<signal name="files_selected">
+			<argument index="0" name="paths" type="StringArray">
+			</argument>
+			<description>
+				Event emitted when the user selects multiple files.
 			</description>
 		</signal>
 	</signals>
@@ -12822,62 +12745,62 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="FixedMaterial" inherits="Material" category="Core">
 	<brief_description>
-	Simple Material with a fixed parameter set.
+		Simple Material with a fixed parameter set.
 	</brief_description>
 	<description>
-	FixedMaterial is a simple type of material [Resource], which contains a fixed amount of parameters. It is the only type of material supported in fixed-pipeline devices and APIs. It is also an often a better alternative to [ShaderMaterial] for most simple use cases.
+		FixedMaterial is a simple type of material [Resource], which contains a fixed amount of parameters. It is the only type of material supported in fixed-pipeline devices and APIs. It is also an often a better alternative to [ShaderMaterial] for most simple use cases.
 	</description>
 	<methods>
-		<method name="set_parameter">
-			<argument index="0" name="param" type="int">
-			</argument>
-			<argument index="1" name="value" type="Variant">
+		<method name="get_fixed_flag" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="flag" type="int">
 			</argument>
 			<description>
-			Set a parameter, parameters are defined in the PARAM_* enum. The type of each parameter may change, so it's best to check the enum.
+			</description>
+		</method>
+		<method name="get_light_shader" qualifiers="const">
+			<return type="int">
+			</return>
+			<description>
 			</description>
 		</method>
 		<method name="get_parameter" qualifiers="const">
 			<argument index="0" name="param" type="int">
 			</argument>
 			<description>
-			Return a parameter, parameters are defined in the PARAM_* enum. The type of each parameter may change, so it's best to check the enum.
+				Return a parameter, parameters are defined in the PARAM_* enum. The type of each parameter may change, so it's best to check the enum.
 			</description>
 		</method>
-		<method name="set_texture">
-			<argument index="0" name="param" type="int">
-			</argument>
-			<argument index="1" name="texture" type="Texture">
-			</argument>
+		<method name="get_point_size" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set a texture. Textures change parameters per texel and are mapped to the model depending on the texcoord mode (see [method set_texcoord_mode]).
 			</description>
 		</method>
-		<method name="get_texture" qualifiers="const">
-			<return type="Texture">
+		<method name="get_texcoord_mode" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="param" type="int">
 			</argument>
 			<description>
-			Return a texture. Textures change parameters per texel and are mapped to the model depending on the texcoord mode (see [method set_texcoord_mode]).
+				Return the texture coordinate mode. Each texture param (from the PARAM_* enum) has one. It defines how the textures are mapped to the object.
 			</description>
 		</method>
-		<method name="set_texcoord_mode">
+		<method name="get_texture" qualifiers="const">
+			<return type="Texture">
+			</return>
 			<argument index="0" name="param" type="int">
 			</argument>
-			<argument index="1" name="mode" type="int">
-			</argument>
 			<description>
-			Set the texture coordinate mode. Each texture param (from the PARAM_* enum) has one. It defines how the textures are mapped to the object.
+				Return a texture. Textures change parameters per texel and are mapped to the model depending on the texcoord mode (see [method set_texcoord_mode]).
 			</description>
 		</method>
-		<method name="get_texcoord_mode" qualifiers="const">
-			<return type="int">
+		<method name="get_uv_transform" qualifiers="const">
+			<return type="Transform">
 			</return>
-			<argument index="0" name="param" type="int">
-			</argument>
 			<description>
-			Return the texture coordinate mode. Each texture param (from the PARAM_* enum) has one. It defines how the textures are mapped to the object.
+				Returns the special transform used to post-transform UV coordinates of the uv_xform texcoord mode: TEXCOORD_UV_TRANSFORM.
 			</description>
 		</method>
 		<method name="set_fixed_flag">
@@ -12888,50 +12811,50 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="get_fixed_flag" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="flag" type="int">
+		<method name="set_light_shader">
+			<argument index="0" name="shader" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_uv_transform">
-			<argument index="0" name="transform" type="Transform">
+		<method name="set_parameter">
+			<argument index="0" name="param" type="int">
+			</argument>
+			<argument index="1" name="value" type="Variant">
 			</argument>
 			<description>
-			Sets a special transform used to post-transform UV coordinates of the uv_xform texcoord mode: TEXCOORD_UV_TRANSFORM.
-			</description>
-		</method>
-		<method name="get_uv_transform" qualifiers="const">
-			<return type="Transform">
-			</return>
-			<description>
-			Returns the special transform used to post-transform UV coordinates of the uv_xform texcoord mode: TEXCOORD_UV_TRANSFORM.
+				Set a parameter, parameters are defined in the PARAM_* enum. The type of each parameter may change, so it's best to check the enum.
 			</description>
 		</method>
-		<method name="set_light_shader">
-			<argument index="0" name="shader" type="int">
+		<method name="set_point_size">
+			<argument index="0" name="size" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_light_shader" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_texcoord_mode">
+			<argument index="0" name="param" type="int">
+			</argument>
+			<argument index="1" name="mode" type="int">
+			</argument>
 			<description>
+				Set the texture coordinate mode. Each texture param (from the PARAM_* enum) has one. It defines how the textures are mapped to the object.
 			</description>
 		</method>
-		<method name="set_point_size">
-			<argument index="0" name="size" type="float">
+		<method name="set_texture">
+			<argument index="0" name="param" type="int">
+			</argument>
+			<argument index="1" name="texture" type="Texture">
 			</argument>
 			<description>
+				Set a texture. Textures change parameters per texel and are mapped to the model depending on the texcoord mode (see [method set_texcoord_mode]).
 			</description>
 		</method>
-		<method name="get_point_size" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_uv_transform">
+			<argument index="0" name="transform" type="Transform">
+			</argument>
 			<description>
+				Sets a special transform used to post-transform UV coordinates of the uv_xform texcoord mode: TEXCOORD_UV_TRANSFORM.
 			</description>
 		</method>
 	</methods>
@@ -12962,8 +12885,6 @@ This approximation makes straight segments between each point, then subdivides t
 		<constant name="PARAM_MAX" value="8">
 			Maximum amount of parameters.
 		</constant>
-		<constant name="TEXCOORD_SPHERE" value="3">
-		</constant>
 		<constant name="TEXCOORD_UV" value="0">
 			Read texture coordinates from the UV array.
 		</constant>
@@ -12973,6 +12894,8 @@ This approximation makes straight segments between each point, then subdivides t
 		<constant name="TEXCOORD_UV2" value="2">
 			Read texture coordinates from the UV2 array.
 		</constant>
+		<constant name="TEXCOORD_SPHERE" value="3">
+		</constant>
 		<constant name="FLAG_USE_ALPHA" value="0">
 		</constant>
 		<constant name="FLAG_USE_COLOR_ARRAY" value="1">
@@ -12993,10 +12916,10 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="Font" inherits="Resource" category="Core">
 	<brief_description>
-	Internationalized font and text drawing support.
+		Internationalized font and text drawing support.
 	</brief_description>
 	<description>
-	Font contains an unicode compatible character set, as well as the ability to draw it with variable width, ascent, descent and kerning. For creating fonts from TTF files (or other font formats), see the editor support for fonts. TODO check wikipedia for graph of ascent/baseline/descent/height/etc.
+		Font contains an unicode compatible character set, as well as the ability to draw it with variable width, ascent, descent and kerning. For creating fonts from TTF files (or other font formats), see the editor support for fonts. TODO check wikipedia for graph of ascent/baseline/descent/height/etc.
 	</description>
 	<methods>
 		<method name="draw" qualifiers="const">
@@ -13011,34 +12934,45 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="4" name="clip_w" type="int" default="-1">
 			</argument>
 			<description>
-			Draw "string" into a canvas item using the font at a given "pos" position, with "modulate" color, and optionally clipping the width. "pos" specifies the baseline, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis.
+				Draw "string" into a canvas item using the font at a given "pos" position, with "modulate" color, and optionally clipping the width. "pos" specifies the baseline, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis.
 			</description>
 		</method>
-		<method name="get_ascent" qualifiers="const">
+		<method name="draw_char" qualifiers="const">
 			<return type="float">
 			</return>
+			<argument index="0" name="canvas_item" type="RID">
+			</argument>
+			<argument index="1" name="pos" type="Vector2">
+			</argument>
+			<argument index="2" name="char" type="int">
+			</argument>
+			<argument index="3" name="next" type="int" default="-1">
+			</argument>
+			<argument index="4" name="modulate" type="Color" default="Color(1,1,1,1)">
+			</argument>
 			<description>
-			Return the font ascent (number of pixels above the baseline).
+				Draw character "char" into a canvas item using the font at a given "pos" position, with "modulate" color, and optionally kerning if "next" is passed. clipping the width. "pos" specifies the baseline, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis. The width used by the character is returned, making this function useful for drawing strings character by character.
 			</description>
 		</method>
-		<method name="get_descent" qualifiers="const">
+		<method name="get_ascent" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the font descent (number of pixels below the baseline).
+				Return the font ascent (number of pixels above the baseline).
 			</description>
 		</method>
-		<method name="get_height" qualifiers="const">
+		<method name="get_descent" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the total font height (ascent plus descent) in pixels.
+				Return the font descent (number of pixels below the baseline).
 			</description>
 		</method>
-		<method name="is_distance_field_hint" qualifiers="const">
-			<return type="bool">
+		<method name="get_height" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
+				Return the total font height (ascent plus descent) in pixels.
 			</description>
 		</method>
 		<method name="get_string_size" qualifiers="const">
@@ -13047,24 +12981,13 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="0" name="string" type="String">
 			</argument>
 			<description>
-			Return the size of a string, taking kerning and advance into account.
+				Return the size of a string, taking kerning and advance into account.
 			</description>
 		</method>
-		<method name="draw_char" qualifiers="const">
-			<return type="float">
+		<method name="is_distance_field_hint" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="canvas_item" type="RID">
-			</argument>
-			<argument index="1" name="pos" type="Vector2">
-			</argument>
-			<argument index="2" name="char" type="int">
-			</argument>
-			<argument index="3" name="next" type="int" default="-1">
-			</argument>
-			<argument index="4" name="modulate" type="Color" default="Color(1,1,1,1)">
-			</argument>
 			<description>
-			Draw character "char" into a canvas item using the font at a given "pos" position, with "modulate" color, and optionally kerning if "next" is passed. clipping the width. "pos" specifies the baseline, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis. The width used by the character is returned, making this function useful for drawing strings character by character.
 			</description>
 		</method>
 	</methods>
@@ -13101,14 +13024,14 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="set_instance">
-			<argument index="0" name="instance" type="Object">
+		<method name="set_function">
+			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_function">
-			<argument index="0" name="name" type="String">
+		<method name="set_instance">
+			<argument index="0" name="instance" type="Object">
 			</argument>
 			<description>
 			</description>
@@ -13123,19 +13046,19 @@ This approximation makes straight segments between each point, then subdivides t
 	<description>
 	</description>
 	<methods>
-		<method name="resume">
-			<return type="Variant">
+		<method name="is_valid" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="arg" type="Variant" default="NULL">
-			</argument>
 			<description>
+				Should put children to the top left corner instead of center of the container.
 			</description>
 		</method>
-		<method name="is_valid" qualifiers="const">
-			<return type="bool">
+		<method name="resume">
+			<return type="Variant">
 			</return>
+			<argument index="0" name="arg" type="Variant" default="NULL">
+			</argument>
 			<description>
-			Should put children to the top left corner instead of center of the container.
 			</description>
 		</method>
 	</methods>
@@ -13162,16 +13085,16 @@ This approximation makes straight segments between each point, then subdivides t
 	<description>
 	</description>
 	<methods>
-		<method name="new">
-			<description>
-			</description>
-		</method>
 		<method name="get_as_byte_code" qualifiers="const">
 			<return type="RawArray">
 			</return>
 			<description>
 			</description>
 		</method>
+		<method name="new">
+			<description>
+			</description>
+		</method>
 	</methods>
 	<constants>
 	</constants>
@@ -13182,31 +13105,31 @@ This approximation makes straight segments between each point, then subdivides t
 	<description>
 	</description>
 	<methods>
-		<method name="set_param_x">
-			<argument index="0" name="param" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
+		<method name="get_flag_x" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="flag" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_param_x" qualifiers="const">
-			<return type="float">
+		<method name="get_flag_y" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="param" type="int">
+			<argument index="0" name="flag" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_param_y">
-			<argument index="0" name="param" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
+		<method name="get_flag_z" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="flag" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_param_y" qualifiers="const">
+		<method name="get_param_x" qualifiers="const">
 			<return type="float">
 			</return>
 			<argument index="0" name="param" type="int">
@@ -13214,11 +13137,11 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="set_param_z">
+		<method name="get_param_y" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="param" type="int">
 			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
 			<description>
 			</description>
 		</method>
@@ -13238,15 +13161,15 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="get_flag_x" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_flag_y">
 			<argument index="0" name="flag" type="int">
 			</argument>
+			<argument index="1" name="value" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_flag_y">
+		<method name="set_flag_z">
 			<argument index="0" name="flag" type="int">
 			</argument>
 			<argument index="1" name="value" type="bool">
@@ -13254,26 +13177,26 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="get_flag_y" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="flag" type="int">
+		<method name="set_param_x">
+			<argument index="0" name="param" type="int">
+			</argument>
+			<argument index="1" name="value" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_flag_z">
-			<argument index="0" name="flag" type="int">
+		<method name="set_param_y">
+			<argument index="0" name="param" type="int">
 			</argument>
-			<argument index="1" name="value" type="bool">
+			<argument index="1" name="value" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_flag_z" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="flag" type="int">
+		<method name="set_param_z">
+			<argument index="0" name="param" type="int">
+			</argument>
+			<argument index="1" name="value" type="float">
 			</argument>
 			<description>
 			</description>
@@ -13334,7 +13257,7 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="build_cylinder_planes">
+		<method name="build_capsule_planes">
 			<return type="Array">
 			</return>
 			<argument index="0" name="radius" type="float">
@@ -13343,12 +13266,14 @@ This approximation makes straight segments between each point, then subdivides t
 			</argument>
 			<argument index="2" name="sides" type="int">
 			</argument>
-			<argument index="3" name="axis" type="int" default="2">
+			<argument index="3" name="lats" type="int">
+			</argument>
+			<argument index="4" name="axis" type="int" default="2">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="build_capsule_planes">
+		<method name="build_cylinder_planes">
 			<return type="Array">
 			</return>
 			<argument index="0" name="radius" type="float">
@@ -13357,35 +13282,33 @@ This approximation makes straight segments between each point, then subdivides t
 			</argument>
 			<argument index="2" name="sides" type="int">
 			</argument>
-			<argument index="3" name="lats" type="int">
-			</argument>
-			<argument index="4" name="axis" type="int" default="2">
+			<argument index="3" name="axis" type="int" default="2">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="segment_intersects_circle">
-			<return type="float">
+		<method name="get_closest_point_to_segment">
+			<return type="Vector3">
 			</return>
-			<argument index="0" name="segment_from" type="Vector2">
-			</argument>
-			<argument index="1" name="segment_to" type="Vector2">
+			<argument index="0" name="point" type="Vector3">
 			</argument>
-			<argument index="2" name="circle_pos" type="Vector2">
+			<argument index="1" name="s1" type="Vector3">
 			</argument>
-			<argument index="3" name="circle_radius" type="float">
+			<argument index="2" name="s2" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="segment_intersects_segment_2d">
-			<argument index="0" name="from_a" type="Vector2">
+		<method name="get_closest_points_between_segments">
+			<return type="Vector3Array">
+			</return>
+			<argument index="0" name="p1" type="Vector3">
 			</argument>
-			<argument index="1" name="to_a" type="Vector2">
+			<argument index="1" name="p2" type="Vector3">
 			</argument>
-			<argument index="2" name="from_b" type="Vector2">
+			<argument index="2" name="q1" type="Vector3">
 			</argument>
-			<argument index="3" name="to_b" type="Vector2">
+			<argument index="3" name="q2" type="Vector3">
 			</argument>
 			<description>
 			</description>
@@ -13404,36 +13327,32 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="get_closest_points_between_segments">
-			<return type="Vector3Array">
+		<method name="get_uv84_normal_bit">
+			<return type="int">
 			</return>
-			<argument index="0" name="p1" type="Vector3">
-			</argument>
-			<argument index="1" name="p2" type="Vector3">
-			</argument>
-			<argument index="2" name="q1" type="Vector3">
-			</argument>
-			<argument index="3" name="q2" type="Vector3">
+			<argument index="0" name="normal" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_closest_point_to_segment">
-			<return type="Vector3">
+		<method name="make_atlas">
+			<return type="Dictionary">
 			</return>
-			<argument index="0" name="point" type="Vector3">
-			</argument>
-			<argument index="1" name="s1" type="Vector3">
-			</argument>
-			<argument index="2" name="s2" type="Vector3">
+			<argument index="0" name="sizes" type="Vector2Array">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_uv84_normal_bit">
-			<return type="int">
+		<method name="point_is_inside_triangle" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="normal" type="Vector3">
+			<argument index="0" name="point" type="Vector2">
+			</argument>
+			<argument index="1" name="a" type="Vector2">
+			</argument>
+			<argument index="2" name="b" type="Vector2">
+			</argument>
+			<argument index="3" name="c" type="Vector2">
 			</argument>
 			<description>
 			</description>
@@ -13452,30 +13371,28 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="segment_intersects_triangle">
-			<argument index="0" name="from" type="Vector3">
-			</argument>
-			<argument index="1" name="to" type="Vector3">
+		<method name="segment_intersects_circle">
+			<return type="float">
+			</return>
+			<argument index="0" name="segment_from" type="Vector2">
 			</argument>
-			<argument index="2" name="a" type="Vector3">
+			<argument index="1" name="segment_to" type="Vector2">
 			</argument>
-			<argument index="3" name="b" type="Vector3">
+			<argument index="2" name="circle_pos" type="Vector2">
 			</argument>
-			<argument index="4" name="c" type="Vector3">
+			<argument index="3" name="circle_radius" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="segment_intersects_sphere">
+		<method name="segment_intersects_convex">
 			<return type="Vector3Array">
 			</return>
 			<argument index="0" name="from" type="Vector3">
 			</argument>
 			<argument index="1" name="to" type="Vector3">
 			</argument>
-			<argument index="2" name="spos" type="Vector3">
-			</argument>
-			<argument index="3" name="sradius" type="float">
+			<argument index="2" name="planes" type="Array">
 			</argument>
 			<description>
 			</description>
@@ -13494,28 +13411,42 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="segment_intersects_convex">
+		<method name="segment_intersects_segment_2d">
+			<argument index="0" name="from_a" type="Vector2">
+			</argument>
+			<argument index="1" name="to_a" type="Vector2">
+			</argument>
+			<argument index="2" name="from_b" type="Vector2">
+			</argument>
+			<argument index="3" name="to_b" type="Vector2">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="segment_intersects_sphere">
 			<return type="Vector3Array">
 			</return>
 			<argument index="0" name="from" type="Vector3">
 			</argument>
 			<argument index="1" name="to" type="Vector3">
 			</argument>
-			<argument index="2" name="planes" type="Array">
+			<argument index="2" name="spos" type="Vector3">
+			</argument>
+			<argument index="3" name="sradius" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="point_is_inside_triangle" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="point" type="Vector2">
+		<method name="segment_intersects_triangle">
+			<argument index="0" name="from" type="Vector3">
 			</argument>
-			<argument index="1" name="a" type="Vector2">
+			<argument index="1" name="to" type="Vector3">
 			</argument>
-			<argument index="2" name="b" type="Vector2">
+			<argument index="2" name="a" type="Vector3">
 			</argument>
-			<argument index="3" name="c" type="Vector2">
+			<argument index="3" name="b" type="Vector3">
+			</argument>
+			<argument index="4" name="c" type="Vector3">
 			</argument>
 			<description>
 			</description>
@@ -13528,101 +13459,84 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="make_atlas">
-			<return type="Dictionary">
-			</return>
-			<argument index="0" name="sizes" type="Vector2Array">
-			</argument>
-			<description>
-			</description>
-		</method>
 	</methods>
 	<constants>
 	</constants>
 </class>
 <class name="GeometryInstance" inherits="VisualInstance" category="Core">
 	<brief_description>
-	Base node for geometry based visual instances.
+		Base node for geometry based visual instances.
 	</brief_description>
 	<description>
-	Base node for geometry based visual instances. Shares some common functionality like visibility and custom materials.
+		Base node for geometry based visual instances. Shares some common functionality like visibility and custom materials.
 	</description>
 	<methods>
-		<method name="set_material_override">
-			<argument index="0" name="material" type="Object">
-			</argument>
-			<description>
-			Set the material override for the whole geometry.
-			</description>
-		</method>
-		<method name="get_material_override" qualifiers="const">
-			<return type="Object">
+		<method name="get_baked_light_texture_id" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the material override for the whole geometry.
 			</description>
 		</method>
-		<method name="set_flag">
-			<argument index="0" name="flag" type="int">
-			</argument>
-			<argument index="1" name="value" type="bool">
-			</argument>
+		<method name="get_cast_shadows_setting" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_flag" qualifiers="const">
-			<return type="bool">
+		<method name="get_draw_range_begin" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="flag" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_cast_shadows_setting">
-			<argument index="0" name="shadow_casting_setting" type="int">
-			</argument>
+		<method name="get_draw_range_end" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_cast_shadows_setting" qualifiers="const">
-			<return type="int">
+		<method name="get_extra_cull_margin" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_draw_range_begin">
-			<argument index="0" name="mode" type="float">
+		<method name="get_flag" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="flag" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_draw_range_begin" qualifiers="const">
-			<return type="float">
+		<method name="get_material_override" qualifiers="const">
+			<return type="Object">
 			</return>
 			<description>
+				Return the material override for the whole geometry.
 			</description>
 		</method>
-		<method name="set_draw_range_end">
-			<argument index="0" name="mode" type="float">
+		<method name="set_baked_light_texture_id">
+			<argument index="0" name="id" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_draw_range_end" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_cast_shadows_setting">
+			<argument index="0" name="shadow_casting_setting" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_baked_light_texture_id">
-			<argument index="0" name="id" type="int">
+		<method name="set_draw_range_begin">
+			<argument index="0" name="mode" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_baked_light_texture_id" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_draw_range_end">
+			<argument index="0" name="mode" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -13632,10 +13546,19 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="get_extra_cull_margin" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_flag">
+			<argument index="0" name="flag" type="int">
+			</argument>
+			<argument index="1" name="value" type="bool">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_material_override">
+			<argument index="0" name="material" type="Object">
+			</argument>
 			<description>
+				Set the material override for the whole geometry.
 			</description>
 		</method>
 	</methods>
@@ -13668,80 +13591,86 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="Globals" inherits="Object" category="Core">
 	<brief_description>
-	Contains global variables accessible from everywhere.
+		Contains global variables accessible from everywhere.
 	</brief_description>
 	<description>
-	Contains global variables accessible from everywhere. Use the normal [Object] API, such as "Globals.get(variable)", "Globals.set(variable,value)" or "Globals.has(variable)" to access them. Variables stored in engine.cfg are also loaded into globals, making this object very useful for reading custom game configuration options.
+		Contains global variables accessible from everywhere. Use the normal [Object] API, such as "Globals.get(variable)", "Globals.set(variable,value)" or "Globals.has(variable)" to access them. Variables stored in engine.cfg are also loaded into globals, making this object very useful for reading custom game configuration options.
 	</description>
 	<methods>
-		<method name="has" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="clear">
 			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			Return true if a configuration value is present.
+				Clear the whole configuration (not recommended, may break things).
 			</description>
 		</method>
-		<method name="set_order">
+		<method name="get_order" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
-			<argument index="1" name="pos" type="int">
-			</argument>
 			<description>
-			Set the order of a configuration value (influences when saved to the config file).
+				Return the order of a configuration value (influences when saved to the config file).
 			</description>
 		</method>
-		<method name="get_order" qualifiers="const">
-			<return type="int">
+		<method name="get_singleton" qualifiers="const">
+			<return type="Object">
 			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			Return the order of a configuration value (influences when saved to the config file).
 			</description>
 		</method>
-		<method name="set_persisting">
-			<argument index="0" name="name" type="String">
+		<method name="globalize_path" qualifiers="const">
+			<return type="String">
+			</return>
+			<argument index="0" name="path" type="String">
 			</argument>
-			<argument index="1" name="enable" type="bool">
+			<description>
+				Convert a localized path (res://) to a full native OS path.
+			</description>
+		</method>
+		<method name="has" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			If set to true, this value can be saved to the configuration file. This is useful for editors.
+				Return true if a configuration value is present.
 			</description>
 		</method>
-		<method name="is_persisting" qualifiers="const">
+		<method name="has_singleton" qualifiers="const">
 			<return type="bool">
 			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			If returns true, this value can be saved to the configuration file. This is useful for editors.
 			</description>
 		</method>
-		<method name="clear">
+		<method name="is_persisting" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			Clear the whole configuration (not recommended, may break things).
+				If returns true, this value can be saved to the configuration file. This is useful for editors.
 			</description>
 		</method>
-		<method name="localize_path" qualifiers="const">
-			<return type="String">
+		<method name="load_resource_pack">
+			<return type="bool">
 			</return>
-			<argument index="0" name="path" type="String">
+			<argument index="0" name="pack" type="String">
 			</argument>
 			<description>
-			Convert a path to a localized path (res:// path).
 			</description>
 		</method>
-		<method name="globalize_path" qualifiers="const">
+		<method name="localize_path" qualifiers="const">
 			<return type="String">
 			</return>
 			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
-			Convert a localized path (res://) to a full native OS path.
+				Convert a path to a localized path (res:// path).
 			</description>
 		</method>
 		<method name="save">
@@ -13750,36 +13679,30 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="has_singleton" qualifiers="const">
-			<return type="bool">
+		<method name="save_custom">
+			<return type="int">
 			</return>
-			<argument index="0" name="name" type="String">
+			<argument index="0" name="file" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_singleton" qualifiers="const">
-			<return type="Object">
-			</return>
+		<method name="set_order">
 			<argument index="0" name="name" type="String">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="load_resource_pack">
-			<return type="bool">
-			</return>
-			<argument index="0" name="pack" type="String">
+			<argument index="1" name="pos" type="int">
 			</argument>
 			<description>
+				Set the order of a configuration value (influences when saved to the config file).
 			</description>
 		</method>
-		<method name="save_custom">
-			<return type="int">
-			</return>
-			<argument index="0" name="file" type="String">
+		<method name="set_persisting">
+			<argument index="0" name="name" type="String">
+			</argument>
+			<argument index="1" name="enable" type="bool">
 			</argument>
 			<description>
+				If set to true, this value can be saved to the configuration file. This is useful for editors.
 			</description>
 		</method>
 	</methods>
@@ -13788,11 +13711,11 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="GraphEdit" inherits="Control" category="Core">
 	<brief_description>
-	GraphEdit is an area capable of showing various GraphNodes. It manages connection events between them.
+		GraphEdit is an area capable of showing various GraphNodes. It manages connection events between them.
 	</brief_description>
 	<description>
-	GraphEdit manages the showing of GraphNodes it contains, as well as connections an disconnections between them. Signals are sent for each of these two events. Disconnection between GraphNodes slots is disabled by default.
-	It is greatly advised to enable low processor usage mode (see [method OS.set_low_processor_usage_mode]) when using GraphEdits.
+		GraphEdit manages the showing of GraphNodes it contains, as well as connections an disconnections between them. Signals are sent for each of these two events. Disconnection between GraphNodes slots is disabled by default.
+		It is greatly advised to enable low processor usage mode (see [method OS.set_low_processor_usage_mode]) when using GraphEdits.
 	</description>
 	<methods>
 		<method name="connect_node">
@@ -13807,22 +13730,7 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="3" name="to_port" type="int">
 			</argument>
 			<description>
-			Create a connection between 'from_port' slot of 'from' GraphNode and 'to_port' slot of 'to' GraphNode. If the connection already exists, no connection is created.
-			</description>
-		</method>
-		<method name="is_node_connected">
-			<return type="bool">
-			</return>
-			<argument index="0" name="from" type="String">
-			</argument>
-			<argument index="1" name="from_port" type="int">
-			</argument>
-			<argument index="2" name="to" type="String">
-			</argument>
-			<argument index="3" name="to_port" type="int">
-			</argument>
-			<description>
-			Return true if the 'from_port' slot of 'from' GraphNode is connected to the 'to_port' slot of 'to' GraphNode.
+				Create a connection between 'from_port' slot of 'from' GraphNode and 'to_port' slot of 'to' GraphNode. If the connection already exists, no connection is created.
 			</description>
 		</method>
 		<method name="disconnect_node">
@@ -13835,76 +13743,79 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="3" name="to_port" type="int">
 			</argument>
 			<description>
-			Remove the connection between 'from_port' slot of 'from' GraphNode and 'to_port' slot of 'to' GraphNode, if connection exists.
+				Remove the connection between 'from_port' slot of 'from' GraphNode and 'to_port' slot of 'to' GraphNode, if connection exists.
 			</description>
 		</method>
 		<method name="get_connection_list" qualifiers="const">
 			<return type="Array">
 			</return>
 			<description>
-			Return an Array containing the list of connections. A connection consists in a structure of the form {from_slot: 0, from: "GraphNode name 0", to_slot: 1, to: "GraphNode name 1" }
+				Return an Array containing the list of connections. A connection consists in a structure of the form {from_slot: 0, from: "GraphNode name 0", to_slot: 1, to: "GraphNode name 1" }
 			</description>
 		</method>
 		<method name="get_scroll_ofs" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
-			Return the scroll offset.
-			</description>
-		</method>
-		<method name="set_zoom">
-			<argument index="0" name="p_zoom" type="float">
-			</argument>
-			<description>
-			Set the zoom value of the GraphEdit. Zoom value is between [0.01; 1.728].
+				Return the scroll offset.
 			</description>
 		</method>
 		<method name="get_zoom" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the current zoom value.
+				Return the current zoom value.
 			</description>
 		</method>
-		<method name="set_right_disconnects">
-			<argument index="0" name="enable" type="bool">
+		<method name="is_node_connected">
+			<return type="bool">
+			</return>
+			<argument index="0" name="from" type="String">
+			</argument>
+			<argument index="1" name="from_port" type="int">
+			</argument>
+			<argument index="2" name="to" type="String">
+			</argument>
+			<argument index="3" name="to_port" type="int">
 			</argument>
 			<description>
-			Enable the disconnection of existing connections in the visual GraphEdit by left-clicking a connection and releasing into the void.
+				Return true if the 'from_port' slot of 'from' GraphNode is connected to the 'to_port' slot of 'to' GraphNode.
 			</description>
 		</method>
 		<method name="is_right_disconnects_enabled" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true is the disconnection of connections is enable in the visual GraphEdit. False otherwise.
+				Return true is the disconnection of connections is enable in the visual GraphEdit. False otherwise.
 			</description>
 		</method>
-	</methods>
-	<signals>
-		<signal name="delete_nodes_request">
+		<method name="set_right_disconnects">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Signal sent when a GraphNode is attempted to be removed from the GraphEdit.
+				Enable the disconnection of existing connections in the visual GraphEdit by left-clicking a connection and releasing into the void.
 			</description>
-		</signal>
-		<signal name="duplicate_nodes_request">
+		</method>
+		<method name="set_zoom">
+			<argument index="0" name="p_zoom" type="float">
+			</argument>
 			<description>
-			Signal sent when a GraphNode is attempted to be duplicated in the GraphEdit.
+				Set the zoom value of the GraphEdit. Zoom value is between [0.01; 1.728].
 			</description>
-		</signal>
-		<signal name="popup_request">
-			<argument index="0" name="p_position" type="Vector2">
-			</argument>
+		</method>
+	</methods>
+	<signals>
+		<signal name="_begin_node_move">
 			<description>
-			Signal sent when a popup is requested. Happens on right-clicking in the GraphEdit. 'p_position' is the position of the mouse pointer when the signal is sent.
+				Signal sent at the beginning of a GraphNode movement.
 			</description>
 		</signal>
-		<signal name="_begin_node_move">
+		<signal name="_end_node_move">
 			<description>
-			Signal sent at the beginning of a GraphNode movement.
+				Signal sent at the end of a GraphNode movement.
 			</description>
 		</signal>
-		<signal name="disconnection_request">
+		<signal name="connection_request">
 			<argument index="0" name="from" type="String">
 			</argument>
 			<argument index="1" name="from_slot" type="int">
@@ -13914,10 +13825,15 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="3" name="to_slot" type="int">
 			</argument>
 			<description>
-			Signal sent to the GraphEdit when the connection between 'from_slot' slot of 'from' GraphNode and 'to_slot' slot of 'to' GraphNode is attempted to be removed.
+				Signal sent to the GraphEdit when the connection between 'from_slot' slot of 'from' GraphNode and 'to_slot' slot of 'to' GraphNode is attempted to be created.
 			</description>
 		</signal>
-		<signal name="connection_request">
+		<signal name="delete_nodes_request">
+			<description>
+				Signal sent when a GraphNode is attempted to be removed from the GraphEdit.
+			</description>
+		</signal>
+		<signal name="disconnection_request">
 			<argument index="0" name="from" type="String">
 			</argument>
 			<argument index="1" name="from_slot" type="int">
@@ -13927,241 +13843,243 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="3" name="to_slot" type="int">
 			</argument>
 			<description>
-			Signal sent to the GraphEdit when the connection between 'from_slot' slot of 'from' GraphNode and 'to_slot' slot of 'to' GraphNode is attempted to be created.
+				Signal sent to the GraphEdit when the connection between 'from_slot' slot of 'from' GraphNode and 'to_slot' slot of 'to' GraphNode is attempted to be removed.
 			</description>
 		</signal>
-		<signal name="_end_node_move">
+		<signal name="duplicate_nodes_request">
+			<description>
+				Signal sent when a GraphNode is attempted to be duplicated in the GraphEdit.
+			</description>
+		</signal>
+		<signal name="popup_request">
+			<argument index="0" name="p_position" type="Vector2">
+			</argument>
 			<description>
-			Signal sent at the end of a GraphNode movement.
+				Signal sent when a popup is requested. Happens on right-clicking in the GraphEdit. 'p_position' is the position of the mouse pointer when the signal is sent.
 			</description>
 		</signal>
 	</signals>
 	<constants>
 	</constants>
 	<theme_items>
-		<theme_item name="more" type="Texture">
-		</theme_item>
-		<theme_item name="reset" type="Texture">
+		<theme_item name="bg" type="StyleBox">
 		</theme_item>
 		<theme_item name="minus" type="Texture">
 		</theme_item>
-		<theme_item name="bg" type="StyleBox">
+		<theme_item name="more" type="Texture">
+		</theme_item>
+		<theme_item name="reset" type="Texture">
 		</theme_item>
 	</theme_items>
 </class>
 <class name="GraphNode" inherits="Container" category="Core">
 	<brief_description>
-	A GraphNode is a container with several input and output slots allowing connections between GraphNodes. Slots can have different, incompatible types.
+		A GraphNode is a container with several input and output slots allowing connections between GraphNodes. Slots can have different, incompatible types.
 	</brief_description>
 	<description>
-	A GraphNode is a container defined by a title. It can have 1 or more input and output slots, which can be enabled (shown) or disabled (not shown) and have different (incompatible) types. Colors can also be assigned to slots. A tuple of input and output slots is defined for each GUI element included in the GraphNode. Input and output connections are left and right slots, but only enabled slots are counted as connections.
+		A GraphNode is a container defined by a title. It can have 1 or more input and output slots, which can be enabled (shown) or disabled (not shown) and have different (incompatible) types. Colors can also be assigned to slots. A tuple of input and output slots is defined for each GUI element included in the GraphNode. Input and output connections are left and right slots, but only enabled slots are counted as connections.
 	</description>
 	<methods>
-		<method name="set_title">
-			<argument index="0" name="title" type="String">
-			</argument>
-			<description>
-			Set the title of the GraphNode.
-			</description>
-		</method>
-		<method name="get_title" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="clear_all_slots">
 			<description>
-			Return the title of the GraphNode.
+				Disable all input and output slots of the GraphNode.
 			</description>
 		</method>
-		<method name="set_slot">
+		<method name="clear_slot">
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="enable_left" type="bool">
-			</argument>
-			<argument index="2" name="type_left" type="int">
-			</argument>
-			<argument index="3" name="color_left" type="Color">
-			</argument>
-			<argument index="4" name="enable_right" type="bool">
-			</argument>
-			<argument index="5" name="type_right" type="int">
-			</argument>
-			<argument index="6" name="color_right" type="Color">
-			</argument>
 			<description>
-			Set the tuple of input/output slots defined by 'idx' ID. 'left' slots are input, 'right' are output. 'type' is an integer defining the type of the slot. Refer to description for the compatibility between slot types.
+				Disable input and output slot whose index is 'idx'.
 			</description>
 		</method>
-		<method name="clear_slot">
+		<method name="get_connection_input_color">
+			<return type="Color">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Disable input and output slot whose index is 'idx'.
+				Return the color of the input connection 'idx'.
 			</description>
 		</method>
-		<method name="clear_all_slots">
+		<method name="get_connection_input_count">
+			<return type="int">
+			</return>
 			<description>
-			Disable all input and output slots of the GraphNode.
+				Return the number of enabled input slots (connections) to the GraphNode.
 			</description>
 		</method>
-		<method name="is_slot_enabled_left" qualifiers="const">
-			<return type="bool">
+		<method name="get_connection_input_pos">
+			<return type="Vector2">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Return true if left (input) slot 'idx' is enabled. False otherwise.
+				Return the position of the input connection 'idx'.
 			</description>
 		</method>
-		<method name="get_slot_type_left" qualifiers="const">
+		<method name="get_connection_input_type">
 			<return type="int">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Return the (integer) type of left (input) 'idx' slot.
+				Return the type of the input connection 'idx'.
 			</description>
 		</method>
-		<method name="get_slot_color_left" qualifiers="const">
+		<method name="get_connection_output_color">
 			<return type="Color">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Return the color set to 'idx' left (input) slot.
+				Return the color of the output connection 'idx'.
 			</description>
 		</method>
-		<method name="is_slot_enabled_right" qualifiers="const">
-			<return type="bool">
+		<method name="get_connection_output_count">
+			<return type="int">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
-			Return true if right (output) slot 'idx' is enabled. False otherwise.
+				Return the number of enabled output slots (connections) of the GraphNode.
 			</description>
 		</method>
-		<method name="get_slot_type_right" qualifiers="const">
-			<return type="int">
+		<method name="get_connection_output_pos">
+			<return type="Vector2">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Return the (integer) type of right (output) 'idx' slot.
+				Return the position of the output connection 'idx'.
 			</description>
 		</method>
-		<method name="get_slot_color_right" qualifiers="const">
-			<return type="Color">
+		<method name="get_connection_output_type">
+			<return type="int">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Return the color set to 'idx' right (output) slot.
-			</description>
-		</method>
-		<method name="set_offset">
-			<argument index="0" name="offset" type="Vector2">
-			</argument>
-			<description>
-			Set the offset of the GraphNode.
+				Return the type of the output connection 'idx'.
 			</description>
 		</method>
 		<method name="get_offset" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
-			Return the offset of the GraphNode.
+				Return the offset of the GraphNode.
 			</description>
 		</method>
-		<method name="get_connection_output_count">
-			<return type="int">
+		<method name="get_slot_color_left" qualifiers="const">
+			<return type="Color">
 			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
 			<description>
-			Return the number of enabled output slots (connections) of the GraphNode.
+				Return the color set to 'idx' left (input) slot.
 			</description>
 		</method>
-		<method name="get_connection_input_count">
-			<return type="int">
+		<method name="get_slot_color_right" qualifiers="const">
+			<return type="Color">
 			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
 			<description>
-			Return the number of enabled input slots (connections) to the GraphNode.
+				Return the color set to 'idx' right (output) slot.
 			</description>
 		</method>
-		<method name="get_connection_output_pos">
-			<return type="Vector2">
+		<method name="get_slot_type_left" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Return the position of the output connection 'idx'.
+				Return the (integer) type of left (input) 'idx' slot.
 			</description>
 		</method>
-		<method name="get_connection_output_type">
+		<method name="get_slot_type_right" qualifiers="const">
 			<return type="int">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Return the type of the output connection 'idx'.
+				Return the (integer) type of right (output) 'idx' slot.
 			</description>
 		</method>
-		<method name="get_connection_output_color">
-			<return type="Color">
+		<method name="get_title" qualifiers="const">
+			<return type="String">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
-			Return the color of the output connection 'idx'.
+				Return the title of the GraphNode.
 			</description>
 		</method>
-		<method name="get_connection_input_pos">
-			<return type="Vector2">
+		<method name="is_close_button_visible" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
-			Return the position of the input connection 'idx'.
+				Returns true if the close button is shown. False otherwise.
 			</description>
 		</method>
-		<method name="get_connection_input_type">
-			<return type="int">
+		<method name="is_slot_enabled_left" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Return the type of the input connection 'idx'.
+				Return true if left (input) slot 'idx' is enabled. False otherwise.
 			</description>
 		</method>
-		<method name="get_connection_input_color">
-			<return type="Color">
+		<method name="is_slot_enabled_right" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Return the color of the input connection 'idx'.
+				Return true if right (output) slot 'idx' is enabled. False otherwise.
+			</description>
+		</method>
+		<method name="set_offset">
+			<argument index="0" name="offset" type="Vector2">
+			</argument>
+			<description>
+				Set the offset of the GraphNode.
 			</description>
 		</method>
 		<method name="set_show_close_button">
 			<argument index="0" name="show" type="bool">
 			</argument>
 			<description>
-			Show the close button on the GraphNode if 'show' is true (disabled by default). If enabled, a connection on the signal close_request is needed for the close button to work.
+				Show the close button on the GraphNode if 'show' is true (disabled by default). If enabled, a connection on the signal close_request is needed for the close button to work.
 			</description>
 		</method>
-		<method name="is_close_button_visible" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_slot">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="enable_left" type="bool">
+			</argument>
+			<argument index="2" name="type_left" type="int">
+			</argument>
+			<argument index="3" name="color_left" type="Color">
+			</argument>
+			<argument index="4" name="enable_right" type="bool">
+			</argument>
+			<argument index="5" name="type_right" type="int">
+			</argument>
+			<argument index="6" name="color_right" type="Color">
+			</argument>
 			<description>
-			Returns true if the close button is shown. False otherwise.
+				Set the tuple of input/output slots defined by 'idx' ID. 'left' slots are input, 'right' are output. 'type' is an integer defining the type of the slot. Refer to description for the compatibility between slot types.
 			</description>
 		</method>
-	</methods>
-	<signals>
-		<signal name="raise_request">
+		<method name="set_title">
+			<argument index="0" name="title" type="String">
+			</argument>
 			<description>
-			Signal sent when the GraphNode is requested to be displayed over other ones. Happens on focusing (clicking into) the GraphNode.
+				Set the title of the GraphNode.
 			</description>
-		</signal>
+		</method>
+	</methods>
+	<signals>
 		<signal name="close_request">
 			<description>
-			Signal sent on closing the GraphNode.
+				Signal sent on closing the GraphNode.
 			</description>
 		</signal>
 		<signal name="dragged">
@@ -14170,74 +14088,79 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="1" name="to" type="Vector2">
 			</argument>
 			<description>
-			Signal sent when the GraphNode is dragged.
+				Signal sent when the GraphNode is dragged.
 			</description>
 		</signal>
 		<signal name="offset_changed">
 			<description>
-			Signal sent when the GraphNode is moved.
+				Signal sent when the GraphNode is moved.
+			</description>
+		</signal>
+		<signal name="raise_request">
+			<description>
+				Signal sent when the GraphNode is requested to be displayed over other ones. Happens on focusing (clicking into) the GraphNode.
 			</description>
 		</signal>
 	</signals>
 	<constants>
 	</constants>
 	<theme_items>
-		<theme_item name="port_offset" type="int">
+		<theme_item name="close" type="Texture">
 		</theme_item>
 		<theme_item name="close_offset" type="int">
 		</theme_item>
-		<theme_item name="separation" type="int">
+		<theme_item name="defaultfocus" type="StyleBox">
 		</theme_item>
-		<theme_item name="title_offset" type="int">
+		<theme_item name="defaultframe" type="StyleBox">
 		</theme_item>
-		<theme_item name="title_color" type="Color">
+		<theme_item name="frame" type="StyleBox">
 		</theme_item>
 		<theme_item name="port" type="Texture">
 		</theme_item>
-		<theme_item name="close" type="Texture">
+		<theme_item name="port_offset" type="int">
 		</theme_item>
-		<theme_item name="title_font" type="Font">
+		<theme_item name="selectedframe" type="StyleBox">
 		</theme_item>
-		<theme_item name="frame" type="StyleBox">
+		<theme_item name="separation" type="int">
 		</theme_item>
-		<theme_item name="selectedframe" type="StyleBox">
+		<theme_item name="title_color" type="Color">
 		</theme_item>
-		<theme_item name="defaultfocus" type="StyleBox">
+		<theme_item name="title_font" type="Font">
 		</theme_item>
-		<theme_item name="defaultframe" type="StyleBox">
+		<theme_item name="title_offset" type="int">
 		</theme_item>
 	</theme_items>
 </class>
 <class name="GridContainer" inherits="Container" category="Core">
 	<brief_description>
-	Grid container used to arrange elements in a grid like layout
+		Grid container used to arrange elements in a grid like layout
 	</brief_description>
 	<description>
-	Grid container will arrange its children in a grid like structure, the grid columns are specified using the [method set_columns] method and the number of rows will be equal to the number of children in the container divided by the number of columns, for example: if the container has 5 children, and 2 columns, there will be 3 rows in the container. Notice that grid layout will preserve the columns and rows for every size of the container.
+		Grid container will arrange its children in a grid like structure, the grid columns are specified using the [method set_columns] method and the number of rows will be equal to the number of children in the container divided by the number of columns, for example: if the container has 5 children, and 2 columns, there will be 3 rows in the container. Notice that grid layout will preserve the columns and rows for every size of the container.
 	</description>
 	<methods>
-		<method name="set_columns">
-			<argument index="0" name="columns" type="int">
-			</argument>
-			<description>
-			Sets the numbers of columns in the container, then reorder its children to accommodate the new layout
-			</description>
-		</method>
 		<method name="get_columns" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Returns the number of columns in this container
+				Returns the number of columns in this container
+			</description>
+		</method>
+		<method name="set_columns">
+			<argument index="0" name="columns" type="int">
+			</argument>
+			<description>
+				Sets the numbers of columns in the container, then reorder its children to accommodate the new layout
 			</description>
 		</method>
 	</methods>
 	<constants>
 	</constants>
 	<theme_items>
-		<theme_item name="vseparation" type="int">
-		</theme_item>
 		<theme_item name="hseparation" type="int">
 		</theme_item>
+		<theme_item name="vseparation" type="int">
+		</theme_item>
 	</theme_items>
 </class>
 <class name="GridMap" inherits="Spatial" category="Core">
@@ -14246,64 +14169,98 @@ This approximation makes straight segments between each point, then subdivides t
 	<description>
 	</description>
 	<methods>
-		<method name="set_theme">
-			<argument index="0" name="theme" type="MeshLibrary">
+		<method name="area_get_bounds" qualifiers="const">
+			<return type="AABB">
+			</return>
+			<argument index="0" name="area" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_theme" qualifiers="const">
-			<return type="MeshLibrary">
+		<method name="area_get_name" qualifiers="const">
+			<return type="String">
 			</return>
+			<argument index="0" name="area" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_bake">
-			<argument index="0" name="enable" type="bool">
+		<method name="area_get_portal_disable_color" qualifiers="const">
+			<return type="Color">
+			</return>
+			<argument index="0" name="area" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_baking_enabled" qualifiers="const">
-			<return type="bool">
+		<method name="area_get_portal_disable_distance" qualifiers="const">
+			<return type="float">
 			</return>
+			<argument index="0" name="area" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_cell_size">
-			<argument index="0" name="size" type="float">
+		<method name="area_is_exterior_portal" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="area" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_cell_size" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="area_set_exterior_portal">
+			<argument index="0" name="area" type="int">
+			</argument>
+			<argument index="1" name="enable" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_octant_size">
-			<argument index="0" name="size" type="int">
+		<method name="area_set_name">
+			<argument index="0" name="area" type="int">
+			</argument>
+			<argument index="1" name="name" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_octant_size" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="area_set_portal_disable_color">
+			<argument index="0" name="area" type="int">
+			</argument>
+			<argument index="1" name="color" type="Color">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_cell_item">
-			<argument index="0" name="x" type="int">
+		<method name="area_set_portal_disable_distance">
+			<argument index="0" name="area" type="int">
 			</argument>
-			<argument index="1" name="y" type="int">
+			<argument index="1" name="distance" type="float">
 			</argument>
-			<argument index="2" name="z" type="int">
+			<description>
+			</description>
+		</method>
+		<method name="bake_geometry">
+			<description>
+			</description>
+		</method>
+		<method name="clear">
+			<description>
+			</description>
+		</method>
+		<method name="create_area">
+			<return type="int">
+			</return>
+			<argument index="0" name="id" type="int">
 			</argument>
-			<argument index="3" name="item" type="int">
+			<argument index="1" name="area" type="AABB">
 			</argument>
-			<argument index="4" name="orientation" type="int" default="0">
+			<description>
+			</description>
+		</method>
+		<method name="erase_area">
+			<argument index="0" name="area" type="int">
 			</argument>
 			<description>
 			</description>
@@ -14332,15 +14289,9 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="resource_changed">
-			<argument index="0" name="resource" type="Object">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="set_center_x">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="get_cell_size" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -14350,137 +14301,119 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="set_center_y">
-			<argument index="0" name="enable" type="bool">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_center_y" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_center_z">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="get_center_z" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_center_z" qualifiers="const">
-			<return type="bool">
+		<method name="get_octant_size" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_clip">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
-			<argument index="1" name="clipabove" type="bool" default="true">
-			</argument>
-			<argument index="2" name="floor" type="int" default="0">
-			</argument>
-			<argument index="3" name="axis" type="int" default="0">
-			</argument>
+		<method name="get_theme" qualifiers="const">
+			<return type="MeshLibrary">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="create_area">
+		<method name="get_unused_area_id" qualifiers="const">
 			<return type="int">
 			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="area" type="AABB">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="area_get_bounds" qualifiers="const">
-			<return type="AABB">
+		<method name="is_baking_enabled" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="area" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="area_set_exterior_portal">
-			<argument index="0" name="area" type="int">
-			</argument>
-			<argument index="1" name="enable" type="bool">
-			</argument>
+		<method name="is_using_baked_light" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="area_set_name">
-			<argument index="0" name="area" type="int">
-			</argument>
-			<argument index="1" name="name" type="String">
+		<method name="resource_changed">
+			<argument index="0" name="resource" type="Object">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="area_get_name" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="area" type="int">
+		<method name="set_bake">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="area_is_exterior_portal" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="area" type="int">
+		<method name="set_cell_item">
+			<argument index="0" name="x" type="int">
+			</argument>
+			<argument index="1" name="y" type="int">
+			</argument>
+			<argument index="2" name="z" type="int">
+			</argument>
+			<argument index="3" name="item" type="int">
+			</argument>
+			<argument index="4" name="orientation" type="int" default="0">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="area_set_portal_disable_distance">
-			<argument index="0" name="area" type="int">
-			</argument>
-			<argument index="1" name="distance" type="float">
+		<method name="set_cell_size">
+			<argument index="0" name="size" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="area_get_portal_disable_distance" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="area" type="int">
+		<method name="set_center_x">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="area_set_portal_disable_color">
-			<argument index="0" name="area" type="int">
-			</argument>
-			<argument index="1" name="color" type="Color">
+		<method name="set_center_y">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="area_get_portal_disable_color" qualifiers="const">
-			<return type="Color">
-			</return>
-			<argument index="0" name="area" type="int">
+		<method name="set_center_z">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="erase_area">
-			<argument index="0" name="area" type="int">
+		<method name="set_clip">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
+			<argument index="1" name="clipabove" type="bool" default="true">
+			</argument>
+			<argument index="2" name="floor" type="int" default="0">
+			</argument>
+			<argument index="3" name="axis" type="int" default="0">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_unused_area_id" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_octant_size">
+			<argument index="0" name="size" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="bake_geometry">
+		<method name="set_theme">
+			<argument index="0" name="theme" type="MeshLibrary">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -14490,16 +14423,6 @@ This approximation makes straight segments between each point, then subdivides t
 			<description>
 			</description>
 		</method>
-		<method name="is_using_baked_light" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="clear">
-			<description>
-			</description>
-		</method>
 	</methods>
 	<constants>
 		<constant name="INVALID_CELL_ITEM" value="-1">
@@ -14508,38 +14431,38 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="GrooveJoint2D" inherits="Joint2D" category="Core">
 	<brief_description>
-	Groove constraint for 2D physics.
+		Groove constraint for 2D physics.
 	</brief_description>
 	<description>
-	Groove constraint for 2D physics. This is useful for making a body "slide" through a segment placed in another.
+		Groove constraint for 2D physics. This is useful for making a body "slide" through a segment placed in another.
 	</description>
 	<methods>
-		<method name="set_length">
-			<argument index="0" name="length" type="float">
-			</argument>
+		<method name="get_initial_offset" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the length of the groove.
+				Set the final offset of the groove on body A.
 			</description>
 		</method>
 		<method name="get_length" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the length of the groove.
+				Return the length of the groove.
 			</description>
 		</method>
 		<method name="set_initial_offset">
 			<argument index="0" name="offset" type="float">
 			</argument>
 			<description>
-			Set the initial offset of the groove on body A.
+				Set the initial offset of the groove on body A.
 			</description>
 		</method>
-		<method name="get_initial_offset" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_length">
+			<argument index="0" name="length" type="float">
+			</argument>
 			<description>
-			Set the final offset of the groove on body A.
+				Set the length of the groove.
 			</description>
 		</method>
 	</methods>
@@ -14548,10 +14471,10 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="HBoxContainer" inherits="BoxContainer" category="Core">
 	<brief_description>
-	Horizontal box container.
+		Horizontal box container.
 	</brief_description>
 	<description>
-	Horizontal box container. See [BoxContainer].
+		Horizontal box container. See [BoxContainer].
 	</description>
 	<methods>
 	</methods>
@@ -14564,10 +14487,10 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="HButtonArray" inherits="ButtonArray" category="Core">
 	<brief_description>
-	Horizontal button array.
+		Horizontal button array.
 	</brief_description>
 	<description>
-	Horizontal button array. See [ButtonArray].
+		Horizontal button array. See [ButtonArray].
 	</description>
 	<methods>
 	</methods>
@@ -14576,62 +14499,62 @@ This approximation makes straight segments between each point, then subdivides t
 	<theme_items>
 		<theme_item name="button_separator" type="int">
 		</theme_item>
-		<theme_item name="icon_separator" type="int">
+		<theme_item name="focus" type="StyleBox">
 		</theme_item>
-		<theme_item name="font_color_selected" type="Color">
+		<theme_item name="font" type="Font">
 		</theme_item>
 		<theme_item name="font_color" type="Color">
 		</theme_item>
-		<theme_item name="font_selected" type="Font">
+		<theme_item name="font_color_selected" type="Color">
 		</theme_item>
-		<theme_item name="font" type="Font">
+		<theme_item name="font_selected" type="Font">
 		</theme_item>
 		<theme_item name="hover" type="StyleBox">
 		</theme_item>
-		<theme_item name="focus" type="StyleBox">
-		</theme_item>
-		<theme_item name="selected" type="StyleBox">
+		<theme_item name="icon_separator" type="int">
 		</theme_item>
 		<theme_item name="normal" type="StyleBox">
 		</theme_item>
+		<theme_item name="selected" type="StyleBox">
+		</theme_item>
 	</theme_items>
 </class>
 <class name="HScrollBar" inherits="ScrollBar" category="Core">
 	<brief_description>
-	Horizontal scroll bar.
+		Horizontal scroll bar.
 	</brief_description>
 	<description>
-	Horizontal scroll bar. See [ScrollBar]. This one goes from left (min) to right (max).
+		Horizontal scroll bar. See [ScrollBar]. This one goes from left (min) to right (max).
 	</description>
 	<methods>
 	</methods>
 	<constants>
 	</constants>
 	<theme_items>
-		<theme_item name="increment_hilite" type="Texture">
+		<theme_item name="decrement" type="Texture">
 		</theme_item>
 		<theme_item name="decrement_hilite" type="Texture">
 		</theme_item>
-		<theme_item name="increment" type="Texture">
-		</theme_item>
-		<theme_item name="decrement" type="Texture">
+		<theme_item name="grabber" type="StyleBox">
 		</theme_item>
 		<theme_item name="grabber_hilite" type="StyleBox">
 		</theme_item>
-		<theme_item name="grabber" type="StyleBox">
+		<theme_item name="increment" type="Texture">
 		</theme_item>
-		<theme_item name="scroll_focus" type="StyleBox">
+		<theme_item name="increment_hilite" type="Texture">
 		</theme_item>
 		<theme_item name="scroll" type="StyleBox">
 		</theme_item>
+		<theme_item name="scroll_focus" type="StyleBox">
+		</theme_item>
 	</theme_items>
 </class>
 <class name="HSeparator" inherits="Separator" category="Core">
 	<brief_description>
-	Horizontal separator.
+		Horizontal separator.
 	</brief_description>
 	<description>
-	Horizontal separator. See [Separator]. It is used to separate objects vertically, though (but it looks horizontal!).
+		Horizontal separator. See [Separator]. It is used to separate objects vertically, though (but it looks horizontal!).
 	</description>
 	<methods>
 	</methods>
@@ -14646,36 +14569,36 @@ This approximation makes straight segments between each point, then subdivides t
 </class>
 <class name="HSlider" inherits="Slider" category="Core">
 	<brief_description>
-	Horizontal slider.
+		Horizontal slider.
 	</brief_description>
 	<description>
-	Horizontal slider. See [Slider]. This one goes from left (min) to right (max).
+		Horizontal slider. See [Slider]. This one goes from left (min) to right (max).
 	</description>
 	<methods>
 	</methods>
 	<constants>
 	</constants>
 	<theme_items>
-		<theme_item name="tick" type="Texture">
-		</theme_item>
-		<theme_item name="grabber_hilite" type="Texture">
+		<theme_item name="focus" type="StyleBox">
 		</theme_item>
 		<theme_item name="grabber" type="Texture">
 		</theme_item>
+		<theme_item name="grabber_hilite" type="Texture">
+		</theme_item>
 		<theme_item name="grabber_hilite" type="StyleBox">
 		</theme_item>
 		<theme_item name="slider" type="StyleBox">
 		</theme_item>
-		<theme_item name="focus" type="StyleBox">
+		<theme_item name="tick" type="Texture">
 		</theme_item>
 	</theme_items>
 </class>
 <class name="HSplitContainer" inherits="SplitContainer" category="Core">
 	<brief_description>
-	Horizontal split container.
+		Horizontal split container.
 	</brief_description>
 	<description>
-	Horizontal split container. See [SplitContainer]. This goes from left to right.
+		Horizontal split container. See [SplitContainer]. This goes from left to right.
 	</description>
 	<methods>
 	</methods>
@@ -14684,23 +14607,28 @@ This approximation makes straight segments between each point, then subdivides t
 	<theme_items>
 		<theme_item name="autohide" type="int">
 		</theme_item>
-		<theme_item name="separation" type="int">
+		<theme_item name="bg" type="StyleBox">
 		</theme_item>
 		<theme_item name="grabber" type="Texture">
 		</theme_item>
-		<theme_item name="bg" type="StyleBox">
+		<theme_item name="separation" type="int">
 		</theme_item>
 	</theme_items>
 </class>
 <class name="HTTPClient" inherits="Reference" category="Core">
 	<brief_description>
-	Hyper-text transfer protocol client.
+		Hyper-text transfer protocol client.
 	</brief_description>
 	<description>
-	Hyper-text transfer protocol client. Supports SSL and SSL server certificate verification.
-	Can be reused to connect to different hosts and make many requests.
+		Hyper-text transfer protocol client. Supports SSL and SSL server certificate verification.
+		Can be reused to connect to different hosts and make many requests.
 	</description>
 	<methods>
+		<method name="close">
+			<description>
+				Cloces the current connection, allows for reusal of [HTTPClient].
+			</description>
+		</method>
 		<method name="connect">
 			<return type="Error">
 			</return>
@@ -14713,186 +14641,181 @@ This approximation makes straight segments between each point, then subdivides t
 			<argument index="3" name="verify_host" type="bool" default="true">
 			</argument>
 			<description>
-			Connect to a host. This needs to be done before any requests are sent.
-			The host should not have http:// prepended but will strip the protocol identifier if provided.
-			verify_host will check the SSL identity of the host if set to true.
-			</description>
-		</method>
-		<method name="set_connection">
-			<argument index="0" name="connection" type="StreamPeer">
-			</argument>
-			<description>
-			Set connection to use, for this client.
+				Connect to a host. This needs to be done before any requests are sent.
+				The host should not have http:// prepended but will strip the protocol identifier if provided.
+				verify_host will check the SSL identity of the host if set to true.
 			</description>
 		</method>
 		<method name="get_connection" qualifiers="const">
 			<return type="StreamPeer">
 			</return>
 			<description>
-			Return current connection.
+				Return current connection.
 			</description>
 		</method>
-		<method name="request_raw">
+		<method name="get_response_body_length" qualifiers="const">
 			<return type="int">
 			</return>
-			<argument index="0" name="method" type="int">
-			</argument>
-			<argument index="1" name="url" type="String">
-			</argument>
-			<argument index="2" name="headers" type="StringArray">
-			</argument>
-			<argument index="3" name="body" type="RawArray">
-			</argument>
 			<description>
-			Sends a raw request to the connected host. The url is what is normally behind the hostname, i.e. in [code]http://somehost.com/index.php[/code], url would be "index.php".
-			Headers are HTTP request headers.
-			Sends body raw, as a byte array, does not encode it in any way.
+				Return the response's body length.
 			</description>
 		</method>
-		<method name="request">
+		<method name="get_response_code" qualifiers="const">
 			<return type="int">
 			</return>
-			<argument index="0" name="method" type="int">
-			</argument>
-			<argument index="1" name="url" type="String">
-			</argument>
-			<argument index="2" name="headers" type="StringArray">
-			</argument>
-			<argument index="3" name="body" type="String" default="&quot;&quot;">
-			</argument>
 			<description>
-			Sends a request to the connected host. The url is what is normally behind the hostname, i.e. in [code]http://somehost.com/index.php[/code], url would be "index.php".
-			Headers are HTTP request headers.
-			To create a POST request with query strings to push to the server, do:
-			[codeblock]
-			var fields = {"username" : "user", "password" : "pass"}
-			var queryString = httpClient.query_string_from_dict(fields)
-			var headers = ["Content-Type: application/x-www-form-urlencoded", "Content-Length: " + str(queryString.length())]
-			var result = httpClient.request(httpClient.METHOD_POST, "index.php", headers, queryString)
-			[/codeblock]
+				Return the HTTP status code of the response.
 			</description>
 		</method>
-		<method name="send_body_text">
-			<return type="int">
+		<method name="get_response_headers">
+			<return type="StringArray">
 			</return>
-			<argument index="0" name="body" type="String">
-			</argument>
 			<description>
-			Stub function
+				Return the response headers.
 			</description>
 		</method>
-		<method name="send_body_data">
-			<return type="int">
+		<method name="get_response_headers_as_dictionary">
+			<return type="Dictionary">
 			</return>
-			<argument index="0" name="body" type="RawArray">
-			</argument>
 			<description>
-			Stub function
+				Returns all response headers as dictionary where the case-sensitivity of the keys and values is kept like the server delivers it. A value is a simple String, this string can have more than one value where "; " is used as separator.
+				Structure: ("key":"value1; value2")
+				Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			</description>
 		</method>
-		<method name="close">
+		<method name="get_status" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Cloces the current connection, allows for reusal of [HTTPClient].
+				Returns a status string like STATUS_REQUESTING. Need to call [method poll] in order to get status updates.
 			</description>
 		</method>
 		<method name="has_response" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return whether this [HTTPClient] has a response available.
+				Return whether this [HTTPClient] has a response available.
 			</description>
 		</method>
-		<method name="is_response_chunked" qualifiers="const">
+		<method name="is_blocking_mode_enabled" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return whether this [HTTPClient] has a response that is chunked.
-			</description>
-		</method>
-		<method name="get_response_code" qualifiers="const">
-			<return type="int">
-			</return>
-			<description>
-			Return the HTTP status code of the response.
+				Return whether blocking mode is enabled.
 			</description>
 		</method>
-		<method name="get_response_headers">
-			<return type="StringArray">
+		<method name="is_response_chunked" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the response headers.
+				Return whether this [HTTPClient] has a response that is chunked.
 			</description>
 		</method>
-		<method name="get_response_headers_as_dictionary">
-			<return type="Dictionary">
+		<method name="poll">
+			<return type="Error">
 			</return>
 			<description>
-			Returns all response headers as dictionary where the case-sensitivity of the keys and values is kept like the server delivers it. A value is a simple String, this string can have more than one value where "; " is used as separator.
-Structure: ("key":"value1; value2")
-Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
+				This needs to be called in order to have any request processed. Check results with [method get_status]
 			</description>
 		</method>
-		<method name="get_response_body_length" qualifiers="const">
-			<return type="int">
+		<method name="query_string_from_dict">
+			<return type="String">
 			</return>
+			<argument index="0" name="fields" type="Dictionary">
+			</argument>
 			<description>
-			Return the response's body length.
+				Generates a GET/POST application/x-www-form-urlencoded style query string from a provided dictionary, e.g.:
+				[codeblock]
+				var fields = {"username": "user", "password": "pass"}
+				String queryString = httpClient.query_string_from_dict(fields)
+				returns:= "username=user&amp;password=pass"
+				[/codeblock]
 			</description>
 		</method>
 		<method name="read_response_body_chunk">
 			<return type="RawArray">
 			</return>
 			<description>
-			Reads one chunk from the response.
+				Reads one chunk from the response.
 			</description>
 		</method>
-		<method name="set_read_chunk_size">
-			<argument index="0" name="bytes" type="int">
+		<method name="request">
+			<return type="int">
+			</return>
+			<argument index="0" name="method" type="int">
+			</argument>
+			<argument index="1" name="url" type="String">
+			</argument>
+			<argument index="2" name="headers" type="StringArray">
+			</argument>
+			<argument index="3" name="body" type="String" default="&quot;&quot;">
 			</argument>
 			<description>
-			Sets the size of the buffer used and maximum bytes to read per iteration. see [method read_response_body_chunk]
+				Sends a request to the connected host. The url is what is normally behind the hostname, i.e. in [code]http://somehost.com/index.php[/code], url would be "index.php".
+				Headers are HTTP request headers.
+				To create a POST request with query strings to push to the server, do:
+				[codeblock]
+				var fields = {"username" : "user", "password" : "pass"}
+				var queryString = httpClient.query_string_from_dict(fields)
+				var headers = ["Content-Type: application/x-www-form-urlencoded", "Content-Length: " + str(queryString.length())]
+				var result = httpClient.request(httpClient.METHOD_POST, "index.php", headers, queryString)
+				[/codeblock]
 			</description>
 		</method>
-		<method name="set_blocking_mode">
-			<argument index="0" name="enabled" type="bool">
+		<method name="request_raw">
+			<return type="int">
+			</return>
+			<argument index="0" name="method" type="int">
+			</argument>
+			<argument index="1" name="url" type="String">
+			</argument>
+			<argument index="2" name="headers" type="StringArray">
+			</argument>
+			<argument index="3" name="body" type="RawArray">
 			</argument>
 			<description>
-			If set to true, execution will block until all data is read from the response.
+				Sends a raw request to the connected host. The url is what is normally behind the hostname, i.e. in [code]http://somehost.com/index.php[/code], url would be "index.php".
+				Headers are HTTP request headers.
+				Sends body raw, as a byte array, does not encode it in any way.
 			</description>
 		</method>
-		<method name="is_blocking_mode_enabled" qualifiers="const">
-			<return type="bool">
+		<method name="send_body_data">
+			<return type="int">
 			</return>
+			<argument index="0" name="body" type="RawArray">
+			</argument>
 			<description>
-			Return whether blocking mode is enabled.
+				Stub function
 			</description>
 		</method>
-		<method name="get_status" qualifiers="const">
+		<method name="send_body_text">
 			<return type="int">
 			</return>
+			<argument index="0" name="body" type="String">
+			</argument>
 			<description>
-			Returns a status string like STATUS_REQUESTING. Need to call [method poll] in order to get status updates.
+				Stub function
 			</description>
 		</method>
-		<method name="poll">
-			<return type="Error">
-			</return>
+		<method name="set_blocking_mode">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
-			This needs to be called in order to have any request processed. Check results with [method get_status]
+				If set to true, execution will block until all data is read from the response.
 			</description>
 		</method>
-		<method name="query_string_from_dict">
-			<return type="String">
-			</return>
-			<argument index="0" name="fields" type="Dictionary">
+		<method name="set_connection">
+			<argument index="0" name="connection" type="StreamPeer">
+			</argument>
+			<description>
+				Set connection to use, for this client.
+			</description>
+		</method>
+		<method name="set_read_chunk_size">
+			<argument index="0" name="bytes" type="int">
 			</argument>
 			<description>
-			Generates a GET/POST application/x-www-form-urlencoded style query string from a provided dictionary, e.g.:
-			[codeblock]
-			var fields = {"username": "user", "password": "pass"}
-			String queryString = httpClient.query_string_from_dict(fields)
-			returns:= "username=user&amp;password=pass"
-			[/codeblock]
+				Sets the size of the buffer used and maximum bytes to read per iteration. see [method read_response_body_chunk]
 			</description>
 		</method>
 	</methods>
@@ -15037,108 +14960,108 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="HTTPRequest" inherits="Node" category="Core">
 	<brief_description>
-	A Node with the ability to send HTTP requests.
+		A Node with the ability to send HTTP requests.
 	</brief_description>
 	<description>
-	A Node with the ability to send HTTP requests. Uses a [HTTPClient] internally, supports HTTPS.
-	Can be used to make HTTP requests or download files via HTTP.
+		A Node with the ability to send HTTP requests. Uses a [HTTPClient] internally, supports HTTPS.
+		Can be used to make HTTP requests or download files via HTTP.
 	</description>
 	<methods>
-		<method name="request">
-			<return type="int">
-			</return>
-			<argument index="0" name="url" type="String">
-			</argument>
-			<argument index="1" name="custom_headers" type="StringArray" default="StringArray()">
-			</argument>
-			<argument index="2" name="ssl_validate_domain" type="bool" default="true">
-			</argument>
+		<method name="cancel_request">
 			<description>
-			Make a HTTP GET request. The url is the complete url including "http://" or "https://" which will be parsed for a host and a port.
-			The custom_headers are HTTP request headers which will be used. If User-Agent is not specified a Godot specific will be used.
-			The ssl_validate_domain specifies if in case of HTTPS the server certificate should be verified.
+				Cancel the current request.
 			</description>
 		</method>
-		<method name="cancel_request">
+		<method name="get_body_size" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Cancel the current request.
+				Return the response body length.
 			</description>
 		</method>
-		<method name="get_http_client_status" qualifiers="const">
+		<method name="get_body_size_limit" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the current status of the underlying [HTTPClient].
+				Return current body size limit.
 			</description>
 		</method>
-		<method name="set_use_threads">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="get_download_file" qualifiers="const">
+			<return type="String">
+			</return>
 			<description>
-			Make this HTTPRequest use threads.
+				Return the file this request will download into.
 			</description>
 		</method>
-		<method name="is_using_threads" qualifiers="const">
-			<return type="bool">
+		<method name="get_downloaded_bytes" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Whether this request is using threads.
+				Return the amount of bytes this HTTPRequest downloaded.
 			</description>
 		</method>
-		<method name="set_body_size_limit">
-			<argument index="0" name="bytes" type="int">
-			</argument>
+		<method name="get_http_client_status" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the response body size limit.
+				Return the current status of the underlying [HTTPClient].
 			</description>
 		</method>
-		<method name="get_body_size_limit" qualifiers="const">
+		<method name="get_max_redirects" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return current body size limit.
+				Return the maximum amount of redirects that will be followed.
 			</description>
 		</method>
-		<method name="set_max_redirects">
-			<argument index="0" name="amount" type="int">
-			</argument>
+		<method name="is_using_threads" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the maximum amount of redirects the request will follow.
+				Whether this request is using threads.
 			</description>
 		</method>
-		<method name="get_max_redirects" qualifiers="const">
+		<method name="request">
 			<return type="int">
 			</return>
+			<argument index="0" name="url" type="String">
+			</argument>
+			<argument index="1" name="custom_headers" type="StringArray" default="StringArray([])">
+			</argument>
+			<argument index="2" name="ssl_validate_domain" type="bool" default="true">
+			</argument>
 			<description>
-			Return the maximum amount of redirects that will be followed.
+				Make a HTTP GET request. The url is the complete url including "http://" or "https://" which will be parsed for a host and a port.
+				The custom_headers are HTTP request headers which will be used. If User-Agent is not specified a Godot specific will be used.
+				The ssl_validate_domain specifies if in case of HTTPS the server certificate should be verified.
 			</description>
 		</method>
-		<method name="set_download_file">
-			<argument index="0" name="path" type="String">
+		<method name="set_body_size_limit">
+			<argument index="0" name="bytes" type="int">
 			</argument>
 			<description>
-			Set the file to download into. Outputs the response body into the file.
+				Set the response body size limit.
 			</description>
 		</method>
-		<method name="get_download_file" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="set_download_file">
+			<argument index="0" name="path" type="String">
+			</argument>
 			<description>
-			Return the file this request will download into.
+				Set the file to download into. Outputs the response body into the file.
 			</description>
 		</method>
-		<method name="get_downloaded_bytes" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_max_redirects">
+			<argument index="0" name="amount" type="int">
+			</argument>
 			<description>
-			Return the amount of bytes this HTTPRequest downloaded.
+				Set the maximum amount of redirects the request will follow.
 			</description>
 		</method>
-		<method name="get_body_size" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_use_threads">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Return the response body length.
+				Make this HTTPRequest use threads.
 			</description>
 		</method>
 	</methods>
@@ -15153,7 +15076,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="3" name="body" type="RawArray">
 			</argument>
 			<description>
-			This signal is emitted upon request completion.
+				This signal is emitted upon request completion.
 			</description>
 		</signal>
 	</signals>
@@ -15201,10 +15124,10 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<description>
 	</description>
 	<methods>
-		<method name="set_param">
-			<argument index="0" name="param" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
+		<method name="get_flag" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="flag" type="int">
 			</argument>
 			<description>
 			</description>
@@ -15225,10 +15148,10 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="get_flag" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="flag" type="int">
+		<method name="set_param">
+			<argument index="0" name="param" type="int">
+			</argument>
+			<argument index="1" name="value" type="float">
 			</argument>
 			<description>
 			</description>
@@ -15263,59 +15186,59 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="IP" inherits="Object" category="Core">
 	<brief_description>
-	IP Protocol support functions.
+		IP Protocol support functions.
 	</brief_description>
 	<description>
-	IP contains some support functions for the IPv4 protocol. TCP/IP support is in different classes (see [StreamPeerTCP] and [TCP_Server]). IP provides hostname resolution support, both blocking and threaded.
+		IP contains some support functions for the IPv4 protocol. TCP/IP support is in different classes (see [StreamPeerTCP] and [TCP_Server]). IP provides hostname resolution support, both blocking and threaded.
 	</description>
 	<methods>
-		<method name="resolve_hostname">
-			<return type="String">
-			</return>
-			<argument index="0" name="host" type="String">
+		<method name="erase_resolve_item">
+			<argument index="0" name="id" type="int">
 			</argument>
 			<description>
-			Resolve a given hostname, blocking. Resolved hostname is returned as an IP.
+				Erase a queue ID, removing it from the queue if needed. This should be used after a queue is completed to free it and enable more queries to happen.
 			</description>
 		</method>
-		<method name="resolve_hostname_queue_item">
-			<return type="int">
+		<method name="get_local_addresses" qualifiers="const">
+			<return type="Array">
 			</return>
-			<argument index="0" name="host" type="String">
-			</argument>
 			<description>
-			Create a queue item for resolving a given hostname. The queue ID is returned, or RESOLVER_INVALID_ID on error.
 			</description>
 		</method>
-		<method name="get_resolve_item_status" qualifiers="const">
-			<return type="int">
+		<method name="get_resolve_item_address" qualifiers="const">
+			<return type="String">
 			</return>
 			<argument index="0" name="id" type="int">
 			</argument>
 			<description>
-			Return the status of hostname queued for resolving, given it's queue ID. Returned status can be any of the RESOLVER_STATUS_* enumeration.
+				Return a resolved item address, or an empty string if an error happened or resolution didn't happen yet (see [method get_resolve_item_status]).
 			</description>
 		</method>
-		<method name="get_resolve_item_address" qualifiers="const">
-			<return type="String">
+		<method name="get_resolve_item_status" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="id" type="int">
 			</argument>
 			<description>
-			Return a resolved item address, or an empty string if an error happened or resolution didn't happen yet (see [method get_resolve_item_status]).
+				Return the status of hostname queued for resolving, given it's queue ID. Returned status can be any of the RESOLVER_STATUS_* enumeration.
 			</description>
 		</method>
-		<method name="erase_resolve_item">
-			<argument index="0" name="id" type="int">
+		<method name="resolve_hostname">
+			<return type="String">
+			</return>
+			<argument index="0" name="host" type="String">
 			</argument>
 			<description>
-			Erase a queue ID, removing it from the queue if needed. This should be used after a queue is completed to free it and enable more queries to happen.
+				Resolve a given hostname, blocking. Resolved hostname is returned as an IP.
 			</description>
 		</method>
-		<method name="get_local_addresses" qualifiers="const">
-			<return type="Array">
+		<method name="resolve_hostname_queue_item">
+			<return type="int">
 			</return>
+			<argument index="0" name="host" type="String">
+			</argument>
 			<description>
+				Create a queue item for resolving a given hostname. The queue ID is returned, or RESOLVER_INVALID_ID on error.
 			</description>
 		</method>
 	</methods>
@@ -15346,12 +15269,27 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="Image" category="Built-In Types">
 	<brief_description>
-	Image datatype.
+		Image datatype.
 	</brief_description>
 	<description>
-	Built in native image datatype. Contains image data, which can be converted to a texture, and several functions to interact with it.
+		Built in native image datatype. Contains image data, which can be converted to a texture, and several functions to interact with it.
 	</description>
 	<methods>
+		<method name="Image">
+			<return type="Image">
+			</return>
+			<argument index="0" name="width" type="int">
+			</argument>
+			<argument index="1" name="height" type="int">
+			</argument>
+			<argument index="2" name="mipmaps" type="bool">
+			</argument>
+			<argument index="3" name="format" type="int">
+			</argument>
+			<description>
+				Create an empty image of a specific size and format.
+			</description>
+		</method>
 		<method name="blit_rect">
 			<argument index="0" name="src" type="Image">
 			</argument>
@@ -15360,7 +15298,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="2" name="dest" type="Vector2" default="0">
 			</argument>
 			<description>
-			Copy a "src_rect" [Rect2] from "src" [Image] to this [Image] on coordinates "dest".
+				Copy a "src_rect" [Rect2] from "src" [Image] to this [Image] on coordinates "dest".
 			</description>
 		</method>
 		<method name="brush_transfer">
@@ -15371,7 +15309,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="2" name="pos" type="Vector2" default="0">
 			</argument>
 			<description>
-			Transfer data from "src" to this [Image] using a "brush" as a mask/brush on coordinates "pos".
+				Transfer data from "src" to this [Image] using a "brush" as a mask/brush on coordinates "pos".
 			</description>
 		</method>
 		<method name="brushed">
@@ -15384,7 +15322,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="2" name="pos" type="Vector2" default="0">
 			</argument>
 			<description>
-			Return a new [Image] from this [Image] that is created by brushhing see [method brush_transfer].
+				Return a new [Image] from this [Image] that is created by brushhing see [method brush_transfer].
 			</description>
 		</method>
 		<method name="compressed">
@@ -15393,7 +15331,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="format" type="int" default="0">
 			</argument>
 			<description>
-			Return a new compressed [Image] from this [Image] using one of [Image].COMPRESS_*.
+				Return a new compressed [Image] from this [Image] using one of [Image].COMPRESS_*.
 			</description>
 		</method>
 		<method name="converted">
@@ -15402,21 +15340,21 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="format" type="int" default="0">
 			</argument>
 			<description>
-			Return a new [Image] from this [Image] with a different format.
+				Return a new [Image] from this [Image] with a different format.
 			</description>
 		</method>
 		<method name="decompressed">
 			<return type="Image">
 			</return>
 			<description>
-			Return a new decompressed [Image].
+				Return a new decompressed [Image].
 			</description>
 		</method>
 		<method name="empty">
 			<return type="bool">
 			</return>
 			<description>
-			Return whether this [Image] is empty(no data).
+				Return whether this [Image] is empty(no data).
 			</description>
 		</method>
 		<method name="fix_alpha_edges">
@@ -15427,21 +15365,21 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<return type="RawArray">
 			</return>
 			<description>
-			Return the raw data of the [Image].
+				Return the raw data of the [Image].
 			</description>
 		</method>
 		<method name="get_format">
 			<return type="int">
 			</return>
 			<description>
-			Return the format of the [Image], one of [Image].FORMAT_*.
+				Return the format of the [Image], one of [Image].FORMAT_*.
 			</description>
 		</method>
 		<method name="get_height">
 			<return type="int">
 			</return>
 			<description>
-			Return the height of the [Image].
+				Return the height of the [Image].
 			</description>
 		</method>
 		<method name="get_pixel">
@@ -15454,7 +15392,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="2" name="mipmap_level" type="int" default="0">
 			</argument>
 			<description>
-			Return the color of the pixel in the [Image] on coordinates "x,y" on mipmap level "mipmap_level".
+				Return the color of the pixel in the [Image] on coordinates "x,y" on mipmap level "mipmap_level".
 			</description>
 		</method>
 		<method name="get_rect">
@@ -15463,21 +15401,21 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="area" type="Rect2" default="0">
 			</argument>
 			<description>
-			Return a new [Image] that is a copy of "area" in this [Image].
+				Return a new [Image] that is a copy of "area" in this [Image].
 			</description>
 		</method>
 		<method name="get_used_rect">
 			<return type="Rect2">
 			</return>
 			<description>
-			Return the area of this [Image] that is used/visibly colored/opaque.
+				Return the area of this [Image] that is used/visibly colored/opaque.
 			</description>
 		</method>
 		<method name="get_width">
 			<return type="int">
 			</return>
 			<description>
-			Return the width of the [Image].
+				Return the width of the [Image].
 			</description>
 		</method>
 		<method name="load">
@@ -15486,7 +15424,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="path" type="String" default="0">
 			</argument>
 			<description>
-			Load an [Image].
+				Load an [Image].
 			</description>
 		</method>
 		<method name="put_pixel">
@@ -15499,7 +15437,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="3" name="mipmap_level" type="int" default="0">
 			</argument>
 			<description>
-			Put a pixel of "color" on coordinates "x,y" on mipmap level "mipmap_level".
+				Put a pixel of "color" on coordinates "x,y" on mipmap level "mipmap_level".
 			</description>
 		</method>
 		<method name="resized">
@@ -15512,7 +15450,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="2" name="interpolation" type="int" default="1">
 			</argument>
 			<description>
-			Return a new [Image] from this [Image] that is resized to size "x,y" using [Image].INTERPOLATE_*.
+				Return a new [Image] from this [Image] that is resized to size "x,y" using [Image].INTERPOLATE_*.
 			</description>
 		</method>
 		<method name="save_png">
@@ -15521,22 +15459,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="path" type="String" default="0">
 			</argument>
 			<description>
-			Save this [Image] as a png.
-			</description>
-		</method>
-		<method name="Image">
-			<return type="Image">
-			</return>
-			<argument index="0" name="width" type="int">
-			</argument>
-			<argument index="1" name="height" type="int">
-			</argument>
-			<argument index="2" name="mipmaps" type="bool">
-			</argument>
-			<argument index="3" name="format" type="int">
-			</argument>
-			<description>
-			Create an empty image of a specific size and format.
+				Save this [Image] as a png.
 			</description>
 		</method>
 	</methods>
@@ -15605,10 +15528,10 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="ImageTexture" inherits="Texture" category="Core">
 	<brief_description>
-	A [Texture] based on an [Image].
+		A [Texture] based on an [Image].
 	</brief_description>
 	<description>
-	A [Texture] based on an [Image]. Can be created from an [Image].
+		A [Texture] based on an [Image]. Can be created from an [Image].
 	</description>
 	<methods>
 		<method name="create">
@@ -15621,9 +15544,9 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="3" name="flags" type="int" default="7">
 			</argument>
 			<description>
-			Create a new [ImageTexture] with "width" and "height".
-			"format" one of [Image].FORMAT_*.
-			"flags" one or more of [Texture].FLAG_*.
+				Create a new [ImageTexture] with "width" and "height".
+				"format" one of [Image].FORMAT_*.
+				"flags" one or more of [Texture].FLAG_*.
 			</description>
 		</method>
 		<method name="create_from_image">
@@ -15632,66 +15555,49 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="flags" type="int" default="7">
 			</argument>
 			<description>
-			Create a new [ImageTexture] from an [Image] with "flags" from [Texture].FLAG_*.
+				Create a new [ImageTexture] from an [Image] with "flags" from [Texture].FLAG_*.
 			</description>
 		</method>
-		<method name="get_format" qualifiers="const">
-			<return type="int">
-			</return>
-			<description>
-			Return the format of the [ImageTexture], one of [Image].FORMAT_*.
-			</description>
-		</method>
-		<method name="load">
-			<argument index="0" name="path" type="String">
-			</argument>
+		<method name="fix_alpha_edges">
 			<description>
-			Load an [ImageTexure].
 			</description>
 		</method>
-		<method name="set_data">
-			<argument index="0" name="image" type="Image">
-			</argument>
+		<method name="get_data" qualifiers="const">
+			<return type="Image">
+			</return>
 			<description>
-			Set the [Image] of this [ImageTexture].
+				Return the [Image] of this [ImageTexture].
 			</description>
 		</method>
-		<method name="get_data" qualifiers="const">
-			<return type="Image">
+		<method name="get_format" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the [Image] of this [ImageTexture].
+				Return the format of the [ImageTexture], one of [Image].FORMAT_*.
 			</description>
 		</method>
-		<method name="set_storage">
-			<argument index="0" name="mode" type="int">
-			</argument>
+		<method name="get_lossy_storage_quality" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the storage type. One of [ImageTexture].STORAGE_*.
+				Return the storage quality for [ImageTexture].STORAGE_COMPRESS_LOSSY.
 			</description>
 		</method>
 		<method name="get_storage" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the storage type. One of [ImageTexture].STORAGE_*.
+				Return the storage type. One of [ImageTexture].STORAGE_*.
 			</description>
 		</method>
-		<method name="set_lossy_storage_quality">
-			<argument index="0" name="quality" type="float">
+		<method name="load">
+			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
-			Set the storage quality in case of [ImageTexture].STORAGE_COMPRESS_LOSSY.
-			</description>
-		</method>
-		<method name="get_lossy_storage_quality" qualifiers="const">
-			<return type="float">
-			</return>
-			<description>
-			Return the storage quality for [ImageTexture].STORAGE_COMPRESS_LOSSY.
+				Load an [ImageTexure].
 			</description>
 		</method>
-		<method name="fix_alpha_edges">
+		<method name="normal_to_xy">
 			<description>
 			</description>
 		</method>
@@ -15699,12 +15605,18 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="normal_to_xy">
+		<method name="set_data">
+			<argument index="0" name="image" type="Image">
+			</argument>
 			<description>
+				Set the [Image] of this [ImageTexture].
 			</description>
 		</method>
-		<method name="shrink_x2_and_keep_size">
+		<method name="set_lossy_storage_quality">
+			<argument index="0" name="quality" type="float">
+			</argument>
 			<description>
+				Set the storage quality in case of [ImageTexture].STORAGE_COMPRESS_LOSSY.
 			</description>
 		</method>
 		<method name="set_size_override">
@@ -15713,6 +15625,17 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
+		<method name="set_storage">
+			<argument index="0" name="mode" type="int">
+			</argument>
+			<description>
+				Set the storage type. One of [ImageTexture].STORAGE_*.
+			</description>
+		</method>
+		<method name="shrink_x2_and_keep_size">
+			<description>
+			</description>
+		</method>
 	</methods>
 	<constants>
 		<constant name="STORAGE_RAW" value="0">
@@ -15732,65 +15655,65 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<description>
 	</description>
 	<methods>
-		<method name="begin">
-			<argument index="0" name="primitive" type="int">
+		<method name="add_sphere">
+			<argument index="0" name="lats" type="int">
 			</argument>
-			<argument index="1" name="texture" type="Texture">
+			<argument index="1" name="lons" type="int">
+			</argument>
+			<argument index="2" name="radius" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_normal">
-			<argument index="0" name="normal" type="Vector3">
+		<method name="add_vertex">
+			<argument index="0" name="pos" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_tangent">
-			<argument index="0" name="tangent" type="Plane">
+		<method name="begin">
+			<argument index="0" name="primitive" type="int">
+			</argument>
+			<argument index="1" name="texture" type="Texture">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_color">
-			<argument index="0" name="color" type="Color">
-			</argument>
+		<method name="clear">
 			<description>
 			</description>
 		</method>
-		<method name="set_uv">
-			<argument index="0" name="uv" type="Vector2">
-			</argument>
+		<method name="end">
 			<description>
 			</description>
 		</method>
-		<method name="set_uv2">
-			<argument index="0" name="uv" type="Vector2">
+		<method name="set_color">
+			<argument index="0" name="color" type="Color">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="add_vertex">
-			<argument index="0" name="pos" type="Vector3">
+		<method name="set_normal">
+			<argument index="0" name="normal" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="add_sphere">
-			<argument index="0" name="lats" type="int">
-			</argument>
-			<argument index="1" name="lons" type="int">
-			</argument>
-			<argument index="2" name="radius" type="float">
+		<method name="set_tangent">
+			<argument index="0" name="tangent" type="Plane">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="end">
+		<method name="set_uv">
+			<argument index="0" name="uv" type="Vector2">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="clear">
+		<method name="set_uv2">
+			<argument index="0" name="uv" type="Vector2">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -15800,48 +15723,24 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="Input" inherits="Object" category="Core">
 	<brief_description>
-	A Singleton that deals with inputs.
+		A Singleton that deals with inputs.
 	</brief_description>
 	<description>
-	A Singleton that deals with inputs. This includes key presses, mouse buttons and movement, joysticks, and input actions.
+		A Singleton that deals with inputs. This includes key presses, mouse buttons and movement, joysticks, and input actions.
 	</description>
 	<methods>
-		<method name="is_key_pressed">
-			<return type="bool">
-			</return>
-			<argument index="0" name="scancode" type="int">
-			</argument>
-			<description>
-			Returns true or false depending on whether the key is pressed or not. You can pass KEY_*, which are pre-defined constants listed in [@Global Scope].
-			</description>
-		</method>
-		<method name="is_mouse_button_pressed">
-			<return type="bool">
-			</return>
-			<argument index="0" name="button" type="int">
-			</argument>
-			<description>
-			Returns true or false depending on whether mouse button is pressed or not. You can pass BUTTON_*, which are pre-defined constants listed in [@Global Scope].
-			</description>
-		</method>
-		<method name="is_joy_button_pressed">
-			<return type="bool">
-			</return>
-			<argument index="0" name="device" type="int">
-			</argument>
-			<argument index="1" name="button" type="int">
+		<method name="action_press">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
-			Returns if the joystick button at the given index is currently pressed. (see JOY_* constants in [@Global Scope])
+				This will simulate pressing the specificed action.
 			</description>
 		</method>
-		<method name="is_action_pressed">
-			<return type="bool">
-			</return>
+		<method name="action_release">
 			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
-			Returns true or false depending on whether the action event is pressed. Actions and their events can be set in the Project Settings / Input Map tab. Or be set with [InputMap].
+				If the specified action is already pressed, this will release it.
 			</description>
 		</method>
 		<method name="add_joy_mapping">
@@ -15850,23 +15749,14 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="update_existing" type="bool" default="false">
 			</argument>
 			<description>
-			Add a new mapping entry (in SDL2 format) to the mapping database. Optionally update already connected devices.
-			</description>
-		</method>
-		<method name="remove_joy_mapping">
-			<argument index="0" name="guid" type="String">
-			</argument>
-			<description>
-			Removes all mappings from the internal db that match the given uid.
+				Add a new mapping entry (in SDL2 format) to the mapping database. Optionally update already connected devices.
 			</description>
 		</method>
-		<method name="is_joy_known">
-			<return type="bool">
+		<method name="get_accelerometer">
+			<return type="Vector3">
 			</return>
-			<argument index="0" name="device" type="int">
-			</argument>
 			<description>
-			Returns if the specified device is known by the system. This means that it sets all button and axis indices exactly as defined in the JOY_* constants (see [@Global Scope]). Unknown joysticks are not expected to match these constants, but you can still retrieve events from them.
+				If the device has an accelerometer, this will return the movement.
 			</description>
 		</method>
 		<method name="get_joy_axis">
@@ -15877,16 +15767,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="axis" type="int">
 			</argument>
 			<description>
-			Returns the current value of the joystick axis at given index (see JOY_* constants in [@Global Scope])
-			</description>
-		</method>
-		<method name="get_joy_name">
-			<return type="String">
-			</return>
-			<argument index="0" name="device" type="int">
-			</argument>
-			<description>
-			Returns the name of the joystick at the specified device index
+				Returns the current value of the joystick axis at given index (see JOY_* constants in [@Global Scope])
 			</description>
 		</method>
 		<method name="get_joy_guid" qualifiers="const">
@@ -15895,16 +15776,16 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="device" type="int">
 			</argument>
 			<description>
-			Returns a SDL2 compatible device guid on platforms that use gamepad remapping. Returns "Default Gamepad" otherwise.
+				Returns a SDL2 compatible device guid on platforms that use gamepad remapping. Returns "Default Gamepad" otherwise.
 			</description>
 		</method>
-		<method name="get_joy_vibration_strength">
-			<return type="Vector2">
+		<method name="get_joy_name">
+			<return type="String">
 			</return>
 			<argument index="0" name="device" type="int">
 			</argument>
 			<description>
-			Returns the strength of the joystick vibration: x is the strength of the weak motor, and y is the strength of the strong motor.
+				Returns the name of the joystick at the specified device index
 			</description>
 		</method>
 		<method name="get_joy_vibration_duration">
@@ -15913,90 +15794,98 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="device" type="int">
 			</argument>
 			<description>
-			Returns the duration of the current vibration effect in seconds.
+				Returns the duration of the current vibration effect in seconds.
 			</description>
 		</method>
-		<method name="start_joy_vibration">
+		<method name="get_joy_vibration_strength">
+			<return type="Vector2">
+			</return>
 			<argument index="0" name="device" type="int">
 			</argument>
-			<argument index="1" name="weak_magnitude" type="float">
-			</argument>
-			<argument index="2" name="strong_magnitude" type="float">
-			</argument>
-			<argument index="3" name="duration" type="float">
-			</argument>
 			<description>
-			Starts to vibrate the joystick. Joysticks usually come with two rumble motors, a strong and a weak one. weak_magnitude is the strength of the weak motor (between 0 and 1) and strong_magnitude is the strength of the strong motor (between 0 and 1). duration is the duration of the effect in seconds (a duration of 0 will play the vibration indefinitely).
+				Returns the strength of the joystick vibration: x is the strength of the weak motor, and y is the strength of the strong motor.
 			</description>
 		</method>
-		<method name="stop_joy_vibration">
-			<argument index="0" name="device" type="int">
-			</argument>
+		<method name="get_magnetometer">
+			<return type="Vector3">
+			</return>
 			<description>
-			Stops the vibration of the joystick.
+				If the device has a magnetometer, this will return the magnetic field strength in micro-Tesla for all axes.
 			</description>
 		</method>
-		<method name="get_accelerometer">
-			<return type="Vector3">
+		<method name="get_mouse_button_mask" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			If the device has an accelerometer, this will return the movement.
+				Returns mouse buttons as a bitmask. If multiple mouse buttons are pressed at the same time the bits are added together.
 			</description>
 		</method>
-		<method name="get_magnetometer">
-			<return type="Vector3">
+		<method name="get_mouse_mode" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			If the device has a magnetometer, this will return the magnetic field strength in micro-Tesla for all axes.
+				Return the mouse mode. See the constants for more information.
 			</description>
 		</method>
 		<method name="get_mouse_speed" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
-			Returns the mouse speed.
+				Returns the mouse speed.
 			</description>
 		</method>
-		<method name="get_mouse_button_mask" qualifiers="const">
-			<return type="int">
+		<method name="is_action_pressed">
+			<return type="bool">
 			</return>
+			<argument index="0" name="action" type="String">
+			</argument>
 			<description>
-			Returns mouse buttons as a bitmask. If multiple mouse buttons are pressed at the same time the bits are added together.
+				Returns true or false depending on whether the action event is pressed. Actions and their events can be set in the Project Settings / Input Map tab. Or be set with [InputMap].
 			</description>
 		</method>
-		<method name="set_mouse_mode">
-			<argument index="0" name="mode" type="int">
+		<method name="is_joy_button_pressed">
+			<return type="bool">
+			</return>
+			<argument index="0" name="device" type="int">
+			</argument>
+			<argument index="1" name="button" type="int">
 			</argument>
 			<description>
-			Set the mouse mode. See the constants for more information.
+				Returns if the joystick button at the given index is currently pressed. (see JOY_* constants in [@Global Scope])
 			</description>
 		</method>
-		<method name="get_mouse_mode" qualifiers="const">
-			<return type="int">
+		<method name="is_joy_known">
+			<return type="bool">
 			</return>
+			<argument index="0" name="device" type="int">
+			</argument>
 			<description>
-			Return the mouse mode. See the constants for more information.
+				Returns if the specified device is known by the system. This means that it sets all button and axis indices exactly as defined in the JOY_* constants (see [@Global Scope]). Unknown joysticks are not expected to match these constants, but you can still retrieve events from them.
 			</description>
 		</method>
-		<method name="warp_mouse_pos">
-			<argument index="0" name="to" type="Vector2">
+		<method name="is_key_pressed">
+			<return type="bool">
+			</return>
+			<argument index="0" name="scancode" type="int">
 			</argument>
 			<description>
-			Sets the mouse position to the specified vector.
+				Returns true or false depending on whether the key is pressed or not. You can pass KEY_*, which are pre-defined constants listed in [@Global Scope].
 			</description>
 		</method>
-		<method name="action_press">
-			<argument index="0" name="action" type="String">
+		<method name="is_mouse_button_pressed">
+			<return type="bool">
+			</return>
+			<argument index="0" name="button" type="int">
 			</argument>
 			<description>
-			This will simulate pressing the specificed action.
+				Returns true or false depending on whether mouse button is pressed or not. You can pass BUTTON_*, which are pre-defined constants listed in [@Global Scope].
 			</description>
 		</method>
-		<method name="action_release">
-			<argument index="0" name="action" type="String">
+		<method name="remove_joy_mapping">
+			<argument index="0" name="guid" type="String">
 			</argument>
 			<description>
-			If the specified action is already pressed, this will release it.
+				Removes all mappings from the internal db that match the given uid.
 			</description>
 		</method>
 		<method name="set_custom_mouse_cursor">
@@ -16005,7 +15894,41 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="hotspot" type="Vector2" default="Vector2(0,0)">
 			</argument>
 			<description>
-			Set a custom mouse cursor image, which is only visible inside the game window. The hotspot can also be specified.
+				Set a custom mouse cursor image, which is only visible inside the game window. The hotspot can also be specified.
+			</description>
+		</method>
+		<method name="set_mouse_mode">
+			<argument index="0" name="mode" type="int">
+			</argument>
+			<description>
+				Set the mouse mode. See the constants for more information.
+			</description>
+		</method>
+		<method name="start_joy_vibration">
+			<argument index="0" name="device" type="int">
+			</argument>
+			<argument index="1" name="weak_magnitude" type="float">
+			</argument>
+			<argument index="2" name="strong_magnitude" type="float">
+			</argument>
+			<argument index="3" name="duration" type="float" default="0">
+			</argument>
+			<description>
+				Starts to vibrate the joystick. Joysticks usually come with two rumble motors, a strong and a weak one. weak_magnitude is the strength of the weak motor (between 0 and 1) and strong_magnitude is the strength of the strong motor (between 0 and 1). duration is the duration of the effect in seconds (a duration of 0 will play the vibration indefinitely).
+			</description>
+		</method>
+		<method name="stop_joy_vibration">
+			<argument index="0" name="device" type="int">
+			</argument>
+			<description>
+				Stops the vibration of the joystick.
+			</description>
+		</method>
+		<method name="warp_mouse_pos">
+			<argument index="0" name="to" type="Vector2">
+			</argument>
+			<description>
+				Sets the mouse position to the specified vector.
 			</description>
 		</method>
 	</methods>
@@ -16016,7 +15939,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="connected" type="bool">
 			</argument>
 			<description>
-			Emitted when a joystick device has been connected or disconnected
+				Emitted when a joystick device has been connected or disconnected
 			</description>
 		</signal>
 	</signals>
@@ -16034,8 +15957,10 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="InputDefault" inherits="Input" category="Core">
 	<brief_description>
+		Default implementation of the [Input] class.
 	</brief_description>
 	<description>
+		Default implementation of the [Input] class, used internally by the editor and games for default input management.
 	</description>
 	<methods>
 	</methods>
@@ -16044,10 +15969,10 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="InputEvent" category="Built-In Types">
 	<brief_description>
-	Built-in input event data.
+		Built-in input event data.
 	</brief_description>
 	<description>
-	Built-in input event data. InputEvent is a built-in engine datatype, given that it's passed around and used so much. Depending on it's type, the members contained can be different, so read the documentation well!. Input events can also represent actions (editable from the project settings).
+		Built-in input event data. InputEvent is a built-in engine datatype, given that it's passed around and used so much. Depending on its type, the members contained can be different, so read the documentation well! Input events can also represent actions (editable from the project settings).
 	</description>
 	<methods>
 		<method name="is_action">
@@ -16056,37 +15981,39 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
-			Return if this input event matches a pre-defined action, no matter the type.
+				Return if this input event matches a pre-defined action, no matter the type.
 			</description>
 		</method>
 		<method name="is_action_pressed">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_pressed" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return whether the given action is being pressed (and is not an echo event for KEY events). Not relevant for the event types MOUSE_MOTION, SCREEN_DRAG and NONE.
 			</description>
 		</method>
 		<method name="is_action_released">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_released" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return whether the given action is released (i.e. not pressed). Not relevant for the event types MOUSE_MOTION, SCREEN_DRAG and NONE.
 			</description>
 		</method>
 		<method name="is_echo">
 			<return type="bool">
 			</return>
 			<description>
-			Return if this input event is an echo event (usually for key events).
+				Return if this input event is an echo event (only for events of type KEY, it will return false for other types).
 			</description>
 		</method>
 		<method name="is_pressed">
 			<return type="bool">
 			</return>
 			<description>
-			Return if this input event is pressed (for key, mouse, joy button or screen press events).
+				Return if this input event is pressed. Not relevant for the event types MOUSE_MOTION, SCREEN_DRAG and NONE.
 			</description>
 		</method>
 		<method name="set_as_action">
@@ -16095,15 +16022,19 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="pressed" type="bool">
 			</argument>
 			<description>
+				Change the input event to an action event of the given name, regardless of its initial type, with the pressed status passed as argument.
 			</description>
 		</method>
 	</methods>
 	<members>
-		<member name="type" type="int">
+		<member name="ID" type="int">
+			Event identifier, positive integer increased at each new event.
 		</member>
 		<member name="device" type="int">
+			Device identifier.
 		</member>
-		<member name="ID" type="int">
+		<member name="type" type="int">
+			Type of event (one of the [InputEvent] constants).
 		</member>
 	</members>
 	<constants>
@@ -16126,17 +16057,22 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			Joystick button event.
 		</constant>
 		<constant name="SCREEN_TOUCH" value="6">
+			Screen touch event.
 		</constant>
 		<constant name="SCREEN_DRAG" value="7">
+			Screen drag event.
 		</constant>
 		<constant name="ACTION" value="8">
+			Pre-defined action event (see [InputMap]).
 		</constant>
 	</constants>
 </class>
 <class name="InputEventAction" category="Built-In Types">
 	<brief_description>
+		Built-in input event type for actions.
 	</brief_description>
 	<description>
+		Input event type for actions that extends the global [InputEvent] type.
 	</description>
 	<methods>
 		<method name="is_action">
@@ -16145,34 +16081,39 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return if this input event matches a pre-defined action, i.e. always true for InputEventAction.
 			</description>
 		</method>
 		<method name="is_action_pressed">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_pressed" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return whether the given action is being pressed.
 			</description>
 		</method>
 		<method name="is_action_released">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_released" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return whether the given action is released (i.e. not pressed).
 			</description>
 		</method>
 		<method name="is_echo">
 			<return type="bool">
 			</return>
 			<description>
+				Return if this input event is an echo event (only for events of type KEY, i.e. always false for this type).
 			</description>
 		</method>
 		<method name="is_pressed">
 			<return type="bool">
 			</return>
 			<description>
+				Return if this input event is pressed.
 			</description>
 		</method>
 		<method name="set_as_action">
@@ -16181,42 +16122,57 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="pressed" type="bool">
 			</argument>
 			<description>
+				Change the input event to an action event of the given name with the pressed status passed as argument.
 			</description>
 		</method>
 	</methods>
 	<members>
-		<member name="type" type="int">
+		<member name="ID" type="int">
+			Event identifier, positive integer increased at each new event.
 		</member>
 		<member name="device" type="int">
+			Device identifier.
 		</member>
-		<member name="ID" type="int">
+		<member name="type" type="int">
+			Type of event (one of the [InputEvent] constants).
 		</member>
 	</members>
 	<constants>
 		<constant name="NONE" value="0">
+			Empty input event.
 		</constant>
 		<constant name="KEY" value="1">
+			Key event.
 		</constant>
 		<constant name="MOUSE_MOTION" value="2">
+			Mouse motion event.
 		</constant>
 		<constant name="MOUSE_BUTTON" value="3">
+			Mouse button event.
 		</constant>
 		<constant name="JOYSTICK_MOTION" value="4">
+			Joystick motion event.
 		</constant>
 		<constant name="JOYSTICK_BUTTON" value="5">
+			Joystick button event.
 		</constant>
 		<constant name="SCREEN_TOUCH" value="6">
+			Screen touch event.
 		</constant>
 		<constant name="SCREEN_DRAG" value="7">
+			Screen drag event.
 		</constant>
 		<constant name="ACTION" value="8">
+			Pre-defined action event (see [InputMap]).
 		</constant>
 	</constants>
 </class>
 <class name="InputEventJoystickButton" category="Built-In Types">
 	<brief_description>
+		Built-in input event type for joystick button events.
 	</brief_description>
 	<description>
+		Input event type for joystick button events that extends the global [InputEvent] type.
 	</description>
 	<methods>
 		<method name="is_action">
@@ -16225,34 +16181,39 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return if this input event matches a pre-defined action.
 			</description>
 		</method>
 		<method name="is_action_pressed">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_pressed" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return whether the given action is being pressed.
 			</description>
 		</method>
 		<method name="is_action_released">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_released" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return whether the given action is released (i.e. not pressed).
 			</description>
 		</method>
 		<method name="is_echo">
 			<return type="bool">
 			</return>
 			<description>
+				Return if this input event is an echo event (only for events of type KEY, i.e. always false for this type).
 			</description>
 		</method>
 		<method name="is_pressed">
 			<return type="bool">
 			</return>
 			<description>
+				Return if this input event is pressed.
 			</description>
 		</method>
 		<method name="set_as_action">
@@ -16261,48 +16222,66 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="pressed" type="bool">
 			</argument>
 			<description>
+				Change the input event to an action event of the given name with the pressed status passed as argument.
 			</description>
 		</method>
 	</methods>
 	<members>
-		<member name="type" type="int">
-		</member>
-		<member name="device" type="int">
-		</member>
 		<member name="ID" type="int">
+			Event identifier, positive integer increased at each new event.
 		</member>
 		<member name="button_index" type="int">
+			Joystick button identifier, one of the JOY_BUTTON_* constants in [@Global Scope].
+		</member>
+		<member name="device" type="int">
+			Device identifier.
 		</member>
 		<member name="pressed" type="bool">
+			Pressed state of the joystick button.
 		</member>
 		<member name="pressure" type="float">
+			Intensity of the button pressure, ranges from 0 to 1.0.
+		</member>
+		<member name="type" type="int">
+			Type of event (one of the [InputEvent] constants).
 		</member>
 	</members>
 	<constants>
 		<constant name="NONE" value="0">
+			Empty input event.
 		</constant>
 		<constant name="KEY" value="1">
+			Key event.
 		</constant>
 		<constant name="MOUSE_MOTION" value="2">
+			Mouse motion event.
 		</constant>
 		<constant name="MOUSE_BUTTON" value="3">
+			Mouse button event.
 		</constant>
 		<constant name="JOYSTICK_MOTION" value="4">
+			Joystick motion event.
 		</constant>
 		<constant name="JOYSTICK_BUTTON" value="5">
+			Joystick button event.
 		</constant>
 		<constant name="SCREEN_TOUCH" value="6">
+			Screen touch event.
 		</constant>
 		<constant name="SCREEN_DRAG" value="7">
+			Screen drag event.
 		</constant>
 		<constant name="ACTION" value="8">
+			Pre-defined action event (see [InputMap]).
 		</constant>
 	</constants>
 </class>
 <class name="InputEventJoystickMotion" category="Built-In Types">
 	<brief_description>
+		Built-in input event type for joystick motion/axis events.
 	</brief_description>
 	<description>
+		Input event type for joystick motion/axis events that extends the global [InputEvent] type.
 	</description>
 	<methods>
 		<method name="is_action">
@@ -16316,29 +16295,33 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		<method name="is_action_pressed">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_pressed" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return whether the given action is being pressed.
 			</description>
 		</method>
 		<method name="is_action_released">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_released" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return whether the given action is released (i.e. not pressed).
 			</description>
 		</method>
 		<method name="is_echo">
 			<return type="bool">
 			</return>
 			<description>
+				Return if this input event is an echo event (only for events of type KEY, i.e. always false for this type).
 			</description>
 		</method>
 		<method name="is_pressed">
 			<return type="bool">
 			</return>
 			<description>
+				Return if this input event is pressed.
 			</description>
 		</method>
 		<method name="set_as_action">
@@ -16347,46 +16330,63 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="pressed" type="bool">
 			</argument>
 			<description>
+				Change the input event to an action event of the given name with the pressed status passed as argument.
 			</description>
 		</method>
 	</methods>
 	<members>
-		<member name="type" type="int">
-		</member>
-		<member name="device" type="int">
-		</member>
 		<member name="ID" type="int">
+			Event identifier, positive integer increased at each new event.
 		</member>
 		<member name="axis" type="int">
+			Joystick axis identifier, one of the JOY_AXIS_* constants in [@Global Scope].
+		</member>
+		<member name="device" type="int">
+			Device identifier.
+		</member>
+		<member name="type" type="int">
+			Type of event (one of the [InputEvent] constants).
 		</member>
 		<member name="value" type="float">
+			Position of the axis, ranging from -1.0 to 1.0. A value of 0 means that the axis is in its neutral position.
 		</member>
 	</members>
 	<constants>
 		<constant name="NONE" value="0">
+			Empty input event.
 		</constant>
 		<constant name="KEY" value="1">
+			Key event.
 		</constant>
 		<constant name="MOUSE_MOTION" value="2">
+			Mouse motion event.
 		</constant>
 		<constant name="MOUSE_BUTTON" value="3">
+			Mouse button event.
 		</constant>
 		<constant name="JOYSTICK_MOTION" value="4">
+			Joystick motion event.
 		</constant>
 		<constant name="JOYSTICK_BUTTON" value="5">
+			Joystick button event.
 		</constant>
 		<constant name="SCREEN_TOUCH" value="6">
+			Screen touch event.
 		</constant>
 		<constant name="SCREEN_DRAG" value="7">
+			Screen drag event.
 		</constant>
 		<constant name="ACTION" value="8">
+			Pre-defined action event (see [InputMap]).
 		</constant>
 	</constants>
 </class>
 <class name="InputEventKey" category="Built-In Types">
 	<brief_description>
+		Built-in input event type for keyboard events.
 	</brief_description>
 	<description>
+		Input event type for keyboard events that extends the global [InputEvent] type.
 	</description>
 	<methods>
 		<method name="is_action">
@@ -16395,34 +16395,39 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return if this input event matches a pre-defined action.
 			</description>
 		</method>
 		<method name="is_action_pressed">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_pressed" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return whether the given action is being pressed.
 			</description>
 		</method>
 		<method name="is_action_released">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_released" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return whether the given action is released (i.e. not pressed).
 			</description>
 		</method>
 		<method name="is_echo">
 			<return type="bool">
 			</return>
 			<description>
+				Return if this input event is an echo event.
 			</description>
 		</method>
 		<method name="is_pressed">
 			<return type="bool">
 			</return>
 			<description>
+				Return if this input event is pressed.
 			</description>
 		</method>
 		<method name="set_as_action">
@@ -16431,58 +16436,81 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="pressed" type="bool">
 			</argument>
 			<description>
+				Change the input event to an action event of the given name with the pressed status passed as argument.
 			</description>
 		</method>
 	</methods>
 	<members>
-		<member name="type" type="int">
-		</member>
-		<member name="device" type="int">
-		</member>
 		<member name="ID" type="int">
-		</member>
-		<member name="shift" type="bool">
+			Event identifier, positive integer increased at each new event.
 		</member>
 		<member name="alt" type="bool">
+			State of the Alt modifier.
 		</member>
 		<member name="control" type="bool">
+			State of the Ctrl modifier.
+		</member>
+		<member name="device" type="int">
+			Device identifier.
+		</member>
+		<member name="echo" type="bool">
+			Echo state of the key, i.e. whether it's a repeat event or not.
 		</member>
 		<member name="meta" type="bool">
+			State of the Meta modifier.
 		</member>
 		<member name="pressed" type="bool">
-		</member>
-		<member name="echo" type="bool">
+			Pressed state of the key.
 		</member>
 		<member name="scancode" type="int">
+			Scancode of the key, one of the KEY_* constants in [@Global Scope].
+		</member>
+		<member name="shift" type="bool">
+			State of the Shift modifier.
+		</member>
+		<member name="type" type="int">
+			Type of event (one of the [InputEvent] constants).
 		</member>
 		<member name="unicode" type="int">
+			Unicode identifier of the key (when relevant).
 		</member>
 	</members>
 	<constants>
 		<constant name="NONE" value="0">
+			Empty input event.
 		</constant>
 		<constant name="KEY" value="1">
+			Key event.
 		</constant>
 		<constant name="MOUSE_MOTION" value="2">
+			Mouse motion event.
 		</constant>
 		<constant name="MOUSE_BUTTON" value="3">
+			Mouse button event.
 		</constant>
 		<constant name="JOYSTICK_MOTION" value="4">
+			Joystick motion event.
 		</constant>
 		<constant name="JOYSTICK_BUTTON" value="5">
+			Joystick button event.
 		</constant>
 		<constant name="SCREEN_TOUCH" value="6">
+			Screen touch event.
 		</constant>
 		<constant name="SCREEN_DRAG" value="7">
+			Screen drag event.
 		</constant>
 		<constant name="ACTION" value="8">
+			Pre-defined action event (see [InputMap]).
 		</constant>
 	</constants>
 </class>
 <class name="InputEventMouseButton" category="Built-In Types">
 	<brief_description>
+		Built-in input event type for mouse button events.
 	</brief_description>
 	<description>
+		Input event type for mouse button events that extends the global [InputEvent] type.
 	</description>
 	<methods>
 		<method name="is_action">
@@ -16491,34 +16519,39 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return if this input event matches a pre-defined action.
 			</description>
 		</method>
 		<method name="is_action_pressed">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_pressed" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return whether the given action is being pressed.
 			</description>
 		</method>
 		<method name="is_action_released">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_released" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return whether the given action is released (i.e. not pressed).
 			</description>
 		</method>
 		<method name="is_echo">
 			<return type="bool">
 			</return>
 			<description>
+				Return if this input event is an echo event (only for events of type KEY, i.e. always false for this type).
 			</description>
 		</method>
 		<method name="is_pressed">
 			<return type="bool">
 			</return>
 			<description>
+				Return if this input event is pressed.
 			</description>
 		</method>
 		<method name="set_as_action">
@@ -16527,70 +16560,99 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="pressed" type="bool">
 			</argument>
 			<description>
+				Change the input event to an action event of the given name with the pressed status passed as argument.
 			</description>
 		</method>
 	</methods>
 	<members>
-		<member name="type" type="int">
-		</member>
-		<member name="device" type="int">
-		</member>
 		<member name="ID" type="int">
-		</member>
-		<member name="shift" type="bool">
+			Event identifier, positive integer increased at each new event.
 		</member>
 		<member name="alt" type="bool">
+			State of the Alt modifier.
 		</member>
-		<member name="control" type="bool">
-		</member>
-		<member name="meta" type="bool">
+		<member name="button_index" type="int">
+			Mouse button identifier, one of the BUTTON_* or BUTTON_WHEEL_* constants in [@Global Scope].
 		</member>
 		<member name="button_mask" type="int">
+			Mouse button mask identifier, one of or a bitwise combination of the BUTTON_MASK_* constants in [@Global Scope].
 		</member>
-		<member name="x" type="int">
+		<member name="control" type="bool">
+			State of the Control modifier.
 		</member>
-		<member name="y" type="int">
+		<member name="device" type="int">
+			Device identifier.
 		</member>
-		<member name="pos" type="Vector2">
+		<member name="doubleclick" type="bool">
+			Whether the event is a double-click.
+		</member>
+		<member name="global_pos" type="Vector2">
+			Global position of the mouse click.
 		</member>
 		<member name="global_x" type="int">
+			Global X coordinate of the mouse click.
 		</member>
 		<member name="global_y" type="int">
+			Global Y coordinate of the mouse click.
 		</member>
-		<member name="global_pos" type="Vector2">
+		<member name="meta" type="bool">
+			State of the Meta modifier.
 		</member>
-		<member name="button_index" type="int">
+		<member name="pos" type="Vector2">
+			Local position of the mouse click.
 		</member>
 		<member name="pressed" type="bool">
+			Pressed state of the mouse button.
 		</member>
-		<member name="doubleclick" type="bool">
+		<member name="shift" type="bool">
+			State of the Shift modifier.
+		</member>
+		<member name="type" type="int">
+			Type of event (one of the [InputEvent] constants).
+		</member>
+		<member name="x" type="int">
+			Local X coordinate of the mouse click.
+		</member>
+		<member name="y" type="int">
+			Local Y coordinate of the mouse click.
 		</member>
 	</members>
 	<constants>
 		<constant name="NONE" value="0">
+			Empty input event.
 		</constant>
 		<constant name="KEY" value="1">
+			Key event.
 		</constant>
 		<constant name="MOUSE_MOTION" value="2">
+			Mouse motion event.
 		</constant>
 		<constant name="MOUSE_BUTTON" value="3">
+			Mouse button event.
 		</constant>
 		<constant name="JOYSTICK_MOTION" value="4">
+			Joystick motion event.
 		</constant>
 		<constant name="JOYSTICK_BUTTON" value="5">
+			Joystick button event.
 		</constant>
 		<constant name="SCREEN_TOUCH" value="6">
+			Screen touch event.
 		</constant>
 		<constant name="SCREEN_DRAG" value="7">
+			Screen drag event.
 		</constant>
 		<constant name="ACTION" value="8">
+			Pre-defined action event (see [InputMap]).
 		</constant>
 	</constants>
 </class>
 <class name="InputEventMouseMotion" category="Built-In Types">
 	<brief_description>
+		Built-in input event type for mouse motion events.
 	</brief_description>
 	<description>
+		Input event type for mouse motion events that extends the global [InputEvent] type.
 	</description>
 	<methods>
 		<method name="is_action">
@@ -16599,34 +16661,39 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return if this input event matches a pre-defined action.
 			</description>
 		</method>
 		<method name="is_action_pressed">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_pressed" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return whether the given action is being pressed. Not relevant for MOUSE_MOTION events, always false.
 			</description>
 		</method>
 		<method name="is_action_released">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_released" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return whether the given action is released (i.e. not pressed). Not relevant for MOUSE_MOTION events, can be true or false depending on whether [method is_action] is true.
 			</description>
 		</method>
 		<method name="is_echo">
 			<return type="bool">
 			</return>
 			<description>
+				Return if this input event is an echo event (only for events of type KEY, i.e. always false for this type).
 			</description>
 		</method>
 		<method name="is_pressed">
 			<return type="bool">
 			</return>
 			<description>
+				Return if this input event is pressed. Not relevant for MOUSE_MOTION events, always false.
 			</description>
 		</method>
 		<method name="set_as_action">
@@ -16635,76 +16702,108 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="pressed" type="bool">
 			</argument>
 			<description>
+				Change the input event to an action event of the given name with the (irrelevant for this type) pressed status passed as argument.
 			</description>
 		</method>
 	</methods>
 	<members>
-		<member name="type" type="int">
-		</member>
-		<member name="device" type="int">
-		</member>
 		<member name="ID" type="int">
-		</member>
-		<member name="shift" type="bool">
+			Event identifier, positive integer increased at each new event.
 		</member>
 		<member name="alt" type="bool">
-		</member>
-		<member name="control" type="bool">
-		</member>
-		<member name="meta" type="bool">
+			State of the Alt modifier.
 		</member>
 		<member name="button_mask" type="int">
+			Mouse button mask identifier, one of or a bitwise combination of the BUTTON_MASK_* constants in [@Global Scope].
 		</member>
-		<member name="x" type="int">
+		<member name="control" type="bool">
+			State of the Ctrl modifier.
 		</member>
-		<member name="y" type="int">
+		<member name="device" type="int">
+			Device identifier.
 		</member>
-		<member name="pos" type="Vector2">
+		<member name="global_pos" type="Vector2">
+			Global position of the mouse pointer.
 		</member>
 		<member name="global_x" type="int">
+			Global X coordinate of the mouse pointer.
 		</member>
 		<member name="global_y" type="int">
+			Global Y coordinate of the mouse pointer.
 		</member>
-		<member name="global_pos" type="Vector2">
+		<member name="meta" type="bool">
+			State of the Meta modifier.
+		</member>
+		<member name="pos" type="Vector2">
+			Local position of the mouse pointer.
+		</member>
+		<member name="relative_pos" type="Vector2">
+			Position of the mouse pointer relative to the previous mouse position.
 		</member>
 		<member name="relative_x" type="int">
+			X coordinate of the mouse pointer relative to the previous mouse position.
 		</member>
 		<member name="relative_y" type="int">
+			Y coordinate of the mouse pointer relative to the previous mouse position.
 		</member>
-		<member name="relative_pos" type="Vector2">
+		<member name="shift" type="bool">
+			State of the Shift modifier.
+		</member>
+		<member name="speed" type="Vector2">
+			Speed of the mouse pointer.
 		</member>
 		<member name="speed_x" type="float">
+			Speed of the mouse pointer on the X axis.
 		</member>
 		<member name="speed_y" type="float">
+			Speed of the mouse pointer on the Y axis.
 		</member>
-		<member name="speed" type="Vector2">
+		<member name="type" type="int">
+			Type of event (one of the [InputEvent] constants).
+		</member>
+		<member name="x" type="int">
+			Local X coordinate of the mouse pointer.
+		</member>
+		<member name="y" type="int">
+			Local Y coordinate of the mouse pointer.
 		</member>
 	</members>
 	<constants>
 		<constant name="NONE" value="0">
+			Empty input event.
 		</constant>
 		<constant name="KEY" value="1">
+			Key event.
 		</constant>
 		<constant name="MOUSE_MOTION" value="2">
+			Mouse motion event.
 		</constant>
 		<constant name="MOUSE_BUTTON" value="3">
+			Mouse button event.
 		</constant>
 		<constant name="JOYSTICK_MOTION" value="4">
+			Joystick motion event.
 		</constant>
 		<constant name="JOYSTICK_BUTTON" value="5">
+			Joystick button event.
 		</constant>
 		<constant name="SCREEN_TOUCH" value="6">
+			Screen touch event.
 		</constant>
 		<constant name="SCREEN_DRAG" value="7">
+			Screen drag event.
 		</constant>
 		<constant name="ACTION" value="8">
+			Pre-defined action event (see [InputMap]).
 		</constant>
 	</constants>
 </class>
 <class name="InputEventScreenDrag" category="Built-In Types">
 	<brief_description>
+		Built-in input event type for screen drag events.
 	</brief_description>
 	<description>
+		Input event type for screen drag events that extends the global [InputEvent] type.
 	</description>
 	<methods>
 		<method name="is_action">
@@ -16713,34 +16812,39 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return if this input event matches a pre-defined action.
 			</description>
 		</method>
 		<method name="is_action_pressed">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_pressed" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return whether the given action is being pressed. Not relevant for SCREEN_DRAG events, always false.
 			</description>
 		</method>
 		<method name="is_action_released">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_released" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return whether the given action is released (i.e. not pressed). Not relevant for SCREEN_DRAG events, can be true or false depending on whether [method is_action] is true.
 			</description>
 		</method>
 		<method name="is_echo">
 			<return type="bool">
 			</return>
 			<description>
+				Return if this input event is an echo event (only for events of type KEY, i.e. always false for this type).
 			</description>
 		</method>
 		<method name="is_pressed">
 			<return type="bool">
 			</return>
 			<description>
+				Return if this input event is pressed. Not relevant for SCREEN_DRAG events, always false.
 			</description>
 		</method>
 		<method name="set_as_action">
@@ -16749,62 +16853,87 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="pressed" type="bool">
 			</argument>
 			<description>
+				Change the input event to an action event of the given name with the (irrelevant for this type) pressed status passed as argument.
 			</description>
 		</method>
 	</methods>
 	<members>
-		<member name="type" type="int">
+		<member name="ID" type="int">
+			Event identifier, positive integer increased at each new event.
 		</member>
 		<member name="device" type="int">
-		</member>
-		<member name="ID" type="int">
+			Device identifier.
 		</member>
 		<member name="index" type="int">
-		</member>
-		<member name="x" type="float">
-		</member>
-		<member name="y" type="float">
+			Drag event index in the case of a multi-drag event.
 		</member>
 		<member name="pos" type="Vector2">
+			Position of the drag event.
+		</member>
+		<member name="relative_pos" type="Vector2">
+			Position of the drag event relative to its start position.
 		</member>
 		<member name="relative_x" type="float">
+			X coordinate of the drag event relative to its start position.
 		</member>
 		<member name="relative_y" type="float">
+			Y coordinate of the drag event relative to its start position.
 		</member>
-		<member name="relative_pos" type="Vector2">
+		<member name="speed" type="Vector2">
+			Speed of the drag event.
 		</member>
 		<member name="speed_x" type="float">
+			Speed of the drag event on the X axis.
 		</member>
 		<member name="speed_y" type="float">
+			Speed of the drag event on the Y axis.
 		</member>
-		<member name="speed" type="Vector2">
+		<member name="type" type="int">
+			Type of event (one of the [InputEvent] constants).
+		</member>
+		<member name="x" type="float">
+			X coordinate of the drag event.
+		</member>
+		<member name="y" type="float">
+			Y coordinate of the drag event.
 		</member>
 	</members>
 	<constants>
 		<constant name="NONE" value="0">
+			Empty input event.
 		</constant>
 		<constant name="KEY" value="1">
+			Key event.
 		</constant>
 		<constant name="MOUSE_MOTION" value="2">
+			Mouse motion event.
 		</constant>
 		<constant name="MOUSE_BUTTON" value="3">
+			Mouse button event.
 		</constant>
 		<constant name="JOYSTICK_MOTION" value="4">
+			Joystick motion event.
 		</constant>
 		<constant name="JOYSTICK_BUTTON" value="5">
+			Joystick button event.
 		</constant>
 		<constant name="SCREEN_TOUCH" value="6">
+			Screen touch event.
 		</constant>
 		<constant name="SCREEN_DRAG" value="7">
+			Screen drag event.
 		</constant>
 		<constant name="ACTION" value="8">
+			Pre-defined action event (see [InputMap]).
 		</constant>
 	</constants>
 </class>
 <class name="InputEventScreenTouch" category="Built-In Types">
 	<brief_description>
+		Built-in input event type for touchscreen drag events.
 	</brief_description>
 	<description>
+		Input event type for touchscreen drag events that extends the global [InputEvent] type.
 	</description>
 	<methods>
 		<method name="is_action">
@@ -16813,34 +16942,39 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return if this input event matches a pre-defined action.
 			</description>
 		</method>
 		<method name="is_action_pressed">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_pressed" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return whether the given action is being pressed.
 			</description>
 		</method>
 		<method name="is_action_released">
 			<return type="bool">
 			</return>
-			<argument index="0" name="is_action_released" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Return whether the given action is released (i.e. not pressed).
 			</description>
 		</method>
 		<method name="is_echo">
 			<return type="bool">
 			</return>
 			<description>
+				Return if this input event is an echo event (only for events of type KEY, i.e. always false for this type).
 			</description>
 		</method>
 		<method name="is_pressed">
 			<return type="bool">
 			</return>
 			<description>
+				Return if this input event is pressed.
 			</description>
 		</method>
 		<method name="set_as_action">
@@ -16849,131 +16983,144 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="pressed" type="bool">
 			</argument>
 			<description>
+				Change the input event to an action event of the given name with the pressed status passed as argument.
 			</description>
 		</method>
 	</methods>
 	<members>
-		<member name="type" type="int">
+		<member name="ID" type="int">
+			Event identifier, positive integer increased at each new event.
 		</member>
 		<member name="device" type="int">
-		</member>
-		<member name="ID" type="int">
+			Device identifier.
 		</member>
 		<member name="index" type="int">
-		</member>
-		<member name="x" type="float">
-		</member>
-		<member name="y" type="float">
+			Touch event index in the case of a multi-touch event.
 		</member>
 		<member name="pos" type="Vector2">
+			Position of the touch event.
 		</member>
 		<member name="pressed" type="bool">
+			Pressed state of the touch event.
+		</member>
+		<member name="type" type="int">
+			Type of event (one of the [InputEvent] constants).
+		</member>
+		<member name="x" type="float">
+			X coordinate of the touch event.
+		</member>
+		<member name="y" type="float">
+			Y coordinate of the touch event.
 		</member>
 	</members>
 	<constants>
 		<constant name="NONE" value="0">
+			Empty input event.
 		</constant>
 		<constant name="KEY" value="1">
+			Key event.
 		</constant>
 		<constant name="MOUSE_MOTION" value="2">
+			Mouse motion event.
 		</constant>
 		<constant name="MOUSE_BUTTON" value="3">
+			Mouse button event.
 		</constant>
 		<constant name="JOYSTICK_MOTION" value="4">
+			Joystick motion event.
 		</constant>
 		<constant name="JOYSTICK_BUTTON" value="5">
+			Joystick button event.
 		</constant>
 		<constant name="SCREEN_TOUCH" value="6">
+			Screen touch event.
 		</constant>
 		<constant name="SCREEN_DRAG" value="7">
+			Screen drag event.
 		</constant>
 		<constant name="ACTION" value="8">
+			Pre-defined action event (see [InputMap]).
 		</constant>
 	</constants>
 </class>
 <class name="InputMap" inherits="Object" category="Core">
 	<brief_description>
-	Singleton that manages actions.
+		Singleton that manages actions.
 	</brief_description>
 	<description>
-	Singleton that manages actions. InputMap has a list of the actions used in InputEvent, which can be modified.
+		Singleton that manages actions. InputMap has a list of the actions used in InputEvent, which can be modified.
 	</description>
 	<methods>
-		<method name="has_action" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="action_add_event">
 			<argument index="0" name="action" type="String">
 			</argument>
+			<argument index="1" name="event" type="InputEvent">
+			</argument>
 			<description>
-			Whether this InputMap has an action with name "action".
+				Add an [InputEvent] to an action. This [InputEvent] will trigger the action.
 			</description>
 		</method>
-		<method name="get_action_id" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="action_erase_event">
 			<argument index="0" name="action" type="String">
 			</argument>
-			<description>
-			Return the id of an action.
-			</description>
-		</method>
-		<method name="get_action_from_id" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="id" type="int">
+			<argument index="1" name="event" type="InputEvent">
 			</argument>
 			<description>
-			Return the action from an id.
+				Remove an [InputEvent] from an action.
 			</description>
 		</method>
-		<method name="get_actions">
-			<return type="Array">
+		<method name="action_has_event">
+			<return type="bool">
 			</return>
+			<argument index="0" name="action" type="String">
+			</argument>
+			<argument index="1" name="event" type="InputEvent">
+			</argument>
 			<description>
-			Return an [Array] of all actions in the [InputMap].
+				Whether an action has an [InputEvent] associated with it.
 			</description>
 		</method>
 		<method name="add_action">
 			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
-			Add an action to the [InputMap].
+				Add an (empty) action to the [InputMap]. An [InputEvent] can then be added to this action with [method action_add_event].
 			</description>
 		</method>
 		<method name="erase_action">
 			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
-			Remove an action from the [InputMap].
+				Remove an action from the [InputMap].
 			</description>
 		</method>
-		<method name="action_add_event">
-			<argument index="0" name="action" type="String">
+		<method name="event_is_action" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="event" type="InputEvent">
 			</argument>
-			<argument index="1" name="event" type="InputEvent">
+			<argument index="1" name="action" type="String">
 			</argument>
 			<description>
-			Add an [InputEvent] to action. This [InputEvent] will trigger the action.
+				Return whether the given event is part of an existing action.
 			</description>
 		</method>
-		<method name="action_has_event">
-			<return type="bool">
+		<method name="get_action_from_id" qualifiers="const">
+			<return type="String">
 			</return>
-			<argument index="0" name="action" type="String">
-			</argument>
-			<argument index="1" name="event" type="InputEvent">
+			<argument index="0" name="id" type="int">
 			</argument>
 			<description>
-			Whether an action has an [InputEvent] associated with it.
+				Return the action corresponding to the identifier.
 			</description>
 		</method>
-		<method name="action_erase_event">
+		<method name="get_action_id" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="action" type="String">
 			</argument>
-			<argument index="1" name="event" type="InputEvent">
-			</argument>
 			<description>
-			Remove an [InputEvent] from an action.
+				Return the identifier of the given action.
 			</description>
 		</method>
 		<method name="get_action_list">
@@ -16982,22 +17129,28 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
-			Return an [Array] of [InputEvent]s associated with an action.
+				Return an array of InputEvents associated with a given action.
 			</description>
 		</method>
-		<method name="event_is_action" qualifiers="const">
+		<method name="get_actions">
+			<return type="Array">
+			</return>
+			<description>
+				Return an array of all actions in the [InputMap].
+			</description>
+		</method>
+		<method name="has_action" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="event" type="InputEvent">
-			</argument>
-			<argument index="1" name="action" type="String">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
+				Whether this InputMap has a registered action with the given name.
 			</description>
 		</method>
 		<method name="load_from_globals">
 			<description>
-			Clears the [InputMap] and loads it from [Globals].
+				Clear the [InputMap] and load it anew from [Globals].
 			</description>
 		</method>
 	</methods>
@@ -17010,42 +17163,88 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<description>
 	</description>
 	<methods>
-		<method name="replace_by_instance">
-			<argument index="0" name="custom_scene" type="PackedScene" default="NULL">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_instance_path" qualifiers="const">
 			<return type="String">
 			</return>
 			<description>
 			</description>
 		</method>
+		<method name="replace_by_instance">
+			<argument index="0" name="custom_scene" type="PackedScene" default="NULL">
+			</argument>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<constants>
 	</constants>
 </class>
 <class name="IntArray" category="Built-In Types">
 	<brief_description>
-	Integer Array.
+		Integer Array.
 	</brief_description>
 	<description>
-	Integer Array. Array of integers. Can only contain integers. Optimized for memory usage, can't fragment the memory.
+		Integer Array. Array of integers. Can only contain integers. Optimized for memory usage, can't fragment the memory.
 	</description>
 	<methods>
+		<method name="IntArray">
+			<return type="IntArray">
+			</return>
+			<argument index="0" name="from" type="Array">
+			</argument>
+			<description>
+				Create from a generic array.
+			</description>
+		</method>
+		<method name="append">
+			<argument index="0" name="integer" type="int">
+			</argument>
+			<description>
+				Append an element at the end of the array (alias of [method push_back]).
+			</description>
+		</method>
+		<method name="append_array">
+			<argument index="0" name="array" type="IntArray">
+			</argument>
+			<description>
+				Append an [IntArray] at the end of this array.
+			</description>
+		</method>
+		<method name="insert">
+			<return type="int">
+			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="integer" type="int">
+			</argument>
+			<description>
+				Insert a new int at a given position in the array. The position must be valid, or at the end of the array (pos==size()).
+			</description>
+		</method>
+		<method name="invert">
+			<description>
+				Reverse the order of the elements in the array (so first element will now be the last).
+			</description>
+		</method>
 		<method name="push_back">
 			<argument index="0" name="integer" type="int">
 			</argument>
 			<description>
-			Append a value to the array.
+				Append a value to the array.
+			</description>
+		</method>
+		<method name="remove">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<description>
+				Remove an element from the array by index.
 			</description>
 		</method>
 		<method name="resize">
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Set the size of the [IntArray]. If larger than the current size it will reserve some space beforehand, and if it is smaller it will cut off the array.
+				Set the size of the [IntArray]. If larger than the current size it will reserve some space beforehand, and if it is smaller it will cut off the array.
 			</description>
 		</method>
 		<method name="set">
@@ -17054,23 +17253,14 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="integer" type="int">
 			</argument>
 			<description>
-			Change the int at the given index.
+				Change the int at the given index.
 			</description>
 		</method>
 		<method name="size">
 			<return type="int">
 			</return>
 			<description>
-			Return the array size.
-			</description>
-		</method>
-		<method name="IntArray">
-			<return type="IntArray">
-			</return>
-			<argument index="0" name="from" type="Array">
-			</argument>
-			<description>
-			Create from a generic array.
+				Return the array size.
 			</description>
 		</method>
 	</methods>
@@ -17083,9 +17273,9 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<description>
 	</description>
 	<methods>
-		<method name="set_target_path">
-			<argument index="0" name="target_path" type="NodePath">
-			</argument>
+		<method name="get_speed" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -17095,33 +17285,33 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="set_target">
-			<argument index="0" name="target" type="Camera">
-			</argument>
+		<method name="is_interpolation_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_speed">
-			<argument index="0" name="speed" type="float">
+		<method name="set_interpolation_enabled">
+			<argument index="0" name="target_path" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_speed" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_speed">
+			<argument index="0" name="speed" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_interpolation_enabled">
-			<argument index="0" name="target_path" type="bool">
+		<method name="set_target">
+			<argument index="0" name="target" type="Camera">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_interpolation_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_target_path">
+			<argument index="0" name="target_path" type="NodePath">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -17135,21 +17325,15 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<description>
 	</description>
 	<methods>
-		<method name="set_bone_name">
-			<argument index="0" name="ik_bone" type="String">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_bone_name" qualifiers="const">
 			<return type="String">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_iterations">
-			<argument index="0" name="iterations" type="int">
-			</argument>
+		<method name="get_chain_size" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -17159,39 +17343,45 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="set_chain_size">
-			<argument index="0" name="chain_size" type="int">
-			</argument>
+		<method name="get_precision" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_chain_size" qualifiers="const">
-			<return type="int">
+		<method name="get_speed" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_precision">
-			<argument index="0" name="precision" type="float">
+		<method name="set_bone_name">
+			<argument index="0" name="ik_bone" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_precision" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_chain_size">
+			<argument index="0" name="chain_size" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_speed">
-			<argument index="0" name="speed" type="float">
+		<method name="set_iterations">
+			<argument index="0" name="iterations" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_speed" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_precision">
+			<argument index="0" name="precision" type="float">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_speed">
+			<argument index="0" name="speed" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -17205,6 +17395,14 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<description>
 	</description>
 	<methods>
+		<method name="add_icon_item">
+			<argument index="0" name="icon" type="Texture">
+			</argument>
+			<argument index="1" name="selectable" type="bool" default="true">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="add_item">
 			<argument index="0" name="text" type="String">
 			</argument>
@@ -17215,99 +17413,81 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="add_icon_item">
-			<argument index="0" name="icon" type="Texture">
-			</argument>
-			<argument index="1" name="selectable" type="bool" default="true">
-			</argument>
+		<method name="clear">
 			<description>
 			</description>
 		</method>
-		<method name="set_item_text">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="text" type="String">
-			</argument>
+		<method name="ensure_current_is_visible">
 			<description>
 			</description>
 		</method>
-		<method name="get_item_text" qualifiers="const">
-			<return type="String">
+		<method name="get_allow_rmb_select" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_item_icon">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="icon" type="Texture">
-			</argument>
+		<method name="get_fixed_column_width" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_item_icon" qualifiers="const">
-			<return type="Texture">
+		<method name="get_fixed_icon_size" qualifiers="const">
+			<return type="Vector2">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_item_icon_region">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="rect" type="Rect2">
-			</argument>
+		<method name="get_icon_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_item_icon_region" qualifiers="const">
-			<return type="Rect2">
+		<method name="get_icon_scale" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_item_selectable">
-			<argument index="0" name="idx" type="int">
+		<method name="get_item_at_pos" qualifiers="const">
+			<return type="int">
+			</return>
+			<argument index="0" name="pos" type="Vector2">
 			</argument>
-			<argument index="1" name="selectable" type="bool">
+			<argument index="1" name="exact" type="bool" default="false">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_item_selectable" qualifiers="const">
-			<return type="bool">
+		<method name="get_item_count" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_item_disabled">
+		<method name="get_item_custom_bg_color" qualifiers="const">
+			<return type="Color">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="disabled" type="bool">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_item_disabled" qualifiers="const">
-			<return type="bool">
+		<method name="get_item_icon" qualifiers="const">
+			<return type="Texture">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_item_metadata">
+		<method name="get_item_icon_region" qualifiers="const">
+			<return type="Rect2">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="metadata" type="Variant">
-			</argument>
 			<description>
 			</description>
 		</method>
@@ -17317,53 +17497,56 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="set_item_custom_bg_color">
+		<method name="get_item_text" qualifiers="const">
+			<return type="String">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="custom_bg_color" type="Color">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_item_custom_bg_color" qualifiers="const">
-			<return type="Color">
+		<method name="get_item_tooltip" qualifiers="const">
+			<return type="String">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_item_tooltip">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="tooltip" type="String">
-			</argument>
+		<method name="get_max_columns" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_item_tooltip" qualifiers="const">
-			<return type="String">
+		<method name="get_max_text_lines" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="select">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="single" type="bool" default="true">
-			</argument>
+		<method name="get_select_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="unselect">
+		<method name="get_selected_items">
+			<return type="IntArray">
+			</return>
+			<description>
+				Returns a list of selected indexes.
+			</description>
+		</method>
+		<method name="is_item_disabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_selected" qualifiers="const">
+		<method name="is_item_selectable" qualifiers="const">
 			<return type="bool">
 			</return>
 			<argument index="0" name="idx" type="int">
@@ -17371,148 +17554,162 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="get_item_count" qualifiers="const">
+		<method name="is_same_column_width" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="remove_item">
+		<method name="is_selected" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="clear">
+		<method name="remove_item">
+			<argument index="0" name="idx" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="sort_items_by_text">
+		<method name="select">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="single" type="bool" default="true">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_fixed_column_width">
-			<argument index="0" name="width" type="int">
+		<method name="set_allow_rmb_select">
+			<argument index="0" name="allow" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_fixed_column_width" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_fixed_column_width">
+			<argument index="0" name="width" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_same_column_width">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_fixed_icon_size">
+			<argument index="0" name="size" type="Vector2">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_same_column_width" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_icon_mode">
+			<argument index="0" name="mode" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_max_text_lines">
-			<argument index="0" name="lines" type="int">
+		<method name="set_icon_scale">
+			<argument index="0" name="scale" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_max_text_lines" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_item_custom_bg_color">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="custom_bg_color" type="Color">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_max_columns">
-			<argument index="0" name="amount" type="int">
+		<method name="set_item_disabled">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="disabled" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_max_columns" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_item_icon">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="icon" type="Texture">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_select_mode">
-			<argument index="0" name="mode" type="int">
+		<method name="set_item_icon_region">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="rect" type="Rect2">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_select_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_item_metadata">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="metadata" type="Variant">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_icon_mode">
-			<argument index="0" name="mode" type="int">
+		<method name="set_item_selectable">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="selectable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_icon_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_item_text">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="text" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_fixed_icon_size">
-			<argument index="0" name="size" type="Vector2">
+		<method name="set_item_tooltip">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="tooltip" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_fixed_icon_size" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_max_columns">
+			<argument index="0" name="amount" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_icon_scale">
-			<argument index="0" name="scale" type="float">
+		<method name="set_max_text_lines">
+			<argument index="0" name="lines" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_icon_scale" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_same_column_width">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_allow_rmb_select">
-			<argument index="0" name="allow" type="bool">
+		<method name="set_select_mode">
+			<argument index="0" name="mode" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_allow_rmb_select" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="sort_items_by_text">
 			<description>
 			</description>
 		</method>
-		<method name="get_item_at_pos" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="pos" type="Vector2">
-			</argument>
-			<argument index="1" name="exact" type="bool" default="false">
+		<method name="unselect">
+			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="ensure_current_is_visible">
-			<description>
-			</description>
-		</method>
 	</methods>
 	<signals>
 		<signal name="item_activated">
@@ -17521,25 +17718,25 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</signal>
-		<signal name="multi_selected">
+		<signal name="item_rmb_selected">
 			<argument index="0" name="index" type="int">
 			</argument>
-			<argument index="1" name="selected" type="bool">
+			<argument index="1" name="atpos" type="Vector2">
 			</argument>
 			<description>
 			</description>
 		</signal>
-		<signal name="item_rmb_selected">
+		<signal name="item_selected">
 			<argument index="0" name="index" type="int">
 			</argument>
-			<argument index="1" name="atpos" type="Vector2">
-			</argument>
 			<description>
 			</description>
 		</signal>
-		<signal name="item_selected">
+		<signal name="multi_selected">
 			<argument index="0" name="index" type="int">
 			</argument>
+			<argument index="1" name="selected" type="bool">
+			</argument>
 			<description>
 			</description>
 		</signal>
@@ -17555,33 +17752,33 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		</constant>
 	</constants>
 	<theme_items>
-		<theme_item name="vseparation" type="int">
-		</theme_item>
-		<theme_item name="line_separation" type="int">
+		<theme_item name="bg" type="StyleBox">
 		</theme_item>
-		<theme_item name="icon_margin" type="int">
+		<theme_item name="bg_focus" type="StyleBox">
 		</theme_item>
-		<theme_item name="hseparation" type="int">
+		<theme_item name="cursor" type="StyleBox">
 		</theme_item>
-		<theme_item name="guide_color" type="Color">
+		<theme_item name="cursor_unfocused" type="StyleBox">
 		</theme_item>
-		<theme_item name="font_color_selected" type="Color">
+		<theme_item name="font" type="Font">
 		</theme_item>
 		<theme_item name="font_color" type="Color">
 		</theme_item>
-		<theme_item name="font" type="Font">
+		<theme_item name="font_color_selected" type="Color">
 		</theme_item>
-		<theme_item name="cursor" type="StyleBox">
+		<theme_item name="guide_color" type="Color">
 		</theme_item>
-		<theme_item name="selected_focus" type="StyleBox">
+		<theme_item name="hseparation" type="int">
 		</theme_item>
-		<theme_item name="bg_focus" type="StyleBox">
+		<theme_item name="icon_margin" type="int">
 		</theme_item>
-		<theme_item name="cursor_unfocused" type="StyleBox">
+		<theme_item name="line_separation" type="int">
 		</theme_item>
 		<theme_item name="selected" type="StyleBox">
 		</theme_item>
-		<theme_item name="bg" type="StyleBox">
+		<theme_item name="selected_focus" type="StyleBox">
+		</theme_item>
+		<theme_item name="vseparation" type="int">
 		</theme_item>
 	</theme_items>
 </class>
@@ -17591,9 +17788,9 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<description>
 	</description>
 	<methods>
-		<method name="set_node_a">
-			<argument index="0" name="node" type="NodePath">
-			</argument>
+		<method name="get_exclude_nodes_from_collision" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -17603,24 +17800,12 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="set_node_b">
-			<argument index="0" name="node" type="NodePath">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_node_b" qualifiers="const">
 			<return type="NodePath">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_solver_priority">
-			<argument index="0" name="priority" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_solver_priority" qualifiers="const">
 			<return type="int">
 			</return>
@@ -17633,9 +17818,21 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="get_exclude_nodes_from_collision" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_node_a">
+			<argument index="0" name="node" type="NodePath">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_node_b">
+			<argument index="0" name="node" type="NodePath">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_solver_priority">
+			<argument index="0" name="priority" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -17645,38 +17842,36 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="Joint2D" inherits="Node2D" category="Core">
 	<brief_description>
-	Base node for all joint constraints in 2D physics.
+		Base node for all joint constraints in 2D physics.
 	</brief_description>
 	<description>
-	Base node for all joint constraints in 2D physics. Joints take 2 bodies and apply a custom constraint.
+		Base node for all joint constraints in 2D physics. Joints take 2 bodies and apply a custom constraint.
 	</description>
 	<methods>
-		<method name="set_node_a">
-			<argument index="0" name="node" type="NodePath">
-			</argument>
+		<method name="get_bias" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the path to the A node for the joint. Must be of type [PhysicsBody2D].
 			</description>
 		</method>
-		<method name="get_node_a" qualifiers="const">
-			<return type="NodePath">
+		<method name="get_exclude_nodes_from_collision" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the path to the A node for the joint.
 			</description>
 		</method>
-		<method name="set_node_b">
-			<argument index="0" name="node" type="NodePath">
-			</argument>
+		<method name="get_node_a" qualifiers="const">
+			<return type="NodePath">
+			</return>
 			<description>
-			Set the path to the B node for the joint. Must be of type [PhysicsBody2D].
+				Return the path to the A node for the joint.
 			</description>
 		</method>
 		<method name="get_node_b" qualifiers="const">
 			<return type="NodePath">
 			</return>
 			<description>
-			Return the path to the B node for the joint.
+				Return the path to the B node for the joint.
 			</description>
 		</method>
 		<method name="set_bias">
@@ -17685,22 +17880,24 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="get_bias" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_exclude_nodes_from_collision">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_exclude_nodes_from_collision">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_node_a">
+			<argument index="0" name="node" type="NodePath">
 			</argument>
 			<description>
+				Set the path to the A node for the joint. Must be of type [PhysicsBody2D].
 			</description>
 		</method>
-		<method name="get_exclude_nodes_from_collision" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_node_b">
+			<argument index="0" name="node" type="NodePath">
+			</argument>
 			<description>
+				Set the path to the B node for the joint. Must be of type [PhysicsBody2D].
 			</description>
 		</method>
 	</methods>
@@ -17709,151 +17906,151 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="KinematicBody" inherits="PhysicsBody" category="Core">
 	<brief_description>
-	Kinematic body 3D node.
+		Kinematic body 3D node.
 	</brief_description>
 	<description>
-	Kinematic bodies are special types of bodies that are meant to be user-controlled. They are not affected by physics at all (to other types of bodies, such a character or a rigid body, these are the same as a static body). They have however, two main uses:
-	Simulated Motion: When these bodies are moved manually, either from code or from an AnimationPlayer (with process mode set to fixed), the physics will automatically compute an estimate of their linear and angular velocity. This makes them very useful for moving platforms or other AnimationPlayer-controlled objects (like a door, a bridge that opens, etc).
-	Kinematic Characters: KinematicBody also has an api for moving objects (the [method move] method) while performing collision tests. This makes them really useful to implement characters that collide against a world, but that don't require advanced physics.
+		Kinematic bodies are special types of bodies that are meant to be user-controlled. They are not affected by physics at all (to other types of bodies, such a character or a rigid body, these are the same as a static body). They have however, two main uses:
+		Simulated Motion: When these bodies are moved manually, either from code or from an AnimationPlayer (with process mode set to fixed), the physics will automatically compute an estimate of their linear and angular velocity. This makes them very useful for moving platforms or other AnimationPlayer-controlled objects (like a door, a bridge that opens, etc).
+		Kinematic Characters: KinematicBody also has an api for moving objects (the [method move] method) while performing collision tests. This makes them really useful to implement characters that collide against a world, but that don't require advanced physics.
 	</description>
 	<methods>
-		<method name="move">
-			<return type="Vector3">
+		<method name="can_collide_with_character_bodies" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="rel_vec" type="Vector3">
-			</argument>
 			<description>
-			Move the body in the given direction, stopping if there is an obstacle. The returned vector is how much movement was remaining before being stopped.
+				Return if this body can collide with character bodies.
 			</description>
 		</method>
-		<method name="move_to">
-			<return type="Vector3">
+		<method name="can_collide_with_kinematic_bodies" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="position" type="Vector3">
-			</argument>
 			<description>
-			Move the body to the given position. This is not a teleport, and the body will stop if there is an obstacle. The returned vector is how much movement was remaining before being stopped.
+				Return if this body can collide with kinematic bodies.
 			</description>
 		</method>
-		<method name="can_teleport_to">
+		<method name="can_collide_with_rigid_bodies" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="position" type="Vector3">
-			</argument>
 			<description>
-			Returns whether the KinematicBody can be teleported to the destination given as an argument, checking all collision shapes of the body against potential colliders at the destination.
+				Return if this body can collide with rigid bodies.
 			</description>
 		</method>
-		<method name="is_colliding" qualifiers="const">
+		<method name="can_collide_with_static_bodies" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return whether the body is colliding with another.
+				Return if this body can collide with static bodies.
 			</description>
 		</method>
-		<method name="get_collision_pos" qualifiers="const">
-			<return type="Vector3">
+		<method name="can_teleport_to">
+			<return type="bool">
+			</return>
+			<argument index="0" name="position" type="Vector3">
+			</argument>
+			<description>
+				Returns whether the KinematicBody can be teleported to the destination given as an argument, checking all collision shapes of the body against potential colliders at the destination.
+			</description>
+		</method>
+		<method name="get_collider" qualifiers="const">
+			<return type="Object">
 			</return>
 			<description>
-			Return the point in space where the body is touching another. If there is no collision, this method will return (0,0,0), so collisions must be checked first with [method is_colliding].
+				Return the body that collided with this one.
 			</description>
 		</method>
-		<method name="get_collision_normal" qualifiers="const">
-			<return type="Vector3">
+		<method name="get_collider_shape" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the normal of the surface the body collided with. This is useful to implement sliding along a surface.
+				Return the shape index from the body that collided with this one. If there is no collision, this method will return 0, so collisions must be checked first with [method is_colliding].
 			</description>
 		</method>
 		<method name="get_collider_velocity" qualifiers="const">
 			<return type="Vector3">
 			</return>
 			<description>
-			Return the velocity of the body that collided with this one.
+				Return the velocity of the body that collided with this one.
 			</description>
 		</method>
-		<method name="get_collider" qualifiers="const">
-			<return type="Object">
+		<method name="get_collision_margin" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return the body that collided with this one.
+				Return the collision margin for this object.
 			</description>
 		</method>
-		<method name="get_collider_shape" qualifiers="const">
-			<return type="int">
+		<method name="get_collision_normal" qualifiers="const">
+			<return type="Vector3">
 			</return>
 			<description>
-			Return the shape index from the body that collided with this one. If there is no collision, this method will return 0, so collisions must be checked first with [method is_colliding].
+				Return the normal of the surface the body collided with. This is useful to implement sliding along a surface.
 			</description>
 		</method>
-		<method name="set_collide_with_static_bodies">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="get_collision_pos" qualifiers="const">
+			<return type="Vector3">
+			</return>
 			<description>
-			Set if this body should collide with static bodies.
+				Return the point in space where the body is touching another. If there is no collision, this method will return (0,0,0), so collisions must be checked first with [method is_colliding].
 			</description>
 		</method>
-		<method name="can_collide_with_static_bodies" qualifiers="const">
+		<method name="is_colliding" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return if this body can collide with static bodies.
+				Return whether the body is colliding with another.
 			</description>
 		</method>
-		<method name="set_collide_with_kinematic_bodies">
-			<argument index="0" name="enable" type="bool">
+		<method name="move">
+			<return type="Vector3">
+			</return>
+			<argument index="0" name="rel_vec" type="Vector3">
 			</argument>
 			<description>
-			Set if this body should collide with kinematic bodies.
+				Move the body in the given direction, stopping if there is an obstacle. The returned vector is how much movement was remaining before being stopped.
 			</description>
 		</method>
-		<method name="can_collide_with_kinematic_bodies" qualifiers="const">
-			<return type="bool">
+		<method name="move_to">
+			<return type="Vector3">
 			</return>
+			<argument index="0" name="position" type="Vector3">
+			</argument>
 			<description>
-			Return if this body can collide with kinematic bodies.
+				Move the body to the given position. This is not a teleport, and the body will stop if there is an obstacle. The returned vector is how much movement was remaining before being stopped.
 			</description>
 		</method>
-		<method name="set_collide_with_rigid_bodies">
+		<method name="set_collide_with_character_bodies">
 			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Set if this body should collide with rigid bodies.
+				Set if this body should collide with character bodies.
 			</description>
 		</method>
-		<method name="can_collide_with_rigid_bodies" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_collide_with_kinematic_bodies">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Return if this body can collide with rigid bodies.
+				Set if this body should collide with kinematic bodies.
 			</description>
 		</method>
-		<method name="set_collide_with_character_bodies">
+		<method name="set_collide_with_rigid_bodies">
 			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Set if this body should collide with character bodies.
+				Set if this body should collide with rigid bodies.
 			</description>
 		</method>
-		<method name="can_collide_with_character_bodies" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_collide_with_static_bodies">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Return if this body can collide with character bodies.
+				Set if this body should collide with static bodies.
 			</description>
 		</method>
 		<method name="set_collision_margin">
 			<argument index="0" name="pixels" type="float">
 			</argument>
 			<description>
-			Set the collision margin for this object. A collision margin is an amount that all shapes will grow when computing collisions, to account for numerical imprecision.
-			</description>
-		</method>
-		<method name="get_collision_margin" qualifiers="const">
-			<return type="float">
-			</return>
-			<description>
-			Return the collision margin for this object.
+				Set the collision margin for this object. A collision margin is an amount that all shapes will grow when computing collisions, to account for numerical imprecision.
 			</description>
 		</method>
 	</methods>
@@ -17862,114 +18059,114 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="KinematicBody2D" inherits="PhysicsBody2D" category="Core">
 	<brief_description>
-	Kinematic body 2D node.
+		Kinematic body 2D node.
 	</brief_description>
 	<description>
-	Kinematic bodies are special types of bodies that are meant to be user-controlled. They are not affected by physics at all (to other types of bodies, such a character or a rigid body, these are the same as a static body). They have however, two main uses:
-	Simulated Motion: When these bodies are moved manually, either from code or from an AnimationPlayer (with process mode set to fixed), the physics will automatically compute an estimate of their linear and angular velocity. This makes them very useful for moving platforms or other AnimationPlayer-controlled objects (like a door, a bridge that opens, etc).
-	Kinematic Characters: KinematicBody2D also has an api for moving objects (the [method move] method) while performing collision tests. This makes them really useful to implement characters that collide against a world, but that don't require advanced physics.
+		Kinematic bodies are special types of bodies that are meant to be user-controlled. They are not affected by physics at all (to other types of bodies, such a character or a rigid body, these are the same as a static body). They have however, two main uses:
+		Simulated Motion: When these bodies are moved manually, either from code or from an AnimationPlayer (with process mode set to fixed), the physics will automatically compute an estimate of their linear and angular velocity. This makes them very useful for moving platforms or other AnimationPlayer-controlled objects (like a door, a bridge that opens, etc).
+		Kinematic Characters: KinematicBody2D also has an api for moving objects (the [method move] method) while performing collision tests. This makes them really useful to implement characters that collide against a world, but that don't require advanced physics.
 	</description>
 	<methods>
-		<method name="move">
-			<return type="Vector2">
+		<method name="get_collider" qualifiers="const">
+			<return type="Object">
 			</return>
-			<argument index="0" name="rel_vec" type="Vector2">
-			</argument>
 			<description>
-			Move the body in the given direction, stopping if there is an obstacle. The returned vector is how much movement was remaining before being stopped.
+				Return the body that collided with this one.
 			</description>
 		</method>
-		<method name="move_to">
-			<return type="Vector2">
+		<method name="get_collider_metadata" qualifiers="const">
+			<return type="Variant">
 			</return>
-			<argument index="0" name="position" type="Vector2">
-			</argument>
 			<description>
-			Move the body to the given position. This is not a teleport, and the body will stop if there is an obstacle. The returned vector is how much movement was remaining before being stopped.
+				Return the metadata of the shape that collided with this body. If there is no collision, it will return 0, so collisions must be checked first with [method is_colliding]. Additionally, this metadata can not be set with [method Object.set_meta], it must be set with [method Physics2DServer.body_set_shape_metadata].
 			</description>
 		</method>
-		<method name="test_move">
-			<return type="bool">
+		<method name="get_collider_shape" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="rel_vec" type="Vector2">
-			</argument>
 			<description>
-			Return true if there would be a collision if the body moved in the given direction.
+				Return the shape index from the body that collided with this one. If there is no collision, this method will return 0, so collisions must be checked first with [method is_colliding].
 			</description>
 		</method>
-		<method name="get_travel" qualifiers="const">
+		<method name="get_collider_velocity" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
-			Return the last movement done by the body.
+				Return the velocity of the body that collided with this one.
 			</description>
 		</method>
-		<method name="revert_motion">
+		<method name="get_collision_margin" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Undo the last movement done by the body.
+				Return the collision margin for this object.
 			</description>
 		</method>
-		<method name="is_colliding" qualifiers="const">
-			<return type="bool">
+		<method name="get_collision_normal" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<description>
-			Return whether the body is colliding with another.
+				Return the normal of the surface the body collided with. This is useful to implement sliding along a surface.
 			</description>
 		</method>
 		<method name="get_collision_pos" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
-			Return the point in space where the body is touching another. If there is no collision, this method will return (0,0), so collisions must be checked first with [method is_colliding].
+				Return the point in space where the body is touching another. If there is no collision, this method will return (0,0), so collisions must be checked first with [method is_colliding].
 			</description>
 		</method>
-		<method name="get_collision_normal" qualifiers="const">
+		<method name="get_travel" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
-			Return the normal of the surface the body collided with. This is useful to implement sliding along a surface.
+				Return the last movement done by the body.
 			</description>
 		</method>
-		<method name="get_collider_velocity" qualifiers="const">
-			<return type="Vector2">
+		<method name="is_colliding" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the velocity of the body that collided with this one.
+				Return whether the body is colliding with another.
 			</description>
 		</method>
-		<method name="get_collider" qualifiers="const">
-			<return type="Object">
+		<method name="move">
+			<return type="Vector2">
 			</return>
+			<argument index="0" name="rel_vec" type="Vector2">
+			</argument>
 			<description>
-			Return the body that collided with this one.
+				Move the body in the given direction, stopping if there is an obstacle. The returned vector is how much movement was remaining before being stopped.
 			</description>
 		</method>
-		<method name="get_collider_shape" qualifiers="const">
-			<return type="int">
+		<method name="move_to">
+			<return type="Vector2">
 			</return>
+			<argument index="0" name="position" type="Vector2">
+			</argument>
 			<description>
-			Return the shape index from the body that collided with this one. If there is no collision, this method will return 0, so collisions must be checked first with [method is_colliding].
+				Move the body to the given position. This is not a teleport, and the body will stop if there is an obstacle. The returned vector is how much movement was remaining before being stopped.
 			</description>
 		</method>
-		<method name="get_collider_metadata" qualifiers="const">
-			<return type="Variant">
-			</return>
+		<method name="revert_motion">
 			<description>
-			Return the metadata of the shape that collided with this body. If there is no collision, it will return 0, so collisions must be checked first with [method is_colliding]. Additionally, this metadata can not be set with [method Object.set_meta], it must be set with [method Physics2DServer.body_set_shape_metadata].
+				Undo the last movement done by the body.
 			</description>
 		</method>
 		<method name="set_collision_margin">
 			<argument index="0" name="pixels" type="float">
 			</argument>
 			<description>
-			Set the collision margin for this object. A collision margin is an amount (in pixels) that all shapes will grow when computing collisions, to account for numerical imprecision.
+				Set the collision margin for this object. A collision margin is an amount (in pixels) that all shapes will grow when computing collisions, to account for numerical imprecision.
 			</description>
 		</method>
-		<method name="get_collision_margin" qualifiers="const">
-			<return type="float">
+		<method name="test_move">
+			<return type="bool">
 			</return>
+			<argument index="0" name="rel_vec" type="Vector2">
+			</argument>
 			<description>
-			Return the collision margin for this object.
+				Return true if there would be a collision if the body moved in the given direction.
 			</description>
 		</method>
 	</methods>
@@ -17978,171 +18175,171 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="Label" inherits="Control" category="Core">
 	<brief_description>
-	Control that displays formatted text.
+		Control that displays formatted text.
 	</brief_description>
 	<description>
-	Label is a control that displays formatted text, optionally autowrapping it to the [Control] area. It inherits from range to be able to scroll wrapped text vertically.
+		Label is a control that displays formatted text, optionally autowrapping it to the [Control] area. It inherits from range to be able to scroll wrapped text vertically.
 	</description>
 	<methods>
-		<method name="set_align">
-			<argument index="0" name="align" type="int">
-			</argument>
+		<method name="get_align" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Sets the alignment mode to any of the ALIGN_* enumeration values.
+				Return the alignment mode (any of the ALIGN_* enumeration values).
 			</description>
 		</method>
-		<method name="get_align" qualifiers="const">
+		<method name="get_line_count" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the alignment mode (any of the ALIGN_* enumeration values).
+				Return the amount of lines.
 			</description>
 		</method>
-		<method name="set_valign">
-			<argument index="0" name="valign" type="int">
-			</argument>
+		<method name="get_line_height" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Sets the vertical alignment mode to any of the VALIGN_* enumeration values.
+				Return the height of a line.
 			</description>
 		</method>
-		<method name="get_valign" qualifiers="const">
+		<method name="get_lines_skipped" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the vertical alignment mode (any of the VALIGN_* enumeration values).
+				Return the the number of lines to skipped before displaying.
 			</description>
 		</method>
-		<method name="set_text">
-			<argument index="0" name="text" type="String">
-			</argument>
+		<method name="get_max_lines_visible" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the label text. Text can contain newlines.
+				Return the restricted number of lines to display. Returns -1 if unrestricted.
+			</description>
+		</method>
+		<method name="get_percent_visible" qualifiers="const">
+			<return type="float">
+			</return>
+			<description>
+				Return the restricted number of characters to display (as a percentage of the total text).
 			</description>
 		</method>
 		<method name="get_text" qualifiers="const">
 			<return type="String">
 			</return>
 			<description>
-			Return the label text. Text can contain newlines.
+				Return the label text. Text can contain newlines.
 			</description>
 		</method>
-		<method name="set_autowrap">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="get_total_character_count" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set [i]autowrap[/i] mode. When enabled, autowrap will fit text to the control width, breaking sentences when they exceed the available horizontal space. When disabled, the label minimum width becomes the width of the longest row, and the minimum height large enough to fit all rows.
+				Return the total length of the text.
 			</description>
 		</method>
-		<method name="has_autowrap" qualifiers="const">
-			<return type="bool">
+		<method name="get_valign" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the state of the [i]autowrap[/i] mode (see [method set_autowrap]).
+				Return the vertical alignment mode (any of the VALIGN_* enumeration values).
 			</description>
 		</method>
-		<method name="set_clip_text">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="get_visible_characters" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Cuts off the rest of the text if it is too wide.
+				Return the restricted number of characters to display. Returns -1 if unrestricted.
 			</description>
 		</method>
-		<method name="is_clipping_text" qualifiers="const">
+		<method name="has_autowrap" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if text would be cut off if it is too wide.
+				Return the state of the [i]autowrap[/i] mode (see [method set_autowrap]).
 			</description>
 		</method>
-		<method name="set_uppercase">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="is_clipping_text" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Display text in all capitals.
+				Return true if text would be cut off if it is too wide.
 			</description>
 		</method>
 		<method name="is_uppercase" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if text is displayed in all capitals.
+				Return true if text is displayed in all capitals.
 			</description>
 		</method>
-		<method name="get_line_height" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_align">
+			<argument index="0" name="align" type="int">
+			</argument>
 			<description>
-			Return the height of a line.
+				Sets the alignment mode to any of the ALIGN_* enumeration values.
 			</description>
 		</method>
-		<method name="get_line_count" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_autowrap">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Return the amount of lines.
+				Set [i]autowrap[/i] mode. When enabled, autowrap will fit text to the control width, breaking sentences when they exceed the available horizontal space. When disabled, the label minimum width becomes the width of the longest row, and the minimum height large enough to fit all rows.
 			</description>
 		</method>
-		<method name="get_total_character_count" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_clip_text">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Return the total length of the text.
+				Cuts off the rest of the text if it is too wide.
 			</description>
 		</method>
-		<method name="set_visible_characters">
-			<argument index="0" name="amount" type="int">
+		<method name="set_lines_skipped">
+			<argument index="0" name="lines_skipped" type="int">
 			</argument>
 			<description>
-			Restricts the number of characters to display. Set to -1 to disable.
+				Sets the number of lines to skip before displaying. Useful for scrolling text.
 			</description>
 		</method>
-		<method name="get_visible_characters" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_max_lines_visible">
+			<argument index="0" name="lines_visible" type="int">
+			</argument>
 			<description>
-			Return the restricted number of characters to display. Returns -1 if unrestricted.
+				Restricts the number of lines to display. Set to -1 to disable.
 			</description>
 		</method>
 		<method name="set_percent_visible">
 			<argument index="0" name="percent_visible" type="float">
 			</argument>
 			<description>
-			Restricts the number of characters to display (as a percentage of the total text).
+				Restricts the number of characters to display (as a percentage of the total text).
 			</description>
 		</method>
-		<method name="get_percent_visible" qualifiers="const">
-			<return type="float">
-			</return>
-			<description>
-			Return the restricted number of characters to display (as a percentage of the total text).
-			</description>
-		</method>
-		<method name="set_lines_skipped">
-			<argument index="0" name="lines_skipped" type="int">
+		<method name="set_text">
+			<argument index="0" name="text" type="String">
 			</argument>
 			<description>
-			Sets the number of lines to skip before displaying. Useful for scrolling text.
+				Set the label text. Text can contain newlines.
 			</description>
 		</method>
-		<method name="get_lines_skipped" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_uppercase">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Return the the number of lines to skipped before displaying.
+				Display text in all capitals.
 			</description>
 		</method>
-		<method name="set_max_lines_visible">
-			<argument index="0" name="lines_visible" type="int">
+		<method name="set_valign">
+			<argument index="0" name="valign" type="int">
 			</argument>
 			<description>
-			Restricts the number of lines to display. Set to -1 to disable.
+				Sets the vertical alignment mode to any of the VALIGN_* enumeration values.
 			</description>
 		</method>
-		<method name="get_max_lines_visible" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_visible_characters">
+			<argument index="0" name="amount" type="int">
+			</argument>
 			<description>
-			Return the restricted number of lines to display. Returns -1 if unrestricted.
+				Restricts the number of characters to display. Set to -1 to disable.
 			</description>
 		</method>
 	</methods>
@@ -18173,29 +18370,29 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		</constant>
 	</constants>
 	<theme_items>
-		<theme_item name="shadow_offset_x" type="int">
+		<theme_item name="font" type="Font">
 		</theme_item>
-		<theme_item name="line_spacing" type="int">
+		<theme_item name="font_color" type="Color">
 		</theme_item>
-		<theme_item name="shadow_offset_y" type="int">
+		<theme_item name="font_color_shadow" type="Color">
 		</theme_item>
-		<theme_item name="shadow_as_outline" type="int">
+		<theme_item name="line_spacing" type="int">
 		</theme_item>
-		<theme_item name="font_color" type="Color">
+		<theme_item name="shadow_as_outline" type="int">
 		</theme_item>
-		<theme_item name="font_color_shadow" type="Color">
+		<theme_item name="shadow_offset_x" type="int">
 		</theme_item>
-		<theme_item name="font" type="Font">
+		<theme_item name="shadow_offset_y" type="int">
 		</theme_item>
 	</theme_items>
 </class>
 <class name="LargeTexture" inherits="Texture" category="Core">
 	<brief_description>
-	A Texture capable of storing many smaller Textures with offsets.
+		A Texture capable of storing many smaller Textures with offsets.
 	</brief_description>
 	<description>
-	A Texture capable of storing many smaller Textures with offsets.
-	You can dynamically add pieces(Textures) to this fLargeTexture] using different offsets.
+		A Texture capable of storing many smaller Textures with offsets.
+		You can dynamically add pieces(Textures) to this fLargeTexture] using different offsets.
 	</description>
 	<methods>
 		<method name="add_piece">
@@ -18206,44 +18403,19 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="texture" type="Texture">
 			</argument>
 			<description>
-			Add another [Texture] to this [LargeTexture], starting on offset "ofs".
-			</description>
-		</method>
-		<method name="set_piece_offset">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="ofs" type="Vector2">
-			</argument>
-			<description>
-			Set the offset of the piece with index "idx" to "ofs".
-			</description>
-		</method>
-		<method name="set_piece_texture">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="texture" type="Texture">
-			</argument>
-			<description>
-			Set the [Texture] of the piece with index "idx" to  "ofs".
-			</description>
-		</method>
-		<method name="set_size">
-			<argument index="0" name="size" type="Vector2">
-			</argument>
-			<description>
-			Set the size of this [LargeTexture].
+				Add another [Texture] to this [LargeTexture], starting on offset "ofs".
 			</description>
 		</method>
 		<method name="clear">
 			<description>
-			Clear the [LargeTexture].
+				Clear the [LargeTexture].
 			</description>
 		</method>
 		<method name="get_piece_count" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the number of pieces currently in this [LargeTexture].
+				Return the number of pieces currently in this [LargeTexture].
 			</description>
 		</method>
 		<method name="get_piece_offset" qualifiers="const">
@@ -18252,7 +18424,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Return the offset of the piece with index "idx".
+				Return the offset of the piece with index "idx".
 			</description>
 		</method>
 		<method name="get_piece_texture" qualifiers="const">
@@ -18261,7 +18433,32 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Return the [Texture] of the piece with index "idx".
+				Return the [Texture] of the piece with index "idx".
+			</description>
+		</method>
+		<method name="set_piece_offset">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="ofs" type="Vector2">
+			</argument>
+			<description>
+				Set the offset of the piece with index "idx" to "ofs".
+			</description>
+		</method>
+		<method name="set_piece_texture">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="texture" type="Texture">
+			</argument>
+			<description>
+				Set the [Texture] of the piece with index "idx" to  "ofs".
+			</description>
+		</method>
+		<method name="set_size">
+			<argument index="0" name="size" type="Vector2">
+			</argument>
+			<description>
+				Set the size of this [LargeTexture].
 			</description>
 		</method>
 	</methods>
@@ -18270,47 +18467,43 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="Light" inherits="VisualInstance" category="Core">
 	<brief_description>
-	Provides a base class for different kinds of light nodes.
+		Provides a base class for different kinds of light nodes.
 	</brief_description>
 	<description>
-	Light is the abstract base class for light nodes, so it shouldn't be used directly (It can't be instanced). Other types of light nodes inherit from it. Light contains the common variables and parameters used for lighting.
+		Light is the abstract base class for light nodes, so it shouldn't be used directly (It can't be instanced). Other types of light nodes inherit from it. Light contains the common variables and parameters used for lighting.
 	</description>
 	<methods>
-		<method name="set_parameter">
-			<argument index="0" name="variable" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+		<method name="get_bake_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_parameter" qualifiers="const">
-			<return type="float">
+		<method name="get_color" qualifiers="const">
+			<return type="Color">
 			</return>
-			<argument index="0" name="variable" type="int">
+			<argument index="0" name="color" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_color">
-			<argument index="0" name="color" type="int">
-			</argument>
-			<argument index="1" name="value" type="Color">
-			</argument>
+		<method name="get_operator" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_color" qualifiers="const">
-			<return type="Color">
+		<method name="get_parameter" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="color" type="int">
+			<argument index="0" name="variable" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_project_shadows">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="get_projector" qualifiers="const">
+			<return type="Texture">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -18320,63 +18513,67 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="set_projector">
-			<argument index="0" name="projector" type="Texture">
-			</argument>
+		<method name="is_editor_only" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_projector" qualifiers="const">
-			<return type="Texture">
+		<method name="is_enabled" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_operator">
-			<argument index="0" name="operator" type="int">
+		<method name="set_bake_mode">
+			<argument index="0" name="bake_mode" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_operator" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_color">
+			<argument index="0" name="color" type="int">
+			</argument>
+			<argument index="1" name="value" type="Color">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_bake_mode">
-			<argument index="0" name="bake_mode" type="int">
+		<method name="set_editor_only">
+			<argument index="0" name="editor_only" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_bake_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_enabled">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_enabled">
-			<argument index="0" name="enabled" type="bool">
+		<method name="set_operator">
+			<argument index="0" name="operator" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_parameter">
+			<argument index="0" name="variable" type="int">
+			</argument>
+			<argument index="1" name="value" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_editor_only">
-			<argument index="0" name="editor_only" type="bool">
+		<method name="set_project_shadows">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_editor_only" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_projector">
+			<argument index="0" name="projector" type="Texture">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -18412,262 +18609,262 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="Light2D" inherits="Node2D" category="Core">
 	<brief_description>
-	Node that casts light in a 2D environment.
+		Node that casts light in a 2D environment.
 	</brief_description>
 	<description>
-	Node that casts light in a 2D environment. Light is defined by a (usually grayscale) texture, a color, an energy value, a mode (see constants), and various other parameters (range and shadows-related). Note that Light2D can be used as a mask.
+		Node that casts light in a 2D environment. Light is defined by a (usually grayscale) texture, a color, an energy value, a mode (see constants), and various other parameters (range and shadows-related). Note that Light2D can be used as a mask.
 	</description>
 	<methods>
-		<method name="set_enabled">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
+		<method name="get_color" qualifiers="const">
+			<return type="Color">
+			</return>
 			<description>
-			Switches the Light2D on or off, depending on the 'enabled' parameter.
+				Return the color of the Light2D.
 			</description>
 		</method>
-		<method name="is_enabled" qualifiers="const">
-			<return type="bool">
+		<method name="get_energy" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return true if the Light2D is enabled, false if it is not.
+				Return the energy value of the Light2D.
 			</description>
 		</method>
-		<method name="set_texture">
-			<argument index="0" name="texture" type="Object">
-			</argument>
+		<method name="get_height" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the texture of the Light2D.
+				Return the height of the Light2D. Used with 2D normalmapping.
 			</description>
 		</method>
-		<method name="get_texture" qualifiers="const">
-			<return type="Object">
+		<method name="get_item_mask" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the texture of the Light2D.
+				Return the item mask of the Light2D.
 			</description>
 		</method>
-		<method name="set_texture_offset">
-			<argument index="0" name="texture_offset" type="Vector2">
-			</argument>
+		<method name="get_item_shadow_mask" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the offset of the light texture.
+				Return the item shadow mask of the Light2D.
 			</description>
 		</method>
-		<method name="get_texture_offset" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_layer_range_max" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the offset of the light texture.
+				Set the maximum layer value of objects of the scene that are affected by the Light2D.
 			</description>
 		</method>
-		<method name="set_color">
-			<argument index="0" name="color" type="Color">
-			</argument>
+		<method name="get_layer_range_min" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the color of the Light2D.
+				Get the minimum layer value of objects of the scene that are affected by the Light2D.
 			</description>
 		</method>
-		<method name="get_color" qualifiers="const">
-			<return type="Color">
+		<method name="get_mode" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the color of the Light2D.
+				Return the current mode set to the Light2D.
 			</description>
 		</method>
-		<method name="set_height">
-			<argument index="0" name="height" type="float">
-			</argument>
+		<method name="get_shadow_buffer_size" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the height of the Light2D. Used with 2D normalmapping.
+				Return the shadow buffer size.
 			</description>
 		</method>
-		<method name="get_height" qualifiers="const">
-			<return type="float">
+		<method name="get_shadow_color" qualifiers="const">
+			<return type="Color">
 			</return>
 			<description>
-			Return the height of the Light2D. Used with 2D normalmapping.
+				Return the color of casted shadows for this Light2D.
 			</description>
 		</method>
-		<method name="set_energy">
-			<argument index="0" name="energy" type="float">
-			</argument>
+		<method name="get_shadow_esm_multiplier" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the energy value of the Light2D. The bigger the value, the stronger the light.
+				Return the Exponential Shadow Multiplier (ESM) value of the Light2D.
 			</description>
 		</method>
-		<method name="get_energy" qualifiers="const">
-			<return type="float">
+		<method name="get_texture" qualifiers="const">
+			<return type="Object">
 			</return>
 			<description>
-			Return the energy value of the Light2D.
+				Return the texture of the Light2D.
 			</description>
 		</method>
-		<method name="set_texture_scale">
-			<argument index="0" name="texture_scale" type="float">
-			</argument>
+		<method name="get_texture_offset" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
-			Set the scale value of the light texture.
+				Return the offset of the light texture.
 			</description>
 		</method>
 		<method name="get_texture_scale" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the scale value of the light texture.
+				Return the scale value of the light texture.
 			</description>
 		</method>
-		<method name="set_z_range_min">
-			<argument index="0" name="z" type="int">
-			</argument>
+		<method name="get_z_range_max" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the minimum Z value that objects of the scene have to be in order to be affected by the Light2D.
+				Get the maximum Z value that objects of the scene can be in order to be affected by the Light2D.
 			</description>
 		</method>
 		<method name="get_z_range_min" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Get the minimum Z value that objects of the scene have to be in order to be affected by the Light2D.
+				Get the minimum Z value that objects of the scene have to be in order to be affected by the Light2D.
 			</description>
 		</method>
-		<method name="set_z_range_max">
-			<argument index="0" name="z" type="int">
-			</argument>
+		<method name="is_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the maximum Z value that objects of the scene can be in order to be affected by the Light2D.
+				Return true if the Light2D is enabled, false if it is not.
 			</description>
 		</method>
-		<method name="get_z_range_max" qualifiers="const">
-			<return type="int">
+		<method name="is_shadow_enabled" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Get the maximum Z value that objects of the scene can be in order to be affected by the Light2D.
+				Return true if shadow casting is enabled for this Light2D, else return false.
 			</description>
 		</method>
-		<method name="set_layer_range_min">
-			<argument index="0" name="layer" type="int">
+		<method name="set_color">
+			<argument index="0" name="color" type="Color">
 			</argument>
 			<description>
-			Set the minimum layer value of objects of the scene that are affected by the Light2D.
+				Set the color of the Light2D.
 			</description>
 		</method>
-		<method name="get_layer_range_min" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_enabled">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
-			Get the minimum layer value of objects of the scene that are affected by the Light2D.
+				Switches the Light2D on or off, depending on the 'enabled' parameter.
 			</description>
 		</method>
-		<method name="set_layer_range_max">
-			<argument index="0" name="layer" type="int">
+		<method name="set_energy">
+			<argument index="0" name="energy" type="float">
 			</argument>
 			<description>
-			Set the maximum layer value of objects of the scene that are affected by the Light2D.
+				Set the energy value of the Light2D. The bigger the value, the stronger the light.
 			</description>
 		</method>
-		<method name="get_layer_range_max" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_height">
+			<argument index="0" name="height" type="float">
+			</argument>
 			<description>
-			Set the maximum layer value of objects of the scene that are affected by the Light2D.
+				Set the height of the Light2D. Used with 2D normalmapping.
 			</description>
 		</method>
 		<method name="set_item_mask">
 			<argument index="0" name="item_mask" type="int">
 			</argument>
 			<description>
-			Set the item mask of the Light2D to 'item_mask' value.
+				Set the item mask of the Light2D to 'item_mask' value.
 			</description>
 		</method>
-		<method name="get_item_mask" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_item_shadow_mask">
+			<argument index="0" name="item_shadow_mask" type="int">
+			</argument>
 			<description>
-			Return the item mask of the Light2D.
+				Set the item shadow mask to 'item_shadow_mask' value.
 			</description>
 		</method>
-		<method name="set_item_shadow_mask">
-			<argument index="0" name="item_shadow_mask" type="int">
+		<method name="set_layer_range_max">
+			<argument index="0" name="layer" type="int">
 			</argument>
 			<description>
-			Set the item shadow mask to 'item_shadow_mask' value.
+				Set the maximum layer value of objects of the scene that are affected by the Light2D.
 			</description>
 		</method>
-		<method name="get_item_shadow_mask" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_layer_range_min">
+			<argument index="0" name="layer" type="int">
+			</argument>
 			<description>
-			Return the item shadow mask of the Light2D.
+				Set the minimum layer value of objects of the scene that are affected by the Light2D.
 			</description>
 		</method>
 		<method name="set_mode">
 			<argument index="0" name="mode" type="int">
 			</argument>
 			<description>
-			Set the behaviour mode of the Light2D. Use constants defined in the constants section.
+				Set the behaviour mode of the Light2D. Use constants defined in the constants section.
 			</description>
 		</method>
-		<method name="get_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_shadow_buffer_size">
+			<argument index="0" name="size" type="int">
+			</argument>
 			<description>
-			Return the current mode set to the Light2D.
+				Set the shadow buffer size.
 			</description>
 		</method>
-		<method name="set_shadow_enabled">
-			<argument index="0" name="enabled" type="bool">
+		<method name="set_shadow_color">
+			<argument index="0" name="shadow_color" type="Color">
 			</argument>
 			<description>
-			Enable or disable shadows casting from this Light2D according to the 'enabled' parameter.
+				Set the color of casted shadows for this Light2D.
 			</description>
 		</method>
-		<method name="is_shadow_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_shadow_enabled">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
-			Return true if shadow casting is enabled for this Light2D, else return false.
+				Enable or disable shadows casting from this Light2D according to the 'enabled' parameter.
 			</description>
 		</method>
-		<method name="set_shadow_buffer_size">
-			<argument index="0" name="size" type="int">
+		<method name="set_shadow_esm_multiplier">
+			<argument index="0" name="multiplier" type="float">
 			</argument>
 			<description>
-			Set the shadow buffer size.
+				Set the Exponential Shadow Multiplier (ESM) value of the Light2D.
 			</description>
 		</method>
-		<method name="get_shadow_buffer_size" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_texture">
+			<argument index="0" name="texture" type="Object">
+			</argument>
 			<description>
-			Return the shadow buffer size.
+				Set the texture of the Light2D.
 			</description>
 		</method>
-		<method name="set_shadow_esm_multiplier">
-			<argument index="0" name="multiplier" type="float">
+		<method name="set_texture_offset">
+			<argument index="0" name="texture_offset" type="Vector2">
 			</argument>
 			<description>
-			Set the Exponential Shadow Multiplier (ESM) value of the Light2D.
+				Set the offset of the light texture.
 			</description>
 		</method>
-		<method name="get_shadow_esm_multiplier" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_texture_scale">
+			<argument index="0" name="texture_scale" type="float">
+			</argument>
 			<description>
-			Return the Exponential Shadow Multiplier (ESM) value of the Light2D.
+				Set the scale value of the light texture.
 			</description>
 		</method>
-		<method name="set_shadow_color">
-			<argument index="0" name="shadow_color" type="Color">
+		<method name="set_z_range_max">
+			<argument index="0" name="z" type="int">
 			</argument>
 			<description>
-			Set the color of casted shadows for this Light2D.
+				Set the maximum Z value that objects of the scene can be in order to be affected by the Light2D.
 			</description>
 		</method>
-		<method name="get_shadow_color" qualifiers="const">
-			<return type="Color">
-			</return>
+		<method name="set_z_range_min">
+			<argument index="0" name="z" type="int">
+			</argument>
 			<description>
-			Return the color of casted shadows for this Light2D.
+				Set the minimum Z value that objects of the scene have to be in order to be affected by the Light2D.
 			</description>
 		</method>
 	</methods>
@@ -18688,38 +18885,38 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="LightOccluder2D" inherits="Node2D" category="Core">
 	<brief_description>
-	Occludes light cast by a Light2D, thus casting shadows.
+		Occludes light cast by a Light2D, thus casting shadows.
 	</brief_description>
 	<description>
-	Occludes light cast by a Light2D, thus casting shadows. The LightOccluder2D must be provided with a shape (see OccluderPolygon2D) that allows the shadow to be computed. This shape affects the resulting shadow, while the shape of the representating asset shadowed does not actually affect shadows.
+		Occludes light cast by a Light2D, thus casting shadows. The LightOccluder2D must be provided with a shape (see OccluderPolygon2D) that allows the shadow to be computed. This shape affects the resulting shadow, while the shape of the representating asset shadowed does not actually affect shadows.
 	</description>
 	<methods>
-		<method name="set_occluder_polygon">
-			<argument index="0" name="polygon" type="OccluderPolygon2D">
-			</argument>
+		<method name="get_occluder_light_mask" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the OccluderPolygon2D that defines the LightOccluder2D.
+				Return the light mask of the LightOccluder2D.
 			</description>
 		</method>
 		<method name="get_occluder_polygon" qualifiers="const">
 			<return type="OccluderPolygon2D">
 			</return>
 			<description>
-			Return the OccluderPolygon2D that defines the LightOccluder2D.
+				Return the OccluderPolygon2D that defines the LightOccluder2D.
 			</description>
 		</method>
 		<method name="set_occluder_light_mask">
 			<argument index="0" name="mask" type="int">
 			</argument>
 			<description>
-			Set the LightOccluder2D light mask. The LightOccluder2D will cast shadows only from Light2Ds that belong to the same light mask(s).
+				Set the LightOccluder2D light mask. The LightOccluder2D will cast shadows only from Light2Ds that belong to the same light mask(s).
 			</description>
 		</method>
-		<method name="get_occluder_light_mask" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_occluder_polygon">
+			<argument index="0" name="polygon" type="OccluderPolygon2D">
+			</argument>
 			<description>
-			Return the light mask of the LightOccluder2D.
+				Set the OccluderPolygon2D that defines the LightOccluder2D.
 			</description>
 		</method>
 	</methods>
@@ -18728,109 +18925,115 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="LineEdit" inherits="Control" category="Core">
 	<brief_description>
-	Control that provides single line string editing.
+		Control that provides single line string editing.
 	</brief_description>
 	<description>
-	LineEdit provides a single line string editor, used for text fields.
+		LineEdit provides a single line string editor, used for text fields.
 	</description>
 	<methods>
-		<method name="set_align">
-			<argument index="0" name="align" type="int">
+		<method name="append_at_cursor">
+			<argument index="0" name="text" type="String">
 			</argument>
 			<description>
+				Append text at cursor, scrolling the [LineEdit] when needed.
 			</description>
 		</method>
-		<method name="get_align" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="clear">
 			<description>
+				Clear the [LineEdit] text.
 			</description>
 		</method>
-		<method name="clear">
+		<method name="cursor_get_blink_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Clear the [LineEdit] text.
+				Gets whether the line edit caret is blinking.
 			</description>
 		</method>
-		<method name="select_all">
+		<method name="cursor_get_blink_speed" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Select the whole string.
+				Gets the line edit caret blink speed.
 			</description>
 		</method>
-		<method name="set_text">
-			<argument index="0" name="text" type="String">
+		<method name="cursor_set_blink_enabled">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Set the text in the [LineEdit], clearing the existing one and the selection.
+				Set the line edit caret to blink.
 			</description>
 		</method>
-		<method name="get_text" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="cursor_set_blink_speed">
+			<argument index="0" name="blink_speed" type="float">
+			</argument>
 			<description>
-			Return the text in the [LineEdit].
+				Set the line edit caret blink speed. Cannot be less then or equal to 0.
 			</description>
 		</method>
-		<method name="set_cursor_pos">
-			<argument index="0" name="pos" type="int">
-			</argument>
+		<method name="get_align" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the cursor position inside the [LineEdit], causing it to scroll if needed.
 			</description>
 		</method>
 		<method name="get_cursor_pos" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the cursor position inside the [LineEdit].
+				Return the cursor position inside the [LineEdit].
 			</description>
 		</method>
-		<method name="set_max_length">
-			<argument index="0" name="chars" type="int">
-			</argument>
+		<method name="get_max_length" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the maximum amount of characters the [LineEdit] can edit, and cropping existing text in case it exceeds that limit. Setting 0 removes the limit.
+				Return the maximum amount of characters the [LineEdit] can edit. If 0 is returned, no limit exists.
 			</description>
 		</method>
-		<method name="get_max_length" qualifiers="const">
-			<return type="int">
+		<method name="get_menu" qualifiers="const">
+			<return type="PopupMenu">
 			</return>
 			<description>
-			Return the maximum amount of characters the [LineEdit] can edit. If 0 is returned, no limit exists.
 			</description>
 		</method>
-		<method name="append_at_cursor">
-			<argument index="0" name="text" type="String">
-			</argument>
+		<method name="get_placeholder" qualifiers="const">
+			<return type="String">
+			</return>
 			<description>
-			Append text at cursor, scrolling the [LineEdit] when needed.
 			</description>
 		</method>
-		<method name="set_editable">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
+		<method name="get_placeholder_alpha" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the [i]editable[/i] status of the [LineEdit]. When disabled, existing text can't be modified and new text can't be added.
 			</description>
 		</method>
-		<method name="is_editable" qualifiers="const">
-			<return type="bool">
+		<method name="get_text" qualifiers="const">
+			<return type="String">
 			</return>
 			<description>
-			Return the [i]editable[/i] status of the [LineEdit] (see [method set_editable]).
+				Return the text in the [LineEdit].
 			</description>
 		</method>
-		<method name="set_secret">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
+		<method name="is_editable" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the [i]secret[/i] status of the [LineEdit]. When enabled, every character is displayed as "*".
+				Return the [i]editable[/i] status of the [LineEdit] (see [method set_editable]).
 			</description>
 		</method>
 		<method name="is_secret" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return the [i]secret[/i] status of the [LineEdit] (see [method set_secret]).
+				Return the [i]secret[/i] status of the [LineEdit] (see [method set_secret]).
+			</description>
+		</method>
+		<method name="menu_option">
+			<argument index="0" name="option" type="int">
+			</argument>
+			<description>
 			</description>
 		</method>
 		<method name="select">
@@ -18841,32 +19044,78 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="menu_option">
-			<argument index="0" name="option" type="int">
+		<method name="select_all">
+			<description>
+				Select the whole string.
+			</description>
+		</method>
+		<method name="set_align">
+			<argument index="0" name="align" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_menu" qualifiers="const">
-			<return type="PopupMenu">
-			</return>
+		<method name="set_cursor_pos">
+			<argument index="0" name="pos" type="int">
+			</argument>
+			<description>
+				Set the cursor position inside the [LineEdit], causing it to scroll if needed.
+			</description>
+		</method>
+		<method name="set_editable">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
+			<description>
+				Set the [i]editable[/i] status of the [LineEdit]. When disabled, existing text can't be modified and new text can't be added.
+			</description>
+		</method>
+		<method name="set_max_length">
+			<argument index="0" name="chars" type="int">
+			</argument>
+			<description>
+				Set the maximum amount of characters the [LineEdit] can edit, and cropping existing text in case it exceeds that limit. Setting 0 removes the limit.
+			</description>
+		</method>
+		<method name="set_placeholder">
+			<argument index="0" name="text" type="String">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_placeholder_alpha">
+			<argument index="0" name="alpha" type="float">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_secret">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
+				Set the [i]secret[/i] status of the [LineEdit]. When enabled, every character is displayed as "*".
+			</description>
+		</method>
+		<method name="set_text">
+			<argument index="0" name="text" type="String">
+			</argument>
+			<description>
+				Set the text in the [LineEdit], clearing the existing one and the selection.
 			</description>
 		</method>
 	</methods>
 	<signals>
-		<signal name="text_entered">
+		<signal name="text_changed">
 			<argument index="0" name="text" type="String">
 			</argument>
 			<description>
-			This signal is emitted when the user presses KEY_ENTER on the [LineEdit]. This signal is often used as an alternate confirmation mechanism in dialogs.
+				When the text changes, this signal is emitted.
 			</description>
 		</signal>
-		<signal name="text_changed">
+		<signal name="text_entered">
 			<argument index="0" name="text" type="String">
 			</argument>
 			<description>
-			When the text changes, this signal is emitted.
+				This signal is emitted when the user presses KEY_ENTER on the [LineEdit]. This signal is often used as an alternate confirmation mechanism in dialogs.
 			</description>
 		</signal>
 	</signals>
@@ -18895,60 +19144,60 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		</constant>
 	</constants>
 	<theme_items>
-		<theme_item name="minimum_spaces" type="int">
+		<theme_item name="cursor_color" type="Color">
 		</theme_item>
-		<theme_item name="selection_color" type="Color">
+		<theme_item name="focus" type="StyleBox">
 		</theme_item>
-		<theme_item name="cursor_color" type="Color">
+		<theme_item name="font" type="Font">
+		</theme_item>
+		<theme_item name="font_color" type="Color">
 		</theme_item>
 		<theme_item name="font_color_selected" type="Color">
 		</theme_item>
-		<theme_item name="font_color" type="Color">
+		<theme_item name="minimum_spaces" type="int">
 		</theme_item>
-		<theme_item name="font" type="Font">
+		<theme_item name="normal" type="StyleBox">
 		</theme_item>
 		<theme_item name="read_only" type="StyleBox">
 		</theme_item>
-		<theme_item name="focus" type="StyleBox">
-		</theme_item>
-		<theme_item name="normal" type="StyleBox">
+		<theme_item name="selection_color" type="Color">
 		</theme_item>
 	</theme_items>
 </class>
 <class name="LineShape2D" inherits="Shape2D" category="Core">
 	<brief_description>
-	Line shape for 2D collision objects.
+		Line shape for 2D collision objects.
 	</brief_description>
 	<description>
-	Line shape for 2D collision objects. It works like a 2D plane and will not allow any body to go to the negative side. Not recommended for rigid bodies, and usually not recommended for static bodies either because it forces checks against it on every frame.
+		Line shape for 2D collision objects. It works like a 2D plane and will not allow any body to go to the negative side. Not recommended for rigid bodies, and usually not recommended for static bodies either because it forces checks against it on every frame.
 	</description>
 	<methods>
-		<method name="set_normal">
-			<argument index="0" name="normal" type="Vector2">
-			</argument>
+		<method name="get_d" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the line normal.
+				Return the line distance from the origin.
 			</description>
 		</method>
 		<method name="get_normal" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
-			Return the line normal.
+				Return the line normal.
 			</description>
 		</method>
 		<method name="set_d">
 			<argument index="0" name="d" type="float">
 			</argument>
 			<description>
-			Set the line distance from the origin.
+				Set the line distance from the origin.
 			</description>
 		</method>
-		<method name="get_d" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_normal">
+			<argument index="0" name="normal" type="Vector2">
+			</argument>
 			<description>
-			Return the line distance from the origin.
+				Set the line normal.
 			</description>
 		</method>
 	</methods>
@@ -18957,38 +19206,38 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="LinkButton" inherits="BaseButton" category="Core">
 	<brief_description>
-	Simple button used to represent a link to some resource
+		Simple button used to represent a link to some resource
 	</brief_description>
 	<description>
-	This kind of buttons are primarily used when the interaction with the button causes a context change (like linking to a web page).
+		This kind of buttons are primarily used when the interaction with the button causes a context change (like linking to a web page).
 	</description>
 	<methods>
-		<method name="set_text">
-			<argument index="0" name="text" type="String">
-			</argument>
+		<method name="get_text" qualifiers="const">
+			<return type="String">
+			</return>
 			<description>
-			Sets the text of the button.
+				Returns the text of the button.
 			</description>
 		</method>
-		<method name="get_text" qualifiers="const">
-			<return type="String">
+		<method name="get_underline_mode" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Returns the text of the button.
+				Returns the underline mode for this button.
 			</description>
 		</method>
-		<method name="set_underline_mode">
-			<argument index="0" name="underline_mode" type="int">
+		<method name="set_text">
+			<argument index="0" name="text" type="String">
 			</argument>
 			<description>
-			Sets the underline mode for this button, the argument must be one of the [LinkButton] constants (see constants section).
+				Sets the text of the button.
 			</description>
 		</method>
-		<method name="get_underline_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_underline_mode">
+			<argument index="0" name="underline_mode" type="int">
+			</argument>
 			<description>
-			Returns the underline mode for this button.
+				Sets the underline mode for this button, the argument must be one of the [LinkButton] constants (see constants section).
 			</description>
 		</method>
 	</methods>
@@ -19001,7 +19250,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		</constant>
 	</constants>
 	<theme_items>
-		<theme_item name="underline_spacing" type="int">
+		<theme_item name="font" type="Font">
 		</theme_item>
 		<theme_item name="font_color" type="Color">
 		</theme_item>
@@ -19009,7 +19258,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 		</theme_item>
 		<theme_item name="font_color_pressed" type="Color">
 		</theme_item>
-		<theme_item name="font" type="Font">
+		<theme_item name="underline_spacing" type="int">
 		</theme_item>
 	</theme_items>
 </class>
@@ -19019,11 +19268,13 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<description>
 	</description>
 	<methods>
-		<method name="make_current">
+		<method name="clear_current">
 			<description>
 			</description>
 		</method>
-		<method name="clear_current">
+		<method name="get_listener_transform" qualifiers="const">
+			<return type="Transform">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -19033,9 +19284,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="get_listener_transform" qualifiers="const">
-			<return type="Transform">
-			</return>
+		<method name="make_current">
 			<description>
 			</description>
 		</method>
@@ -19045,10 +19294,10 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="MainLoop" inherits="Object" category="Core">
 	<brief_description>
-	Main loop is the abstract main loop base class.
+		Main loop is the abstract main loop base class.
 	</brief_description>
 	<description>
-	Main loop is the abstract main loop base class. All other main loop classes are derived from it. Upon application start, a [MainLoop] has to be provided to OS, else the application will exit. This happens automatically (and a [SceneTree] is created), unless a main [Script] is supplied, which may or not create and return a [MainLoop].
+		Main loop is the abstract main loop base class. All other main loop classes are derived from it. Upon application start, a [MainLoop] has to be provided to OS, else the application will exit. This happens automatically (and a [SceneTree] is created), unless a main [Script] is supplied, which may or not create and return a [MainLoop].
 	</description>
 	<methods>
 		<method name="_drop_files" qualifiers="virtual">
@@ -19091,14 +19340,14 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="input_event">
-			<argument index="0" name="ev" type="InputEvent">
-			</argument>
+		<method name="finish">
 			<description>
 			</description>
 		</method>
-		<method name="input_text">
-			<argument index="0" name="text" type="String">
+		<method name="idle">
+			<return type="bool">
+			</return>
+			<argument index="0" name="delta" type="float">
 			</argument>
 			<description>
 			</description>
@@ -19107,23 +19356,23 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="iteration">
-			<return type="bool">
-			</return>
-			<argument index="0" name="delta" type="float">
+		<method name="input_event">
+			<argument index="0" name="ev" type="InputEvent">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="idle">
-			<return type="bool">
-			</return>
-			<argument index="0" name="delta" type="float">
+		<method name="input_text">
+			<argument index="0" name="text" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="finish">
+		<method name="iteration">
+			<return type="bool">
+			</return>
+			<argument index="0" name="delta" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -19147,23 +19396,23 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="MarginContainer" inherits="Container" category="Core">
 	<brief_description>
-	Simple margin container.
+		Simple margin container.
 	</brief_description>
 	<description>
-	Simple margin container. Adds a left margin to anything contained.
+		Simple margin container. Adds a left margin to anything contained.
 	</description>
 	<methods>
 	</methods>
 	<constants>
 	</constants>
 	<theme_items>
-		<theme_item name="margin_right" type="int">
-		</theme_item>
-		<theme_item name="margin_top" type="int">
+		<theme_item name="margin_bottom" type="int">
 		</theme_item>
 		<theme_item name="margin_left" type="int">
 		</theme_item>
-		<theme_item name="margin_bottom" type="int">
+		<theme_item name="margin_right" type="int">
+		</theme_item>
+		<theme_item name="margin_top" type="int">
 		</theme_item>
 	</theme_items>
 </class>
@@ -19173,10 +19422,18 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<description>
 	</description>
 	<methods>
-		<method name="variant_to_base64">
+		<method name="base64_to_raw">
+			<return type="RawArray">
+			</return>
+			<argument index="0" name="base64_str" type="String">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="base64_to_utf8">
 			<return type="String">
 			</return>
-			<argument index="0" name="variant" type="Variant">
+			<argument index="0" name="base64_str" type="String">
 			</argument>
 			<description>
 			</description>
@@ -19197,14 +19454,6 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="base64_to_raw">
-			<return type="RawArray">
-			</return>
-			<argument index="0" name="base64_str" type="String">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="utf8_to_base64">
 			<return type="String">
 			</return>
@@ -19213,10 +19462,10 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="base64_to_utf8">
+		<method name="variant_to_base64">
 			<return type="String">
 			</return>
-			<argument index="0" name="base64_str" type="String">
+			<argument index="0" name="variant" type="Variant">
 			</argument>
 			<description>
 			</description>
@@ -19227,68 +19476,68 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="Material" inherits="Resource" category="Core">
 	<brief_description>
-	Abstract base [Resource] for coloring and shading geometry.
+		Abstract base [Resource] for coloring and shading geometry.
 	</brief_description>
 	<description>
-	Material is a base [Resource] used for coloring and shading geometry. All materials inherit from it and almost all [VisualInstance] derived nodes carry a Material. A few flags and parameters are shared between all material types and are configured here.
+		Material is a base [Resource] used for coloring and shading geometry. All materials inherit from it and almost all [VisualInstance] derived nodes carry a Material. A few flags and parameters are shared between all material types and are configured here.
 	</description>
 	<methods>
-		<method name="set_flag">
-			<argument index="0" name="flag" type="int">
-			</argument>
-			<argument index="1" name="enable" type="bool">
-			</argument>
+		<method name="get_blend_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set a [Material] flag, which toggles on or off a behavior when rendering. See enumeration FLAG_* for a list.
+				Return blend mode for the material, which can be one of BLEND_MODE_MIX (default), BLEND_MODE_ADD, BLEND_MODE_SUB. Keep in mind that only BLEND_MODE_MIX ensures that the material [i]may[/i] be opaque, any other blend mode will render with alpha blending enabled in raster-based [VisualServer] implementations.
 			</description>
 		</method>
-		<method name="get_flag" qualifiers="const">
-			<return type="bool">
+		<method name="get_depth_draw_mode" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="flag" type="int">
-			</argument>
 			<description>
-			Return a [Material] flag, which toggles on or off a behavior when rendering. See enumeration FLAG_* for a list.
 			</description>
 		</method>
-		<method name="set_blend_mode">
-			<argument index="0" name="mode" type="int">
+		<method name="get_flag" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="flag" type="int">
 			</argument>
 			<description>
-			Set blend mode for the material, which can be one of BLEND_MODE_MIX (default), BLEND_MODE_ADD, BLEND_MODE_SUB. Keep in mind that only BLEND_MODE_MIX ensures that the material [i]may[/i] be opaque, any other blend mode will render with alpha blending enabled in raster-based [VisualServer] implementations.
+				Return a [Material] flag, which toggles on or off a behavior when rendering. See enumeration FLAG_* for a list.
 			</description>
 		</method>
-		<method name="get_blend_mode" qualifiers="const">
-			<return type="int">
+		<method name="get_line_width" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return blend mode for the material, which can be one of BLEND_MODE_MIX (default), BLEND_MODE_ADD, BLEND_MODE_SUB. Keep in mind that only BLEND_MODE_MIX ensures that the material [i]may[/i] be opaque, any other blend mode will render with alpha blending enabled in raster-based [VisualServer] implementations.
+				Return the line width for geometry drawn with FLAG_WIREFRAME enabled, or LINE primitives. Note that not all hardware or VisualServer backends support this (like DirectX).
 			</description>
 		</method>
-		<method name="set_line_width">
-			<argument index="0" name="width" type="float">
+		<method name="set_blend_mode">
+			<argument index="0" name="mode" type="int">
 			</argument>
 			<description>
-			Set the line width for geometry drawn with FLAG_WIREFRAME enabled, or LINE primitives. Note that not all hardware or VisualServer backends support this (like DirectX).
+				Set blend mode for the material, which can be one of BLEND_MODE_MIX (default), BLEND_MODE_ADD, BLEND_MODE_SUB. Keep in mind that only BLEND_MODE_MIX ensures that the material [i]may[/i] be opaque, any other blend mode will render with alpha blending enabled in raster-based [VisualServer] implementations.
 			</description>
 		</method>
-		<method name="get_line_width" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_depth_draw_mode">
+			<argument index="0" name="mode" type="int">
+			</argument>
 			<description>
-			Return the line width for geometry drawn with FLAG_WIREFRAME enabled, or LINE primitives. Note that not all hardware or VisualServer backends support this (like DirectX).
 			</description>
 		</method>
-		<method name="set_depth_draw_mode">
-			<argument index="0" name="mode" type="int">
+		<method name="set_flag">
+			<argument index="0" name="flag" type="int">
+			</argument>
+			<argument index="1" name="enable" type="bool">
 			</argument>
 			<description>
+				Set a [Material] flag, which toggles on or off a behavior when rendering. See enumeration FLAG_* for a list.
 			</description>
 		</method>
-		<method name="get_depth_draw_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_line_width">
+			<argument index="0" name="width" type="float">
+			</argument>
 			<description>
+				Set the line width for geometry drawn with FLAG_WIREFRAME enabled, or LINE primitives. Note that not all hardware or VisualServer backends support this (like DirectX).
 			</description>
 		</method>
 	</methods>
@@ -19359,24 +19608,57 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="Matrix3" category="Built-In Types">
 	<brief_description>
-	3x3 matrix datatype.
+		3x3 matrix datatype.
 	</brief_description>
 	<description>
-	3x3 matrix used for 3D rotation and scale. Contains 3 vector fields x,y and z. Can also be accessed as array of 3D vectors. Almost always used as orthogonal basis for a [Transform].
+		3x3 matrix used for 3D rotation and scale. Contains 3 vector fields x,y and z. Can also be accessed as array of 3D vectors. Almost always used as orthogonal basis for a [Transform].
 	</description>
 	<methods>
+		<method name="Matrix3">
+			<return type="Matrix3">
+			</return>
+			<argument index="0" name="from" type="Quat">
+			</argument>
+			<description>
+				Create a matrix from a quaternion.
+			</description>
+		</method>
+		<method name="Matrix3">
+			<return type="Matrix3">
+			</return>
+			<argument index="0" name="axis" type="Vector3">
+			</argument>
+			<argument index="1" name="phi" type="float">
+			</argument>
+			<description>
+				Create a matrix from an axis vector and an angle.
+			</description>
+		</method>
+		<method name="Matrix3">
+			<return type="Matrix3">
+			</return>
+			<argument index="0" name="x_axis" type="Vector3">
+			</argument>
+			<argument index="1" name="y_axis" type="Vector3">
+			</argument>
+			<argument index="2" name="z_axis" type="Vector3">
+			</argument>
+			<description>
+				Create a matrix from 3 axis vectors.
+			</description>
+		</method>
 		<method name="determinant">
 			<return type="float">
 			</return>
 			<description>
-			Return the determinant of the matrix.
+				Return the determinant of the matrix.
 			</description>
 		</method>
 		<method name="get_euler">
 			<return type="Vector3">
 			</return>
 			<description>
-			Return euler angles from the matrix.
+				Return euler angles from the matrix.
 			</description>
 		</method>
 		<method name="get_orthogonal_index">
@@ -19395,14 +19677,14 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<return type="Matrix3">
 			</return>
 			<description>
-			Return the affine inverse of the matrix.
+				Return the affine inverse of the matrix.
 			</description>
 		</method>
 		<method name="orthonormalized">
 			<return type="Matrix3">
 			</return>
 			<description>
-			Return the orthonormalized version of the matrix (useful to call from time to time to avoid rounding error).
+				Return the orthonormalized version of the matrix (useful to call from time to time to avoid rounding error).
 			</description>
 		</method>
 		<method name="rotated">
@@ -19413,7 +19695,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="phi" type="float">
 			</argument>
 			<description>
-			Return the rotated version of the matrix, by a given axis and angle.
+				Return the rotated version of the matrix, by a given axis and angle.
 			</description>
 		</method>
 		<method name="scaled">
@@ -19422,7 +19704,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="scale" type="Vector3">
 			</argument>
 			<description>
-			Return the scaled version of the matrix, by a 3D scale.
+				Return the scaled version of the matrix, by a 3D scale.
 			</description>
 		</method>
 		<method name="tdotx">
@@ -19431,7 +19713,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="with" type="Vector3">
 			</argument>
 			<description>
-			Transposed dot product with the x axis of the matrix.
+				Transposed dot product with the x axis of the matrix.
 			</description>
 		</method>
 		<method name="tdoty">
@@ -19440,7 +19722,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="with" type="Vector3">
 			</argument>
 			<description>
-			Transposed dot product with the y axis of the matrix.
+				Transposed dot product with the y axis of the matrix.
 			</description>
 		</method>
 		<method name="tdotz">
@@ -19449,14 +19731,14 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="with" type="Vector3">
 			</argument>
 			<description>
-			Transposed dot product with the z axis of the matrix.
+				Transposed dot product with the z axis of the matrix.
 			</description>
 		</method>
 		<method name="transposed">
 			<return type="Matrix3">
 			</return>
 			<description>
-			Return the transposed version of the matrix.
+				Return the transposed version of the matrix.
 			</description>
 		</method>
 		<method name="xform">
@@ -19465,7 +19747,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="v" type="Vector3">
 			</argument>
 			<description>
-			Return a vector transformed by the matrix and return it.
+				Return a vector transformed by the matrix and return it.
 			</description>
 		</method>
 		<method name="xform_inv">
@@ -19474,40 +19756,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="v" type="Vector3">
 			</argument>
 			<description>
-			Return a vector transformed by the transposed matrix and return it.
-			</description>
-		</method>
-		<method name="Matrix3">
-			<return type="Matrix3">
-			</return>
-			<argument index="0" name="x_axis" type="Vector3">
-			</argument>
-			<argument index="1" name="y_axis" type="Vector3">
-			</argument>
-			<argument index="2" name="z_axis" type="Vector3">
-			</argument>
-			<description>
-			Create a matrix from 3 axis vectors.
-			</description>
-		</method>
-		<method name="Matrix3">
-			<return type="Matrix3">
-			</return>
-			<argument index="0" name="axis" type="Vector3">
-			</argument>
-			<argument index="1" name="phi" type="float">
-			</argument>
-			<description>
-			Create a matrix from an axis vector and an angle.
-			</description>
-		</method>
-		<method name="Matrix3">
-			<return type="Matrix3">
-			</return>
-			<argument index="0" name="from" type="Quat">
-			</argument>
-			<description>
-			Create a matrix from a quaternion.
+				Return a vector transformed by the transposed matrix and return it.
 			</description>
 		</method>
 	</methods>
@@ -19524,12 +19773,42 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="Matrix32" category="Built-In Types">
 	<brief_description>
-	3x2 Matrix for 2D transforms.
+		3x2 Matrix for 2D transforms.
 	</brief_description>
 	<description>
-	3x2 Matrix for 2D transforms.
+		3x2 Matrix for 2D transforms.
 	</description>
 	<methods>
+		<method name="Matrix32">
+			<return type="Matrix32">
+			</return>
+			<argument index="0" name="from" type="Transform">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="Matrix32">
+			<return type="Matrix32">
+			</return>
+			<argument index="0" name="x_axis" type="Vector2">
+			</argument>
+			<argument index="1" name="y_axis" type="Vector2">
+			</argument>
+			<argument index="2" name="origin" type="Vector2">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="Matrix32">
+			<return type="Matrix32">
+			</return>
+			<argument index="0" name="rot" type="float">
+			</argument>
+			<argument index="1" name="pos" type="Vector2">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="affine_inverse">
 			<return type="Matrix32">
 			</return>
@@ -19632,61 +19911,31 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="Matrix32">
-			<return type="Matrix32">
-			</return>
-			<argument index="0" name="rot" type="float">
-			</argument>
-			<argument index="1" name="pos" type="Vector2">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="Matrix32">
-			<return type="Matrix32">
-			</return>
-			<argument index="0" name="x_axis" type="Vector2">
-			</argument>
-			<argument index="1" name="y_axis" type="Vector2">
-			</argument>
-			<argument index="2" name="origin" type="Vector2">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="Matrix32">
-			<return type="Matrix32">
-			</return>
-			<argument index="0" name="from" type="Transform">
-			</argument>
-			<description>
-			</description>
-		</method>
 	</methods>
 	<members>
+		<member name="o" type="Vector2">
+		</member>
 		<member name="x" type="Vector2">
 		</member>
 		<member name="y" type="Vector2">
 		</member>
-		<member name="o" type="Vector2">
-		</member>
 	</members>
 	<constants>
 	</constants>
 </class>
 <class name="MenuButton" inherits="Button" category="Core">
 	<brief_description>
-	Special button that brings up a [PopupMenu] when clicked.
+		Special button that brings up a [PopupMenu] when clicked.
 	</brief_description>
 	<description>
-	Special button that brings up a [PopupMenu] when clicked. That's pretty much all it does, as it's just a helper class when building GUIs.
+		Special button that brings up a [PopupMenu] when clicked. That's pretty much all it does, as it's just a helper class when building GUIs.
 	</description>
 	<methods>
 		<method name="get_popup">
 			<return type="PopupMenu">
 			</return>
 			<description>
-			Return the [PopupMenu] contained in this button.
+				Return the [PopupMenu] contained in this button.
 			</description>
 		</method>
 	</methods>
@@ -19699,36 +19948,36 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<constants>
 	</constants>
 	<theme_items>
-		<theme_item name="hseparation" type="int">
+		<theme_item name="disabled" type="StyleBox">
 		</theme_item>
-		<theme_item name="font_color_disabled" type="Color">
+		<theme_item name="focus" type="StyleBox">
+		</theme_item>
+		<theme_item name="font" type="Font">
 		</theme_item>
 		<theme_item name="font_color" type="Color">
 		</theme_item>
+		<theme_item name="font_color_disabled" type="Color">
+		</theme_item>
 		<theme_item name="font_color_hover" type="Color">
 		</theme_item>
 		<theme_item name="font_color_pressed" type="Color">
 		</theme_item>
-		<theme_item name="font" type="Font">
-		</theme_item>
 		<theme_item name="hover" type="StyleBox">
 		</theme_item>
-		<theme_item name="pressed" type="StyleBox">
-		</theme_item>
-		<theme_item name="focus" type="StyleBox">
-		</theme_item>
-		<theme_item name="disabled" type="StyleBox">
+		<theme_item name="hseparation" type="int">
 		</theme_item>
 		<theme_item name="normal" type="StyleBox">
 		</theme_item>
+		<theme_item name="pressed" type="StyleBox">
+		</theme_item>
 	</theme_items>
 </class>
 <class name="Mesh" inherits="Resource" category="Core">
 	<brief_description>
-	A [Resource] that contains vertex-array based geometry.
+		A [Resource] that contains vertex-array based geometry.
 	</brief_description>
 	<description>
-	Mesh is a type of [Resource] that contains vertex-array based geometry, divided in [i]surfaces[/i]. Each surface contains a completely separate array and a material used to draw it. Design wise, a mesh with multiple surfaces is preferred to a single surface, because objects created in 3D editing software commonly contain multiple materials.
+		Mesh is a type of [Resource] that contains vertex-array based geometry, divided in [i]surfaces[/i]. Each surface contains a completely separate array and a material used to draw it. Design wise, a mesh with multiple surfaces is preferred to a single surface, because objects created in 3D editing software commonly contain multiple materials.
 	</description>
 	<methods>
 		<method name="add_morph_target">
@@ -19737,17 +19986,22 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="get_morph_target_count" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="add_surface">
+			<argument index="0" name="primitive" type="int">
+			</argument>
+			<argument index="1" name="arrays" type="Array">
+			</argument>
+			<argument index="2" name="morph_arrays" type="Array" default="Array()">
+			</argument>
+			<argument index="3" name="alphasort" type="bool" default="false">
+			</argument>
 			<description>
+				Create a new surface ([method get_surface_count] that will become surf_idx for this.
+				Surfaces are created to be rendered using a "primitive", which may be PRIMITIVE_POINTS, PRIMITIVE_LINES, PRIMITIVE_LINE_STRIP, PRIMITIVE_LINE_LOOP, PRIMITIVE_TRIANGLES, PRIMITIVE_TRIANGLE_STRIP, PRIMITIVE_TRIANGLE_FAN. (As a note, when using indices, it is recommended to only use just points, lines or triangles).
+				The format of a surface determines which arrays it will allocate and hold, so "format" is a combination of ARRAY_FORMAT_* mask constants ORed together. ARRAY_FORMAT_VERTEX must be always present. "array_len" determines the amount of vertices in the array (not primitives!). if ARRAY_FORMAT_INDEX is in the format mask, then it means that an index array will be allocated and "index_array_len" must be passed.
 			</description>
 		</method>
-		<method name="get_morph_target_name" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="index" type="int">
-			</argument>
+		<method name="center_geometry">
 			<description>
 			</description>
 		</method>
@@ -19755,9 +20009,15 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="set_morph_target_mode">
-			<argument index="0" name="mode" type="int">
-			</argument>
+		<method name="get_custom_aabb" qualifiers="const">
+			<return type="AABB">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="get_morph_target_count" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -19767,78 +20027,62 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="add_surface">
-			<argument index="0" name="primitive" type="int">
-			</argument>
-			<argument index="1" name="arrays" type="Array">
-			</argument>
-			<argument index="2" name="morph_arrays" type="Array" default="Array()">
-			</argument>
-			<argument index="3" name="alphasort" type="bool" default="false">
+		<method name="get_morph_target_name" qualifiers="const">
+			<return type="String">
+			</return>
+			<argument index="0" name="index" type="int">
 			</argument>
 			<description>
-			Create a new surface ([method get_surface_count] that will become surf_idx for this.
-			Surfaces are created to be rendered using a "primitive", which may be PRIMITIVE_POINTS, PRIMITIVE_LINES, PRIMITIVE_LINE_STRIP, PRIMITIVE_LINE_LOOP, PRIMITIVE_TRIANGLES, PRIMITIVE_TRIANGLE_STRIP, PRIMITIVE_TRIANGLE_FAN. (As a note, when using indices, it is recommended to only use just points, lines or triangles).
-			The format of a surface determines which arrays it will allocate and hold, so "format" is a combination of ARRAY_FORMAT_* mask constants ORed together. ARRAY_FORMAT_VERTEX must be always present. "array_len" determines the amount of vertices in the array (not primitives!). if ARRAY_FORMAT_INDEX is in the format mask, then it means that an index array will be allocated and "index_array_len" must be passed.
 			</description>
 		</method>
 		<method name="get_surface_count" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the amount of surfaces that the [Mesh] holds.
+				Return the amount of surfaces that the [Mesh] holds.
 			</description>
 		</method>
-		<method name="surface_remove">
-			<argument index="0" name="surf_idx" type="int">
-			</argument>
+		<method name="regen_normalmaps">
 			<description>
-			Remove a surface at position surf_idx, shifting greater surfaces one surf_idx slot down.
 			</description>
 		</method>
-		<method name="surface_get_array_len" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="surf_idx" type="int">
+		<method name="set_custom_aabb">
+			<argument index="0" name="aabb" type="AABB">
 			</argument>
 			<description>
-			Return the length in vertices of the vertex array in the requested surface (see [method add_surface]).
 			</description>
 		</method>
-		<method name="surface_get_array_index_len" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="surf_idx" type="int">
+		<method name="set_morph_target_mode">
+			<argument index="0" name="mode" type="int">
 			</argument>
 			<description>
-			Return the length in indices of the index array in the requested surface (see [method add_surface]).
 			</description>
 		</method>
-		<method name="surface_get_format" qualifiers="const">
+		<method name="surface_get_array_index_len" qualifiers="const">
 			<return type="int">
 			</return>
 			<argument index="0" name="surf_idx" type="int">
 			</argument>
 			<description>
-			Return the format mask of the requested surface (see [method add_surface]).
+				Return the length in indices of the index array in the requested surface (see [method add_surface]).
 			</description>
 		</method>
-		<method name="surface_get_primitive_type" qualifiers="const">
+		<method name="surface_get_array_len" qualifiers="const">
 			<return type="int">
 			</return>
 			<argument index="0" name="surf_idx" type="int">
 			</argument>
 			<description>
-			Return the primitive type of the requested surface (see [method add_surface]).
+				Return the length in vertices of the vertex array in the requested surface (see [method add_surface]).
 			</description>
 		</method>
-		<method name="surface_set_material">
+		<method name="surface_get_format" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="surf_idx" type="int">
 			</argument>
-			<argument index="1" name="material" type="Material">
-			</argument>
 			<description>
-			Set a [Material] for a given surface. Surface will be rendered using this material.
+				Return the format mask of the requested surface (see [method add_surface]).
 			</description>
 		</method>
 		<method name="surface_get_material" qualifiers="const">
@@ -19847,15 +20091,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="surf_idx" type="int">
 			</argument>
 			<description>
-			Return a [Material] in a given surface. Surface is rendered using this material.
-			</description>
-		</method>
-		<method name="surface_set_name">
-			<argument index="0" name="surf_idx" type="int">
-			</argument>
-			<argument index="1" name="name" type="String">
-			</argument>
-			<description>
+				Return a [Material] in a given surface. Surface is rendered using this material.
 			</description>
 		</method>
 		<method name="surface_get_name" qualifiers="const">
@@ -19866,23 +20102,36 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="center_geometry">
+		<method name="surface_get_primitive_type" qualifiers="const">
+			<return type="int">
+			</return>
+			<argument index="0" name="surf_idx" type="int">
+			</argument>
 			<description>
+				Return the primitive type of the requested surface (see [method add_surface]).
 			</description>
 		</method>
-		<method name="regen_normalmaps">
+		<method name="surface_remove">
+			<argument index="0" name="surf_idx" type="int">
+			</argument>
 			<description>
+				Remove a surface at position surf_idx, shifting greater surfaces one surf_idx slot down.
 			</description>
 		</method>
-		<method name="set_custom_aabb">
-			<argument index="0" name="aabb" type="AABB">
+		<method name="surface_set_material">
+			<argument index="0" name="surf_idx" type="int">
+			</argument>
+			<argument index="1" name="material" type="Material">
 			</argument>
 			<description>
+				Set a [Material] for a given surface. Surface will be rendered using this material.
 			</description>
 		</method>
-		<method name="get_custom_aabb" qualifiers="const">
-			<return type="AABB">
-			</return>
+		<method name="surface_set_name">
+			<argument index="0" name="surf_idx" type="int">
+			</argument>
+			<argument index="1" name="name" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -19981,39 +20230,51 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="create_from_surface">
+		<method name="commit_to_surface">
 			<return type="int">
 			</return>
 			<argument index="0" name="mesh" type="Object">
 			</argument>
-			<argument index="1" name="surface" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="commit_to_surface">
+		<method name="create_from_surface">
 			<return type="int">
 			</return>
 			<argument index="0" name="mesh" type="Object">
 			</argument>
+			<argument index="1" name="surface" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_format" qualifiers="const">
+		<method name="get_edge_count" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_vertex_count" qualifiers="const">
-			<return type="int">
+		<method name="get_edge_faces" qualifiers="const">
+			<return type="IntArray">
 			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_edge_count" qualifiers="const">
+		<method name="get_edge_meta" qualifiers="const">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="get_edge_vertex" qualifiers="const">
 			<return type="int">
 			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="vertex" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -20023,15 +20284,23 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="set_vertex">
+		<method name="get_face_edge" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="vertex" type="Vector3">
+			<argument index="1" name="edge" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_vertex" qualifiers="const">
+		<method name="get_face_meta" qualifiers="const">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="get_face_normal" qualifiers="const">
 			<return type="Vector3">
 			</return>
 			<argument index="0" name="idx" type="int">
@@ -20039,107 +20308,109 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="set_vertex_normal">
+		<method name="get_face_vertex" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="normal" type="Vector3">
+			<argument index="1" name="vertex" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_vertex_normal" qualifiers="const">
-			<return type="Vector3">
+		<method name="get_format" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_vertex_tangent">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="tangent" type="Plane">
-			</argument>
+		<method name="get_material" qualifiers="const">
+			<return type="Object">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_vertex_tangent" qualifiers="const">
-			<return type="Plane">
+		<method name="get_vertex" qualifiers="const">
+			<return type="Vector3">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_vertex_uv">
+		<method name="get_vertex_bones" qualifiers="const">
+			<return type="IntArray">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="uv" type="Vector2">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_vertex_uv" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_vertex_color" qualifiers="const">
+			<return type="Color">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_vertex_uv2">
+		<method name="get_vertex_count" qualifiers="const">
+			<return type="int">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="get_vertex_edges" qualifiers="const">
+			<return type="IntArray">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="uv2" type="Vector2">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_vertex_uv2" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_vertex_faces" qualifiers="const">
+			<return type="IntArray">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_vertex_color">
+		<method name="get_vertex_meta" qualifiers="const">
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="color" type="Color">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_vertex_color" qualifiers="const">
-			<return type="Color">
+		<method name="get_vertex_normal" qualifiers="const">
+			<return type="Vector3">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_vertex_bones">
+		<method name="get_vertex_tangent" qualifiers="const">
+			<return type="Plane">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="bones" type="IntArray">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_vertex_bones" qualifiers="const">
-			<return type="IntArray">
+		<method name="get_vertex_uv" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_vertex_weights">
+		<method name="get_vertex_uv2" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="weights" type="RealArray">
-			</argument>
 			<description>
 			</description>
 		</method>
@@ -20151,7 +20422,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="set_vertex_meta">
+		<method name="set_edge_meta">
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<argument index="1" name="meta" type="Variant">
@@ -20159,165 +20430,143 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="get_vertex_meta" qualifiers="const">
+		<method name="set_face_meta">
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_vertex_edges" qualifiers="const">
-			<return type="IntArray">
-			</return>
-			<argument index="0" name="idx" type="int">
+			<argument index="1" name="meta" type="Variant">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_vertex_faces" qualifiers="const">
-			<return type="IntArray">
-			</return>
-			<argument index="0" name="idx" type="int">
+		<method name="set_material">
+			<argument index="0" name="material" type="Material">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_edge_vertex" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_vertex">
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="vertex" type="int">
+			<argument index="1" name="vertex" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_edge_faces" qualifiers="const">
-			<return type="IntArray">
-			</return>
+		<method name="set_vertex_bones">
 			<argument index="0" name="idx" type="int">
 			</argument>
+			<argument index="1" name="bones" type="IntArray">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_edge_meta">
+		<method name="set_vertex_color">
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="meta" type="Variant">
+			<argument index="1" name="color" type="Color">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_edge_meta" qualifiers="const">
+		<method name="set_vertex_meta">
 			<argument index="0" name="idx" type="int">
 			</argument>
+			<argument index="1" name="meta" type="Variant">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_face_vertex" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_vertex_normal">
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="vertex" type="int">
+			<argument index="1" name="normal" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_face_edge" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_vertex_tangent">
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="edge" type="int">
+			<argument index="1" name="tangent" type="Plane">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_face_meta">
+		<method name="set_vertex_uv">
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="meta" type="Variant">
+			<argument index="1" name="uv" type="Vector2">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_face_meta" qualifiers="const">
+		<method name="set_vertex_uv2">
 			<argument index="0" name="idx" type="int">
 			</argument>
+			<argument index="1" name="uv2" type="Vector2">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_face_normal" qualifiers="const">
-			<return type="Vector3">
-			</return>
+		<method name="set_vertex_weights">
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="set_material">
-			<argument index="0" name="material" type="Material">
+			<argument index="1" name="weights" type="RealArray">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_material" qualifiers="const">
-			<return type="Object">
-			</return>
-			<description>
-			</description>
-		</method>
 	</methods>
 	<constants>
 	</constants>
 </class>
 <class name="MeshInstance" inherits="GeometryInstance" category="Core">
 	<brief_description>
-	Node that instances meshes into a scenario.
+		Node that instances meshes into a scenario.
 	</brief_description>
 	<description>
-	MeshInstance is a [Node] that takes a [Mesh] resource and adds it to the current scenario by creating an instance of it. This is the class most often used to get 3D geometry rendered and can be used to instance a single [Mesh] in many places. This allows to reuse geometry and save on resources. When a [Mesh] has to be instanced more than thousands of times at close proximity, consider using a [MultiMesh] in a [MultiMeshInstance] instead.
+		MeshInstance is a [Node] that takes a [Mesh] resource and adds it to the current scenario by creating an instance of it. This is the class most often used to get 3D geometry rendered and can be used to instance a single [Mesh] in many places. This allows to reuse geometry and save on resources. When a [Mesh] has to be instanced more than thousands of times at close proximity, consider using a [MultiMesh] in a [MultiMeshInstance] instead.
 	</description>
 	<methods>
-		<method name="set_mesh">
-			<argument index="0" name="mesh" type="Mesh">
-			</argument>
+		<method name="create_convex_collision">
 			<description>
-			Set the [Mesh] resource for the instance.
 			</description>
 		</method>
-		<method name="get_mesh" qualifiers="const">
-			<return type="Mesh">
-			</return>
+		<method name="create_trimesh_collision">
 			<description>
-			Return the current [Mesh] resource for the instance.
+				This helper creates a [StaticBody] child [Node] using the mesh geometry as collision. It's mainly used for testing.
 			</description>
 		</method>
-		<method name="set_skeleton_path">
-			<argument index="0" name="skeleton_path" type="NodePath">
-			</argument>
+		<method name="get_aabb" qualifiers="const">
+			<return type="AABB">
+			</return>
 			<description>
+				Return the AABB of the mesh, in local coordinates.
 			</description>
 		</method>
-		<method name="get_skeleton_path">
-			<return type="NodePath">
+		<method name="get_mesh" qualifiers="const">
+			<return type="Mesh">
 			</return>
 			<description>
+				Return the current [Mesh] resource for the instance.
 			</description>
 		</method>
-		<method name="get_aabb" qualifiers="const">
-			<return type="AABB">
+		<method name="get_skeleton_path">
+			<return type="NodePath">
 			</return>
 			<description>
-			Return the AABB of the mesh, in local coordinates.
 			</description>
 		</method>
-		<method name="create_trimesh_collision">
+		<method name="set_mesh">
+			<argument index="0" name="mesh" type="Mesh">
+			</argument>
 			<description>
-			This helper creates a [StaticBody] child [Node] using the mesh geometry as collision. It's mainly used for testing.
+				Set the [Mesh] resource for the instance.
 			</description>
 		</method>
-		<method name="create_convex_collision">
+		<method name="set_skeleton_path">
+			<argument index="0" name="skeleton_path" type="NodePath">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -20327,51 +20576,38 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="MeshLibrary" inherits="Resource" category="Core">
 	<brief_description>
-	Library of meshes.
+		Library of meshes.
 	</brief_description>
 	<description>
-	Library of meshes. Contains a list of [Mesh] resources, each with name and ID. Useful for GridMap or painting Terrain.
+		Library of meshes. Contains a list of [Mesh] resources, each with name and ID. Useful for GridMap or painting Terrain.
 	</description>
 	<methods>
-		<method name="create_item">
-			<argument index="0" name="id" type="int">
-			</argument>
-			<description>
-			Create a new item in the library, supplied an id.
-			</description>
-		</method>
-		<method name="set_item_name">
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="name" type="String">
-			</argument>
+		<method name="clear">
 			<description>
-			Set the name of the item.
+				Clear the library.
 			</description>
 		</method>
-		<method name="set_item_mesh">
+		<method name="create_item">
 			<argument index="0" name="id" type="int">
 			</argument>
-			<argument index="1" name="mesh" type="Mesh">
-			</argument>
 			<description>
-			Set the mesh of the item.
+				Create a new item in the library, supplied an id.
 			</description>
 		</method>
-		<method name="set_item_navmesh">
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="navmesh" type="NavigationMesh">
-			</argument>
+		<method name="get_item_list" qualifiers="const">
+			<return type="IntArray">
+			</return>
 			<description>
+				Return the list of items.
 			</description>
 		</method>
-		<method name="set_item_shape">
+		<method name="get_item_mesh" qualifiers="const">
+			<return type="Mesh">
+			</return>
 			<argument index="0" name="id" type="int">
 			</argument>
-			<argument index="1" name="shape" type="Shape">
-			</argument>
 			<description>
+				Return the mesh of the item.
 			</description>
 		</method>
 		<method name="get_item_name" qualifiers="const">
@@ -20380,58 +20616,71 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="id" type="int">
 			</argument>
 			<description>
-			Return the name of the item.
+				Return the name of the item.
 			</description>
 		</method>
-		<method name="get_item_mesh" qualifiers="const">
-			<return type="Mesh">
+		<method name="get_item_navmesh" qualifiers="const">
+			<return type="NavigationMesh">
 			</return>
 			<argument index="0" name="id" type="int">
 			</argument>
 			<description>
-			Return the mesh of the item.
 			</description>
 		</method>
-		<method name="get_item_navmesh" qualifiers="const">
-			<return type="NavigationMesh">
+		<method name="get_item_shape" qualifiers="const">
+			<return type="Shape">
 			</return>
 			<argument index="0" name="id" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_item_shape" qualifiers="const">
-			<return type="Shape">
+		<method name="get_last_unused_item_id" qualifiers="const">
+			<return type="int">
 			</return>
+			<description>
+				Get an unused id for a new item.
+			</description>
+		</method>
+		<method name="remove_item">
 			<argument index="0" name="id" type="int">
 			</argument>
 			<description>
+				Remove the item.
 			</description>
 		</method>
-		<method name="remove_item">
+		<method name="set_item_mesh">
 			<argument index="0" name="id" type="int">
 			</argument>
+			<argument index="1" name="mesh" type="Mesh">
+			</argument>
 			<description>
-			Remove the item.
+				Set the mesh of the item.
 			</description>
 		</method>
-		<method name="clear">
+		<method name="set_item_name">
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="name" type="String">
+			</argument>
 			<description>
-			Clear the library.
+				Set the name of the item.
 			</description>
 		</method>
-		<method name="get_item_list" qualifiers="const">
-			<return type="IntArray">
-			</return>
+		<method name="set_item_navmesh">
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="navmesh" type="NavigationMesh">
+			</argument>
 			<description>
-			Return the list of items.
 			</description>
 		</method>
-		<method name="get_last_unused_item_id" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_item_shape">
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="shape" type="Shape">
+			</argument>
 			<description>
-			Get an unused id for a new item.
 			</description>
 		</method>
 	</methods>
@@ -20440,59 +20689,64 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="MultiMesh" inherits="Resource" category="Core">
 	<brief_description>
-	Provides high performance mesh instancing.
+		Provides high performance mesh instancing.
 	</brief_description>
 	<description>
-	MultiMesh provides low level mesh instancing. If the amount of [Mesh] instances needed goes from hundreds to thousands (and most need to be visible at close proximity) creating such a large amount of [MeshInstance] nodes may affect performance by using too much CPU or video memory.
-	For this case a MultiMesh becomes very useful, as it can draw thousands of instances with little API overhead.
-	As a drawback, if the instances are too far away of each other, performance may be reduced as every single instance will always rendered (they are spatially indexed as one, for the whole object).
-	Since instances may have any behavior, the AABB used for visibility must be provided by the user, or generated with [method generate_aabb].
+		MultiMesh provides low level mesh instancing. If the amount of [Mesh] instances needed goes from hundreds to thousands (and most need to be visible at close proximity) creating such a large amount of [MeshInstance] nodes may affect performance by using too much CPU or video memory.
+		For this case a MultiMesh becomes very useful, as it can draw thousands of instances with little API overhead.
+		As a drawback, if the instances are too far away of each other, performance may be reduced as every single instance will always rendered (they are spatially indexed as one, for the whole object).
+		Since instances may have any behavior, the AABB used for visibility must be provided by the user, or generated with [method generate_aabb].
 	</description>
 	<methods>
-		<method name="set_mesh">
-			<argument index="0" name="mesh" type="Mesh">
-			</argument>
+		<method name="generate_aabb">
 			<description>
-			Set the [Mesh] resource to be drawn in multiple instances.
+				Generate a new visibility AABB, using mesh AABB and instance transforms. Since instance information is stored in the [VisualServer], this function is VERY SLOW and must NOT be used often.
 			</description>
 		</method>
-		<method name="get_mesh" qualifiers="const">
-			<return type="Mesh">
+		<method name="get_aabb" qualifiers="const">
+			<return type="AABB">
 			</return>
 			<description>
-			Return the [Mesh] resource drawn as multiple instances.
+				Return the visibility AABB.
 			</description>
 		</method>
-		<method name="set_instance_count">
-			<argument index="0" name="count" type="int">
+		<method name="get_instance_color" qualifiers="const">
+			<return type="Color">
+			</return>
+			<argument index="0" name="instance" type="int">
 			</argument>
 			<description>
-			Set the amount of instances that is going to be drawn. Changing this number will erase all the existing instance transform and color data.
+				Get the color of a specific instance.
 			</description>
 		</method>
 		<method name="get_instance_count" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the amount of instances that is going to be drawn.
+				Return the amount of instances that is going to be drawn.
 			</description>
 		</method>
-		<method name="set_instance_transform">
+		<method name="get_instance_transform" qualifiers="const">
+			<return type="Transform">
+			</return>
 			<argument index="0" name="instance" type="int">
 			</argument>
-			<argument index="1" name="transform" type="Transform">
-			</argument>
 			<description>
-			Set the transform for a specific instance.
+				Return the transform of a specific instance.
 			</description>
 		</method>
-		<method name="get_instance_transform" qualifiers="const">
-			<return type="Transform">
+		<method name="get_mesh" qualifiers="const">
+			<return type="Mesh">
 			</return>
-			<argument index="0" name="instance" type="int">
+			<description>
+				Return the [Mesh] resource drawn as multiple instances.
+			</description>
+		</method>
+		<method name="set_aabb">
+			<argument index="0" name="visibility_aabb" type="AABB">
 			</argument>
 			<description>
-			Return the transform of a specific instance.
+				Set the visibility AABB. If not provided, MultiMesh will not be visible.
 			</description>
 		</method>
 		<method name="set_instance_color">
@@ -20501,35 +20755,30 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="color" type="Color">
 			</argument>
 			<description>
-			Set the color of a specific instance.
+				Set the color of a specific instance.
 			</description>
 		</method>
-		<method name="get_instance_color" qualifiers="const">
-			<return type="Color">
-			</return>
-			<argument index="0" name="instance" type="int">
+		<method name="set_instance_count">
+			<argument index="0" name="count" type="int">
 			</argument>
 			<description>
-			Get the color of a specific instance.
+				Set the amount of instances that is going to be drawn. Changing this number will erase all the existing instance transform and color data.
 			</description>
 		</method>
-		<method name="set_aabb">
-			<argument index="0" name="visibility_aabb" type="AABB">
+		<method name="set_instance_transform">
+			<argument index="0" name="instance" type="int">
+			</argument>
+			<argument index="1" name="transform" type="Transform">
 			</argument>
 			<description>
-			Set the visibility AABB. If not provided, MultiMesh will not be visible.
-			</description>
-		</method>
-		<method name="get_aabb" qualifiers="const">
-			<return type="AABB">
-			</return>
-			<description>
-			Return the visibility AABB.
+				Set the transform for a specific instance.
 			</description>
 		</method>
-		<method name="generate_aabb">
+		<method name="set_mesh">
+			<argument index="0" name="mesh" type="Mesh">
+			</argument>
 			<description>
-			Generate a new visibility AABB, using mesh AABB and instance transforms. Since instance information is stored in the [VisualServer], this function is VERY SLOW and must NOT be used often.
+				Set the [Mesh] resource to be drawn in multiple instances.
 			</description>
 		</method>
 	</methods>
@@ -20538,24 +20787,24 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="MultiMeshInstance" inherits="GeometryInstance" category="Core">
 	<brief_description>
-	Node that instances a [MultiMesh].
+		Node that instances a [MultiMesh].
 	</brief_description>
 	<description>
-	MultiMeshInstance is a [Node] that takes a [MultiMesh] resource and adds it to the current scenario by creating an instance of it (yes, this is an instance of instances).
+		MultiMeshInstance is a [Node] that takes a [MultiMesh] resource and adds it to the current scenario by creating an instance of it (yes, this is an instance of instances).
 	</description>
 	<methods>
-		<method name="set_multimesh">
-			<argument index="0" name="multimesh" type="Object">
-			</argument>
-			<description>
-			Set the [MultiMesh] to be instance.
-			</description>
-		</method>
 		<method name="get_multimesh" qualifiers="const">
 			<return type="Object">
 			</return>
 			<description>
-			Return the [MultiMesh] that is used for instancing.
+				Return the [MultiMesh] that is used for instancing.
+			</description>
+		</method>
+		<method name="set_multimesh">
+			<argument index="0" name="multimesh" type="Object">
+			</argument>
+			<description>
+				Set the [MultiMesh] to be instance.
 			</description>
 		</method>
 	</methods>
@@ -20564,27 +20813,27 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="Mutex" inherits="Reference" category="Core">
 	<brief_description>
-	A synchronization Mutex.
+		A synchronization Mutex.
 	</brief_description>
 	<description>
-	A synchronization Mutex. Element used in multi-threadding. Basically a binary [Semaphore]. Guarantees that only one thread has this lock, can be used to protect a critical section.
+		A synchronization Mutex. Element used in multi-threadding. Basically a binary [Semaphore]. Guarantees that only one thread has this lock, can be used to protect a critical section.
 	</description>
 	<methods>
 		<method name="lock">
 			<description>
-			Lock this [Mutex], blocks until it is unlocked by the current owner.
+				Lock this [Mutex], blocks until it is unlocked by the current owner.
 			</description>
 		</method>
 		<method name="try_lock">
 			<return type="Error">
 			</return>
 			<description>
-			Try locking this [Mutex], does not block. Returns [OK] on success else [ERR_BUSY].
+				Try locking this [Mutex], does not block. Returns [OK] on success else [ERR_BUSY].
 			</description>
 		</method>
 		<method name="unlock">
 			<description>
-			Unlock this [Mutex], leaving it to others threads.
+				Unlock this [Mutex], leaving it to others threads.
 			</description>
 		</method>
 	</methods>
@@ -20597,89 +20846,89 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<description>
 	</description>
 	<methods>
-		<method name="navmesh_create">
-			<return type="int">
+		<method name="get_closest_point">
+			<return type="Vector3">
 			</return>
-			<argument index="0" name="mesh" type="NavigationMesh">
-			</argument>
-			<argument index="1" name="xform" type="Transform">
-			</argument>
-			<argument index="2" name="owner" type="Object" default="NULL">
+			<argument index="0" name="to_point" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="navmesh_set_transform">
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="xform" type="Transform">
+		<method name="get_closest_point_normal">
+			<return type="Vector3">
+			</return>
+			<argument index="0" name="to_point" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="navmesh_remove">
-			<argument index="0" name="id" type="int">
+		<method name="get_closest_point_owner">
+			<return type="Object">
+			</return>
+			<argument index="0" name="to_point" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_simple_path">
-			<return type="Vector3Array">
+		<method name="get_closest_point_to_segment">
+			<return type="Vector3">
 			</return>
 			<argument index="0" name="start" type="Vector3">
 			</argument>
 			<argument index="1" name="end" type="Vector3">
 			</argument>
-			<argument index="2" name="optimize" type="bool" default="true">
+			<argument index="2" name="use_collision" type="bool" default="false">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_closest_point_to_segment">
-			<return type="Vector3">
+		<method name="get_simple_path">
+			<return type="Vector3Array">
 			</return>
 			<argument index="0" name="start" type="Vector3">
 			</argument>
 			<argument index="1" name="end" type="Vector3">
 			</argument>
-			<argument index="2" name="use_collision" type="bool" default="false">
+			<argument index="2" name="optimize" type="bool" default="true">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_closest_point">
+		<method name="get_up_vector" qualifiers="const">
 			<return type="Vector3">
 			</return>
-			<argument index="0" name="to_point" type="Vector3">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_closest_point_normal">
-			<return type="Vector3">
+		<method name="navmesh_create">
+			<return type="int">
 			</return>
-			<argument index="0" name="to_point" type="Vector3">
+			<argument index="0" name="mesh" type="NavigationMesh">
+			</argument>
+			<argument index="1" name="xform" type="Transform">
+			</argument>
+			<argument index="2" name="owner" type="Object" default="NULL">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_closest_point_owner">
-			<return type="Object">
-			</return>
-			<argument index="0" name="to_point" type="Vector3">
+		<method name="navmesh_remove">
+			<argument index="0" name="id" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_up_vector">
-			<argument index="0" name="up" type="Vector3">
+		<method name="navmesh_set_transform">
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="xform" type="Transform">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_up_vector" qualifiers="const">
-			<return type="Vector3">
-			</return>
+		<method name="set_up_vector">
+			<argument index="0" name="up" type="Vector3">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -20693,28 +20942,18 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<description>
 	</description>
 	<methods>
-		<method name="navpoly_create">
-			<return type="int">
+		<method name="get_closest_point">
+			<return type="Vector2">
 			</return>
-			<argument index="0" name="mesh" type="NavigationPolygon">
-			</argument>
-			<argument index="1" name="xform" type="Matrix32">
-			</argument>
-			<argument index="2" name="owner" type="Object" default="NULL">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="navpoly_set_transform">
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="xform" type="Matrix32">
+			<argument index="0" name="to_point" type="Vector2">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="navpoly_remove">
-			<argument index="0" name="id" type="int">
+		<method name="get_closest_point_owner">
+			<return type="Object">
+			</return>
+			<argument index="0" name="to_point" type="Vector2">
 			</argument>
 			<description>
 			</description>
@@ -20731,18 +20970,28 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="get_closest_point">
-			<return type="Vector2">
+		<method name="navpoly_create">
+			<return type="int">
 			</return>
-			<argument index="0" name="to_point" type="Vector2">
+			<argument index="0" name="mesh" type="NavigationPolygon">
+			</argument>
+			<argument index="1" name="xform" type="Matrix32">
+			</argument>
+			<argument index="2" name="owner" type="Object" default="NULL">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_closest_point_owner">
-			<return type="Object">
-			</return>
-			<argument index="0" name="to_point" type="Vector2">
+		<method name="navpoly_remove">
+			<argument index="0" name="id" type="int">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="navpoly_set_transform">
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="xform" type="Matrix32">
 			</argument>
 			<description>
 			</description>
@@ -20757,20 +21006,20 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<description>
 	</description>
 	<methods>
-		<method name="set_vertices">
-			<argument index="0" name="vertices" type="Vector3Array">
+		<method name="add_polygon">
+			<argument index="0" name="polygon" type="IntArray">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_vertices" qualifiers="const">
-			<return type="Vector3Array">
-			</return>
+		<method name="clear_polygons">
 			<description>
 			</description>
 		</method>
-		<method name="add_polygon">
-			<argument index="0" name="polygon" type="IntArray">
+		<method name="get_polygon">
+			<return type="IntArray">
+			</return>
+			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
@@ -20781,15 +21030,15 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="get_polygon">
-			<return type="IntArray">
+		<method name="get_vertices" qualifiers="const">
+			<return type="Vector3Array">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="clear_polygons">
+		<method name="set_vertices">
+			<argument index="0" name="vertices" type="Vector3Array">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -20803,14 +21052,14 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<description>
 	</description>
 	<methods>
-		<method name="set_navigation_mesh">
-			<argument index="0" name="navmesh" type="Object">
-			</argument>
+		<method name="get_navigation_mesh" qualifiers="const">
+			<return type="Object">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_navigation_mesh" qualifiers="const">
-			<return type="Object">
+		<method name="is_enabled" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
@@ -20821,9 +21070,9 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="is_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_navigation_mesh">
+			<argument index="0" name="navmesh" type="Object">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -20837,15 +21086,17 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<description>
 	</description>
 	<methods>
-		<method name="set_vertices">
-			<argument index="0" name="vertices" type="Vector2Array">
+		<method name="add_outline">
+			<argument index="0" name="outline" type="Vector2Array">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_vertices" qualifiers="const">
-			<return type="Vector2Array">
-			</return>
+		<method name="add_outline_at_index">
+			<argument index="0" name="outline" type="Vector2Array">
+			</argument>
+			<argument index="1" name="index" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -20855,17 +21106,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="get_polygon_count" qualifiers="const">
-			<return type="int">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="get_polygon">
-			<return type="IntArray">
-			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
+		<method name="clear_outlines">
 			<description>
 			</description>
 		</method>
@@ -20873,16 +21114,10 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="add_outline">
-			<argument index="0" name="outline" type="Vector2Array">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="add_outline_at_index">
-			<argument index="0" name="outline" type="Vector2Array">
-			</argument>
-			<argument index="1" name="index" type="int">
+		<method name="get_outline" qualifiers="const">
+			<return type="Vector2Array">
+			</return>
+			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
@@ -20893,19 +21128,27 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="set_outline">
+		<method name="get_polygon">
+			<return type="IntArray">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="outline" type="Vector2Array">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_outline" qualifiers="const">
+		<method name="get_polygon_count" qualifiers="const">
+			<return type="int">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="get_vertices" qualifiers="const">
 			<return type="Vector2Array">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="make_polygons_from_outlines">
 			<description>
 			</description>
 		</method>
@@ -20915,11 +21158,17 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="clear_outlines">
+		<method name="set_outline">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="outline" type="Vector2Array">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="make_polygons_from_outlines">
+		<method name="set_vertices">
+			<argument index="0" name="vertices" type="Vector2Array">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -20933,14 +21182,14 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<description>
 	</description>
 	<methods>
-		<method name="set_navigation_polygon">
-			<argument index="0" name="navpoly" type="NavigationPolygon">
-			</argument>
+		<method name="get_navigation_polygon" qualifiers="const">
+			<return type="NavigationPolygon">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_navigation_polygon" qualifiers="const">
-			<return type="NavigationPolygon">
+		<method name="is_enabled" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
@@ -20951,9 +21200,9 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="is_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_navigation_polygon">
+			<argument index="0" name="navpoly" type="NavigationPolygon">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -20968,169 +21217,169 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	</description>
 	<methods>
 		<method name="Nil">
-			<argument index="0" name="from" type="bool">
+			<argument index="0" name="from" type="ColorArray">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="int">
+			<argument index="0" name="from" type="Vector3Array">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="float">
+			<argument index="0" name="from" type="Vector2Array">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="String">
+			<argument index="0" name="from" type="StringArray">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="Vector2">
+			<argument index="0" name="from" type="RealArray">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="Rect2">
+			<argument index="0" name="from" type="IntArray">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="Vector3">
+			<argument index="0" name="from" type="RawArray">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="Matrix32">
+			<argument index="0" name="from" type="Array">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="Plane">
+			<argument index="0" name="from" type="Dictionary">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="Quat">
+			<argument index="0" name="from" type="InputEvent">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="AABB">
+			<argument index="0" name="from" type="Object">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="Matrix3">
+			<argument index="0" name="from" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="Transform">
+			<argument index="0" name="from" type="NodePath">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="Color">
+			<argument index="0" name="from" type="Image">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="Image">
+			<argument index="0" name="from" type="Color">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="NodePath">
+			<argument index="0" name="from" type="Transform">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="RID">
+			<argument index="0" name="from" type="Matrix3">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="Object">
+			<argument index="0" name="from" type="AABB">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="InputEvent">
+			<argument index="0" name="from" type="Quat">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="Dictionary">
+			<argument index="0" name="from" type="Plane">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="Array">
+			<argument index="0" name="from" type="Matrix32">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="RawArray">
+			<argument index="0" name="from" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="IntArray">
+			<argument index="0" name="from" type="Rect2">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="RealArray">
+			<argument index="0" name="from" type="Vector2">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="StringArray">
+			<argument index="0" name="from" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="Vector2Array">
+			<argument index="0" name="from" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="Vector3Array">
+			<argument index="0" name="from" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
 		<method name="Nil">
-			<argument index="0" name="from" type="ColorArray">
+			<argument index="0" name="from" type="bool">
 			</argument>
 			<description>
 			</description>
@@ -21141,18 +21390,18 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="Node" inherits="Object" category="Core">
 	<brief_description>
-	Base class for all the "Scene" elements.
+		Base class for all the "Scene" elements.
 	</brief_description>
 	<description>
-	Nodes can be set as children of other nodes, resulting in a tree arrangement. Any tree of nodes is called a "Scene".
-	Scenes can be saved to disk, and then instanced into other scenes. This allows for very high flexibility in the architecture and data model of the projects.
-	[SceneTree] contains the "active" tree of nodes, and a node becomes active (receiving NOTIFICATION_ENTER_SCENE) when added to that tree.
-	A node can contain any number of nodes as a children (but there is only one tree root) with the requirement that no two children with the same name can exist.
-	Nodes can, optionally, be added to groups. This makes it easy to reach a number of nodes from the code (for example an "enemies" group).
-	Nodes can be set to "process" state, so they constantly receive a callback requesting them to process (do anything). Normal processing ([method _process]) happens as fast as possible and is dependent on the frame rate, so the processing time delta is variable. Fixed processing ([method _fixed_process]) happens a fixed amount of times per second (by default 60) and is useful to link itself to the physics.
-	Nodes can also process input events. When set, the [method _input] function will be called with every input that the program receives. Since this is usually too overkill (unless used for simple projects), an [method _unhandled_input] function is called when the input was not handled by anyone else (usually, GUI [Control] nodes).
-	To keep track of the scene hierarchy (specially when instancing scenes into scenes) an "owner" can be set to a node. This keeps track of who instanced what. This is mostly useful when writing editors and tools, though.
-	Finally, when a node is freed, it will free all its children nodes too.
+		Nodes can be set as children of other nodes, resulting in a tree arrangement. Any tree of nodes is called a "Scene".
+		Scenes can be saved to disk, and then instanced into other scenes. This allows for very high flexibility in the architecture and data model of the projects.
+		[SceneTree] contains the "active" tree of nodes, and a node becomes active (receiving NOTIFICATION_ENTER_SCENE) when added to that tree.
+		A node can contain any number of nodes as a children (but there is only one tree root) with the requirement that no two children with the same name can exist.
+		Nodes can, optionally, be added to groups. This makes it easy to reach a number of nodes from the code (for example an "enemies" group).
+		Nodes can be set to "process" state, so they constantly receive a callback requesting them to process (do anything). Normal processing ([method _process]) happens as fast as possible and is dependent on the frame rate, so the processing time delta is variable. Fixed processing ([method _fixed_process]) happens a fixed amount of times per second (by default 60) and is useful to link itself to the physics.
+		Nodes can also process input events. When set, the [method _input] function will be called with every input that the program receives. Since this is usually too overkill (unless used for simple projects), an [method _unhandled_input] function is called when the input was not handled by anyone else (usually, GUI [Control] nodes).
+		To keep track of the scene hierarchy (specially when instancing scenes into scenes) an "owner" can be set to a node. This keeps track of who instanced what. This is mostly useful when writing editors and tools, though.
+		Finally, when a node is freed, it will free all its children nodes too.
 	</description>
 	<methods>
 		<method name="_enter_tree" qualifiers="virtual">
@@ -21167,78 +21416,103 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="delta" type="float">
 			</argument>
 			<description>
-			Called for fixed processing (synced to the physics).
+				Called for fixed processing (synced to the physics).
 			</description>
 		</method>
 		<method name="_input" qualifiers="virtual">
 			<argument index="0" name="event" type="InputEvent">
 			</argument>
 			<description>
-			Called when any input happens (also must enable with [method set_process_input] or the property).
+				Called when any input happens (also must enable with [method set_process_input] or the property).
 			</description>
 		</method>
 		<method name="_process" qualifiers="virtual">
 			<argument index="0" name="delta" type="float">
 			</argument>
 			<description>
-			Called for processing. This is called every frame, with the delta time from the previous frame.
+				Called for processing. This is called every frame, with the delta time from the previous frame.
 			</description>
 		</method>
 		<method name="_ready" qualifiers="virtual">
 			<description>
-			Called when ready (entered scene and children entered too).
+				Called when ready (entered scene and children entered too).
 			</description>
 		</method>
 		<method name="_unhandled_input" qualifiers="virtual">
 			<argument index="0" name="event" type="InputEvent">
 			</argument>
 			<description>
-			Called when any input happens that was not handled by something else (also must enable with [method set_process_unhandled_input] or the property).
+				Called when any input happens that was not handled by something else (also must enable with [method set_process_unhandled_input] or the property).
 			</description>
 		</method>
 		<method name="_unhandled_key_input" qualifiers="virtual">
 			<argument index="0" name="key_event" type="InputEvent">
 			</argument>
 			<description>
-			Called when any key input happens that was not handled by something else.
+				Called when any key input happens that was not handled by something else.
 			</description>
 		</method>
-		<method name="set_name">
-			<argument index="0" name="name" type="String">
+		<method name="add_child">
+			<argument index="0" name="node" type="Node">
+			</argument>
+			<argument index="1" name="legible_unique_name" type="bool" default="false">
 			</argument>
 			<description>
-			Set the name of the [Node]. Name must be unique within parent, and setting an already existing name will cause for the node to be automatically renamed.
+				Add a child [Node]. Nodes can have as many children as they want, but every child must have a unique name. Children nodes are automatically deleted when the parent node is deleted, so deleting a whole scene is performed by deleting its topmost node.
+				The optional boolean argument enforces creating child node with human-readable names, based on the name of node being instanced instead of its type only.
 			</description>
 		</method>
-		<method name="get_name" qualifiers="const">
-			<return type="String">
+		<method name="add_to_group">
+			<argument index="0" name="group" type="String">
+			</argument>
+			<argument index="1" name="persistent" type="bool" default="false">
+			</argument>
+			<description>
+				Add a node to a group. Groups are helpers to name and organize group of nodes, like for example: "Enemies", "Collectables", etc. A [Node] can be in any number of groups. Nodes can be assigned a group at any time, but will not be added to it until they are inside the scene tree (see [method is_inside_tree]).
+			</description>
+		</method>
+		<method name="can_process" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the name of the [Node]. Name is be unique within parent.
+				Return true if the node can process.
 			</description>
 		</method>
-		<method name="add_child">
-			<argument index="0" name="node" type="Node">
+		<method name="duplicate" qualifiers="const">
+			<return type="Node">
+			</return>
+			<argument index="0" name="use_instancing" type="bool" default="false">
 			</argument>
-			<argument index="1" name="legible_unique_name" type="bool" default="false">
+			<description>
+			</description>
+		</method>
+		<method name="find_node" qualifiers="const">
+			<return type="Node">
+			</return>
+			<argument index="0" name="mask" type="String">
+			</argument>
+			<argument index="1" name="recursive" type="bool" default="true">
+			</argument>
+			<argument index="2" name="owned" type="bool" default="true">
 			</argument>
 			<description>
-			Add a child [Node]. Nodes can have as many children as they want, but every child must have a unique name. Children nodes are automatically deleted when the parent node is deleted, so deleting a whole scene is performed by deleting its topmost node.
-			The optional boolean argument enforces creating child node with human-readable names, based on the name of node being instanced instead of its type only.
+				Find a descendant of this node whose name matches [code]mask[/code] as in [method String.match] (i.e. case sensitive, but '*' matches zero or more characters and '?' matches any single character except '.'). Note that it does not match against the full path, just against individual node names.
 			</description>
 		</method>
-		<method name="remove_child">
-			<argument index="0" name="node" type="Node">
+		<method name="get_child" qualifiers="const">
+			<return type="Node">
+			</return>
+			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Remove a child [Node]. Node is NOT deleted and will have to be deleted manually.
+				Return a children node by it's index (see [method get_child_count]). This method is often used for iterating all children of a node.
 			</description>
 		</method>
 		<method name="get_child_count" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the amount of children nodes.
+				Return the amount of children nodes.
 			</description>
 		</method>
 		<method name="get_children" qualifiers="const">
@@ -21247,73 +21521,65 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="get_child" qualifiers="const">
-			<return type="Node">
+		<method name="get_filename" qualifiers="const">
+			<return type="String">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
-			Return a children node by it's index (see [method get_child_count]). This method is often used for iterating all children of a node.
+				Return a filename that may be containedA node can contained by the node. When a scene is instanced from a file, it topmost node contains the filename from where it was loaded (see [method set_filename]).
 			</description>
 		</method>
-		<method name="has_node" qualifiers="const">
-			<return type="bool">
+		<method name="get_fixed_process_delta_time" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="path" type="NodePath">
-			</argument>
 			<description>
+				Return the time elapsed since the last fixed frame. This is always the same in fixed processing unless the frames per second is changed in [OS].
 			</description>
 		</method>
-		<method name="get_node" qualifiers="const">
-			<return type="Node">
+		<method name="get_groups" qualifiers="const">
+			<return type="Array">
 			</return>
-			<argument index="0" name="path" type="NodePath">
-			</argument>
 			<description>
-			Fetch a node. NodePath must be valid (or else error will occur) and can be either the path to child node, a relative path (from the current node to another node), or an absolute path to a node.
-			Note: fetching absolute paths only works when the node is inside the scene tree (see [method is_inside_tree]). Examples. Assume your current node is Character and following tree:[br]
- root/
- root/Character
- root/Character/Sword
- root/Character/Backpack/Dagger
- root/MyGame
- root/Swamp/Alligator
- root/Swamp/Mosquito
- root/Swamp/Goblin
-
- Possible paths are:
- - get_node("Sword")
- - get_node("Backpack/Dagger")
- - get_node("../Swamp/Alligator")
- - get_node("/root/MyGame")
 			</description>
 		</method>
-		<method name="get_parent" qualifiers="const">
-			<return type="Node">
+		<method name="get_index" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the parent [Node] of the current [Node], or an empty Object if the node lacks a parent.
+				Get the node index in the parent (assuming it has a parent).
 			</description>
 		</method>
-		<method name="find_node" qualifiers="const">
-			<return type="Node">
+		<method name="get_name" qualifiers="const">
+			<return type="String">
 			</return>
-			<argument index="0" name="mask" type="String">
-			</argument>
-			<argument index="1" name="recursive" type="bool" default="true">
-			</argument>
-			<argument index="2" name="owned" type="bool" default="true">
-			</argument>
 			<description>
-			Find a descendant of this node whose name matches [code]mask[/code] as in [method String.match] (i.e. case sensitive, but '*' matches zero or more characters and '?' matches any single character except '.'). Note that it does not match against the full path, just against individual node names.
+				Return the name of the [Node]. Name is be unique within parent.
 			</description>
 		</method>
-		<method name="has_node_and_resource" qualifiers="const">
-			<return type="bool">
+		<method name="get_node" qualifiers="const">
+			<return type="Node">
 			</return>
 			<argument index="0" name="path" type="NodePath">
 			</argument>
 			<description>
+				Fetch a node. NodePath must be valid (or else error will occur) and can be either the path to child node, a relative path (from the current node to another node), or an absolute path to a node.
+				Note: fetching absolute paths only works when the node is inside the scene tree (see [method is_inside_tree]). Examples. Assume your current node is Character and following tree:
+				[codeblock]
+				root/
+				root/Character
+				root/Character/Sword
+				root/Character/Backpack/Dagger
+				root/MyGame
+				root/Swamp/Alligator
+				root/Swamp/Mosquito
+				root/Swamp/Goblin
+				[/codeblock]
+				Possible paths are:
+				[codeblock]
+				get_node("Sword")
+				get_node("Backpack/Dagger")
+				get_node("../Swamp/Alligator")
+				get_node("/root/MyGame")
+				[/codeblock]
 			</description>
 		</method>
 		<method name="get_node_and_resource">
@@ -21324,35 +21590,25 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="is_inside_tree" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="is_a_parent_of" qualifiers="const">
-			<return type="bool">
+		<method name="get_owner" qualifiers="const">
+			<return type="Node">
 			</return>
-			<argument index="0" name="node" type="Node">
-			</argument>
 			<description>
-			Return [i]true[/i] if the "node" argument is a direct or indirect child of the current node, otherwise return [i]false[/i].
+				Get the node owner (see [method set_owner]).
 			</description>
 		</method>
-		<method name="is_greater_than" qualifiers="const">
-			<return type="bool">
+		<method name="get_parent" qualifiers="const">
+			<return type="Node">
 			</return>
-			<argument index="0" name="node" type="Node">
-			</argument>
 			<description>
-			Return [i]true[/i] if "node" occurs later in the scene hierarchy than the current node, otherwise return [i]false[/i].
+				Return the parent [Node] of the current [Node], or an empty Object if the node lacks a parent.
 			</description>
 		</method>
 		<method name="get_path" qualifiers="const">
 			<return type="NodePath">
 			</return>
 			<description>
-			Return the absolute path of the current node. This only works if the current node is inside the scene tree (see [method is_inside_tree]).
+				Return the absolute path of the current node. This only works if the current node is inside the scene tree (see [method is_inside_tree]).
 			</description>
 		</method>
 		<method name="get_path_to" qualifiers="const">
@@ -21361,274 +21617,294 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="node" type="Node">
 			</argument>
 			<description>
-			Return the relative path from the current node to the specified node in "node" argument. Both nodes must be in the same scene, or else the function will fail.
+				Return the relative path from the current node to the specified node in "node" argument. Both nodes must be in the same scene, or else the function will fail.
 			</description>
 		</method>
-		<method name="add_to_group">
-			<argument index="0" name="group" type="String">
-			</argument>
-			<argument index="1" name="persistent" type="bool" default="false">
-			</argument>
+		<method name="get_pause_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Add a node to a group. Groups are helpers to name and organize group of nodes, like for example: "Enemies", "Collectables", etc. A [Node] can be in any number of groups. Nodes can be assigned a group at any time, but will not be added to it until they are inside the scene tree (see [method is_inside_tree]).
 			</description>
 		</method>
-		<method name="remove_from_group">
-			<argument index="0" name="group" type="String">
-			</argument>
+		<method name="get_position_in_parent" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Remove a node from a group.
 			</description>
 		</method>
-		<method name="is_in_group" qualifiers="const">
-			<return type="bool">
+		<method name="get_process_delta_time" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="group" type="String">
-			</argument>
 			<description>
+				Return the time elapsed (in seconds) since the last process callback. This is almost always different each time.
 			</description>
 		</method>
-		<method name="move_child">
-			<argument index="0" name="child_node" type="Node">
-			</argument>
-			<argument index="1" name="to_pos" type="int">
-			</argument>
+		<method name="get_scene_instance_load_placeholder" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Move a child node to a different position (order) amongst the other children. Since calls, signals, etc are performed by tree order, changing the order of children nodes may be useful.
 			</description>
 		</method>
-		<method name="get_groups" qualifiers="const">
-			<return type="Array">
+		<method name="get_tree" qualifiers="const">
+			<return type="SceneTree">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="raise">
+		<method name="get_viewport" qualifiers="const">
+			<return type="Object">
+			</return>
 			<description>
-			Move this node to the top of the array of nodes of the parent node. This is often useful on GUIs ([Control]), because their order of drawing fully depends on their order in the tree.
 			</description>
 		</method>
-		<method name="set_owner">
-			<argument index="0" name="owner" type="Node">
+		<method name="has_node" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="path" type="NodePath">
 			</argument>
 			<description>
-			Set the node owner. A node can have any other node as owner (as long as a valid parent, grandparent, etc ascending in the tree). When saving a node (using SceneSaver) all the nodes it owns will be saved with it. This allows to create complex SceneTrees, with instancing and subinstancing.
 			</description>
 		</method>
-		<method name="get_owner" qualifiers="const">
-			<return type="Node">
+		<method name="has_node_and_resource" qualifiers="const">
+			<return type="bool">
 			</return>
+			<argument index="0" name="path" type="NodePath">
+			</argument>
 			<description>
-			Get the node owner (see [method set_owner]).
-			</description>
-		</method>
-		<method name="remove_and_skip">
-			<description>
-			Remove a node and set all its children as children of the parent node (if exists). All even subscriptions that pass by the removed node will be unsubscribed.
 			</description>
 		</method>
-		<method name="get_index" qualifiers="const">
-			<return type="int">
+		<method name="is_a_parent_of" qualifiers="const">
+			<return type="bool">
 			</return>
+			<argument index="0" name="node" type="Node">
+			</argument>
 			<description>
-			Get the node index in the parent (assuming it has a parent).
+				Return [i]true[/i] if the "node" argument is a direct or indirect child of the current node, otherwise return [i]false[/i].
 			</description>
 		</method>
-		<method name="print_tree">
+		<method name="is_displayed_folded" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Print the scene to stdout. Used mainly for debugging purposes.
 			</description>
 		</method>
-		<method name="set_filename">
-			<argument index="0" name="filename" type="String">
-			</argument>
+		<method name="is_displayed_folded" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			A node can contain a filename. This filename should not be changed by the user, unless writing editors and tools. When a scene is instanced from a file, it topmost node contains the filename from where it was loaded.
 			</description>
 		</method>
-		<method name="get_filename" qualifiers="const">
-			<return type="String">
+		<method name="is_fixed_processing" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return a filename that may be containedA node can contained by the node. When a scene is instanced from a file, it topmost node contains the filename from where it was loaded (see [method set_filename]).
+				Return true if fixed processing is enabled (see [method set_fixed_process]).
 			</description>
 		</method>
-		<method name="propagate_notification">
-			<argument index="0" name="what" type="int">
+		<method name="is_greater_than" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="node" type="Node">
 			</argument>
 			<description>
-			Notify the current node and all its children recursively by calling notification() in all of them.
+				Return [i]true[/i] if "node" occurs later in the scene hierarchy than the current node, otherwise return [i]false[/i].
 			</description>
 		</method>
-		<method name="set_fixed_process">
-			<argument index="0" name="enable" type="bool">
+		<method name="is_in_group" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="group" type="String">
 			</argument>
 			<description>
-			Enables or disables node fixed framerate processing. When a node is being processed, it will receive a NOTIFICATION_PROCESS at a fixed (usually 60 fps, check [OS] to change that) interval (and the [method _fixed_process] callback will be called if exists). It is common to check how much time was elapsed since the previous frame by calling [method get_fixed_process_delta_time].
 			</description>
 		</method>
-		<method name="get_fixed_process_delta_time" qualifiers="const">
-			<return type="float">
+		<method name="is_inside_tree" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the time elapsed since the last fixed frame. This is always the same in fixed processing unless the frames per second is changed in [OS].
 			</description>
 		</method>
-		<method name="is_fixed_processing" qualifiers="const">
+		<method name="is_processing" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if fixed processing is enabled (see [method set_fixed_process]).
+				Return whether processing is enabled in the current node (see [method set_process]).
 			</description>
 		</method>
-		<method name="set_process">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="is_processing_input" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Enables or disables node processing. When a node is being processed, it will receive a NOTIFICATION_PROCESS on every drawn frame (and the [method _process] callback will be called if exists). It is common to check how much time was elapsed since the previous frame by calling [method get_process_delta_time].
+				Return true if the node is processing input (see [method set_process_input]).
 			</description>
 		</method>
-		<method name="get_process_delta_time" qualifiers="const">
-			<return type="float">
+		<method name="is_processing_unhandled_input" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the time elapsed (in seconds) since the last process callback. This is almost always different each time.
+				Return true if the node is processing unhandled input (see [method set_process_unhandled_input]).
 			</description>
 		</method>
-		<method name="is_processing" qualifiers="const">
+		<method name="is_processing_unhandled_key_input" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return whether processing is enabled in the current node (see [method set_process]).
 			</description>
 		</method>
-		<method name="set_process_input">
-			<argument index="0" name="enable" type="bool">
+		<method name="move_child">
+			<argument index="0" name="child_node" type="Node">
+			</argument>
+			<argument index="1" name="to_pos" type="int">
 			</argument>
 			<description>
-			Enable input processing for node. This is not required for GUI controls! It hooks up the node to receive all input (see [method _input]).
+				Move a child node to a different position (order) amongst the other children. Since calls, signals, etc are performed by tree order, changing the order of children nodes may be useful.
 			</description>
 		</method>
-		<method name="is_processing_input" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="print_stray_nodes">
 			<description>
-			Return true if the node is processing input (see [method set_process_input]).
 			</description>
 		</method>
-		<method name="set_process_unhandled_input">
-			<argument index="0" name="enable" type="bool">
+		<method name="print_tree">
+			<description>
+				Print the scene to stdout. Used mainly for debugging purposes.
+			</description>
+		</method>
+		<method name="propagate_notification">
+			<argument index="0" name="what" type="int">
 			</argument>
 			<description>
-			Enable unhandled input processing for node. This is not required for GUI controls! It hooks up the node to receive all input that was not previously handled before (usually by a [Control]). (see [method _unhandled_input]).
+				Notify the current node and all its children recursively by calling notification() in all of them.
 			</description>
 		</method>
-		<method name="is_processing_unhandled_input" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="queue_free">
 			<description>
-			Return true if the node is processing unhandled input (see [method set_process_unhandled_input]).
 			</description>
 		</method>
-		<method name="set_process_unhandled_key_input">
-			<argument index="0" name="enable" type="bool">
+		<method name="raise">
+			<description>
+				Move this node to the top of the array of nodes of the parent node. This is often useful on GUIs ([Control]), because their order of drawing fully depends on their order in the tree.
+			</description>
+		</method>
+		<method name="remove_and_skip">
+			<description>
+				Remove a node and set all its children as children of the parent node (if exists). All even subscriptions that pass by the removed node will be unsubscribed.
+			</description>
+		</method>
+		<method name="remove_child">
+			<argument index="0" name="node" type="Node">
 			</argument>
 			<description>
+				Remove a child [Node]. Node is NOT deleted and will have to be deleted manually.
 			</description>
 		</method>
-		<method name="is_processing_unhandled_key_input" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="remove_from_group">
+			<argument index="0" name="group" type="String">
+			</argument>
 			<description>
+				Remove a node from a group.
 			</description>
 		</method>
-		<method name="set_pause_mode">
-			<argument index="0" name="mode" type="int">
+		<method name="replace_by">
+			<argument index="0" name="node" type="Node">
+			</argument>
+			<argument index="1" name="keep_data" type="bool" default="false">
 			</argument>
 			<description>
+				Replace a node in a scene by a given one. Subscriptions that pass through this node will be lost.
 			</description>
 		</method>
-		<method name="get_pause_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_display_folded">
+			<argument index="0" name="fold" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="can_process" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_display_folded">
+			<argument index="0" name="fold" type="bool">
+			</argument>
 			<description>
-			Return true if the node can process.
 			</description>
 		</method>
-		<method name="print_stray_nodes">
+		<method name="set_filename">
+			<argument index="0" name="filename" type="String">
+			</argument>
 			<description>
+				A node can contain a filename. This filename should not be changed by the user, unless writing editors and tools. When a scene is instanced from a file, it topmost node contains the filename from where it was loaded.
 			</description>
 		</method>
-		<method name="get_position_in_parent" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_fixed_process">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
+				Enables or disables node fixed framerate processing. When a node is being processed, it will receive a NOTIFICATION_PROCESS at a fixed (usually 60 fps, check [OS] to change that) interval (and the [method _fixed_process] callback will be called if exists). It is common to check how much time was elapsed since the previous frame by calling [method get_fixed_process_delta_time].
 			</description>
 		</method>
-		<method name="get_tree" qualifiers="const">
-			<return type="SceneTree">
-			</return>
+		<method name="set_name">
+			<argument index="0" name="name" type="String">
+			</argument>
 			<description>
+				Set the name of the [Node]. Name must be unique within parent, and setting an already existing name will cause for the node to be automatically renamed.
 			</description>
 		</method>
-		<method name="duplicate" qualifiers="const">
-			<return type="Node">
-			</return>
-			<argument index="0" name="use_instancing" type="bool" default="false">
+		<method name="set_owner">
+			<argument index="0" name="owner" type="Node">
 			</argument>
 			<description>
+				Set the node owner. A node can have any other node as owner (as long as a valid parent, grandparent, etc ascending in the tree). When saving a node (using SceneSaver) all the nodes it owns will be saved with it. This allows to create complex SceneTrees, with instancing and subinstancing.
 			</description>
 		</method>
-		<method name="replace_by">
-			<argument index="0" name="node" type="Node">
+		<method name="set_pause_mode">
+			<argument index="0" name="mode" type="int">
 			</argument>
-			<argument index="1" name="keep_data" type="bool" default="false">
+			<description>
+			</description>
+		</method>
+		<method name="set_process">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Replace a node in a scene by a given one. Subscriptions that pass through this node will be lost.
+				Enables or disables node processing. When a node is being processed, it will receive a NOTIFICATION_PROCESS on every drawn frame (and the [method _process] callback will be called if exists). It is common to check how much time was elapsed since the previous frame by calling [method get_process_delta_time].
 			</description>
 		</method>
-		<method name="set_scene_instance_load_placeholder">
-			<argument index="0" name="load_placeholder" type="bool">
+		<method name="set_process_input">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
+				Enable input processing for node. This is not required for GUI controls! It hooks up the node to receive all input (see [method _input]).
 			</description>
 		</method>
-		<method name="get_scene_instance_load_placeholder" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_process_unhandled_input">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
+				Enable unhandled input processing for node. This is not required for GUI controls! It hooks up the node to receive all input that was not previously handled before (usually by a [Control]). (see [method _unhandled_input]).
 			</description>
 		</method>
-		<method name="get_viewport" qualifiers="const">
-			<return type="Object">
-			</return>
+		<method name="set_process_unhandled_key_input">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="queue_free">
+		<method name="set_scene_instance_load_placeholder">
+			<argument index="0" name="load_placeholder" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
 	</methods>
 	<signals>
-		<signal name="renamed">
+		<signal name="enter_tree">
 			<description>
-			Emitted when the node is renamed.
 			</description>
 		</signal>
-		<signal name="enter_tree">
+		<signal name="exit_tree">
 			<description>
 			</description>
 		</signal>
-		<signal name="exit_tree">
+		<signal name="renamed">
 			<description>
+				Emitted when the node is renamed.
 			</description>
 		</signal>
 	</signals>
@@ -21672,52 +21948,56 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="Node2D" inherits="CanvasItem" category="Core">
 	<brief_description>
-	Base node for 2D system.
+		Base node for 2D system.
 	</brief_description>
 	<description>
-	Base node for 2D system. Node2D contains a position, rotation and scale, which is used to position and animate. It can alternatively be used with a custom 2D transform ([Matrix32]). A tree of Node2Ds allows complex hierarchies for animation and positioning.
+		Base node for 2D system. Node2D contains a position, rotation and scale, which is used to position and animate. It can alternatively be used with a custom 2D transform ([Matrix32]). A tree of Node2Ds allows complex hierarchies for animation and positioning.
 	</description>
 	<methods>
-		<method name="set_pos">
-			<argument index="0" name="pos" type="Vector2">
+		<method name="edit_set_pivot">
+			<argument index="0" name="pivot" type="Vector2">
 			</argument>
 			<description>
-			Set the position of the 2D node.
+				Set the pivot position of the 2D node to 'pivot' value. This method is implemented only in some nodes that inherit Node2D.
 			</description>
 		</method>
-		<method name="set_rot">
-			<argument index="0" name="radians" type="float">
+		<method name="get_angle_to" qualifiers="const">
+			<return type="float">
+			</return>
+			<argument index="0" name="point" type="Vector2">
 			</argument>
 			<description>
-			Set the rotation of the 2D node.
+				Return the rotation angle in radians needed for the 2d node to point at 'point' position.
 			</description>
 		</method>
-		<method name="set_rotd">
-			<argument index="0" name="degrees" type="float">
-			</argument>
+		<method name="get_global_pos" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
-			Set the rotation of the 2D node.
+				Return the global position of the 2D node.
 			</description>
 		</method>
-		<method name="set_scale">
-			<argument index="0" name="scale" type="Vector2">
-			</argument>
+		<method name="get_pos" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
-			Set the scale of the 2D node.
+				Return the position of the 2D node.
 			</description>
 		</method>
-		<method name="get_pos" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_relative_transform_to_parent" qualifiers="const">
+			<return type="Matrix32">
 			</return>
+			<argument index="0" name="parent" type="Object">
+			</argument>
 			<description>
-			Return the position of the 2D node.
+				Return the transform [Matrix32] calculated relatively to the parent of this 2D node.
 			</description>
 		</method>
 		<method name="get_rot" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the rotation of the 2D node.
+				Return the rotation of the 2D node.
 			</description>
 		</method>
 		<method name="get_rotd" qualifiers="const">
@@ -21730,14 +22010,35 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<return type="Vector2">
 			</return>
 			<description>
-			Return the scale of the 2D node.
+				Return the scale of the 2D node.
 			</description>
 		</method>
-		<method name="rotate">
-			<argument index="0" name="radians" type="float">
+		<method name="get_z" qualifiers="const">
+			<return type="int">
+			</return>
+			<description>
+				Return the Z-index of the 2D node.
+			</description>
+		</method>
+		<method name="global_translate">
+			<argument index="0" name="offset" type="Vector2">
 			</argument>
 			<description>
-			Apply a 'radians' rotation to the 2D node, starting from its current rotation.
+				Apply a global translation of 'offset' to the 2D node, starting from its current global position.
+			</description>
+		</method>
+		<method name="is_z_relative" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+				Return true if the Z-index value of this 2D node is relative to its parent's. Else, return false.
+			</description>
+		</method>
+		<method name="look_at">
+			<argument index="0" name="point" type="Vector2">
+			</argument>
+			<description>
+				Rotate the 2d node so it points at 'point' position.
 			</description>
 		</method>
 		<method name="move_local_x">
@@ -21746,7 +22047,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="scaled" type="bool" default="false">
 			</argument>
 			<description>
-			Apply a local translation on X axis to the 2D node according to the 'delta' of the process. If 'scaled' is false, the movement is normalized.
+				Apply a local translation on X axis to the 2D node according to the 'delta' of the process. If 'scaled' is false, the movement is normalized.
 			</description>
 		</method>
 		<method name="move_local_y">
@@ -21755,116 +22056,91 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="scaled" type="bool" default="false">
 			</argument>
 			<description>
-			Apply a local translation on Y axis to the 2D node according to the 'delta' of the process. If 'scaled' is false, the movement is normalized.
-			</description>
-		</method>
-		<method name="translate">
-			<argument index="0" name="offset" type="Vector2">
-			</argument>
-			<description>
-			Apply a local translation of 'offset' to the 2D node, starting from its current local position.
+				Apply a local translation on Y axis to the 2D node according to the 'delta' of the process. If 'scaled' is false, the movement is normalized.
 			</description>
 		</method>
-		<method name="global_translate">
-			<argument index="0" name="offset" type="Vector2">
+		<method name="rotate">
+			<argument index="0" name="radians" type="float">
 			</argument>
 			<description>
-			Apply a global translation of 'offset' to the 2D node, starting from its current global position.
+				Apply a 'radians' rotation to the 2D node, starting from its current rotation.
 			</description>
 		</method>
 		<method name="scale">
 			<argument index="0" name="ratio" type="Vector2">
 			</argument>
 			<description>
-			Apply the 'ratio' scale to the 2D node, according to its current scale value.
+				Apply the 'ratio' scale to the 2D node, according to its current scale value.
 			</description>
 		</method>
 		<method name="set_global_pos">
 			<argument index="0" name="pos" type="Vector2">
 			</argument>
 			<description>
-			Set the global position of the 2D node to 'pos'.
-			</description>
-		</method>
-		<method name="get_global_pos" qualifiers="const">
-			<return type="Vector2">
-			</return>
-			<description>
-			Return the global position of the 2D node.
-			</description>
-		</method>
-		<method name="set_transform">
-			<argument index="0" name="xform" type="Matrix32">
-			</argument>
-			<description>
-			Set the local transform [Matrix32] of the 2D node.
+				Set the global position of the 2D node to 'pos'.
 			</description>
 		</method>
 		<method name="set_global_transform">
 			<argument index="0" name="xform" type="Matrix32">
 			</argument>
 			<description>
-			Set the global transform [Matrix32] of the 2D node.
+				Set the global transform [Matrix32] of the 2D node.
 			</description>
 		</method>
-		<method name="look_at">
-			<argument index="0" name="point" type="Vector2">
+		<method name="set_pos">
+			<argument index="0" name="pos" type="Vector2">
 			</argument>
 			<description>
-			Rotate the 2d node so it points at 'point' position.
+				Set the position of the 2D node.
 			</description>
 		</method>
-		<method name="get_angle_to" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="point" type="Vector2">
+		<method name="set_rot">
+			<argument index="0" name="radians" type="float">
 			</argument>
 			<description>
-			Return the rotation angle in radians needed for the 2d node to point at 'point' position.
+				Set the rotation of the 2D node.
 			</description>
 		</method>
-		<method name="set_z">
-			<argument index="0" name="z" type="int">
+		<method name="set_rotd">
+			<argument index="0" name="degrees" type="float">
 			</argument>
 			<description>
-			Set the Z-index value of the 2D node.
+				Set the rotation of the 2D node.
 			</description>
 		</method>
-		<method name="get_z" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_scale">
+			<argument index="0" name="scale" type="Vector2">
+			</argument>
 			<description>
-			Return the Z-index of the 2D node.
+				Set the scale of the 2D node.
 			</description>
 		</method>
-		<method name="set_z_as_relative">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_transform">
+			<argument index="0" name="xform" type="Matrix32">
 			</argument>
 			<description>
-			Set the Z-index value as relative to the parent node of this 2D node. Thus, if this 2D node's Z-index value is 2 and its parent's effective Z-index is 3, then the effective Z-index value of this 2D node would be 3 + 2 = 5.
+				Set the local transform [Matrix32] of the 2D node.
 			</description>
 		</method>
-		<method name="is_z_relative" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_z">
+			<argument index="0" name="z" type="int">
+			</argument>
 			<description>
-			Return true if the Z-index value of this 2D node is relative to its parent's. Else, return false.
+				Set the Z-index value of the 2D node.
 			</description>
 		</method>
-		<method name="edit_set_pivot">
-			<argument index="0" name="pivot" type="Vector2">
+		<method name="set_z_as_relative">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Set the pivot position of the 2D node to 'pivot' value. This method is implemented only in some nodes that inherit Node2D.
+				Set the Z-index value as relative to the parent node of this 2D node. Thus, if this 2D node's Z-index value is 2 and its parent's effective Z-index is 3, then the effective Z-index value of this 2D node would be 3 + 2 = 5.
 			</description>
 		</method>
-		<method name="get_relative_transform_to_parent" qualifiers="const">
-			<return type="Matrix32">
-			</return>
-			<argument index="0" name="parent" type="Object">
+		<method name="translate">
+			<argument index="0" name="offset" type="Vector2">
 			</argument>
 			<description>
-			Return the transform [Matrix32] calculated relatively to the parent of this 2D node.
+				Apply a local translation of 'offset' to the 2D node, starting from its current local position.
 			</description>
 		</method>
 	</methods>
@@ -21873,35 +22149,44 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="NodePath" category="Built-In Types">
 	<brief_description>
-	Pre-parsed scene tree path.
+		Pre-parsed scene tree path.
 	</brief_description>
 	<description>
-	A pre-parsed relative or absolute path in a scene tree, for use with [method Node.get_node] and similar functions. It can reference a node, a resource within a node, or a property of a node or resource. For instance, [code]"Path2D/PathFollow2D/Sprite:texture:size"[/code] would refer to the size property of the texture resource on the node named "Sprite" which is a child of the other named nodes in the path. Note that if you want to get a resource, you must end the path with a colon, otherwise the last element will be used as a property name.
-	You will usually just pass a string to [method Node.get_node] and it will be automatically converted, but you may occasionally want to parse a path ahead of time with [NodePath] or the literal syntax [code]@"path"[/code]. Exporting a [NodePath] variable will give you a node selection widget in the properties panel of the editor, which can often be useful.
-	A [NodePath] is made up of a list of node names, a list of "subnode" (resource) names, and the name of a property in the final node or resource.
+		A pre-parsed relative or absolute path in a scene tree, for use with [method Node.get_node] and similar functions. It can reference a node, a resource within a node, or a property of a node or resource. For instance, [code]"Path2D/PathFollow2D/Sprite:texture:size"[/code] would refer to the size property of the texture resource on the node named "Sprite" which is a child of the other named nodes in the path. Note that if you want to get a resource, you must end the path with a colon, otherwise the last element will be used as a property name.
+		You will usually just pass a string to [method Node.get_node] and it will be automatically converted, but you may occasionally want to parse a path ahead of time with [NodePath] or the literal syntax [code]@"path"[/code]. Exporting a [NodePath] variable will give you a node selection widget in the properties panel of the editor, which can often be useful.
+		A [NodePath] is made up of a list of node names, a list of "subnode" (resource) names, and the name of a property in the final node or resource.
 	</description>
 	<methods>
+		<method name="NodePath">
+			<return type="NodePath">
+			</return>
+			<argument index="0" name="from" type="String">
+			</argument>
+			<description>
+				Create a NodePath from a string, e.g. "Path2D/PathFollow2D/Sprite:texture:size". A path is absolute if it starts with a slash. Absolute paths are only valid in the global scene tree, not within individual scenes. In a relative path, [code]"."[/code] and [code]".."[/code] indicate the current node and its parent.
+			</description>
+		</method>
 		<method name="get_name">
 			<return type="String">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Get the node name indicated by [code]idx[/code] (0 to [method get_name_count])
+				Get the node name indicated by [code]idx[/code] (0 to [method get_name_count])
 			</description>
 		</method>
 		<method name="get_name_count">
 			<return type="int">
 			</return>
 			<description>
-			Get the number of node names which make up the path.
+				Get the number of node names which make up the path.
 			</description>
 		</method>
 		<method name="get_property">
 			<return type="String">
 			</return>
 			<description>
-			Get the path's property name, or an empty string if the path doesn't have a property.
+				Get the path's property name, or an empty string if the path doesn't have a property.
 			</description>
 		</method>
 		<method name="get_subname">
@@ -21910,37 +22195,28 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Get the resource name indicated by [code]idx[/code] (0 to [method get_subname_count])
+				Get the resource name indicated by [code]idx[/code] (0 to [method get_subname_count])
 			</description>
 		</method>
 		<method name="get_subname_count">
 			<return type="int">
 			</return>
 			<description>
-			Get the number of resource names in the path.
+				Get the number of resource names in the path.
 			</description>
 		</method>
 		<method name="is_absolute">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if the node path is absolute (not relative).
+				Return true if the node path is absolute (not relative).
 			</description>
 		</method>
 		<method name="is_empty">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if the node path is empty.
-			</description>
-		</method>
-		<method name="NodePath">
-			<return type="NodePath">
-			</return>
-			<argument index="0" name="from" type="String">
-			</argument>
-			<description>
-			Create a NodePath from a string, e.g. "Path2D/PathFollow2D/Sprite:texture:size". A path is absolute if it starts with a slash. Absolute paths are only valid in the global scene tree, not within individual scenes. In a relative path, [code]"."[/code] and [code]".."[/code] indicate the current node and its parent.
+				Return true if the node path is empty.
 			</description>
 		</method>
 	</methods>
@@ -21949,578 +22225,551 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="OS" inherits="Object" category="Core">
 	<brief_description>
-	Operating System functions.
+		Operating System functions.
 	</brief_description>
 	<description>
-	Operating System functions. OS Wraps the most common functionality to communicate with the host Operating System, such as:
- -Mouse Grabbing
- -Mouse Cursors
- -Clipboard
- -Video Mode
- -Date " Time
- -Timers
- -Environment Variables
- -Execution of Binaries
- -Command Line
+		Operating System functions. OS Wraps the most common functionality to communicate with the host Operating System, such as: mouse grabbing, mouse cursors, clipboard, video mode, date and time, timers, environment variables, execution of binaries, command line, etc.
 	</description>
 	<methods>
-		<method name="set_clipboard">
-			<argument index="0" name="clipboard" type="String">
+		<method name="alert">
+			<argument index="0" name="text" type="String">
+			</argument>
+			<argument index="1" name="title" type="String" default="&quot;Alert!&quot;">
 			</argument>
 			<description>
-			Set clipboard to the OS.
 			</description>
 		</method>
-		<method name="get_clipboard" qualifiers="const">
-			<return type="String">
+		<method name="can_draw" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Get clipboard from the host OS.
+				Return true if the host OS allows drawing.
 			</description>
 		</method>
-		<method name="set_video_mode">
-			<argument index="0" name="size" type="Vector2">
-			</argument>
-			<argument index="1" name="fullscreen" type="bool">
-			</argument>
-			<argument index="2" name="resizable" type="bool">
-			</argument>
-			<argument index="3" name="screen" type="int" default="0">
-			</argument>
+		<method name="can_use_threads" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Change the video mode.
 			</description>
 		</method>
-		<method name="get_video_mode_size" qualifiers="const">
-			<return type="Vector2">
-			</return>
-			<argument index="0" name="screen" type="int" default="0">
+		<method name="delay_msec" qualifiers="const">
+			<argument index="0" name="msec" type="int">
 			</argument>
 			<description>
-			Return the current video mode size.
+				Delay executing of the current thread by given milliseconds.
 			</description>
 		</method>
-		<method name="is_video_mode_fullscreen" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="screen" type="int" default="0">
+		<method name="delay_usec" qualifiers="const">
+			<argument index="0" name="usec" type="int">
 			</argument>
 			<description>
-			Return true if the current video mode is fullscreen.
+				Delay executing of the current thread by given microseconds.
 			</description>
 		</method>
-		<method name="is_video_mode_resizable" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="screen" type="int" default="0">
+		<method name="dump_memory_to_file">
+			<argument index="0" name="file" type="String">
 			</argument>
 			<description>
-			Return true if the window is resizable.
 			</description>
 		</method>
-		<method name="get_fullscreen_mode_list" qualifiers="const">
-			<return type="Array">
-			</return>
-			<argument index="0" name="screen" type="int" default="0">
+		<method name="dump_resources_to_file">
+			<argument index="0" name="file" type="String">
 			</argument>
 			<description>
-			Return the list of fullscreen modes.
 			</description>
 		</method>
-		<method name="get_screen_count" qualifiers="const">
+		<method name="execute">
 			<return type="int">
 			</return>
+			<argument index="0" name="path" type="String">
+			</argument>
+			<argument index="1" name="arguments" type="StringArray">
+			</argument>
+			<argument index="2" name="blocking" type="bool">
+			</argument>
+			<argument index="3" name="output" type="Array" default="Array()">
+			</argument>
 			<description>
-			Returns the number of displays attached to the host machine
+				Execute the binary file in given path, optionally blocking until it returns. A process ID is returned.
 			</description>
 		</method>
-		<method name="get_current_screen" qualifiers="const">
+		<method name="find_scancode_from_string" qualifiers="const">
 			<return type="int">
 			</return>
-			<description>
-			Returns the current screen index (0 padded).
-			</description>
-		</method>
-		<method name="set_current_screen">
-			<argument index="0" name="screen" type="int">
+			<argument index="0" name="string" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_screen_position" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_borderless_window" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="screen" type="int" default="0">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_screen_size" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_clipboard" qualifiers="const">
+			<return type="String">
 			</return>
-			<argument index="0" name="screen" type="int" default="0">
-			</argument>
 			<description>
-			Returns the dimensions in pixels of the specified screen.
+				Get clipboard from the host OS.
 			</description>
 		</method>
-		<method name="get_screen_dpi" qualifiers="const">
-			<return type="int">
+		<method name="get_cmdline_args">
+			<return type="StringArray">
 			</return>
-			<argument index="0" name="screen" type="int" default="0">
-			</argument>
 			<description>
+				Return the commandline passed to the engine.
 			</description>
 		</method>
-		<method name="get_window_position" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_current_screen" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Returns the window position relative to the screen, the origin is the top left corner, +Y axis goes to the bottom and +X axis goes to the right.
+				Returns the current screen index (0 padded).
 			</description>
 		</method>
-		<method name="set_window_position">
-			<argument index="0" name="position" type="Vector2">
-			</argument>
+		<method name="get_custom_level" qualifiers="const">
+			<return type="String">
+			</return>
 			<description>
-			Sets the position of the window to the specified position (this function could be restricted by the window manager, meaning that there could be some unreachable areas of the screen).
 			</description>
 		</method>
-		<method name="get_window_size" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_data_dir" qualifiers="const">
+			<return type="String">
 			</return>
 			<description>
-			Returns the size of the window (without counting window manager decorations).
+				Return the absolute directory path of user data path([user://]).
 			</description>
 		</method>
-		<method name="set_window_size">
-			<argument index="0" name="size" type="Vector2">
+		<method name="get_date" qualifiers="const">
+			<return type="Dictionary">
+			</return>
+			<argument index="0" name="utc" type="bool" default="false">
 			</argument>
 			<description>
-			Sets the window size to the specified size.
+				Returns current date as a dictionary of keys: year, month, day, weekday, dst (daylight savings time).
 			</description>
 		</method>
-		<method name="set_window_fullscreen">
-			<argument index="0" name="enabled" type="bool">
+		<method name="get_datetime" qualifiers="const">
+			<return type="Dictionary">
+			</return>
+			<argument index="0" name="utc" type="bool" default="false">
 			</argument>
 			<description>
-			Sets window fullscreen mode to the [i]enabled[/i] argument, [i]enabled[/i] is a toggle for the fullscreen mode, calling the function with [i]enabled[/i] true when the screen is not on fullscreen mode will cause the screen to go to fullscreen mode, calling the function with [i]enabled[/i] false when the screen is in fullscreen mode will cause the window to exit the fullscreen mode.
+				Returns current datetime as a dictionary of keys: year, month, day, weekday, dst (daylight savings time), hour, minute, second.
 			</description>
 		</method>
-		<method name="is_window_fullscreen" qualifiers="const">
-			<return type="bool">
+		<method name="get_datetime_from_unix_time" qualifiers="const">
+			<return type="Dictionary">
 			</return>
-			<description>
-			Returns whether the window is in fullscreen mode or not.
-			</description>
-		</method>
-		<method name="set_window_resizable">
-			<argument index="0" name="enabled" type="bool">
+			<argument index="0" name="unix_time_val" type="int">
 			</argument>
 			<description>
-			Set the window resizable state, if the window is not resizable it will preserve the dimensions specified in the project settings.
+				Get a dictionary of time values when given epoch time.
+				Dictionary Time values will be a union of values from [method get_time] and [method get_date] dictionaries (with the exception of dst = day light standard time, as it cannot be determined from epoch).
 			</description>
 		</method>
-		<method name="is_window_resizable" qualifiers="const">
-			<return type="bool">
+		<method name="get_dynamic_memory_usage" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Returns whether the window is resizable or not.
+				Return the total amount of dynamic memory used (only works in debug).
 			</description>
 		</method>
-		<method name="set_window_minimized">
-			<argument index="0" name="enabled" type="bool">
+		<method name="get_environment" qualifiers="const">
+			<return type="String">
+			</return>
+			<argument index="0" name="environment" type="String">
 			</argument>
 			<description>
-			Set whether the window is minimized.
+				Return an environment variable.
 			</description>
 		</method>
-		<method name="is_window_minimized" qualifiers="const">
-			<return type="bool">
+		<method name="get_executable_path" qualifiers="const">
+			<return type="String">
 			</return>
 			<description>
-			Return true if the window is minimized.
+				Return the path to the current engine executable.
 			</description>
 		</method>
-		<method name="set_window_maximized">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
+		<method name="get_frames_drawn">
+			<return type="int">
+			</return>
 			<description>
-			Set the window size to maximized.
+				Return the total amount of frames drawn.
 			</description>
 		</method>
-		<method name="is_window_maximized" qualifiers="const">
-			<return type="bool">
+		<method name="get_frames_per_second" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return true if the window is maximized.
+				Returns the frames per second of the running game.
 			</description>
 		</method>
-		<method name="set_borderless_window">
-			<argument index="0" name="borderless" type="bool">
+		<method name="get_fullscreen_mode_list" qualifiers="const">
+			<return type="Array">
+			</return>
+			<argument index="0" name="screen" type="int" default="0">
 			</argument>
 			<description>
+				Return the list of fullscreen modes.
 			</description>
 		</method>
-		<method name="get_borderless_window" qualifiers="const">
-			<return type="bool">
+		<method name="get_iterations_per_second" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
+				Return the amount of fixed iterations per second (for fixed process and physics).
 			</description>
 		</method>
-		<method name="set_screen_orientation">
-			<argument index="0" name="orientation" type="int">
-			</argument>
+		<method name="get_locale" qualifiers="const">
+			<return type="String">
+			</return>
 			<description>
-			Sets the current screen orientation, the argument value must be one of the SCREEN_ORIENTATION constants in this class.
+				Return the host OS locale.
 			</description>
 		</method>
-		<method name="get_screen_orientation" qualifiers="const">
-			<return type="int">
+		<method name="get_main_loop" qualifiers="const">
+			<return type="Object">
 			</return>
 			<description>
-			Returns the current screen orientation, the return value will be one of the SCREEN_ORIENTATION constants in this class.
+				Return the main loop object (see [MainLoop]).
 			</description>
 		</method>
-		<method name="set_keep_screen_on">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
+		<method name="get_model_name" qualifiers="const">
+			<return type="String">
+			</return>
 			<description>
-			Set keep screen on if true, or goes to sleep by device setting if false. (for Android/iOS)
 			</description>
 		</method>
-		<method name="is_keep_screen_on" qualifiers="const">
-			<return type="bool">
+		<method name="get_name" qualifiers="const">
+			<return type="String">
 			</return>
 			<description>
-			Returns whether the screen is being kept on or not.
+				Return the name of the host OS. Possible values are: "Android", "BlackBerry 10", "Flash", "Haiku", "iOS", "HTML5", "OSX", "Server", "Windows", "WinRT", "X11"
 			</description>
 		</method>
-		<method name="set_iterations_per_second">
-			<argument index="0" name="iterations_per_second" type="int">
-			</argument>
+		<method name="get_process_ID" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the amount of fixed iterations per second (for fixed process and physics).
+				Returns the game process ID
 			</description>
 		</method>
-		<method name="get_iterations_per_second" qualifiers="const">
+		<method name="get_processor_count" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the amount of fixed iterations per second (for fixed process and physics).
+				Returns the number of cores available in the host machine.
 			</description>
 		</method>
-		<method name="set_target_fps">
-			<argument index="0" name="target_fps" type="int">
+		<method name="get_scancode_string" qualifiers="const">
+			<return type="String">
+			</return>
+			<argument index="0" name="code" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_target_fps" qualifiers="const">
-			<return type="float">
+		<method name="get_screen_count" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
+				Returns the number of displays attached to the host machine
 			</description>
 		</method>
-		<method name="set_time_scale">
-			<argument index="0" name="time_scale" type="float">
+		<method name="get_screen_dpi" qualifiers="const">
+			<return type="int">
+			</return>
+			<argument index="0" name="screen" type="int" default="0">
 			</argument>
 			<description>
-			Speeds up or slows down the physics by changing the delta variable. (delta * time_scale)
 			</description>
 		</method>
-		<method name="get_time_scale">
-			<return type="float">
+		<method name="get_screen_orientation" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
+				Returns the current screen orientation, the return value will be one of the SCREEN_ORIENTATION constants in this class.
 			</description>
 		</method>
-		<method name="has_touchscreen_ui_hint" qualifiers="const">
-			<return type="bool">
+		<method name="get_screen_position" qualifiers="const">
+			<return type="Vector2">
 			</return>
-			<description>
-			</description>
-		</method>
-		<method name="set_window_title">
-			<argument index="0" name="title" type="String">
+			<argument index="0" name="screen" type="int" default="0">
 			</argument>
 			<description>
-			Sets the window title to the specified string.
 			</description>
 		</method>
-		<method name="set_low_processor_usage_mode">
-			<argument index="0" name="enable" type="bool">
+		<method name="get_screen_size" qualifiers="const">
+			<return type="Vector2">
+			</return>
+			<argument index="0" name="screen" type="int" default="0">
 			</argument>
 			<description>
-			Set to true to enable the low cpu usage mode. In this mode, the screen only redraws when there are changes, and a considerable sleep time is inserted between frames. This way, editors using the engine UI only use very little cpu.
+				Returns the dimensions in pixels of the specified screen.
 			</description>
 		</method>
-		<method name="is_in_low_processor_usage_mode" qualifiers="const">
-			<return type="bool">
+		<method name="get_splash_tick_msec" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return true if low cpu usage mode is enabled.
 			</description>
 		</method>
-		<method name="get_processor_count" qualifiers="const">
+		<method name="get_static_memory_peak_usage" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Returns the number of cores available in the host machine.
+				Return the max amount of static memory used (only works in debug).
 			</description>
 		</method>
-		<method name="get_executable_path" qualifiers="const">
-			<return type="String">
+		<method name="get_static_memory_usage" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the path to the current engine executable.
 			</description>
 		</method>
-		<method name="execute">
-			<return type="int">
+		<method name="get_system_dir" qualifiers="const">
+			<return type="String">
 			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
-			<argument index="1" name="arguments" type="StringArray">
-			</argument>
-			<argument index="2" name="blocking" type="bool">
-			</argument>
-			<argument index="3" name="output" type="Array" default="Array()">
+			<argument index="0" name="dir" type="int">
 			</argument>
 			<description>
-			Execute the binary file in given path, optionally blocking until it returns. A process ID is returned.
 			</description>
 		</method>
-		<method name="kill">
+		<method name="get_system_time_secs" qualifiers="const">
 			<return type="int">
 			</return>
-			<argument index="0" name="pid" type="int">
-			</argument>
 			<description>
-			Kill a process ID (this method can be used to kill processes that were not spawned by the game).
 			</description>
 		</method>
-		<method name="shell_open">
-			<return type="int">
+		<method name="get_target_fps" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="uri" type="String">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_process_ID" qualifiers="const">
+		<method name="get_ticks_msec" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Returns the game process ID
+				Return the amount of time passed in milliseconds since the engine started.
 			</description>
 		</method>
-		<method name="get_environment" qualifiers="const">
-			<return type="String">
+		<method name="get_time" qualifiers="const">
+			<return type="Dictionary">
 			</return>
-			<argument index="0" name="environment" type="String">
+			<argument index="0" name="utc" type="bool" default="false">
 			</argument>
 			<description>
-			Return an environment variable.
+				Returns current time as a dictionary of keys: hour, minute, second
 			</description>
 		</method>
-		<method name="has_environment" qualifiers="const">
-			<return type="bool">
+		<method name="get_time_scale">
+			<return type="float">
 			</return>
-			<argument index="0" name="environment" type="String">
-			</argument>
 			<description>
-			Return true if an environment variable exists.
 			</description>
 		</method>
-		<method name="get_name" qualifiers="const">
-			<return type="String">
+		<method name="get_time_zone_info" qualifiers="const">
+			<return type="Dictionary">
 			</return>
 			<description>
-			Return the name of the host OS. Possible values are: "Android", "BlackBerry 10", "Flash", "Haiku", "iOS", "HTML5", "OSX", "Server", "Windows", "WinRT", "X11"
 			</description>
 		</method>
-		<method name="get_cmdline_args">
-			<return type="StringArray">
+		<method name="get_unique_ID" qualifiers="const">
+			<return type="String">
 			</return>
 			<description>
-			Return the commandline passed to the engine.
 			</description>
 		</method>
-		<method name="get_main_loop" qualifiers="const">
-			<return type="Object">
+		<method name="get_unix_time" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the main loop object (see [MainLoop]).
+				Return	the current unix timestamp.
 			</description>
 		</method>
-		<method name="get_datetime" qualifiers="const">
-			<return type="Dictionary">
+		<method name="get_unix_time_from_datetime" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="utc" type="bool" default="false">
+			<argument index="0" name="datetime" type="Dictionary">
 			</argument>
 			<description>
-			Returns current datetime as a dictionary of keys: year, month, day, weekday, dst (daylight savings time), hour, minute, second.
+				Get an epoch time value from a dictionary of time values.
+				[code]datetime[/code] must be populated with the following keys: year, month, day, hour, minute, second.
+				You can pass the output from [method get_datetime_from_unix_time] directly into this function. Daylight savings time (dst), if present, is ignored.
 			</description>
 		</method>
-		<method name="get_date" qualifiers="const">
-			<return type="Dictionary">
+		<method name="get_video_mode_size" qualifiers="const">
+			<return type="Vector2">
 			</return>
-			<argument index="0" name="utc" type="bool" default="false">
+			<argument index="0" name="screen" type="int" default="0">
 			</argument>
 			<description>
-			Returns current date as a dictionary of keys: year, month, day, weekday, dst (daylight savings time).
+				Return the current video mode size.
 			</description>
 		</method>
-		<method name="get_time" qualifiers="const">
-			<return type="Dictionary">
+		<method name="get_window_position" qualifiers="const">
+			<return type="Vector2">
 			</return>
-			<argument index="0" name="utc" type="bool" default="false">
-			</argument>
 			<description>
-			Returns current time as a dictionary of keys: hour, minute, second
+				Returns the window position relative to the screen, the origin is the top left corner, +Y axis goes to the bottom and +X axis goes to the right.
 			</description>
 		</method>
-		<method name="get_time_zone_info" qualifiers="const">
-			<return type="Dictionary">
+		<method name="get_window_size" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<description>
+				Returns the size of the window (without counting window manager decorations).
 			</description>
 		</method>
-		<method name="get_unix_time" qualifiers="const">
-			<return type="int">
+		<method name="has_environment" qualifiers="const">
+			<return type="bool">
 			</return>
+			<argument index="0" name="environment" type="String">
+			</argument>
 			<description>
-			Return	the current unix timestamp.
+				Return true if an environment variable exists.
 			</description>
 		</method>
-		<method name="get_datetime_from_unix_time" qualifiers="const">
-			<return type="Dictionary">
+		<method name="has_touchscreen_ui_hint" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="unix_time_val" type="int">
-			</argument>
 			<description>
-			Get a dictionary of time values when given epoch time.
-			Dictionary Time values will be a union of values from [method get_time] and [method get_date] dictionaries (with the exception of dst = day light standard time, as it cannot be determined from epoch).
 			</description>
 		</method>
-		<method name="get_unix_time_from_datetime" qualifiers="const">
-			<return type="int">
+		<method name="is_debug_build" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="datetime" type="Dictionary">
-			</argument>
 			<description>
-			Get an epoch time value from a dictionary of time values.
-			[code]datetime[/code] must be populated with the following keys: year, month, day, hour, minute, second.
-			You can pass the output from [method get_datetime_from_unix_time] directly into this function. Daylight savings time (dst), if present, is ignored.
 			</description>
 		</method>
-		<method name="get_system_time_secs" qualifiers="const">
-			<return type="int">
+		<method name="is_in_low_processor_usage_mode" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
+				Return true if low cpu usage mode is enabled.
 			</description>
 		</method>
-		<method name="set_icon">
-			<argument index="0" name="icon" type="Image">
-			</argument>
+		<method name="is_keep_screen_on" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
+				Returns whether the screen is being kept on or not.
 			</description>
 		</method>
-		<method name="delay_usec" qualifiers="const">
-			<argument index="0" name="usec" type="int">
-			</argument>
+		<method name="is_ok_left_and_cancel_right" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Delay executing of the current thread by given microseconds.
 			</description>
 		</method>
-		<method name="delay_msec" qualifiers="const">
-			<argument index="0" name="msec" type="int">
+		<method name="is_scancode_unicode" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="code" type="int">
 			</argument>
 			<description>
-			Delay executing of the current thread by given milliseconds.
 			</description>
 		</method>
-		<method name="get_ticks_msec" qualifiers="const">
-			<return type="int">
+		<method name="is_stdout_verbose" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the amount of time passed in milliseconds since the engine started.
+				Return true if the engine was executed with -v (verbose stdout).
 			</description>
 		</method>
-		<method name="get_splash_tick_msec" qualifiers="const">
-			<return type="int">
+		<method name="is_video_mode_fullscreen" qualifiers="const">
+			<return type="bool">
 			</return>
+			<argument index="0" name="screen" type="int" default="0">
+			</argument>
 			<description>
+				Return true if the current video mode is fullscreen.
 			</description>
 		</method>
-		<method name="get_locale" qualifiers="const">
-			<return type="String">
+		<method name="is_video_mode_resizable" qualifiers="const">
+			<return type="bool">
 			</return>
+			<argument index="0" name="screen" type="int" default="0">
+			</argument>
 			<description>
-			Return the host OS locale.
+				Return true if the window is resizable.
 			</description>
 		</method>
-		<method name="get_model_name" qualifiers="const">
-			<return type="String">
+		<method name="is_vsnc_enabled" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_custom_level" qualifiers="const">
-			<return type="String">
+		<method name="is_window_fullscreen" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
+				Returns whether the window is in fullscreen mode or not.
 			</description>
 		</method>
-		<method name="can_draw" qualifiers="const">
+		<method name="is_window_maximized" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if the host OS allows drawing.
+				Return true if the window is maximized.
 			</description>
 		</method>
-		<method name="get_frames_drawn">
-			<return type="int">
+		<method name="is_window_minimized" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the total amount of frames drawn.
+				Return true if the window is minimized.
 			</description>
 		</method>
-		<method name="is_stdout_verbose" qualifiers="const">
+		<method name="is_window_resizable" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if the engine was executed with -v (verbose stdout).
+				Returns whether the window is resizable or not.
 			</description>
 		</method>
-		<method name="can_use_threads" qualifiers="const">
-			<return type="bool">
+		<method name="kill">
+			<return type="int">
 			</return>
+			<argument index="0" name="pid" type="int">
+			</argument>
 			<description>
+				Kill a process ID (this method can be used to kill processes that were not spawned by the game).
 			</description>
 		</method>
-		<method name="is_debug_build" qualifiers="const">
+		<method name="native_video_is_playing">
 			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="dump_memory_to_file">
-			<argument index="0" name="file" type="String">
-			</argument>
+		<method name="native_video_pause">
 			<description>
 			</description>
 		</method>
-		<method name="dump_resources_to_file">
-			<argument index="0" name="file" type="String">
+		<method name="native_video_play">
+			<return type="int">
+			</return>
+			<argument index="0" name="path" type="String">
+			</argument>
+			<argument index="1" name="volume" type="float">
+			</argument>
+			<argument index="2" name="audio_track" type="String">
+			</argument>
+			<argument index="3" name="subtitle_track" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="print_resources_in_use">
-			<argument index="0" name="short" type="bool" default="false">
-			</argument>
+		<method name="native_video_stop">
+			<description>
+			</description>
+		</method>
+		<method name="native_video_unpause">
 			<description>
 			</description>
 		</method>
@@ -22530,157 +22779,175 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="get_static_memory_usage" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="print_all_textures_by_size">
 			<description>
 			</description>
 		</method>
-		<method name="get_static_memory_peak_usage" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="print_resources_by_type">
+			<argument index="0" name="types" type="StringArray">
+			</argument>
 			<description>
-			Return the max amount of static memory used (only works in debug).
 			</description>
 		</method>
-		<method name="get_dynamic_memory_usage" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="print_resources_in_use">
+			<argument index="0" name="short" type="bool" default="false">
+			</argument>
 			<description>
-			Return the total amount of dynamic memory used (only works in debug).
 			</description>
 		</method>
-		<method name="get_data_dir" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="set_borderless_window">
+			<argument index="0" name="borderless" type="bool">
+			</argument>
 			<description>
-			Return the absolute directory path of user data path([user://]).
 			</description>
 		</method>
-		<method name="get_system_dir" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="dir" type="int">
+		<method name="set_clipboard">
+			<argument index="0" name="clipboard" type="String">
 			</argument>
 			<description>
+				Set clipboard to the OS.
 			</description>
 		</method>
-		<method name="get_unique_ID" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="set_current_screen">
+			<argument index="0" name="screen" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_ok_left_and_cancel_right" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_icon">
+			<argument index="0" name="icon" type="Image">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_frames_per_second" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_iterations_per_second">
+			<argument index="0" name="iterations_per_second" type="int">
+			</argument>
 			<description>
-			Returns the frames per second of the running game.
+				Set the amount of fixed iterations per second (for fixed process and physics).
 			</description>
 		</method>
-		<method name="print_all_textures_by_size">
+		<method name="set_keep_screen_on">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
+				Set keep screen on if true, or goes to sleep by device setting if false. (for Android/iOS)
 			</description>
 		</method>
-		<method name="print_resources_by_type">
-			<argument index="0" name="types" type="StringArray">
+		<method name="set_low_processor_usage_mode">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
+				Set to true to enable the low cpu usage mode. In this mode, the screen only redraws when there are changes, and a considerable sleep time is inserted between frames. This way, editors using the engine UI only use very little cpu.
 			</description>
 		</method>
-		<method name="native_video_play">
-			<return type="int">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
-			<argument index="1" name="volume" type="float">
-			</argument>
-			<argument index="2" name="audio_track" type="String">
+		<method name="set_screen_orientation">
+			<argument index="0" name="orientation" type="int">
 			</argument>
-			<argument index="3" name="subtitle_track" type="String">
+			<description>
+				Sets the current screen orientation, the argument value must be one of the SCREEN_ORIENTATION constants in this class.
+			</description>
+		</method>
+		<method name="set_target_fps">
+			<argument index="0" name="target_fps" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="native_video_is_playing">
-			<return type="bool">
+		<method name="set_thread_name">
+			<return type="int">
 			</return>
+			<argument index="0" name="name" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="native_video_stop">
+		<method name="set_time_scale">
+			<argument index="0" name="time_scale" type="float">
+			</argument>
 			<description>
+				Speeds up or slows down the physics by changing the delta variable. (delta * time_scale)
 			</description>
 		</method>
-		<method name="native_video_pause">
+		<method name="set_use_file_access_save_and_swap">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="native_video_unpause">
+		<method name="set_use_vsync">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_scancode_string" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="code" type="int">
+		<method name="set_video_mode">
+			<argument index="0" name="size" type="Vector2">
+			</argument>
+			<argument index="1" name="fullscreen" type="bool">
+			</argument>
+			<argument index="2" name="resizable" type="bool">
+			</argument>
+			<argument index="3" name="screen" type="int" default="0">
 			</argument>
 			<description>
+				Change the video mode.
 			</description>
 		</method>
-		<method name="is_scancode_unicode" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="code" type="int">
+		<method name="set_window_fullscreen">
+			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
+				Sets window fullscreen mode to the [i]enabled[/i] argument, [i]enabled[/i] is a toggle for the fullscreen mode, calling the function with [i]enabled[/i] true when the screen is not on fullscreen mode will cause the screen to go to fullscreen mode, calling the function with [i]enabled[/i] false when the screen is in fullscreen mode will cause the window to exit the fullscreen mode.
 			</description>
 		</method>
-		<method name="find_scancode_from_string" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="string" type="String">
+		<method name="set_window_maximized">
+			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
+				Set the window size to maximized.
 			</description>
 		</method>
-		<method name="set_use_file_access_save_and_swap">
+		<method name="set_window_minimized">
 			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
+				Set whether the window is minimized.
 			</description>
 		</method>
-		<method name="alert">
-			<argument index="0" name="text" type="String">
+		<method name="set_window_position">
+			<argument index="0" name="position" type="Vector2">
 			</argument>
-			<argument index="1" name="title" type="String" default="&quot;Alert!&quot;">
+			<description>
+				Sets the position of the window to the specified position (this function could be restricted by the window manager, meaning that there could be some unreachable areas of the screen).
+			</description>
+		</method>
+		<method name="set_window_resizable">
+			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
+				Set the window resizable state, if the window is not resizable it will preserve the dimensions specified in the project settings.
 			</description>
 		</method>
-		<method name="set_thread_name">
-			<return type="int">
-			</return>
-			<argument index="0" name="name" type="String">
+		<method name="set_window_size">
+			<argument index="0" name="size" type="Vector2">
 			</argument>
 			<description>
+				Sets the window size to the specified size.
 			</description>
 		</method>
-		<method name="set_use_vsync">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_window_title">
+			<argument index="0" name="title" type="String">
 			</argument>
 			<description>
+				Sets the window title to the specified string.
 			</description>
 		</method>
-		<method name="is_vsnc_enabled" qualifiers="const">
-			<return type="bool">
+		<method name="shell_open">
+			<return type="int">
 			</return>
+			<argument index="0" name="uri" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -22758,28 +23025,37 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="Object" category="Core">
 	<brief_description>
-	Base class for all non built-in types.
+		Base class for all non built-in types.
 	</brief_description>
 	<description>
-	Base class for all non built-in types. Everything not a built-in type starts the inheritance chain from this class.
-	Objects do not manage memory, if inheriting from one the object will most likely have to be deleted manually (call the [method free] function from the script or delete from C++).
-	Some derivates add memory management, such as [Reference] (which keeps a reference count and deletes itself automatically when no longer referenced) and [Node], which deletes the children tree when deleted.
-	Objects export properties, which are mainly useful for storage and editing, but not really so much in programming. Properties are exported in [method _get_property_list] and handled in [method _get] and [method _set]. However, scripting languages and C++ have simpler means to export them.
-	Objects also receive notifications ([method _notification]). Notifications are a simple way to notify the object about simple events, so they can all be handled together.
+		Base class for all non built-in types. Everything not a built-in type starts the inheritance chain from this class.
+		Objects do not manage memory, if inheriting from one the object will most likely have to be deleted manually (call the [method free] function from the script or delete from C++).
+		Some derivates add memory management, such as [Reference] (which keeps a reference count and deletes itself automatically when no longer referenced) and [Node], which deletes the children tree when deleted.
+		Objects export properties, which are mainly useful for storage and editing, but not really so much in programming. Properties are exported in [method _get_property_list] and handled in [method _get] and [method _set]. However, scripting languages and C++ have simpler means to export them.
+		Objects also receive notifications ([method _notification]). Notifications are a simple way to notify the object about simple events, so they can all be handled together.
 	</description>
 	<methods>
+		<method name="XL_MESSAGE" qualifiers="const">
+			<return type="String">
+			</return>
+			<argument index="0" name="message" type="String">
+			</argument>
+			<description>
+				Deprecated, will go away.
+			</description>
+		</method>
 		<method name="_get" qualifiers="virtual">
 			<argument index="0" name="property" type="String">
 			</argument>
 			<description>
-			Return a property, return null if the property does not exist.
+				Return a property, return null if the property does not exist.
 			</description>
 		</method>
 		<method name="_get_property_list" qualifiers="virtual">
 			<return type="Array">
 			</return>
 			<description>
-			Return the property list, array of dictionaries, dictionaries must contain: name:String, type:int (see TYPE_* enum in globals) and optionally: hint:int (see PROPERTY_HINT_* in globals), hint_string:String, usage:int (see PROPERTY_USAGE_* in globals).
+				Return the property list, array of dictionaries, dictionaries must contain: name:String, type:int (see TYPE_* enum in globals) and optionally: hint:int (see PROPERTY_HINT_* in globals), hint_string:String, usage:int (see PROPERTY_USAGE_* in globals).
 			</description>
 		</method>
 		<method name="_init" qualifiers="virtual">
@@ -22790,7 +23066,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="what" type="int">
 			</argument>
 			<description>
-			Notification request, the notification id is received.
+				Notification request, the notification id is received.
 			</description>
 		</method>
 		<method name="_set" qualifiers="virtual">
@@ -22799,206 +23075,205 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="value" type="Variant">
 			</argument>
 			<description>
-			Set a property. Return true if the property was found.
+				Set a property. Return true if the property was found.
 			</description>
 		</method>
-		<method name="free">
-			<description>
-			</description>
-		</method>
-		<method name="get_type" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="add_user_signal">
+			<argument index="0" name="signal" type="String">
+			</argument>
+			<argument index="1" name="arguments" type="Array" default="Array()">
+			</argument>
 			<description>
-			Return the type of the object as a string.
+				Add a user signal (can be added anytime). Arguments are optional, but can be added as an array of dictionaries, each containing "name" and "type" (from [@Global Scope] TYPE_*).
 			</description>
 		</method>
-		<method name="is_type" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="type" type="String">
+		<method name="call">
+			<argument index="0" name="method" type="String">
+			</argument>
+			<argument index="1" name="arg0" type="Variant" default="NULL">
+			</argument>
+			<argument index="2" name="arg1" type="Variant" default="NULL">
+			</argument>
+			<argument index="3" name="arg2" type="Variant" default="NULL">
+			</argument>
+			<argument index="4" name="arg3" type="Variant" default="NULL">
+			</argument>
+			<argument index="5" name="arg4" type="Variant" default="NULL">
+			</argument>
+			<argument index="6" name="arg5" type="Variant" default="NULL">
+			</argument>
+			<argument index="7" name="arg6" type="Variant" default="NULL">
+			</argument>
+			<argument index="8" name="arg7" type="Variant" default="NULL">
+			</argument>
+			<argument index="9" name="arg8" type="Variant" default="NULL">
+			</argument>
+			<argument index="10" name="arg9" type="Variant" default="NULL">
 			</argument>
 			<description>
-			Check the type of the object against a string (including inheritance).
+				Call a function in the object, result is returned.
 			</description>
 		</method>
-		<method name="set">
-			<argument index="0" name="property" type="String">
+		<method name="call_deferred">
+			<argument index="0" name="method" type="String">
 			</argument>
-			<argument index="1" name="value" type="Variant">
+			<argument index="1" name="arg0" type="Variant" default="NULL">
+			</argument>
+			<argument index="2" name="arg1" type="Variant" default="NULL">
+			</argument>
+			<argument index="3" name="arg2" type="Variant" default="NULL">
+			</argument>
+			<argument index="4" name="arg3" type="Variant" default="NULL">
+			</argument>
+			<argument index="5" name="arg4" type="Variant" default="NULL">
 			</argument>
 			<description>
-			Set property into the object.
+				Create and store a function in the object. The call will take place on idle time.
 			</description>
 		</method>
-		<method name="get" qualifiers="const">
-			<argument index="0" name="property" type="String">
+		<method name="callv">
+			<return type="Variant">
+			</return>
+			<argument index="0" name="method" type="String">
+			</argument>
+			<argument index="1" name="arg_array" type="Array">
 			</argument>
 			<description>
-			Get a property from the object.
 			</description>
 		</method>
-		<method name="get_property_list" qualifiers="const">
-			<return type="Array">
+		<method name="can_translate_messages" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the list of properties as an array of dictionaries, dictionaries contain: name:String, type:int (see TYPE_* enum in globals) and optionally: hint:int (see PROPERTY_HINT_* in globals), hint_string:String, usage:int (see PROPERTY_USAGE_* in globals).
+				Return true if this object can translate strings.
 			</description>
 		</method>
-		<method name="get_method_list" qualifiers="const">
-			<return type="Array">
+		<method name="connect">
+			<return type="int">
 			</return>
+			<argument index="0" name="signal" type="String">
+			</argument>
+			<argument index="1" name="target" type="Object">
+			</argument>
+			<argument index="2" name="method" type="String">
+			</argument>
+			<argument index="3" name="binds" type="Array" default="Array()">
+			</argument>
+			<argument index="4" name="flags" type="int" default="0">
+			</argument>
 			<description>
+				Connect a signal to a method at a target (member function). Binds are optional and are passed as extra arguments to the call. Flags specify optional deferred or one shot connections, see enum CONNECT_*. A signal can only be connected once to a method, and it will throw an error if already connected. If you want to avoid this, use [method is_connected] to check.
 			</description>
 		</method>
-		<method name="notification">
-			<argument index="0" name="what" type="int">
+		<method name="disconnect">
+			<argument index="0" name="signal" type="String">
 			</argument>
-			<argument index="1" name="reversed" type="bool" default="false">
+			<argument index="1" name="target" type="Object">
+			</argument>
+			<argument index="2" name="method" type="String">
 			</argument>
 			<description>
-			Notify the object of something.
+				Disconnect a signal from a method.
 			</description>
 		</method>
-		<method name="get_instance_ID" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="emit_signal">
+			<argument index="0" name="signal" type="String">
+			</argument>
+			<argument index="1" name="arg0" type="Variant" default="NULL">
+			</argument>
+			<argument index="2" name="arg1" type="Variant" default="NULL">
+			</argument>
+			<argument index="3" name="arg2" type="Variant" default="NULL">
+			</argument>
+			<argument index="4" name="arg3" type="Variant" default="NULL">
+			</argument>
+			<argument index="5" name="arg4" type="Variant" default="NULL">
+			</argument>
 			<description>
-			Return the instance ID. All objects have a unique instance ID.
+				Emit a signal. Arguments are passed in an array.
 			</description>
 		</method>
-		<method name="set_script">
-			<argument index="0" name="script" type="Script">
-			</argument>
+		<method name="free">
 			<description>
-			Set a script into the object, scripts extend the object functionality.
 			</description>
 		</method>
-		<method name="get_script" qualifiers="const">
-			<return type="Script">
-			</return>
+		<method name="get" qualifiers="const">
+			<argument index="0" name="property" type="String">
+			</argument>
 			<description>
-			Return the object script (or null if it doesn't have one).
+				Get a property from the object.
 			</description>
 		</method>
-		<method name="set_meta">
-			<argument index="0" name="name" type="String">
-			</argument>
-			<argument index="1" name="value" type="Variant">
-			</argument>
+		<method name="get_instance_ID" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set a metadata into the object. Metadata is serialized. Metadata can be [i]anything[/i].
+				Return the instance ID. All objects have a unique instance ID.
 			</description>
 		</method>
 		<method name="get_meta" qualifiers="const">
 			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			Return a metadata from the object.
+				Return a metadata from the object.
 			</description>
 		</method>
-		<method name="has_meta" qualifiers="const">
-			<return type="bool">
+		<method name="get_meta_list" qualifiers="const">
+			<return type="StringArray">
 			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
 			<description>
-			Return true if a metadata is found with the requested name.
+				Return the list of metadata in the object.
 			</description>
 		</method>
-		<method name="get_meta_list" qualifiers="const">
-			<return type="StringArray">
+		<method name="get_method_list" qualifiers="const">
+			<return type="Array">
 			</return>
 			<description>
-			Return the list of metadata in the object.
 			</description>
 		</method>
-		<method name="add_user_signal">
-			<argument index="0" name="signal" type="String">
-			</argument>
-			<argument index="1" name="arguments" type="Array" default="Array()">
-			</argument>
+		<method name="get_property_list" qualifiers="const">
+			<return type="Array">
+			</return>
 			<description>
-			Add a user signal (can be added anytime). Arguments are optional, but can be added as an array of dictionaries, each containing "name" and "type" (from [@Global Scope] TYPE_*).
+				Return the list of properties as an array of dictionaries, dictionaries contain: name:String, type:int (see TYPE_* enum in globals) and optionally: hint:int (see PROPERTY_HINT_* in globals), hint_string:String, usage:int (see PROPERTY_USAGE_* in globals).
 			</description>
 		</method>
-		<method name="has_user_signal" qualifiers="const">
-			<return type="bool">
+		<method name="get_script" qualifiers="const">
+			<return type="Script">
 			</return>
-			<argument index="0" name="signal" type="String">
-			</argument>
 			<description>
+				Return the object script (or null if it doesn't have one).
 			</description>
 		</method>
-		<method name="emit_signal">
+		<method name="get_signal_connection_list" qualifiers="const">
+			<return type="Array">
+			</return>
 			<argument index="0" name="signal" type="String">
 			</argument>
-			<argument index="1" name="arg0" type="Variant" default="NULL">
-			</argument>
-			<argument index="2" name="arg1" type="Variant" default="NULL">
-			</argument>
-			<argument index="3" name="arg2" type="Variant" default="NULL">
-			</argument>
-			<argument index="4" name="arg3" type="Variant" default="NULL">
-			</argument>
-			<argument index="5" name="arg4" type="Variant" default="NULL">
-			</argument>
 			<description>
-			Emit a signal. Arguments are passed in an array.
 			</description>
 		</method>
-		<method name="call">
-			<argument index="0" name="method" type="String">
-			</argument>
-			<argument index="1" name="arg0" type="Variant" default="NULL">
-			</argument>
-			<argument index="2" name="arg1" type="Variant" default="NULL">
-			</argument>
-			<argument index="3" name="arg2" type="Variant" default="NULL">
-			</argument>
-			<argument index="4" name="arg3" type="Variant" default="NULL">
-			</argument>
-			<argument index="5" name="arg4" type="Variant" default="NULL">
-			</argument>
-			<argument index="6" name="arg5" type="Variant" default="NULL">
-			</argument>
-			<argument index="7" name="arg6" type="Variant" default="NULL">
-			</argument>
-			<argument index="8" name="arg7" type="Variant" default="NULL">
-			</argument>
-			<argument index="9" name="arg8" type="Variant" default="NULL">
-			</argument>
-			<argument index="10" name="arg9" type="Variant" default="NULL">
-			</argument>
+		<method name="get_signal_list" qualifiers="const">
+			<return type="Array">
+			</return>
 			<description>
-			Call a function in the object, result is returned.
+				Return the list of signals as an array of dictionaries.
 			</description>
 		</method>
-		<method name="call_deferred">
-			<argument index="0" name="method" type="String">
-			</argument>
-			<argument index="1" name="arg0" type="Variant" default="NULL">
-			</argument>
-			<argument index="2" name="arg1" type="Variant" default="NULL">
-			</argument>
-			<argument index="3" name="arg2" type="Variant" default="NULL">
-			</argument>
-			<argument index="4" name="arg3" type="Variant" default="NULL">
-			</argument>
-			<argument index="5" name="arg4" type="Variant" default="NULL">
-			</argument>
+		<method name="get_type" qualifiers="const">
+			<return type="String">
+			</return>
 			<description>
-			Create and store a function in the object. The call will take place on idle time.
+				Return the type of the object as a string.
 			</description>
 		</method>
-		<method name="callv">
-			<return type="Variant">
+		<method name="has_meta" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="method" type="String">
-			</argument>
-			<argument index="1" name="arg_array" type="Array">
+			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
+				Return true if a metadata is found with the requested name.
 			</description>
 		</method>
 		<method name="has_method" qualifiers="const">
@@ -23009,23 +23284,23 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="get_signal_list" qualifiers="const">
-			<return type="Array">
+		<method name="has_user_signal" qualifiers="const">
+			<return type="bool">
 			</return>
+			<argument index="0" name="signal" type="String">
+			</argument>
 			<description>
-			Return the list of signals as an array of dictionaries.
 			</description>
 		</method>
-		<method name="get_signal_connection_list" qualifiers="const">
-			<return type="Array">
+		<method name="is_blocking_signals" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="signal" type="String">
-			</argument>
 			<description>
+				Return true if signal emission blocking is enabled.
 			</description>
 		</method>
-		<method name="connect">
-			<return type="int">
+		<method name="is_connected" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="signal" type="String">
 			</argument>
@@ -23033,77 +23308,75 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			</argument>
 			<argument index="2" name="method" type="String">
 			</argument>
-			<argument index="3" name="binds" type="Array" default="Array()">
-			</argument>
-			<argument index="4" name="flags" type="int" default="0">
-			</argument>
 			<description>
-			Connect a signal to a method at a target (member function). Binds are optional and are passed as extra arguments to the call. Flags specify optional deferred or one shot connections, see enum CONNECT_*. A signal can only be connected once to a method, and it will throw an error if already connected. If you want to avoid this, use [method is_connected] to check.
+				Return true if a connection exists for a given signal and target/method.
 			</description>
 		</method>
-		<method name="disconnect">
-			<argument index="0" name="signal" type="String">
-			</argument>
-			<argument index="1" name="target" type="Object">
-			</argument>
-			<argument index="2" name="method" type="String">
-			</argument>
+		<method name="is_queued_for_deletion" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Disconnect a signal from a method.
 			</description>
 		</method>
-		<method name="is_connected" qualifiers="const">
+		<method name="is_type" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="signal" type="String">
+			<argument index="0" name="type" type="String">
 			</argument>
-			<argument index="1" name="target" type="Object">
+			<description>
+				Check the type of the object against a string (including inheritance).
+			</description>
+		</method>
+		<method name="notification">
+			<argument index="0" name="what" type="int">
 			</argument>
-			<argument index="2" name="method" type="String">
+			<argument index="1" name="reversed" type="bool" default="false">
 			</argument>
 			<description>
-			Return true if a connection exists for a given signal and target/method.
+				Notify the object of something.
 			</description>
 		</method>
-		<method name="set_block_signals">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="property_list_changed_notify">
 			<description>
-			If set to true, signal emission is blocked.
 			</description>
 		</method>
-		<method name="is_blocking_signals" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set">
+			<argument index="0" name="property" type="String">
+			</argument>
+			<argument index="1" name="value" type="Variant">
+			</argument>
 			<description>
-			Return true if signal emission blocking is enabled.
+				Set property into the object.
 			</description>
 		</method>
-		<method name="set_message_translation">
+		<method name="set_block_signals">
 			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Set true if this object can translate strings (in calls to tr() ). Default is true.
+				If set to true, signal emission is blocked.
 			</description>
 		</method>
-		<method name="can_translate_messages" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_message_translation">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Return true if this object can translate strings.
+				Set true if this object can translate strings (in calls to tr() ). Default is true.
 			</description>
 		</method>
-		<method name="property_list_changed_notify">
+		<method name="set_meta">
+			<argument index="0" name="name" type="String">
+			</argument>
+			<argument index="1" name="value" type="Variant">
+			</argument>
 			<description>
+				Set a metadata into the object. Metadata is serialized. Metadata can be [i]anything[/i].
 			</description>
 		</method>
-		<method name="XL_MESSAGE" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="message" type="String">
+		<method name="set_script">
+			<argument index="0" name="script" type="Script">
 			</argument>
 			<description>
-			Deprecated, will go away.
+				Set a script into the object, scripts extend the object functionality.
 			</description>
 		</method>
 		<method name="tr" qualifiers="const">
@@ -23112,13 +23385,7 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="message" type="String">
 			</argument>
 			<description>
-			Translate a message. Only works in message translation is enabled (which is by default). See [method set_message_translation].
-			</description>
-		</method>
-		<method name="is_queued_for_deletion" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
+				Translate a message. Only works in message translation is enabled (which is by default). See [method set_message_translation].
 			</description>
 		</method>
 	</methods>
@@ -23152,9 +23419,15 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<description>
 	</description>
 	<methods>
-		<method name="set_closed">
-			<argument index="0" name="closed" type="bool">
-			</argument>
+		<method name="get_cull_mode" qualifiers="const">
+			<return type="int">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="get_polygon" qualifiers="const">
+			<return type="Vector2Array">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -23164,15 +23437,15 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="set_cull_mode">
-			<argument index="0" name="cull_mode" type="int">
+		<method name="set_closed">
+			<argument index="0" name="closed" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_cull_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_cull_mode">
+			<argument index="0" name="cull_mode" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -23182,12 +23455,6 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="get_polygon" qualifiers="const">
-			<return type="Vector2Array">
-			</return>
-			<description>
-			</description>
-		</method>
 	</methods>
 	<constants>
 		<constant name="CULL_DISABLED" value="0">
@@ -23200,10 +23467,10 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="OmniLight" inherits="Light" category="Core">
 	<brief_description>
-	OmniDirectional Light, such as a light bulb or a candle.
+		OmniDirectional Light, such as a light bulb or a candle.
 	</brief_description>
 	<description>
-	An OmniDirectional light is a type of [Light] node that emits lights in all directions. The light is attenuated through the distance and this attenuation can be configured by changing the energy, radius and attenuation parameters of [Light]. TODO: Image of an omnilight.
+		An OmniDirectional light is a type of [Light] node that emits lights in all directions. The light is attenuated through the distance and this attenuation can be configured by changing the energy, radius and attenuation parameters of [Light]. TODO: Image of an omnilight.
 	</description>
 	<methods>
 	</methods>
@@ -23212,21 +23479,12 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="OptionButton" inherits="Button" category="Core">
 	<brief_description>
-	Button control that provides selectable options when pressed.
+		Button control that provides selectable options when pressed.
 	</brief_description>
 	<description>
-	OptionButton is a type button that provides a selectable list of items when pressed. The item selected becomes the "current" item and is displayed as the button text.
+		OptionButton is a type button that provides a selectable list of items when pressed. The item selected becomes the "current" item and is displayed as the button text.
 	</description>
 	<methods>
-		<method name="add_item">
-			<argument index="0" name="label" type="String">
-			</argument>
-			<argument index="1" name="id" type="int" default="-1">
-			</argument>
-			<description>
-			Add an item, with text "label" and (optionally) id. If no "id" is passed, "id" becomes the item index. New items are appended at the end.
-			</description>
-		</method>
 		<method name="add_icon_item">
 			<argument index="0" name="texture" type="Texture">
 			</argument>
@@ -23235,49 +23493,56 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="2" name="id" type="int">
 			</argument>
 			<description>
-			Add an item, with a "texture" icon, text "label" and (optionally) id. If no "id" is passed, "id" becomes the item index. New items are appended at the end.
+				Add an item, with a "texture" icon, text "label" and (optionally) id. If no "id" is passed, "id" becomes the item index. New items are appended at the end.
 			</description>
 		</method>
-		<method name="set_item_text">
-			<argument index="0" name="idx" type="int">
+		<method name="add_item">
+			<argument index="0" name="label" type="String">
 			</argument>
-			<argument index="1" name="text" type="String">
+			<argument index="1" name="id" type="int" default="-1">
 			</argument>
 			<description>
-			Set the text of an item at index "idx".
+				Add an item, with text "label" and (optionally) id. If no "id" is passed, "id" becomes the item index. New items are appended at the end.
 			</description>
 		</method>
-		<method name="set_item_icon">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="texture" type="Texture">
-			</argument>
+		<method name="add_separator">
 			<description>
-			Set the icon of an item at index "idx".
+				Add a separator to the list of items. Separators help to group items. Separator also takes up an index and is appended at the end.
 			</description>
 		</method>
-		<method name="set_item_disabled">
+		<method name="clear">
+			<description>
+				Clear all the items in the [OptionButton].
+			</description>
+		</method>
+		<method name="get_item_ID" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="disabled" type="bool">
-			</argument>
 			<description>
+				Return the ID of the item at index "idx".
 			</description>
 		</method>
-		<method name="set_item_ID">
+		<method name="get_item_count" qualifiers="const">
+			<return type="int">
+			</return>
+			<description>
+				Return the amount of items in the OptionButton.
+			</description>
+		</method>
+		<method name="get_item_icon" qualifiers="const">
+			<return type="Texture">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="id" type="int">
-			</argument>
 			<description>
-			Set the ID of an item at index "idx".
+				Return the icon of the item at index "idx".
 			</description>
 		</method>
-		<method name="set_item_metadata">
+		<method name="get_item_metadata" qualifiers="const">
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="metadata" type="Variant">
-			</argument>
 			<description>
 			</description>
 		</method>
@@ -23287,30 +23552,23 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Return the text of the item at index "idx".
+				Return the text of the item at index "idx".
 			</description>
 		</method>
-		<method name="get_item_icon" qualifiers="const">
-			<return type="Texture">
+		<method name="get_selected" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
-			Return the icon of the item at index "idx".
+				Return the current item index
 			</description>
 		</method>
-		<method name="get_item_ID" qualifiers="const">
+		<method name="get_selected_ID" qualifiers="const">
 			<return type="int">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
-			Return the ID of the item at index "idx".
 			</description>
 		</method>
-		<method name="get_item_metadata" qualifiers="const">
-			<argument index="0" name="idx" type="int">
-			</argument>
+		<method name="get_selected_metadata" qualifiers="const">
 			<description>
 			</description>
 		</method>
@@ -23322,51 +23580,60 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="get_item_count" qualifiers="const">
-			<return type="int">
-			</return>
-			<description>
-			Return the amount of items in the OptionButton.
-			</description>
-		</method>
-		<method name="add_separator">
+		<method name="remove_item">
+			<argument index="0" name="idx" type="int">
+			</argument>
 			<description>
-			Add a separator to the list of items. Separators help to group items. Separator also takes up an index and is appended at the end.
 			</description>
 		</method>
-		<method name="clear">
+		<method name="select">
+			<argument index="0" name="idx" type="int">
+			</argument>
 			<description>
-			Clear all the items in the [OptionButton].
+				Select an item by index and make it the current item.
 			</description>
 		</method>
-		<method name="select">
+		<method name="set_item_ID">
 			<argument index="0" name="idx" type="int">
 			</argument>
+			<argument index="1" name="id" type="int">
+			</argument>
 			<description>
-			Select an item by index and make it the current item.
+				Set the ID of an item at index "idx".
 			</description>
 		</method>
-		<method name="get_selected" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_item_disabled">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="disabled" type="bool">
+			</argument>
 			<description>
-			Return the current item index
 			</description>
 		</method>
-		<method name="get_selected_ID" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_item_icon">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="texture" type="Texture">
+			</argument>
 			<description>
+				Set the icon of an item at index "idx".
 			</description>
 		</method>
-		<method name="get_selected_metadata" qualifiers="const">
+		<method name="set_item_metadata">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="metadata" type="Variant">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="remove_item">
+		<method name="set_item_text">
 			<argument index="0" name="idx" type="int">
 			</argument>
+			<argument index="1" name="text" type="String">
+			</argument>
 			<description>
+				Set the text of an item at index "idx".
 			</description>
 		</method>
 	</methods>
@@ -23375,39 +23642,39 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="ID" type="int">
 			</argument>
 			<description>
-			This signal is emitted when the current item was changed by the user. ID of the item selected is passed as argument (if no IDs were added, ID will be just the item index).
+				This signal is emitted when the current item was changed by the user. ID of the item selected is passed as argument (if no IDs were added, ID will be just the item index).
 			</description>
 		</signal>
 	</signals>
 	<constants>
 	</constants>
 	<theme_items>
-		<theme_item name="hseparation" type="int">
+		<theme_item name="arrow" type="Texture">
 		</theme_item>
 		<theme_item name="arrow_margin" type="int">
 		</theme_item>
-		<theme_item name="font_color_disabled" type="Color">
+		<theme_item name="disabled" type="StyleBox">
+		</theme_item>
+		<theme_item name="focus" type="StyleBox">
+		</theme_item>
+		<theme_item name="font" type="Font">
 		</theme_item>
 		<theme_item name="font_color" type="Color">
 		</theme_item>
+		<theme_item name="font_color_disabled" type="Color">
+		</theme_item>
 		<theme_item name="font_color_hover" type="Color">
 		</theme_item>
 		<theme_item name="font_color_pressed" type="Color">
 		</theme_item>
-		<theme_item name="arrow" type="Texture">
-		</theme_item>
-		<theme_item name="font" type="Font">
-		</theme_item>
 		<theme_item name="hover" type="StyleBox">
 		</theme_item>
-		<theme_item name="pressed" type="StyleBox">
-		</theme_item>
-		<theme_item name="focus" type="StyleBox">
-		</theme_item>
-		<theme_item name="disabled" type="StyleBox">
+		<theme_item name="hseparation" type="int">
 		</theme_item>
 		<theme_item name="normal" type="StyleBox">
 		</theme_item>
+		<theme_item name="pressed" type="StyleBox">
+		</theme_item>
 	</theme_items>
 </class>
 <class name="PCKPacker" inherits="Reference" category="Core">
@@ -23416,30 +23683,30 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<description>
 	</description>
 	<methods>
-		<method name="pck_start">
+		<method name="add_file">
 			<return type="int">
 			</return>
-			<argument index="0" name="pck_name" type="String">
+			<argument index="0" name="pck_path" type="String">
 			</argument>
-			<argument index="1" name="alignment" type="int">
+			<argument index="1" name="source_path" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="add_file">
+		<method name="flush">
 			<return type="int">
 			</return>
-			<argument index="0" name="pck_path" type="String">
-			</argument>
-			<argument index="1" name="source_path" type="String">
+			<argument index="0" name="verbose" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="flush">
+		<method name="pck_start">
 			<return type="int">
 			</return>
-			<argument index="0" name="verbose" type="bool">
+			<argument index="0" name="pck_name" type="String">
+			</argument>
+			<argument index="1" name="alignment" type="int">
 			</argument>
 			<description>
 			</description>
@@ -23450,10 +23717,10 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="PHashTranslation" inherits="Translation" category="Core">
 	<brief_description>
-	Optimized translation.
+		Optimized translation.
 	</brief_description>
 	<description>
-	Optimized translation. Uses real-time compressed translations, which results in very small dictionaries.
+		Optimized translation. Uses real-time compressed translations, which results in very small dictionaries.
 	</description>
 	<methods>
 		<method name="generate">
@@ -23510,36 +23777,36 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<brief_description>
 	</brief_description>
 	<description>
-	TODO: explain ownership, and that node does not need to own itself
+		TODO: explain ownership, and that node does not need to own itself
 	</description>
 	<methods>
-		<method name="pack">
-			<return type="int">
+		<method name="can_instance" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="path" type="Node">
-			</argument>
 			<description>
-			Pack will ignore any sub-nodes not owned by given node. See [method Node.set_owner].
 			</description>
 		</method>
-		<method name="instance" qualifiers="const">
-			<return type="Node">
+		<method name="get_state">
+			<return type="SceneState">
 			</return>
-			<argument index="0" name="gen_edit_state" type="bool" default="false">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="can_instance" qualifiers="const">
-			<return type="bool">
+		<method name="instance" qualifiers="const">
+			<return type="Node">
 			</return>
+			<argument index="0" name="gen_edit_state" type="bool" default="false">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_state">
-			<return type="SceneState">
+		<method name="pack">
+			<return type="int">
 			</return>
+			<argument index="0" name="path" type="Node">
+			</argument>
 			<description>
+				Pack will ignore any sub-nodes not owned by given node. See [method Node.set_owner].
 			</description>
 		</method>
 	</methods>
@@ -23548,56 +23815,56 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="PacketPeer" inherits="Reference" category="Core">
 	<brief_description>
-	Abstraction and base class for packet-based protocols.
+		Abstraction and base class for packet-based protocols.
 	</brief_description>
 	<description>
-	PacketPeer is an abstraction and base class for packet-based protocols (such as UDP). It provides an API for sending and receiving packets both as raw data or variables. This makes it easy to transfer data over a protocol, without having to encode data as low level bytes or having to worry about network ordering.
+		PacketPeer is an abstraction and base class for packet-based protocols (such as UDP). It provides an API for sending and receiving packets both as raw data or variables. This makes it easy to transfer data over a protocol, without having to encode data as low level bytes or having to worry about network ordering.
 	</description>
 	<methods>
-		<method name="get_var" qualifiers="const">
-			<return type="Variant">
-			</return>
-			<description>
-			Get a Variant.
-			</description>
-		</method>
-		<method name="put_var">
+		<method name="get_available_packet_count" qualifiers="const">
 			<return type="int">
 			</return>
-			<argument index="0" name="var" type="Variant">
-			</argument>
 			<description>
-			Send a Variant as a packet.
+				Return the number of packets currently available in the ring-buffer.
 			</description>
 		</method>
 		<method name="get_packet" qualifiers="const">
 			<return type="RawArray">
 			</return>
 			<description>
-			Get a raw packet.
+				Get a raw packet.
 			</description>
 		</method>
-		<method name="put_packet">
+		<method name="get_packet_error" qualifiers="const">
 			<return type="Error">
 			</return>
-			<argument index="0" name="buffer" type="RawArray">
-			</argument>
 			<description>
-			Send a raw packet.
+				Return the error state of the last packet received (via [method get_packet] and [method get_var]).
 			</description>
 		</method>
-		<method name="get_packet_error" qualifiers="const">
+		<method name="get_var" qualifiers="const">
+			<return type="Variant">
+			</return>
+			<description>
+				Get a Variant.
+			</description>
+		</method>
+		<method name="put_packet">
 			<return type="Error">
 			</return>
+			<argument index="0" name="buffer" type="RawArray">
+			</argument>
 			<description>
-			Return the error state of the last packet received (via [method get_packet] and [method get_var]).
+				Send a raw packet.
 			</description>
 		</method>
-		<method name="get_available_packet_count" qualifiers="const">
+		<method name="put_var">
 			<return type="int">
 			</return>
+			<argument index="0" name="var" type="Variant">
+			</argument>
 			<description>
-			Return the number of packets currently available in the ring-buffer.
+				Send a Variant as a packet.
 			</description>
 		</method>
 	</methods>
@@ -23606,17 +23873,17 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="PacketPeerStream" inherits="PacketPeer" category="Core">
 	<brief_description>
-	Wrapper to use a PacketPeer over a StreamPeer.
+		Wrapper to use a PacketPeer over a StreamPeer.
 	</brief_description>
 	<description>
-	PacketStreamPeer provides a wrapper for working using packets over a stream. This allows for using packet based code with StreamPeers. PacketPeerStream implements a custom protocol over the StreamPeer, so the user should not read or write to the wrapped StreamPeer directly.
+		PacketStreamPeer provides a wrapper for working using packets over a stream. This allows for using packet based code with StreamPeers. PacketPeerStream implements a custom protocol over the StreamPeer, so the user should not read or write to the wrapped StreamPeer directly.
 	</description>
 	<methods>
 		<method name="set_stream_peer">
 			<argument index="0" name="peer" type="StreamPeer">
 			</argument>
 			<description>
-			Set the StreamPeer object to be wrapped
+				Set the StreamPeer object to be wrapped
 			</description>
 		</method>
 	</methods>
@@ -23625,61 +23892,54 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="PacketPeerUDP" inherits="PacketPeer" category="Core">
 	<brief_description>
-	UDP packet peer.
+		UDP packet peer.
 	</brief_description>
 	<description>
-	UDP packet peer. Can be used to send raw UDP packets as well as [Variant]s.
+		UDP packet peer. Can be used to send raw UDP packets as well as [Variant]s.
 	</description>
 	<methods>
-		<method name="listen">
-			<return type="Error">
-			</return>
-			<argument index="0" name="port" type="int">
-			</argument>
-			<argument index="1" name="recv_buf_size" type="int" default="65536">
-			</argument>
-			<description>
-			Make this [PacketPeerUDP] listen on the "port" using a buffer size "recv_buf_size". Listens on all available adresses.
-			</description>
-		</method>
 		<method name="close">
 			<description>
-			Close the UDP socket the [PacketPeerUDP] is currently listening on.
+				Close the UDP socket the [PacketPeerUDP] is currently listening on.
 			</description>
 		</method>
-		<method name="wait">
-			<return type="Error">
+		<method name="get_packet_address" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Wait for a packet to arrive on the listening port, see [method listen].
+				Return the address of the remote peer(as a 32bit integer) that sent the last packet(that was received with [method get_packet] or [method get_var]).
 			</description>
 		</method>
-		<method name="is_listening" qualifiers="const">
-			<return type="bool">
+		<method name="get_packet_ip" qualifiers="const">
+			<return type="String">
 			</return>
 			<description>
-			Return whether this [PacketPeerUDP] is listening.
+				Return the IP of the remote peer that sent the last packet(that was received with [method get_packet] or [method get_var]).
 			</description>
 		</method>
-		<method name="get_packet_ip" qualifiers="const">
-			<return type="String">
+		<method name="get_packet_port" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the IP of the remote peer that sent the last packet(that was received with [method get_packet] or [method get_var]).
+				Return the port of the remote peer that sent the last packet(that was received with [method get_packet] or [method get_var]).
 			</description>
 		</method>
-		<method name="get_packet_address" qualifiers="const">
-			<return type="int">
+		<method name="is_listening" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the address of the remote peer(as a 32bit integer) that sent the last packet(that was received with [method get_packet] or [method get_var]).
+				Return whether this [PacketPeerUDP] is listening.
 			</description>
 		</method>
-		<method name="get_packet_port" qualifiers="const">
-			<return type="int">
+		<method name="listen">
+			<return type="Error">
 			</return>
+			<argument index="0" name="port" type="int">
+			</argument>
+			<argument index="1" name="recv_buf_size" type="int" default="65536">
+			</argument>
 			<description>
-			Return the port of the remote peer that sent the last packet(that was received with [method get_packet] or [method get_var]).
+				Make this [PacketPeerUDP] listen on the "port" using a buffer size "recv_buf_size". Listens on all available adresses.
 			</description>
 		</method>
 		<method name="set_send_address">
@@ -23690,7 +23950,14 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="port" type="int">
 			</argument>
 			<description>
-			Set the destination address and port for sending packets and variables, a hostname will be resolved if valid.
+				Set the destination address and port for sending packets and variables, a hostname will be resolved if valid.
+			</description>
+		</method>
+		<method name="wait">
+			<return type="Error">
+			</return>
+			<description>
+				Wait for a packet to arrive on the listening port, see [method listen].
 			</description>
 		</method>
 	</methods>
@@ -23699,30 +23966,30 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="Panel" inherits="Control" category="Core">
 	<brief_description>
-	Provides an opaque background for [Control] children.
+		Provides an opaque background for [Control] children.
 	</brief_description>
 	<description>
-	Panel is a [Control] that displays an opaque background. It's commonly used as a parent and container for other types of [Control] nodes.
+		Panel is a [Control] that displays an opaque background. It's commonly used as a parent and container for other types of [Control] nodes.
 	</description>
 	<methods>
 	</methods>
 	<constants>
 	</constants>
 	<theme_items>
-		<theme_item name="panelf" type="StyleBox">
-		</theme_item>
 		<theme_item name="panel" type="StyleBox">
 		</theme_item>
+		<theme_item name="panelf" type="StyleBox">
+		</theme_item>
 		<theme_item name="panelnc" type="StyleBox">
 		</theme_item>
 	</theme_items>
 </class>
 <class name="PanelContainer" inherits="Container" category="Core">
 	<brief_description>
-	Panel container type.
+		Panel container type.
 	</brief_description>
 	<description>
-	Panel container type. This container fits controls inside of the delimited area of a stylebox. It's useful for giving controls an outline.
+		Panel container type. This container fits controls inside of the delimited area of a stylebox. It's useful for giving controls an outline.
 	</description>
 	<methods>
 	</methods>
@@ -23735,92 +24002,92 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="ParallaxBackground" inherits="CanvasLayer" category="Core">
 	<brief_description>
-	A node used to create a parallax scrolling background.
+		A node used to create a parallax scrolling background.
 	</brief_description>
 	<description>
-	A ParallaxBackground will use one or more [ParallaxLayer] nodes to create a parallax scrolling background. Each [ParallaxLayer] can be set to move at different speeds relative to the camera movement, this can be used to create an illusion of depth in a 2D game.
+		A ParallaxBackground will use one or more [ParallaxLayer] nodes to create a parallax scrolling background. Each [ParallaxLayer] can be set to move at different speeds relative to the camera movement, this can be used to create an illusion of depth in a 2D game.
 	</description>
 	<methods>
-		<method name="set_scroll_offset">
-			<argument index="0" name="ofs" type="Vector2">
-			</argument>
+		<method name="get_limit_begin" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
+				Return the beginning limit.
 			</description>
 		</method>
-		<method name="get_scroll_offset" qualifiers="const">
+		<method name="get_limit_end" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
+				Return the ending limit.
 			</description>
 		</method>
-		<method name="set_scroll_base_offset">
-			<argument index="0" name="ofs" type="Vector2">
-			</argument>
+		<method name="get_scroll_base_offset" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
-			Set the base offset in pixels of all children [ParallaxLayer] nodes.
+				Return the base offset.
 			</description>
 		</method>
-		<method name="get_scroll_base_offset" qualifiers="const">
+		<method name="get_scroll_base_scale" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
-			Return the base offset.
+				Return the base motion scale.
 			</description>
 		</method>
-		<method name="set_scroll_base_scale">
-			<argument index="0" name="scale" type="Vector2">
-			</argument>
+		<method name="get_scroll_offset" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
-			Set the base motion scale of all children [ParallaxLayer] nodes.
 			</description>
 		</method>
-		<method name="get_scroll_base_scale" qualifiers="const">
-			<return type="Vector2">
+		<method name="is_ignore_camera_zoom">
+			<return type="bool">
 			</return>
 			<description>
-			Return the base motion scale.
+				Return ignoring camera zoom.
 			</description>
 		</method>
-		<method name="set_limit_begin">
-			<argument index="0" name="ofs" type="Vector2">
+		<method name="set_ignore_camera_zoom">
+			<argument index="0" name="ignore" type="bool">
 			</argument>
 			<description>
-			Set the left and top limits in pixels for scrolling to begin. If the camera is outside of this limit the background will not continue to scroll. If an axis is greater than or equal to the corresponding axis of limit_end, then it will not limit scrolling for that axis.
+				Set to true for all child [ParallaxLayer] nodes to not be affected by the zoom level of the camera.
 			</description>
 		</method>
-		<method name="get_limit_begin" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_limit_begin">
+			<argument index="0" name="ofs" type="Vector2">
+			</argument>
 			<description>
-			Return the beginning limit.
+				Set the left and top limits in pixels for scrolling to begin. If the camera is outside of this limit the background will not continue to scroll. If an axis is greater than or equal to the corresponding axis of limit_end, then it will not limit scrolling for that axis.
 			</description>
 		</method>
 		<method name="set_limit_end">
 			<argument index="0" name="ofs" type="Vector2">
 			</argument>
 			<description>
-			Set the right and bottom limits in pixels for scrolling to end. If the camera is outside of this limit the background will not continue to scroll. If an axis is less than or equal to the corresponding axis of limit_begin, then it will not limit scrolling for that axis.
+				Set the right and bottom limits in pixels for scrolling to end. If the camera is outside of this limit the background will not continue to scroll. If an axis is less than or equal to the corresponding axis of limit_begin, then it will not limit scrolling for that axis.
 			</description>
 		</method>
-		<method name="get_limit_end" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_scroll_base_offset">
+			<argument index="0" name="ofs" type="Vector2">
+			</argument>
 			<description>
-			Return the ending limit.
+				Set the base offset in pixels of all children [ParallaxLayer] nodes.
 			</description>
 		</method>
-		<method name="set_ignore_camera_zoom">
-			<argument index="0" name="ignore" type="bool">
+		<method name="set_scroll_base_scale">
+			<argument index="0" name="scale" type="Vector2">
 			</argument>
 			<description>
-			Set to true for all child [ParallaxLayer] nodes to not be affected by the zoom level of the camera.
+				Set the base motion scale of all children [ParallaxLayer] nodes.
 			</description>
 		</method>
-		<method name="is_ignore_camera_zoom">
-			<return type="bool">
-			</return>
+		<method name="set_scroll_offset">
+			<argument index="0" name="ofs" type="Vector2">
+			</argument>
 			<description>
-			Return ignoring camera zoom.
 			</description>
 		</method>
 	</methods>
@@ -23829,38 +24096,50 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="ParallaxLayer" inherits="Node2D" category="Core">
 	<brief_description>
-	A parallax scrolling layer to be used with [ParallaxBackground].
+		A parallax scrolling layer to be used with [ParallaxBackground].
 	</brief_description>
 	<description>
-	A ParallaxLayer must be the child of a [ParallaxBackground] node. All child nodes will be affected by the parallax scrolling of this layer.
+		A ParallaxLayer must be the child of a [ParallaxBackground] node. All child nodes will be affected by the parallax scrolling of this layer.
 	</description>
 	<methods>
-		<method name="set_motion_scale">
-			<argument index="0" name="scale" type="Vector2">
-			</argument>
+		<method name="get_mirroring" qualifiers="const">
+			<return type="Vector2">
+			</return>
+			<description>
+				Return the mirroring of the ParallaxLayer.
+			</description>
+		</method>
+		<method name="get_motion_offset" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
-			Set the motion scale of the ParallaxLayer. If an axis is set to 0 then it will not move at all, it will stick with the camera.
 			</description>
 		</method>
 		<method name="get_motion_scale" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
-			Return the motion scale of the ParallaxLayer.
+				Return the motion scale of the ParallaxLayer.
 			</description>
 		</method>
 		<method name="set_mirroring">
 			<argument index="0" name="mirror" type="Vector2">
 			</argument>
 			<description>
-			Set the mirroring of the ParallaxLayer. If an axis is set to 0 then that axis will have no mirroring.
+				Set the mirroring of the ParallaxLayer. If an axis is set to 0 then that axis will have no mirroring.
 			</description>
 		</method>
-		<method name="get_mirroring" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_motion_offset">
+			<argument index="0" name="offset" type="Vector2">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_motion_scale">
+			<argument index="0" name="scale" type="Vector2">
+			</argument>
 			<description>
-			Return the mirroring of the ParallaxLayer.
+				Set the motion scale of the ParallaxLayer. If an axis is set to 0 then it will not move at all, it will stick with the camera.
 			</description>
 		</method>
 	</methods>
@@ -23873,63 +24152,63 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<description>
 	</description>
 	<methods>
-		<method name="set_enabled">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
+		<method name="get_absorption" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="is_enabled" qualifiers="const">
-			<return type="bool">
+		<method name="get_disable_radius" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_radius">
-			<argument index="0" name="radius" type="float">
-			</argument>
+		<method name="get_gravity" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_radius" qualifiers="const">
-			<return type="float">
+		<method name="get_particles_path" qualifiers="const">
+			<return type="NodePath">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_disable_radius">
-			<argument index="0" name="radius" type="float">
-			</argument>
+		<method name="get_radius" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_disable_radius" qualifiers="const">
-			<return type="float">
+		<method name="is_enabled" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_gravity">
-			<argument index="0" name="gravity" type="float">
+		<method name="set_absorption">
+			<argument index="0" name="absorption" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_gravity" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_disable_radius">
+			<argument index="0" name="radius" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_absorption">
-			<argument index="0" name="absorption" type="float">
+		<method name="set_enabled">
+			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_absorption" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_gravity">
+			<argument index="0" name="gravity" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -23939,9 +24218,9 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="get_particles_path" qualifiers="const">
-			<return type="NodePath">
-			</return>
+		<method name="set_radius">
+			<argument index="0" name="radius" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -23951,72 +24230,41 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="Particles" inherits="GeometryInstance" category="Core">
 	<brief_description>
-	Particle system 3D Node
+		Particle system 3D Node
 	</brief_description>
 	<description>
-	Particles is a particle system 3D [Node] that is used to simulate several types of particle effects, such as explosions, rain, snow, fireflies, or other magical-like shinny sparkles. Particles are drawn using impostors, and given their dynamic behavior, the user must provide a visibility AABB (although helpers to create one automatically exist).
+		Particles is a particle system 3D [Node] that is used to simulate several types of particle effects, such as explosions, rain, snow, fireflies, or other magical-like shinny sparkles. Particles are drawn using impostors, and given their dynamic behavior, the user must provide a visibility AABB (although helpers to create one automatically exist).
 	</description>
 	<methods>
-		<method name="set_amount">
-			<argument index="0" name="amount" type="int">
-			</argument>
-			<description>
-			Set total amount of particles in the system.
-			</description>
-		</method>
 		<method name="get_amount" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the total amount of particles in the system.
-			</description>
-		</method>
-		<method name="set_emitting">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
-			<description>
-			Set the "emitting" property state. When emitting, the particle system generates new particles at constant rate.
+				Return the total amount of particles in the system.
 			</description>
 		</method>
-		<method name="is_emitting" qualifiers="const">
-			<return type="bool">
+		<method name="get_color_phase_color" qualifiers="const">
+			<return type="Color">
 			</return>
-			<description>
-			Return the "emitting" property state (see [method set_emitting]).
-			</description>
-		</method>
-		<method name="set_visibility_aabb">
-			<argument index="0" name="aabb" type="AABB">
+			<argument index="0" name="phase" type="int">
 			</argument>
 			<description>
-			Set the visibility AABB for the particle system, since the default one will not work properly most of the time.
+				Return the color of a color phase.
 			</description>
 		</method>
-		<method name="get_visibility_aabb" qualifiers="const">
-			<return type="AABB">
+		<method name="get_color_phase_pos" qualifiers="const">
+			<return type="float">
 			</return>
-			<description>
-			Return the current visibility AABB.
-			</description>
-		</method>
-		<method name="set_emission_half_extents">
-			<argument index="0" name="half_extents" type="Vector3">
+			<argument index="0" name="phase" type="int">
 			</argument>
 			<description>
-			Set the half extents for the emission box.
+				Return the position of a color phase (0 to 1).
 			</description>
 		</method>
-		<method name="get_emission_half_extents" qualifiers="const">
-			<return type="Vector3">
+		<method name="get_color_phases" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the half extents for the emission box.
-			</description>
-		</method>
-		<method name="set_emission_base_velocity">
-			<argument index="0" name="base_velocity" type="Vector3">
-			</argument>
-			<description>
 			</description>
 		</method>
 		<method name="get_emission_base_velocity" qualifiers="const">
@@ -24025,10 +24273,11 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="set_emission_points">
-			<argument index="0" name="points" type="Vector3Array">
-			</argument>
+		<method name="get_emission_half_extents" qualifiers="const">
+			<return type="Vector3">
+			</return>
 			<description>
+				Return the half extents for the emission box.
 			</description>
 		</method>
 		<method name="get_emission_points" qualifiers="const">
@@ -24037,27 +24286,33 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="set_gravity_normal">
-			<argument index="0" name="normal" type="Vector3">
-			</argument>
+		<method name="get_emit_timeout" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the normal vector towards where gravity is pulling (by default, negative Y).
 			</description>
 		</method>
 		<method name="get_gravity_normal" qualifiers="const">
 			<return type="Vector3">
 			</return>
 			<description>
-			Return the normal vector towards where gravity is pulling (by default, negative Y).
+				Return the normal vector towards where gravity is pulling (by default, negative Y).
 			</description>
 		</method>
-		<method name="set_variable">
+		<method name="get_material" qualifiers="const">
+			<return type="Material">
+			</return>
+			<description>
+				Return the material used to draw particles.
+			</description>
+		</method>
+		<method name="get_randomness" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="variable" type="int">
 			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
 			<description>
-			Set a specific variable for the particle system (see VAR_* enum).
+				Return the randomness for a specific variable of the particle system. Randomness produces small changes from the default each time a particle is emitted.
 			</description>
 		</method>
 		<method name="get_variable" qualifiers="const">
@@ -24066,43 +24321,40 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="0" name="variable" type="int">
 			</argument>
 			<description>
-			Return a specific variable for the particle system (see VAR_* enum).
+				Return a specific variable for the particle system (see VAR_* enum).
 			</description>
 		</method>
-		<method name="set_randomness">
-			<argument index="0" name="variable" type="int">
-			</argument>
-			<argument index="1" name="randomness" type="float">
-			</argument>
+		<method name="get_visibility_aabb" qualifiers="const">
+			<return type="AABB">
+			</return>
 			<description>
-			Set the randomness for a specific variable of the particle system. Randomness produces small changes from the default each time a particle is emitted.
+				Return the current visibility AABB.
 			</description>
 		</method>
-		<method name="get_randomness" qualifiers="const">
-			<return type="float">
+		<method name="has_height_from_velocity" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="variable" type="int">
-			</argument>
 			<description>
-			Return the randomness for a specific variable of the particle system. Randomness produces small changes from the default each time a particle is emitted.
 			</description>
 		</method>
-		<method name="set_color_phase_pos">
-			<argument index="0" name="phase" type="int">
-			</argument>
-			<argument index="1" name="pos" type="float">
-			</argument>
+		<method name="is_emitting" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the position of a color phase (0 to 1).
+				Return the "emitting" property state (see [method set_emitting]).
 			</description>
 		</method>
-		<method name="get_color_phase_pos" qualifiers="const">
-			<return type="float">
+		<method name="is_using_local_coordinates" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="phase" type="int">
+			<description>
+			</description>
+		</method>
+		<method name="set_amount">
+			<argument index="0" name="amount" type="int">
 			</argument>
 			<description>
-			Return the position of a color phase (0 to 1).
+				Set total amount of particles in the system.
 			</description>
 		</method>
 		<method name="set_color_phase_color">
@@ -24111,30 +24363,41 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<argument index="1" name="color" type="Color">
 			</argument>
 			<description>
-			Set the color of a color phase.
+				Set the color of a color phase.
 			</description>
 		</method>
-		<method name="get_color_phase_color" qualifiers="const">
-			<return type="Color">
-			</return>
+		<method name="set_color_phase_pos">
 			<argument index="0" name="phase" type="int">
 			</argument>
+			<argument index="1" name="pos" type="float">
+			</argument>
 			<description>
-			Return the color of a color phase.
+				Set the position of a color phase (0 to 1).
 			</description>
 		</method>
-		<method name="set_material">
-			<argument index="0" name="material" type="Material">
+		<method name="set_color_phases">
+			<argument index="0" name="count" type="int">
 			</argument>
 			<description>
-			Set the material used to draw particles.
 			</description>
 		</method>
-		<method name="get_material" qualifiers="const">
-			<return type="Material">
-			</return>
+		<method name="set_emission_base_velocity">
+			<argument index="0" name="base_velocity" type="Vector3">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_emission_half_extents">
+			<argument index="0" name="half_extents" type="Vector3">
+			</argument>
+			<description>
+				Set the half extents for the emission box.
+			</description>
+		</method>
+		<method name="set_emission_points">
+			<argument index="0" name="points" type="Vector3Array">
+			</argument>
 			<description>
-			Return the material used to draw particles.
 			</description>
 		</method>
 		<method name="set_emit_timeout">
@@ -24143,10 +24406,18 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="get_emit_timeout" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_emitting">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
+				Set the "emitting" property state. When emitting, the particle system generates new particles at constant rate.
+			</description>
+		</method>
+		<method name="set_gravity_normal">
+			<argument index="0" name="normal" type="Vector3">
+			</argument>
+			<description>
+				Set the normal vector towards where gravity is pulling (by default, negative Y).
 			</description>
 		</method>
 		<method name="set_height_from_velocity">
@@ -24155,34 +24426,42 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 			<description>
 			</description>
 		</method>
-		<method name="has_height_from_velocity" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_material">
+			<argument index="0" name="material" type="Material">
+			</argument>
 			<description>
+				Set the material used to draw particles.
 			</description>
 		</method>
-		<method name="set_use_local_coordinates">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_randomness">
+			<argument index="0" name="variable" type="int">
+			</argument>
+			<argument index="1" name="randomness" type="float">
 			</argument>
 			<description>
+				Set the randomness for a specific variable of the particle system. Randomness produces small changes from the default each time a particle is emitted.
 			</description>
 		</method>
-		<method name="is_using_local_coordinates" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_use_local_coordinates">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_color_phases">
-			<argument index="0" name="count" type="int">
+		<method name="set_variable">
+			<argument index="0" name="variable" type="int">
+			</argument>
+			<argument index="1" name="value" type="float">
 			</argument>
 			<description>
+				Set a specific variable for the particle system (see VAR_* enum).
 			</description>
 		</method>
-		<method name="get_color_phases" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_visibility_aabb">
+			<argument index="0" name="aabb" type="AABB">
+			</argument>
 			<description>
+				Set the visibility AABB for the particle system, since the default one will not work properly most of the time.
 			</description>
 		</method>
 	</methods>
@@ -24219,351 +24498,351 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="Particles2D" inherits="Node2D" category="Core">
 	<brief_description>
-	2D Particle emitter
+		2D Particle emitter
 	</brief_description>
 	<description>
-	Particles2D is a particle system 2D [Node] that is used to simulate several types of particle effects, such as explosions, rain, snow, fireflies, or other magical-like shinny sparkles. Particles are drawn using impostors, and given their dynamic behavior, the user must provide a visibility AABB (although helpers to create one automatically exist).
+		Particles2D is a particle system 2D [Node] that is used to simulate several types of particle effects, such as explosions, rain, snow, fireflies, or other magical-like shinny sparkles. Particles are drawn using impostors, and given their dynamic behavior, the user must provide a visibility AABB (although helpers to create one automatically exist).
 	</description>
 	<methods>
-		<method name="set_emitting">
-			<argument index="0" name="active" type="bool">
-			</argument>
+		<method name="get_amount" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			If this is set to true then the particle emitter will emit particles, if its false it will not.
+				Returns the amount of particles spawned at each emission
 			</description>
 		</method>
-		<method name="is_emitting" qualifiers="const">
-			<return type="bool">
+		<method name="get_color" qualifiers="const">
+			<return type="Color">
 			</return>
 			<description>
-			Returns whether this emitter is currently emitting or not
+				Returns the tint color for each particle.
 			</description>
 		</method>
-		<method name="set_amount">
-			<argument index="0" name="amount" type="int">
+		<method name="get_color_phase_color" qualifiers="const">
+			<return type="Color">
+			</return>
+			<argument index="0" name="phase" type="int">
 			</argument>
 			<description>
-			Sets the amount of particles spawned at each emission
 			</description>
 		</method>
-		<method name="get_amount" qualifiers="const">
-			<return type="int">
+		<method name="get_color_phase_pos" qualifiers="const">
+			<return type="float">
 			</return>
+			<argument index="0" name="phase" type="int">
+			</argument>
 			<description>
-			Returns the amount of particles spawned at each emission
 			</description>
 		</method>
-		<method name="set_lifetime">
-			<argument index="0" name="lifetime" type="float">
-			</argument>
+		<method name="get_color_phases" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Sets the amount of seconds that each particle will be visible.
 			</description>
 		</method>
-		<method name="get_lifetime" qualifiers="const">
-			<return type="float">
+		<method name="get_color_ramp" qualifiers="const">
+			<return type="ColorRamp">
 			</return>
 			<description>
-			Gets the amount of seconds that each particle will be visible.
+				Returns the [ColorRamp] used to tint each particle
 			</description>
 		</method>
-		<method name="set_time_scale">
-			<argument index="0" name="time_scale" type="float">
-			</argument>
+		<method name="get_emission_half_extents" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
-			Sets the increment or decrement for the particle lifetime. for example: if the time scale is set to 2, the particles will die and move twice as fast.
+				Returns the half extents of the emission box.
 			</description>
 		</method>
-		<method name="get_time_scale" qualifiers="const">
-			<return type="float">
+		<method name="get_emission_points" qualifiers="const">
+			<return type="Vector2Array">
 			</return>
 			<description>
-			Returns the emitter time scale
 			</description>
 		</method>
-		<method name="set_pre_process_time">
-			<argument index="0" name="time" type="float">
-			</argument>
+		<method name="get_emissor_offset" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
+				Returns the particle spawn origin position relative to the emitter.
 			</description>
 		</method>
-		<method name="get_pre_process_time" qualifiers="const">
+		<method name="get_emit_timeout" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
+				Returns the amount of seconds during which the emitter will spawn particles
 			</description>
 		</method>
-		<method name="set_emit_timeout">
-			<argument index="0" name="value" type="float">
-			</argument>
+		<method name="get_explosiveness" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Sets the amount of seconds during which the emitter will spawn particles, after the specified seconds the emitter state will be set to non emitting, so calling [method is_emitting] will return false. If the timeout is 0 the emitter will spawn forever.
 			</description>
 		</method>
-		<method name="get_emit_timeout" qualifiers="const">
-			<return type="float">
+		<method name="get_h_frames" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Returns the amount of seconds during which the emitter will spawn particles
 			</description>
 		</method>
-		<method name="set_param">
-			<argument index="0" name="param" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+		<method name="get_initial_velocity" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
-			Sets the value of the specified emitter parameter (see the constants secction for the list of parameters)
 			</description>
 		</method>
-		<method name="get_param" qualifiers="const">
+		<method name="get_lifetime" qualifiers="const">
 			<return type="float">
 			</return>
-			<argument index="0" name="param" type="int">
-			</argument>
 			<description>
-			Returns the value of the specified emitter parameter
+				Gets the amount of seconds that each particle will be visible.
 			</description>
 		</method>
-		<method name="set_randomness">
+		<method name="get_param" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="param" type="int">
 			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
 			<description>
-			Sets the randomness value of the specified emitter parameter (see the constants secction for the list of parameters), 0 means no randomness, so every particle will have the parameters specified, 1 means that the parameter will be choosen at random, the closer the randomness value gets to 0 the more conservative the variation of the parameter will be.
+				Returns the value of the specified emitter parameter
 			</description>
 		</method>
-		<method name="get_randomness" qualifiers="const">
+		<method name="get_pre_process_time" qualifiers="const">
 			<return type="float">
 			</return>
-			<argument index="0" name="param" type="int">
-			</argument>
 			<description>
-			Returns the randomness value of the specified emitter parameter
 			</description>
 		</method>
-		<method name="set_texture">
-			<return type="Texture">
+		<method name="get_randomness" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="texture" type="Object">
+			<argument index="0" name="param" type="int">
 			</argument>
 			<description>
-			Sets the texture for each particle
+				Returns the randomness value of the specified emitter parameter
 			</description>
 		</method>
 		<method name="get_texture" qualifiers="const">
 			<return type="Texture">
 			</return>
 			<description>
-			Returns the texture for emitted particles
+				Returns the texture for emitted particles
 			</description>
 		</method>
-		<method name="set_color">
-			<argument index="0" name="color" type="Color">
-			</argument>
+		<method name="get_time_scale" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the tint color for each particle.
+				Returns the emitter time scale
 			</description>
 		</method>
-		<method name="get_color" qualifiers="const">
-			<return type="Color">
+		<method name="get_v_frames" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Returns the tint color for each particle.
 			</description>
 		</method>
-		<method name="set_color_ramp">
-			<return type="ColorRamp">
+		<method name="is_emitting" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="color_ramp" type="Object">
-			</argument>
 			<description>
-			Sets the [ColorRamp] used to tint each particle. Particle will be tinted according to their lifetimes.
+				Returns whether this emitter is currently emitting or not
 			</description>
 		</method>
-		<method name="get_color_ramp" qualifiers="const">
-			<return type="ColorRamp">
+		<method name="is_flipped_h" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Returns the [ColorRamp] used to tint each particle
 			</description>
 		</method>
-		<method name="set_emissor_offset">
-			<argument index="0" name="offset" type="Vector2">
-			</argument>
+		<method name="is_flipped_v" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Sets the particle spawn origin position relative to the emitter center. for example if this value is set to (50, 50), the particle will spawn 50 units to the right and  50 units to the bottom of the emitter center.
 			</description>
 		</method>
-		<method name="get_emissor_offset" qualifiers="const">
-			<return type="Vector2">
+		<method name="is_using_local_space" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Returns the particle spawn origin position relative to the emitter.
 			</description>
 		</method>
-		<method name="set_flip_h">
-			<argument index="0" name="enable" type="bool">
+		<method name="pre_process">
+			<argument index="0" name="time" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_flipped_h" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="reset">
 			<description>
 			</description>
 		</method>
-		<method name="set_flip_v">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_amount">
+			<argument index="0" name="amount" type="int">
 			</argument>
 			<description>
+				Sets the amount of particles spawned at each emission
 			</description>
 		</method>
-		<method name="is_flipped_v" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_color">
+			<argument index="0" name="color" type="Color">
+			</argument>
 			<description>
+				Set the tint color for each particle.
 			</description>
 		</method>
-		<method name="set_h_frames">
-			<argument index="0" name="enable" type="int">
+		<method name="set_color_phase_color">
+			<argument index="0" name="phase" type="int">
+			</argument>
+			<argument index="1" name="color" type="Color">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_h_frames" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_color_phase_pos">
+			<argument index="0" name="phase" type="int">
+			</argument>
+			<argument index="1" name="pos" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_v_frames">
-			<argument index="0" name="enable" type="int">
+		<method name="set_color_phases">
+			<argument index="0" name="phases" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_v_frames" qualifiers="const">
-			<return type="int">
+		<method name="set_color_ramp">
+			<return type="ColorRamp">
 			</return>
+			<argument index="0" name="color_ramp" type="Object">
+			</argument>
 			<description>
+				Sets the [ColorRamp] used to tint each particle. Particle will be tinted according to their lifetimes.
 			</description>
 		</method>
 		<method name="set_emission_half_extents">
 			<argument index="0" name="extents" type="Vector2">
 			</argument>
 			<description>
-			Sets the half extents of the emission box, particles will be spawned at random inside this box.
+				Sets the half extents of the emission box, particles will be spawned at random inside this box.
 			</description>
 		</method>
-		<method name="get_emission_half_extents" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_emission_points">
+			<argument index="0" name="points" type="Vector2Array">
+			</argument>
 			<description>
-			Returns the half extents of the emission box.
 			</description>
 		</method>
-		<method name="set_color_phases">
-			<argument index="0" name="phases" type="int">
+		<method name="set_emissor_offset">
+			<argument index="0" name="offset" type="Vector2">
 			</argument>
 			<description>
+				Sets the particle spawn origin position relative to the emitter center. for example if this value is set to (50, 50), the particle will spawn 50 units to the right and  50 units to the bottom of the emitter center.
 			</description>
 		</method>
-		<method name="get_color_phases" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_emit_timeout">
+			<argument index="0" name="value" type="float">
+			</argument>
 			<description>
+				Sets the amount of seconds during which the emitter will spawn particles, after the specified seconds the emitter state will be set to non emitting, so calling [method is_emitting] will return false. If the timeout is 0 the emitter will spawn forever.
 			</description>
 		</method>
-		<method name="set_color_phase_color">
-			<argument index="0" name="phase" type="int">
-			</argument>
-			<argument index="1" name="color" type="Color">
+		<method name="set_emitting">
+			<argument index="0" name="active" type="bool">
 			</argument>
 			<description>
+				If this is set to true then the particle emitter will emit particles, if its false it will not.
 			</description>
 		</method>
-		<method name="get_color_phase_color" qualifiers="const">
-			<return type="Color">
-			</return>
-			<argument index="0" name="phase" type="int">
+		<method name="set_explosiveness">
+			<argument index="0" name="amount" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_color_phase_pos">
-			<argument index="0" name="phase" type="int">
-			</argument>
-			<argument index="1" name="pos" type="float">
+		<method name="set_flip_h">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_color_phase_pos" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="phase" type="int">
+		<method name="set_flip_v">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="pre_process">
-			<argument index="0" name="time" type="float">
+		<method name="set_h_frames">
+			<argument index="0" name="enable" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="reset">
+		<method name="set_initial_velocity">
+			<argument index="0" name="velocity" type="Vector2">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_use_local_space">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_lifetime">
+			<argument index="0" name="lifetime" type="float">
 			</argument>
 			<description>
+				Sets the amount of seconds that each particle will be visible.
 			</description>
 		</method>
-		<method name="is_using_local_space" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_param">
+			<argument index="0" name="param" type="int">
+			</argument>
+			<argument index="1" name="value" type="float">
+			</argument>
 			<description>
+				Sets the value of the specified emitter parameter (see the constants secction for the list of parameters)
 			</description>
 		</method>
-		<method name="set_initial_velocity">
-			<argument index="0" name="velocity" type="Vector2">
+		<method name="set_pre_process_time">
+			<argument index="0" name="time" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_initial_velocity" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_randomness">
+			<argument index="0" name="param" type="int">
+			</argument>
+			<argument index="1" name="value" type="float">
+			</argument>
 			<description>
+				Sets the randomness value of the specified emitter parameter (see the constants secction for the list of parameters), 0 means no randomness, so every particle will have the parameters specified, 1 means that the parameter will be choosen at random, the closer the randomness value gets to 0 the more conservative the variation of the parameter will be.
 			</description>
 		</method>
-		<method name="set_explosiveness">
-			<argument index="0" name="amount" type="float">
+		<method name="set_texture">
+			<return type="Texture">
+			</return>
+			<argument index="0" name="texture" type="Object">
 			</argument>
 			<description>
+				Sets the texture for each particle
 			</description>
 		</method>
-		<method name="get_explosiveness" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_time_scale">
+			<argument index="0" name="time_scale" type="float">
+			</argument>
 			<description>
+				Sets the increment or decrement for the particle lifetime. for example: if the time scale is set to 2, the particles will die and move twice as fast.
 			</description>
 		</method>
-		<method name="set_emission_points">
-			<argument index="0" name="points" type="Vector2Array">
+		<method name="set_use_local_space">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_emission_points" qualifiers="const">
-			<return type="Vector2Array">
-			</return>
+		<method name="set_v_frames">
+			<argument index="0" name="enable" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -24623,94 +24902,100 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 	<description>
 	</description>
 	<methods>
-		<method name="set_texture">
-			<argument index="0" name="texture" type="Object">
-			</argument>
+		<method name="get_draw_center" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_texture" qualifiers="const">
-			<return type="Object">
+		<method name="get_modulate" qualifiers="const">
+			<return type="Color">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_modulate">
-			<argument index="0" name="modulate" type="Color">
+		<method name="get_patch_margin" qualifiers="const">
+			<return type="int">
+			</return>
+			<argument index="0" name="margin" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_modulate" qualifiers="const">
-			<return type="Color">
+		<method name="get_region_rect" qualifiers="const">
+			<return type="Rect2">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_patch_margin">
-			<argument index="0" name="margin" type="int">
-			</argument>
-			<argument index="1" name="value" type="int">
-			</argument>
+		<method name="get_texture" qualifiers="const">
+			<return type="Object">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_patch_margin" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="margin" type="int">
+		<method name="set_draw_center">
+			<argument index="0" name="draw_center" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_region_rect">
-			<argument index="0" name="rect" type="Rect2">
+		<method name="set_modulate">
+			<argument index="0" name="modulate" type="Color">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_region_rect" qualifiers="const">
-			<return type="Rect2">
-			</return>
+		<method name="set_patch_margin">
+			<argument index="0" name="margin" type="int">
+			</argument>
+			<argument index="1" name="value" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_draw_center">
-			<argument index="0" name="draw_center" type="bool">
+		<method name="set_region_rect">
+			<argument index="0" name="rect" type="Rect2">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_draw_center" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_texture">
+			<argument index="0" name="texture" type="Object">
+			</argument>
 			<description>
 			</description>
 		</method>
 	</methods>
+	<signals>
+		<signal name="texture_changed">
+			<description>
+			</description>
+		</signal>
+	</signals>
 	<constants>
 	</constants>
 </class>
 <class name="Path" inherits="Spatial" category="Core">
 	<brief_description>
-	Container for a [Curve3D].
+		Container for a [Curve3D].
 	</brief_description>
 	<description>
-	This class is a container/Node-ification of a [Curve3D], so it can have [Spatial] properties and [Node] info.
+		This class is a container/Node-ification of a [Curve3D], so it can have [Spatial] properties and [Node] info.
 	</description>
 	<methods>
-		<method name="set_curve">
-			<argument index="0" name="curve" type="Curve3D">
-			</argument>
-			<description>
-			Sets the [Curve3D].
-			</description>
-		</method>
 		<method name="get_curve" qualifiers="const">
 			<return type="Curve3D">
 			</return>
 			<description>
-			Returns the [Curve3D] contained.
+				Returns the [Curve3D] contained.
+			</description>
+		</method>
+		<method name="set_curve">
+			<argument index="0" name="curve" type="Curve3D">
+			</argument>
+			<description>
+				Sets the [Curve3D].
 			</description>
 		</method>
 	</methods>
@@ -24719,24 +25004,24 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="Path2D" inherits="Node2D" category="Core">
 	<brief_description>
-	Container for a [Curve2D].
+		Container for a [Curve2D].
 	</brief_description>
 	<description>
-	This class is a container/Node-ification of a [Curve2D], so it can have [Node2D] properties and [Node] info.
+		This class is a container/Node-ification of a [Curve2D], so it can have [Node2D] properties and [Node] info.
 	</description>
 	<methods>
-		<method name="set_curve">
-			<argument index="0" name="curve" type="Curve2D">
-			</argument>
-			<description>
-			Sets the [Curve2D].
-			</description>
-		</method>
 		<method name="get_curve" qualifiers="const">
 			<return type="Curve2D">
 			</return>
 			<description>
-			Returns the [Curve2D] contained.
+				Returns the [Curve2D] contained.
+			</description>
+		</method>
+		<method name="set_curve">
+			<argument index="0" name="curve" type="Curve2D">
+			</argument>
+			<description>
+				Sets the [Curve2D].
 			</description>
 		</method>
 	</methods>
@@ -24745,112 +25030,112 @@ Example: (content-length:12), (Content-Type:application/json; charset=UTF-8)
 </class>
 <class name="PathFollow" inherits="Spatial" category="Core">
 	<brief_description>
-	Point sampler for a [Path].
+		Point sampler for a [Path].
 	</brief_description>
 	<description>
-	This node takes its parent [Path], and returns the coordinates of a point within it, given a distance from the first vertex.
-It is useful for making other nodes follow a path, without coding the movement pattern. For that, the nodes must be descendants of this node. Then, when setting an offset in this node, the descendant nodes will move accordingly.
+		This node takes its parent [Path], and returns the coordinates of a point within it, given a distance from the first vertex.
+		It is useful for making other nodes follow a path, without coding the movement pattern. For that, the nodes must be descendants of this node. Then, when setting an offset in this node, the descendant nodes will move accordingly.
 	</description>
 	<methods>
-		<method name="set_offset">
-			<argument index="0" name="offset" type="float">
-			</argument>
+		<method name="get_cubic_interpolation" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Sets the distance from the first vertex, measured in 3D units along the path. This sets this node's position to a point within the path.
+				This method returns whether the position between two cached points (see [method set_cubic_interpolation]) is interpolated linearly, or cubicly.
 			</description>
 		</method>
-		<method name="get_offset" qualifiers="const">
+		<method name="get_h_offset" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Returns the distance along the path in 3D units.
+				Returns the X displacement this node has from its parent [Path].
 			</description>
 		</method>
-		<method name="set_h_offset">
-			<argument index="0" name="h_offset" type="float">
-			</argument>
+		<method name="get_offset" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Moves this node in the X axis. As this node's position will be set every time its offset is set, this allows many PathFollow to share the same curve (and thus the same movement pattern), yet not return the same position for a given path offset.
-A similar effect may be achieved moving the this node's descendants.
+				Returns the distance along the path in 3D units.
 			</description>
 		</method>
-		<method name="get_h_offset" qualifiers="const">
-			<return type="float">
+		<method name="get_rotation_mode" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Returns the X displacement this node has from its parent [Path].
+				Returns the rotation mode. The constants below list which axes are allowed to rotate for each mode.
 			</description>
 		</method>
-		<method name="set_v_offset">
-			<argument index="0" name="v_offset" type="float">
-			</argument>
+		<method name="get_unit_offset" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Moves this node in the Y axis, for the same reasons of [method set_h_offset].
+				Returns the distance along the path as a number in the range 0.0 (for the first vertex) to 1.0 (for the last).
 			</description>
 		</method>
 		<method name="get_v_offset" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Returns the Y displacement this node has from its parent [Path].
+				Returns the Y displacement this node has from its parent [Path].
 			</description>
 		</method>
-		<method name="set_unit_offset">
-			<argument index="0" name="unit_offset" type="float">
-			</argument>
+		<method name="has_loop" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Sets the distance from the first vertex, considering 0.0 as the first vertex and 1.0 as the last. This is just another way of expressing the offset within the path, as the offset supplied is multiplied internally by the path's length.
+				Returns whether this node wraps its offsets around, or truncates them to the path ends.
 			</description>
 		</method>
-		<method name="get_unit_offset" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_cubic_interpolation">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Returns the distance along the path as a number in the range 0.0 (for the first vertex) to 1.0 (for the last).
+				The points along the [Curve3D] of the [Path] are precomputed before use, for faster calculations. The point at the requested offset is then calculated interpolating between two adjacent cached points. This may present a problem if the curve makes sharp turns, as the cached points may not follow the curve closely enough.
+				There are two answers to this problem: Either increase the number of cached points and increase memory consumption, or make a cubic interpolation between two points at the cost of (slightly) slower calculations.
+				This method controls whether the position between two cached points is interpolated linearly, or cubicly.
 			</description>
 		</method>
-		<method name="set_rotation_mode">
-			<argument index="0" name="rotation_mode" type="int">
+		<method name="set_h_offset">
+			<argument index="0" name="h_offset" type="float">
 			</argument>
 			<description>
-			Allows or forbids rotation on one or more axes, per the constants below.
+				Moves this node in the X axis. As this node's position will be set every time its offset is set, this allows many PathFollow to share the same curve (and thus the same movement pattern), yet not return the same position for a given path offset.
+				A similar effect may be achieved moving the this node's descendants.
 			</description>
 		</method>
-		<method name="get_rotation_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_loop">
+			<argument index="0" name="loop" type="bool">
+			</argument>
 			<description>
-			Returns the rotation mode. The constants below list which axes are allowed to rotate for each mode.
+				If set, any offset outside the path's length (whether set by [method set_offset] or [method set_unit_offset] will wrap around, instead of stopping at the ends. Set it for cyclic paths.
 			</description>
 		</method>
-		<method name="set_cubic_interpolation">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_offset">
+			<argument index="0" name="offset" type="float">
 			</argument>
 			<description>
-			The points along the [Curve3D] of the [Path] are precomputed before use, for faster calculations. The point at the requested offset is then calculated interpolating between two adjacent cached points. This may present a problem if the curve makes sharp turns, as the cached points may not follow the curve closely enough.
-There are two answers to this problem: Either increase the number of cached points and increase memory consumption, or make a cubic interpolation between two points at the cost of (slightly) slower calculations.
-This method controls whether the position between two cached points is interpolated linearly, or cubicly.
+				Sets the distance from the first vertex, measured in 3D units along the path. This sets this node's position to a point within the path.
 			</description>
 		</method>
-		<method name="get_cubic_interpolation" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_rotation_mode">
+			<argument index="0" name="rotation_mode" type="int">
+			</argument>
 			<description>
-			This method returns whether the position between two cached points (see [method set_cubic_interpolation]) is interpolated linearly, or cubicly.
+				Allows or forbids rotation on one or more axes, per the constants below.
 			</description>
 		</method>
-		<method name="set_loop">
-			<argument index="0" name="loop" type="bool">
+		<method name="set_unit_offset">
+			<argument index="0" name="unit_offset" type="float">
 			</argument>
 			<description>
-			If set, any offset outside the path's length (whether set by [method set_offset] or [method set_unit_offset] will wrap around, instead of stopping at the ends. Set it for cyclic paths.
+				Sets the distance from the first vertex, considering 0.0 as the first vertex and 1.0 as the last. This is just another way of expressing the offset within the path, as the offset supplied is multiplied internally by the path's length.
 			</description>
 		</method>
-		<method name="has_loop" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_v_offset">
+			<argument index="0" name="v_offset" type="float">
+			</argument>
 			<description>
-			Returns whether this node wraps its offsets around, or truncates them to the path ends.
+				Moves this node in the Y axis, for the same reasons of [method set_h_offset].
 			</description>
 		</method>
 	</methods>
@@ -24871,112 +25156,112 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="PathFollow2D" inherits="Node2D" category="Core">
 	<brief_description>
-	Point sampler for a [Path2D].
+		Point sampler for a [Path2D].
 	</brief_description>
 	<description>
-	This node takes its parent [Path2D], and returns the coordinates of a point within it, given a distance from the first vertex.
-It is useful for making other nodes follow a path, without coding the movement pattern. For that, the nodes must be descendants of this node. Then, when setting an offset in this node, the descendant nodes will move accordingly.
+		This node takes its parent [Path2D], and returns the coordinates of a point within it, given a distance from the first vertex.
+		It is useful for making other nodes follow a path, without coding the movement pattern. For that, the nodes must be descendants of this node. Then, when setting an offset in this node, the descendant nodes will move accordingly.
 	</description>
 	<methods>
-		<method name="set_offset">
-			<argument index="0" name="offset" type="float">
-			</argument>
+		<method name="get_cubic_interpolation" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Sets the distance from the first vertex, measured in pixels along the path. This sets this node's position to a point within the path.
+				This method returns whether the position between two cached points (see [method set_cubic_interpolation]) is interpolated linearly, or cubicly.
 			</description>
 		</method>
-		<method name="get_offset" qualifiers="const">
+		<method name="get_h_offset" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Returns the distance along the path in pixels.
+				Returns the horizontal displacement this node has from its parent [Path2D].
 			</description>
 		</method>
-		<method name="set_h_offset">
-			<argument index="0" name="h_offset" type="float">
-			</argument>
-			<description>
-			Moves this node horizontally. As this node's position will be set every time its offset is set, this allows many PathFollow2D to share the same curve (and thus the same movement pattern), yet not return the same position for a given path offset.
-A similar effect may be achieved moving this node's descendants.
-			</description>
-		</method>
-		<method name="get_h_offset" qualifiers="const">
+		<method name="get_offset" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Returns the horizontal displacement this node has from its parent [Path2D].
+				Returns the distance along the path in pixels.
 			</description>
 		</method>
-		<method name="set_v_offset">
-			<argument index="0" name="v_offset" type="float">
-			</argument>
+		<method name="get_unit_offset" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Moves the PathFollow2D vertically, for the same reasons of [method set_h_offset].
+				Returns the distance along the path as a number in the range 0.0 (for the first vertex) to 1.0 (for the last).
 			</description>
 		</method>
 		<method name="get_v_offset" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Returns the vertical displacement this node has from its parent [Path2D].
+				Returns the vertical displacement this node has from its parent [Path2D].
 			</description>
 		</method>
-		<method name="set_unit_offset">
-			<argument index="0" name="unit_offset" type="float">
-			</argument>
+		<method name="has_loop" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Sets the distance from the first vertex, considering 0.0 as the first vertex and 1.0 as the last. This is just another way of expressing the offset within the path, as the offset supplied is multiplied internally by the path's length.
+				Returns whether this node wraps its offsets around, or truncates them to the path ends.
 			</description>
 		</method>
-		<method name="get_unit_offset" qualifiers="const">
-			<return type="float">
+		<method name="is_rotating" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Returns the distance along the path as a number in the range 0.0 (for the first vertex) to 1.0 (for the last).
+				Returns whether this node rotates to follow the path.
 			</description>
 		</method>
-		<method name="set_rotate">
+		<method name="set_cubic_interpolation">
 			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			If set, this node rotates to follow the path, making its descendants rotate.
+				The points along the [Curve2D] of the [Path2D] are precomputed before use, for faster calculations. The point at the requested offset is then calculated interpolating between two adjacent cached points. This may present a problem if the curve makes sharp turns, as the cached points may not follow the curve closely enough.
+				There are two answers to this problem: Either increase the number of cached points and increase memory consumption, or make a cubic interpolation between two points at the cost of (slightly) slower calculations.
+				This method controls whether the position between two cached points is interpolated linearly, or cubicly.
 			</description>
 		</method>
-		<method name="is_rotating" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_h_offset">
+			<argument index="0" name="h_offset" type="float">
+			</argument>
 			<description>
-			Returns whether this node rotates to follow the path.
+				Moves this node horizontally. As this node's position will be set every time its offset is set, this allows many PathFollow2D to share the same curve (and thus the same movement pattern), yet not return the same position for a given path offset.
+				A similar effect may be achieved moving this node's descendants.
 			</description>
 		</method>
-		<method name="set_cubic_interpolation">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_loop">
+			<argument index="0" name="loop" type="bool">
 			</argument>
 			<description>
-			The points along the [Curve2D] of the [Path2D] are precomputed before use, for faster calculations. The point at the requested offset is then calculated interpolating between two adjacent cached points. This may present a problem if the curve makes sharp turns, as the cached points may not follow the curve closely enough.
-There are two answers to this problem: Either increase the number of cached points and increase memory consumption, or make a cubic interpolation between two points at the cost of (slightly) slower calculations.
-This method controls whether the position between two cached points is interpolated linearly, or cubicly.
+				If set, any offset outside the path's length (whether set by [method set_offset] or [method set_unit_offset] will wrap around, instead of stopping at the ends. Set it for cyclic paths.
 			</description>
 		</method>
-		<method name="get_cubic_interpolation" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_offset">
+			<argument index="0" name="offset" type="float">
+			</argument>
 			<description>
-			This method returns whether the position between two cached points (see [method set_cubic_interpolation]) is interpolated linearly, or cubicly.
+				Sets the distance from the first vertex, measured in pixels along the path. This sets this node's position to a point within the path.
 			</description>
 		</method>
-		<method name="set_loop">
-			<argument index="0" name="loop" type="bool">
+		<method name="set_rotate">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			If set, any offset outside the path's length (whether set by [method set_offset] or [method set_unit_offset] will wrap around, instead of stopping at the ends. Set it for cyclic paths.
+				If set, this node rotates to follow the path, making its descendants rotate.
 			</description>
 		</method>
-		<method name="has_loop" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_unit_offset">
+			<argument index="0" name="unit_offset" type="float">
+			</argument>
+			<description>
+				Sets the distance from the first vertex, considering 0.0 as the first vertex and 1.0 as the last. This is just another way of expressing the offset within the path, as the offset supplied is multiplied internally by the path's length.
+			</description>
+		</method>
+		<method name="set_v_offset">
+			<argument index="0" name="v_offset" type="float">
+			</argument>
 			<description>
-			Returns whether this node wraps its offsets around, or truncates them to the path ends.
+				Moves the PathFollow2D vertically, for the same reasons of [method set_h_offset].
 			</description>
 		</method>
 	</methods>
@@ -24985,10 +25270,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="PathRemap" inherits="Object" category="Core">
 	<brief_description>
-	Singleton containing the list of remapped resources.
+		Singleton containing the list of remapped resources.
 	</brief_description>
 	<description>
-	When exporting, the types of some resources may change internally so they are converted to more optimized versions. While it's not usually necessary to access to this directly (path remapping happens automatically when opening a file), it's exported just for information.
+		When exporting, the types of some resources may change internally so they are converted to more optimized versions. While it's not usually necessary to access to this directly (path remapping happens automatically when opening a file), it's exported just for information.
 	</description>
 	<methods>
 		<method name="add_remap">
@@ -24999,16 +25284,19 @@ This method controls whether the position between two cached points is interpola
 			<argument index="2" name="locale" type="String" default="&quot;&quot;">
 			</argument>
 			<description>
-			Add a remap from a file to another.
+				Add a remap from a file to another.
 			</description>
 		</method>
-		<method name="has_remap" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="clear_remaps">
+			<description>
+				Clear all remaps.
+			</description>
+		</method>
+		<method name="erase_remap">
 			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
-			Return true if a file is being remapped.
+				Erase a remap.
 			</description>
 		</method>
 		<method name="get_remap" qualifiers="const">
@@ -25017,19 +25305,16 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
-			Return the remapped new path of a file.
+				Return the remapped new path of a file.
 			</description>
 		</method>
-		<method name="erase_remap">
+		<method name="has_remap" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
-			Erase a remap.
-			</description>
-		</method>
-		<method name="clear_remaps">
-			<description>
-			Clear all remaps.
+				Return true if a file is being remapped.
 			</description>
 		</method>
 	</methods>
@@ -25112,126 +25397,105 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Physics2DDirectBodyState" inherits="Object" category="Core">
 	<brief_description>
-	Direct access object to a physics body in the [Physics2DServer].
+		Direct access object to a physics body in the [Physics2DServer].
 	</brief_description>
 	<description>
-	Direct access object to a physics body in the [Physics2DServer]. This object is passed via the direct state callback of rigid/character bodies, and is intended for changing the direct state of that body.
+		Direct access object to a physics body in the [Physics2DServer]. This object is passed via the direct state callback of rigid/character bodies, and is intended for changing the direct state of that body.
 	</description>
 	<methods>
-		<method name="get_total_gravity" qualifiers="const">
-			<return type="Vector2">
-			</return>
-			<description>
-			Return the total gravity vector being currently applied to this body.
-			</description>
-		</method>
-		<method name="get_total_linear_damp" qualifiers="const">
+		<method name="get_angular_velocity" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the rate at which the body stops moving, if there are not any other forces moving it.
+				Return the angular velocity of the body.
 			</description>
 		</method>
-		<method name="get_total_angular_damp" qualifiers="const">
-			<return type="float">
+		<method name="get_contact_collider" qualifiers="const">
+			<return type="RID">
 			</return>
+			<argument index="0" name="contact_idx" type="int">
+			</argument>
 			<description>
-			Return the rate at which the body stops rotating, if there are not any other forces moving it.
+				Return the [RID] of the collider.
 			</description>
 		</method>
-		<method name="get_inverse_mass" qualifiers="const">
-			<return type="float">
+		<method name="get_contact_collider_id" qualifiers="const">
+			<return type="int">
 			</return>
+			<argument index="0" name="contact_idx" type="int">
+			</argument>
 			<description>
-			Return the inverse of the mass of the body.
+				Return the object id of the collider.
 			</description>
 		</method>
-		<method name="get_inverse_inertia" qualifiers="const">
-			<return type="float">
+		<method name="get_contact_collider_object" qualifiers="const">
+			<return type="Object">
 			</return>
-			<description>
-			Return the inverse of the inertia of the body.
-			</description>
-		</method>
-		<method name="set_linear_velocity">
-			<argument index="0" name="velocity" type="Vector2">
+			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
-			Change the linear velocity of the body.
+				Return the collider object, this depends on how it was created (will return a scene node if such was used to create it).
 			</description>
 		</method>
-		<method name="get_linear_velocity" qualifiers="const">
+		<method name="get_contact_collider_pos" qualifiers="const">
 			<return type="Vector2">
 			</return>
-			<description>
-			Return the current linear velocity of the body.
-			</description>
-		</method>
-		<method name="set_angular_velocity">
-			<argument index="0" name="velocity" type="float">
+			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
-			Change the angular velocity of the body.
+				Return the contact position in the collider.
 			</description>
 		</method>
-		<method name="get_angular_velocity" qualifiers="const">
-			<return type="float">
+		<method name="get_contact_collider_shape" qualifiers="const">
+			<return type="int">
 			</return>
-			<description>
-			Return the angular velocity of the body.
-			</description>
-		</method>
-		<method name="set_transform">
-			<argument index="0" name="transform" type="Matrix32">
+			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
-			Change the transform matrix of the body.
+				Return the collider shape index.
 			</description>
 		</method>
-		<method name="get_transform" qualifiers="const">
-			<return type="Matrix32">
+		<method name="get_contact_collider_shape_metadata" qualifiers="const">
+			<return type="Variant">
 			</return>
-			<description>
-			Return the transform matrix of the body.
-			</description>
-		</method>
-		<method name="set_sleep_state">
-			<argument index="0" name="enabled" type="bool">
+			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
-			Set the sleeping state of the body, only affects character/rigid bodies.
+				Return the metadata of the collided shape. This metadata is different from [method Object.get_meta], and is set with [method Physics2DServer.shape_set_data].
 			</description>
 		</method>
-		<method name="is_sleeping" qualifiers="const">
-			<return type="bool">
+		<method name="get_contact_collider_velocity_at_pos" qualifiers="const">
+			<return type="Vector2">
 			</return>
+			<argument index="0" name="contact_idx" type="int">
+			</argument>
 			<description>
-			Return true if this body is currently sleeping (not active).
+				Return the linear velocity vector at contact point of the collider.
 			</description>
 		</method>
 		<method name="get_contact_count" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the amount of contacts this body has with other bodies. Note that by default this returns 0 unless bodies are configured to log contacts.
+				Return the amount of contacts this body has with other bodies. Note that by default this returns 0 unless bodies are configured to log contacts.
 			</description>
 		</method>
-		<method name="get_contact_local_pos" qualifiers="const">
+		<method name="get_contact_local_normal" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
-			Return the local position (of this body) of the contact point.
+				Return the local normal (of this body) of the contact point.
 			</description>
 		</method>
-		<method name="get_contact_local_normal" qualifiers="const">
+		<method name="get_contact_local_pos" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
-			Return the local normal (of this body) of the contact point.
+				Return the local position (of this body) of the contact point.
 			</description>
 		</method>
 		<method name="get_contact_local_shape" qualifiers="const">
@@ -25240,89 +25504,110 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
-			Return the local shape index of the collision.
+				Return the local shape index of the collision.
 			</description>
 		</method>
-		<method name="get_contact_collider" qualifiers="const">
-			<return type="RID">
+		<method name="get_inverse_inertia" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="contact_idx" type="int">
-			</argument>
 			<description>
-			Return the [RID] of the collider.
+				Return the inverse of the inertia of the body.
 			</description>
 		</method>
-		<method name="get_contact_collider_pos" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_inverse_mass" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="contact_idx" type="int">
-			</argument>
 			<description>
-			Return the contact position in the collider.
+				Return the inverse of the mass of the body.
 			</description>
 		</method>
-		<method name="get_contact_collider_id" qualifiers="const">
-			<return type="int">
+		<method name="get_linear_velocity" qualifiers="const">
+			<return type="Vector2">
 			</return>
-			<argument index="0" name="contact_idx" type="int">
-			</argument>
 			<description>
-			Return the object id of the collider.
+				Return the current linear velocity of the body.
 			</description>
 		</method>
-		<method name="get_contact_collider_object" qualifiers="const">
-			<return type="Object">
+		<method name="get_space_state">
+			<return type="Physics2DDirectSpaceState">
 			</return>
-			<argument index="0" name="contact_idx" type="int">
-			</argument>
 			<description>
-			Return the collider object, this depends on how it was created (will return a scene node if such was used to create it).
+				Return the current state of space, useful for queries.
 			</description>
 		</method>
-		<method name="get_contact_collider_shape" qualifiers="const">
-			<return type="int">
+		<method name="get_step" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="contact_idx" type="int">
-			</argument>
 			<description>
-			Return the collider shape index.
+				Return the timestep (delta) used for the simulation.
 			</description>
 		</method>
-		<method name="get_contact_collider_shape_metadata" qualifiers="const">
-			<return type="Variant">
+		<method name="get_total_angular_damp" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="contact_idx" type="int">
-			</argument>
 			<description>
-			Return the metadata of the collided shape. This metadata is different from [method Object.get_meta], and is set with [method Physics2DServer.shape_set_data].
+				Return the rate at which the body stops rotating, if there are not any other forces moving it.
 			</description>
 		</method>
-		<method name="get_contact_collider_velocity_at_pos" qualifiers="const">
+		<method name="get_total_gravity" qualifiers="const">
 			<return type="Vector2">
 			</return>
-			<argument index="0" name="contact_idx" type="int">
-			</argument>
 			<description>
-			Return the linear velocity vector at contact point of the collider.
+				Return the total gravity vector being currently applied to this body.
 			</description>
 		</method>
-		<method name="get_step" qualifiers="const">
+		<method name="get_total_linear_damp" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the timestep (delta) used for the simulation.
+				Return the rate at which the body stops moving, if there are not any other forces moving it.
+			</description>
+		</method>
+		<method name="get_transform" qualifiers="const">
+			<return type="Matrix32">
+			</return>
+			<description>
+				Return the transform matrix of the body.
 			</description>
 		</method>
 		<method name="integrate_forces">
 			<description>
-			Call the built-in force integration code.
+				Call the built-in force integration code.
 			</description>
 		</method>
-		<method name="get_space_state">
-			<return type="Physics2DDirectSpaceState">
+		<method name="is_sleeping" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the current state of space, useful for queries.
+				Return true if this body is currently sleeping (not active).
+			</description>
+		</method>
+		<method name="set_angular_velocity">
+			<argument index="0" name="velocity" type="float">
+			</argument>
+			<description>
+				Change the angular velocity of the body.
+			</description>
+		</method>
+		<method name="set_linear_velocity">
+			<argument index="0" name="velocity" type="Vector2">
+			</argument>
+			<description>
+				Change the linear velocity of the body.
+			</description>
+		</method>
+		<method name="set_sleep_state">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
+			<description>
+				Set the sleeping state of the body, only affects character/rigid bodies.
+			</description>
+		</method>
+		<method name="set_transform">
+			<argument index="0" name="transform" type="Matrix32">
+			</argument>
+			<description>
+				Change the transform matrix of the body.
 			</description>
 		</method>
 	</methods>
@@ -25331,10 +25616,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Physics2DDirectBodyStateSW" inherits="Physics2DDirectBodyState" category="Core">
 	<brief_description>
-	Software implementation of [Physics2DDirectBodyState].
+		Software implementation of [Physics2DDirectBodyState].
 	</brief_description>
 	<description>
-	Software implementation of [Physics2DDirectBodyState]. This object exposes no new methods or properties and should not be used, as [Physics2DDirectBodyState] selects the best implementation available.
+		Software implementation of [Physics2DDirectBodyState]. This object exposes no new methods or properties and should not be used, as [Physics2DDirectBodyState] selects the best implementation available.
 	</description>
 	<methods>
 	</methods>
@@ -25343,12 +25628,51 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Physics2DDirectSpaceState" inherits="Object" category="Core">
 	<brief_description>
-	Direct access object to a space in the [Physics2DServer].
+		Direct access object to a space in the [Physics2DServer].
 	</brief_description>
 	<description>
-	Direct access object to a space in the [Physics2DServer]. It's used mainly to do queries against objects and areas residing in a given space.
+		Direct access object to a space in the [Physics2DServer]. It's used mainly to do queries against objects and areas residing in a given space.
 	</description>
 	<methods>
+		<method name="cast_motion">
+			<return type="Array">
+			</return>
+			<argument index="0" name="shape" type="Physics2DShapeQueryParameters">
+			</argument>
+			<description>
+				Check whether the shape can travel to a point. If it can, the method will return an array with two floats: The first is the distance the shape can move in that direction without colliding, and the second is the distance at which it will collide.
+	If the shape can not move, the array will be empty.
+			</description>
+		</method>
+		<method name="collide_shape">
+			<return type="Array">
+			</return>
+			<argument index="0" name="shape" type="Physics2DShapeQueryParameters">
+			</argument>
+			<argument index="1" name="max_results" type="int" default="32">
+			</argument>
+			<description>
+				Check the intersections of a shape, given through a [Physics2DShapeQueryParameters] object, against the space. The resulting array contains a list of points where the shape intersects another. Like with [method intersect_shape], the number of returned results can be limited to save processing time.
+			</description>
+		</method>
+		<method name="get_rest_info">
+			<return type="Dictionary">
+			</return>
+			<argument index="0" name="shape" type="Physics2DShapeQueryParameters">
+			</argument>
+			<description>
+				Check the intersections of a shape, given through a [Physics2DShapeQueryParameters] object, against the space. If it collides with more than a shape, the nearest one is selected. The returned object is a dictionary containing the following fields:
+				pointo: Place where the shapes intersect.
+				normal: Normal of the object at the point where the shapes intersect.
+				shape: Shape index within the object against which the shape intersected.
+				metadata: Metadata of the shape against which the shape intersected. This metadata is different from [method Object.get_meta], and is set with [method Physics2DServer.shape_set_data].
+				collider_id: Id of the object against which the shape intersected.
+				collider: Object against which the shape intersected.
+				rid: [RID] of the object against which the shape intersected.
+				linear_velocity: The movement vector of the object the shape intersected, if it was a body. If it was an area, it is (0,0).
+				If the shape did not intersect anything, then an empty dictionary (dir.empty()==true) is returned instead.
+			</description>
+		</method>
 		<method name="intersect_point">
 			<return type="Array">
 			</return>
@@ -25363,13 +25687,13 @@ This method controls whether the position between two cached points is interpola
 			<argument index="4" name="type_mask" type="int" default="15">
 			</argument>
 			<description>
-			Check whether a point is inside any shape. The shapes the point is inside of are returned in an array containing dictionaries with the following fields:
-		shape: Shape index within the object the point is in.
-		metadata: Metadata of the shape the point is in. This metadata is different from [method Object.get_meta], and is set with [method Physics2DServer.shape_set_data].
-		collider_id: Id of the object the point is in.
-		collider: Object the point is inside of.
-		rid: [RID] of the object the point is in.
-	Additionally, the method can take an array of objects or [RID]s that are to be excluded from collisions, a bitmask representing the physics layers to check in, and another bitmask for the types of objects to check (see TYPE_MASK_* constants).
+				Check whether a point is inside any shape. The shapes the point is inside of are returned in an array containing dictionaries with the following fields:
+				shape: Shape index within the object the point is in.
+				metadata: Metadata of the shape the point is in. This metadata is different from [method Object.get_meta], and is set with [method Physics2DServer.shape_set_data].
+				collider_id: Id of the object the point is in.
+				collider: Object the point is inside of.
+				rid: [RID] of the object the point is in.
+				Additionally, the method can take an array of objects or [RID]s that are to be excluded from collisions, a bitmask representing the physics layers to check in, and another bitmask for the types of objects to check (see TYPE_MASK_* constants).
 			</description>
 		</method>
 		<method name="intersect_ray">
@@ -25386,16 +25710,16 @@ This method controls whether the position between two cached points is interpola
 			<argument index="4" name="type_mask" type="int" default="15">
 			</argument>
 			<description>
-			Intersect a ray in a given space. The returned object is a dictionary with the following fields:
-		position: Place where ray is stopped.
-		normal: Normal of the object at the point where the ray was stopped.
-		shape: Shape index within the object against which the ray was stopped.
-		metadata: Metadata of the shape against which the ray was stopped. This metadata is different from [method Object.get_meta], and is set with [method Physics2DServer.shape_set_data].
-		collider_id: Id of the object against which the ray was stopped.
-		collider: Object against which the ray was stopped.
-		rid: [RID] of the object against which the ray was stopped.
-	If the ray did not intersect anything, then an empty dictionary (dir.empty()==true) is returned instead.
-	Additionally, the method can take an array of objects or [RID]s that are to be excluded from collisions, a bitmask representing the physics layers to check in, and another bitmask for the types of objects to check (see TYPE_MASK_* constants).
+				Intersect a ray in a given space. The returned object is a dictionary with the following fields:
+				position: Place where ray is stopped.
+				normal: Normal of the object at the point where the ray was stopped.
+				shape: Shape index within the object against which the ray was stopped.
+				metadata: Metadata of the shape against which the ray was stopped. This metadata is different from [method Object.get_meta], and is set with [method Physics2DServer.shape_set_data].
+				collider_id: Id of the object against which the ray was stopped.
+				collider: Object against which the ray was stopped.
+				rid: [RID] of the object against which the ray was stopped.
+				If the ray did not intersect anything, then an empty dictionary (dir.empty()==true) is returned instead.
+				Additionally, the method can take an array of objects or [RID]s that are to be excluded from collisions, a bitmask representing the physics layers to check in, and another bitmask for the types of objects to check (see TYPE_MASK_* constants).
 			</description>
 		</method>
 		<method name="intersect_shape">
@@ -25406,52 +25730,13 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="max_results" type="int" default="32">
 			</argument>
 			<description>
-			Check the intersections of a shape, given through a [Physics2DShapeQueryParameters] object, against the space. The intersected shapes are returned in an array containing dictionaries with the following fields:
-		shape: Shape index within the object the shape intersected.
-		metadata: Metadata of the shape intersected by the shape given through the [Physics2DShapeQueryParameters]. This metadata is different from [method Object.get_meta], and is set with [method Physics2DServer.shape_set_data].
-		collider_id: Id of the object the shape intersected.
-		collider: Object the shape intersected.
-		rid: [RID] of the object the shape intersected.
-	The number of intersections can be limited with the second paramater, to reduce the processing time.
-			</description>
-		</method>
-		<method name="cast_motion">
-			<return type="Array">
-			</return>
-			<argument index="0" name="shape" type="Physics2DShapeQueryParameters">
-			</argument>
-			<description>
-			Check whether the shape can travel to a point. If it can, the method will return an array with two floats: The first is the distance the shape can move in that direction without colliding, and the second is the distance at which it will collide.
-	If the shape can not move, the array will be empty.
-			</description>
-		</method>
-		<method name="collide_shape">
-			<return type="Array">
-			</return>
-			<argument index="0" name="shape" type="Physics2DShapeQueryParameters">
-			</argument>
-			<argument index="1" name="max_results" type="int" default="32">
-			</argument>
-			<description>
-			Check the intersections of a shape, given through a [Physics2DShapeQueryParameters] object, against the space. The resulting array contains a list of points where the shape intersects another. Like with [method intersect_shape], the number of returned results can be limited to save processing time.
-			</description>
-		</method>
-		<method name="get_rest_info">
-			<return type="Dictionary">
-			</return>
-			<argument index="0" name="shape" type="Physics2DShapeQueryParameters">
-			</argument>
-			<description>
-			Check the intersections of a shape, given through a [Physics2DShapeQueryParameters] object, against the space. If it collides with more than a shape, the nearest one is selected. The returned object is a dictionary containing the following fields:
-		pointo: Place where the shapes intersect.
-		normal: Normal of the object at the point where the shapes intersect.
-		shape: Shape index within the object against which the shape intersected.
-		metadata: Metadata of the shape against which the shape intersected. This metadata is different from [method Object.get_meta], and is set with [method Physics2DServer.shape_set_data].
-		collider_id: Id of the object against which the shape intersected.
-		collider: Object against which the shape intersected.
-		rid: [RID] of the object against which the shape intersected.
-		linear_velocity: The movement vector of the object the shape intersected, if it was a body. If it was an area, it is (0,0).
-	If the shape did not intersect anything, then an empty dictionary (dir.empty()==true) is returned instead.
+				Check the intersections of a shape, given through a [Physics2DShapeQueryParameters] object, against the space. The intersected shapes are returned in an array containing dictionaries with the following fields:
+				shape: Shape index within the object the shape intersected.
+				metadata: Metadata of the shape intersected by the shape given through the [Physics2DShapeQueryParameters]. This metadata is different from [method Object.get_meta], and is set with [method Physics2DServer.shape_set_data].
+				collider_id: Id of the object the shape intersected.
+				collider: Object the shape intersected.
+				rid: [RID] of the object the shape intersected.
+				The number of intersections can be limited with the second paramater, to reduce the processing time.
 			</description>
 		</method>
 	</methods>
@@ -25478,116 +25763,93 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Physics2DServer" inherits="Object" category="Core">
 	<brief_description>
-	Physics 2D Server.
+		Physics 2D Server.
 	</brief_description>
 	<description>
-	Physics 2D Server is the server responsible for all 2D physics. It can create many kinds of physics objects, but does not insert them on the node tree.
+		Physics 2D Server is the server responsible for all 2D physics. It can create many kinds of physics objects, but does not insert them on the node tree.
 	</description>
 	<methods>
-		<method name="shape_create">
-			<return type="RID">
-			</return>
-			<argument index="0" name="type" type="int">
+		<method name="area_add_shape">
+			<argument index="0" name="area" type="RID">
 			</argument>
-			<description>
-			Create a shape of type SHAPE_*. Does not assign it to a body or an area. To do so, you must use [method area_set_shape] or [method body_set_shape].
-			</description>
-		</method>
-		<method name="shape_set_data">
-			<argument index="0" name="shape" type="RID">
+			<argument index="1" name="shape" type="RID">
 			</argument>
-			<argument index="1" name="data" type="Variant">
+			<argument index="2" name="transform" type="Matrix32" default="1,0, 0,1, 0,0">
 			</argument>
 			<description>
-			Set the shape data that defines its shape and size. The data to be passed depends on the kind of shape created [method shape_get_type].
+				Add a shape to the area, along with a transform matrix. Shapes are usually referenced by their index, so you should track which shape has a given index.
 			</description>
 		</method>
-		<method name="shape_get_type" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="shape" type="RID">
+		<method name="area_attach_object_instance_ID">
+			<argument index="0" name="area" type="RID">
+			</argument>
+			<argument index="1" name="id" type="int">
 			</argument>
 			<description>
-			Return the type of shape (see SHAPE_* constants).
+				Assign the area to a descendant of [Object], so it can exist in the node tree.
 			</description>
 		</method>
-		<method name="shape_get_data" qualifiers="const">
-			<argument index="0" name="shape" type="RID">
+		<method name="area_clear_shapes">
+			<argument index="0" name="area" type="RID">
 			</argument>
 			<description>
-			Return the shape data.
+				Remove all shapes from an area. It does not delete the shapes, so they can be reassigned later.
 			</description>
 		</method>
-		<method name="space_create">
+		<method name="area_create">
 			<return type="RID">
 			</return>
 			<description>
-			Create a space. A space is a collection of parameters for the physics engine that can be assigned to an area or a body. It can be assigned to an area with [method area_set_space], or to a body with [method body_set_space].
+				Create an [Area2D].
 			</description>
 		</method>
-		<method name="space_set_active">
-			<argument index="0" name="space" type="RID">
-			</argument>
-			<argument index="1" name="active" type="bool">
-			</argument>
-			<description>
-			Mark a space as active. It will not have an effect, unless it is assigned to an area or body.
-			</description>
-		</method>
-		<method name="space_is_active" qualifiers="const">
-			<return type="bool">
+		<method name="area_get_object_instance_ID" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="space" type="RID">
+			<argument index="0" name="area" type="RID">
 			</argument>
 			<description>
-			Return whether the space is active.
+				Get the instance ID of the object the area is assigned to.
 			</description>
 		</method>
-		<method name="space_set_param">
-			<argument index="0" name="space" type="RID">
+		<method name="area_get_param" qualifiers="const">
+			<argument index="0" name="area" type="RID">
 			</argument>
 			<argument index="1" name="param" type="int">
 			</argument>
-			<argument index="2" name="value" type="float">
-			</argument>
 			<description>
-			Set the value for a space parameter. A list of available parameters is on the SPACE_PARAM_* constants.
+				Return an area parameter value.
 			</description>
 		</method>
-		<method name="space_get_param" qualifiers="const">
-			<return type="float">
+		<method name="area_get_shape" qualifiers="const">
+			<return type="RID">
 			</return>
-			<argument index="0" name="space" type="RID">
+			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int">
+			<argument index="1" name="shape_idx" type="int">
 			</argument>
 			<description>
-			Return the value of a space parameter.
+				Return the [RID] of the nth shape of an area.
 			</description>
 		</method>
-		<method name="space_get_direct_state">
-			<return type="Physics2DDirectSpaceState">
+		<method name="area_get_shape_count" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="space" type="RID">
+			<argument index="0" name="area" type="RID">
 			</argument>
 			<description>
-			Return the state of a space, a [Physics2DDirectSpaceState]. This object can be used to make collision/intersection queries.
+				Return the number of shapes assigned to an area.
 			</description>
 		</method>
-		<method name="area_create">
-			<return type="RID">
+		<method name="area_get_shape_transform" qualifiers="const">
+			<return type="Matrix32">
 			</return>
-			<description>
-			Create an [Area2D].
-			</description>
-		</method>
-		<method name="area_set_space">
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="space" type="RID">
+			<argument index="1" name="shape_idx" type="int">
 			</argument>
 			<description>
-			Assign a space to the area.
+				Return the transform matrix of a shape within an area.
 			</description>
 		</method>
 		<method name="area_get_space" qualifiers="const">
@@ -25596,16 +25858,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="area" type="RID">
 			</argument>
 			<description>
-			Return the space assigned to the area.
-			</description>
-		</method>
-		<method name="area_set_space_override_mode">
-			<argument index="0" name="area" type="RID">
-			</argument>
-			<argument index="1" name="mode" type="int">
-			</argument>
-			<description>
-			Set the space override mode for the area. The modes are described in the constants AREA_SPACE_OVERRIDE_*.
+				Return the space assigned to the area.
 			</description>
 		</method>
 		<method name="area_get_space_override_mode" qualifiers="const">
@@ -25614,116 +25867,110 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="area" type="RID">
 			</argument>
 			<description>
-			Return the space override mode for the area.
+				Return the space override mode for the area.
 			</description>
 		</method>
-		<method name="area_add_shape">
+		<method name="area_get_transform" qualifiers="const">
+			<return type="Matrix32">
+			</return>
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="shape" type="RID">
-			</argument>
-			<argument index="2" name="transform" type="Matrix32" default="1,0, 0,1, 0,0">
-			</argument>
 			<description>
-			Add a shape to the area, along with a transform matrix. Shapes are usually referenced by their index, so you should track which shape has a given index.
+				Return the transform matrix for an area.
 			</description>
 		</method>
-		<method name="area_set_shape">
+		<method name="area_remove_shape">
 			<argument index="0" name="area" type="RID">
 			</argument>
 			<argument index="1" name="shape_idx" type="int">
 			</argument>
-			<argument index="2" name="shape" type="RID">
-			</argument>
 			<description>
-			Substitute a given area shape by another. The old shape is selected by its index, the new one by its [RID].
+				Remove a shape from an area. It does not delete the shape, so it can be reassigned later.
 			</description>
 		</method>
-		<method name="area_set_shape_transform">
+		<method name="area_set_collision_mask">
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="shape_idx" type="int">
-			</argument>
-			<argument index="2" name="transform" type="Matrix32">
+			<argument index="1" name="mask" type="int">
 			</argument>
 			<description>
-			Set the transform matrix for an area shape.
+				Set which physics layers the area will monitor.
 			</description>
 		</method>
-		<method name="area_get_shape_count" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="area_set_layer_mask">
 			<argument index="0" name="area" type="RID">
 			</argument>
+			<argument index="1" name="mask" type="int">
+			</argument>
 			<description>
-			Return the number of shapes assigned to an area.
+				Assign the area to one or many physics layers.
 			</description>
 		</method>
-		<method name="area_get_shape" qualifiers="const">
-			<return type="RID">
-			</return>
+		<method name="area_set_monitor_callback">
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="shape_idx" type="int">
+			<argument index="1" name="receiver" type="Object">
+			</argument>
+			<argument index="2" name="method" type="String">
 			</argument>
 			<description>
-			Return the [RID] of the nth shape of an area.
+				Set the function to call when any body/area enters or exits the area. This callback will be called for any object interacting with the area, and takes five parameters:
+				1: AREA_BODY_ADDED or AREA_BODY_REMOVED, depending on whether the object entered or exited the area.
+				2: [RID] of the object that entered/exited the area.
+				3: Instance ID of the object that entered/exited the area.
+				4: The shape index of the object that entered/exited the area.
+				5: The shape index of the area where the object entered/exited.
 			</description>
 		</method>
-		<method name="area_get_shape_transform" qualifiers="const">
-			<return type="Matrix32">
-			</return>
+		<method name="area_set_param">
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="shape_idx" type="int">
+			<argument index="1" name="param" type="int">
+			</argument>
+			<argument index="2" name="value" type="Variant">
 			</argument>
 			<description>
-			Return the transform matrix of a shape within an area.
+				Set the value for an area parameter. A list of available parameters is on the AREA_PARAM_* constants.
 			</description>
 		</method>
-		<method name="area_remove_shape">
+		<method name="area_set_shape">
 			<argument index="0" name="area" type="RID">
 			</argument>
 			<argument index="1" name="shape_idx" type="int">
 			</argument>
-			<description>
-			Remove a shape from an area. It does not delete the shape, so it can be reassigned later.
-			</description>
-		</method>
-		<method name="area_clear_shapes">
-			<argument index="0" name="area" type="RID">
+			<argument index="2" name="shape" type="RID">
 			</argument>
 			<description>
-			Remove all shapes from an area. It does not delete the shapes, so they can be reassigned later.
+				Substitute a given area shape by another. The old shape is selected by its index, the new one by its [RID].
 			</description>
 		</method>
-		<method name="area_set_layer_mask">
+		<method name="area_set_shape_transform">
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="mask" type="int">
+			<argument index="1" name="shape_idx" type="int">
+			</argument>
+			<argument index="2" name="transform" type="Matrix32">
 			</argument>
 			<description>
-			Assign the area to one or many physics layers.
+				Set the transform matrix for an area shape.
 			</description>
 		</method>
-		<method name="area_set_collision_mask">
+		<method name="area_set_space">
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="mask" type="int">
+			<argument index="1" name="space" type="RID">
 			</argument>
 			<description>
-			Set which physics layers the area will monitor.
+				Assign a space to the area.
 			</description>
 		</method>
-		<method name="area_set_param">
+		<method name="area_set_space_override_mode">
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int">
-			</argument>
-			<argument index="2" name="value" type="Variant">
+			<argument index="1" name="mode" type="int">
 			</argument>
 			<description>
-			Set the value for an area parameter. A list of available parameters is on the AREA_PARAM_* constants.
+				Set the space override mode for the area. The modes are described in the constants AREA_SPACE_OVERRIDE_*.
 			</description>
 		</method>
 		<method name="area_set_transform">
@@ -25732,59 +25979,65 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="transform" type="Matrix32">
 			</argument>
 			<description>
-			Set the transform matrix for an area.
+				Set the transform matrix for an area.
 			</description>
 		</method>
-		<method name="area_get_param" qualifiers="const">
-			<argument index="0" name="area" type="RID">
+		<method name="body_add_collision_exception">
+			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int">
+			<argument index="1" name="excepted_body" type="RID">
 			</argument>
 			<description>
-			Return an area parameter value.
+				Add a body to the list of bodies exempt from collisions.
 			</description>
 		</method>
-		<method name="area_get_transform" qualifiers="const">
-			<return type="Matrix32">
-			</return>
-			<argument index="0" name="area" type="RID">
+		<method name="body_add_force">
+			<argument index="0" name="body" type="RID">
+			</argument>
+			<argument index="1" name="offset" type="Vector2">
+			</argument>
+			<argument index="2" name="force" type="Vector2">
 			</argument>
 			<description>
-			Return the transform matrix for an area.
+				Add a positioned force to the applied force and torque. As with [method body_apply_impulse], both the force and the offset from the body origin are in global coordinates. A force differs from an impulse in that, while the two are forces, the impulse clears itself after being applied.
 			</description>
 		</method>
-		<method name="area_attach_object_instance_ID">
-			<argument index="0" name="area" type="RID">
+		<method name="body_add_shape">
+			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="id" type="int">
+			<argument index="1" name="shape" type="RID">
+			</argument>
+			<argument index="2" name="transform" type="Matrix32" default="1,0, 0,1, 0,0">
 			</argument>
 			<description>
-			Assign the area to a descendant of [Object], so it can exist in the node tree.
+				Add a shape to the body, along with a transform matrix. Shapes are usually referenced by their index, so you should track which shape has a given index.
 			</description>
 		</method>
-		<method name="area_get_object_instance_ID" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="area" type="RID">
+		<method name="body_apply_impulse">
+			<argument index="0" name="body" type="RID">
+			</argument>
+			<argument index="1" name="pos" type="Vector2">
+			</argument>
+			<argument index="2" name="impulse" type="Vector2">
 			</argument>
 			<description>
-			Get the instance ID of the object the area is assigned to.
+				Add a positioned impulse to the applied force and torque. Both the force and the offset from the body origin are in global coordinates.
 			</description>
 		</method>
-		<method name="area_set_monitor_callback">
-			<argument index="0" name="area" type="RID">
+		<method name="body_attach_object_instance_ID">
+			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="receiver" type="Object">
+			<argument index="1" name="id" type="int">
 			</argument>
-			<argument index="2" name="method" type="String">
+			<description>
+				Assign the area to a descendant of [Object], so it can exist in the node tree.
+			</description>
+		</method>
+		<method name="body_clear_shapes">
+			<argument index="0" name="body" type="RID">
 			</argument>
 			<description>
-			Set the function to call when any body/area enters or exits the area. This callback will be called for any object interacting with the area, and takes five parameters:
-		1: AREA_BODY_ADDED or AREA_BODY_REMOVED, depending on whether the object entered or exited the area.
-		2: [RID] of the object that entered/exited the area.
-		3: Instance ID of the object that entered/exited the area.
-		4: The shape index of the object that entered/exited the area.
-		5: The shape index of the area where the object entered/exited.
+				Remove all shapes from a body.
 			</description>
 		</method>
 		<method name="body_create">
@@ -25795,96 +26048,90 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="init_sleeping" type="bool" default="false">
 			</argument>
 			<description>
-			Create a physics body. The first parameter can be any value from constants BODY_MODE*, for the type of body created. Additionally, the body can be created in sleeping state to save processing time.
+				Create a physics body. The first parameter can be any value from constants BODY_MODE*, for the type of body created. Additionally, the body can be created in sleeping state to save processing time.
 			</description>
 		</method>
-		<method name="body_set_space">
+		<method name="body_get_collision_mask" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="space" type="RID">
-			</argument>
 			<description>
-			Assign a space to the body (see [method create_space]).
+				Return the physics layer or layers a body can collide with.
 			</description>
 		</method>
-		<method name="body_get_space" qualifiers="const">
-			<return type="RID">
+		<method name="body_get_continuous_collision_detection_mode" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
 			<description>
-			Return the [RID] of the space assigned to a body.
+				Return the continuous collision detection mode.
 			</description>
 		</method>
-		<method name="body_set_mode">
+		<method name="body_get_layer_mask" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="mode" type="int">
-			</argument>
 			<description>
-			Set the body mode, from one of the constants BODY_MODE*.
+				Return the physics layer or layers a body belongs to.
 			</description>
 		</method>
-		<method name="body_get_mode" qualifiers="const">
+		<method name="body_get_max_contacts_reported" qualifiers="const">
 			<return type="int">
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
 			<description>
-			Return the body mode.
+				Return the maximum contacts that can be reported. See [method body_set_max_contacts_reported].
 			</description>
 		</method>
-		<method name="body_add_shape">
+		<method name="body_get_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="shape" type="RID">
-			</argument>
-			<argument index="2" name="transform" type="Matrix32" default="1,0, 0,1, 0,0">
-			</argument>
 			<description>
-			Add a shape to the body, along with a transform matrix. Shapes are usually referenced by their index, so you should track which shape has a given index.
+				Return the body mode.
 			</description>
 		</method>
-		<method name="body_set_shape">
+		<method name="body_get_object_instance_ID" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="shape_idx" type="int">
-			</argument>
-			<argument index="2" name="shape" type="RID">
-			</argument>
 			<description>
-			Substitute a given body shape by another. The old shape is selected by its index, the new one by its [RID].
+				Get the instance ID of the object the area is assigned to.
 			</description>
 		</method>
-		<method name="body_set_shape_transform">
+		<method name="body_get_one_way_collision_direction" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="shape_idx" type="int">
-			</argument>
-			<argument index="2" name="transform" type="Matrix32">
-			</argument>
 			<description>
-			Set the transform matrix for a body shape.
+				Return the direction used for one-way collision detection.
 			</description>
 		</method>
-		<method name="body_set_shape_metadata">
+		<method name="body_get_one_way_collision_max_depth" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="shape_idx" type="int">
-			</argument>
-			<argument index="2" name="metadata" type="Variant">
-			</argument>
 			<description>
-			Set metadata of a shape within a body. This metadata is different from [method Object.set_meta], and can be retrieved on shape queries.
+				Return how far a body can go through the given one, when it allows one-way collisions.
 			</description>
 		</method>
-		<method name="body_get_shape_count" qualifiers="const">
-			<return type="int">
+		<method name="body_get_param" qualifiers="const">
+			<return type="float">
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
+			<argument index="1" name="param" type="int">
+			</argument>
 			<description>
-			Return the number of shapes assigned to a body.
+				Return the value of a body parameter.
 			</description>
 		</method>
 		<method name="body_get_shape" qualifiers="const">
@@ -25895,18 +26142,16 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="shape_idx" type="int">
 			</argument>
 			<description>
-			Return the [RID] of the nth shape of a body.
+				Return the [RID] of the nth shape of a body.
 			</description>
 		</method>
-		<method name="body_get_shape_transform" qualifiers="const">
-			<return type="Matrix32">
+		<method name="body_get_shape_count" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="shape_idx" type="int">
-			</argument>
 			<description>
-			Return the transform matrix of a body shape.
+				Return the number of shapes assigned to a body.
 			</description>
 		</method>
 		<method name="body_get_shape_metadata" qualifiers="const">
@@ -25915,34 +26160,45 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="shape_idx" type="int">
 			</argument>
 			<description>
-			Return the metadata of a shape of a body.
+				Return the metadata of a shape of a body.
 			</description>
 		</method>
-		<method name="body_remove_shape">
+		<method name="body_get_shape_transform" qualifiers="const">
+			<return type="Matrix32">
+			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
 			<argument index="1" name="shape_idx" type="int">
 			</argument>
 			<description>
-			Remove a shape from a body. The shape is not deleted, so it can be reused afterwards.
+				Return the transform matrix of a body shape.
 			</description>
 		</method>
-		<method name="body_clear_shapes">
+		<method name="body_get_space" qualifiers="const">
+			<return type="RID">
+			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
 			<description>
-			Remove all shapes from a body.
+				Return the [RID] of the space assigned to a body.
 			</description>
 		</method>
-		<method name="body_set_shape_as_trigger">
+		<method name="body_get_state" qualifiers="const">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="shape_idx" type="int">
+			<argument index="1" name="state" type="int">
 			</argument>
-			<argument index="2" name="enable" type="bool">
+			<description>
+				Return a body state.
+			</description>
+		</method>
+		<method name="body_is_omitting_force_integration" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="body" type="RID">
 			</argument>
 			<description>
-			Mark a body's shape as a trigger. A trigger shape cannot affect other bodies, but detects other shapes entering and exiting it.
+				Return whether a body uses a callback function to calculate its own physics (see [method body_set_force_integration_callback]).
 			</description>
 		</method>
 		<method name="body_is_shape_set_as_trigger" qualifiers="const">
@@ -25953,293 +26209,311 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="shape_idx" type="int">
 			</argument>
 			<description>
-			Return whether a body's shape is marked as a trigger.
+				Return whether a body's shape is marked as a trigger.
 			</description>
 		</method>
-		<method name="body_attach_object_instance_ID">
+		<method name="body_remove_collision_exception">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="id" type="int">
+			<argument index="1" name="excepted_body" type="RID">
 			</argument>
 			<description>
-			Assign the area to a descendant of [Object], so it can exist in the node tree.
+				Remove a body from the list of bodies exempt from collisions.
 			</description>
 		</method>
-		<method name="body_get_object_instance_ID" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="body_remove_shape">
 			<argument index="0" name="body" type="RID">
 			</argument>
+			<argument index="1" name="shape_idx" type="int">
+			</argument>
 			<description>
-			Get the instance ID of the object the area is assigned to.
+				Remove a shape from a body. The shape is not deleted, so it can be reused afterwards.
 			</description>
 		</method>
-		<method name="body_set_continuous_collision_detection_mode">
+		<method name="body_set_axis_velocity">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="mode" type="int">
+			<argument index="1" name="axis_velocity" type="Vector2">
 			</argument>
 			<description>
-			Set the continuous collision detection mode from any of the CCD_MODE_* constants.
-			Continuous collision detection tries to predict where a moving body will collide, instead of moving it and correcting its movement if it collided.
+				Set an axis velocity. The velocity in the given vector axis will be set as the given vector length. This is useful for jumping behavior.
 			</description>
 		</method>
-		<method name="body_get_continuous_collision_detection_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="body_set_collision_mask">
 			<argument index="0" name="body" type="RID">
 			</argument>
+			<argument index="1" name="mask" type="int">
+			</argument>
 			<description>
-			Return the continuous collision detection mode.
+				Set the physics layer or layers a body can collide with.
 			</description>
 		</method>
-		<method name="body_set_layer_mask">
+		<method name="body_set_continuous_collision_detection_mode">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="mask" type="int">
+			<argument index="1" name="mode" type="int">
 			</argument>
 			<description>
-			Set the physics layer or layers a body belongs to.
+				Set the continuous collision detection mode from any of the CCD_MODE_* constants.
+				Continuous collision detection tries to predict where a moving body will collide, instead of moving it and correcting its movement if it collided.
 			</description>
 		</method>
-		<method name="body_get_layer_mask" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="body_set_force_integration_callback">
 			<argument index="0" name="body" type="RID">
 			</argument>
+			<argument index="1" name="receiver" type="Object">
+			</argument>
+			<argument index="2" name="method" type="String">
+			</argument>
+			<argument index="3" name="userdata" type="Variant" default="NULL">
+			</argument>
 			<description>
-			Return the physics layer or layers a body belongs to.
+				Set the function used to calculate physics for an object, if that object allows it (see [method body_set_omit_force integration]).
 			</description>
 		</method>
-		<method name="body_set_collision_mask">
+		<method name="body_set_layer_mask">
 			<argument index="0" name="body" type="RID">
 			</argument>
 			<argument index="1" name="mask" type="int">
 			</argument>
 			<description>
-			Set the physics layer or layers a body can collide with.
+				Set the physics layer or layers a body belongs to.
 			</description>
 		</method>
-		<method name="body_get_collision_mask" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="body_set_max_contacts_reported">
 			<argument index="0" name="body" type="RID">
 			</argument>
+			<argument index="1" name="amount" type="int">
+			</argument>
 			<description>
-			Return the physics layer or layers a body can collide with.
+				Set the maximum contacts to report. Bodies can keep a log of the contacts with other bodies, this is enabled by setting the maximum amount of contacts reported to a number greater than 0.
 			</description>
 		</method>
-		<method name="body_set_param">
+		<method name="body_set_mode">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int">
-			</argument>
-			<argument index="2" name="value" type="float">
+			<argument index="1" name="mode" type="int">
 			</argument>
 			<description>
-			Set a body parameter (see BODY_PARAM* constants).
+				Set the body mode, from one of the constants BODY_MODE*.
 			</description>
 		</method>
-		<method name="body_get_param" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="body_set_omit_force_integration">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int">
+			<argument index="1" name="enable" type="bool">
 			</argument>
 			<description>
-			Return the value of a body parameter.
+				Set whether a body uses a callback function to calculate its own physics (see [method body_set_force_integration_callback]).
 			</description>
 		</method>
-		<method name="body_set_state">
+		<method name="body_set_one_way_collision_direction">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="state" type="int">
-			</argument>
-			<argument index="2" name="value" type="Variant">
+			<argument index="1" name="normal" type="Vector2">
 			</argument>
 			<description>
-			Set a body state (see BODY_STATE* constants).
+				Set a direction in which bodies can go through the given one. If this value is different from (0,0), any movement within 90 degrees of this vector is considered a valid movement. Set this direction to (0,0) to disable one-way collisions.
 			</description>
 		</method>
-		<method name="body_get_state" qualifiers="const">
+		<method name="body_set_one_way_collision_max_depth">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="state" type="int">
+			<argument index="1" name="depth" type="float">
 			</argument>
 			<description>
-			Return a body state.
+				Set how far a body can go through the given one, if it allows one-way collisions (see [method body_set_one_way_collision_direction]).
 			</description>
 		</method>
-		<method name="body_apply_impulse">
+		<method name="body_set_param">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="pos" type="Vector2">
+			<argument index="1" name="param" type="int">
 			</argument>
-			<argument index="2" name="impulse" type="Vector2">
+			<argument index="2" name="value" type="float">
 			</argument>
 			<description>
-			Add a positioned impulse to the applied force and torque. Both the force and the offset from the body origin are in global coordinates.
+				Set a body parameter (see BODY_PARAM* constants).
 			</description>
 		</method>
-		<method name="body_add_force">
+		<method name="body_set_shape">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="offset" type="Vector2">
+			<argument index="1" name="shape_idx" type="int">
 			</argument>
-			<argument index="2" name="force" type="Vector2">
+			<argument index="2" name="shape" type="RID">
 			</argument>
 			<description>
-			Add a positioned force to the applied force and torque. As with [method body_apply_impulse], both the force and the offset from the body origin are in global coordinates. A force differs from an impulse in that, while the two are forces, the impulse clears itself after being applied.
+				Substitute a given body shape by another. The old shape is selected by its index, the new one by its [RID].
 			</description>
 		</method>
-		<method name="body_set_axis_velocity">
+		<method name="body_set_shape_as_trigger">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="axis_velocity" type="Vector2">
+			<argument index="1" name="shape_idx" type="int">
+			</argument>
+			<argument index="2" name="enable" type="bool">
 			</argument>
 			<description>
-			Set an axis velocity. The velocity in the given vector axis will be set as the given vector length. This is useful for jumping behavior.
+				Mark a body's shape as a trigger. A trigger shape cannot affect other bodies, but detects other shapes entering and exiting it.
 			</description>
 		</method>
-		<method name="body_add_collision_exception">
+		<method name="body_set_shape_metadata">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="excepted_body" type="RID">
+			<argument index="1" name="shape_idx" type="int">
+			</argument>
+			<argument index="2" name="metadata" type="Variant">
 			</argument>
 			<description>
-			Add a body to the list of bodies exempt from collisions.
+				Set metadata of a shape within a body. This metadata is different from [method Object.set_meta], and can be retrieved on shape queries.
 			</description>
 		</method>
-		<method name="body_remove_collision_exception">
+		<method name="body_set_shape_transform">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="excepted_body" type="RID">
+			<argument index="1" name="shape_idx" type="int">
+			</argument>
+			<argument index="2" name="transform" type="Matrix32">
 			</argument>
 			<description>
-			Remove a body from the list of bodies exempt from collisions.
+				Set the transform matrix for a body shape.
 			</description>
 		</method>
-		<method name="body_set_max_contacts_reported">
+		<method name="body_set_space">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="amount" type="int">
+			<argument index="1" name="space" type="RID">
 			</argument>
 			<description>
-			Set the maximum contacts to report. Bodies can keep a log of the contacts with other bodies, this is enabled by setting the maximum amount of contacts reported to a number greater than 0.
+				Assign a space to the body (see [method create_space]).
 			</description>
 		</method>
-		<method name="body_get_max_contacts_reported" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="body_set_state">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<description>
-			Return the maximum contacts that can be reported. See [method body_set_max_contacts_reported].
-			</description>
-		</method>
-		<method name="body_set_one_way_collision_direction">
-			<argument index="0" name="body" type="RID">
+			<argument index="1" name="state" type="int">
 			</argument>
-			<argument index="1" name="normal" type="Vector2">
+			<argument index="2" name="value" type="Variant">
 			</argument>
 			<description>
-			Set a direction in which bodies can go through the given one. If this value is different from (0,0), any movement within 90 degrees of this vector is considered a valid movement. Set this direction to (0,0) to disable one-way collisions.
+				Set a body state (see BODY_STATE* constants).
 			</description>
 		</method>
-		<method name="body_get_one_way_collision_direction" qualifiers="const">
-			<return type="Vector2">
+		<method name="body_test_motion">
+			<return type="bool">
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
+			<argument index="1" name="motion" type="Vector2">
+			</argument>
+			<argument index="2" name="margin" type="float" default="0.08">
+			</argument>
+			<argument index="3" name="result" type="Physics2DTestMotionResult" default="NULL">
+			</argument>
 			<description>
-			Return the direction used for one-way collision detection.
+				Return whether a body can move in a given direction. Apart from the boolean return value, a [Physics2DTestMotionResult] can be passed to return additional information in.
 			</description>
 		</method>
-		<method name="body_set_one_way_collision_max_depth">
-			<argument index="0" name="body" type="RID">
+		<method name="damped_spring_joint_create">
+			<return type="RID">
+			</return>
+			<argument index="0" name="anchor_a" type="Vector2">
 			</argument>
-			<argument index="1" name="depth" type="float">
+			<argument index="1" name="anchor_b" type="Vector2">
+			</argument>
+			<argument index="2" name="body_a" type="RID">
+			</argument>
+			<argument index="3" name="body_b" type="RID" default="RID()">
 			</argument>
 			<description>
-			Set how far a body can go through the given one, if it allows one-way collisions (see [method body_set_one_way_collision_direction]).
+				Create a damped spring joint between two bodies. If not specified, the second body is assumed to be the joint itself.
 			</description>
 		</method>
-		<method name="body_get_one_way_collision_max_depth" qualifiers="const">
+		<method name="damped_string_joint_get_param" qualifiers="const">
 			<return type="float">
 			</return>
-			<argument index="0" name="body" type="RID">
+			<argument index="0" name="joint" type="RID">
+			</argument>
+			<argument index="1" name="param" type="int">
 			</argument>
 			<description>
-			Return how far a body can go through the given one, when it allows one-way collisions.
+				Return the value of a damped spring joint parameter.
 			</description>
 		</method>
-		<method name="body_set_omit_force_integration">
-			<argument index="0" name="body" type="RID">
+		<method name="damped_string_joint_set_param">
+			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="enable" type="bool">
+			<argument index="1" name="param" type="int">
+			</argument>
+			<argument index="2" name="value" type="float">
 			</argument>
 			<description>
-			Set whether a body uses a callback function to calculate its own physics (see [method body_set_force_integration_callback]).
+				Set a damped spring joint parameter. Parameters are explained in the DAMPED_STRING* constants.
 			</description>
 		</method>
-		<method name="body_is_omitting_force_integration" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="body" type="RID">
+		<method name="free_rid">
+			<argument index="0" name="rid" type="RID">
 			</argument>
 			<description>
-			Return whether a body uses a callback function to calculate its own physics (see [method body_set_force_integration_callback]).
+				Destroy any of the objects created by Physics2DServer. If the [RID] passed is not one of the objects that can be created by Physics2DServer, an error will be sent to the console.
 			</description>
 		</method>
-		<method name="body_set_force_integration_callback">
-			<argument index="0" name="body" type="RID">
-			</argument>
-			<argument index="1" name="receiver" type="Object">
-			</argument>
-			<argument index="2" name="method" type="String">
-			</argument>
-			<argument index="3" name="userdata" type="Variant" default="NULL">
+		<method name="get_process_info">
+			<return type="int">
+			</return>
+			<argument index="0" name="process_info" type="int">
 			</argument>
 			<description>
-			Set the function used to calculate physics for an object, if that object allows it (see [method body_set_omit_force integration]).
+				Return information about the current state of the 2D physics engine. The states are listed under the INFO_* constants.
 			</description>
 		</method>
-		<method name="body_test_motion">
-			<return type="bool">
+		<method name="groove_joint_create">
+			<return type="RID">
 			</return>
-			<argument index="0" name="body" type="RID">
+			<argument index="0" name="groove1_a" type="Vector2">
 			</argument>
-			<argument index="1" name="motion" type="Vector2">
+			<argument index="1" name="groove2_a" type="Vector2">
 			</argument>
-			<argument index="2" name="margin" type="float" default="0.08">
+			<argument index="2" name="anchor_b" type="Vector2">
 			</argument>
-			<argument index="3" name="result" type="Physics2DTestMotionResult" default="NULL">
+			<argument index="3" name="body_a" type="RID" default="RID()">
+			</argument>
+			<argument index="4" name="body_b" type="RID" default="RID()">
 			</argument>
 			<description>
-			Return whether a body can move in a given direction. Apart from the boolean return value, a [Physics2DTestMotionResult] can be passed to return additional information in.
+				Create a groove joint between two bodies. If not specified, the bodyies are assumed to be the joint itself.
 			</description>
 		</method>
-		<method name="joint_set_param">
+		<method name="joint_get_param" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
 			<argument index="1" name="param" type="int">
 			</argument>
-			<argument index="2" name="value" type="float">
-			</argument>
 			<description>
-			Set a joint parameter. Parameters are explained in the JOINT_PARAM* constants.
+				Return the value of a joint parameter.
 			</description>
 		</method>
-		<method name="joint_get_param" qualifiers="const">
-			<return type="float">
+		<method name="joint_get_type" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
+			<description>
+				Return the type of a joint (see JOINT_* constants).
+			</description>
+		</method>
+		<method name="joint_set_param">
+			<argument index="0" name="joint" type="RID">
+			</argument>
 			<argument index="1" name="param" type="int">
 			</argument>
+			<argument index="2" name="value" type="float">
+			</argument>
 			<description>
-			Return the value of a joint parameter.
+				Set a joint parameter. Parameters are explained in the JOINT_PARAM* constants.
 			</description>
 		</method>
 		<method name="pin_joint_create">
@@ -26252,93 +26526,104 @@ This method controls whether the position between two cached points is interpola
 			<argument index="2" name="body_b" type="RID" default="RID()">
 			</argument>
 			<description>
-			Create a pin joint between two bodies. If not specified, the second body is assumed to be the joint itself.
+				Create a pin joint between two bodies. If not specified, the second body is assumed to be the joint itself.
 			</description>
 		</method>
-		<method name="groove_joint_create">
+		<method name="set_active">
+			<argument index="0" name="active" type="bool">
+			</argument>
+			<description>
+				Activate or deactivate the 2D physics engine.
+			</description>
+		</method>
+		<method name="shape_create">
 			<return type="RID">
 			</return>
-			<argument index="0" name="groove1_a" type="Vector2">
+			<argument index="0" name="type" type="int">
 			</argument>
-			<argument index="1" name="groove2_a" type="Vector2">
+			<description>
+				Create a shape of type SHAPE_*. Does not assign it to a body or an area. To do so, you must use [method area_set_shape] or [method body_set_shape].
+			</description>
+		</method>
+		<method name="shape_get_data" qualifiers="const">
+			<argument index="0" name="shape" type="RID">
 			</argument>
-			<argument index="2" name="anchor_b" type="Vector2">
+			<description>
+				Return the shape data.
+			</description>
+		</method>
+		<method name="shape_get_type" qualifiers="const">
+			<return type="int">
+			</return>
+			<argument index="0" name="shape" type="RID">
 			</argument>
-			<argument index="3" name="body_a" type="RID" default="RID()">
+			<description>
+				Return the type of shape (see SHAPE_* constants).
+			</description>
+		</method>
+		<method name="shape_set_data">
+			<argument index="0" name="shape" type="RID">
 			</argument>
-			<argument index="4" name="body_b" type="RID" default="RID()">
+			<argument index="1" name="data" type="Variant">
 			</argument>
 			<description>
-			Create a groove joint between two bodies. If not specified, the bodyies are assumed to be the joint itself.
+				Set the shape data that defines its shape and size. The data to be passed depends on the kind of shape created [method shape_get_type].
 			</description>
 		</method>
-		<method name="damped_spring_joint_create">
+		<method name="space_create">
 			<return type="RID">
 			</return>
-			<argument index="0" name="anchor_a" type="Vector2">
-			</argument>
-			<argument index="1" name="anchor_b" type="Vector2">
-			</argument>
-			<argument index="2" name="body_a" type="RID">
-			</argument>
-			<argument index="3" name="body_b" type="RID" default="RID()">
-			</argument>
 			<description>
-			Create a damped spring joint between two bodies. If not specified, the second body is assumed to be the joint itself.
+				Create a space. A space is a collection of parameters for the physics engine that can be assigned to an area or a body. It can be assigned to an area with [method area_set_space], or to a body with [method body_set_space].
 			</description>
 		</method>
-		<method name="damped_string_joint_set_param">
-			<argument index="0" name="joint" type="RID">
-			</argument>
-			<argument index="1" name="param" type="int">
-			</argument>
-			<argument index="2" name="value" type="float">
+		<method name="space_get_direct_state">
+			<return type="Physics2DDirectSpaceState">
+			</return>
+			<argument index="0" name="space" type="RID">
 			</argument>
 			<description>
-			Set a damped spring joint parameter. Parameters are explained in the DAMPED_STRING* constants.
+				Return the state of a space, a [Physics2DDirectSpaceState]. This object can be used to make collision/intersection queries.
 			</description>
 		</method>
-		<method name="damped_string_joint_get_param" qualifiers="const">
+		<method name="space_get_param" qualifiers="const">
 			<return type="float">
 			</return>
-			<argument index="0" name="joint" type="RID">
+			<argument index="0" name="space" type="RID">
 			</argument>
 			<argument index="1" name="param" type="int">
 			</argument>
 			<description>
-			Return the value of a damped spring joint parameter.
+				Return the value of a space parameter.
 			</description>
 		</method>
-		<method name="joint_get_type" qualifiers="const">
-			<return type="int">
+		<method name="space_is_active" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="joint" type="RID">
+			<argument index="0" name="space" type="RID">
 			</argument>
 			<description>
-			Return the type of a joint (see JOINT_* constants).
+				Return whether the space is active.
 			</description>
 		</method>
-		<method name="free_rid">
-			<argument index="0" name="rid" type="RID">
+		<method name="space_set_active">
+			<argument index="0" name="space" type="RID">
 			</argument>
-			<description>
-			Destroy any of the objects created by Physics2DServer. If the [RID] passed is not one of the objects that can be created by Physics2DServer, an error will be sent to the console.
-			</description>
-		</method>
-		<method name="set_active">
-			<argument index="0" name="active" type="bool">
+			<argument index="1" name="active" type="bool">
 			</argument>
 			<description>
-			Activate or deactivate the 2D physics engine.
+				Mark a space as active. It will not have an effect, unless it is assigned to an area or body.
 			</description>
 		</method>
-		<method name="get_process_info">
-			<return type="int">
-			</return>
-			<argument index="0" name="process_info" type="int">
+		<method name="space_set_param">
+			<argument index="0" name="space" type="RID">
+			</argument>
+			<argument index="1" name="param" type="int">
+			</argument>
+			<argument index="2" name="value" type="float">
 			</argument>
 			<description>
-			Return information about the current state of the 2D physics engine. The states are listed under the INFO_* constants.
+				Set the value for a space parameter. A list of available parameters is on the SPACE_PARAM_* constants.
 			</description>
 		</method>
 	</methods>
@@ -26524,10 +26809,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Physics2DServerSW" inherits="Physics2DServer" category="Core">
 	<brief_description>
-	Software implementation of [Physics2DServer].
+		Software implementation of [Physics2DServer].
 	</brief_description>
 	<description>
-	Software implementation of [Physics2DServer]. This class exposes no new methods or properties and should not be used, as [Physics2DServer] automatically selects the best implementation available.
+		Software implementation of [Physics2DServer]. This class exposes no new methods or properties and should not be used, as [Physics2DServer] automatically selects the best implementation available.
 	</description>
 	<methods>
 	</methods>
@@ -26536,115 +26821,115 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Physics2DShapeQueryParameters" inherits="Reference" category="Core">
 	<brief_description>
-	Parameters to be sent to a 2D shape physics query.
+		Parameters to be sent to a 2D shape physics query.
 	</brief_description>
 	<description>
-	This class contains the shape and other parameters for intersection/collision queries.
+		This class contains the shape and other parameters for intersection/collision queries.
 	</description>
 	<methods>
-		<method name="set_shape">
-			<argument index="0" name="shape" type="Shape2D">
-			</argument>
+		<method name="get_exclude" qualifiers="const">
+			<return type="Array">
+			</return>
 			<description>
-			Set the [Shape2D] that will be used for collision/intersection queries.
+				Return the list of objects, or object [RID]s, that will be excluded from collisions.
 			</description>
 		</method>
-		<method name="set_shape_rid">
-			<argument index="0" name="shape" type="RID">
-			</argument>
+		<method name="get_layer_mask" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the [RID] of the shape to be used in queries.
+				Return the physics layer(s) the shape belongs to.
 			</description>
 		</method>
-		<method name="get_shape_rid" qualifiers="const">
-			<return type="RID">
+		<method name="get_margin" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return the [RID] of the shape queried.
+				Return the collision margin for the shape.
 			</description>
 		</method>
-		<method name="set_transform">
-			<argument index="0" name="transform" type="Matrix32">
-			</argument>
+		<method name="get_motion" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
-			Set the transormation matrix of the shape. This is necessary to set its position/rotation/scale.
+				Return the current movement speed of the shape.
 			</description>
 		</method>
-		<method name="get_transform" qualifiers="const">
-			<return type="Matrix32">
+		<method name="get_object_type_mask" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the transform matrix of the shape queried.
+				Return the type of object the shape belongs to.
 			</description>
 		</method>
-		<method name="set_motion">
-			<argument index="0" name="motion" type="Vector2">
-			</argument>
+		<method name="get_shape_rid" qualifiers="const">
+			<return type="RID">
+			</return>
 			<description>
-			Set the current movement speed of the shape.
+				Return the [RID] of the shape queried.
 			</description>
 		</method>
-		<method name="get_motion" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_transform" qualifiers="const">
+			<return type="Matrix32">
 			</return>
 			<description>
-			Return the current movement speed of the shape.
+				Return the transform matrix of the shape queried.
 			</description>
 		</method>
-		<method name="set_margin">
-			<argument index="0" name="margin" type="float">
+		<method name="set_exclude">
+			<argument index="0" name="exclude" type="Array">
 			</argument>
 			<description>
-			Set the collision margin for the shape. A collision margin is an amount (in pixels) that the shape will grow when computing collisions, to account for numerical imprecision.
+				Set the list of objects, or object [RID]s, that will be excluded from collisions.
 			</description>
 		</method>
-		<method name="get_margin" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_layer_mask">
+			<argument index="0" name="layer_mask" type="int">
+			</argument>
 			<description>
-			Return the collision margin for the shape.
+				Set the physics layer(s) the shape belongs to.
 			</description>
 		</method>
-		<method name="set_layer_mask">
-			<argument index="0" name="layer_mask" type="int">
+		<method name="set_margin">
+			<argument index="0" name="margin" type="float">
 			</argument>
 			<description>
-			Set the physics layer(s) the shape belongs to.
+				Set the collision margin for the shape. A collision margin is an amount (in pixels) that the shape will grow when computing collisions, to account for numerical imprecision.
 			</description>
 		</method>
-		<method name="get_layer_mask" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_motion">
+			<argument index="0" name="motion" type="Vector2">
+			</argument>
 			<description>
-			Return the physics layer(s) the shape belongs to.
+				Set the current movement speed of the shape.
 			</description>
 		</method>
 		<method name="set_object_type_mask">
 			<argument index="0" name="object_type_mask" type="int">
 			</argument>
 			<description>
-			Set the type of object the shape belongs to (see Physics2DDirectSpaceState.TYPE_MASK_*).
+				Set the type of object the shape belongs to (see Physics2DDirectSpaceState.TYPE_MASK_*).
 			</description>
 		</method>
-		<method name="get_object_type_mask" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_shape">
+			<argument index="0" name="shape" type="Shape2D">
+			</argument>
 			<description>
-			Return the type of object the shape belongs to.
+				Set the [Shape2D] that will be used for collision/intersection queries.
 			</description>
 		</method>
-		<method name="set_exclude">
-			<argument index="0" name="exclude" type="Array">
+		<method name="set_shape_rid">
+			<argument index="0" name="shape" type="RID">
 			</argument>
 			<description>
-			Set the list of objects, or object [RID]s, that will be excluded from collisions.
+				Set the [RID] of the shape to be used in queries.
 			</description>
 		</method>
-		<method name="get_exclude" qualifiers="const">
-			<return type="Array">
-			</return>
+		<method name="set_transform">
+			<argument index="0" name="transform" type="Matrix32">
+			</argument>
 			<description>
-			Return the list of objects, or object [RID]s, that will be excluded from collisions.
+				Set the transormation matrix of the shape. This is necessary to set its position/rotation/scale.
 			</description>
 		</method>
 	</methods>
@@ -26663,8 +26948,8 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_result_rid" qualifiers="const">
-			<return type="RID">
+		<method name="get_result_object" qualifiers="const">
+			<return type="Object">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
@@ -26679,16 +26964,16 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_result_object" qualifiers="const">
-			<return type="Object">
+		<method name="get_result_object_shape" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_result_object_shape" qualifiers="const">
-			<return type="int">
+		<method name="get_result_rid" qualifiers="const">
+			<return type="RID">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
@@ -26705,26 +26990,26 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="get_motion" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_collider" qualifiers="const">
+			<return type="Object">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_motion_remainder" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_collider_id" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_collision_point" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_collider_rid" qualifiers="const">
+			<return type="RID">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_collision_normal" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_collider_shape" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
 			</description>
@@ -26735,26 +27020,26 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_collider_id" qualifiers="const">
-			<return type="int">
+		<method name="get_collision_normal" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_collider_rid" qualifiers="const">
-			<return type="RID">
+		<method name="get_collision_point" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_collider" qualifiers="const">
-			<return type="Object">
+		<method name="get_motion" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_collider_shape" qualifiers="const">
-			<return type="int">
+		<method name="get_motion_remainder" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<description>
 			</description>
@@ -26765,76 +27050,76 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="PhysicsBody" inherits="CollisionObject" category="Core">
 	<brief_description>
-	Base class for different types of Physics bodies.
+		Base class for different types of Physics bodies.
 	</brief_description>
 	<description>
-	PhysicsBody is an abstract base class for implementing a physics body. All PhysicsBody types inherit from it.
+		PhysicsBody is an abstract base class for implementing a physics body. All PhysicsBody types inherit from it.
 	</description>
 	<methods>
-		<method name="set_layer_mask">
-			<argument index="0" name="mask" type="int">
+		<method name="add_collision_exception_with">
+			<argument index="0" name="body" type="PhysicsBody">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_layer_mask" qualifiers="const">
+		<method name="get_collision_mask" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_collision_mask">
-			<argument index="0" name="mask" type="int">
+		<method name="get_collision_mask_bit" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="bit" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_collision_mask" qualifiers="const">
+		<method name="get_layer_mask" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_collision_mask_bit">
+		<method name="get_layer_mask_bit" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="bit" type="int">
 			</argument>
-			<argument index="1" name="value" type="bool">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_collision_mask_bit" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="bit" type="int">
+		<method name="remove_collision_exception_with">
+			<argument index="0" name="body" type="PhysicsBody">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_layer_mask_bit">
-			<argument index="0" name="bit" type="int">
-			</argument>
-			<argument index="1" name="value" type="bool">
+		<method name="set_collision_mask">
+			<argument index="0" name="mask" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_layer_mask_bit" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_collision_mask_bit">
 			<argument index="0" name="bit" type="int">
 			</argument>
+			<argument index="1" name="value" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="add_collision_exception_with">
-			<argument index="0" name="body" type="PhysicsBody">
+		<method name="set_layer_mask">
+			<argument index="0" name="mask" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="remove_collision_exception_with">
-			<argument index="0" name="body" type="PhysicsBody">
+		<method name="set_layer_mask_bit">
+			<argument index="0" name="bit" type="int">
+			</argument>
+			<argument index="1" name="value" type="bool">
 			</argument>
 			<description>
 			</description>
@@ -26845,118 +27130,118 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="PhysicsBody2D" inherits="CollisionObject2D" category="Core">
 	<brief_description>
-	Base class for all objects affected by physics.
+		Base class for all objects affected by physics.
 	</brief_description>
 	<description>
-	PhysicsBody2D is an abstract base class for implementing a physics body. All *Body2D types inherit from it.
+		PhysicsBody2D is an abstract base class for implementing a physics body. All *Body2D types inherit from it.
 	</description>
 	<methods>
-		<method name="set_layer_mask">
-			<argument index="0" name="mask" type="int">
+		<method name="add_collision_exception_with">
+			<argument index="0" name="body" type="PhysicsBody2D">
 			</argument>
 			<description>
-			Set the physics layers this area is in.
-			Collidable objects can exist in any of 32 different layers. These layers are not visual, but more of a tagging system instead. A collidable can use these layers/tags to select with which objects it can collide, using [method set_collision_mask].
-			A contact is detected if object A is in any of the layers that object B scans, or object B is in any layer scanned by object A.
+				Adds a body to the collision exception list. This list contains bodies that this body will not collide with.
 			</description>
 		</method>
-		<method name="get_layer_mask" qualifiers="const">
+		<method name="get_collision_mask" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the physics layer this area is in.
+				Return the physics layers this area can scan for collisions.
 			</description>
 		</method>
-		<method name="set_collision_mask">
-			<argument index="0" name="mask" type="int">
+		<method name="get_collision_mask_bit" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="bit" type="int">
 			</argument>
 			<description>
-			Set the physics layers this area can scan for collisions.
+				Return an individual bit on the collision mask.
 			</description>
 		</method>
-		<method name="get_collision_mask" qualifiers="const">
+		<method name="get_layer_mask" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the physics layers this area can scan for collisions.
+				Return the physics layer this area is in.
 			</description>
 		</method>
-		<method name="set_collision_mask_bit">
+		<method name="get_layer_mask_bit" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="bit" type="int">
 			</argument>
-			<argument index="1" name="value" type="bool">
-			</argument>
 			<description>
-			Set/clear individual bits on the collision mask. This makes selecting the areas scanned easier.
+				Return an individual bit on the collision mask.
 			</description>
 		</method>
-		<method name="get_collision_mask_bit" qualifiers="const">
-			<return type="bool">
+		<method name="get_one_way_collision_direction" qualifiers="const">
+			<return type="Vector2">
 			</return>
-			<argument index="0" name="bit" type="int">
-			</argument>
 			<description>
-			Return an individual bit on the collision mask.
+				Return the direction used for one-way collision detection.
 			</description>
 		</method>
-		<method name="set_layer_mask_bit">
-			<argument index="0" name="bit" type="int">
-			</argument>
-			<argument index="1" name="value" type="bool">
-			</argument>
+		<method name="get_one_way_collision_max_depth" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set/clear individual bits on the layer mask. This makes getting a body in/out of only one layer easier.
+				Return how far a body can go through this one, when it allows one-way collisions.
 			</description>
 		</method>
-		<method name="get_layer_mask_bit" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="bit" type="int">
+		<method name="remove_collision_exception_with">
+			<argument index="0" name="body" type="PhysicsBody2D">
 			</argument>
 			<description>
-			Return an individual bit on the collision mask.
+				Removes a body from the collision exception list.
 			</description>
 		</method>
-		<method name="set_one_way_collision_direction">
-			<argument index="0" name="dir" type="Vector2">
+		<method name="set_collision_mask">
+			<argument index="0" name="mask" type="int">
 			</argument>
 			<description>
-			Set a direction in which bodies can go through this one. If this value is different from (0,0), any movement within 90 degrees of this vector is considered a valid movement. Set this direction to (0,0) to disable one-way collisions.
+				Set the physics layers this area can scan for collisions.
 			</description>
 		</method>
-		<method name="get_one_way_collision_direction" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_collision_mask_bit">
+			<argument index="0" name="bit" type="int">
+			</argument>
+			<argument index="1" name="value" type="bool">
+			</argument>
 			<description>
-			Return the direction used for one-way collision detection.
+				Set/clear individual bits on the collision mask. This makes selecting the areas scanned easier.
 			</description>
 		</method>
-		<method name="set_one_way_collision_max_depth">
-			<argument index="0" name="depth" type="float">
+		<method name="set_layer_mask">
+			<argument index="0" name="mask" type="int">
 			</argument>
 			<description>
-			Set how far a body can go through this one, when it allows one-way collisions (see [method set_one_way_collision_direction]).
+				Set the physics layers this area is in.
+				Collidable objects can exist in any of 32 different layers. These layers are not visual, but more of a tagging system instead. A collidable can use these layers/tags to select with which objects it can collide, using [method set_collision_mask].
+				A contact is detected if object A is in any of the layers that object B scans, or object B is in any layer scanned by object A.
 			</description>
 		</method>
-		<method name="get_one_way_collision_max_depth" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_layer_mask_bit">
+			<argument index="0" name="bit" type="int">
+			</argument>
+			<argument index="1" name="value" type="bool">
+			</argument>
 			<description>
-			Return how far a body can go through this one, when it allows one-way collisions.
+				Set/clear individual bits on the layer mask. This makes getting a body in/out of only one layer easier.
 			</description>
 		</method>
-		<method name="add_collision_exception_with">
-			<argument index="0" name="body" type="PhysicsBody2D">
+		<method name="set_one_way_collision_direction">
+			<argument index="0" name="dir" type="Vector2">
 			</argument>
 			<description>
-			Adds a body to the collision exception list. This list contains bodies that this body will not collide with.
+				Set a direction in which bodies can go through this one. If this value is different from (0,0), any movement within 90 degrees of this vector is considered a valid movement. Set this direction to (0,0) to disable one-way collisions.
 			</description>
 		</method>
-		<method name="remove_collision_exception_with">
-			<argument index="0" name="body" type="PhysicsBody2D">
+		<method name="set_one_way_collision_max_depth">
+			<argument index="0" name="depth" type="float">
 			</argument>
 			<description>
-			Removes a body from the collision exception list.
+				Set how far a body can go through this one, when it allows one-way collisions (see [method set_one_way_collision_direction]).
 			</description>
 		</method>
 	</methods>
@@ -26969,191 +27254,191 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="get_total_gravity" qualifiers="const">
-			<return type="Vector3">
-			</return>
+		<method name="add_force">
+			<argument index="0" name="force" type="Vector3">
+			</argument>
+			<argument index="1" name="pos" type="Vector3">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_total_linear_damp" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="apply_impulse">
+			<argument index="0" name="pos" type="Vector3">
+			</argument>
+			<argument index="1" name="j" type="Vector3">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_total_angular_damp" qualifiers="const">
-			<return type="float">
+		<method name="get_angular_velocity" qualifiers="const">
+			<return type="Vector3">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_inverse_mass" qualifiers="const">
-			<return type="float">
+		<method name="get_contact_collider" qualifiers="const">
+			<return type="RID">
 			</return>
+			<argument index="0" name="contact_idx" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_inverse_inertia" qualifiers="const">
-			<return type="Vector3">
+		<method name="get_contact_collider_id" qualifiers="const">
+			<return type="int">
 			</return>
+			<argument index="0" name="contact_idx" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_linear_velocity">
-			<argument index="0" name="velocity" type="Vector3">
+		<method name="get_contact_collider_object" qualifiers="const">
+			<return type="Object">
+			</return>
+			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_linear_velocity" qualifiers="const">
+		<method name="get_contact_collider_pos" qualifiers="const">
 			<return type="Vector3">
 			</return>
+			<argument index="0" name="contact_idx" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_angular_velocity">
-			<argument index="0" name="velocity" type="Vector3">
+		<method name="get_contact_collider_shape" qualifiers="const">
+			<return type="int">
+			</return>
+			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_angular_velocity" qualifiers="const">
+		<method name="get_contact_collider_velocity_at_pos" qualifiers="const">
 			<return type="Vector3">
 			</return>
-			<description>
-			</description>
-		</method>
-		<method name="set_transform">
-			<argument index="0" name="transform" type="Transform">
+			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_transform" qualifiers="const">
-			<return type="Transform">
+		<method name="get_contact_count" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="add_force">
-			<argument index="0" name="force" type="Vector3">
-			</argument>
-			<argument index="1" name="pos" type="Vector3">
+		<method name="get_contact_local_normal" qualifiers="const">
+			<return type="Vector3">
+			</return>
+			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="apply_impulse">
-			<argument index="0" name="pos" type="Vector3">
-			</argument>
-			<argument index="1" name="j" type="Vector3">
+		<method name="get_contact_local_pos" qualifiers="const">
+			<return type="Vector3">
+			</return>
+			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_sleep_state">
-			<argument index="0" name="enabled" type="bool">
+		<method name="get_contact_local_shape" qualifiers="const">
+			<return type="int">
+			</return>
+			<argument index="0" name="contact_idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_sleeping" qualifiers="const">
-			<return type="bool">
+		<method name="get_inverse_inertia" qualifiers="const">
+			<return type="Vector3">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_contact_count" qualifiers="const">
-			<return type="int">
+		<method name="get_inverse_mass" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_contact_local_pos" qualifiers="const">
+		<method name="get_linear_velocity" qualifiers="const">
 			<return type="Vector3">
 			</return>
-			<argument index="0" name="contact_idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_contact_local_normal" qualifiers="const">
-			<return type="Vector3">
+		<method name="get_space_state">
+			<return type="PhysicsDirectSpaceState">
 			</return>
-			<argument index="0" name="contact_idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_contact_local_shape" qualifiers="const">
-			<return type="int">
+		<method name="get_step" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="contact_idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_contact_collider" qualifiers="const">
-			<return type="RID">
+		<method name="get_total_angular_damp" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="contact_idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_contact_collider_pos" qualifiers="const">
+		<method name="get_total_gravity" qualifiers="const">
 			<return type="Vector3">
 			</return>
-			<argument index="0" name="contact_idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_contact_collider_id" qualifiers="const">
-			<return type="int">
+		<method name="get_total_linear_damp" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="contact_idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_contact_collider_object" qualifiers="const">
-			<return type="Object">
+		<method name="get_transform" qualifiers="const">
+			<return type="Transform">
 			</return>
-			<argument index="0" name="contact_idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_contact_collider_shape" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="contact_idx" type="int">
-			</argument>
+		<method name="integrate_forces">
 			<description>
 			</description>
 		</method>
-		<method name="get_contact_collider_velocity_at_pos" qualifiers="const">
-			<return type="Vector3">
+		<method name="is_sleeping" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="contact_idx" type="int">
+			<description>
+			</description>
+		</method>
+		<method name="set_angular_velocity">
+			<argument index="0" name="velocity" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_step" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_linear_velocity">
+			<argument index="0" name="velocity" type="Vector3">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="integrate_forces">
+		<method name="set_sleep_state">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_space_state">
-			<return type="PhysicsDirectSpaceState">
-			</return>
+		<method name="set_transform">
+			<argument index="0" name="transform" type="Transform">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -27177,23 +27462,17 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="intersect_ray">
-			<return type="Dictionary">
+		<method name="cast_motion">
+			<return type="Array">
 			</return>
-			<argument index="0" name="from" type="Vector3">
-			</argument>
-			<argument index="1" name="to" type="Vector3">
-			</argument>
-			<argument index="2" name="exclude" type="Array" default="Array()">
-			</argument>
-			<argument index="3" name="layer_mask" type="int" default="2147483647">
+			<argument index="0" name="shape" type="PhysicsShapeQueryParameters">
 			</argument>
-			<argument index="4" name="type_mask" type="int" default="15">
+			<argument index="1" name="motion" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="intersect_shape">
+		<method name="collide_shape">
 			<return type="Array">
 			</return>
 			<argument index="0" name="shape" type="PhysicsShapeQueryParameters">
@@ -27203,31 +27482,37 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="cast_motion">
-			<return type="Array">
+		<method name="get_rest_info">
+			<return type="Dictionary">
 			</return>
 			<argument index="0" name="shape" type="PhysicsShapeQueryParameters">
 			</argument>
-			<argument index="1" name="motion" type="Vector3">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="collide_shape">
-			<return type="Array">
+		<method name="intersect_ray">
+			<return type="Dictionary">
 			</return>
-			<argument index="0" name="shape" type="PhysicsShapeQueryParameters">
+			<argument index="0" name="from" type="Vector3">
 			</argument>
-			<argument index="1" name="max_results" type="int" default="32">
+			<argument index="1" name="to" type="Vector3">
+			</argument>
+			<argument index="2" name="exclude" type="Array" default="Array()">
+			</argument>
+			<argument index="3" name="layer_mask" type="int" default="2147483647">
+			</argument>
+			<argument index="4" name="type_mask" type="int" default="15">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_rest_info">
-			<return type="Dictionary">
+		<method name="intersect_shape">
+			<return type="Array">
 			</return>
 			<argument index="0" name="shape" type="PhysicsShapeQueryParameters">
 			</argument>
+			<argument index="1" name="max_results" type="int" default="32">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -27253,117 +27538,63 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="shape_create">
-			<return type="RID">
-			</return>
-			<argument index="0" name="type" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="shape_set_data">
-			<argument index="0" name="shape" type="RID">
-			</argument>
-			<argument index="1" name="data" type="Variant">
+		<method name="area_add_shape">
+			<argument index="0" name="area" type="RID">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="shape_get_type" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="shape" type="RID">
+			<argument index="1" name="shape" type="RID">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="shape_get_data" qualifiers="const">
-			<argument index="0" name="shape" type="RID">
+			<argument index="2" name="transform" type="Transform" default="Transform()">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="space_create">
-			<return type="RID">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="space_set_active">
-			<argument index="0" name="space" type="RID">
-			</argument>
-			<argument index="1" name="active" type="bool">
+		<method name="area_attach_object_instance_ID">
+			<argument index="0" name="area" type="RID">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="space_is_active" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="space" type="RID">
+			<argument index="1" name="id" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="space_set_param">
-			<argument index="0" name="space" type="RID">
-			</argument>
-			<argument index="1" name="param" type="int">
-			</argument>
-			<argument index="2" name="value" type="float">
+		<method name="area_clear_shapes">
+			<argument index="0" name="area" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="space_get_param" qualifiers="const">
-			<return type="float">
+		<method name="area_create">
+			<return type="RID">
 			</return>
-			<argument index="0" name="space" type="RID">
-			</argument>
-			<argument index="1" name="param" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="space_get_direct_state">
-			<return type="PhysicsDirectSpaceState">
+		<method name="area_get_object_instance_ID" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="space" type="RID">
+			<argument index="0" name="area" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="area_create">
-			<return type="RID">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="area_set_space">
+		<method name="area_get_param" qualifiers="const">
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="space" type="RID">
+			<argument index="1" name="param" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="area_get_space" qualifiers="const">
+		<method name="area_get_shape" qualifiers="const">
 			<return type="RID">
 			</return>
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="area_set_space_override_mode">
-			<argument index="0" name="area" type="RID">
-			</argument>
-			<argument index="1" name="mode" type="int">
+			<argument index="1" name="shape_idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="area_get_space_override_mode" qualifiers="const">
+		<method name="area_get_shape_count" qualifiers="const">
 			<return type="int">
 			</return>
 			<argument index="0" name="area" type="RID">
@@ -27371,37 +27602,25 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="area_add_shape">
-			<argument index="0" name="area" type="RID">
-			</argument>
-			<argument index="1" name="shape" type="RID">
-			</argument>
-			<argument index="2" name="transform" type="Transform" default="Transform()">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="area_set_shape">
+		<method name="area_get_shape_transform" qualifiers="const">
+			<return type="Transform">
+			</return>
 			<argument index="0" name="area" type="RID">
 			</argument>
 			<argument index="1" name="shape_idx" type="int">
 			</argument>
-			<argument index="2" name="shape" type="RID">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="area_set_shape_transform">
+		<method name="area_get_space" qualifiers="const">
+			<return type="RID">
+			</return>
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="shape_idx" type="int">
-			</argument>
-			<argument index="2" name="transform" type="Transform">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="area_get_shape_count" qualifiers="const">
+		<method name="area_get_space_override_mode" qualifiers="const">
 			<return type="int">
 			</return>
 			<argument index="0" name="area" type="RID">
@@ -27409,23 +27628,19 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="area_get_shape" qualifiers="const">
-			<return type="RID">
+		<method name="area_get_transform" qualifiers="const">
+			<return type="Transform">
 			</return>
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="shape_idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="area_get_shape_transform" qualifiers="const">
-			<return type="Transform">
+		<method name="area_is_ray_pickable" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="shape_idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
@@ -27437,9 +27652,11 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="area_clear_shapes">
+		<method name="area_set_collision_mask">
 			<argument index="0" name="area" type="RID">
 			</argument>
+			<argument index="1" name="mask" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -27451,10 +27668,12 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="area_set_collision_mask">
+		<method name="area_set_monitor_callback">
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="mask" type="int">
+			<argument index="1" name="receiver" type="Object">
+			</argument>
+			<argument index="2" name="method" type="String">
 			</argument>
 			<description>
 			</description>
@@ -27469,141 +27688,129 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="area_set_transform">
+		<method name="area_set_ray_pickable">
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="transform" type="Transform">
+			<argument index="1" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="area_get_param" qualifiers="const">
+		<method name="area_set_shape">
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int">
+			<argument index="1" name="shape_idx" type="int">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="area_get_transform" qualifiers="const">
-			<return type="Transform">
-			</return>
-			<argument index="0" name="area" type="RID">
+			<argument index="2" name="shape" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="area_attach_object_instance_ID">
+		<method name="area_set_shape_transform">
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="id" type="int">
+			<argument index="1" name="shape_idx" type="int">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="area_get_object_instance_ID" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="area" type="RID">
+			<argument index="2" name="transform" type="Transform">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="area_set_monitor_callback">
+		<method name="area_set_space">
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="receiver" type="Object">
-			</argument>
-			<argument index="2" name="method" type="String">
+			<argument index="1" name="space" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="area_set_ray_pickable">
+		<method name="area_set_space_override_mode">
 			<argument index="0" name="area" type="RID">
 			</argument>
-			<argument index="1" name="enable" type="bool">
+			<argument index="1" name="mode" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="area_is_ray_pickable" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="area_set_transform">
 			<argument index="0" name="area" type="RID">
 			</argument>
+			<argument index="1" name="transform" type="Transform">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_create">
-			<return type="RID">
-			</return>
-			<argument index="0" name="mode" type="int" default="2">
+		<method name="body_add_collision_exception">
+			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="init_sleeping" type="bool" default="false">
+			<argument index="1" name="excepted_body" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_set_space">
+		<method name="body_add_shape">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="space" type="RID">
+			<argument index="1" name="shape" type="RID">
+			</argument>
+			<argument index="2" name="transform" type="Transform" default="Transform()">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_get_space" qualifiers="const">
-			<return type="RID">
-			</return>
+		<method name="body_apply_impulse">
 			<argument index="0" name="body" type="RID">
 			</argument>
+			<argument index="1" name="pos" type="Vector3">
+			</argument>
+			<argument index="2" name="impulse" type="Vector3">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_set_mode">
+		<method name="body_attach_object_instance_ID">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="mode" type="int">
+			<argument index="1" name="id" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_get_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="body_clear_shapes">
 			<argument index="0" name="body" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_set_layer_mask">
-			<argument index="0" name="body" type="RID">
+		<method name="body_create">
+			<return type="RID">
+			</return>
+			<argument index="0" name="mode" type="int" default="2">
 			</argument>
-			<argument index="1" name="mask" type="int">
+			<argument index="1" name="init_sleeping" type="bool" default="false">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_get_layer_mask" qualifiers="const">
+		<method name="body_get_axis_lock" qualifiers="const">
 			<return type="int">
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_set_collision_mask">
+		<method name="body_get_collision_mask" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="mask" type="int">
+			<argument index="1" name="arg1" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_get_collision_mask" qualifiers="const">
+		<method name="body_get_layer_mask" qualifiers="const">
 			<return type="int">
 			</return>
 			<argument index="0" name="body" type="RID">
@@ -27613,41 +27820,37 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="body_add_shape">
+		<method name="body_get_max_contacts_reported" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="shape" type="RID">
-			</argument>
-			<argument index="2" name="transform" type="Transform" default="Transform()">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_set_shape">
+		<method name="body_get_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="shape_idx" type="int">
-			</argument>
-			<argument index="2" name="shape" type="RID">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_set_shape_transform">
+		<method name="body_get_object_instance_ID" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="shape_idx" type="int">
-			</argument>
-			<argument index="2" name="transform" type="Transform">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_get_shape_count" qualifiers="const">
-			<return type="int">
+		<method name="body_get_param" qualifiers="const">
+			<return type="float">
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
+			<argument index="1" name="param" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -27661,17 +27864,17 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="body_get_shape_transform" qualifiers="const">
-			<return type="Transform">
+		<method name="body_get_shape_count" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="shape_idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_remove_shape">
+		<method name="body_get_shape_transform" qualifiers="const">
+			<return type="Transform">
+			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
 			<argument index="1" name="shape_idx" type="int">
@@ -27679,37 +27882,39 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="body_clear_shapes">
+		<method name="body_get_space" qualifiers="const">
+			<return type="RID">
+			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_attach_object_instance_ID">
+		<method name="body_get_state" qualifiers="const">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="id" type="int">
+			<argument index="1" name="state" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_get_object_instance_ID" qualifiers="const">
-			<return type="int">
+		<method name="body_is_continuous_collision_detection_enabled" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_set_enable_continuous_collision_detection">
+		<method name="body_is_omitting_force_integration" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="enable" type="bool">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_is_continuous_collision_detection_enabled" qualifiers="const">
+		<method name="body_is_ray_pickable" qualifiers="const">
 			<return type="bool">
 			</return>
 			<argument index="0" name="body" type="RID">
@@ -27717,111 +27922,109 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="body_set_param">
+		<method name="body_remove_collision_exception">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int">
-			</argument>
-			<argument index="2" name="value" type="float">
+			<argument index="1" name="excepted_body" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_get_param" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="body_remove_shape">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int">
+			<argument index="1" name="shape_idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_set_state">
+		<method name="body_set_axis_lock">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="state" type="int">
-			</argument>
-			<argument index="2" name="value" type="Variant">
+			<argument index="1" name="axis" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_get_state" qualifiers="const">
+		<method name="body_set_axis_velocity">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="state" type="int">
+			<argument index="1" name="axis_velocity" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_apply_impulse">
+		<method name="body_set_collision_mask">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="pos" type="Vector3">
-			</argument>
-			<argument index="2" name="impulse" type="Vector3">
+			<argument index="1" name="mask" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_set_axis_velocity">
+		<method name="body_set_enable_continuous_collision_detection">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="axis_velocity" type="Vector3">
+			<argument index="1" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_set_axis_lock">
+		<method name="body_set_force_integration_callback">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="axis" type="int">
+			<argument index="1" name="receiver" type="Object">
+			</argument>
+			<argument index="2" name="method" type="String">
+			</argument>
+			<argument index="3" name="userdata" type="Variant" default="NULL">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_get_axis_lock" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="body_set_layer_mask">
 			<argument index="0" name="body" type="RID">
 			</argument>
+			<argument index="1" name="mask" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_add_collision_exception">
+		<method name="body_set_max_contacts_reported">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="excepted_body" type="RID">
+			<argument index="1" name="amount" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_remove_collision_exception">
+		<method name="body_set_mode">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="excepted_body" type="RID">
+			<argument index="1" name="mode" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_set_max_contacts_reported">
+		<method name="body_set_omit_force_integration">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="amount" type="int">
+			<argument index="1" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_get_max_contacts_reported" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="body_set_param">
 			<argument index="0" name="body" type="RID">
 			</argument>
+			<argument index="1" name="param" type="int">
+			</argument>
+			<argument index="2" name="value" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_set_omit_force_integration">
+		<method name="body_set_ray_pickable">
 			<argument index="0" name="body" type="RID">
 			</argument>
 			<argument index="1" name="enable" type="bool">
@@ -27829,57 +28032,55 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="body_is_omitting_force_integration" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="body_set_shape">
 			<argument index="0" name="body" type="RID">
 			</argument>
+			<argument index="1" name="shape_idx" type="int">
+			</argument>
+			<argument index="2" name="shape" type="RID">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_set_force_integration_callback">
+		<method name="body_set_shape_transform">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="receiver" type="Object">
-			</argument>
-			<argument index="2" name="method" type="String">
+			<argument index="1" name="shape_idx" type="int">
 			</argument>
-			<argument index="3" name="userdata" type="Variant" default="NULL">
+			<argument index="2" name="transform" type="Transform">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_set_ray_pickable">
+		<method name="body_set_space">
 			<argument index="0" name="body" type="RID">
 			</argument>
-			<argument index="1" name="enable" type="bool">
+			<argument index="1" name="space" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="body_is_ray_pickable" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="body_set_state">
 			<argument index="0" name="body" type="RID">
 			</argument>
+			<argument index="1" name="state" type="int">
+			</argument>
+			<argument index="2" name="value" type="Variant">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="joint_create_pin">
-			<return type="RID">
+		<method name="cone_twist_joint_get_param" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="body_A" type="RID">
-			</argument>
-			<argument index="1" name="local_A" type="Vector3">
-			</argument>
-			<argument index="2" name="body_B" type="RID">
+			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="3" name="local_B" type="Vector3">
+			<argument index="1" name="param" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="pin_joint_set_param">
+		<method name="cone_twist_joint_set_param">
 			<argument index="0" name="joint" type="RID">
 			</argument>
 			<argument index="1" name="param" type="int">
@@ -27889,68 +28090,74 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="pin_joint_get_param" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="joint" type="RID">
-			</argument>
-			<argument index="1" name="param" type="int">
+		<method name="free_rid">
+			<argument index="0" name="rid" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="pin_joint_set_local_A">
+		<method name="generic_6dof_joint_get_flag">
+			<return type="bool">
+			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="local_A" type="Vector3">
+			<argument index="1" name="axis" type="int">
+			</argument>
+			<argument index="2" name="flag" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="pin_joint_get_local_A" qualifiers="const">
-			<return type="Vector3">
+		<method name="generic_6dof_joint_get_param">
+			<return type="float">
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
+			<argument index="1" name="axis" type="int">
+			</argument>
+			<argument index="2" name="param" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="pin_joint_set_local_B">
+		<method name="generic_6dof_joint_set_flag">
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="local_B" type="Vector3">
+			<argument index="1" name="axis" type="int">
+			</argument>
+			<argument index="2" name="flag" type="int">
+			</argument>
+			<argument index="3" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="pin_joint_get_local_B" qualifiers="const">
-			<return type="Vector3">
-			</return>
+		<method name="generic_6dof_joint_set_param">
 			<argument index="0" name="joint" type="RID">
 			</argument>
+			<argument index="1" name="axis" type="int">
+			</argument>
+			<argument index="2" name="param" type="int">
+			</argument>
+			<argument index="3" name="value" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="joint_create_hinge">
-			<return type="RID">
+		<method name="get_process_info">
+			<return type="int">
 			</return>
-			<argument index="0" name="body_A" type="RID">
-			</argument>
-			<argument index="1" name="hinge_A" type="Transform">
-			</argument>
-			<argument index="2" name="body_B" type="RID">
-			</argument>
-			<argument index="3" name="hinge_B" type="Transform">
+			<argument index="0" name="process_info" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="hinge_joint_set_param">
+		<method name="hinge_joint_get_flag" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int">
-			</argument>
-			<argument index="2" name="value" type="float">
+			<argument index="1" name="flag" type="int">
 			</argument>
 			<description>
 			</description>
@@ -27975,17 +28182,17 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="hinge_joint_get_flag" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="hinge_joint_set_param">
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="flag" type="int">
+			<argument index="1" name="param" type="int">
+			</argument>
+			<argument index="2" name="value" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="joint_create_slider">
+		<method name="joint_create_cone_twist">
 			<return type="RID">
 			</return>
 			<argument index="0" name="body_A" type="RID">
@@ -27999,57 +28206,67 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="slider_joint_set_param">
-			<argument index="0" name="joint" type="RID">
+		<method name="joint_create_generic_6dof">
+			<return type="RID">
+			</return>
+			<argument index="0" name="body_A" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int">
+			<argument index="1" name="local_ref_A" type="Transform">
 			</argument>
-			<argument index="2" name="value" type="float">
+			<argument index="2" name="body_B" type="RID">
+			</argument>
+			<argument index="3" name="local_ref_B" type="Transform">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="slider_joint_get_param" qualifiers="const">
-			<return type="float">
+		<method name="joint_create_hinge">
+			<return type="RID">
 			</return>
-			<argument index="0" name="joint" type="RID">
+			<argument index="0" name="body_A" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int">
+			<argument index="1" name="hinge_A" type="Transform">
+			</argument>
+			<argument index="2" name="body_B" type="RID">
+			</argument>
+			<argument index="3" name="hinge_B" type="Transform">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="joint_create_cone_twist">
+		<method name="joint_create_pin">
 			<return type="RID">
 			</return>
 			<argument index="0" name="body_A" type="RID">
 			</argument>
-			<argument index="1" name="local_ref_A" type="Transform">
+			<argument index="1" name="local_A" type="Vector3">
 			</argument>
 			<argument index="2" name="body_B" type="RID">
 			</argument>
-			<argument index="3" name="local_ref_B" type="Transform">
+			<argument index="3" name="local_B" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="cone_twist_joint_set_param">
-			<argument index="0" name="joint" type="RID">
+		<method name="joint_create_slider">
+			<return type="RID">
+			</return>
+			<argument index="0" name="body_A" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int">
+			<argument index="1" name="local_ref_A" type="Transform">
 			</argument>
-			<argument index="2" name="value" type="float">
+			<argument index="2" name="body_B" type="RID">
+			</argument>
+			<argument index="3" name="local_ref_B" type="Transform">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="cone_twist_joint_get_param" qualifiers="const">
-			<return type="float">
+		<method name="joint_get_solver_priority" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="param" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
@@ -28069,92 +28286,160 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="joint_get_solver_priority" qualifiers="const">
-			<return type="int">
+		<method name="pin_joint_get_local_A" qualifiers="const">
+			<return type="Vector3">
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="joint_create_generic_6dof">
-			<return type="RID">
+		<method name="pin_joint_get_local_B" qualifiers="const">
+			<return type="Vector3">
 			</return>
-			<argument index="0" name="body_A" type="RID">
-			</argument>
-			<argument index="1" name="local_ref_A" type="Transform">
+			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="2" name="body_B" type="RID">
+			<description>
+			</description>
+		</method>
+		<method name="pin_joint_get_param" qualifiers="const">
+			<return type="float">
+			</return>
+			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="3" name="local_ref_B" type="Transform">
+			<argument index="1" name="param" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="generic_6dof_joint_set_param">
+		<method name="pin_joint_set_local_A">
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="axis" type="int">
+			<argument index="1" name="local_A" type="Vector3">
 			</argument>
-			<argument index="2" name="param" type="int">
+			<description>
+			</description>
+		</method>
+		<method name="pin_joint_set_local_B">
+			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="3" name="value" type="float">
+			<argument index="1" name="local_B" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="generic_6dof_joint_get_param">
-			<return type="float">
-			</return>
+		<method name="pin_joint_set_param">
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="axis" type="int">
+			<argument index="1" name="param" type="int">
 			</argument>
-			<argument index="2" name="param" type="int">
+			<argument index="2" name="value" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="generic_6dof_joint_set_flag">
-			<argument index="0" name="joint" type="RID">
+		<method name="set_active">
+			<argument index="0" name="active" type="bool">
 			</argument>
-			<argument index="1" name="axis" type="int">
+			<description>
+			</description>
+		</method>
+		<method name="shape_create">
+			<return type="RID">
+			</return>
+			<argument index="0" name="type" type="int">
 			</argument>
-			<argument index="2" name="flag" type="int">
+			<description>
+			</description>
+		</method>
+		<method name="shape_get_data" qualifiers="const">
+			<argument index="0" name="shape" type="RID">
 			</argument>
-			<argument index="3" name="enable" type="bool">
+			<description>
+			</description>
+		</method>
+		<method name="shape_get_type" qualifiers="const">
+			<return type="int">
+			</return>
+			<argument index="0" name="shape" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="generic_6dof_joint_get_flag">
-			<return type="bool">
+		<method name="shape_set_data">
+			<argument index="0" name="shape" type="RID">
+			</argument>
+			<argument index="1" name="data" type="Variant">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="slider_joint_get_param" qualifiers="const">
+			<return type="float">
 			</return>
 			<argument index="0" name="joint" type="RID">
 			</argument>
-			<argument index="1" name="axis" type="int">
+			<argument index="1" name="param" type="int">
 			</argument>
-			<argument index="2" name="flag" type="int">
+			<description>
+			</description>
+		</method>
+		<method name="slider_joint_set_param">
+			<argument index="0" name="joint" type="RID">
+			</argument>
+			<argument index="1" name="param" type="int">
+			</argument>
+			<argument index="2" name="value" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="free_rid">
-			<argument index="0" name="rid" type="RID">
+		<method name="space_create">
+			<return type="RID">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="space_get_direct_state">
+			<return type="PhysicsDirectSpaceState">
+			</return>
+			<argument index="0" name="space" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_active">
-			<argument index="0" name="active" type="bool">
+		<method name="space_get_param" qualifiers="const">
+			<return type="float">
+			</return>
+			<argument index="0" name="space" type="RID">
+			</argument>
+			<argument index="1" name="param" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_process_info">
-			<return type="int">
+		<method name="space_is_active" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="process_info" type="int">
+			<argument index="0" name="space" type="RID">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="space_set_active">
+			<argument index="0" name="space" type="RID">
+			</argument>
+			<argument index="1" name="active" type="bool">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="space_set_param">
+			<argument index="0" name="space" type="RID">
+			</argument>
+			<argument index="1" name="param" type="int">
+			</argument>
+			<argument index="2" name="value" type="float">
 			</argument>
 			<description>
 			</description>
@@ -28396,45 +28681,45 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_shape">
-			<argument index="0" name="shape" type="Shape">
-			</argument>
+		<method name="get_exclude" qualifiers="const">
+			<return type="Array">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_shape_rid">
-			<argument index="0" name="shape" type="RID">
-			</argument>
+		<method name="get_layer_mask" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_shape_rid" qualifiers="const">
-			<return type="RID">
+		<method name="get_margin" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_transform">
-			<argument index="0" name="transform" type="Transform">
-			</argument>
+		<method name="get_object_type_mask" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_transform" qualifiers="const">
-			<return type="Transform">
+		<method name="get_shape_rid" qualifiers="const">
+			<return type="RID">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_margin">
-			<argument index="0" name="margin" type="float">
-			</argument>
+		<method name="get_transform" qualifiers="const">
+			<return type="Transform">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_margin" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_exclude">
+			<argument index="0" name="exclude" type="Array">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -28444,9 +28729,9 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_layer_mask" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_margin">
+			<argument index="0" name="margin" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -28456,21 +28741,21 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_object_type_mask" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_shape">
+			<argument index="0" name="shape" type="Shape">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_exclude">
-			<argument index="0" name="exclude" type="Array">
+		<method name="set_shape_rid">
+			<argument index="0" name="shape" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_exclude" qualifiers="const">
-			<return type="Array">
-			</return>
+		<method name="set_transform">
+			<argument index="0" name="transform" type="Transform">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -28480,7 +28765,7 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="PhysicsShapeQueryResult" inherits="Reference" category="Core">
 	<brief_description>
-	Result of a shape query in Physics2DServer.
+		Result of a shape query in Physics2DServer.
 	</brief_description>
 	<description>
 	</description>
@@ -28491,8 +28776,8 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_result_rid" qualifiers="const">
-			<return type="RID">
+		<method name="get_result_object" qualifiers="const">
+			<return type="Object">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
@@ -28507,16 +28792,16 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_result_object" qualifiers="const">
-			<return type="Object">
+		<method name="get_result_object_shape" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_result_object_shape" qualifiers="const">
-			<return type="int">
+		<method name="get_result_rid" qualifiers="const">
+			<return type="RID">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
@@ -28533,19 +28818,19 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_param">
+		<method name="get_param" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="param" type="int">
 			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_param" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_param">
 			<argument index="0" name="param" type="int">
 			</argument>
+			<argument index="1" name="value" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -28561,41 +28846,80 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="PinJoint2D" inherits="Joint2D" category="Core">
 	<brief_description>
-	Pin Joint for 2D Shapes.
+		Pin Joint for 2D Shapes.
 	</brief_description>
 	<description>
-	Pin Joint for 2D Rigid Bodies. It pins 2 bodies (rigid or static) together, or a single body to a fixed position in space.
+		Pin Joint for 2D Rigid Bodies. It pins 2 bodies (rigid or static) together, or a single body to a fixed position in space.
 	</description>
 	<methods>
-		<method name="set_softness">
-			<argument index="0" name="softness" type="float">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_softness" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
+		<method name="set_softness">
+			<argument index="0" name="softness" type="float">
+			</argument>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<constants>
 	</constants>
 </class>
 <class name="Plane" category="Built-In Types">
 	<brief_description>
-	Plane in hessian form.
+		Plane in hessian form.
 	</brief_description>
 	<description>
-	Plane represents a normalized plane equation. Basically, "normal" is the normal of the plane (a,b,c normalized), and "d" is the distance from the origin to the plane (in the direction of "normal"). "Over" or "Above" the plane is considered the side of the plane towards where the normal is pointing.
+		Plane represents a normalized plane equation. Basically, "normal" is the normal of the plane (a,b,c normalized), and "d" is the distance from the origin to the plane (in the direction of "normal"). "Over" or "Above" the plane is considered the side of the plane towards where the normal is pointing.
 	</description>
 	<methods>
+		<method name="Plane">
+			<return type="Plane">
+			</return>
+			<argument index="0" name="a" type="float">
+			</argument>
+			<argument index="1" name="b" type="float">
+			</argument>
+			<argument index="2" name="c" type="float">
+			</argument>
+			<argument index="3" name="d" type="float">
+			</argument>
+			<description>
+				Creates a plane from the three parameters "a", "b", "c" and "d".
+			</description>
+		</method>
+		<method name="Plane">
+			<return type="Plane">
+			</return>
+			<argument index="0" name="v1" type="Vector3">
+			</argument>
+			<argument index="1" name="v2" type="Vector3">
+			</argument>
+			<argument index="2" name="v3" type="Vector3">
+			</argument>
+			<description>
+				Creates a plane from three points.
+			</description>
+		</method>
+		<method name="Plane">
+			<return type="Plane">
+			</return>
+			<argument index="0" name="normal" type="Vector3">
+			</argument>
+			<argument index="1" name="d" type="float">
+			</argument>
+			<description>
+				Creates a plane from the normal and the plane's distance to the origin.
+			</description>
+		</method>
 		<method name="center">
 			<return type="Vector3">
 			</return>
 			<description>
-			Returns the center of the plane.
+				Returns the center of the plane.
 			</description>
 		</method>
 		<method name="distance_to">
@@ -28604,14 +28928,14 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="point" type="Vector3">
 			</argument>
 			<description>
-			Returns the shortest distance from the plane to the position "point".
+				Returns the shortest distance from the plane to the position "point".
 			</description>
 		</method>
 		<method name="get_any_point">
 			<return type="Vector3">
 			</return>
 			<description>
-			Returns a point on the plane.
+				Returns a point on the plane.
 			</description>
 		</method>
 		<method name="has_point">
@@ -28622,7 +28946,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="epsilon" type="float" default="0.00001">
 			</argument>
 			<description>
-			Returns true if "point" is inside the plane (by a very minimum threshold).
+				Returns true if "point" is inside the plane (by a very minimum threshold).
 			</description>
 		</method>
 		<method name="intersect_3">
@@ -28633,7 +28957,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="c" type="Plane">
 			</argument>
 			<description>
-			Returns the intersection point of the three planes "b", "c" and this plane. If no intersection is found null is returned.
+				Returns the intersection point of the three planes "b", "c" and this plane. If no intersection is found null is returned.
 			</description>
 		</method>
 		<method name="intersects_ray">
@@ -28644,7 +28968,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="dir" type="Vector3">
 			</argument>
 			<description>
-			Returns the intersection point of a ray consisting of the position "from" and the direction normal "dir" with this plane. If no intersection is found null is returned.
+				Returns the intersection point of a ray consisting of the position "from" and the direction normal "dir" with this plane. If no intersection is found null is returned.
 			</description>
 		</method>
 		<method name="intersects_segment">
@@ -28655,7 +28979,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="end" type="Vector3">
 			</argument>
 			<description>
-			Returns the intersection point of a segment from position "begin" to position "end" with this plane. If no intersection is found null is returned.
+				Returns the intersection point of a segment from position "begin" to position "end" with this plane. If no intersection is found null is returned.
 			</description>
 		</method>
 		<method name="is_point_over">
@@ -28664,14 +28988,14 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="point" type="Vector3">
 			</argument>
 			<description>
-			Returns true if "point" is located above the plane.
+				Returns true if "point" is located above the plane.
 			</description>
 		</method>
 		<method name="normalized">
 			<return type="Plane">
 			</return>
 			<description>
-			Returns a copy of the plane, normalized.
+				Returns a copy of the plane, normalized.
 			</description>
 		</method>
 		<method name="project">
@@ -28680,50 +29004,13 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="point" type="Vector3">
 			</argument>
 			<description>
-			Returns the orthogonal projection of point "p" into a point in the plane.
-			</description>
-		</method>
-		<method name="Plane">
-			<return type="Plane">
-			</return>
-			<argument index="0" name="a" type="float">
-			</argument>
-			<argument index="1" name="b" type="float">
-			</argument>
-			<argument index="2" name="c" type="float">
-			</argument>
-			<argument index="3" name="d" type="float">
-			</argument>
-			<description>
-			Creates a plane from the three parameters "a", "b", "c" and "d".
-			</description>
-		</method>
-		<method name="Plane">
-			<return type="Plane">
-			</return>
-			<argument index="0" name="v1" type="Vector3">
-			</argument>
-			<argument index="1" name="v2" type="Vector3">
-			</argument>
-			<argument index="2" name="v3" type="Vector3">
-			</argument>
-			<description>
-			Creates a plane from three points.
-			</description>
-		</method>
-		<method name="Plane">
-			<return type="Plane">
-			</return>
-			<argument index="0" name="normal" type="Vector3">
-			</argument>
-			<argument index="1" name="d" type="float">
-			</argument>
-			<description>
-			Creates a plane from the normal and the plane's distance to the origin.
+				Returns the orthogonal projection of point "p" into a point in the plane.
 			</description>
 		</method>
 	</methods>
 	<members>
+		<member name="d" type="float">
+		</member>
 		<member name="normal" type="Vector3">
 		</member>
 		<member name="x" type="float">
@@ -28732,8 +29019,6 @@ This method controls whether the position between two cached points is interpola
 		</member>
 		<member name="z" type="float">
 		</member>
-		<member name="d" type="float">
-		</member>
 	</members>
 	<constants>
 	</constants>
@@ -28744,183 +29029,183 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_plane">
-			<argument index="0" name="plane" type="Plane">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_plane" qualifiers="const">
 			<return type="Plane">
 			</return>
 			<description>
 			</description>
 		</method>
+		<method name="set_plane">
+			<argument index="0" name="plane" type="Plane">
+			</argument>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<constants>
 	</constants>
 </class>
 <class name="Polygon2D" inherits="Node2D" category="Core">
 	<brief_description>
-	2D polygon representation
+		2D polygon representation
 	</brief_description>
 	<description>
-	A Polygon2D is defined by a set of n vertices connected together by line segments, meaning that the vertex 1 will be connected with vertex 2, vertex 2 with vertex 3 ..., vertex n-1 with vertex n and vertex n with vertex 1 in order to close the loop and define a polygon.
+		A Polygon2D is defined by a set of n vertices connected together by line segments, meaning that the vertex 1 will be connected with vertex 2, vertex 2 with vertex 3 ..., vertex n-1 with vertex n and vertex n with vertex 1 in order to close the loop and define a polygon.
 	</description>
 	<methods>
-		<method name="set_polygon">
-			<argument index="0" name="polygon" type="Vector2Array">
-			</argument>
+		<method name="get_color" qualifiers="const">
+			<return type="Color">
+			</return>
 			<description>
-			Define the set of vertices that will represent the polygon.
+				Return the polygon fill color.
 			</description>
 		</method>
-		<method name="get_polygon" qualifiers="const">
-			<return type="Vector2Array">
+		<method name="get_invert" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the set of vertices that defines this polygon.
+				Return whether this polygon is inverted or not.
 			</description>
 		</method>
-		<method name="set_uv">
-			<argument index="0" name="uv" type="Vector2Array">
-			</argument>
+		<method name="get_invert_border" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the texture coordinates for every vertex of the polygon. There should be one uv vertex for every vertex in the polygon. If there are less, the undefined ones will be assumed to be (0,0). Extra uv vertices are ignored.
+				Return the added padding around the bounding box.
 			</description>
 		</method>
-		<method name="get_uv" qualifiers="const">
-			<return type="Vector2Array">
+		<method name="get_offset" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<description>
-			Return the texture coordinates associated with every vertex of the polygon.
+				Return the offset for the polygon vertices.
 			</description>
 		</method>
-		<method name="set_color">
-			<argument index="0" name="color" type="Color">
-			</argument>
+		<method name="get_polygon" qualifiers="const">
+			<return type="Vector2Array">
+			</return>
 			<description>
-			Set the polygon fill color. If the polygon has a texture defined, the defined texture will be multiplied by the polygon fill color. This, also, is the default color for those vertices that are not defined by [method get_vertex_colors].
+				Return the set of vertices that defines this polygon.
 			</description>
 		</method>
-		<method name="get_color" qualifiers="const">
-			<return type="Color">
+		<method name="get_texture" qualifiers="const">
+			<return type="Object">
 			</return>
 			<description>
-			Return the polygon fill color.
+				Return the polygon texture
 			</description>
 		</method>
-		<method name="set_vertex_colors">
-			<argument index="0" name="vertex_colors" type="ColorArray">
-			</argument>
+		<method name="get_texture_offset" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
-			Set the color for each vertex of the polygon. There should be one color for every vertex in the polygon. If there are less, the undefined ones will be assumed to be [method get_color]. Extra color entries are ignored.
-	Colors are interpolated between vertices, resulting in smooth gradients when they differ.
+				Return the polygon texture offset.
 			</description>
 		</method>
-		<method name="get_vertex_colors" qualifiers="const">
-			<return type="ColorArray">
+		<method name="get_texture_rotation" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return the list of vertex colors.
+				Return the rotation in radians of the texture polygon.
 			</description>
 		</method>
-		<method name="set_texture">
-			<argument index="0" name="texture" type="Object">
-			</argument>
+		<method name="get_texture_scale" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
-			Set the polygon texture.
+				Return the uv coordinate multiplier.
 			</description>
 		</method>
-		<method name="get_texture" qualifiers="const">
-			<return type="Object">
+		<method name="get_uv" qualifiers="const">
+			<return type="Vector2Array">
 			</return>
 			<description>
-			Return the polygon texture
+				Return the texture coordinates associated with every vertex of the polygon.
 			</description>
 		</method>
-		<method name="set_texture_offset">
-			<argument index="0" name="texture_offset" type="Vector2">
-			</argument>
+		<method name="get_vertex_colors" qualifiers="const">
+			<return type="ColorArray">
+			</return>
 			<description>
-			Set the offset of the polygon texture. Initially the texture will appear anchored to the polygon position, the offset is used to move the texture location away from that point (notice that the texture origin is set to its top left corner, so when offset is 0,0 the top left corner of the texture is at the polygon position), for example setting the offset to 10, 10 will move the texture 10 units to the left and 10 units to the top.
+				Return the list of vertex colors.
 			</description>
 		</method>
-		<method name="get_texture_offset" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_color">
+			<argument index="0" name="color" type="Color">
+			</argument>
 			<description>
-			Return the polygon texture offset.
+				Set the polygon fill color. If the polygon has a texture defined, the defined texture will be multiplied by the polygon fill color. This, also, is the default color for those vertices that are not defined by [method get_vertex_colors].
 			</description>
 		</method>
-		<method name="set_texture_rotation">
-			<argument index="0" name="texture_rotation" type="float">
+		<method name="set_invert">
+			<argument index="0" name="invert" type="bool">
 			</argument>
 			<description>
-			Set the amount of rotation of the polygon texture, [code]texture_rotation[/code] is specified in radians and clockwise rotation.
+				Set the polygon as the defined polygon bounding box minus the defined polygon (the defined polygon will appear as a hole on the square that contains the defined polygon).
 			</description>
 		</method>
-		<method name="get_texture_rotation" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_invert_border">
+			<argument index="0" name="invert_border" type="float">
+			</argument>
 			<description>
-			Return the rotation in radians of the texture polygon.
+				Add extra padding around the bounding box, making it bigger. Too small a value can make the polygon triangulate strangely, due to numerical imprecision.
 			</description>
 		</method>
-		<method name="set_texture_scale">
-			<argument index="0" name="texture_scale" type="Vector2">
+		<method name="set_offset">
+			<argument index="0" name="offset" type="Vector2">
 			</argument>
 			<description>
-			Set the value that will multiply the uv coordinates ([method get_uv]) when applying the texture. Larger values make the texture smaller, and vice versa.
+				Set the an offset that will be added to the vertices' position. E.g. if the offset is set to (10,10) then all the polygon points will move 10 units to the right and 10 units to the bottom.
 			</description>
 		</method>
-		<method name="get_texture_scale" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_polygon">
+			<argument index="0" name="polygon" type="Vector2Array">
+			</argument>
 			<description>
-			Return the uv coordinate multiplier.
+				Define the set of vertices that will represent the polygon.
 			</description>
 		</method>
-		<method name="set_invert">
-			<argument index="0" name="invert" type="bool">
+		<method name="set_texture">
+			<argument index="0" name="texture" type="Object">
 			</argument>
 			<description>
-			Set the polygon as the defined polygon bounding box minus the defined polygon (the defined polygon will appear as a hole on the square that contains the defined polygon).
+				Set the polygon texture.
 			</description>
 		</method>
-		<method name="get_invert" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_texture_offset">
+			<argument index="0" name="texture_offset" type="Vector2">
+			</argument>
 			<description>
-			Return whether this polygon is inverted or not.
+				Set the offset of the polygon texture. Initially the texture will appear anchored to the polygon position, the offset is used to move the texture location away from that point (notice that the texture origin is set to its top left corner, so when offset is 0,0 the top left corner of the texture is at the polygon position), for example setting the offset to 10, 10 will move the texture 10 units to the left and 10 units to the top.
 			</description>
 		</method>
-		<method name="set_invert_border">
-			<argument index="0" name="invert_border" type="float">
+		<method name="set_texture_rotation">
+			<argument index="0" name="texture_rotation" type="float">
 			</argument>
 			<description>
-			Add extra padding around the bounding box, making it bigger. Too small a value can make the polygon triangulate strangely, due to numerical imprecision.
+				Set the amount of rotation of the polygon texture, [code]texture_rotation[/code] is specified in radians and clockwise rotation.
 			</description>
 		</method>
-		<method name="get_invert_border" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_texture_scale">
+			<argument index="0" name="texture_scale" type="Vector2">
+			</argument>
 			<description>
-			Return the added padding around the bounding box.
+				Set the value that will multiply the uv coordinates ([method get_uv]) when applying the texture. Larger values make the texture smaller, and vice versa.
 			</description>
 		</method>
-		<method name="set_offset">
-			<argument index="0" name="offset" type="Vector2">
+		<method name="set_uv">
+			<argument index="0" name="uv" type="Vector2Array">
 			</argument>
 			<description>
-			Set the an offset that will be added to the vertices' position. E.g. if the offset is set to (10,10) then all the polygon points will move 10 units to the right and 10 units to the bottom.
+				Set the texture coordinates for every vertex of the polygon. There should be one uv vertex for every vertex in the polygon. If there are less, the undefined ones will be assumed to be (0,0). Extra uv vertices are ignored.
 			</description>
 		</method>
-		<method name="get_offset" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_vertex_colors">
+			<argument index="0" name="vertex_colors" type="ColorArray">
+			</argument>
 			<description>
-			Return the offset for the polygon vertices.
+				Set the color for each vertex of the polygon. There should be one color for every vertex in the polygon. If there are less, the undefined ones will be assumed to be [method get_color]. Extra color entries are ignored.
+	Colors are interpolated between vertices, resulting in smooth gradients when they differ.
 			</description>
 		</method>
 	</methods>
@@ -28933,14 +29218,6 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="setup">
-			<argument index="0" name="points" type="Vector2Array">
-			</argument>
-			<argument index="1" name="connections" type="IntArray">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="find_path">
 			<return type="Vector2Array">
 			</return>
@@ -28951,6 +29228,20 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
+		<method name="get_bounds" qualifiers="const">
+			<return type="Rect2">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="get_closest_point" qualifiers="const">
+			<return type="Vector2">
+			</return>
+			<argument index="0" name="point" type="Vector2">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="get_intersections" qualifiers="const">
 			<return type="Vector2Array">
 			</return>
@@ -28961,10 +29252,10 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_closest_point" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_point_penalty" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="point" type="Vector2">
+			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
@@ -28985,17 +29276,11 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_point_penalty" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="idx" type="int">
+		<method name="setup">
+			<argument index="0" name="points" type="Vector2Array">
+			</argument>
+			<argument index="1" name="connections" type="IntArray">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_bounds" qualifiers="const">
-			<return type="Rect2">
-			</return>
 			<description>
 			</description>
 		</method>
@@ -29005,62 +29290,62 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Popup" inherits="Control" category="Core">
 	<brief_description>
-	Base container control for popups and dialogs.
+		Base container control for popups and dialogs.
 	</brief_description>
 	<description>
-	Popup is a base [Control] used to show dialogs and popups. It's a subwindow and modal by default (see [Control]) and has helpers for custom popup behavior.
+		Popup is a base [Control] used to show dialogs and popups. It's a subwindow and modal by default (see [Control]) and has helpers for custom popup behavior.
 	</description>
 	<methods>
-		<method name="popup_centered">
-			<argument index="0" name="size" type="Vector2" default="Vector2(0,0)">
-			</argument>
+		<method name="is_exclusive" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Popup (show the control in modal form) in the center of the screen, at the current size, or at a size determined by "size".
+				Returns whether the popup will hide other popups when shown on the screen.
 			</description>
 		</method>
-		<method name="popup_centered_ratio">
-			<argument index="0" name="ratio" type="float" default="0.75">
+		<method name="popup">
+			<description>
+				Popup (show the control in modal form).
+			</description>
+		</method>
+		<method name="popup_centered">
+			<argument index="0" name="size" type="Vector2" default="Vector2(0,0)">
 			</argument>
 			<description>
-			Popup (show the control in modal form) in the center of the screen, scaled at a ratio of size of the screen.
+				Popup (show the control in modal form) in the center of the screen, at the current size, or at a size determined by "size".
 			</description>
 		</method>
 		<method name="popup_centered_minsize">
 			<argument index="0" name="minsize" type="Vector2" default="Vector2(0,0)">
 			</argument>
 			<description>
-			Popup (show the control in modal form) in the center of the screen, ensuring the size is never smaller than [code]minsize[/code].
+				Popup (show the control in modal form) in the center of the screen, ensuring the size is never smaller than [code]minsize[/code].
 			</description>
 		</method>
-		<method name="popup">
+		<method name="popup_centered_ratio">
+			<argument index="0" name="ratio" type="float" default="0.75">
+			</argument>
 			<description>
-			Popup (show the control in modal form).
+				Popup (show the control in modal form) in the center of the screen, scaled at a ratio of size of the screen.
 			</description>
 		</method>
 		<method name="set_exclusive">
 			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Make the popup hide other popups when shown on the screen.
-			</description>
-		</method>
-		<method name="is_exclusive" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
-			Returns whether the popup will hide other popups when shown on the screen.
+				Make the popup hide other popups when shown on the screen.
 			</description>
 		</method>
 	</methods>
 	<signals>
-		<signal name="popup_hide">
+		<signal name="about_to_show">
 			<description>
-			This signal is emitted when a popup is hidden.
+				This signal is emitted when a popup is about to be shown. (often used in [PopupMenu] for clearing the list of options and creating a new one according to the current context).
 			</description>
 		</signal>
-		<signal name="about_to_show">
+		<signal name="popup_hide">
 			<description>
-			This signal is emitted when a popup is about to be shown. (often used in [PopupMenu] for clearing the list of options and creating a new one according to the current context).
+				This signal is emitted when a popup is hidden.
 			</description>
 		</signal>
 	</signals>
@@ -29075,10 +29360,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="PopupDialog" inherits="Popup" category="Core">
 	<brief_description>
-	Base class for Popup Dialogs.
+		Base class for Popup Dialogs.
 	</brief_description>
 	<description>
-	PopupDialog is a base class for popup dialogs, along with [WindowDialog].
+		PopupDialog is a base class for popup dialogs, along with [WindowDialog].
 	</description>
 	<methods>
 	</methods>
@@ -29087,34 +29372,29 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="PopupMenu" inherits="Popup" category="Core">
 	<brief_description>
-	PopupMenu displays a list of options.
+		PopupMenu displays a list of options.
 	</brief_description>
 	<description>
-	PopupMenu is the typical Control that displays a list of options. They are popular in toolbars or context menus.
+		PopupMenu is the typical Control that displays a list of options. They are popular in toolbars or context menus.
 	</description>
 	<methods>
-		<method name="add_icon_item">
-			<argument index="0" name="texture" type="Object">
-			</argument>
-			<argument index="1" name="label" type="String">
+		<method name="add_check_item">
+			<argument index="0" name="label" type="String">
 			</argument>
-			<argument index="2" name="id" type="int" default="-1">
+			<argument index="1" name="id" type="int" default="-1">
 			</argument>
-			<argument index="3" name="accel" type="int" default="0">
+			<argument index="2" name="accel" type="int" default="0">
 			</argument>
 			<description>
-			Add a new item with text "label" and icon "texture". An id can optionally be provided, as well as an accelerator keybinding. If no id is provided, one will be created from the index.
+				Add a new checkable item with text "label". An id can optionally be provided, as well as an accelerator. If no id is provided, one will be created from the index. Note that checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually.
 			</description>
 		</method>
-		<method name="add_item">
-			<argument index="0" name="label" type="String">
+		<method name="add_check_shortcut">
+			<argument index="0" name="shortcut" type="ShortCut">
 			</argument>
 			<argument index="1" name="id" type="int" default="-1">
 			</argument>
-			<argument index="2" name="accel" type="int" default="0">
-			</argument>
 			<description>
-			Add a new item with text "label". An id can optionally be provided, as well as an accelerator keybinding. If no id is provided, one will be created from the index.
 			</description>
 		</method>
 		<method name="add_icon_check_item">
@@ -29127,29 +29407,30 @@ This method controls whether the position between two cached points is interpola
 			<argument index="3" name="accel" type="int" default="0">
 			</argument>
 			<description>
-			Add a new checkable item with text "label" and icon "texture". An id can optionally be provided, as well as an accelerator. If no id is provided, one will be created from the index. Note that checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually.
+				Add a new checkable item with text "label" and icon "texture". An id can optionally be provided, as well as an accelerator. If no id is provided, one will be created from the index. Note that checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually.
 			</description>
 		</method>
-		<method name="add_check_item">
-			<argument index="0" name="label" type="String">
+		<method name="add_icon_check_shortcut">
+			<argument index="0" name="texture" type="Object">
 			</argument>
-			<argument index="1" name="id" type="int" default="-1">
+			<argument index="1" name="shortcut" type="ShortCut">
 			</argument>
-			<argument index="2" name="accel" type="int" default="0">
+			<argument index="2" name="id" type="int" default="-1">
 			</argument>
 			<description>
-			Add a new checkable item with text "label". An id can optionally be provided, as well as an accelerator. If no id is provided, one will be created from the index. Note that checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually.
 			</description>
 		</method>
-		<method name="add_submenu_item">
-			<argument index="0" name="label" type="String">
+		<method name="add_icon_item">
+			<argument index="0" name="texture" type="Object">
 			</argument>
-			<argument index="1" name="submenu" type="String">
+			<argument index="1" name="label" type="String">
 			</argument>
 			<argument index="2" name="id" type="int" default="-1">
 			</argument>
+			<argument index="3" name="accel" type="int" default="0">
+			</argument>
 			<description>
-			Adds an item with a submenu. The submenu is the name of a child PopupMenu node that would be shown when the item is clicked. An id can optionally be provided, but if is isn't provided, one will be created from the index.
+				Add a new item with text "label" and icon "texture". An id can optionally be provided, as well as an accelerator keybinding. If no id is provided, one will be created from the index.
 			</description>
 		</method>
 		<method name="add_icon_shortcut">
@@ -29162,25 +29443,23 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="add_shortcut">
-			<argument index="0" name="shortcut" type="ShortCut">
+		<method name="add_item">
+			<argument index="0" name="label" type="String">
 			</argument>
 			<argument index="1" name="id" type="int" default="-1">
 			</argument>
+			<argument index="2" name="accel" type="int" default="0">
+			</argument>
 			<description>
+				Add a new item with text "label". An id can optionally be provided, as well as an accelerator keybinding. If no id is provided, one will be created from the index.
 			</description>
 		</method>
-		<method name="add_icon_check_shortcut">
-			<argument index="0" name="texture" type="Object">
-			</argument>
-			<argument index="1" name="shortcut" type="ShortCut">
-			</argument>
-			<argument index="2" name="id" type="int" default="-1">
-			</argument>
+		<method name="add_separator">
 			<description>
+				Add a separator between items. Separators also occupy an index.
 			</description>
 		</method>
-		<method name="add_check_shortcut">
+		<method name="add_shortcut">
 			<argument index="0" name="shortcut" type="ShortCut">
 			</argument>
 			<argument index="1" name="id" type="int" default="-1">
@@ -29188,231 +29467,237 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="set_item_text">
-			<argument index="0" name="idx" type="int">
+		<method name="add_submenu_item">
+			<argument index="0" name="label" type="String">
 			</argument>
-			<argument index="1" name="text" type="String">
+			<argument index="1" name="submenu" type="String">
+			</argument>
+			<argument index="2" name="id" type="int" default="-1">
 			</argument>
 			<description>
-			Set the text of the item at index "idx".
+				Adds an item with a submenu. The submenu is the name of a child PopupMenu node that would be shown when the item is clicked. An id can optionally be provided, but if is isn't provided, one will be created from the index.
 			</description>
 		</method>
-		<method name="set_item_icon">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="icon" type="Object">
-			</argument>
+		<method name="clear">
 			<description>
-			Set the icon of the item at index "idx".
+				Clear the popup menu, in effect removing all items.
 			</description>
 		</method>
-		<method name="set_item_accelerator">
+		<method name="get_item_ID" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="accel" type="int">
-			</argument>
 			<description>
-			Set the accelerator of the item at index "idx". Accelerators are special combinations of keys that activate the item, no matter which control is focused.
+				Return the id of the item at index "idx".
 			</description>
 		</method>
-		<method name="set_item_metadata">
+		<method name="get_item_accelerator" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="metadata" type="Variant">
-			</argument>
 			<description>
-			Sets the metadata of an item, which might be of any type. You can later get it with [method get_item_metadata], which provides a simple way of assigning context data to items.
+				Return the accelerator of the item at index "idx". Accelerators are special combinations of keys that activate the item, no matter which control is focused.
 			</description>
 		</method>
-		<method name="set_item_checked">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="checked" type="bool">
-			</argument>
+		<method name="get_item_count" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the checkstate status of the item at index "idx".
+				Return the amount of items.
 			</description>
 		</method>
-		<method name="set_item_disabled">
+		<method name="get_item_icon" qualifiers="const">
+			<return type="Object">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="disabled" type="bool">
-			</argument>
 			<description>
-			Sets whether the item at index "idx" is disabled or not. When it is disabled it can't be selected, or its action invoked.
+				Return the icon of the item at index "idx".
 			</description>
 		</method>
-		<method name="set_item_shortcut">
-			<argument index="0" name="idx" type="int">
-			</argument>
-			<argument index="1" name="shortcut" type="ShortCut">
+		<method name="get_item_index" qualifiers="const">
+			<return type="int">
+			</return>
+			<argument index="0" name="id" type="int">
 			</argument>
 			<description>
+				Find and return the index of the item containing a given id.
 			</description>
 		</method>
-		<method name="set_item_submenu">
+		<method name="get_item_metadata" qualifiers="const">
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="submenu" type="String">
-			</argument>
 			<description>
-			Sets the submenu of the item at index "idx". The submenu is the name of a child PopupMenu node that would be shown when the item is clicked.
+				Return the metadata of an item, which might be of any type. You can set it with [method set_item_metadata], which provides a simple way of assigning context data to items.
 			</description>
 		</method>
-		<method name="set_item_as_separator">
+		<method name="get_item_shortcut" qualifiers="const">
+			<return type="ShortCut">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="enable" type="bool">
-			</argument>
 			<description>
-			Mark the item at index "idx" as a seperator, which means that it would be displayed as a mere line.
 			</description>
 		</method>
-		<method name="set_item_as_checkable">
+		<method name="get_item_submenu" qualifiers="const">
+			<return type="String">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="enable" type="bool">
-			</argument>
 			<description>
-			Set whether the item at index "idx" has a checkbox. Note that checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually.
+				Return the submenu name of the item at index "idx".
 			</description>
 		</method>
-		<method name="set_item_ID">
+		<method name="get_item_text" qualifiers="const">
+			<return type="String">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="id" type="int">
-			</argument>
 			<description>
-			Set the id of the item at index "idx".
+				Return the text of the item at index "idx".
 			</description>
 		</method>
-		<method name="get_item_text" qualifiers="const">
-			<return type="String">
+		<method name="is_item_checkable" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Return the text of the item at index "idx".
+				Return whether the item at index "idx" has a checkbox. Note that checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually.
 			</description>
 		</method>
-		<method name="get_item_icon" qualifiers="const">
-			<return type="Object">
+		<method name="is_item_checked" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Return the icon of the item at index "idx".
+				Return the checkstate status of the item at index "idx".
 			</description>
 		</method>
-		<method name="get_item_metadata" qualifiers="const">
+		<method name="is_item_disabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Return the metadata of an item, which might be of any type. You can set it with [method set_item_metadata], which provides a simple way of assigning context data to items.
+				Return whether the item at index "idx" is disabled. When it is disabled it can't be selected, or its action invoked.
 			</description>
 		</method>
-		<method name="get_item_accelerator" qualifiers="const">
-			<return type="int">
+		<method name="is_item_separator" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Return the accelerator of the item at index "idx". Accelerators are special combinations of keys that activate the item, no matter which control is focused.
+				Return whether the item is a seperator. If it is, it would be displayed as a line.
 			</description>
 		</method>
-		<method name="get_item_shortcut" qualifiers="const">
-			<return type="ShortCut">
-			</return>
+		<method name="remove_item">
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
+				Removes the item at index "idx" from the menu. Note that the indexes of items after the removed item are going to be shifted by one.
 			</description>
 		</method>
-		<method name="get_item_submenu" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="set_item_ID">
 			<argument index="0" name="idx" type="int">
 			</argument>
+			<argument index="1" name="id" type="int">
+			</argument>
 			<description>
-			Return the submenu name of the item at index "idx".
+				Set the id of the item at index "idx".
 			</description>
 		</method>
-		<method name="is_item_separator" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_item_accelerator">
 			<argument index="0" name="idx" type="int">
 			</argument>
+			<argument index="1" name="accel" type="int">
+			</argument>
 			<description>
-			Return whether the item is a seperator. If it is, it would be displayed as a line.
+				Set the accelerator of the item at index "idx". Accelerators are special combinations of keys that activate the item, no matter which control is focused.
 			</description>
 		</method>
-		<method name="is_item_checkable" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_item_as_checkable">
 			<argument index="0" name="idx" type="int">
 			</argument>
+			<argument index="1" name="enable" type="bool">
+			</argument>
 			<description>
-			Return whether the item at index "idx" has a checkbox. Note that checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually.
+				Set whether the item at index "idx" has a checkbox. Note that checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually.
 			</description>
 		</method>
-		<method name="is_item_checked" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_item_as_separator">
 			<argument index="0" name="idx" type="int">
 			</argument>
+			<argument index="1" name="enable" type="bool">
+			</argument>
 			<description>
-			Return the checkstate status of the item at index "idx".
+				Mark the item at index "idx" as a seperator, which means that it would be displayed as a mere line.
 			</description>
 		</method>
-		<method name="is_item_disabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_item_checked">
 			<argument index="0" name="idx" type="int">
 			</argument>
+			<argument index="1" name="checked" type="bool">
+			</argument>
 			<description>
-			Return whether the item at index "idx" is disabled. When it is disabled it can't be selected, or its action invoked.
+				Set the checkstate status of the item at index "idx".
 			</description>
 		</method>
-		<method name="get_item_ID" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_item_disabled">
 			<argument index="0" name="idx" type="int">
 			</argument>
+			<argument index="1" name="disabled" type="bool">
+			</argument>
 			<description>
-			Return the id of the item at index "idx".
+				Sets whether the item at index "idx" is disabled or not. When it is disabled it can't be selected, or its action invoked.
 			</description>
 		</method>
-		<method name="get_item_index" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="id" type="int">
+		<method name="set_item_icon">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="icon" type="Object">
 			</argument>
 			<description>
-			Find and return the index of the item containing a given id.
+				Set the icon of the item at index "idx".
 			</description>
 		</method>
-		<method name="get_item_count" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_item_metadata">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="metadata" type="Variant">
+			</argument>
 			<description>
-			Return the amount of items.
+				Sets the metadata of an item, which might be of any type. You can later get it with [method get_item_metadata], which provides a simple way of assigning context data to items.
 			</description>
 		</method>
-		<method name="add_separator">
+		<method name="set_item_shortcut">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="shortcut" type="ShortCut">
+			</argument>
 			<description>
-			Add a separator between items. Separators also occupy an index.
 			</description>
 		</method>
-		<method name="remove_item">
+		<method name="set_item_submenu">
 			<argument index="0" name="idx" type="int">
 			</argument>
+			<argument index="1" name="submenu" type="String">
+			</argument>
 			<description>
-			Removes the item at index "idx" from the menu. Note that the indexes of items after the removed item are going to be shifted by one.
+				Sets the submenu of the item at index "idx". The submenu is the name of a child PopupMenu node that would be shown when the item is clicked.
 			</description>
 		</method>
-		<method name="clear">
+		<method name="set_item_text">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="text" type="String">
+			</argument>
 			<description>
-			Clear the popup menu, in effect removing all items.
+				Set the text of the item at index "idx".
 			</description>
 		</method>
 	</methods>
@@ -29421,49 +29706,49 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="ID" type="int">
 			</argument>
 			<description>
-			This even is emitted when an item is pressed or its accelerator is activated. The id of the item is returned if it exists, else the index.
+				This even is emitted when an item is pressed or its accelerator is activated. The id of the item is returned if it exists, else the index.
 			</description>
 		</signal>
 	</signals>
 	<constants>
 	</constants>
 	<theme_items>
-		<theme_item name="vseparation" type="int">
+		<theme_item name="checked" type="Texture">
 		</theme_item>
-		<theme_item name="hseparation" type="int">
+		<theme_item name="font" type="Font">
 		</theme_item>
-		<theme_item name="font_color_disabled" type="Color">
+		<theme_item name="font_color" type="Color">
 		</theme_item>
 		<theme_item name="font_color_accel" type="Color">
 		</theme_item>
-		<theme_item name="font_color" type="Color">
+		<theme_item name="font_color_disabled" type="Color">
 		</theme_item>
 		<theme_item name="font_color_hover" type="Color">
 		</theme_item>
-		<theme_item name="submenu" type="Texture">
+		<theme_item name="hover" type="StyleBox">
 		</theme_item>
-		<theme_item name="checked" type="Texture">
+		<theme_item name="hseparation" type="int">
 		</theme_item>
-		<theme_item name="unchecked" type="Texture">
+		<theme_item name="panel" type="StyleBox">
 		</theme_item>
-		<theme_item name="font" type="Font">
+		<theme_item name="panel_disabled" type="StyleBox">
 		</theme_item>
-		<theme_item name="hover" type="StyleBox">
+		<theme_item name="separator" type="StyleBox">
 		</theme_item>
-		<theme_item name="panel_disabled" type="StyleBox">
+		<theme_item name="submenu" type="Texture">
 		</theme_item>
-		<theme_item name="panel" type="StyleBox">
+		<theme_item name="unchecked" type="Texture">
 		</theme_item>
-		<theme_item name="separator" type="StyleBox">
+		<theme_item name="vseparation" type="int">
 		</theme_item>
 	</theme_items>
 </class>
 <class name="PopupPanel" inherits="Popup" category="Core">
 	<brief_description>
-	Class for displaying popups with a panel background.
+		Class for displaying popups with a panel background.
 	</brief_description>
 	<description>
-	Class for displaying popups with a panel background. In some cases it might be simpler to use than [Popup], since it provides a configurable background. If you are making windows, better check [WindowDialog].
+		Class for displaying popups with a panel background. In some cases it might be simpler to use than [Popup], since it provides a configurable background. If you are making windows, better check [WindowDialog].
 	</description>
 	<methods>
 	</methods>
@@ -29476,80 +29761,80 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Portal" inherits="VisualInstance" category="Core">
 	<brief_description>
-	Portals provide virtual openings to rooms.
+		Portals provide virtual openings to rooms.
 	</brief_description>
 	<description>
-	Portals provide virtual openings to [VisualInstance] nodes, so cameras can look at them from the outside. Note that portals are a visibility optimization technique, and are in no way related to the game of the same name (as in, they are not used for teleportation). For more information on how rooms and portals work, see [VisualInstance]. Portals are represented as 2D convex polygon shapes (in the X,Y local plane), and are placed on the surface of the areas occupied by a [VisualInstance], to indicate that the room can be accessed or looked-at through them. If two rooms are next to each other, and two similar portals in each of them share the same world position (and are parallel and opposed to each other), they will automatically "connect" and form "doors" (for example, the portals that connect a kitchen to a living room are placed in the door they share). Portals must always have a [VisualInstance] node as a parent, grandparent or far parent, or else they will not be active.
+		Portals provide virtual openings to [VisualInstance] nodes, so cameras can look at them from the outside. Note that portals are a visibility optimization technique, and are in no way related to the game of the same name (as in, they are not used for teleportation). For more information on how rooms and portals work, see [VisualInstance]. Portals are represented as 2D convex polygon shapes (in the X,Y local plane), and are placed on the surface of the areas occupied by a [VisualInstance], to indicate that the room can be accessed or looked-at through them. If two rooms are next to each other, and two similar portals in each of them share the same world position (and are parallel and opposed to each other), they will automatically "connect" and form "doors" (for example, the portals that connect a kitchen to a living room are placed in the door they share). Portals must always have a [VisualInstance] node as a parent, grandparent or far parent, or else they will not be active.
 	</description>
 	<methods>
-		<method name="set_shape">
-			<argument index="0" name="points" type="Vector2Array">
-			</argument>
+		<method name="get_connect_range" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the portal shape. The shape is an array of [Vector2] points, representing a convex polygon in the X,Y plane.
+				Return the range for auto-connecting two portals from different rooms sharing the same space.
 			</description>
 		</method>
-		<method name="get_shape" qualifiers="const">
-			<return type="Vector2Array">
+		<method name="get_disable_distance" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return the portal shape. The shape is an array of [Vector2] points, representing a convex polygon in the X,Y plane.
+				Return the distance threshold for disabling the portal. Every time that the portal goes beyond "distance", it disables itself, becoming the opaque color (see [method set_disabled_color]).
 			</description>
 		</method>
-		<method name="set_enabled">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="get_disabled_color" qualifiers="const">
+			<return type="Color">
+			</return>
+			<description>
+				Return the color for when the portal goes beyond the disable distance (see [method set_disable_distance]) and becomes disabled.
+			</description>
+		</method>
+		<method name="get_shape" qualifiers="const">
+			<return type="Vector2Array">
+			</return>
 			<description>
-			Enable the portal (it is enabled by default though), disabling it will cause the parent [VisualInstance] to not be visible any longer when looking through the portal.
+				Return the portal shape. The shape is an array of [Vector2] points, representing a convex polygon in the X,Y plane.
 			</description>
 		</method>
 		<method name="is_enabled" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return whether the portal is active. When disabled it causes the parent [VisualInstance] to not be visible any longer when looking through the portal.
+				Return whether the portal is active. When disabled it causes the parent [VisualInstance] to not be visible any longer when looking through the portal.
 			</description>
 		</method>
-		<method name="set_disable_distance">
-			<argument index="0" name="distance" type="float">
+		<method name="set_connect_range">
+			<argument index="0" name="range" type="float">
 			</argument>
 			<description>
-			Set the distance threshold for disabling the portal. Every time that the portal goes beyond "distance", it disables itself, becoming the opaque color (see [method set_disabled_color]).
+				Set the range for auto-connecting two portals from different rooms sharing the same space.
 			</description>
 		</method>
-		<method name="get_disable_distance" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_disable_distance">
+			<argument index="0" name="distance" type="float">
+			</argument>
 			<description>
-			Return the distance threshold for disabling the portal. Every time that the portal goes beyond "distance", it disables itself, becoming the opaque color (see [method set_disabled_color]).
+				Set the distance threshold for disabling the portal. Every time that the portal goes beyond "distance", it disables itself, becoming the opaque color (see [method set_disabled_color]).
 			</description>
 		</method>
 		<method name="set_disabled_color">
 			<argument index="0" name="color" type="Color">
 			</argument>
 			<description>
-			When the portal goes beyond the disable distance (see [method set_disable_distance]), it becomes opaque and displayed with color "color".
-			</description>
-		</method>
-		<method name="get_disabled_color" qualifiers="const">
-			<return type="Color">
-			</return>
-			<description>
-			Return the color for when the portal goes beyond the disable distance (see [method set_disable_distance]) and becomes disabled.
+				When the portal goes beyond the disable distance (see [method set_disable_distance]), it becomes opaque and displayed with color "color".
 			</description>
 		</method>
-		<method name="set_connect_range">
-			<argument index="0" name="range" type="float">
+		<method name="set_enabled">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Set the range for auto-connecting two portals from different rooms sharing the same space.
+				Enable the portal (it is enabled by default though), disabling it will cause the parent [VisualInstance] to not be visible any longer when looking through the portal.
 			</description>
 		</method>
-		<method name="get_connect_range" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_shape">
+			<argument index="0" name="points" type="Vector2Array">
+			</argument>
 			<description>
-			Return the range for auto-connecting two portals from different rooms sharing the same space.
+				Set the portal shape. The shape is an array of [Vector2] points, representing a convex polygon in the X,Y plane.
 			</description>
 		</method>
 	</methods>
@@ -29558,10 +29843,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Position2D" inherits="Node2D" category="Core">
 	<brief_description>
-	Generic 2D Position hint for editing.
+		Generic 2D Position hint for editing.
 	</brief_description>
 	<description>
-	Generic 2D Position hint for editing. It's just like a plain [Node2D] but displays as a cross in the 2D-Editor at all times.
+		Generic 2D Position hint for editing. It's just like a plain [Node2D] but displays as a cross in the 2D-Editor at all times.
 	</description>
 	<methods>
 	</methods>
@@ -29570,10 +29855,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Position3D" inherits="Spatial" category="Core">
 	<brief_description>
-	Generic 3D Position hint for editing
+		Generic 3D Position hint for editing
 	</brief_description>
 	<description>
-	Generic 3D Position hint for editing. It's just like a plain [Spatial] but displays as a cross in the 3D-Editor at all times.
+		Generic 3D Position hint for editing. It's just like a plain [Spatial] but displays as a cross in the 3D-Editor at all times.
 	</description>
 	<methods>
 	</methods>
@@ -29582,54 +29867,48 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="ProgressBar" inherits="Range" category="Core">
 	<brief_description>
-	General purpose progress bar.
+		General purpose progress bar.
 	</brief_description>
 	<description>
-	General purpose progress bar. Shows fill percentage from right to left.
+		General purpose progress bar. Shows fill percentage from right to left.
 	</description>
 	<methods>
-		<method name="set_percent_visible">
-			<argument index="0" name="visible" type="bool">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="is_percent_visible" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
+		<method name="set_percent_visible">
+			<argument index="0" name="visible" type="bool">
+			</argument>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<constants>
 	</constants>
 	<theme_items>
-		<theme_item name="font_color" type="Color">
+		<theme_item name="bg" type="StyleBox">
 		</theme_item>
-		<theme_item name="font_color_shadow" type="Color">
+		<theme_item name="fg" type="StyleBox">
 		</theme_item>
 		<theme_item name="font" type="Font">
 		</theme_item>
-		<theme_item name="fg" type="StyleBox">
+		<theme_item name="font_color" type="Color">
 		</theme_item>
-		<theme_item name="bg" type="StyleBox">
+		<theme_item name="font_color_shadow" type="Color">
 		</theme_item>
 	</theme_items>
 </class>
 <class name="ProximityGroup" inherits="Spatial" category="Core">
 	<brief_description>
-	General purpose proximity-detection node.
+		General purpose proximity-detection node.
 	</brief_description>
 	<description>
-	General purpose proximity-detection node.
+		General purpose proximity-detection node.
 	</description>
 	<methods>
-		<method name="set_group_name">
-			<argument index="0" name="name" type="String">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="broadcast">
 			<argument index="0" name="name" type="String">
 			</argument>
@@ -29638,6 +29917,12 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
+		<method name="get_grid_radius" qualifiers="const">
+			<return type="Vector3">
+			</return>
+			<description>
+			</description>
+		</method>
 		<method name="set_dispatch_mode">
 			<argument index="0" name="mode" type="int">
 			</argument>
@@ -29650,9 +29935,9 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_grid_radius" qualifiers="const">
-			<return type="Vector3">
-			</return>
+		<method name="set_group_name">
+			<argument index="0" name="name" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -29676,21 +29961,15 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_axis">
-			<argument index="0" name="axis" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_axis" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_size">
-			<argument index="0" name="size" type="Vector2">
-			</argument>
+		<method name="get_offset" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -29700,15 +29979,21 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="set_centered">
-			<argument index="0" name="centered" type="bool">
+		<method name="is_centered" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="set_axis">
+			<argument index="0" name="axis" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_centered" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_centered">
+			<argument index="0" name="centered" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -29718,9 +30003,9 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_offset" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_size">
+			<argument index="0" name="size" type="Vector2">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -29730,12 +30015,44 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Quat" category="Built-In Types">
 	<brief_description>
-	Quaternion.
+		Quaternion.
 	</brief_description>
 	<description>
-	Quaternion is a 4 dimensional vector that is used to represent a rotation. It mainly exists to perform SLERP (spherical-linear interpolation) between to rotations obtained by a Matrix3 cheaply. Adding quaternions also cheaply adds the rotations, however quaternions need to be often normalized, or else they suffer from precision issues.
+		Quaternion is a 4 dimensional vector that is used to represent a rotation. It mainly exists to perform SLERP (spherical-linear interpolation) between to rotations obtained by a Matrix3 cheaply. Adding quaternions also cheaply adds the rotations, however quaternions need to be often normalized, or else they suffer from precision issues.
 	</description>
 	<methods>
+		<method name="Quat">
+			<return type="Quat">
+			</return>
+			<argument index="0" name="x" type="float">
+			</argument>
+			<argument index="1" name="y" type="float">
+			</argument>
+			<argument index="2" name="z" type="float">
+			</argument>
+			<argument index="3" name="w" type="float">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="Quat">
+			<return type="Quat">
+			</return>
+			<argument index="0" name="axis" type="Vector3">
+			</argument>
+			<argument index="1" name="angle" type="float">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="Quat">
+			<return type="Quat">
+			</return>
+			<argument index="0" name="from" type="Matrix3">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="cubic_slerp">
 			<return type="Quat">
 			</return>
@@ -29756,35 +30073,35 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="b" type="Quat">
 			</argument>
 			<description>
-			Returns the dot product between two quaternions.
+				Returns the dot product between two quaternions.
 			</description>
 		</method>
 		<method name="inverse">
 			<return type="Quat">
 			</return>
 			<description>
-			Returns the inverse of the quaternion (applies to the inverse rotation too).
+				Returns the inverse of the quaternion (applies to the inverse rotation too).
 			</description>
 		</method>
 		<method name="length">
 			<return type="float">
 			</return>
 			<description>
-			Returns the length of the quaternion.
+				Returns the length of the quaternion.
 			</description>
 		</method>
 		<method name="length_squared">
 			<return type="float">
 			</return>
 			<description>
-			Returns the length of the quaternion, squared.
+				Returns the length of the quaternion, squared.
 			</description>
 		</method>
 		<method name="normalized">
 			<return type="Quat">
 			</return>
 			<description>
-			Returns a copy of the quaternion, normalized to unit length.
+				Returns a copy of the quaternion, normalized to unit length.
 			</description>
 		</method>
 		<method name="slerp">
@@ -29795,7 +30112,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="t" type="float">
 			</argument>
 			<description>
-			Perform a spherical-linear interpolation with another quaternion.
+				Perform a spherical-linear interpolation with another quaternion.
 			</description>
 		</method>
 		<method name="slerpni">
@@ -29816,48 +30133,16 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="Quat">
-			<return type="Quat">
-			</return>
-			<argument index="0" name="x" type="float">
-			</argument>
-			<argument index="1" name="y" type="float">
-			</argument>
-			<argument index="2" name="z" type="float">
-			</argument>
-			<argument index="3" name="w" type="float">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="Quat">
-			<return type="Quat">
-			</return>
-			<argument index="0" name="axis" type="Vector3">
-			</argument>
-			<argument index="1" name="angle" type="float">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="Quat">
-			<return type="Quat">
-			</return>
-			<argument index="0" name="from" type="Matrix3">
-			</argument>
-			<description>
-			</description>
-		</method>
 	</methods>
 	<members>
+		<member name="w" type="float">
+		</member>
 		<member name="x" type="float">
 		</member>
 		<member name="y" type="float">
 		</member>
 		<member name="z" type="float">
 		</member>
-		<member name="w" type="float">
-		</member>
 	</members>
 	<constants>
 	</constants>
@@ -29868,12 +30153,6 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="get_id">
-			<return type="int">
-			</return>
-			<description>
-			</description>
-		</method>
 		<method name="RID">
 			<return type="RID">
 			</return>
@@ -29882,83 +30161,88 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
+		<method name="get_id">
+			<return type="int">
+			</return>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<constants>
 	</constants>
 </class>
 <class name="Range" inherits="Control" category="Core">
 	<brief_description>
-	Abstract base class for range-based controls.
+		Abstract base class for range-based controls.
 	</brief_description>
 	<description>
-	Range is a base class for [Control] nodes that change a floating point [i]value[/i] between a [i]minimum[/i] and a [i]maximum[/i], using [i]step[/i] and [i]page[/i], for example a [ScrollBar].
+		Range is a base class for [Control] nodes that change a floating point [i]value[/i] between a [i]minimum[/i] and a [i]maximum[/i], using [i]step[/i] and [i]page[/i], for example a [ScrollBar].
 	</description>
 	<methods>
-		<method name="get_val" qualifiers="const">
+		<method name="get_max" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the current value.
+				Return the maximum value.
 			</description>
 		</method>
-		<method name="get_value" qualifiers="const">
+		<method name="get_min" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
+				Return the minimum value.
 			</description>
 		</method>
-		<method name="get_min" qualifiers="const">
+		<method name="get_page" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the minimum value.
+				Return the page size, if page is 0, paging is disabled.
 			</description>
 		</method>
-		<method name="get_max" qualifiers="const">
+		<method name="get_step" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the maximum value.
+				Return the stepping, if step is 0, stepping is disabled.
 			</description>
 		</method>
-		<method name="get_step" qualifiers="const">
+		<method name="get_unit_value" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the stepping, if step is 0, stepping is disabled.
+				Return value mapped to 0 to 1 (unit) range.
 			</description>
 		</method>
-		<method name="get_page" qualifiers="const">
+		<method name="get_val" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the page size, if page is 0, paging is disabled.
+				Return the current value.
 			</description>
 		</method>
-		<method name="get_unit_value" qualifiers="const">
+		<method name="get_value" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return value mapped to 0 to 1 (unit) range.
 			</description>
 		</method>
-		<method name="set_val">
-			<argument index="0" name="value" type="float">
-			</argument>
+		<method name="is_rounded_values" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_value">
-			<argument index="0" name="value" type="float">
-			</argument>
+		<method name="is_unit_value_exp" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_min">
-			<argument index="0" name="minimum" type="float">
+		<method name="set_exp_unit_value">
+			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
-			Set minimum value, clamped range value to it if it's less.
 			</description>
 		</method>
 		<method name="set_max">
@@ -29967,48 +30251,49 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="set_step">
-			<argument index="0" name="step" type="float">
+		<method name="set_min">
+			<argument index="0" name="minimum" type="float">
 			</argument>
 			<description>
-			Set step value. If step is 0, stepping will be disabled.
+				Set minimum value, clamped range value to it if it's less.
 			</description>
 		</method>
 		<method name="set_page">
 			<argument index="0" name="pagesize" type="float">
 			</argument>
 			<description>
-			Set page size. Page is mainly used for scrollbars or anything that controls text scrolling.
+				Set page size. Page is mainly used for scrollbars or anything that controls text scrolling.
 			</description>
 		</method>
-		<method name="set_unit_value">
-			<argument index="0" name="value" type="float">
+		<method name="set_rounded_values">
+			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
-			Set value mapped to 0 to 1 (unit) range, it will then be converted to the actual value within min and max.
 			</description>
 		</method>
-		<method name="set_rounded_values">
-			<argument index="0" name="enabled" type="bool">
+		<method name="set_step">
+			<argument index="0" name="step" type="float">
 			</argument>
 			<description>
+				Set step value. If step is 0, stepping will be disabled.
 			</description>
 		</method>
-		<method name="is_rounded_values" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_unit_value">
+			<argument index="0" name="value" type="float">
+			</argument>
 			<description>
+				Set value mapped to 0 to 1 (unit) range, it will then be converted to the actual value within min and max.
 			</description>
 		</method>
-		<method name="set_exp_unit_value">
-			<argument index="0" name="enabled" type="bool">
+		<method name="set_val">
+			<argument index="0" name="value" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_unit_value_exp" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_value">
+			<argument index="0" name="value" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -30024,16 +30309,16 @@ This method controls whether the position between two cached points is interpola
 		</method>
 	</methods>
 	<signals>
-		<signal name="value_changed">
-			<argument index="0" name="value" type="float">
-			</argument>
+		<signal name="changed">
 			<description>
-			This signal is emitted when value changes.
+				This signal is emitted when min, max, range or step change.
 			</description>
 		</signal>
-		<signal name="changed">
+		<signal name="value_changed">
+			<argument index="0" name="value" type="float">
+			</argument>
 			<description>
-			This signal is emitted when min, max, range or step change.
+				This signal is emitted when value changes.
 			</description>
 		</signal>
 	</signals>
@@ -30042,38 +30327,83 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="RawArray" category="Built-In Types">
 	<brief_description>
-	Raw byte array.
+		Raw byte array.
 	</brief_description>
 	<description>
-	Raw byte array. Contains bytes. Optimized for memory usage, can't fragment the memory.
+		Raw byte array. Contains bytes. Optimized for memory usage, can't fragment the memory.
 	</description>
 	<methods>
+		<method name="RawArray">
+			<return type="RawArray">
+			</return>
+			<argument index="0" name="from" type="Array">
+			</argument>
+			<description>
+				Create from a generic array.
+			</description>
+		</method>
+		<method name="append">
+			<argument index="0" name="byte" type="int">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="append_array">
+			<argument index="0" name="array" type="RawArray">
+			</argument>
+			<description>
+				Append an [RawArray] at the end of this array.
+			</description>
+		</method>
 		<method name="get_string_from_ascii">
 			<return type="String">
 			</return>
 			<description>
-			Returns a copy of the array's contents formatted as String. Fast alternative to get_string_from_utf8(), assuming the content is ASCII-only (unlike the UTF-8 function, this function maps every byte to a character in the string, so any multibyte sequence will be torn apart).
+				Returns a copy of the array's contents formatted as String. Fast alternative to get_string_from_utf8(), assuming the content is ASCII-only (unlike the UTF-8 function, this function maps every byte to a character in the string, so any multibyte sequence will be torn apart).
 			</description>
 		</method>
 		<method name="get_string_from_utf8">
 			<return type="String">
 			</return>
 			<description>
-			Returns a copy of the array's contents formatted as String, assuming the array is formatted as UTF-8. Slower than get_string_from_ascii(), but works for UTF-8. Usually you should prefer this function over get_string_from_ascii() to support international input.
+				Returns a copy of the array's contents formatted as String, assuming the array is formatted as UTF-8. Slower than get_string_from_ascii(), but works for UTF-8. Usually you should prefer this function over get_string_from_ascii() to support international input.
+			</description>
+		</method>
+		<method name="insert">
+			<return type="int">
+			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="byte" type="int">
+			</argument>
+			<description>
+				Insert a new element at a given position in the array. The position must be valid, or at the end of the array (pos==size()).
+			</description>
+		</method>
+		<method name="invert">
+			<description>
+				Reverse the order of the elements in the array (so first element will now be the last).
 			</description>
 		</method>
 		<method name="push_back">
 			<argument index="0" name="byte" type="int">
 			</argument>
 			<description>
-			Append an element at the end of the array.
+				Append an element at the end of the array.
+			</description>
+		</method>
+		<method name="remove">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<description>
+				Remove an element from the array by index.
 			</description>
 		</method>
 		<method name="resize">
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Set the size of the [RawArray]. If larger than the current size it will reserve some space beforehand, and if it is smaller it will cut off the array.
+				Set the size of the [RawArray]. If larger than the current size it will reserve some space beforehand, and if it is smaller it will cut off the array.
 			</description>
 		</method>
 		<method name="set">
@@ -30082,23 +30412,14 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="byte" type="int">
 			</argument>
 			<description>
-			Change the byte at the given index.
+				Change the byte at the given index.
 			</description>
 		</method>
 		<method name="size">
 			<return type="int">
 			</return>
 			<description>
-			Return the size of the array.
-			</description>
-		</method>
-		<method name="RawArray">
-			<return type="RawArray">
-			</return>
-			<argument index="0" name="from" type="Array">
-			</argument>
-			<description>
-			Create from a generic array.
+				Return the size of the array.
 			</description>
 		</method>
 	</methods>
@@ -30111,21 +30432,19 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_enabled">
-			<argument index="0" name="enabled" type="bool">
+		<method name="add_exception">
+			<argument index="0" name="node" type="Object">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="add_exception_rid">
+			<argument index="0" name="rid" type="RID">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_cast_to">
-			<argument index="0" name="local_point" type="Vector3">
-			</argument>
+		<method name="clear_exceptions">
 			<description>
 			</description>
 		</method>
@@ -30135,12 +30454,6 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="is_colliding" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
-			</description>
-		</method>
 		<method name="get_collider" qualifiers="const">
 			<return type="Object">
 			</return>
@@ -30153,33 +30466,39 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_collision_point" qualifiers="const">
+		<method name="get_collision_normal" qualifiers="const">
 			<return type="Vector3">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_collision_normal" qualifiers="const">
+		<method name="get_collision_point" qualifiers="const">
 			<return type="Vector3">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="add_exception_rid">
-			<argument index="0" name="rid" type="RID">
-			</argument>
+		<method name="get_layer_mask" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="add_exception">
-			<argument index="0" name="node" type="Object">
-			</argument>
+		<method name="get_type_mask" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="remove_exception_rid">
-			<argument index="0" name="rid" type="RID">
-			</argument>
+		<method name="is_colliding" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="is_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -30189,31 +30508,33 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="clear_exceptions">
+		<method name="remove_exception_rid">
+			<argument index="0" name="rid" type="RID">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_layer_mask">
-			<argument index="0" name="mask" type="int">
+		<method name="set_cast_to">
+			<argument index="0" name="local_point" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_layer_mask" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_enabled">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_type_mask">
+		<method name="set_layer_mask">
 			<argument index="0" name="mask" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_type_mask" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_type_mask">
+			<argument index="0" name="mask" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -30223,128 +30544,128 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="RayCast2D" inherits="Node2D" category="Core">
 	<brief_description>
-	Query the closest object intersecting a ray
+		Query the closest object intersecting a ray
 	</brief_description>
 	<description>
-	A RayCast2D represents a line from its origin to its destination position [code]cast_to[/code], it is used to query the 2D space in order to find the closest object intersecting with the ray.
+		A RayCast2D represents a line from its origin to its destination position [code]cast_to[/code], it is used to query the 2D space in order to find the closest object intersecting with the ray.
 	</description>
 	<methods>
-		<method name="set_enabled">
-			<argument index="0" name="enabled" type="bool">
+		<method name="add_exception">
+			<argument index="0" name="node" type="Object">
 			</argument>
 			<description>
-			Enables the RayCast2D. Only enabled raycasts will be able to query the space and report collisions.
+				Adds a collision exception so the ray does not report collisions with the specified [code]node[/code].
 			</description>
 		</method>
-		<method name="is_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="add_exception_rid">
+			<argument index="0" name="rid" type="RID">
+			</argument>
 			<description>
-			Returns whether this raycast is enabled or not
 			</description>
 		</method>
-		<method name="set_cast_to">
-			<argument index="0" name="local_point" type="Vector2">
-			</argument>
+		<method name="clear_exceptions">
 			<description>
-			Sets the ray destination point, so that the ray will test from the ray's origin to [code]local_point[/code]
+				Removes all collision exception for this ray.
 			</description>
 		</method>
 		<method name="get_cast_to" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
-			Return the destination point of this ray object
-			</description>
-		</method>
-		<method name="is_colliding" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
-			Return whether the closest object the ray is pointing to is colliding with the vector (considering the vector length).
+				Return the destination point of this ray object
 			</description>
 		</method>
 		<method name="get_collider" qualifiers="const">
 			<return type="Object">
 			</return>
 			<description>
-			Return the closest object the ray is pointing to. Note that this does not consider the length of the vector, so you must also use [method is_colliding] to check if the object returned is actually colliding with the ray.
+				Return the closest object the ray is pointing to. Note that this does not consider the length of the vector, so you must also use [method is_colliding] to check if the object returned is actually colliding with the ray.
 			</description>
 		</method>
 		<method name="get_collider_shape" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Returns the collision shape of the closest object the ray is pointing to.
+				Returns the collision shape of the closest object the ray is pointing to.
 			</description>
 		</method>
-		<method name="get_collision_point" qualifiers="const">
+		<method name="get_collision_normal" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
-			Returns the collision point in which the ray intersects the closest object.
+				Returns the normal of the intersecting object shape face containing the collision point.
 			</description>
 		</method>
-		<method name="get_collision_normal" qualifiers="const">
+		<method name="get_collision_point" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
-			Returns the normal of the intersecting object shape face containing the collision point.
+				Returns the collision point in which the ray intersects the closest object.
 			</description>
 		</method>
-		<method name="add_exception_rid">
-			<argument index="0" name="rid" type="RID">
-			</argument>
+		<method name="get_layer_mask" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
+				Returns the layer mask for this ray.
 			</description>
 		</method>
-		<method name="add_exception">
-			<argument index="0" name="node" type="Object">
-			</argument>
+		<method name="get_type_mask" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Adds a collision exception so the ray does not report collisions with the specified [code]node[/code].
 			</description>
 		</method>
-		<method name="remove_exception_rid">
-			<argument index="0" name="rid" type="RID">
-			</argument>
+		<method name="is_colliding" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
+				Return whether the closest object the ray is pointing to is colliding with the vector (considering the vector length).
+			</description>
+		</method>
+		<method name="is_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+				Returns whether this raycast is enabled or not
 			</description>
 		</method>
 		<method name="remove_exception">
 			<argument index="0" name="node" type="Object">
 			</argument>
 			<description>
-			Removes a collision exception so the ray does report collisions with the specified [code]node[/code].
+				Removes a collision exception so the ray does report collisions with the specified [code]node[/code].
 			</description>
 		</method>
-		<method name="clear_exceptions">
+		<method name="remove_exception_rid">
+			<argument index="0" name="rid" type="RID">
+			</argument>
 			<description>
-			Removes all collision exception for this ray.
 			</description>
 		</method>
-		<method name="set_layer_mask">
-			<argument index="0" name="mask" type="int">
+		<method name="set_cast_to">
+			<argument index="0" name="local_point" type="Vector2">
 			</argument>
 			<description>
+				Sets the ray destination point, so that the ray will test from the ray's origin to [code]local_point[/code]
 			</description>
 		</method>
-		<method name="get_layer_mask" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_enabled">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
-			Returns the layer mask for this ray.
+				Enables the RayCast2D. Only enabled raycasts will be able to query the space and report collisions.
 			</description>
 		</method>
-		<method name="set_type_mask">
+		<method name="set_layer_mask">
 			<argument index="0" name="mask" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_type_mask" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_type_mask">
+			<argument index="0" name="mask" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -30358,42 +30679,42 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_length">
-			<argument index="0" name="length" type="float">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_length" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
+		<method name="set_length">
+			<argument index="0" name="length" type="float">
+			</argument>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<constants>
 	</constants>
 </class>
 <class name="RayShape2D" inherits="Shape2D" category="Core">
 	<brief_description>
-	Ray 2D shape resource for physics.
+		Ray 2D shape resource for physics.
 	</brief_description>
 	<description>
-	Ray 2D shape resource for physics. A ray is not really a collision body, instead it tries to separate itself from whatever is touching its far endpoint. It's often useful for characters.
+		Ray 2D shape resource for physics. A ray is not really a collision body, instead it tries to separate itself from whatever is touching its far endpoint. It's often useful for characters.
 	</description>
 	<methods>
-		<method name="set_length">
-			<argument index="0" name="length" type="float">
-			</argument>
-			<description>
-			Set the length of the ray.
-			</description>
-		</method>
 		<method name="get_length" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the length of the ray.
+				Return the length of the ray.
+			</description>
+		</method>
+		<method name="set_length">
+			<argument index="0" name="length" type="float">
+			</argument>
+			<description>
+				Set the length of the ray.
 			</description>
 		</method>
 	</methods>
@@ -30402,24 +30723,70 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="RealArray" category="Built-In Types">
 	<brief_description>
-	Real Array .
+		Real Array .
 	</brief_description>
 	<description>
-	Real Array. Array of floating point values. Can only contain floats. Optimized for memory usage, can't fragment the memory.
+		Real Array. Array of floating point values. Can only contain floats. Optimized for memory usage, can't fragment the memory.
 	</description>
 	<methods>
+		<method name="RealArray">
+			<return type="RealArray">
+			</return>
+			<argument index="0" name="from" type="Array">
+			</argument>
+			<description>
+				Create from a generic array.
+			</description>
+		</method>
+		<method name="append">
+			<argument index="0" name="value" type="float">
+			</argument>
+			<description>
+				Append an element at the end of the array (alias of [method push_back]).
+			</description>
+		</method>
+		<method name="append_array">
+			<argument index="0" name="array" type="RealArray">
+			</argument>
+			<description>
+				Append an [RealArray] at the end of this array.
+			</description>
+		</method>
+		<method name="insert">
+			<return type="int">
+			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="value" type="float">
+			</argument>
+			<description>
+				Insert a new element at a given position in the array. The position must be valid, or at the end of the array (pos==size()).
+			</description>
+		</method>
+		<method name="invert">
+			<description>
+				Reverse the order of the elements in the array (so first element will now be the last).
+			</description>
+		</method>
 		<method name="push_back">
 			<argument index="0" name="value" type="float">
 			</argument>
 			<description>
-			Append an element at the end of the array.
+				Append an element at the end of the array.
+			</description>
+		</method>
+		<method name="remove">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<description>
+				Remove an element from the array by index.
 			</description>
 		</method>
 		<method name="resize">
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Set the size of the [RealArray]. If larger than the current size it will reserve some space beforehand, and if it is smaller it will cut off the array.
+				Set the size of the [RealArray]. If larger than the current size it will reserve some space beforehand, and if it is smaller it will cut off the array.
 			</description>
 		</method>
 		<method name="set">
@@ -30428,23 +30795,14 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="value" type="float">
 			</argument>
 			<description>
-			Change the float at the given index.
+				Change the float at the given index.
 			</description>
 		</method>
 		<method name="size">
 			<return type="int">
 			</return>
 			<description>
-			Return the size of the array.
-			</description>
-		</method>
-		<method name="RealArray">
-			<return type="RealArray">
-			</return>
-			<argument index="0" name="from" type="Array">
-			</argument>
-			<description>
-			Create from a generic array.
+				Return the size of the array.
 			</description>
 		</method>
 	</methods>
@@ -30453,19 +30811,45 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Rect2" category="Built-In Types">
 	<brief_description>
-	2D Axis-aligned bounding box.
+		2D Axis-aligned bounding box.
 	</brief_description>
 	<description>
-	Rect2 provides an 2D Axis-Aligned Bounding Box. It consists of a position, a size, and several utility functions. It is typically used for fast overlap tests.
+		Rect2 provides an 2D Axis-Aligned Bounding Box. It consists of a position, a size, and several utility functions. It is typically used for fast overlap tests.
 	</description>
 	<methods>
+		<method name="Rect2">
+			<return type="Rect2">
+			</return>
+			<argument index="0" name="pos" type="Vector2">
+			</argument>
+			<argument index="1" name="size" type="Vector2">
+			</argument>
+			<description>
+				Construct a [Rect2] by position and size.
+			</description>
+		</method>
+		<method name="Rect2">
+			<return type="Rect2">
+			</return>
+			<argument index="0" name="x" type="float">
+			</argument>
+			<argument index="1" name="y" type="float">
+			</argument>
+			<argument index="2" name="width" type="float">
+			</argument>
+			<argument index="3" name="height" type="float">
+			</argument>
+			<description>
+				Construct a [Rect2] by x, y, width and height.
+			</description>
+		</method>
 		<method name="clip">
 			<return type="Rect2">
 			</return>
 			<argument index="0" name="b" type="Rect2">
 			</argument>
 			<description>
-			Returns the intersection of this [Rect2] and b.
+				Returns the intersection of this [Rect2] and b.
 			</description>
 		</method>
 		<method name="encloses">
@@ -30474,7 +30858,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="b" type="Rect2">
 			</argument>
 			<description>
-			Returns true if this [Rect2] completely encloses another one.
+				Returns true if this [Rect2] completely encloses another one.
 			</description>
 		</method>
 		<method name="expand">
@@ -30483,14 +30867,14 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="to" type="Vector2">
 			</argument>
 			<description>
-			Return this [Rect2] expanded to include a given point.
+				Return this [Rect2] expanded to include a given point.
 			</description>
 		</method>
 		<method name="get_area">
 			<return type="float">
 			</return>
 			<description>
-			Get the area of the [Rect2].
+				Get the area of the [Rect2].
 			</description>
 		</method>
 		<method name="grow">
@@ -30499,14 +30883,14 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="by" type="float">
 			</argument>
 			<description>
-			Return a copy of the [Rect2] grown a given amount of units towards all the sides.
+				Return a copy of the [Rect2] grown a given amount of units towards all the sides.
 			</description>
 		</method>
 		<method name="has_no_area">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if the [Rect2] is flat or empty.
+				Return true if the [Rect2] is flat or empty.
 			</description>
 		</method>
 		<method name="has_point">
@@ -30515,7 +30899,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="point" type="Vector2">
 			</argument>
 			<description>
-			Return true if the [Rect2] contains a point.
+				Return true if the [Rect2] contains a point.
 			</description>
 		</method>
 		<method name="intersects">
@@ -30524,7 +30908,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="b" type="Rect2">
 			</argument>
 			<description>
-			Return true if the [Rect2] overlaps with another.
+				Return true if the [Rect2] overlaps with another.
 			</description>
 		</method>
 		<method name="merge">
@@ -30533,70 +30917,44 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="b" type="Rect2">
 			</argument>
 			<description>
-			Combine this [Rect2] with another, a larger one is returned that contains both.
-			</description>
-		</method>
-		<method name="Rect2">
-			<return type="Rect2">
-			</return>
-			<argument index="0" name="pos" type="Vector2">
-			</argument>
-			<argument index="1" name="size" type="Vector2">
-			</argument>
-			<description>
-			Construct a [Rect2] by position and size.
-			</description>
-		</method>
-		<method name="Rect2">
-			<return type="Rect2">
-			</return>
-			<argument index="0" name="x" type="float">
-			</argument>
-			<argument index="1" name="y" type="float">
-			</argument>
-			<argument index="2" name="width" type="float">
-			</argument>
-			<argument index="3" name="height" type="float">
-			</argument>
-			<description>
-			Construct a [Rect2] by x, y, width and height.
+				Combine this [Rect2] with another, a larger one is returned that contains both.
 			</description>
 		</method>
 	</methods>
 	<members>
+		<member name="end" type="Vector2">
+			Ending corner.
+		</member>
 		<member name="pos" type="Vector2">
 			Position (starting corner).
 		</member>
 		<member name="size" type="Vector2">
 			Size from position to end.
 		</member>
-		<member name="end" type="Vector2">
-			Ending corner.
-		</member>
 	</members>
 	<constants>
 	</constants>
 </class>
 <class name="RectangleShape2D" inherits="Shape2D" category="Core">
 	<brief_description>
-	Rectangle Shape for 2D Physics.
+		Rectangle Shape for 2D Physics.
 	</brief_description>
 	<description>
-	Rectangle Shape for 2D Physics. This shape is useful for modeling box-like 2D objects.
+		Rectangle Shape for 2D Physics. This shape is useful for modeling box-like 2D objects.
 	</description>
 	<methods>
-		<method name="set_extents">
-			<argument index="0" name="extents" type="Vector2">
-			</argument>
-			<description>
-			Set the half extents, the actual width and height of this shape is twice the half extents.
-			</description>
-		</method>
 		<method name="get_extents" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
-			Return the half extents, the actual width and height of this shape is twice the half extents.
+				Return the half extents, the actual width and height of this shape is twice the half extents.
+			</description>
+		</method>
+		<method name="set_extents">
+			<argument index="0" name="extents" type="Vector2">
+			</argument>
+			<description>
+				Set the half extents, the actual width and height of this shape is twice the half extents.
 			</description>
 		</method>
 	</methods>
@@ -30605,10 +30963,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Reference" inherits="Object" category="Core">
 	<brief_description>
-	Base class for anything that keeps a reference count.
+		Base class for anything that keeps a reference count.
 	</brief_description>
 	<description>
-	Base class for anything that keeps a reference count. Resource and many other helper objects inherit this. References keep an internal reference counter so they are only released when no longer in use.
+		Base class for anything that keeps a reference count. Resource and many other helper objects inherit this. References keep an internal reference counter so they are only released when no longer in use.
 	</description>
 	<methods>
 		<method name="init_ref">
@@ -30619,14 +30977,14 @@ This method controls whether the position between two cached points is interpola
 		</method>
 		<method name="reference">
 			<description>
-			Increase the internal reference counter. Use this only if you really know what you are doing.
+				Increase the internal reference counter. Use this only if you really know what you are doing.
 			</description>
 		</method>
 		<method name="unreference">
 			<return type="bool">
 			</return>
 			<description>
-			Decrease the internal reference counter. Use this only if you really know what you are doing.
+				Decrease the internal reference counter. Use this only if you really know what you are doing.
 			</description>
 		</method>
 	</methods>
@@ -30635,10 +30993,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="ReferenceFrame" inherits="Control" category="Core">
 	<brief_description>
-	Reference frame for GUI.
+		Reference frame for GUI.
 	</brief_description>
 	<description>
-	Reference frame for GUI. It's just like an empty control, except a red box is displayed while editing around its size at all times.
+		Reference frame for GUI. It's just like an empty control, except a red box is displayed while editing around its size at all times.
 	</description>
 	<methods>
 	</methods>
@@ -30651,13 +31009,13 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="RegEx" inherits="Reference" category="Core">
 	<brief_description>
-	Simple regular expression matcher.
+		Simple regular expression matcher.
 	</brief_description>
 	<description>
-	Class for finding text patterns in a string using regular expressions. Regular expressions are a way to define patterns of text to be searched.
-	This class only finds patterns in a string. It can not perform replacements.
-	Usage of regular expressions is too long to be explained here, but Internet is full of tutorials and detailed explanations.
-	Currently supported features:
+		Class for finding text patterns in a string using regular expressions. Regular expressions are a way to define patterns of text to be searched.
+		This class only finds patterns in a string. It can not perform replacements.
+		Usage of regular expressions is too long to be explained here, but Internet is full of tutorials and detailed explanations.
+		Currently supported features:
 		Capturing [code]()[/code] and non-capturing [code](?:)[/code] groups
 		Any character [code].[/code]
 		Shorthand character classes [code]\w \W \s \S \d \D[/code]
@@ -30674,6 +31032,11 @@ This method controls whether the position between two cached points is interpola
 		Word boundaries [code]\b[/code], [code]\B[/code]
 	</description>
 	<methods>
+		<method name="clear">
+			<description>
+				This method resets the state of the object, as it was freshly created. Namely, it unassigns the regular expression of this object, and forgets all captures made by the last [method find].
+			</description>
+		</method>
 		<method name="compile">
 			<return type="int">
 			</return>
@@ -30682,7 +31045,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="capture" type="int" default="9">
 			</argument>
 			<description>
-			Compiles and assign the regular expression pattern to use. The limit on the number of capturing groups can be specified or made unlimited if negative.
+				Compiles and assign the regular expression pattern to use. The limit on the number of capturing groups can be specified or made unlimited if negative.
 			</description>
 		</method>
 		<method name="find" qualifiers="const">
@@ -30695,35 +31058,23 @@ This method controls whether the position between two cached points is interpola
 			<argument index="2" name="end" type="int" default="-1">
 			</argument>
 			<description>
-			This method tries to find the pattern within the string, and returns the position where it was found. It also stores any capturing group (see [method get_capture]) for further retrieval.
-			</description>
-		</method>
-		<method name="clear">
-			<description>
-			This method resets the state of the object, as it was freshly created. Namely, it unassigns the regular expression of this object, and forgets all captures made by the last [method find].
+				This method tries to find the pattern within the string, and returns the position where it was found. It also stores any capturing group (see [method get_capture]) for further retrieval.
 			</description>
 		</method>
-		<method name="is_valid" qualifiers="const">
-			<return type="bool">
+		<method name="get_capture" qualifiers="const">
+			<return type="String">
 			</return>
+			<argument index="0" name="capture" type="int">
+			</argument>
 			<description>
-			Returns whether this object has a valid regular expression assigned.
+				Returns a captured group. A captured group is the part of a string that matches a part of the pattern delimited by parentheses (unless they are non-capturing parentheses [i](?:)[/i]).
 			</description>
 		</method>
 		<method name="get_capture_count" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Returns the number of capturing groups. A captured group is the part of a string that matches a part of the pattern delimited by parentheses (unless they are non-capturing parentheses [i](?:)[/i]).
-			</description>
-		</method>
-		<method name="get_capture" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="capture" type="int">
-			</argument>
-			<description>
-			Returns a captured group. A captured group is the part of a string that matches a part of the pattern delimited by parentheses (unless they are non-capturing parentheses [i](?:)[/i]).
+				Returns the number of capturing groups. A captured group is the part of a string that matches a part of the pattern delimited by parentheses (unless they are non-capturing parentheses [i](?:)[/i]).
 			</description>
 		</method>
 		<method name="get_capture_start" qualifiers="const">
@@ -30738,7 +31089,14 @@ This method controls whether the position between two cached points is interpola
 			<return type="StringArray">
 			</return>
 			<description>
-			Return a list of all the captures made by the regular expression.
+				Return a list of all the captures made by the regular expression.
+			</description>
+		</method>
+		<method name="is_valid" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+				Returns whether this object has a valid regular expression assigned.
 			</description>
 		</method>
 	</methods>
@@ -30751,18 +31109,18 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_remote_node">
-			<argument index="0" name="path" type="NodePath">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_remote_node" qualifiers="const">
 			<return type="NodePath">
 			</return>
 			<description>
 			</description>
 		</method>
+		<method name="set_remote_node">
+			<argument index="0" name="path" type="NodePath">
+			</argument>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<constants>
 	</constants>
@@ -30779,52 +31137,45 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Resource" inherits="Reference" category="Core">
 	<brief_description>
-	Base class for all resources.
+		Base class for all resources.
 	</brief_description>
 	<description>
-	Resource is the base class for all resource types. Resources are primarily data containers. They are reference counted and freed when no longer in use. They are also loaded only once from disk, and further attempts to load the resource will return the same reference (all this in contrast to a [Node], which is not reference counted and can be instanced from disk as many times as desired). Resources can be saved externally on disk or bundled into another object, such as a [Node] or another resource.
+		Resource is the base class for all resource types. Resources are primarily data containers. They are reference counted and freed when no longer in use. They are also loaded only once from disk, and further attempts to load the resource will return the same reference (all this in contrast to a [Node], which is not reference counted and can be instanced from disk as many times as desired). Resources can be saved externally on disk or bundled into another object, such as a [Node] or another resource.
 	</description>
 	<methods>
-		<method name="set_path">
-			<argument index="0" name="path" type="String">
+		<method name="duplicate">
+			<return type="Object">
+			</return>
+			<argument index="0" name="subresources" type="bool" default="false">
 			</argument>
 			<description>
-			Set the path of the resource. This is useful mainly for editors when saving/loading, and shouldn't be changed by anything else. Fails if another [Resource] already has path "path".
 			</description>
 		</method>
-		<method name="take_over_path">
-			<argument index="0" name="path" type="String">
-			</argument>
+		<method name="get_import_metadata" qualifiers="const">
+			<return type="Object">
+			</return>
 			<description>
-			Set the path of the resource. Differs from set_path(), if another [Resource] exists with "path" it over-takes it, instead of failing.
 			</description>
 		</method>
-		<method name="get_path" qualifiers="const">
+		<method name="get_name" qualifiers="const">
 			<return type="String">
 			</return>
 			<description>
-			Return the path of the resource. This is useful mainly for editors when saving/loading, and shouldn't be changed by anything else.
+				Return the name of the resources, any name is valid (it doesn't have to be unique). Name is for descriptive purposes only.
 			</description>
 		</method>
-		<method name="set_name">
-			<argument index="0" name="name" type="String">
-			</argument>
-			<description>
-			Set the name of the resources, any name is valid (it doesn't have to be unique). Name is for descriptive purposes only.
-			</description>
-		</method>
-		<method name="get_name" qualifiers="const">
+		<method name="get_path" qualifiers="const">
 			<return type="String">
 			</return>
 			<description>
-			Return the name of the resources, any name is valid (it doesn't have to be unique). Name is for descriptive purposes only.
+				Return the path of the resource. This is useful mainly for editors when saving/loading, and shouldn't be changed by anything else.
 			</description>
 		</method>
 		<method name="get_rid" qualifiers="const">
 			<return type="RID">
 			</return>
 			<description>
-			Return the RID of the resource (or an empty RID). Many resources (such as [Texture], [Mesh], etc) are high level abstractions of resources stored in a server, so this function will return the original RID.
+				Return the RID of the resource (or an empty RID). Many resources (such as [Texture], [Mesh], etc) are high level abstractions of resources stored in a server, so this function will return the original RID.
 			</description>
 		</method>
 		<method name="set_import_metadata">
@@ -30833,18 +31184,25 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_import_metadata" qualifiers="const">
-			<return type="Object">
-			</return>
+		<method name="set_name">
+			<argument index="0" name="name" type="String">
+			</argument>
 			<description>
+				Set the name of the resources, any name is valid (it doesn't have to be unique). Name is for descriptive purposes only.
 			</description>
 		</method>
-		<method name="duplicate">
-			<return type="Object">
-			</return>
-			<argument index="0" name="subresources" type="bool" default="false">
+		<method name="set_path">
+			<argument index="0" name="path" type="String">
+			</argument>
+			<description>
+				Set the path of the resource. This is useful mainly for editors when saving/loading, and shouldn't be changed by anything else. Fails if another [Resource] already has path "path".
+			</description>
+		</method>
+		<method name="take_over_path">
+			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
+				Set the path of the resource. Differs from set_path(), if another [Resource] exists with "path" it over-takes it, instead of failing.
 			</description>
 		</method>
 	</methods>
@@ -30863,8 +31221,10 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_editor">
-			<argument index="0" name="name" type="String">
+		<method name="add_source">
+			<argument index="0" name="path" type="String">
+			</argument>
+			<argument index="1" name="md5" type="String" default="&quot;&quot;">
 			</argument>
 			<description>
 			</description>
@@ -30875,19 +31235,21 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="add_source">
-			<argument index="0" name="path" type="String">
-			</argument>
-			<argument index="1" name="md5" type="String" default="&quot;&quot;">
+		<method name="get_option" qualifiers="const">
+			<argument index="0" name="key" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_source_path" qualifiers="const">
-			<return type="String">
+		<method name="get_options" qualifiers="const">
+			<return type="StringArray">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="get_source_count" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
@@ -30899,11 +31261,11 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="set_source_md5">
+		<method name="get_source_path" qualifiers="const">
+			<return type="String">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="md5" type="String">
-			</argument>
 			<description>
 			</description>
 		</method>
@@ -30913,9 +31275,9 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_source_count" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_editor">
+			<argument index="0" name="name" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -30927,15 +31289,11 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_option" qualifiers="const">
-			<argument index="0" name="key" type="String">
+		<method name="set_source_md5">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="md5" type="String">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_options" qualifiers="const">
-			<return type="StringArray">
-			</return>
 			<description>
 			</description>
 		</method>
@@ -30945,44 +31303,44 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="ResourceInteractiveLoader" inherits="Reference" category="Core">
 	<brief_description>
-	Interactive Resource Loader.
+		Interactive Resource Loader.
 	</brief_description>
 	<description>
-	Interactive Resource Loader. This object is returned by ResourceLoader when performing an interactive load. It allows to load with high granularity, so this is mainly useful for displaying load bars/percentages.
+		Interactive Resource Loader. This object is returned by ResourceLoader when performing an interactive load. It allows to load with high granularity, so this is mainly useful for displaying load bars/percentages.
 	</description>
 	<methods>
 		<method name="get_resource">
 			<return type="Object">
 			</return>
 			<description>
-			Return the loaded resource (only if loaded). Otherwise, returns null.
+				Return the loaded resource (only if loaded). Otherwise, returns null.
 			</description>
 		</method>
-		<method name="poll">
+		<method name="get_stage" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Poll the load. If OK is returned, this means poll will have to be called again. If ERR_EOF is returned, them the load has finished and the resource can be obtained by calling [method get_resource].
+				Return the load stage. The total amount of stages can be queried with [method get_stage_count]
 			</description>
 		</method>
-		<method name="wait">
+		<method name="get_stage_count" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
+				Return the total amount of stages (calls to [method poll]) needed to completely load this resource.
 			</description>
 		</method>
-		<method name="get_stage" qualifiers="const">
+		<method name="poll">
 			<return type="int">
 			</return>
 			<description>
-			Return the load stage. The total amount of stages can be queried with [method get_stage_count]
+				Poll the load. If OK is returned, this means poll will have to be called again. If ERR_EOF is returned, them the load has finished and the resource can be obtained by calling [method get_resource].
 			</description>
 		</method>
-		<method name="get_stage_count" qualifiers="const">
+		<method name="wait">
 			<return type="int">
 			</return>
 			<description>
-			Return the total amount of stages (calls to [method poll]) needed to completely load this resource.
 			</description>
 		</method>
 	</methods>
@@ -30991,21 +31349,35 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="ResourceLoader" inherits="Object" category="Core">
 	<brief_description>
-	Resource Loader.
+		Resource Loader.
 	</brief_description>
 	<description>
-	Resource Loader. This is a static object accessible as [ResourceLoader]. GDScript has a simplified load() function, though.
+		Resource Loader. This is a static object accessible as [ResourceLoader]. GDScript has a simplified load() function, though.
 	</description>
 	<methods>
-		<method name="load_interactive">
-			<return type="ResourceInteractiveLoader">
+		<method name="get_dependencies">
+			<return type="StringArray">
 			</return>
 			<argument index="0" name="path" type="String">
 			</argument>
-			<argument index="1" name="type_hint" type="String" default="&quot;&quot;">
+			<description>
+			</description>
+		</method>
+		<method name="get_recognized_extensions_for_type">
+			<return type="StringArray">
+			</return>
+			<argument index="0" name="type" type="String">
+			</argument>
+			<description>
+				Return the list of recognized extensions for a resource type.
+			</description>
+		</method>
+		<method name="has">
+			<return type="bool">
+			</return>
+			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
-			Load a resource interactively, the returned object allows to load with high granularity.
 			</description>
 		</method>
 		<method name="load">
@@ -31028,36 +31400,22 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_recognized_extensions_for_type">
-			<return type="StringArray">
+		<method name="load_interactive">
+			<return type="ResourceInteractiveLoader">
 			</return>
-			<argument index="0" name="type" type="String">
+			<argument index="0" name="path" type="String">
+			</argument>
+			<argument index="1" name="type_hint" type="String" default="&quot;&quot;">
 			</argument>
 			<description>
-			Return the list of recognized extensions for a resource type.
+				Load a resource interactively, the returned object allows to load with high granularity.
 			</description>
 		</method>
 		<method name="set_abort_on_missing_resources">
 			<argument index="0" name="abort" type="bool">
 			</argument>
 			<description>
-			Change the behavior on missing sub-resources. Default is to abort load.
-			</description>
-		</method>
-		<method name="get_dependencies">
-			<return type="StringArray">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="has">
-			<return type="bool">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
-			<description>
+				Change the behavior on missing sub-resources. Default is to abort load.
 			</description>
 		</method>
 	</methods>
@@ -31066,10 +31424,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="ResourcePreloader" inherits="Node" category="Core">
 	<brief_description>
-	Resource Preloader Node.
+		Resource Preloader Node.
 	</brief_description>
 	<description>
-	Resource Preloader Node. This node is used to preload sub-resources inside a scene, so when the scene is loaded all the resources are ready to use and be retrieved from here.
+		Resource Preloader Node. This node is used to preload sub-resources inside a scene, so when the scene is loaded all the resources are ready to use and be retrieved from here.
 	</description>
 	<methods>
 		<method name="add_resource">
@@ -31078,23 +31436,23 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="resource" type="Object">
 			</argument>
 			<description>
-			Add a resource to the preloader. Set the text-id that will be used to identify it (retrieve it/erase it/etc).
+				Add a resource to the preloader. Set the text-id that will be used to identify it (retrieve it/erase it/etc).
 			</description>
 		</method>
-		<method name="remove_resource">
+		<method name="get_resource" qualifiers="const">
+			<return type="Object">
+			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			Remove a resource from the preloader by text id.
+				Return the resource given a text-id.
 			</description>
 		</method>
-		<method name="rename_resource">
-			<argument index="0" name="name" type="String">
-			</argument>
-			<argument index="1" name="newname" type="String">
-			</argument>
+		<method name="get_resource_list" qualifiers="const">
+			<return type="StringArray">
+			</return>
 			<description>
-			Rename a resource inside the preloader, from a text-id to a new text-id.
+				Return the list of resources inside the preloader.
 			</description>
 		</method>
 		<method name="has_resource" qualifiers="const">
@@ -31103,23 +31461,23 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			Return true if the preloader has a given resource.
+				Return true if the preloader has a given resource.
 			</description>
 		</method>
-		<method name="get_resource" qualifiers="const">
-			<return type="Object">
-			</return>
+		<method name="remove_resource">
 			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			Return the resource given a text-id.
+				Remove a resource from the preloader by text id.
 			</description>
 		</method>
-		<method name="get_resource_list" qualifiers="const">
-			<return type="StringArray">
-			</return>
+		<method name="rename_resource">
+			<argument index="0" name="name" type="String">
+			</argument>
+			<argument index="1" name="newname" type="String">
+			</argument>
 			<description>
-			Return the list of resources inside the preloader.
+				Rename a resource inside the preloader, from a text-id to a new text-id.
 			</description>
 		</method>
 	</methods>
@@ -31128,12 +31486,21 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="ResourceSaver" inherits="Object" category="Core">
 	<brief_description>
-	Resource Saving Interface.
+		Resource Saving Interface.
 	</brief_description>
 	<description>
-	Resource Saving Interface. This interface is used for saving resources to disk.
+		Resource Saving Interface. This interface is used for saving resources to disk.
 	</description>
 	<methods>
+		<method name="get_recognized_extensions">
+			<return type="StringArray">
+			</return>
+			<argument index="0" name="type" type="Object">
+			</argument>
+			<description>
+				Return the list of extensions available for saving a resource of a given type.
+			</description>
+		</method>
 		<method name="save">
 			<return type="int">
 			</return>
@@ -31144,16 +31511,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="2" name="flags" type="int" default="0">
 			</argument>
 			<description>
-			Save a resource to disk, to a given path.
-			</description>
-		</method>
-		<method name="get_recognized_extensions">
-			<return type="StringArray">
-			</return>
-			<argument index="0" name="type" type="Object">
-			</argument>
-			<description>
-			Return the list of extensions available for saving a resource of a given type.
+				Save a resource to disk, to a given path.
 			</description>
 		</method>
 	</methods>
@@ -31174,213 +31532,220 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="RichTextLabel" inherits="Control" category="Core">
 	<brief_description>
-	Label that displays rich text.
+		Label that displays rich text.
 	</brief_description>
 	<description>
-	Label that displays rich text. Rich text can contain custom text, fonts, images and some basic formatting. It also adapts itself to given width/heights.
+		Label that displays rich text. Rich text can contain custom text, fonts, images and some basic formatting. It also adapts itself to given width/heights.
 	</description>
 	<methods>
+		<method name="add_image">
+			<argument index="0" name="image" type="Texture">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="add_text">
 			<argument index="0" name="text" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="add_image">
-			<argument index="0" name="image" type="Texture">
+		<method name="append_bbcode">
+			<return type="int">
+			</return>
+			<argument index="0" name="bbcode" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="newline">
+		<method name="clear">
 			<description>
 			</description>
 		</method>
-		<method name="push_font">
-			<argument index="0" name="font" type="Object">
-			</argument>
+		<method name="get_bbcode" qualifiers="const">
+			<return type="String">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="push_color">
-			<argument index="0" name="color" type="Color">
-			</argument>
+		<method name="get_tab_size" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="push_align">
-			<argument index="0" name="align" type="int">
-			</argument>
+		<method name="get_text">
+			<return type="String">
+			</return>
 			<description>
+			Returns the raw text, stripping out the formatting information.
 			</description>
 		</method>
-		<method name="push_indent">
-			<argument index="0" name="level" type="int">
-			</argument>
+		<method name="get_total_character_count" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="push_list">
-			<argument index="0" name="type" type="int">
-			</argument>
+		<method name="get_v_scroll">
+			<return type="Object">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="push_meta">
-			<argument index="0" name="data" type="Variant">
-			</argument>
+		<method name="get_visible_characters" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="push_underline">
+		<method name="is_meta_underlined" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="push_table">
-			<argument index="0" name="columns" type="int">
-			</argument>
+		<method name="is_scroll_active" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_table_column_expand">
-			<argument index="0" name="column" type="int">
-			</argument>
-			<argument index="1" name="expand" type="bool">
-			</argument>
-			<argument index="2" name="ratio" type="int">
-			</argument>
+		<method name="is_scroll_following" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="push_cell">
+		<method name="is_selection_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
+				Return true if selecting the text inside this richtext is allowed.
 			</description>
 		</method>
-		<method name="pop">
+		<method name="is_using_bbcode" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="clear">
+		<method name="newline">
 			<description>
 			</description>
 		</method>
-		<method name="set_meta_underline">
-			<argument index="0" name="enable" type="bool">
+		<method name="parse_bbcode">
+			<return type="int">
+			</return>
+			<argument index="0" name="bbcode" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_meta_underlined" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="pop">
 			<description>
 			</description>
 		</method>
-		<method name="set_scroll_active">
-			<argument index="0" name="active" type="bool">
+		<method name="push_align">
+			<argument index="0" name="align" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_scroll_active" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="push_cell">
 			<description>
 			</description>
 		</method>
-		<method name="set_scroll_follow">
-			<argument index="0" name="follow" type="bool">
+		<method name="push_color">
+			<argument index="0" name="color" type="Color">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_scroll_following" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="push_font">
+			<argument index="0" name="font" type="Object">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_v_scroll">
-			<return type="Object">
-			</return>
+		<method name="push_indent">
+			<argument index="0" name="level" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="scroll_to_line">
-			<argument index="0" name="line" type="int">
+		<method name="push_list">
+			<argument index="0" name="type" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_tab_size">
-			<argument index="0" name="spaces" type="int">
+		<method name="push_meta">
+			<argument index="0" name="data" type="Variant">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_tab_size" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="push_table">
+			<argument index="0" name="columns" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_selection_enabled">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
+		<method name="push_underline">
 			<description>
-			Set to true if selecting the text inside this richtext is allowed.
 			</description>
 		</method>
-		<method name="is_selection_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="scroll_to_line">
+			<argument index="0" name="line" type="int">
+			</argument>
 			<description>
-			Return true if selecting the text inside this richtext is allowed.
 			</description>
 		</method>
-		<method name="parse_bbcode">
-			<return type="int">
-			</return>
-			<argument index="0" name="bbcode" type="String">
+		<method name="set_bbcode">
+			<argument index="0" name="text" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="append_bbcode">
-			<return type="int">
-			</return>
-			<argument index="0" name="bbcode" type="String">
+		<method name="set_meta_underline">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_bbcode">
-			<argument index="0" name="text" type="String">
+		<method name="set_scroll_active">
+			<argument index="0" name="active" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_bbcode" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="set_scroll_follow">
+			<argument index="0" name="follow" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_visible_characters">
-			<argument index="0" name="amount" type="int">
+		<method name="set_selection_enabled">
+			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
+				Set to true if selecting the text inside this richtext is allowed.
 			</description>
 		</method>
-		<method name="get_visible_characters" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_tab_size">
+			<argument index="0" name="spaces" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_total_character_count" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_table_column_expand">
+			<argument index="0" name="column" type="int">
+			</argument>
+			<argument index="1" name="expand" type="bool">
+			</argument>
+			<argument index="2" name="ratio" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -31390,9 +31755,9 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="is_using_bbcode" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_visible_characters">
+			<argument index="0" name="amount" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -31444,308 +31809,308 @@ This method controls whether the position between two cached points is interpola
 		</constant>
 	</constants>
 	<theme_items>
-		<theme_item name="table_vseparation" type="int">
-		</theme_item>
-		<theme_item name="table_hseparation" type="int">
+		<theme_item name="bold_font" type="Font">
 		</theme_item>
-		<theme_item name="line_separation" type="int">
+		<theme_item name="bold_italics_font" type="Font">
 		</theme_item>
 		<theme_item name="default_color" type="Color">
 		</theme_item>
-		<theme_item name="selection_color" type="Color">
+		<theme_item name="focus" type="StyleBox">
 		</theme_item>
 		<theme_item name="font_color_selected" type="Color">
 		</theme_item>
-		<theme_item name="mono_font" type="Font">
-		</theme_item>
-		<theme_item name="bold_italics_font" type="Font">
-		</theme_item>
 		<theme_item name="italics_font" type="Font">
 		</theme_item>
-		<theme_item name="bold_font" type="Font">
+		<theme_item name="line_separation" type="int">
+		</theme_item>
+		<theme_item name="mono_font" type="Font">
 		</theme_item>
 		<theme_item name="normal_font" type="Font">
 		</theme_item>
-		<theme_item name="focus" type="StyleBox">
+		<theme_item name="selection_color" type="Color">
+		</theme_item>
+		<theme_item name="table_hseparation" type="int">
+		</theme_item>
+		<theme_item name="table_vseparation" type="int">
 		</theme_item>
 	</theme_items>
 </class>
 <class name="RigidBody" inherits="PhysicsBody" category="Core">
 	<brief_description>
-	Rigid body node.
+		Rigid body node.
 	</brief_description>
 	<description>
-	Rigid body node. This node is used for placing rigid bodies in the scene. It can contain a number of shapes, and also shift mode between regular Rigid body, Kinematic, Character or Static.
+		Rigid body node. This node is used for placing rigid bodies in the scene. It can contain a number of shapes, and also shift mode between regular Rigid body, Kinematic, Character or Static.
 	</description>
 	<methods>
 		<method name="_integrate_forces" qualifiers="virtual">
 			<argument index="0" name="state" type="PhysicsDirectBodyState">
 			</argument>
 			<description>
-			Called during physics processing, allowing you to read and safely modify the simulation state for the object. By default it works in addition to the usual physics behavior, but [method set_use_custom_integrator] allows you to disable the default behavior and do fully custom force integration for a body.
+				Called during physics processing, allowing you to read and safely modify the simulation state for the object. By default it works in addition to the usual physics behavior, but [method set_use_custom_integrator] allows you to disable the default behavior and do fully custom force integration for a body.
 			</description>
 		</method>
-		<method name="set_mode">
-			<argument index="0" name="mode" type="int">
+		<method name="apply_impulse">
+			<argument index="0" name="pos" type="Vector3">
+			</argument>
+			<argument index="1" name="impulse" type="Vector3">
 			</argument>
 			<description>
-			Set the body mode, from the MODE_* enum. This allows to change to a static body or a character body.
+				Apply a positioned impulse (which will be affected by the body mass and shape). This is the equivalent of hitting a billiard ball with a cue: a force that is applied once, and only once. Both the impulse and the offset from the body origin are in global coordinates.
 			</description>
 		</method>
-		<method name="get_mode" qualifiers="const">
-			<return type="int">
+		<method name="get_angular_damp" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return the current body mode, see [method set_mode].
+				Return the current body angular damp. Default is -1.
 			</description>
 		</method>
-		<method name="set_mass">
-			<argument index="0" name="mass" type="float">
-			</argument>
+		<method name="get_angular_velocity" qualifiers="const">
+			<return type="Vector3">
+			</return>
 			<description>
-			Set the body mass.
+				Return the current body angular velocity.
 			</description>
 		</method>
-		<method name="get_mass" qualifiers="const">
+		<method name="get_axis_lock" qualifiers="const">
+			<return type="int">
+			</return>
+			<description>
+				Return the current axis lock of the body. One of AXIS_LOCK_* enum.
+			</description>
+		</method>
+		<method name="get_bounce" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the current body mass.
+				Return the current body bounciness.
 			</description>
 		</method>
-		<method name="set_weight">
-			<argument index="0" name="weight" type="float">
-			</argument>
+		<method name="get_colliding_bodies" qualifiers="const">
+			<return type="Array">
+			</return>
 			<description>
-			Set the body weight given standard earth-weight (gravity 9.8).
+				Return a list of the bodies colliding with this one.
 			</description>
 		</method>
-		<method name="get_weight" qualifiers="const">
+		<method name="get_friction" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the current body weight, given standard earth-weight (gravity 9.8).
+				Return the current body friction, from 0 (frictionless) to 1 (max friction).
 			</description>
 		</method>
-		<method name="set_friction">
-			<argument index="0" name="friction" type="float">
-			</argument>
+		<method name="get_gravity_scale" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the body friction, from 0 (frictionless) to 1 (max friction).
+				Return the current body gravity scale.
 			</description>
 		</method>
-		<method name="get_friction" qualifiers="const">
+		<method name="get_linear_damp" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the current body friction, from 0 (frictionless) to 1 (max friction).
+				Return the current body linear damp. Default is -1.
 			</description>
 		</method>
-		<method name="set_bounce">
-			<argument index="0" name="bounce" type="float">
-			</argument>
+		<method name="get_linear_velocity" qualifiers="const">
+			<return type="Vector3">
+			</return>
 			<description>
-			Set the body bounciness, from 0 (no bounciness) to 1 (max bounciness).
+				Return the current body linear velocity.
 			</description>
 		</method>
-		<method name="get_bounce" qualifiers="const">
+		<method name="get_mass" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the current body bounciness.
+				Return the current body mass.
 			</description>
 		</method>
-		<method name="set_linear_velocity">
-			<argument index="0" name="linear_velocity" type="Vector3">
-			</argument>
+		<method name="get_max_contacts_reported" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the body linear velocity. Can be used sporadically, but [b]DON'T SET THIS IN EVERY FRAME[/b], because physics may be running in another thread and definitely runs at a different granularity. Use [method _integrate_forces] as your process loop if you want to have precise control of the body state.
+				Return the maximum contacts that can be reported. See [method set_max_contacts_reported].
 			</description>
 		</method>
-		<method name="get_linear_velocity" qualifiers="const">
-			<return type="Vector3">
+		<method name="get_mode" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the current body linear velocity.
+				Return the current body mode, see [method set_mode].
 			</description>
 		</method>
-		<method name="set_angular_velocity">
-			<argument index="0" name="angular_velocity" type="Vector3">
-			</argument>
+		<method name="get_weight" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the body angular velocity. Can be used sporadically, but [b]DON'T SET THIS IN EVERY FRAME[/b], because physics may be running in another thread and definitely runs at a different granularity. Use [method _integrate_forces] as your process loop if you want to have precise control of the body state.
+				Return the current body weight, given standard earth-weight (gravity 9.8).
 			</description>
 		</method>
-		<method name="get_angular_velocity" qualifiers="const">
-			<return type="Vector3">
+		<method name="is_able_to_sleep" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the current body angular velocity.
+				Return whether the body has the ability to fall asleep when not moving. See [method set_can_sleep].
 			</description>
 		</method>
-		<method name="set_gravity_scale">
-			<argument index="0" name="gravity_scale" type="float">
-			</argument>
+		<method name="is_contact_monitor_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the gravity factor. This factor multiplies gravity intensity just for this body.
+				Return whether contact monitoring is enabled.
 			</description>
 		</method>
-		<method name="get_gravity_scale" qualifiers="const">
-			<return type="float">
+		<method name="is_sleeping" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the current body gravity scale.
+				Return whether the body is sleeping.
 			</description>
 		</method>
-		<method name="set_linear_damp">
-			<argument index="0" name="linear_damp" type="float">
-			</argument>
+		<method name="is_using_continuous_collision_detection" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the linear damp for this body. Default of -1, cannot be less than -1. If this value is different from -1, any linear damp derived from the world or areas will be overridden.
+				Return whether this body is using continuous collision detection.
 			</description>
 		</method>
-		<method name="get_linear_damp" qualifiers="const">
-			<return type="float">
+		<method name="is_using_custom_integrator">
+			<return type="bool">
 			</return>
 			<description>
-			Return the current body linear damp. Default is -1.
+				Return whether the body is using a custom integrator.
 			</description>
 		</method>
 		<method name="set_angular_damp">
 			<argument index="0" name="angular_damp" type="float">
 			</argument>
 			<description>
-			Set the angular damp for this body. Default of -1, cannot be less than -1. If this value is different from -1, any angular damp derived from the world or areas will be overridden.
+				Set the angular damp for this body. Default of -1, cannot be less than -1. If this value is different from -1, any angular damp derived from the world or areas will be overridden.
 			</description>
 		</method>
-		<method name="get_angular_damp" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_angular_velocity">
+			<argument index="0" name="angular_velocity" type="Vector3">
+			</argument>
 			<description>
-			Return the current body angular damp. Default is -1.
+				Set the body angular velocity. Can be used sporadically, but [b]DON'T SET THIS IN EVERY FRAME[/b], because physics may be running in another thread and definitely runs at a different granularity. Use [method _integrate_forces] as your process loop if you want to have precise control of the body state.
 			</description>
 		</method>
-		<method name="set_max_contacts_reported">
-			<argument index="0" name="amount" type="int">
+		<method name="set_axis_lock">
+			<argument index="0" name="axis_lock" type="int">
 			</argument>
 			<description>
-			Set the maximum contacts to report. Bodies can keep a log of the contacts with other bodies, this is enabled by setting the maximum amount of contacts reported to a number greater than 0.
+				Set the axis lock of the body, from the AXIS_LOCK_* enum. Axis lock stops the body from moving along the specified axis(X/Y/Z) and rotating along the other two axes.
 			</description>
 		</method>
-		<method name="get_max_contacts_reported" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_axis_velocity">
+			<argument index="0" name="axis_velocity" type="Vector3">
+			</argument>
 			<description>
-			Return the maximum contacts that can be reported. See [method set_max_contacts_reported].
+				Set an axis velocity. The velocity in the given vector axis will be set as the given vector length. This is useful for jumping behavior.
 			</description>
 		</method>
-		<method name="set_use_custom_integrator">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_bounce">
+			<argument index="0" name="bounce" type="float">
 			</argument>
 			<description>
-			Pass true to disable the internal force integration (like gravity or air friction) for this body. Other than collision response, the body will only move as determined by the [method _integrate_forces] function, if defined.
+				Set the body bounciness, from 0 (no bounciness) to 1 (max bounciness).
 			</description>
 		</method>
-		<method name="is_using_custom_integrator">
-			<return type="bool">
-			</return>
+		<method name="set_can_sleep">
+			<argument index="0" name="able_to_sleep" type="bool">
+			</argument>
 			<description>
-			Return whether the body is using a custom integrator.
+				Set the body ability to fall asleep when not moving. This saves an enormous amount of processor time when there are plenty of rigid bodies (non static) in a scene.
+				Sleeping bodies are not affected by forces until a collision or an [method apply_impulse] / [method set_applied_force] wakes them up. Until then, they behave like a static body.
 			</description>
 		</method>
 		<method name="set_contact_monitor">
 			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
-			Enable contact monitoring. This allows the body to emit signals when it collides with another.
-			</description>
-		</method>
-		<method name="is_contact_monitor_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
-			Return whether contact monitoring is enabled.
+				Enable contact monitoring. This allows the body to emit signals when it collides with another.
 			</description>
 		</method>
-		<method name="set_use_continuous_collision_detection">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_friction">
+			<argument index="0" name="friction" type="float">
 			</argument>
 			<description>
-			Set the continuous collision detection mode from the enum CCD_MODE_*.
-			Continuous collision detection tries to predict where a moving body will collide, instead of moving it and correcting its movement if it collided. The first is more precise, and misses less impacts by small, fast-moving objects. The second is faster to compute, but can miss small, fast-moving objects.
+				Set the body friction, from 0 (frictionless) to 1 (max friction).
 			</description>
 		</method>
-		<method name="is_using_continuous_collision_detection" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_gravity_scale">
+			<argument index="0" name="gravity_scale" type="float">
+			</argument>
 			<description>
-			Return whether this body is using continuous collision detection.
+				Set the gravity factor. This factor multiplies gravity intensity just for this body.
 			</description>
 		</method>
-		<method name="set_axis_velocity">
-			<argument index="0" name="axis_velocity" type="Vector3">
+		<method name="set_linear_damp">
+			<argument index="0" name="linear_damp" type="float">
 			</argument>
 			<description>
-			Set an axis velocity. The velocity in the given vector axis will be set as the given vector length. This is useful for jumping behavior.
+				Set the linear damp for this body. Default of -1, cannot be less than -1. If this value is different from -1, any linear damp derived from the world or areas will be overridden.
 			</description>
 		</method>
-		<method name="apply_impulse">
-			<argument index="0" name="pos" type="Vector3">
-			</argument>
-			<argument index="1" name="impulse" type="Vector3">
+		<method name="set_linear_velocity">
+			<argument index="0" name="linear_velocity" type="Vector3">
 			</argument>
 			<description>
-			Apply a positioned impulse (which will be affected by the body mass and shape). This is the equivalent of hitting a billiard ball with a cue: a force that is applied once, and only once. Both the impulse and the offset from the body origin are in global coordinates.
+				Set the body linear velocity. Can be used sporadically, but [b]DON'T SET THIS IN EVERY FRAME[/b], because physics may be running in another thread and definitely runs at a different granularity. Use [method _integrate_forces] as your process loop if you want to have precise control of the body state.
 			</description>
 		</method>
-		<method name="set_sleeping">
-			<argument index="0" name="sleeping" type="bool">
+		<method name="set_mass">
+			<argument index="0" name="mass" type="float">
 			</argument>
 			<description>
-			Set whether a body is sleeping or not. Sleeping bodies are not affected by forces until a collision or an [method apply_impulse] wakes them up. Until then, they behave like a static body.
+				Set the body mass.
 			</description>
 		</method>
-		<method name="is_sleeping" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_max_contacts_reported">
+			<argument index="0" name="amount" type="int">
+			</argument>
 			<description>
-			Return whether the body is sleeping.
+				Set the maximum contacts to report. Bodies can keep a log of the contacts with other bodies, this is enabled by setting the maximum amount of contacts reported to a number greater than 0.
 			</description>
 		</method>
-		<method name="set_can_sleep">
-			<argument index="0" name="able_to_sleep" type="bool">
+		<method name="set_mode">
+			<argument index="0" name="mode" type="int">
 			</argument>
 			<description>
-			Set the body ability to fall asleep when not moving. This saves an enormous amount of processor time when there are plenty of rigid bodies (non static) in a scene.
-			Sleeping bodies are not affected by forces until a collision or an [method apply_impulse] / [method set_applied_force] wakes them up. Until then, they behave like a static body.
+				Set the body mode, from the MODE_* enum. This allows to change to a static body or a character body.
 			</description>
 		</method>
-		<method name="is_able_to_sleep" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_sleeping">
+			<argument index="0" name="sleeping" type="bool">
+			</argument>
 			<description>
-			Return whether the body has the ability to fall asleep when not moving. See [method set_can_sleep].
+				Set whether a body is sleeping or not. Sleeping bodies are not affected by forces until a collision or an [method apply_impulse] wakes them up. Until then, they behave like a static body.
 			</description>
 		</method>
-		<method name="set_axis_lock">
-			<argument index="0" name="axis_lock" type="int">
+		<method name="set_use_continuous_collision_detection">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Set the axis lock of the body, from the AXIS_LOCK_* enum. Axis lock stops the body from moving along the specified axis(X/Y/Z) and rotating along the other two axes.
+				Set the continuous collision detection mode from the enum CCD_MODE_*.
+				Continuous collision detection tries to predict where a moving body will collide, instead of moving it and correcting its movement if it collided. The first is more precise, and misses less impacts by small, fast-moving objects. The second is faster to compute, but can miss small, fast-moving objects.
 			</description>
 		</method>
-		<method name="get_axis_lock" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_use_custom_integrator">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Return the current axis lock of the body. One of AXIS_LOCK_* enum.
+				Pass true to disable the internal force integration (like gravity or air friction) for this body. Other than collision response, the body will only move as determined by the [method _integrate_forces] function, if defined.
 			</description>
 		</method>
-		<method name="get_colliding_bodies" qualifiers="const">
-			<return type="Array">
-			</return>
+		<method name="set_weight">
+			<argument index="0" name="weight" type="float">
+			</argument>
 			<description>
-			Return a list of the bodies colliding with this one.
+				Set the body weight given standard earth-weight (gravity 9.8).
 			</description>
 		</method>
 	</methods>
@@ -31754,7 +32119,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="body" type="Object">
 			</argument>
 			<description>
-			Emitted when a body enters into contact with this one. Contact monitor and contacts reported must be enabled for this to work.
+				Emitted when a body enters into contact with this one. Contact monitor and contacts reported must be enabled for this to work.
 			</description>
 		</signal>
 		<signal name="body_enter_shape">
@@ -31767,15 +32132,15 @@ This method controls whether the position between two cached points is interpola
 			<argument index="3" name="local_shape" type="int">
 			</argument>
 			<description>
-			Emitted when a body enters into contact with this one. Contact monitor and contacts reported must be enabled for this to work.
-			This signal not only receives the body that collided with this one, but also its [RID] (body_id), the shape index from the colliding body (body_shape), and the shape index from this body (local_shape) the other body collided with.
+				Emitted when a body enters into contact with this one. Contact monitor and contacts reported must be enabled for this to work.
+				This signal not only receives the body that collided with this one, but also its [RID] (body_id), the shape index from the colliding body (body_shape), and the shape index from this body (local_shape) the other body collided with.
 			</description>
 		</signal>
 		<signal name="body_exit">
 			<argument index="0" name="body" type="Object">
 			</argument>
 			<description>
-			Emitted when a body shape exits contact with this one. Contact monitor and contacts reported must be enabled for this to work.
+				Emitted when a body shape exits contact with this one. Contact monitor and contacts reported must be enabled for this to work.
 			</description>
 		</signal>
 		<signal name="body_exit_shape">
@@ -31788,13 +32153,13 @@ This method controls whether the position between two cached points is interpola
 			<argument index="3" name="local_shape" type="int">
 			</argument>
 			<description>
-			Emitted when a body shape exits contact with this one. Contact monitor and contacts reported must be enabled for this to work.
-			This signal not only receives the body that stopped colliding with this one, but also its [RID] (body_id), the shape index from the colliding body (body_shape), and the shape index from this body (local_shape) the other body stopped colliding with.
+				Emitted when a body shape exits contact with this one. Contact monitor and contacts reported must be enabled for this to work.
+				This signal not only receives the body that stopped colliding with this one, but also its [RID] (body_id), the shape index from the colliding body (body_shape), and the shape index from this body (local_shape) the other body stopped colliding with.
 			</description>
 		</signal>
 		<signal name="sleeping_state_changed">
 			<description>
-			Emitted when the body changes it's sleeping state. Either by sleeping or waking up.
+				Emitted when the body changes it's sleeping state. Either by sleeping or waking up.
 			</description>
 		</signal>
 	</signals>
@@ -31815,312 +32180,319 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="RigidBody2D" inherits="PhysicsBody2D" category="Core">
 	<brief_description>
-	Rigid body 2D node.
+		Rigid body 2D node.
 	</brief_description>
 	<description>
-	Rigid body 2D node. This node is used for placing rigid bodies in the scene. It can contain a number of shapes, and also shift state between regular Rigid body, Kinematic, Character or Static.
-	Character mode forbids the node from being rotated. This node can have a custom force integrator function, for writing complex physics motion behavior per node.
-	As a warning, don't change this node position every frame or very often. Sporadic changes work fine, but physics runs at a different granularity (fixed hz) than usual rendering (process callback) and maybe even in a separate thread, so changing this from a process loop will yield strange behavior.
+		Rigid body 2D node. This node is used for placing rigid bodies in the scene. It can contain a number of shapes, and also shift state between regular Rigid body, Kinematic, Character or Static.
+		Character mode forbids the node from being rotated. This node can have a custom force integrator function, for writing complex physics motion behavior per node.
+		As a warning, don't change this node position every frame or very often. Sporadic changes work fine, but physics runs at a different granularity (fixed hz) than usual rendering (process callback) and maybe even in a separate thread, so changing this from a process loop will yield strange behavior.
 	</description>
 	<methods>
 		<method name="_integrate_forces" qualifiers="virtual">
 			<argument index="0" name="state" type="Physics2DDirectBodyState">
 			</argument>
 			<description>
-			Called during physics processing, allowing you to read and safely modify the simulation state for the object. By default it works in addition to the usual physics behavior, but [method set_use_custom_integrator] allows you to disable the default behavior and do fully custom force integration for a body.
+				Called during physics processing, allowing you to read and safely modify the simulation state for the object. By default it works in addition to the usual physics behavior, but [method set_use_custom_integrator] allows you to disable the default behavior and do fully custom force integration for a body.
 			</description>
 		</method>
-		<method name="set_mode">
-			<argument index="0" name="mode" type="int">
+		<method name="add_force">
+			<argument index="0" name="offset" type="Vector2">
+			</argument>
+			<argument index="1" name="force" type="Vector2">
 			</argument>
 			<description>
-			Set the body mode, from the MODE_* enum. This allows to change to a static body or a character body.
-			</description>
-		</method>
-		<method name="get_mode" qualifiers="const">
-			<return type="int">
-			</return>
-			<description>
-			Return the current body mode, see [method set_mode].
+				Add a positioned force to the applied force and torque. As with [method apply_impulse], both the force and the offset from the body origin are in global coordinates.
 			</description>
 		</method>
-		<method name="set_mass">
-			<argument index="0" name="mass" type="float">
+		<method name="apply_impulse">
+			<argument index="0" name="offset" type="Vector2">
+			</argument>
+			<argument index="1" name="impulse" type="Vector2">
 			</argument>
 			<description>
-			Set the body mass.
+				Apply a positioned impulse (which will be affected by the body mass and shape). This is the equivalent of hitting a billiard ball with a cue: a force that is applied once, and only once. Both the impulse and the offset from the body origin are in global coordinates.
 			</description>
 		</method>
-		<method name="get_mass" qualifiers="const">
+		<method name="get_angular_damp" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the body mass.
+				Return the angular damp for this body.
 			</description>
 		</method>
-		<method name="get_inertia" qualifiers="const">
+		<method name="get_angular_velocity" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the body's moment of inertia. This is usually automatically computed from the mass and the shapes. Note that this doesn't seem to work in a [code]_ready[/code] function: it apparently has not been auto-computed yet.
+				Return the body angular velocity. This changes by physics granularity. See [method set_angular_velocity].
 			</description>
 		</method>
-		<method name="set_inertia">
-			<argument index="0" name="inertia" type="float">
-			</argument>
+		<method name="get_applied_force" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
-			Set the body's moment of inertia. This is like mass, but for rotation: it determines how much torque it takes to rotate the body. The moment of inertia is usually computed automatically from the mass and the shapes, but this function allows you to set a custom value. Set 0 (or negative) inertia to return to automatically computing it.
+				Return the applied force vector.
 			</description>
 		</method>
-		<method name="set_weight">
-			<argument index="0" name="weight" type="float">
-			</argument>
+		<method name="get_applied_torque" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the body weight given standard earth-weight (gravity 9.8). Not really useful for 2D since most measures for this node are in pixels.
+				Return the torque which is being applied to this body.
 			</description>
 		</method>
-		<method name="get_weight" qualifiers="const">
+		<method name="get_bounce" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the body weight given standard earth-weight (gravity 9.8).
+				Return the body bounciness.
 			</description>
 		</method>
-		<method name="set_friction">
-			<argument index="0" name="friction" type="float">
-			</argument>
+		<method name="get_colliding_bodies" qualifiers="const">
+			<return type="Array">
+			</return>
+			<description>
+				Return a list of the bodies colliding with this one.
+			</description>
+		</method>
+		<method name="get_continuous_collision_detection_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the body friction, from 0 (frictionless) to 1 (full friction).
+				Return whether this body is using continuous collision detection.
 			</description>
 		</method>
 		<method name="get_friction" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the body friction.
+				Return the body friction.
 			</description>
 		</method>
-		<method name="set_bounce">
-			<argument index="0" name="bounce" type="float">
-			</argument>
+		<method name="get_gravity_scale" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the body bounciness, from 0 (no bounce) to 1 (full bounce).
+				Return the gravity factor.
 			</description>
 		</method>
-		<method name="get_bounce" qualifiers="const">
+		<method name="get_inertia" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the body bounciness.
+				Return the body's moment of inertia. This is usually automatically computed from the mass and the shapes. Note that this doesn't seem to work in a [code]_ready[/code] function: it apparently has not been auto-computed yet.
 			</description>
 		</method>
-		<method name="set_gravity_scale">
-			<argument index="0" name="gravity_scale" type="float">
-			</argument>
+		<method name="get_linear_damp" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the gravity factor. This factor multiplies gravity intensity just for this body.
+				Return the linear damp for this body.
 			</description>
 		</method>
-		<method name="get_gravity_scale" qualifiers="const">
+		<method name="get_linear_velocity" qualifiers="const">
+			<return type="Vector2">
+			</return>
+			<description>
+				Return the body linear velocity. This changes by physics granularity. See [method set_linear_velocity].
+			</description>
+		</method>
+		<method name="get_mass" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the gravity factor.
+				Return the body mass.
 			</description>
 		</method>
-		<method name="set_linear_damp">
-			<argument index="0" name="linear_damp" type="float">
-			</argument>
+		<method name="get_max_contacts_reported" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the linear damp for this body. If this value is different from -1, any linear damp derived from the world or areas will be overridden.
+				Return the maximum contacts that can be reported. See [method set_max_contacts_reported].
 			</description>
 		</method>
-		<method name="get_linear_damp" qualifiers="const">
+		<method name="get_mode" qualifiers="const">
+			<return type="int">
+			</return>
+			<description>
+				Return the current body mode, see [method set_mode].
+			</description>
+		</method>
+		<method name="get_weight" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the linear damp for this body.
+				Return the body weight given standard earth-weight (gravity 9.8).
 			</description>
 		</method>
-		<method name="set_angular_damp">
-			<argument index="0" name="angular_damp" type="float">
-			</argument>
+		<method name="is_able_to_sleep" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the angular damp for this body. If this value is different from -1, any angular damp derived from the world or areas will be overridden.
+				Return true if the body has the ability to fall asleep when not moving. See [method set_can_sleep].
 			</description>
 		</method>
-		<method name="get_angular_damp" qualifiers="const">
-			<return type="float">
+		<method name="is_contact_monitor_enabled" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the angular damp for this body.
+				Return whether contact monitoring is enabled.
 			</description>
 		</method>
-		<method name="set_linear_velocity">
-			<argument index="0" name="linear_velocity" type="Vector2">
-			</argument>
+		<method name="is_sleeping" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the body linear velocity. Can be used sporadically, but [b]DON'T SET THIS IN EVERY FRAME[/b], because physics may be running in another thread and definitely runs at a different granularity. Use [method _integrate_forces] as your process loop if you want to have precise control of the body state.
+				Return whether the body is sleeping.
 			</description>
 		</method>
-		<method name="get_linear_velocity" qualifiers="const">
-			<return type="Vector2">
+		<method name="is_using_custom_integrator">
+			<return type="bool">
 			</return>
 			<description>
-			Return the body linear velocity. This changes by physics granularity. See [method set_linear_velocity].
+				Return true if the body is not doing any built-in force integration.
+			</description>
+		</method>
+		<method name="set_angular_damp">
+			<argument index="0" name="angular_damp" type="float">
+			</argument>
+			<description>
+				Set the angular damp for this body. If this value is different from -1, any angular damp derived from the world or areas will be overridden.
 			</description>
 		</method>
 		<method name="set_angular_velocity">
 			<argument index="0" name="angular_velocity" type="float">
 			</argument>
 			<description>
-			Set the body angular velocity. Can be used sporadically, but [b]DON'T SET THIS IN EVERY FRAME[/b], because physics may be running in another thread and definitely runs at a different granularity. Use [method _integrate_forces] as your process loop if you want to have precise control of the body state.
+				Set the body angular velocity. Can be used sporadically, but [b]DON'T SET THIS IN EVERY FRAME[/b], because physics may be running in another thread and definitely runs at a different granularity. Use [method _integrate_forces] as your process loop if you want to have precise control of the body state.
 			</description>
 		</method>
-		<method name="get_angular_velocity" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_applied_force">
+			<argument index="0" name="force" type="Vector2">
+			</argument>
 			<description>
-			Return the body angular velocity. This changes by physics granularity. See [method set_angular_velocity].
+				Set the applied force vector. This is the equivalent of pushing a box over the ground: the force applied is applied constantly.
 			</description>
 		</method>
-		<method name="set_max_contacts_reported">
-			<argument index="0" name="amount" type="int">
+		<method name="set_applied_torque">
+			<argument index="0" name="torque" type="float">
 			</argument>
 			<description>
-			Set the maximum contacts to report. Bodies can keep a log of the contacts with other bodies, this is enabled by setting the maximum amount of contacts reported to a number greater than 0.
+				Set a constant torque which will be applied to this body.
 			</description>
 		</method>
-		<method name="get_max_contacts_reported" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_axis_velocity">
+			<argument index="0" name="axis_velocity" type="Vector2">
+			</argument>
 			<description>
-			Return the maximum contacts that can be reported. See [method set_max_contacts_reported].
+				Set an axis velocity. The velocity in the given vector axis will be set as the given vector length. This is useful for jumping behavior.
 			</description>
 		</method>
-		<method name="set_use_custom_integrator">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_bounce">
+			<argument index="0" name="bounce" type="float">
 			</argument>
 			<description>
-			Pass true to disable the internal force integration (like gravity or air friction) for this body. Other than collision response, the body will only move as determined by the [method _integrate_forces] function, if defined.
+				Set the body bounciness, from 0 (no bounce) to 1 (full bounce).
 			</description>
 		</method>
-		<method name="is_using_custom_integrator">
-			<return type="bool">
-			</return>
+		<method name="set_can_sleep">
+			<argument index="0" name="able_to_sleep" type="bool">
+			</argument>
 			<description>
-			Return true if the body is not doing any built-in force integration.
+				Set the body ability to fall asleep when not moving. This saves an enormous amount of processor time when there are plenty of rigid bodies (non static) in a scene.
+				Sleeping bodies are not affected by forces until a collision or an [method apply_impulse] / [method set_applied_force] wakes them up. Until then, they behave like a static body.
 			</description>
 		</method>
 		<method name="set_contact_monitor">
 			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
-			Enable contact monitoring. This allows the body to emit signals when it collides with another.
-			</description>
-		</method>
-		<method name="is_contact_monitor_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
-			Return whether contact monitoring is enabled.
+				Enable contact monitoring. This allows the body to emit signals when it collides with another.
 			</description>
 		</method>
 		<method name="set_continuous_collision_detection_mode">
 			<argument index="0" name="mode" type="int">
 			</argument>
 			<description>
-			Set the continuous collision detection mode from the enum CCD_MODE_*.
-			Continuous collision detection tries to predict where a moving body will collide, instead of moving it and correcting its movement if it collided. The first is more precise, and misses less impacts by small, fast-moving objects. The second is faster to compute, but can miss small, fast-moving objects.
+				Set the continuous collision detection mode from the enum CCD_MODE_*.
+				Continuous collision detection tries to predict where a moving body will collide, instead of moving it and correcting its movement if it collided. The first is more precise, and misses less impacts by small, fast-moving objects. The second is faster to compute, but can miss small, fast-moving objects.
 			</description>
 		</method>
-		<method name="get_continuous_collision_detection_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_friction">
+			<argument index="0" name="friction" type="float">
+			</argument>
 			<description>
-			Return whether this body is using continuous collision detection.
+				Set the body friction, from 0 (frictionless) to 1 (full friction).
 			</description>
 		</method>
-		<method name="set_axis_velocity">
-			<argument index="0" name="axis_velocity" type="Vector2">
+		<method name="set_gravity_scale">
+			<argument index="0" name="gravity_scale" type="float">
 			</argument>
 			<description>
-			Set an axis velocity. The velocity in the given vector axis will be set as the given vector length. This is useful for jumping behavior.
+				Set the gravity factor. This factor multiplies gravity intensity just for this body.
 			</description>
 		</method>
-		<method name="apply_impulse">
-			<argument index="0" name="offset" type="Vector2">
-			</argument>
-			<argument index="1" name="impulse" type="Vector2">
+		<method name="set_inertia">
+			<argument index="0" name="inertia" type="float">
 			</argument>
 			<description>
-			Apply a positioned impulse (which will be affected by the body mass and shape). This is the equivalent of hitting a billiard ball with a cue: a force that is applied once, and only once. Both the impulse and the offset from the body origin are in global coordinates.
+				Set the body's moment of inertia. This is like mass, but for rotation: it determines how much torque it takes to rotate the body. The moment of inertia is usually computed automatically from the mass and the shapes, but this function allows you to set a custom value. Set 0 (or negative) inertia to return to automatically computing it.
 			</description>
 		</method>
-		<method name="set_applied_force">
-			<argument index="0" name="force" type="Vector2">
+		<method name="set_linear_damp">
+			<argument index="0" name="linear_damp" type="float">
 			</argument>
 			<description>
-			Set the applied force vector. This is the equivalent of pushing a box over the ground: the force applied is applied constantly.
+				Set the linear damp for this body. If this value is different from -1, any linear damp derived from the world or areas will be overridden.
 			</description>
 		</method>
-		<method name="get_applied_force" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_linear_velocity">
+			<argument index="0" name="linear_velocity" type="Vector2">
+			</argument>
 			<description>
-			Return the applied force vector.
+				Set the body linear velocity. Can be used sporadically, but [b]DON'T SET THIS IN EVERY FRAME[/b], because physics may be running in another thread and definitely runs at a different granularity. Use [method _integrate_forces] as your process loop if you want to have precise control of the body state.
 			</description>
 		</method>
-		<method name="set_applied_torque">
-			<argument index="0" name="torque" type="float">
+		<method name="set_mass">
+			<argument index="0" name="mass" type="float">
 			</argument>
 			<description>
-			Set a constant torque which will be applied to this body.
+				Set the body mass.
 			</description>
 		</method>
-		<method name="get_applied_torque" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_max_contacts_reported">
+			<argument index="0" name="amount" type="int">
+			</argument>
 			<description>
-			Return the torque which is being applied to this body.
+				Set the maximum contacts to report. Bodies can keep a log of the contacts with other bodies, this is enabled by setting the maximum amount of contacts reported to a number greater than 0.
 			</description>
 		</method>
-		<method name="add_force">
-			<argument index="0" name="offset" type="Vector2">
-			</argument>
-			<argument index="1" name="force" type="Vector2">
+		<method name="set_mode">
+			<argument index="0" name="mode" type="int">
 			</argument>
 			<description>
-			Add a positioned force to the applied force and torque. As with [method apply_impulse], both the force and the offset from the body origin are in global coordinates.
+				Set the body mode, from the MODE_* enum. This allows to change to a static body or a character body.
 			</description>
 		</method>
 		<method name="set_sleeping">
 			<argument index="0" name="sleeping" type="bool">
 			</argument>
 			<description>
-			Set whether a body is sleeping or not. Sleeping bodies are not affected by forces until a collision or an [method apply_impulse] / [method set_applied_force] wakes them up. Until then, they behave like a static body.
+				Set whether a body is sleeping or not. Sleeping bodies are not affected by forces until a collision or an [method apply_impulse] / [method set_applied_force] wakes them up. Until then, they behave like a static body.
 			</description>
 		</method>
-		<method name="is_sleeping" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
-			Return whether the body is sleeping.
-			</description>
-		</method>
-		<method name="set_can_sleep">
-			<argument index="0" name="able_to_sleep" type="bool">
+		<method name="set_use_custom_integrator">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Set the body ability to fall asleep when not moving. This saves an enormous amount of processor time when there are plenty of rigid bodies (non static) in a scene.
-			Sleeping bodies are not affected by forces until a collision or an [method apply_impulse] / [method set_applied_force] wakes them up. Until then, they behave like a static body.
+				Pass true to disable the internal force integration (like gravity or air friction) for this body. Other than collision response, the body will only move as determined by the [method _integrate_forces] function, if defined.
 			</description>
 		</method>
-		<method name="is_able_to_sleep" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_weight">
+			<argument index="0" name="weight" type="float">
+			</argument>
 			<description>
-			Return true if the body has the ability to fall asleep when not moving. See [method set_can_sleep].
+				Set the body weight given standard earth-weight (gravity 9.8). Not really useful for 2D since most measures for this node are in pixels.
 			</description>
 		</method>
 		<method name="test_motion">
@@ -32133,14 +32505,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="2" name="result" type="Physics2DTestMotionResult" default="NULL">
 			</argument>
 			<description>
-			Return whether the body would collide, if it tried to move in the given vector. This method allows two extra parameters: A margin, which increases slightly the size of the shapes involved in the collision detection, and an object of type [Physics2DTestMotionResult], which will store additional information about the collision (should there be one).
-			</description>
-		</method>
-		<method name="get_colliding_bodies" qualifiers="const">
-			<return type="Array">
-			</return>
-			<description>
-			Return a list of the bodies colliding with this one.
+				Return whether the body would collide, if it tried to move in the given vector. This method allows two extra parameters: A margin, which increases slightly the size of the shapes involved in the collision detection, and an object of type [Physics2DTestMotionResult], which will store additional information about the collision (should there be one).
 			</description>
 		</method>
 	</methods>
@@ -32149,7 +32514,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="body" type="Object">
 			</argument>
 			<description>
-			Emitted when a body enters into contact with this one. Contact monitor and contacts reported must be enabled for this to work.
+				Emitted when a body enters into contact with this one. Contact monitor and contacts reported must be enabled for this to work.
 			</description>
 		</signal>
 		<signal name="body_enter_shape">
@@ -32162,15 +32527,15 @@ This method controls whether the position between two cached points is interpola
 			<argument index="3" name="local_shape" type="int">
 			</argument>
 			<description>
-			Emitted when a body enters into contact with this one. Contact monitor and contacts reported must be enabled for this to work.
-			This signal not only receives the body that collided with this one, but also its [RID] (body_id), the shape index from the colliding body (body_shape), and the shape index from this body (local_shape) the other body collided with.
+				Emitted when a body enters into contact with this one. Contact monitor and contacts reported must be enabled for this to work.
+				This signal not only receives the body that collided with this one, but also its [RID] (body_id), the shape index from the colliding body (body_shape), and the shape index from this body (local_shape) the other body collided with.
 			</description>
 		</signal>
 		<signal name="body_exit">
 			<argument index="0" name="body" type="Object">
 			</argument>
 			<description>
-			Emitted when a body exits contact with this one. Contact monitor and contacts reported must be enabled for this to work.
+				Emitted when a body exits contact with this one. Contact monitor and contacts reported must be enabled for this to work.
 			</description>
 		</signal>
 		<signal name="body_exit_shape">
@@ -32183,13 +32548,13 @@ This method controls whether the position between two cached points is interpola
 			<argument index="3" name="local_shape" type="int">
 			</argument>
 			<description>
-			Emitted when a body shape exits contact with this one. Contact monitor and contacts reported must be enabled for this to work.
-			This signal not only receives the body that stopped colliding with this one, but also its [RID] (body_id), the shape index from the colliding body (body_shape), and the shape index from this body (local_shape) the other body stopped colliding with.
+				Emitted when a body shape exits contact with this one. Contact monitor and contacts reported must be enabled for this to work.
+				This signal not only receives the body that stopped colliding with this one, but also its [RID] (body_id), the shape index from the colliding body (body_shape), and the shape index from this body (local_shape) the other body stopped colliding with.
 			</description>
 		</signal>
 		<signal name="sleeping_state_changed">
 			<description>
-			Emitted when the body changes it's sleeping state. Either by sleeping or waking up.
+				Emitted when the body changes it's sleeping state. Either by sleeping or waking up.
 			</description>
 		</signal>
 	</signals>
@@ -32219,15 +32584,13 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Room" inherits="VisualInstance" category="Core">
 	<brief_description>
-	Room data resource.
+		Room data resource.
 	</brief_description>
 	<description>
-	Room contains the data to define the bounds of a scene (using a BSP Tree). It is instanced by a [VisualInstance] node to create rooms. See that class documentation for more information about rooms.
+		Room contains the data to define the bounds of a scene (using a BSP Tree). It is instanced by a [VisualInstance] node to create rooms. See that class documentation for more information about rooms.
 	</description>
 	<methods>
-		<method name="set_room">
-			<argument index="0" name="room" type="Room">
-			</argument>
+		<method name="compute_room_from_subtree">
 			<description>
 			</description>
 		</method>
@@ -32237,19 +32600,21 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="compute_room_from_subtree">
+		<method name="is_simulating_acoustics" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_simulate_acoustics">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_room">
+			<argument index="0" name="room" type="Room">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_simulating_acoustics" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_simulate_acoustics">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -32263,24 +32628,12 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_bounds">
-			<argument index="0" name="bsp_tree" type="Dictionary">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_bounds" qualifiers="const">
 			<return type="Dictionary">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_geometry_hint">
-			<argument index="0" name="triangles" type="Vector3Array">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_geometry_hint" qualifiers="const">
 			<return type="Vector3Array">
 			</return>
@@ -32295,16 +32648,28 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
+		<method name="set_bounds">
+			<argument index="0" name="bsp_tree" type="Dictionary">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_geometry_hint">
+			<argument index="0" name="triangles" type="Vector3Array">
+			</argument>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<constants>
 	</constants>
 </class>
 <class name="Sample" inherits="Resource" category="Core">
 	<brief_description>
-	Audio sample (sound) class.
+		Audio sample (sound) class.
 	</brief_description>
 	<description>
-	Sample provides an audio sample class, containing audio data, together with some information for playback, such as format, mix rate and loop. It is used by sound playback routines.
+		Sample provides an audio sample class, containing audio data, together with some information for playback, such as format, mix rate and loop. It is used by sound playback routines.
 	</description>
 	<methods>
 		<method name="create">
@@ -32315,103 +32680,100 @@ This method controls whether the position between two cached points is interpola
 			<argument index="2" name="length" type="int">
 			</argument>
 			<description>
-			Create new data for the sample, with format (see FORMAT_* constants), stereo hint, and length in samples (not bytes).
-			Calling this method overrides previously existing data. Stereo samples are interleaved pairs of left and right points (in that order), but count as one sample for length purposes.
+				Create new data for the sample, with format (see FORMAT_* constants), stereo hint, and length in samples (not bytes).
+				Calling this method overrides previously existing data. Stereo samples are interleaved pairs of left and right points (in that order), but count as one sample for length purposes.
 			</description>
 		</method>
-		<method name="get_format" qualifiers="const">
-			<return type="int">
+		<method name="get_data" qualifiers="const">
+			<return type="RawArray">
 			</return>
 			<description>
-			Return the sample format.
+				Return sample data as little endian.
 			</description>
 		</method>
-		<method name="is_stereo" qualifiers="const">
-			<return type="bool">
+		<method name="get_format" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return whether the current sample was created as stereo.
+				Return the sample format.
 			</description>
 		</method>
 		<method name="get_length" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the sample length in samples. Stereo samples count as one, even if they are made of a left and a right sample.
+				Return the sample length in samples. Stereo samples count as one, even if they are made of a left and a right sample.
 			</description>
 		</method>
-		<method name="set_data">
-			<argument index="0" name="data" type="RawArray">
-			</argument>
+		<method name="get_loop_begin" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set sample data. Data must be little endian, no matter the host platform, and exactly as long as to fit all samples. The length of this array can be calculated as follows:
-			Get the sample length ([method get_length]).
-			If the sample format is FORMAT_PCM16, multiply it by 2.
-			If the sample format is FORMAT_IMA_ADPCM, divide it by 2 (rounding any fraction up), then add 4.
-			If the sample is stereo ([method is_stereo]), multiply it by 2.
+				Return the loop begin position.
 			</description>
 		</method>
-		<method name="get_data" qualifiers="const">
-			<return type="RawArray">
+		<method name="get_loop_end" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return sample data as little endian.
+				Return the loop end position.
 			</description>
 		</method>
-		<method name="set_mix_rate">
-			<argument index="0" name="hz" type="int">
-			</argument>
+		<method name="get_loop_format" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the mix rate for the sample (expected playback frequency).
+				Return the loop format.
 			</description>
 		</method>
 		<method name="get_mix_rate" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the mix rate for the sample.
+				Return the mix rate for the sample.
 			</description>
 		</method>
-		<method name="set_loop_format">
-			<argument index="0" name="format" type="int">
-			</argument>
+		<method name="is_stereo" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the loop format (use LOOP_* constants as argument).
+				Return whether the current sample was created as stereo.
 			</description>
 		</method>
-		<method name="get_loop_format" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_data">
+			<argument index="0" name="data" type="RawArray">
+			</argument>
 			<description>
-			Return the loop format.
+				Set sample data. Data must be little endian, no matter the host platform, and exactly as long as to fit all samples. The length of this array can be calculated as follows:
+				Get the sample length ([method get_length]). If the sample format is FORMAT_PCM16, multiply it by 2. If the sample format is FORMAT_IMA_ADPCM, divide it by 2 (rounding any fraction up), then add 4. If the sample is stereo ([method is_stereo]), multiply it by 2.
 			</description>
 		</method>
 		<method name="set_loop_begin">
 			<argument index="0" name="pos" type="int">
 			</argument>
 			<description>
-			Set the loop begin position. It must be a valid frame and less than the loop end position.
+				Set the loop begin position. It must be a valid frame and less than the loop end position.
 			</description>
 		</method>
-		<method name="get_loop_begin" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_loop_end">
+			<argument index="0" name="pos" type="int">
+			</argument>
 			<description>
-			Return the loop begin position.
+				Set the loop end position. It must be a valid frame and greater than the loop begin position.
 			</description>
 		</method>
-		<method name="set_loop_end">
-			<argument index="0" name="pos" type="int">
+		<method name="set_loop_format">
+			<argument index="0" name="format" type="int">
 			</argument>
 			<description>
-			Set the loop end position. It must be a valid frame and greater than the loop begin position.
+				Set the loop format (use LOOP_* constants as argument).
 			</description>
 		</method>
-		<method name="get_loop_end" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_mix_rate">
+			<argument index="0" name="hz" type="int">
+			</argument>
 			<description>
-			Return the loop end position.
+				Set the mix rate for the sample (expected playback frequency).
 			</description>
 		</method>
 	</methods>
@@ -32438,10 +32800,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="SampleLibrary" inherits="Resource" category="Core">
 	<brief_description>
-	Library that contains a collection of samples.
+		Library that contains a collection of samples.
 	</brief_description>
 	<description>
-	Library that contains a collection of [Sample], each identified by a text ID. This is used as a data container for the majority of the SamplePlayer classes and derivatives.
+		Library that contains a collection of [Sample], each identified by a text ID. This is used as a data container for the majority of the SamplePlayer classes and derivatives.
 	</description>
 	<methods>
 		<method name="add_sample">
@@ -32450,7 +32812,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="sample" type="Sample">
 			</argument>
 			<description>
-			Add a sample to the library, with a given text ID.
+				Add a sample to the library, with a given text ID.
 			</description>
 		</method>
 		<method name="get_sample" qualifiers="const">
@@ -32459,7 +32821,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			Return the sample from the library matching the given text ID. Return null if the sample is not found.
+				Return the sample from the library matching the given text ID. Return null if the sample is not found.
 			</description>
 		</method>
 		<method name="has_sample" qualifiers="const">
@@ -32468,23 +32830,23 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			Return true if the sample text ID exists in the library.
+				Return true if the sample text ID exists in the library.
 			</description>
 		</method>
 		<method name="remove_sample">
 			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			Remove the sample matching the given text ID.
+				Remove the sample matching the given text ID.
 			</description>
 		</method>
-		<method name="sample_set_volume_db">
+		<method name="sample_get_pitch_scale" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
-			<argument index="1" name="db" type="float">
-			</argument>
 			<description>
-			Set the volume (in dB) for the given sample.
+				Return the pitch scale for the given sample.
 			</description>
 		</method>
 		<method name="sample_get_volume_db" qualifiers="const">
@@ -32493,7 +32855,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			Return the volume (in dB) for the given sample.
+				Return the volume (in dB) for the given sample.
 			</description>
 		</method>
 		<method name="sample_set_pitch_scale">
@@ -32502,16 +32864,16 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="pitch" type="float">
 			</argument>
 			<description>
-			Set the pitch scale for the given sample.
+				Set the pitch scale for the given sample.
 			</description>
 		</method>
-		<method name="sample_get_pitch_scale" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="sample_set_volume_db">
 			<argument index="0" name="name" type="String">
 			</argument>
+			<argument index="1" name="db" type="float">
+			</argument>
 			<description>
-			Return the pitch scale for the given sample.
+				Set the volume (in dB) for the given sample.
 			</description>
 		</method>
 	</methods>
@@ -32520,187 +32882,155 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="SamplePlayer" inherits="Node" category="Core">
 	<brief_description>
-	Sample Player node.
+		Sample Player node.
 	</brief_description>
 	<description>
-	SamplePlayer is a [Node] meant for simple sample playback. A library of samples is loaded and played back "as is", without positioning or anything.
+		SamplePlayer is a [Node] meant for simple sample playback. A library of samples is loaded and played back "as is", without positioning or anything.
 	</description>
 	<methods>
-		<method name="set_sample_library">
-			<argument index="0" name="library" type="SampleLibrary">
+		<method name="get_chorus" qualifiers="const">
+			<return type="float">
+			</return>
+			<argument index="0" name="voice" type="int">
 			</argument>
 			<description>
-			Set the sample library for the player.
+				Return the current chorus send level for a given voice.
 			</description>
 		</method>
-		<method name="get_sample_library" qualifiers="const">
-			<return type="SampleLibrary">
+		<method name="get_default_chorus" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return the sample library used by the player.
+				Return the default chorus send level of the player.
 			</description>
 		</method>
-		<method name="set_polyphony">
-			<argument index="0" name="max_voices" type="int">
-			</argument>
+		<method name="get_default_filter_cutoff" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the polyphony of the player (maximum amount of simultaneous voices).
+				Return the default filter cutoff frequency of the player.
 			</description>
 		</method>
-		<method name="get_polyphony" qualifiers="const">
-			<return type="int">
+		<method name="get_default_filter_gain" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return the polyphony of the player.
+				Return the default filter gain of the player.
 			</description>
 		</method>
-		<method name="play">
-			<return type="int">
+		<method name="get_default_filter_resonance" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
-			<argument index="1" name="unique" type="bool" default="false">
-			</argument>
 			<description>
-			Play a sample referenced by its name.
-			Optionally, the playback can be made "unique" to force stopping all other samples currently played. The voices allocated for playback will then be returned.
+				Return the default filter resonance of the player.
 			</description>
 		</method>
-		<method name="stop">
-			<argument index="0" name="voice" type="int">
-			</argument>
+		<method name="get_default_filter_type" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Stop a given voice.
+				Return the default filter type in use (see FILTER_* constants) for the player.
 			</description>
 		</method>
-		<method name="stop_all">
+		<method name="get_default_pan" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Stop all playing voices.
+				Return the default panning of the player.
 			</description>
 		</method>
-		<method name="set_mix_rate">
-			<argument index="0" name="voice" type="int">
-			</argument>
-			<argument index="1" name="hz" type="int">
-			</argument>
+		<method name="get_default_pan_depth" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the mix rate (in Hz) of a given voice.
+				Return the default pan depth of the player.
 			</description>
 		</method>
-		<method name="set_pitch_scale">
-			<argument index="0" name="voice" type="int">
-			</argument>
-			<argument index="1" name="ratio" type="float">
-			</argument>
+		<method name="get_default_pan_height" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the pitch scale of a given voice. A ratio of 1.0 is the normal scale.
+				Return the default pan height of the player.
 			</description>
 		</method>
-		<method name="set_volume">
-			<argument index="0" name="voice" type="int">
-			</argument>
-			<argument index="1" name="volume" type="float">
-			</argument>
+		<method name="get_default_pitch_scale" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the volume of a given voice using a linear scale.
-			The "volume" argument should be a positive factor ranging from 0.0 (mute) up to 16.0 (i.e. 24 dB).
-			A factor of 1.0 means that the voice will be played at normal system volume. Factors above 1.0 might be limited by the platform's audio output.
+				Return the default pitch scale of the player.
 			</description>
 		</method>
-		<method name="set_volume_db">
-			<argument index="0" name="voice" type="int">
-			</argument>
-			<argument index="1" name="db" type="float">
-			</argument>
+		<method name="get_default_reverb" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the volume of a given voice in dB.
-			The "dB" argument can range from -80 to 24 dB, 0 dB being the maximum volume. Every 6 dB (resp. -6 dB), the volume is increased (resp. reduced) by half.
+				Return the default reverberation send level of the player.
 			</description>
 		</method>
-		<method name="set_pan">
-			<argument index="0" name="voice" type="int">
-			</argument>
-			<argument index="1" name="pan" type="float">
-			</argument>
-			<argument index="2" name="depth" type="float" default="0">
-			</argument>
-			<argument index="3" name="height" type="float" default="0">
-			</argument>
+		<method name="get_default_reverb_room" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the panning of a voice. Panning goes from -1.0 (left) to +1.0 (right).
-			Optionally, for hardware than support 3D sound, one can also set depth and height (also in range -1.0 to +1.0).
+				Return the default reverberation room type of the player (see REVERB_* enum).
 			</description>
 		</method>
-		<method name="set_filter">
-			<argument index="0" name="voice" type="int">
-			</argument>
-			<argument index="1" name="type" type="int">
-			</argument>
-			<argument index="2" name="cutoff_hz" type="float">
-			</argument>
-			<argument index="3" name="resonance" type="float">
-			</argument>
-			<argument index="4" name="gain" type="float" default="0">
-			</argument>
+		<method name="get_default_volume" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the filter for a given voice, using the given type (see FILTER_* constants), cutoff frequency (from 20 to 16,384 Hz) and resonance (from 0 to 4.0).
-			Optionally, a gain can also be given (from 0 to 2.0).
+				Return the default volume (on a linear scale) of the player.
 			</description>
 		</method>
-		<method name="set_chorus">
-			<argument index="0" name="voice" type="int">
-			</argument>
-			<argument index="1" name="send" type="float">
-			</argument>
+		<method name="get_default_volume_db" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the chorus send level of a voice (from 0 to 1.0). For setting chorus parameters, see [AudioServer].
+				Return the default volume (in dB) of the player.
 			</description>
 		</method>
-		<method name="set_reverb">
+		<method name="get_filter_cutoff" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="voice" type="int">
 			</argument>
-			<argument index="1" name="room_type" type="int">
-			</argument>
-			<argument index="2" name="send" type="float">
-			</argument>
 			<description>
-			Set the reverberation type (see REVERB_* constants) and send level (from 0 to 1.0) of a voice.
+				Return the current filter cutoff frequency for a given voice.
 			</description>
 		</method>
-		<method name="get_mix_rate" qualifiers="const">
-			<return type="int">
+		<method name="get_filter_gain" qualifiers="const">
+			<return type="float">
 			</return>
 			<argument index="0" name="voice" type="int">
 			</argument>
 			<description>
-			Return the current mix rate for a given voice.
+				Return the current filter gain for a given voice.
 			</description>
 		</method>
-		<method name="get_pitch_scale" qualifiers="const">
+		<method name="get_filter_resonance" qualifiers="const">
 			<return type="float">
 			</return>
 			<argument index="0" name="voice" type="int">
 			</argument>
 			<description>
-			Return the current pitch scale for a given voice.
+				Return the current filter resonance for a given voice.
 			</description>
 		</method>
-		<method name="get_volume" qualifiers="const">
-			<return type="float">
+		<method name="get_filter_type" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="voice" type="int">
 			</argument>
 			<description>
-			Return the current volume (on a linear scale) for a given voice.
+				Return the current filter type in use (see FILTER_* constants) for a given voice.
 			</description>
 		</method>
-		<method name="get_volume_db" qualifiers="const">
-			<return type="float">
+		<method name="get_mix_rate" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="voice" type="int">
 			</argument>
 			<description>
-			Return the current volume (in dB) for a given voice.
+				Return the current mix rate for a given voice.
 			</description>
 		</method>
 		<method name="get_pan" qualifiers="const">
@@ -32709,7 +33039,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="voice" type="int">
 			</argument>
 			<description>
-			Return the current panning for a given voice.
+				Return the current panning for a given voice.
 			</description>
 		</method>
 		<method name="get_pan_depth" qualifiers="const">
@@ -32718,7 +33048,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="voice" type="int">
 			</argument>
 			<description>
-			Return the current pan depth for a given voice.
+				Return the current pan depth for a given voice.
 			</description>
 		</method>
 		<method name="get_pan_height" qualifiers="const">
@@ -32727,106 +33057,110 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="voice" type="int">
 			</argument>
 			<description>
-			Return the current pan height for a given voice.
+				Return the current pan height for a given voice.
 			</description>
 		</method>
-		<method name="get_filter_type" qualifiers="const">
-			<return type="int">
+		<method name="get_pitch_scale" qualifiers="const">
+			<return type="float">
 			</return>
 			<argument index="0" name="voice" type="int">
 			</argument>
 			<description>
-			Return the current filter type in use (see FILTER_* constants) for a given voice.
+				Return the current pitch scale for a given voice.
 			</description>
 		</method>
-		<method name="get_filter_cutoff" qualifiers="const">
-			<return type="float">
+		<method name="get_polyphony" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="voice" type="int">
-			</argument>
 			<description>
-			Return the current filter cutoff frequency for a given voice.
+				Return the polyphony of the player.
 			</description>
 		</method>
-		<method name="get_filter_resonance" qualifiers="const">
+		<method name="get_reverb" qualifiers="const">
 			<return type="float">
 			</return>
 			<argument index="0" name="voice" type="int">
 			</argument>
 			<description>
-			Return the current filter resonance for a given voice.
+				Return the current reverberation send level for a given voice.
 			</description>
 		</method>
-		<method name="get_filter_gain" qualifiers="const">
-			<return type="float">
+		<method name="get_reverb_room" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="voice" type="int">
 			</argument>
 			<description>
-			Return the current filter gain for a given voice.
+				Return the current reverberation room type for a given voice (see REVERB_* enum).
 			</description>
 		</method>
-		<method name="get_chorus" qualifiers="const">
-			<return type="float">
+		<method name="get_sample_library" qualifiers="const">
+			<return type="SampleLibrary">
 			</return>
-			<argument index="0" name="voice" type="int">
-			</argument>
 			<description>
-			Return the current chorus send level for a given voice.
+				Return the sample library used by the player.
 			</description>
 		</method>
-		<method name="get_reverb_room" qualifiers="const">
-			<return type="int">
+		<method name="get_volume" qualifiers="const">
+			<return type="float">
 			</return>
 			<argument index="0" name="voice" type="int">
 			</argument>
 			<description>
-			Return the current reverberation room type for a given voice (see REVERB_* enum).
+				Return the current volume (on a linear scale) for a given voice.
 			</description>
 		</method>
-		<method name="get_reverb" qualifiers="const">
+		<method name="get_volume_db" qualifiers="const">
 			<return type="float">
 			</return>
 			<argument index="0" name="voice" type="int">
 			</argument>
 			<description>
-			Return the current reverberation send level for a given voice.
+				Return the current volume (in dB) for a given voice.
 			</description>
 		</method>
-		<method name="set_default_pitch_scale">
-			<argument index="0" name="ratio" type="float">
-			</argument>
+		<method name="is_active" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the default pitch scale of the player. A ratio of 1.0 is the normal scale.
+				Return whether the player is currently active.
 			</description>
 		</method>
-		<method name="set_default_volume">
-			<argument index="0" name="volume" type="float">
+		<method name="is_voice_active" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="voice" type="int">
 			</argument>
 			<description>
-			Set the default volume of the player using a linear scale.
-			The "volume" argument should be a positive factor ranging from 0.0 (mute) up to 16.0 (i.e. 24 dB).
-			A factor of 1.0 means that the voice will be played at normal system volume. Factors above 1.0 might be limited by the platform's audio output.
+				Return whether the given voice is currently active.
 			</description>
 		</method>
-		<method name="set_default_volume_db">
-			<argument index="0" name="db" type="float">
+		<method name="play">
+			<return type="int">
+			</return>
+			<argument index="0" name="name" type="String">
+			</argument>
+			<argument index="1" name="unique" type="bool" default="false">
 			</argument>
 			<description>
-			Set the default volume of the player in dB.
-			The "dB" argument can range from -80 to 24 dB, 0 dB being the maximum volume. Every 6 dB (resp. -6 dB), the volume is increased (resp. reduced) by half.
+				Play a sample referenced by its name.
+				Optionally, the playback can be made "unique" to force stopping all other samples currently played. The voices allocated for playback will then be returned.
 			</description>
 		</method>
-		<method name="set_default_pan">
-			<argument index="0" name="pan" type="float">
+		<method name="set_chorus">
+			<argument index="0" name="voice" type="int">
 			</argument>
-			<argument index="1" name="depth" type="float" default="0">
+			<argument index="1" name="send" type="float">
 			</argument>
-			<argument index="2" name="height" type="float" default="0">
+			<description>
+				Set the chorus send level of a voice (from 0 to 1.0). For setting chorus parameters, see [AudioServer].
+			</description>
+		</method>
+		<method name="set_default_chorus">
+			<argument index="0" name="send" type="float">
 			</argument>
 			<description>
-			Set the default panning of the player. Panning goes from -1.0 (left) to +1.0 (right).
-			Optionally, for hardware than support 3D sound, one can also set depth and height (also in range -1.0 to +1.0).
+				Set the default chorus send level of the player (from 0 to 1.0). For setting chorus parameters, see [AudioServer].
 			</description>
 		</method>
 		<method name="set_default_filter">
@@ -32839,131 +33173,159 @@ This method controls whether the position between two cached points is interpola
 			<argument index="3" name="gain" type="float" default="0">
 			</argument>
 			<description>
-			Set the default filter for the player, using the given type (see FILTER_* constants), cutoff frequency (from 20 to 16,384 Hz) and resonance (from 0 to 4.0).
+				Set the default filter for the player, using the given type (see FILTER_* constants), cutoff frequency (from 20 to 16,384 Hz) and resonance (from 0 to 4.0).
 			Optionally, a gain can also be given (from 0 to 2.0).
 			</description>
 		</method>
-		<method name="set_default_chorus">
-			<argument index="0" name="send" type="float">
+		<method name="set_default_pan">
+			<argument index="0" name="pan" type="float">
 			</argument>
-			<description>
-			Set the default chorus send level of the player (from 0 to 1.0). For setting chorus parameters, see [AudioServer].
-			</description>
-		</method>
-		<method name="set_default_reverb">
-			<argument index="0" name="room_type" type="int">
+			<argument index="1" name="depth" type="float" default="0">
 			</argument>
-			<argument index="1" name="send" type="float">
+			<argument index="2" name="height" type="float" default="0">
 			</argument>
 			<description>
-			Set the default reverberation type (see REVERB_* constants) and send level (from 0 to 1.0) of the player.
+				Set the default panning of the player. Panning goes from -1.0 (left) to +1.0 (right).
+				Optionally, for hardware than support 3D sound, one can also set depth and height (also in range -1.0 to +1.0).
 			</description>
 		</method>
-		<method name="get_default_pitch_scale" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_default_pitch_scale">
+			<argument index="0" name="ratio" type="float">
+			</argument>
 			<description>
-			Return the default pitch scale of the player.
+				Set the default pitch scale of the player. A ratio of 1.0 is the normal scale.
 			</description>
 		</method>
-		<method name="get_default_volume" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_default_reverb">
+			<argument index="0" name="room_type" type="int">
+			</argument>
+			<argument index="1" name="send" type="float">
+			</argument>
 			<description>
-			Return the default volume (on a linear scale) of the player.
+				Set the default reverberation type (see REVERB_* constants) and send level (from 0 to 1.0) of the player.
 			</description>
 		</method>
-		<method name="get_default_volume_db" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_default_volume">
+			<argument index="0" name="volume" type="float">
+			</argument>
 			<description>
-			Return the default volume (in dB) of the player.
+				Set the default volume of the player using a linear scale.
+				The "volume" argument should be a positive factor ranging from 0.0 (mute) up to 16.0 (i.e. 24 dB).
+				A factor of 1.0 means that the voice will be played at normal system volume. Factors above 1.0 might be limited by the platform's audio output.
 			</description>
 		</method>
-		<method name="get_default_pan" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_default_volume_db">
+			<argument index="0" name="db" type="float">
+			</argument>
 			<description>
-			Return the default panning of the player.
+				Set the default volume of the player in dB.
+				The "dB" argument can range from -80 to 24 dB, 0 dB being the maximum volume. Every 6 dB (resp. -6 dB), the volume is increased (resp. reduced) by half.
 			</description>
 		</method>
-		<method name="get_default_pan_depth" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_filter">
+			<argument index="0" name="voice" type="int">
+			</argument>
+			<argument index="1" name="type" type="int">
+			</argument>
+			<argument index="2" name="cutoff_hz" type="float">
+			</argument>
+			<argument index="3" name="resonance" type="float">
+			</argument>
+			<argument index="4" name="gain" type="float" default="0">
+			</argument>
 			<description>
-			Return the default pan depth of the player.
+				Set the filter for a given voice, using the given type (see FILTER_* constants), cutoff frequency (from 20 to 16,384 Hz) and resonance (from 0 to 4.0).
+				Optionally, a gain can also be given (from 0 to 2.0).
 			</description>
 		</method>
-		<method name="get_default_pan_height" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_mix_rate">
+			<argument index="0" name="voice" type="int">
+			</argument>
+			<argument index="1" name="hz" type="int">
+			</argument>
 			<description>
-			Return the default pan height of the player.
+				Set the mix rate (in Hz) of a given voice.
 			</description>
 		</method>
-		<method name="get_default_filter_type" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_pan">
+			<argument index="0" name="voice" type="int">
+			</argument>
+			<argument index="1" name="pan" type="float">
+			</argument>
+			<argument index="2" name="depth" type="float" default="0">
+			</argument>
+			<argument index="3" name="height" type="float" default="0">
+			</argument>
 			<description>
-			Return the default filter type in use (see FILTER_* constants) for the player.
+				Set the panning of a voice. Panning goes from -1.0 (left) to +1.0 (right).
+				Optionally, for hardware than support 3D sound, one can also set depth and height (also in range -1.0 to +1.0).
 			</description>
 		</method>
-		<method name="get_default_filter_cutoff" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_pitch_scale">
+			<argument index="0" name="voice" type="int">
+			</argument>
+			<argument index="1" name="ratio" type="float">
+			</argument>
 			<description>
-			Return the default filter cutoff frequency of the player.
+				Set the pitch scale of a given voice. A ratio of 1.0 is the normal scale.
 			</description>
 		</method>
-		<method name="get_default_filter_resonance" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_polyphony">
+			<argument index="0" name="max_voices" type="int">
+			</argument>
 			<description>
-			Return the default filter resonance of the player.
+				Set the polyphony of the player (maximum amount of simultaneous voices).
 			</description>
 		</method>
-		<method name="get_default_filter_gain" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_reverb">
+			<argument index="0" name="voice" type="int">
+			</argument>
+			<argument index="1" name="room_type" type="int">
+			</argument>
+			<argument index="2" name="send" type="float">
+			</argument>
 			<description>
-			Return the default filter gain of the player.
+				Set the reverberation type (see REVERB_* constants) and send level (from 0 to 1.0) of a voice.
 			</description>
 		</method>
-		<method name="get_default_chorus" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_sample_library">
+			<argument index="0" name="library" type="SampleLibrary">
+			</argument>
 			<description>
-			Return the default chorus send level of the player.
+				Set the sample library for the player.
 			</description>
 		</method>
-		<method name="get_default_reverb_room" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_volume">
+			<argument index="0" name="voice" type="int">
+			</argument>
+			<argument index="1" name="volume" type="float">
+			</argument>
 			<description>
-			Return the default reverberation room type of the player (see REVERB_* enum).
+				Set the volume of a given voice using a linear scale.
+				The "volume" argument should be a positive factor ranging from 0.0 (mute) up to 16.0 (i.e. 24 dB).
+				A factor of 1.0 means that the voice will be played at normal system volume. Factors above 1.0 might be limited by the platform's audio output.
 			</description>
 		</method>
-		<method name="get_default_reverb" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_volume_db">
+			<argument index="0" name="voice" type="int">
+			</argument>
+			<argument index="1" name="db" type="float">
+			</argument>
 			<description>
-			Return the default reverberation send level of the player.
+				Set the volume of a given voice in dB.
+				The "dB" argument can range from -80 to 24 dB, 0 dB being the maximum volume. Every 6 dB (resp. -6 dB), the volume is increased (resp. reduced) by half.
 			</description>
 		</method>
-		<method name="is_active" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="stop">
+			<argument index="0" name="voice" type="int">
+			</argument>
 			<description>
-			Return whether the player is currently active.
+				Stop a given voice.
 			</description>
 		</method>
-		<method name="is_voice_active" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="voice" type="int">
-			</argument>
+		<method name="stop_all">
 			<description>
-			Return whether the given voice is currently active.
+				Stop all playing voices.
 			</description>
 		</method>
 	</methods>
@@ -33014,38 +33376,40 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="SamplePlayer2D" inherits="SoundPlayer2D" category="Core">
 	<brief_description>
-	Sample player for positional 2D Sound.
+		Sample player for positional 2D Sound.
 	</brief_description>
 	<description>
-	Sample player for positional 2D Sound. Plays sound samples positionally, left and right depending on the distance/place on the screen.
+		Sample player for positional 2D Sound. Plays sound samples positionally, left and right depending on the distance/place on the screen.
 	</description>
 	<methods>
-		<method name="set_sample_library">
-			<argument index="0" name="library" type="SampleLibrary">
-			</argument>
+		<method name="get_polyphony" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the sample library for the player.
+				Return the polyphony of the player.
 			</description>
 		</method>
-		<method name="get_sample_library" qualifiers="const">
-			<return type="SampleLibrary">
+		<method name="get_random_pitch_scale" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return the sample library used by the player.
+				Return the amplitude used for random pitch scale variations.
 			</description>
 		</method>
-		<method name="set_polyphony">
-			<argument index="0" name="max_voices" type="int">
-			</argument>
+		<method name="get_sample_library" qualifiers="const">
+			<return type="SampleLibrary">
+			</return>
 			<description>
-			Set the polyphony of the player (maximum amount of simultaneous voices).
+				Return the sample library used by the player.
 			</description>
 		</method>
-		<method name="get_polyphony" qualifiers="const">
-			<return type="int">
+		<method name="is_voice_active" qualifiers="const">
+			<return type="bool">
 			</return>
+			<argument index="0" name="voice" type="int">
+			</argument>
 			<description>
-			Return the polyphony of the player.
+				Return whether a voice is still active or has stopped playing.
 			</description>
 		</method>
 		<method name="play">
@@ -33056,64 +33420,62 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="voice" type="int" default="-2">
 			</argument>
 			<description>
-			Play a sample. An internal polyphony ID can optionally be passed, or defaults to NEXT_VOICE.
-			Return a voice ID which can be used to modify the voice parameters, or INVALID_VOICE if the voice or sample are invalid.
+				Play a sample. An internal polyphony ID can optionally be passed, or defaults to NEXT_VOICE.
+				Return a voice ID which can be used to modify the voice parameters, or INVALID_VOICE if the voice or sample are invalid.
 			</description>
 		</method>
-		<method name="voice_set_pitch_scale">
-			<argument index="0" name="voice" type="int">
-			</argument>
-			<argument index="1" name="ratio" type="float">
+		<method name="set_polyphony">
+			<argument index="0" name="max_voices" type="int">
 			</argument>
 			<description>
-			Change the pitch scale of a currently playing voice.
+				Set the polyphony of the player (maximum amount of simultaneous voices).
 			</description>
 		</method>
-		<method name="voice_set_volume_scale_db">
-			<argument index="0" name="voice" type="int">
-			</argument>
-			<argument index="1" name="db" type="float">
+		<method name="set_random_pitch_scale">
+			<argument index="0" name="val" type="float">
 			</argument>
 			<description>
-			Change the volume scale (in dB) of a currently playing voice.
+				Set the amplitude for random pitch scale variations. If different from zero, the pitch scale will vary randomly around 1.0 in a range defined by val.
+				The actual pitch scale will be, with "variation" ranging from -val to val:
+				* variation &gt; 0: 1.0 + variation
+				* variation &lt; 0: 1.0/(1.0 - variation)
 			</description>
 		</method>
-		<method name="is_voice_active" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="voice" type="int">
+		<method name="set_sample_library">
+			<argument index="0" name="library" type="SampleLibrary">
 			</argument>
 			<description>
-			Return whether a voice is still active or has stopped playing.
+				Set the sample library for the player.
 			</description>
 		</method>
-		<method name="stop_voice">
-			<argument index="0" name="voice" type="int">
-			</argument>
+		<method name="stop_all">
 			<description>
-			Stop a given voice.
+				Stop all playing voices.
 			</description>
 		</method>
-		<method name="stop_all">
+		<method name="stop_voice">
+			<argument index="0" name="voice" type="int">
+			</argument>
 			<description>
-			Stop all playing voices.
+				Stop a given voice.
 			</description>
 		</method>
-		<method name="set_random_pitch_scale">
-			<argument index="0" name="val" type="float">
+		<method name="voice_set_pitch_scale">
+			<argument index="0" name="voice" type="int">
+			</argument>
+			<argument index="1" name="ratio" type="float">
 			</argument>
 			<description>
-			Set the amplitude for random pitch scale variations. If different from zero, the pitch scale will vary randomly around 1.0 in a range defined by val.
-			The actual pitch scale will be, with "variation" ranging from -val to val:
-			* variation &gt; 0: 1.0 + variation
-			* variation &lt; 0: 1.0/(1.0 - variation)
+				Change the pitch scale of a currently playing voice.
 			</description>
 		</method>
-		<method name="get_random_pitch_scale" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="voice_set_volume_scale_db">
+			<argument index="0" name="voice" type="int">
+			</argument>
+			<argument index="1" name="db" type="float">
+			</argument>
 			<description>
-			Return the amplitude used for random pitch scale variations.
+				Change the volume scale (in dB) of a currently playing voice.
 			</description>
 		</method>
 	</methods>
@@ -33132,67 +33494,63 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="get_node_count" qualifiers="const">
-			<return type="int">
+		<method name="get_connection_binds" qualifiers="const">
+			<return type="Array">
 			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_node_type" qualifiers="const">
-			<return type="String">
+		<method name="get_connection_count" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_node_name" qualifiers="const">
-			<return type="String">
+		<method name="get_connection_flags" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_node_path" qualifiers="const">
-			<return type="NodePath">
+		<method name="get_connection_method" qualifiers="const">
+			<return type="String">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="for_parent" type="bool" default="false">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_node_owner_path" qualifiers="const">
-			<return type="NodePath">
+		<method name="get_connection_signal" qualifiers="const">
+			<return type="String">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_node_instance_placeholder" qualifiers="const">
-			<return type="bool">
+		<method name="get_connection_source" qualifiers="const">
+			<return type="NodePath">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_node_instance_placeholder" qualifiers="const">
-			<return type="String">
+		<method name="get_connection_target" qualifiers="const">
+			<return type="NodePath">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_node_instance" qualifiers="const">
-			<return type="PackedScene">
+		<method name="get_node_count" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
@@ -33204,80 +33562,84 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_node_property_count" qualifiers="const">
-			<return type="int">
+		<method name="get_node_instance" qualifiers="const">
+			<return type="PackedScene">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_node_property_name" qualifiers="const">
+		<method name="get_node_instance_placeholder" qualifiers="const">
 			<return type="String">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="prop_idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_node_property_value" qualifiers="const">
+		<method name="get_node_name" qualifiers="const">
+			<return type="String">
+			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
-			<argument index="1" name="prop_idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_connection_count" qualifiers="const">
-			<return type="int">
+		<method name="get_node_owner_path" qualifiers="const">
+			<return type="NodePath">
 			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_connection_source" qualifiers="const">
+		<method name="get_node_path" qualifiers="const">
 			<return type="NodePath">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
+			<argument index="1" name="for_parent" type="bool" default="false">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_connection_signal" qualifiers="const">
-			<return type="String">
+		<method name="get_node_property_count" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_connection_target" qualifiers="const">
-			<return type="NodePath">
+		<method name="get_node_property_name" qualifiers="const">
+			<return type="String">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
+			<argument index="1" name="prop_idx" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_connection_method" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="get_node_property_value" qualifiers="const">
 			<argument index="0" name="idx" type="int">
 			</argument>
+			<argument index="1" name="prop_idx" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_connection_flags" qualifiers="const">
-			<return type="int">
+		<method name="get_node_type" qualifiers="const">
+			<return type="String">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_connection_binds" qualifiers="const">
-			<return type="Array">
+		<method name="is_node_instance_placeholder" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="idx" type="int">
 			</argument>
@@ -33294,241 +33656,241 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="notify_group">
-			<argument index="0" name="call_flags" type="int">
+		<method name="call_group">
+			<argument index="0" name="flags" type="int">
 			</argument>
 			<argument index="1" name="group" type="String">
 			</argument>
-			<argument index="2" name="notification" type="int">
+			<argument index="2" name="method" type="String">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="set_group">
-			<argument index="0" name="call_flags" type="int">
+			<argument index="3" name="arg0" type="Variant" default="NULL">
 			</argument>
-			<argument index="1" name="group" type="String">
+			<argument index="4" name="arg1" type="Variant" default="NULL">
 			</argument>
-			<argument index="2" name="property" type="String">
+			<argument index="5" name="arg2" type="Variant" default="NULL">
 			</argument>
-			<argument index="3" name="value" type="Variant">
+			<argument index="6" name="arg3" type="Variant" default="NULL">
+			</argument>
+			<argument index="7" name="arg4" type="Variant" default="NULL">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_nodes_in_group">
-			<return type="Array">
+		<method name="change_scene">
+			<return type="int">
 			</return>
-			<argument index="0" name="group" type="String">
+			<argument index="0" name="path" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_root" qualifiers="const">
-			<return type="Viewport">
+		<method name="change_scene_to">
+			<return type="int">
 			</return>
+			<argument index="0" name="packed_scene" type="PackedScene">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="has_group" qualifiers="const">
-			<return type="bool">
+		<method name="get_current_scene" qualifiers="const">
+			<return type="Node">
 			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_auto_accept_quit">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
+		<method name="get_edited_scene_root" qualifiers="const">
+			<return type="Object">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_editor_hint">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="get_frame" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="is_editor_hint" qualifiers="const">
-			<return type="bool">
+		<method name="get_node_count" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_debug_collisions_hint">
-			<argument index="0" name="enable" type="bool">
+		<method name="get_nodes_in_group">
+			<return type="Array">
+			</return>
+			<argument index="0" name="group" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_debugging_collisions_hint" qualifiers="const">
-			<return type="bool">
+		<method name="get_root" qualifiers="const">
+			<return type="Viewport">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_debug_navigation_hint">
-			<argument index="0" name="enable" type="bool">
+		<method name="has_group" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
+		<method name="is_debugging_collisions_hint" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+			</description>
+		</method>
 		<method name="is_debugging_navigation_hint" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_edited_scene_root">
-			<argument index="0" name="scene" type="Object">
-			</argument>
+		<method name="is_editor_hint" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_edited_scene_root" qualifiers="const">
-			<return type="Object">
+		<method name="is_paused" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_pause">
-			<argument index="0" name="enable" type="bool">
+		<method name="notify_group">
+			<argument index="0" name="call_flags" type="int">
+			</argument>
+			<argument index="1" name="group" type="String">
+			</argument>
+			<argument index="2" name="notification" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_paused" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="queue_delete">
+			<argument index="0" name="obj" type="Object">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_input_as_handled">
+		<method name="quit">
 			<description>
 			</description>
 		</method>
-		<method name="get_node_count" qualifiers="const">
+		<method name="reload_current_scene">
 			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_frame" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_auto_accept_quit">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="quit">
+		<method name="set_current_scene">
+			<argument index="0" name="child_node" type="Node">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_screen_stretch">
-			<argument index="0" name="mode" type="int">
-			</argument>
-			<argument index="1" name="aspect" type="int">
-			</argument>
-			<argument index="2" name="minsize" type="Vector2">
+		<method name="set_debug_collisions_hint">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="queue_delete">
-			<argument index="0" name="obj" type="Object">
+		<method name="set_debug_navigation_hint">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="call_group">
-			<argument index="0" name="flags" type="int">
-			</argument>
-			<argument index="1" name="group" type="String">
-			</argument>
-			<argument index="2" name="method" type="String">
-			</argument>
-			<argument index="3" name="arg0" type="Variant" default="NULL">
-			</argument>
-			<argument index="4" name="arg1" type="Variant" default="NULL">
-			</argument>
-			<argument index="5" name="arg2" type="Variant" default="NULL">
-			</argument>
-			<argument index="6" name="arg3" type="Variant" default="NULL">
-			</argument>
-			<argument index="7" name="arg4" type="Variant" default="NULL">
+		<method name="set_edited_scene_root">
+			<argument index="0" name="scene" type="Object">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_current_scene">
-			<argument index="0" name="child_node" type="Node">
+		<method name="set_editor_hint">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_current_scene" qualifiers="const">
-			<return type="Node">
-			</return>
+		<method name="set_group">
+			<argument index="0" name="call_flags" type="int">
+			</argument>
+			<argument index="1" name="group" type="String">
+			</argument>
+			<argument index="2" name="property" type="String">
+			</argument>
+			<argument index="3" name="value" type="Variant">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="change_scene">
-			<return type="int">
-			</return>
-			<argument index="0" name="path" type="String">
-			</argument>
+		<method name="set_input_as_handled">
 			<description>
 			</description>
 		</method>
-		<method name="change_scene_to">
-			<return type="int">
-			</return>
-			<argument index="0" name="packed_scene" type="PackedScene">
+		<method name="set_pause">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="reload_current_scene">
-			<return type="int">
-			</return>
+		<method name="set_screen_stretch">
+			<argument index="0" name="mode" type="int">
+			</argument>
+			<argument index="1" name="aspect" type="int">
+			</argument>
+			<argument index="2" name="minsize" type="Vector2">
+			</argument>
 			<description>
 			</description>
 		</method>
 	</methods>
 	<signals>
-		<signal name="node_configuration_warning_changed">
-			<argument index="0" name="node" type="Object">
+		<signal name="files_dropped">
+			<argument index="0" name="files" type="StringArray">
+			</argument>
+			<argument index="1" name="screen" type="int">
 			</argument>
 			<description>
 			</description>
 		</signal>
-		<signal name="screen_resized">
+		<signal name="fixed_frame">
 			<description>
 			</description>
 		</signal>
-		<signal name="node_removed">
-			<argument index="0" name="node" type="Object">
-			</argument>
+		<signal name="idle_frame">
 			<description>
 			</description>
 		</signal>
-		<signal name="files_dropped">
-			<argument index="0" name="files" type="StringArray">
-			</argument>
-			<argument index="1" name="screen" type="int">
+		<signal name="node_configuration_warning_changed">
+			<argument index="0" name="node" type="Object">
 			</argument>
 			<description>
 			</description>
 		</signal>
-		<signal name="idle_frame">
+		<signal name="node_removed">
+			<argument index="0" name="node" type="Object">
+			</argument>
 			<description>
 			</description>
 		</signal>
-		<signal name="tree_changed">
+		<signal name="screen_resized">
 			<description>
 			</description>
 		</signal>
-		<signal name="fixed_frame">
+		<signal name="tree_changed">
 			<description>
 			</description>
 		</signal>
@@ -33560,47 +33922,40 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Script" inherits="Resource" category="Core">
 	<brief_description>
-	Base class for scripts.
+		Base class for scripts.
 	</brief_description>
 	<description>
-	Base class for scripts. Any script that is loaded becomes one of these resources, which can then create instances.
+		Base class for scripts. Any script that is loaded becomes one of these resources, which can then create instances.
 	</description>
 	<methods>
 		<method name="can_instance" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if this script can be instance (ie not a library).
+				Return true if this script can be instance (ie not a library).
 			</description>
 		</method>
-		<method name="instance_has" qualifiers="const">
-			<return type="bool">
+		<method name="get_source_code" qualifiers="const">
+			<return type="String">
 			</return>
-			<argument index="0" name="base_object" type="Object">
-			</argument>
 			<description>
-			Return true if a given object uses an instance of this script.
+				Return the script source code (if available).
 			</description>
 		</method>
 		<method name="has_source_code" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if the script contains source code.
+				Return true if the script contains source code.
 			</description>
 		</method>
-		<method name="get_source_code" qualifiers="const">
-			<return type="String">
+		<method name="instance_has" qualifiers="const">
+			<return type="bool">
 			</return>
-			<description>
-			Return the script source code (if available).
-			</description>
-		</method>
-		<method name="set_source_code">
-			<argument index="0" name="source" type="String">
+			<argument index="0" name="base_object" type="Object">
 			</argument>
 			<description>
-			Set the script source code.
+				Return true if a given object uses an instance of this script.
 			</description>
 		</method>
 		<method name="reload">
@@ -33611,96 +33966,103 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
+		<method name="set_source_code">
+			<argument index="0" name="source" type="String">
+			</argument>
+			<description>
+				Set the script source code.
+			</description>
+		</method>
 	</methods>
 	<constants>
 	</constants>
 </class>
 <class name="ScrollBar" inherits="Range" category="Core">
 	<brief_description>
-	Base class for scroll bars.
+		Base class for scroll bars.
 	</brief_description>
 	<description>
-	Scrollbars are a [Range] based [Control], that display a draggable area (the size of the page). Horizontal ([HScrollBar]) and Vertical ([VScrollBar]) versions are available.
+		Scrollbars are a [Range] based [Control], that display a draggable area (the size of the page). Horizontal ([HScrollBar]) and Vertical ([VScrollBar]) versions are available.
 	</description>
 	<methods>
-		<method name="set_custom_step">
-			<argument index="0" name="step" type="float">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_custom_step" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
+		<method name="set_custom_step">
+			<argument index="0" name="step" type="float">
+			</argument>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<constants>
 	</constants>
 </class>
 <class name="ScrollContainer" inherits="Container" category="Core">
 	<brief_description>
-	A helper node for displaying scrollable elements (e.g. lists).
+		A helper node for displaying scrollable elements (e.g. lists).
 	</brief_description>
 	<description>
-	A ScrollContainer node with a [Control] child and scrollbar child ([HScrollbar], [VScrollBar], or both) will only draw the Control within the ScrollContainer area.  Scrollbars will automatically be drawn at the right (for vertical) or bottom (for horizontal) and will enable dragging to move the viewable Control (and its children) within the ScrollContainer.  Scrollbars will also automatically resize the grabber based on the minimum_size of the Control relative to the ScrollContainer.  Works great with a [Panel] control.
+		A ScrollContainer node with a [Control] child and scrollbar child ([HScrollbar], [VScrollBar], or both) will only draw the Control within the ScrollContainer area.  Scrollbars will automatically be drawn at the right (for vertical) or bottom (for horizontal) and will enable dragging to move the viewable Control (and its children) within the ScrollContainer.  Scrollbars will also automatically resize the grabber based on the minimum_size of the Control relative to the ScrollContainer.  Works great with a [Panel] control.
 	</description>
 	<methods>
-		<method name="set_enable_h_scroll">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="get_h_scroll" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set allows horizontal scrool.
+				Return current horizontal scroll value.
 			</description>
 		</method>
-		<method name="is_h_scroll_enabled" qualifiers="const">
-			<return type="bool">
+		<method name="get_v_scroll" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return true if horizontal scrool is allowed.
+				Return current vertical scroll value.
 			</description>
 		</method>
-		<method name="set_enable_v_scroll">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="is_h_scroll_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set allows vertical scrool.
+				Return true if horizontal scrool is allowed.
 			</description>
 		</method>
 		<method name="is_v_scroll_enabled" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if vertical scrool is allowed.
+				Return true if vertical scrool is allowed.
 			</description>
 		</method>
-		<method name="set_h_scroll">
-			<argument index="0" name="val" type="int">
+		<method name="set_enable_h_scroll">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Set horizontal scroll value.
+				Set allows horizontal scrool.
 			</description>
 		</method>
-		<method name="get_h_scroll" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_enable_v_scroll">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Return current horizontal scroll value.
+				Set allows vertical scrool.
 			</description>
 		</method>
-		<method name="set_v_scroll">
+		<method name="set_h_scroll">
 			<argument index="0" name="val" type="int">
 			</argument>
 			<description>
-			Set vertical scroll value.
+				Set horizontal scroll value.
 			</description>
 		</method>
-		<method name="get_v_scroll" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_v_scroll">
+			<argument index="0" name="val" type="int">
+			</argument>
 			<description>
-			Return current vertical scroll value.
+				Set vertical scroll value.
 			</description>
 		</method>
 	</methods>
@@ -33709,38 +34071,38 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="SegmentShape2D" inherits="Shape2D" category="Core">
 	<brief_description>
-	Segment Shape for 2D Collision Detection.
+		Segment Shape for 2D Collision Detection.
 	</brief_description>
 	<description>
-	Segment Shape for 2D Collision Detection, consists of two points, 'a' and 'b'.
+		Segment Shape for 2D Collision Detection, consists of two points, 'a' and 'b'.
 	</description>
 	<methods>
-		<method name="set_a">
-			<argument index="0" name="a" type="Vector2">
-			</argument>
+		<method name="get_a" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
-			Set the first point's position.
+				Return the first point's position.
 			</description>
 		</method>
-		<method name="get_a" qualifiers="const">
+		<method name="get_b" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
-			Return the first point's position.
+				Return the second point's position.
 			</description>
 		</method>
-		<method name="set_b">
-			<argument index="0" name="b" type="Vector2">
+		<method name="set_a">
+			<argument index="0" name="a" type="Vector2">
 			</argument>
 			<description>
-			Set the second point's position.
+				Set the first point's position.
 			</description>
 		</method>
-		<method name="get_b" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_b">
+			<argument index="0" name="b" type="Vector2">
+			</argument>
 			<description>
-			Return the second point's position.
+				Set the second point's position.
 			</description>
 		</method>
 	</methods>
@@ -33749,24 +34111,24 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Semaphore" inherits="Reference" category="Core">
 	<brief_description>
-	A synchronization Semaphore.
+		A synchronization Semaphore.
 	</brief_description>
 	<description>
-	A synchronization Semaphore. Element used in multi-threadding. Initialized to zero on creation.
+		A synchronization Semaphore. Element used in multi-threadding. Initialized to zero on creation.
 	</description>
 	<methods>
-		<method name="wait">
+		<method name="post">
 			<return type="Error">
 			</return>
 			<description>
-			Tries to wait for the [Semaphore], if it's value is zero, blocks until non-zero.
+				Lowers the [Semaphore], allowing one more thread in.
 			</description>
 		</method>
-		<method name="post">
+		<method name="wait">
 			<return type="Error">
 			</return>
 			<description>
-			Lowers the [Semaphore], allowing one more thread in.
+				Tries to wait for the [Semaphore], if it's value is zero, blocks until non-zero.
 			</description>
 		</method>
 	</methods>
@@ -33775,10 +34137,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Separator" inherits="Control" category="Core">
 	<brief_description>
-	Base class for separators.
+		Base class for separators.
 	</brief_description>
 	<description>
-	Separator is a [Control] used for separating other controls. It's purely a visual decoration. Horizontal ([HSeparator]) and Vertical ([VSeparator]) versions are available.
+		Separator is a [Control] used for separating other controls. It's purely a visual decoration. Horizontal ([HSeparator]) and Vertical ([VSeparator]) versions are available.
 	</description>
 	<methods>
 	</methods>
@@ -33787,70 +34149,70 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Shader" inherits="Resource" category="Core">
 	<brief_description>
-	To be changed, ignore.
+		To be changed, ignore.
 	</brief_description>
 	<description>
-	To be changed, ignore.
+		To be changed, ignore.
 	</description>
 	<methods>
-		<method name="get_mode" qualifiers="const">
-			<return type="int">
+		<method name="get_default_texture_param" qualifiers="const">
+			<return type="Texture">
 			</return>
+			<argument index="0" name="param" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_code">
-			<argument index="0" name="vcode" type="String">
-			</argument>
-			<argument index="1" name="fcode" type="String">
-			</argument>
-			<argument index="2" name="lcode" type="String">
-			</argument>
-			<argument index="3" name="fofs" type="int" default="0">
-			</argument>
-			<argument index="4" name="lofs" type="int" default="0">
-			</argument>
+		<method name="get_fragment_code" qualifiers="const">
+			<return type="String">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_vertex_code" qualifiers="const">
+		<method name="get_light_code" qualifiers="const">
 			<return type="String">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_fragment_code" qualifiers="const">
-			<return type="String">
+		<method name="get_mode" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_light_code" qualifiers="const">
+		<method name="get_vertex_code" qualifiers="const">
 			<return type="String">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_default_texture_param">
-			<argument index="0" name="param" type="String">
-			</argument>
-			<argument index="1" name="texture" type="Texture">
+		<method name="has_param" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_default_texture_param" qualifiers="const">
-			<return type="Texture">
-			</return>
-			<argument index="0" name="param" type="String">
+		<method name="set_code">
+			<argument index="0" name="vcode" type="String">
+			</argument>
+			<argument index="1" name="fcode" type="String">
+			</argument>
+			<argument index="2" name="lcode" type="String">
+			</argument>
+			<argument index="3" name="fofs" type="int" default="0">
+			</argument>
+			<argument index="4" name="lofs" type="int" default="0">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="has_param" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="name" type="String">
+		<method name="set_default_texture_param">
+			<argument index="0" name="param" type="String">
+			</argument>
+			<argument index="1" name="texture" type="Texture">
 			</argument>
 			<description>
 			</description>
@@ -33871,17 +34233,15 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="node_add">
+		<method name="clear">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="node_type" type="int">
-			</argument>
-			<argument index="2" name="id" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="node_remove">
+		<method name="color_ramp_node_get_colors" qualifiers="const">
+			<return type="ColorArray">
+			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
@@ -33889,28 +34249,30 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="node_set_pos">
+		<method name="color_ramp_node_get_offsets" qualifiers="const">
+			<return type="RealArray">
+			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
-			<argument index="2" name="pos" type="Vector2">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="node_get_pos" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="color_ramp_node_set_ramp">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
+			<argument index="2" name="colors" type="ColorArray">
+			</argument>
+			<argument index="3" name="offsets" type="RealArray">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="node_get_type" qualifiers="const">
-			<return type="int">
+		<method name="comment_node_get_text" qualifiers="const">
+			<return type="String">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
@@ -33919,48 +34281,54 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_node_list" qualifiers="const">
-			<return type="Array">
-			</return>
+		<method name="comment_node_set_text">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
+			<argument index="1" name="id" type="int">
+			</argument>
+			<argument index="2" name="text" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="default_set_value">
+		<method name="connect_node">
+			<return type="Error">
+			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="int">
+			<argument index="1" name="src_id" type="int">
 			</argument>
-			<argument index="2" name="param_id" type="int">
+			<argument index="2" name="src_slot" type="int">
 			</argument>
-			<argument index="3" name="value" type="Variant">
+			<argument index="3" name="dst_id" type="int">
+			</argument>
+			<argument index="4" name="dst_slot" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="default_get_value">
+		<method name="cubemap_input_node_get_value" qualifiers="const">
+			<return type="CubeMap">
+			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
-			<argument index="2" name="param_id" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="scalar_const_node_set_value">
+		<method name="cubemap_input_node_set_value">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
-			<argument index="2" name="value" type="float">
+			<argument index="2" name="value" type="CubeMap">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="scalar_const_node_get_value" qualifiers="const">
-			<return type="float">
+		<method name="curve_map_node_get_points" qualifiers="const">
+			<return type="Vector2Array">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
@@ -33969,78 +34337,70 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="vec_const_node_set_value">
+		<method name="curve_map_node_set_points">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
-			<argument index="2" name="value" type="Vector3">
+			<argument index="2" name="points" type="Vector2Array">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="vec_const_node_get_value" qualifiers="const">
-			<return type="Vector3">
-			</return>
+		<method name="default_get_value">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
+			<argument index="2" name="param_id" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="rgb_const_node_set_value">
+		<method name="default_set_value">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
-			<argument index="2" name="value" type="Color">
+			<argument index="2" name="param_id" type="int">
+			</argument>
+			<argument index="3" name="value" type="Variant">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="rgb_const_node_get_value" qualifiers="const">
-			<return type="Color">
-			</return>
+		<method name="disconnect_node">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="int">
+			<argument index="1" name="src_id" type="int">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="xform_const_node_set_value">
-			<argument index="0" name="shader_type" type="int">
+			<argument index="2" name="src_slot" type="int">
 			</argument>
-			<argument index="1" name="id" type="int">
+			<argument index="3" name="dst_id" type="int">
 			</argument>
-			<argument index="2" name="value" type="Transform">
+			<argument index="4" name="dst_slot" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="xform_const_node_get_value" qualifiers="const">
-			<return type="Transform">
+		<method name="get_node_connections" qualifiers="const">
+			<return type="Array">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="texture_node_set_filter_size">
+		<method name="get_node_list" qualifiers="const">
+			<return type="Array">
+			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="int">
-			</argument>
-			<argument index="2" name="filter_size" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="texture_node_get_filter_size" qualifiers="const">
-			<return type="int">
+		<method name="input_node_get_name">
+			<return type="String">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
@@ -34049,118 +34409,122 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="texture_node_set_filter_strength">
+		<method name="input_node_set_name">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="float">
+			<argument index="1" name="id" type="int">
 			</argument>
-			<argument index="2" name="filter_strength" type="float">
+			<argument index="2" name="name" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="texture_node_get_filter_strength" qualifiers="const">
-			<return type="float">
+		<method name="is_node_connected" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="float">
+			<argument index="1" name="src_id" type="int">
+			</argument>
+			<argument index="2" name="src_slot" type="int">
+			</argument>
+			<argument index="3" name="dst_id" type="int">
+			</argument>
+			<argument index="4" name="dst_slot" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="scalar_op_node_set_op">
+		<method name="node_add">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="float">
+			<argument index="1" name="node_type" type="int">
 			</argument>
-			<argument index="2" name="op" type="int">
+			<argument index="2" name="id" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="scalar_op_node_get_op" qualifiers="const">
-			<return type="int">
+		<method name="node_get_pos" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="float">
+			<argument index="1" name="id" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="vec_op_node_set_op">
+		<method name="node_get_state" qualifiers="const">
+			<return type="Variant">
+			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="float">
-			</argument>
-			<argument index="2" name="op" type="int">
+			<argument index="1" name="id" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="vec_op_node_get_op" qualifiers="const">
+		<method name="node_get_type" qualifiers="const">
 			<return type="int">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="float">
+			<argument index="1" name="id" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="vec_scalar_op_node_set_op">
+		<method name="node_remove">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="float">
-			</argument>
-			<argument index="2" name="op" type="int">
+			<argument index="1" name="id" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="vec_scalar_op_node_get_op" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="node_set_pos">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="float">
+			<argument index="1" name="id" type="int">
+			</argument>
+			<argument index="2" name="pos" type="Vector2">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="rgb_op_node_set_op">
+		<method name="node_set_state">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="float">
+			<argument index="1" name="id" type="int">
 			</argument>
-			<argument index="2" name="op" type="int">
+			<argument index="2" name="state" type="Variant">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="rgb_op_node_get_op" qualifiers="const">
-			<return type="int">
+		<method name="rgb_const_node_get_value" qualifiers="const">
+			<return type="Color">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="float">
+			<argument index="1" name="id" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="xform_vec_mult_node_set_no_translation">
+		<method name="rgb_const_node_set_value">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
-			<argument index="2" name="disable" type="bool">
+			<argument index="2" name="value" type="Color">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="xform_vec_mult_node_get_no_translation" qualifiers="const">
-			<return type="bool">
+		<method name="rgb_input_node_get_value" qualifiers="const">
+			<return type="Color">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
@@ -34169,38 +34533,38 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="scalar_func_node_set_function">
+		<method name="rgb_input_node_set_value">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
-			<argument index="2" name="func" type="int">
+			<argument index="2" name="value" type="Color">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="scalar_func_node_get_function" qualifiers="const">
+		<method name="rgb_op_node_get_op" qualifiers="const">
 			<return type="int">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="int">
+			<argument index="1" name="id" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="vec_func_node_set_function">
+		<method name="rgb_op_node_set_op">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="int">
+			<argument index="1" name="id" type="float">
 			</argument>
-			<argument index="2" name="func" type="int">
+			<argument index="2" name="op" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="vec_func_node_get_function" qualifiers="const">
-			<return type="int">
+		<method name="scalar_const_node_get_value" qualifiers="const">
+			<return type="float">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
@@ -34209,18 +34573,18 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="input_node_set_name">
+		<method name="scalar_const_node_set_value">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
-			<argument index="2" name="name" type="String">
+			<argument index="2" name="value" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="input_node_get_name">
-			<return type="String">
+		<method name="scalar_func_node_get_function" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
@@ -34229,12 +34593,12 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="scalar_input_node_set_value">
+		<method name="scalar_func_node_set_function">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
-			<argument index="2" name="value" type="float">
+			<argument index="2" name="func" type="int">
 			</argument>
 			<description>
 			</description>
@@ -34249,38 +34613,38 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="vec_input_node_set_value">
+		<method name="scalar_input_node_set_value">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
-			<argument index="2" name="value" type="Vector3">
+			<argument index="2" name="value" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="vec_input_node_get_value" qualifiers="const">
-			<return type="Vector3">
+		<method name="scalar_op_node_get_op" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="int">
+			<argument index="1" name="id" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="rgb_input_node_set_value">
+		<method name="scalar_op_node_set_op">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="int">
+			<argument index="1" name="id" type="float">
 			</argument>
-			<argument index="2" name="value" type="Color">
+			<argument index="2" name="op" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="rgb_input_node_get_value" qualifiers="const">
-			<return type="Color">
+		<method name="texture_input_node_get_value" qualifiers="const">
+			<return type="Texture">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
@@ -34289,18 +34653,18 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="xform_input_node_set_value">
+		<method name="texture_input_node_set_value">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
-			<argument index="2" name="value" type="Transform">
+			<argument index="2" name="value" type="Texture">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="xform_input_node_get_value" qualifiers="const">
-			<return type="Transform">
+		<method name="texture_node_get_filter_size" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
@@ -34309,38 +34673,38 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="texture_input_node_set_value">
+		<method name="texture_node_get_filter_strength" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="int">
-			</argument>
-			<argument index="2" name="value" type="Texture">
+			<argument index="1" name="id" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="texture_input_node_get_value" qualifiers="const">
-			<return type="Texture">
-			</return>
+		<method name="texture_node_set_filter_size">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
+			<argument index="2" name="filter_size" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="cubemap_input_node_set_value">
+		<method name="texture_node_set_filter_strength">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="int">
+			<argument index="1" name="id" type="float">
 			</argument>
-			<argument index="2" name="value" type="CubeMap">
+			<argument index="2" name="filter_strength" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="cubemap_input_node_get_value" qualifiers="const">
-			<return type="CubeMap">
+		<method name="vec_const_node_get_value" qualifiers="const">
+			<return type="Vector3">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
@@ -34349,18 +34713,18 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="comment_node_set_text">
+		<method name="vec_const_node_set_value">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
-			<argument index="2" name="text" type="String">
+			<argument index="2" name="value" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="comment_node_get_text" qualifiers="const">
-			<return type="String">
+		<method name="vec_func_node_get_function" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
@@ -34369,20 +34733,18 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="color_ramp_node_set_ramp">
+		<method name="vec_func_node_set_function">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
-			<argument index="2" name="colors" type="ColorArray">
-			</argument>
-			<argument index="3" name="offsets" type="RealArray">
+			<argument index="2" name="func" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="color_ramp_node_get_colors" qualifiers="const">
-			<return type="ColorArray">
+		<method name="vec_input_node_get_value" qualifiers="const">
+			<return type="Vector3">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
@@ -34391,113 +34753,113 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="color_ramp_node_get_offsets" qualifiers="const">
-			<return type="RealArray">
-			</return>
+		<method name="vec_input_node_set_value">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
+			<argument index="2" name="value" type="Vector3">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="curve_map_node_set_points">
+		<method name="vec_op_node_get_op" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="int">
-			</argument>
-			<argument index="2" name="points" type="Vector2Array">
+			<argument index="1" name="id" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="curve_map_node_get_points" qualifiers="const">
-			<return type="Vector2Array">
-			</return>
+		<method name="vec_op_node_set_op">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="id" type="int">
+			<argument index="1" name="id" type="float">
+			</argument>
+			<argument index="2" name="op" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="connect_node">
-			<return type="Error">
+		<method name="vec_scalar_op_node_get_op" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="src_id" type="int">
+			<argument index="1" name="id" type="float">
 			</argument>
-			<argument index="2" name="src_slot" type="int">
+			<description>
+			</description>
+		</method>
+		<method name="vec_scalar_op_node_set_op">
+			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="3" name="dst_id" type="int">
+			<argument index="1" name="id" type="float">
 			</argument>
-			<argument index="4" name="dst_slot" type="int">
+			<argument index="2" name="op" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_node_connected" qualifiers="const">
-			<return type="bool">
+		<method name="xform_const_node_get_value" qualifiers="const">
+			<return type="Transform">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="src_id" type="int">
-			</argument>
-			<argument index="2" name="src_slot" type="int">
-			</argument>
-			<argument index="3" name="dst_id" type="int">
-			</argument>
-			<argument index="4" name="dst_slot" type="int">
+			<argument index="1" name="id" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="disconnect_node">
+		<method name="xform_const_node_set_value">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
-			<argument index="1" name="src_id" type="int">
-			</argument>
-			<argument index="2" name="src_slot" type="int">
-			</argument>
-			<argument index="3" name="dst_id" type="int">
+			<argument index="1" name="id" type="int">
 			</argument>
-			<argument index="4" name="dst_slot" type="int">
+			<argument index="2" name="value" type="Transform">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_node_connections" qualifiers="const">
-			<return type="Array">
+		<method name="xform_input_node_get_value" qualifiers="const">
+			<return type="Transform">
 			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
+			<argument index="1" name="id" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="clear">
+		<method name="xform_input_node_set_value">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
+			<argument index="1" name="id" type="int">
+			</argument>
+			<argument index="2" name="value" type="Transform">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="node_set_state">
+		<method name="xform_vec_mult_node_get_no_translation" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
-			<argument index="2" name="state" type="Variant">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="node_get_state" qualifiers="const">
-			<return type="Variant">
-			</return>
+		<method name="xform_vec_mult_node_set_no_translation">
 			<argument index="0" name="shader_type" type="int">
 			</argument>
 			<argument index="1" name="id" type="int">
 			</argument>
+			<argument index="2" name="disable" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -34741,31 +35103,31 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_shader">
-			<argument index="0" name="shader" type="Shader">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_shader" qualifiers="const">
 			<return type="Shader">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_shader_param">
+		<method name="get_shader_param" qualifiers="const">
+			<return type="Variant">
+			</return>
 			<argument index="0" name="param" type="String">
 			</argument>
-			<argument index="1" name="value" type="Variant">
+			<description>
+			</description>
+		</method>
+		<method name="set_shader">
+			<argument index="0" name="shader" type="Shader">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_shader_param" qualifiers="const">
-			<return type="Variant">
-			</return>
+		<method name="set_shader_param">
 			<argument index="0" name="param" type="String">
 			</argument>
+			<argument index="1" name="value" type="Variant">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -34785,29 +35147,28 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Shape2D" inherits="Resource" category="Core">
 	<brief_description>
-	Base class for all 2D Shapes.
+		Base class for all 2D Shapes.
 	</brief_description>
 	<description>
-	Base class for all 2D Shapes. All 2D shape types inherit from this.
+		Base class for all 2D Shapes. All 2D shape types inherit from this.
 	</description>
 	<methods>
-		<method name="set_custom_solver_bias">
-			<argument index="0" name="bias" type="float">
-			</argument>
-			<description>
-			Use a custom solver bias. No need to change this unless you really know what you are doing.
-			The solver bias is a factor controlling how much two objects "rebound" off each other, when colliding, to avoid them getting into each other because of numerical imprecision.
-			</description>
-		</method>
-		<method name="get_custom_solver_bias" qualifiers="const">
-			<return type="float">
+		<method name="collide">
+			<return type="bool">
 			</return>
+			<argument index="0" name="local_xform" type="Matrix32">
+			</argument>
+			<argument index="1" name="with_shape" type="Shape2D">
+			</argument>
+			<argument index="2" name="shape_xform" type="Matrix32">
+			</argument>
 			<description>
-			Return the custom solver bias.
+				Return whether this shape is colliding with another.
+				This method needs the transformation matrix for this shape ([code]local_xform[/code]), the shape to check collisions with ([code]with_shape[/code]), and the transformation matrix of that shape ([code]shape_xform[/code]).
 			</description>
 		</method>
-		<method name="collide">
-			<return type="bool">
+		<method name="collide_and_get_contacts">
+			<return type="Variant">
 			</return>
 			<argument index="0" name="local_xform" type="Matrix32">
 			</argument>
@@ -34816,8 +35177,8 @@ This method controls whether the position between two cached points is interpola
 			<argument index="2" name="shape_xform" type="Matrix32">
 			</argument>
 			<description>
-			Return whether this shape is colliding with another.
-			This method needs the transformation matrix for this shape ([code]local_xform[/code]), the shape to check collisions with ([code]with_shape[/code]), and the transformation matrix of that shape ([code]shape_xform[/code]).
+				Return a list of the points where this shape touches another. If there are no collisions, the list is empty.
+				This method needs the transformation matrix for this shape ([code]local_xform[/code]), the shape to check collisions with ([code]with_shape[/code]), and the transformation matrix of that shape ([code]shape_xform[/code]).
 			</description>
 		</method>
 		<method name="collide_with_motion">
@@ -34834,22 +35195,8 @@ This method controls whether the position between two cached points is interpola
 			<argument index="4" name="shape_motion" type="Vector2">
 			</argument>
 			<description>
-			Return whether this shape would collide with another, if a given movement was applied.
-			This method needs the transformation matrix for this shape ([code]local_xform[/code]), the movement to test on this shape ([code]local_motion[/code]), the shape to check collisions with ([code]with_shape[/code]), the transformation matrix of that shape ([code]shape_xform[/code]), and the movement to test onto the other object ([code]shape_motion[/code]).
-			</description>
-		</method>
-		<method name="collide_and_get_contacts">
-			<return type="Variant">
-			</return>
-			<argument index="0" name="local_xform" type="Matrix32">
-			</argument>
-			<argument index="1" name="with_shape" type="Shape2D">
-			</argument>
-			<argument index="2" name="shape_xform" type="Matrix32">
-			</argument>
-			<description>
-			Return a list of the points where this shape touches another. If there are no collisions, the list is empty.
-			This method needs the transformation matrix for this shape ([code]local_xform[/code]), the shape to check collisions with ([code]with_shape[/code]), and the transformation matrix of that shape ([code]shape_xform[/code]).
+				Return whether this shape would collide with another, if a given movement was applied.
+				This method needs the transformation matrix for this shape ([code]local_xform[/code]), the movement to test on this shape ([code]local_motion[/code]), the shape to check collisions with ([code]with_shape[/code]), the transformation matrix of that shape ([code]shape_xform[/code]), and the movement to test onto the other object ([code]shape_motion[/code]).
 			</description>
 		</method>
 		<method name="collide_with_motion_and_get_contacts">
@@ -34866,8 +35213,23 @@ This method controls whether the position between two cached points is interpola
 			<argument index="4" name="shape_motion" type="Vector2">
 			</argument>
 			<description>
-			Return a list of the points where this shape would touch another, if a given movement was applied. If there are no collisions, the list is empty.
-			This method needs the transformation matrix for this shape ([code]local_xform[/code]), the movement to test on this shape ([code]local_motion[/code]), the shape to check collisions with ([code]with_shape[/code]), the transformation matrix of that shape ([code]shape_xform[/code]), and the movement to test onto the other object ([code]shape_motion[/code]).
+				Return a list of the points where this shape would touch another, if a given movement was applied. If there are no collisions, the list is empty.
+				This method needs the transformation matrix for this shape ([code]local_xform[/code]), the movement to test on this shape ([code]local_motion[/code]), the shape to check collisions with ([code]with_shape[/code]), the transformation matrix of that shape ([code]shape_xform[/code]), and the movement to test onto the other object ([code]shape_motion[/code]).
+			</description>
+		</method>
+		<method name="get_custom_solver_bias" qualifiers="const">
+			<return type="float">
+			</return>
+			<description>
+				Return the custom solver bias.
+			</description>
+		</method>
+		<method name="set_custom_solver_bias">
+			<argument index="0" name="bias" type="float">
+			</argument>
+			<description>
+				Use a custom solver bias. No need to change this unless you really know what you are doing.
+				The solver bias is a factor controlling how much two objects "rebound" off each other, when colliding, to avoid them getting into each other because of numerical imprecision.
 			</description>
 		</method>
 	</methods>
@@ -34880,9 +35242,9 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_shortcut">
-			<argument index="0" name="event" type="InputEvent">
-			</argument>
+		<method name="get_as_text" qualifiers="const">
+			<return type="String">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -34892,23 +35254,23 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="is_valid" qualifiers="const">
+		<method name="is_shortcut" qualifiers="const">
 			<return type="bool">
 			</return>
+			<argument index="0" name="event" type="InputEvent">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_shortcut" qualifiers="const">
+		<method name="is_valid" qualifiers="const">
 			<return type="bool">
 			</return>
-			<argument index="0" name="event" type="InputEvent">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_as_text" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="set_shortcut">
+			<argument index="0" name="event" type="InputEvent">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -34918,17 +35280,31 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Skeleton" inherits="Spatial" category="Core">
 	<brief_description>
-	Skeleton for characters and animated objects.
+		Skeleton for characters and animated objects.
 	</brief_description>
 	<description>
-	Skeleton provides a hierarchical interface for managing bones, including pose, rest and animation (see [Animation]). Skeleton will support rag doll dynamics in the future.
+		Skeleton provides a hierarchical interface for managing bones, including pose, rest and animation (see [Animation]). Skeleton will support rag doll dynamics in the future.
 	</description>
 	<methods>
 		<method name="add_bone">
 			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			Add a bone, with name "name". [method get_bone_count] will become the bone index.
+				Add a bone, with name "name". [method get_bone_count] will become the bone index.
+			</description>
+		</method>
+		<method name="bind_child_node_to_bone">
+			<argument index="0" name="bone_idx" type="int">
+			</argument>
+			<argument index="1" name="node" type="Node">
+			</argument>
+			<description>
+				Deprecated soon.
+			</description>
+		</method>
+		<method name="clear_bones">
+			<description>
+				Clear all the bones in this skeleton.
 			</description>
 		</method>
 		<method name="find_bone" qualifiers="const">
@@ -34937,47 +35313,57 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			Return the bone index that matches "name" as its name.
+				Return the bone index that matches "name" as its name.
 			</description>
 		</method>
-		<method name="get_bone_name" qualifiers="const">
-			<return type="String">
+		<method name="get_bone_count" qualifiers="const">
+			<return type="int">
+			</return>
+			<description>
+				Return the amount of bones in the skeleton.
+			</description>
+		</method>
+		<method name="get_bone_custom_pose" qualifiers="const">
+			<return type="Transform">
 			</return>
 			<argument index="0" name="bone_idx" type="int">
 			</argument>
 			<description>
-			Return the name of the bone at index "index"
 			</description>
 		</method>
-		<method name="get_bone_parent" qualifiers="const">
-			<return type="int">
+		<method name="get_bone_global_pose" qualifiers="const">
+			<return type="Transform">
 			</return>
 			<argument index="0" name="bone_idx" type="int">
 			</argument>
 			<description>
-			Return the bone index which is the parent of the bone at "bone_idx". If -1, then bone has no parent. Note that the parent bone returned will always be less than "bone_idx".
 			</description>
 		</method>
-		<method name="set_bone_parent">
+		<method name="get_bone_name" qualifiers="const">
+			<return type="String">
+			</return>
 			<argument index="0" name="bone_idx" type="int">
 			</argument>
-			<argument index="1" name="parent_idx" type="int">
-			</argument>
 			<description>
-			Set the bone index "parent_idx" as the parent of the bone at "bone_idx". If -1, then bone has no parent. Note: "parent_idx" must be less than "bone_idx".
+				Return the name of the bone at index "index"
 			</description>
 		</method>
-		<method name="get_bone_count" qualifiers="const">
+		<method name="get_bone_parent" qualifiers="const">
 			<return type="int">
 			</return>
+			<argument index="0" name="bone_idx" type="int">
+			</argument>
 			<description>
-			Return the amount of bones in the skeleton.
+				Return the bone index which is the parent of the bone at "bone_idx". If -1, then bone has no parent. Note that the parent bone returned will always be less than "bone_idx".
 			</description>
 		</method>
-		<method name="unparent_bone_and_rest">
+		<method name="get_bone_pose" qualifiers="const">
+			<return type="Transform">
+			</return>
 			<argument index="0" name="bone_idx" type="int">
 			</argument>
 			<description>
+				Return the pose transform for bone "bone_idx".
 			</description>
 		</method>
 		<method name="get_bone_rest" qualifiers="const">
@@ -34986,24 +35372,24 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="bone_idx" type="int">
 			</argument>
 			<description>
-			Return the rest transform for a bone "bone_idx".
+				Return the rest transform for a bone "bone_idx".
 			</description>
 		</method>
-		<method name="set_bone_rest">
+		<method name="get_bone_transform" qualifiers="const">
+			<return type="Transform">
+			</return>
 			<argument index="0" name="bone_idx" type="int">
 			</argument>
-			<argument index="1" name="rest" type="Transform">
-			</argument>
 			<description>
-			Set the rest transform for bone "bone_idx"
 			</description>
 		</method>
-		<method name="set_bone_disable_rest">
+		<method name="get_bound_child_nodes_to_bone" qualifiers="const">
+			<return type="Array">
+			</return>
 			<argument index="0" name="bone_idx" type="int">
 			</argument>
-			<argument index="1" name="disable" type="bool">
-			</argument>
 			<description>
+				Deprecated soon.
 			</description>
 		</method>
 		<method name="is_bone_rest_disabled" qualifiers="const">
@@ -35014,91 +35400,67 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="bind_child_node_to_bone">
+		<method name="set_bone_custom_pose">
 			<argument index="0" name="bone_idx" type="int">
 			</argument>
-			<argument index="1" name="node" type="Node">
+			<argument index="1" name="custom_pose" type="Transform">
 			</argument>
 			<description>
-			Deprecated soon.
 			</description>
 		</method>
-		<method name="unbind_child_node_from_bone">
+		<method name="set_bone_disable_rest">
 			<argument index="0" name="bone_idx" type="int">
 			</argument>
-			<argument index="1" name="node" type="Node">
+			<argument index="1" name="disable" type="bool">
 			</argument>
 			<description>
-			Deprecated soon.
 			</description>
 		</method>
-		<method name="get_bound_child_nodes_to_bone" qualifiers="const">
-			<return type="Array">
-			</return>
+		<method name="set_bone_global_pose">
 			<argument index="0" name="bone_idx" type="int">
 			</argument>
-			<description>
-			Deprecated soon.
-			</description>
-		</method>
-		<method name="clear_bones">
-			<description>
-			Clear all the bones in this skeleton.
-			</description>
-		</method>
-		<method name="get_bone_pose" qualifiers="const">
-			<return type="Transform">
-			</return>
-			<argument index="0" name="bone_idx" type="int">
+			<argument index="1" name="pose" type="Transform">
 			</argument>
 			<description>
-			Return the pose transform for bone "bone_idx".
 			</description>
 		</method>
-		<method name="set_bone_pose">
+		<method name="set_bone_parent">
 			<argument index="0" name="bone_idx" type="int">
 			</argument>
-			<argument index="1" name="pose" type="Transform">
+			<argument index="1" name="parent_idx" type="int">
 			</argument>
 			<description>
-			Return the pose transform for bone "bone_idx".
+				Set the bone index "parent_idx" as the parent of the bone at "bone_idx". If -1, then bone has no parent. Note: "parent_idx" must be less than "bone_idx".
 			</description>
 		</method>
-		<method name="set_bone_global_pose">
+		<method name="set_bone_pose">
 			<argument index="0" name="bone_idx" type="int">
 			</argument>
 			<argument index="1" name="pose" type="Transform">
 			</argument>
 			<description>
+				Return the pose transform for bone "bone_idx".
 			</description>
 		</method>
-		<method name="get_bone_global_pose" qualifiers="const">
-			<return type="Transform">
-			</return>
+		<method name="set_bone_rest">
 			<argument index="0" name="bone_idx" type="int">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_bone_custom_pose" qualifiers="const">
-			<return type="Transform">
-			</return>
-			<argument index="0" name="bone_idx" type="int">
+			<argument index="1" name="rest" type="Transform">
 			</argument>
 			<description>
+				Set the rest transform for bone "bone_idx"
 			</description>
 		</method>
-		<method name="set_bone_custom_pose">
+		<method name="unbind_child_node_from_bone">
 			<argument index="0" name="bone_idx" type="int">
 			</argument>
-			<argument index="1" name="custom_pose" type="Transform">
+			<argument index="1" name="node" type="Node">
 			</argument>
 			<description>
+				Deprecated soon.
 			</description>
 		</method>
-		<method name="get_bone_transform" qualifiers="const">
-			<return type="Transform">
-			</return>
+		<method name="unparent_bone_and_rest">
 			<argument index="0" name="bone_idx" type="int">
 			</argument>
 			<description>
@@ -35112,38 +35474,38 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Slider" inherits="Range" category="Core">
 	<brief_description>
-	Base class for GUI Sliders.
+		Base class for GUI Sliders.
 	</brief_description>
 	<description>
-	Base class for GUI Sliders.
+		Base class for GUI Sliders.
 	</description>
 	<methods>
-		<method name="set_ticks">
-			<argument index="0" name="count" type="int">
-			</argument>
-			<description>
-			Set amount of ticks to display in slider.
-			</description>
-		</method>
 		<method name="get_ticks" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return amounts of ticks to display on slider.
+				Return amounts of ticks to display on slider.
 			</description>
 		</method>
 		<method name="get_ticks_on_borders" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if ticks are visible on borders.
+				Return true if ticks are visible on borders.
+			</description>
+		</method>
+		<method name="set_ticks">
+			<argument index="0" name="count" type="int">
+			</argument>
+			<description>
+				Set amount of ticks to display in slider.
 			</description>
 		</method>
 		<method name="set_ticks_on_borders">
 			<argument index="0" name="ticks_on_border" type="bool">
 			</argument>
 			<description>
-			Set true if ticks are visible on borders.
+				Set true if ticks are visible on borders.
 			</description>
 		</method>
 	</methods>
@@ -35156,19 +35518,19 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_param">
+		<method name="get_param" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="param" type="int">
 			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_param" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_param">
 			<argument index="0" name="param" type="int">
 			</argument>
+			<argument index="1" name="value" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -35224,25 +35586,25 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="SoundPlayer2D" inherits="Node2D" category="Core">
 	<brief_description>
-	Base class for playing spatial 2D sound.
+		Base class for playing spatial 2D sound.
 	</brief_description>
 	<description>
-	Base class for playing spatial 2D sound.
+		Base class for playing spatial 2D sound.
 	</description>
 	<methods>
-		<method name="set_param">
+		<method name="get_param" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="param" type="int">
 			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_param" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_param">
 			<argument index="0" name="param" type="int">
 			</argument>
+			<argument index="1" name="value" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -35268,14 +35630,6 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_param">
-			<argument index="0" name="param" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_param" qualifiers="const">
 			<return type="float">
 			</return>
@@ -35284,14 +35638,14 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="set_reverb_mode">
-			<argument index="0" name="reverb_mode" type="int">
-			</argument>
+		<method name="get_reverb_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_reverb_mode" qualifiers="const">
-			<return type="int">
+		<method name="is_forcing_params_to_all_sources">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
@@ -35302,9 +35656,17 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="is_forcing_params_to_all_sources">
-			<return type="bool">
-			</return>
+		<method name="set_param">
+			<argument index="0" name="param" type="int">
+			</argument>
+			<argument index="1" name="value" type="float">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_reverb_mode">
+			<argument index="0" name="reverb_mode" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -35314,104 +35676,96 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Spatial" inherits="Node" category="Core">
 	<brief_description>
-	Base class for all 3D nodes.
+		Base class for all 3D nodes.
 	</brief_description>
 	<description>
-	Spatial is the base for every type of 3D [Node]. It contains a 3D [Transform] which can be set or get as local or global. If a Spatial [Node] has Spatial children, their transforms will be relative to the parent.
+		Spatial is the base for every type of 3D [Node]. It contains a 3D [Transform] which can be set or get as local or global. If a Spatial [Node] has Spatial children, their transforms will be relative to the parent.
 	</description>
 	<methods>
-		<method name="set_transform">
-			<argument index="0" name="local" type="Transform">
-			</argument>
+		<method name="get_gizmo" qualifiers="const">
+			<return type="SpatialGizmo">
+			</return>
 			<description>
-			Set the transform locally, relative to the parent spatial node.
 			</description>
 		</method>
-		<method name="get_transform" qualifiers="const">
+		<method name="get_global_transform" qualifiers="const">
 			<return type="Transform">
 			</return>
 			<description>
-			Return the local transform, relative to the bone parent.
+				Return the global transform, relative to worldspace.
 			</description>
 		</method>
-		<method name="set_translation">
-			<argument index="0" name="translation" type="Vector3">
-			</argument>
+		<method name="get_parent_spatial" qualifiers="const">
+			<return type="Object">
+			</return>
 			<description>
+				Return the parent [Spatial], or an empty [Object] if no parent exists or parent is not of type [Spatial].
 			</description>
 		</method>
-		<method name="get_translation" qualifiers="const">
+		<method name="get_rotation" qualifiers="const">
 			<return type="Vector3">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_rotation">
-			<argument index="0" name="rotation_rad" type="Vector3">
-			</argument>
+		<method name="get_rotation_deg" qualifiers="const">
+			<return type="Vector3">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_rotation" qualifiers="const">
+		<method name="get_scale" qualifiers="const">
 			<return type="Vector3">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_rotation_deg">
-			<argument index="0" name="rotation_deg" type="Vector3">
-			</argument>
+		<method name="get_transform" qualifiers="const">
+			<return type="Transform">
+			</return>
 			<description>
+				Return the local transform, relative to the bone parent.
 			</description>
 		</method>
-		<method name="get_rotation_deg" qualifiers="const">
+		<method name="get_translation" qualifiers="const">
 			<return type="Vector3">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_scale">
-			<argument index="0" name="scale" type="Vector3">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_scale" qualifiers="const">
-			<return type="Vector3">
+		<method name="get_world" qualifiers="const">
+			<return type="World">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_global_transform">
-			<argument index="0" name="global" type="Transform">
+		<method name="global_rotate">
+			<argument index="0" name="normal" type="Vector3">
+			</argument>
+			<argument index="1" name="radians" type="float">
 			</argument>
 			<description>
-			Set the transform globally, relative to worldspace.
 			</description>
 		</method>
-		<method name="get_global_transform" qualifiers="const">
-			<return type="Transform">
-			</return>
+		<method name="global_translate">
+			<argument index="0" name="offset" type="Vector3">
+			</argument>
 			<description>
-			Return the global transform, relative to worldspace.
 			</description>
 		</method>
-		<method name="get_parent_spatial" qualifiers="const">
-			<return type="Object">
-			</return>
+		<method name="hide">
 			<description>
-			Return the parent [Spatial], or an empty [Object] if no parent exists or parent is not of type [Spatial].
 			</description>
 		</method>
-		<method name="set_ignore_transform_notification">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
+		<method name="is_hidden" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_as_toplevel">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="is_local_transform_notification_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -35421,135 +35775,143 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_world" qualifiers="const">
-			<return type="World">
+		<method name="is_visible" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="update_gizmo">
+		<method name="look_at">
+			<argument index="0" name="target" type="Vector3">
+			</argument>
+			<argument index="1" name="up" type="Vector3">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_gizmo">
-			<argument index="0" name="gizmo" type="SpatialGizmo">
+		<method name="look_at_from_pos">
+			<argument index="0" name="pos" type="Vector3">
+			</argument>
+			<argument index="1" name="target" type="Vector3">
+			</argument>
+			<argument index="2" name="up" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_gizmo" qualifiers="const">
-			<return type="SpatialGizmo">
-			</return>
+		<method name="orthonormalize">
 			<description>
 			</description>
 		</method>
-		<method name="show">
+		<method name="rotate">
+			<argument index="0" name="normal" type="Vector3">
+			</argument>
+			<argument index="1" name="radians" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="hide">
+		<method name="rotate_x">
+			<argument index="0" name="radians" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_visible" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="rotate_y">
+			<argument index="0" name="radians" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_hidden" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="rotate_z">
+			<argument index="0" name="radians" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_hidden">
-			<argument index="0" name="hidden" type="bool">
+		<method name="set_as_toplevel">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_notify_local_transform">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_gizmo">
+			<argument index="0" name="gizmo" type="SpatialGizmo">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_local_transform_notification_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_global_transform">
+			<argument index="0" name="global" type="Transform">
+			</argument>
 			<description>
+				Set the transform globally, relative to worldspace.
 			</description>
 		</method>
-		<method name="rotate">
-			<argument index="0" name="normal" type="Vector3">
-			</argument>
-			<argument index="1" name="radians" type="float">
+		<method name="set_hidden">
+			<argument index="0" name="hidden" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="global_rotate">
-			<argument index="0" name="normal" type="Vector3">
-			</argument>
-			<argument index="1" name="radians" type="float">
+		<method name="set_identity">
+			<description>
+			</description>
+		</method>
+		<method name="set_ignore_transform_notification">
+			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="rotate_x">
-			<argument index="0" name="radians" type="float">
+		<method name="set_notify_local_transform">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="rotate_y">
-			<argument index="0" name="radians" type="float">
+		<method name="set_rotation">
+			<argument index="0" name="rotation_rad" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="rotate_z">
-			<argument index="0" name="radians" type="float">
+		<method name="set_rotation_deg">
+			<argument index="0" name="rotation_deg" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="translate">
-			<argument index="0" name="offset" type="Vector3">
+		<method name="set_scale">
+			<argument index="0" name="scale" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="global_translate">
-			<argument index="0" name="offset" type="Vector3">
+		<method name="set_transform">
+			<argument index="0" name="local" type="Transform">
 			</argument>
 			<description>
+				Set the transform locally, relative to the parent spatial node.
 			</description>
 		</method>
-		<method name="orthonormalize">
+		<method name="set_translation">
+			<argument index="0" name="translation" type="Vector3">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_identity">
+		<method name="show">
 			<description>
 			</description>
 		</method>
-		<method name="look_at">
-			<argument index="0" name="target" type="Vector3">
-			</argument>
-			<argument index="1" name="up" type="Vector3">
+		<method name="translate">
+			<argument index="0" name="offset" type="Vector3">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="look_at_from_pos">
-			<argument index="0" name="pos" type="Vector3">
-			</argument>
-			<argument index="1" name="target" type="Vector3">
-			</argument>
-			<argument index="2" name="up" type="Vector3">
-			</argument>
+		<method name="update_gizmo">
 			<description>
 			</description>
 		</method>
@@ -35588,19 +35950,19 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_param">
+		<method name="get_param" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="param" type="int">
 			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_param" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_param">
 			<argument index="0" name="param" type="int">
 			</argument>
+			<argument index="1" name="value" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -35630,9 +35992,9 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_sample_library">
-			<argument index="0" name="library" type="SampleLibrary">
-			</argument>
+		<method name="get_polyphony" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -35642,15 +36004,11 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="set_polyphony">
-			<argument index="0" name="voices" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_polyphony" qualifiers="const">
-			<return type="int">
+		<method name="is_voice_active" qualifiers="const">
+			<return type="bool">
 			</return>
+			<argument index="0" name="voice" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -35664,37 +36022,41 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="voice_set_pitch_scale">
-			<argument index="0" name="voice" type="int">
-			</argument>
-			<argument index="1" name="ratio" type="float">
+		<method name="set_polyphony">
+			<argument index="0" name="voices" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="voice_set_volume_scale_db">
-			<argument index="0" name="voice" type="int">
-			</argument>
-			<argument index="1" name="db" type="float">
+		<method name="set_sample_library">
+			<argument index="0" name="library" type="SampleLibrary">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_voice_active" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="stop_all">
+			<description>
+			</description>
+		</method>
+		<method name="stop_voice">
 			<argument index="0" name="voice" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="stop_voice">
+		<method name="voice_set_pitch_scale">
 			<argument index="0" name="voice" type="int">
 			</argument>
+			<argument index="1" name="ratio" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="stop_all">
+		<method name="voice_set_volume_scale_db">
+			<argument index="0" name="voice" type="int">
+			</argument>
+			<argument index="1" name="db" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -35708,10 +36070,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="SpatialSound2DServer" inherits="Object" category="Core">
 	<brief_description>
-	Server for Spatial 2D Sound.
+		Server for Spatial 2D Sound.
 	</brief_description>
 	<description>
-	Server for Spatial 2D Sound.
+		Server for Spatial 2D Sound.
 	</description>
 	<methods>
 	</methods>
@@ -35754,145 +36116,145 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_stream">
-			<argument index="0" name="stream" type="AudioStream">
-			</argument>
+		<method name="get_buffering_msec" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_stream" qualifiers="const">
-			<return type="AudioStream">
+		<method name="get_length" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="play">
-			<argument index="0" name="offset" type="float" default="0">
-			</argument>
+		<method name="get_loop_count" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="stop">
+		<method name="get_loop_restart_time" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="is_playing" qualifiers="const">
-			<return type="bool">
+		<method name="get_pos" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_paused">
-			<argument index="0" name="paused" type="bool">
-			</argument>
+		<method name="get_stream" qualifiers="const">
+			<return type="AudioStream">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="is_paused" qualifiers="const">
-			<return type="bool">
+		<method name="get_stream_name" qualifiers="const">
+			<return type="String">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_loop">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
+		<method name="get_volume" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="has_loop" qualifiers="const">
-			<return type="bool">
+		<method name="get_volume_db" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_volume">
-			<argument index="0" name="volume" type="float">
-			</argument>
+		<method name="has_autoplay" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_volume" qualifiers="const">
-			<return type="float">
+		<method name="has_loop" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_volume_db">
-			<argument index="0" name="db" type="float">
-			</argument>
+		<method name="is_paused" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_volume_db" qualifiers="const">
-			<return type="float">
+		<method name="is_playing" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_buffering_msec">
-			<argument index="0" name="msec" type="int">
+		<method name="play">
+			<argument index="0" name="offset" type="float" default="0">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_buffering_msec" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="seek_pos">
+			<argument index="0" name="time" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_loop_restart_time">
-			<argument index="0" name="secs" type="float">
+		<method name="set_autoplay">
+			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_loop_restart_time" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_buffering_msec">
+			<argument index="0" name="msec" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_stream_name" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="set_loop">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_loop_count" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_loop_restart_time">
+			<argument index="0" name="secs" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_pos" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_paused">
+			<argument index="0" name="paused" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="seek_pos">
-			<argument index="0" name="time" type="float">
+		<method name="set_stream">
+			<argument index="0" name="stream" type="AudioStream">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_autoplay">
-			<argument index="0" name="enabled" type="bool">
+		<method name="set_volume">
+			<argument index="0" name="volume" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="has_autoplay" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_volume_db">
+			<argument index="0" name="db" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_length" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="stop">
 			<description>
 			</description>
 		</method>
@@ -35906,75 +36268,75 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_radius">
-			<argument index="0" name="radius" type="float">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_radius" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
+		<method name="set_radius">
+			<argument index="0" name="radius" type="float">
+			</argument>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<constants>
 	</constants>
 </class>
 <class name="SpinBox" inherits="Range" category="Core">
 	<brief_description>
-	Numerical input text field.
+		Numerical input text field.
 	</brief_description>
 	<description>
-	SpinBox is a numerical input text field. It allows entering integers and floats.
+		SpinBox is a numerical input text field. It allows entering integers and floats.
 	</description>
 	<methods>
-		<method name="set_suffix">
-			<argument index="0" name="suffix" type="String">
-			</argument>
+		<method name="get_line_edit">
+			<return type="Object">
+			</return>
 			<description>
-			Set a specific suffix.
 			</description>
 		</method>
-		<method name="get_suffix" qualifiers="const">
+		<method name="get_prefix" qualifiers="const">
 			<return type="String">
 			</return>
 			<description>
-			Return the specific suffix.
 			</description>
 		</method>
-		<method name="set_prefix">
-			<argument index="0" name="prefix" type="String">
-			</argument>
+		<method name="get_suffix" qualifiers="const">
+			<return type="String">
+			</return>
 			<description>
-			Set a prefix.
+				Return the specific suffix.
 			</description>
 		</method>
-		<method name="get_prefix" qualifiers="const">
-			<return type="String">
+		<method name="is_editable" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
+				Return if the spinbox is editable.
 			</description>
 		</method>
 		<method name="set_editable">
 			<argument index="0" name="editable" type="bool">
 			</argument>
 			<description>
-			Set whether the spinbox is editable.
+				Set whether the spinbox is editable.
 			</description>
 		</method>
-		<method name="is_editable" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_prefix">
+			<argument index="0" name="prefix" type="String">
+			</argument>
 			<description>
-			Return if the spinbox is editable.
+				Set a prefix.
 			</description>
 		</method>
-		<method name="get_line_edit">
-			<return type="Object">
-			</return>
+		<method name="set_suffix">
+			<argument index="0" name="suffix" type="String">
+			</argument>
 			<description>
+				Set a specific suffix.
 			</description>
 		</method>
 	</methods>
@@ -35987,52 +36349,52 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="SplitContainer" inherits="Container" category="Core">
 	<brief_description>
-	Container for splitting and adjusting.
+		Container for splitting and adjusting.
 	</brief_description>
 	<description>
-	Container for splitting two controls vertically or horizontally, with a grabber that allows adjusting the split offset or ratio.
+		Container for splitting two controls vertically or horizontally, with a grabber that allows adjusting the split offset or ratio.
 	</description>
 	<methods>
-		<method name="set_split_offset">
-			<argument index="0" name="offset" type="int">
-			</argument>
+		<method name="get_dragger_visibility" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the split offset.
+				Return visibility of the split dragger(One of [DRAGGER_VISIBLE], [DRAGGER_HIDDEN] or [DRAGGER_HIDDEN_COLLAPSED]).
 			</description>
 		</method>
 		<method name="get_split_offset" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the split offset.
-			</description>
-		</method>
-		<method name="set_collapsed">
-			<argument index="0" name="collapsed" type="bool">
-			</argument>
-			<description>
-			Set if the split must be collapsed.
+				Return the split offset.
 			</description>
 		</method>
 		<method name="is_collapsed" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if the split is collapsed.
+				Return true if the split is collapsed.
+			</description>
+		</method>
+		<method name="set_collapsed">
+			<argument index="0" name="collapsed" type="bool">
+			</argument>
+			<description>
+				Set if the split must be collapsed.
 			</description>
 		</method>
 		<method name="set_dragger_visibility">
 			<argument index="0" name="mode" type="int">
 			</argument>
 			<description>
-			Set visibility of the split dragger([i]mode[/i] must be one of [DRAGGER_VISIBLE], [DRAGGER_HIDDEN] or [DRAGGER_HIDDEN_COLLAPSED]).
+				Set visibility of the split dragger([i]mode[/i] must be one of [DRAGGER_VISIBLE], [DRAGGER_HIDDEN] or [DRAGGER_HIDDEN_COLLAPSED]).
 			</description>
 		</method>
-		<method name="get_dragger_visibility" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_split_offset">
+			<argument index="0" name="offset" type="int">
+			</argument>
 			<description>
-			Return visibility of the split dragger(One of [DRAGGER_VISIBLE], [DRAGGER_HIDDEN] or [DRAGGER_HIDDEN_COLLAPSED]).
+				Set the split offset.
 			</description>
 		</method>
 	</methods>
@@ -36041,7 +36403,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="offset" type="int">
 			</argument>
 			<description>
-			Emmited when the dragger is gragged by user.
+				Emmited when the dragger is gragged by user.
 			</description>
 		</signal>
 	</signals>
@@ -36059,10 +36421,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="SpotLight" inherits="Light" category="Core">
 	<brief_description>
-	Spotlight [Light], such as a reflector spotlight or a lantern.
+		Spotlight [Light], such as a reflector spotlight or a lantern.
 	</brief_description>
 	<description>
-	A SpotLight light is a type of [Light] node that emits lights in a specific direction, in the shape of a cone. The light is attenuated through the distance and this attenuation can be configured by changing the energy, radius and attenuation parameters of [Light]. TODO: Image of a spotlight.
+		A SpotLight light is a type of [Light] node that emits lights in a specific direction, in the shape of a cone. The light is attenuated through the distance and this attenuation can be configured by changing the energy, radius and attenuation parameters of [Light]. TODO: Image of a spotlight.
 	</description>
 	<methods>
 	</methods>
@@ -36071,164 +36433,164 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Sprite" inherits="Node2D" category="Core">
 	<brief_description>
-	General purpose Sprite node.
+		General purpose Sprite node.
 	</brief_description>
 	<description>
-	General purpose Sprite node. This Sprite node can show any texture as a sprite. The texture can be used as a spritesheet for animation, or only a region from a bigger texture can referenced, like an atlas.
+		General purpose Sprite node. This Sprite node can show any texture as a sprite. The texture can be used as a spritesheet for animation, or only a region from a bigger texture can referenced, like an atlas.
 	</description>
 	<methods>
-		<method name="set_texture">
-			<argument index="0" name="texture" type="Texture">
-			</argument>
+		<method name="get_frame" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the base texture for the sprite.
+				Return the texture frame for a sprite-sheet, works when vframes or hframes are greater than 1.
 			</description>
 		</method>
-		<method name="get_texture" qualifiers="const">
-			<return type="Texture">
+		<method name="get_hframes" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the base texture for the sprite.
+				Return the amount of horizontal frames. See [method set_hframes].
 			</description>
 		</method>
-		<method name="set_centered">
-			<argument index="0" name="centered" type="bool">
-			</argument>
+		<method name="get_modulate" qualifiers="const">
+			<return type="Color">
+			</return>
 			<description>
-			Set whether the sprite should be centered on the origin.
+				Return color modulation for the sprite. All sprite pixels are multiplied by this color.
 			</description>
 		</method>
-		<method name="is_centered" qualifiers="const">
-			<return type="bool">
+		<method name="get_offset" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<description>
-			Return if the sprite is centered at the local origin.
+				Return sprite draw offset.
 			</description>
 		</method>
-		<method name="set_offset">
-			<argument index="0" name="offset" type="Vector2">
-			</argument>
+		<method name="get_region_rect" qualifiers="const">
+			<return type="Rect2">
+			</return>
 			<description>
-			Set the sprite draw offset, useful for setting rotation pivots.
+				Return the region rect to read from.
 			</description>
 		</method>
-		<method name="get_offset" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_texture" qualifiers="const">
+			<return type="Texture">
 			</return>
 			<description>
-			Return sprite draw offset.
+				Return the base texture for the sprite.
 			</description>
 		</method>
-		<method name="set_flip_h">
-			<argument index="0" name="flip_h" type="bool">
-			</argument>
+		<method name="get_vframes" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set true to flip the sprite horizontally.
+				Return the amount of vertical frames. See [method set_vframes].
 			</description>
 		</method>
-		<method name="is_flipped_h" qualifiers="const">
+		<method name="is_centered" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if the sprite is flipped horizontally.
+				Return if the sprite is centered at the local origin.
 			</description>
 		</method>
-		<method name="set_flip_v">
-			<argument index="0" name="flip_v" type="bool">
-			</argument>
+		<method name="is_flipped_h" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set true to flip the sprite vertically.
+				Return true if the sprite is flipped horizontally.
 			</description>
 		</method>
 		<method name="is_flipped_v" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if the sprite is flipped vertically.
-			</description>
-		</method>
-		<method name="set_region">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
-			<description>
-			Set the sprite as a sub-region of a bigger texture. Useful for texture-atlases.
+				Return true if the sprite is flipped vertically.
 			</description>
 		</method>
 		<method name="is_region" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return if the sprite reads from a region.
+				Return if the sprite reads from a region.
 			</description>
 		</method>
-		<method name="set_region_rect">
-			<argument index="0" name="rect" type="Rect2">
+		<method name="set_centered">
+			<argument index="0" name="centered" type="bool">
 			</argument>
 			<description>
-			Set the region rect to read from.
+				Set whether the sprite should be centered on the origin.
 			</description>
 		</method>
-		<method name="get_region_rect" qualifiers="const">
-			<return type="Rect2">
-			</return>
+		<method name="set_flip_h">
+			<argument index="0" name="flip_h" type="bool">
+			</argument>
 			<description>
-			Return the region rect to read from.
+				Set true to flip the sprite horizontally.
+			</description>
+		</method>
+		<method name="set_flip_v">
+			<argument index="0" name="flip_v" type="bool">
+			</argument>
+			<description>
+				Set true to flip the sprite vertically.
 			</description>
 		</method>
 		<method name="set_frame">
 			<argument index="0" name="frame" type="int">
 			</argument>
 			<description>
-			Set the texture frame for a sprite-sheet, works when vframes or hframes are greater than 1.
+				Set the texture frame for a sprite-sheet, works when vframes or hframes are greater than 1.
 			</description>
 		</method>
-		<method name="get_frame" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_hframes">
+			<argument index="0" name="hframes" type="int">
+			</argument>
 			<description>
-			Return the texture frame for a sprite-sheet, works when vframes or hframes are greater than 1.
+				Set the amount of horizontal frames and converts the sprite into a sprite-sheet. This is useful for animation.
 			</description>
 		</method>
-		<method name="set_vframes">
-			<argument index="0" name="vframes" type="int">
+		<method name="set_modulate">
+			<argument index="0" name="modulate" type="Color">
 			</argument>
 			<description>
-			Set the amount of vertical frames and converts the sprite into a sprite-sheet. This is useful for animation.
+				Set color modulation for the sprite. All sprite pixels are multiplied by this color.  Color may contain rgb values above 1 to achieve a highlight effect.
 			</description>
 		</method>
-		<method name="get_vframes" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_offset">
+			<argument index="0" name="offset" type="Vector2">
+			</argument>
 			<description>
-			Return the amount of vertical frames. See [method set_vframes].
+				Set the sprite draw offset, useful for setting rotation pivots.
 			</description>
 		</method>
-		<method name="set_hframes">
-			<argument index="0" name="hframes" type="int">
+		<method name="set_region">
+			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
-			Set the amount of horizontal frames and converts the sprite into a sprite-sheet. This is useful for animation.
+				Set the sprite as a sub-region of a bigger texture. Useful for texture-atlases.
 			</description>
 		</method>
-		<method name="get_hframes" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_region_rect">
+			<argument index="0" name="rect" type="Rect2">
+			</argument>
 			<description>
-			Return the amount of horizontal frames. See [method set_hframes].
+				Set the region rect to read from.
 			</description>
 		</method>
-		<method name="set_modulate">
-			<argument index="0" name="modulate" type="Color">
+		<method name="set_texture">
+			<argument index="0" name="texture" type="Texture">
 			</argument>
 			<description>
-			Set color modulation for the sprite. All sprite pixels are multiplied by this color.  Color may contain rgb values above 1 to achieve a highlight effect.
+				Set the base texture for the sprite.
 			</description>
 		</method>
-		<method name="get_modulate" qualifiers="const">
-			<return type="Color">
-			</return>
+		<method name="set_vframes">
+			<argument index="0" name="vframes" type="int">
+			</argument>
 			<description>
-			Return color modulation for the sprite. All sprite pixels are multiplied by this color.
+				Set the amount of vertical frames and converts the sprite into a sprite-sheet. This is useful for animation.
 			</description>
 		</method>
 	</methods>
@@ -36237,6 +36599,10 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</signal>
+		<signal name="texture_changed">
+			<description>
+			</description>
+		</signal>
 	</signals>
 	<constants>
 	</constants>
@@ -36247,38 +36613,38 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_texture">
-			<argument index="0" name="texture" type="Texture">
-			</argument>
+		<method name="get_frame" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_texture" qualifiers="const">
-			<return type="Texture">
+		<method name="get_hframes" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_region">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
+		<method name="get_region_rect" qualifiers="const">
+			<return type="Rect2">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="is_region" qualifiers="const">
-			<return type="bool">
+		<method name="get_texture" qualifiers="const">
+			<return type="Texture">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_region_rect">
-			<argument index="0" name="rect" type="Rect2">
-			</argument>
+		<method name="get_vframes" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_region_rect" qualifiers="const">
-			<return type="Rect2">
+		<method name="is_region" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
@@ -36289,33 +36655,33 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_frame" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_hframes">
+			<argument index="0" name="hframes" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_vframes">
-			<argument index="0" name="vframes" type="int">
+		<method name="set_region">
+			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_vframes" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_region_rect">
+			<argument index="0" name="rect" type="Rect2">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_hframes">
-			<argument index="0" name="hframes" type="int">
+		<method name="set_texture">
+			<argument index="0" name="texture" type="Texture">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_hframes" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_vframes">
+			<argument index="0" name="vframes" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -36335,99 +36701,89 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_centered">
-			<argument index="0" name="centered" type="bool">
-			</argument>
+		<method name="get_alpha_cut_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="is_centered" qualifiers="const">
-			<return type="bool">
+		<method name="get_axis" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_offset">
-			<argument index="0" name="offset" type="Vector2">
+		<method name="get_draw_flag" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="flag" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_offset" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_item_rect" qualifiers="const">
+			<return type="Rect2">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_flip_h">
-			<argument index="0" name="flip_h" type="bool">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="is_flipped_h" qualifiers="const">
-			<return type="bool">
+		<method name="get_modulate" qualifiers="const">
+			<return type="Color">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_flip_v">
-			<argument index="0" name="flip_v" type="bool">
-			</argument>
+		<method name="get_offset" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="is_flipped_v" qualifiers="const">
-			<return type="bool">
+		<method name="get_opacity" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_modulate">
-			<argument index="0" name="modulate" type="Color">
-			</argument>
+		<method name="get_pixel_size" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_modulate" qualifiers="const">
-			<return type="Color">
+		<method name="is_centered" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_opacity">
-			<argument index="0" name="opacity" type="float">
-			</argument>
+		<method name="is_flipped_h" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_opacity" qualifiers="const">
-			<return type="float">
+		<method name="is_flipped_v" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_pixel_size">
-			<argument index="0" name="pixel_size" type="float">
+		<method name="set_alpha_cut_mode">
+			<argument index="0" name="mode" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_pixel_size" qualifiers="const">
-			<return type="float">
-			</return>
-			<description>
-			</description>
-		</method>
 		<method name="set_axis">
 			<argument index="0" name="axis" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_axis" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_centered">
+			<argument index="0" name="centered" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -36439,29 +36795,39 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_draw_flag" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="flag" type="int">
+		<method name="set_flip_h">
+			<argument index="0" name="flip_h" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_alpha_cut_mode">
-			<argument index="0" name="mode" type="int">
+		<method name="set_flip_v">
+			<argument index="0" name="flip_v" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_alpha_cut_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_modulate">
+			<argument index="0" name="modulate" type="Color">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_item_rect" qualifiers="const">
-			<return type="Rect2">
-			</return>
+		<method name="set_offset">
+			<argument index="0" name="offset" type="Vector2">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_opacity">
+			<argument index="0" name="opacity" type="float">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_pixel_size">
+			<argument index="0" name="pixel_size" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -36483,10 +36849,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="SpriteFrames" inherits="Resource" category="Core">
 	<brief_description>
-	Sprite frame library for AnimatedSprite.
+		Sprite frame library for AnimatedSprite.
 	</brief_description>
 	<description>
-	Sprite frame library for [AnimatedSprite].
+		Sprite frame library for [AnimatedSprite].
 	</description>
 	<methods>
 		<method name="add_animation">
@@ -36495,33 +36861,31 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="has_animation" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="add_frame">
 			<argument index="0" name="anim" type="String">
 			</argument>
+			<argument index="1" name="frame" type="Object">
+			</argument>
+			<argument index="2" name="atpos" type="int" default="-1">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="remove_animation">
+		<method name="clear">
 			<argument index="0" name="anim" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="rename_animation">
-			<argument index="0" name="anim" type="String">
-			</argument>
-			<argument index="1" name="newname" type="String">
-			</argument>
+		<method name="clear_all">
 			<description>
 			</description>
 		</method>
-		<method name="set_animation_speed">
+		<method name="get_animation_loop" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="anim" type="String">
 			</argument>
-			<argument index="1" name="speed" type="float">
-			</argument>
 			<description>
 			</description>
 		</method>
@@ -36533,43 +36897,39 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="set_animation_loop">
+		<method name="get_frame" qualifiers="const">
+			<return type="Object">
+			</return>
 			<argument index="0" name="anim" type="String">
 			</argument>
-			<argument index="1" name="loop" type="bool">
+			<argument index="1" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_animation_loop" qualifiers="const">
-			<return type="bool">
+		<method name="get_frame_count" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="anim" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="add_frame">
+		<method name="has_animation" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="anim" type="String">
 			</argument>
-			<argument index="1" name="frame" type="Object">
-			</argument>
-			<argument index="2" name="atpos" type="int" default="-1">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_frame_count" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="remove_animation">
 			<argument index="0" name="anim" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_frame" qualifiers="const">
-			<return type="Object">
-			</return>
+		<method name="remove_frame">
 			<argument index="0" name="anim" type="String">
 			</argument>
 			<argument index="1" name="idx" type="int">
@@ -36577,31 +36937,37 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="set_frame">
+		<method name="rename_animation">
 			<argument index="0" name="anim" type="String">
 			</argument>
-			<argument index="1" name="idx" type="int">
-			</argument>
-			<argument index="2" name="txt" type="Object">
+			<argument index="1" name="newname" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="remove_frame">
+		<method name="set_animation_loop">
 			<argument index="0" name="anim" type="String">
 			</argument>
-			<argument index="1" name="idx" type="int">
+			<argument index="1" name="loop" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="clear">
+		<method name="set_animation_speed">
 			<argument index="0" name="anim" type="String">
 			</argument>
+			<argument index="1" name="speed" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="clear_all">
+		<method name="set_frame">
+			<argument index="0" name="anim" type="String">
+			</argument>
+			<argument index="1" name="idx" type="int">
+			</argument>
+			<argument index="2" name="txt" type="Object">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -36611,68 +36977,68 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="StaticBody" inherits="PhysicsBody" category="Core">
 	<brief_description>
-	Static body for 3D Physics.
+		Static body for 3D Physics.
 	</brief_description>
 	<description>
-	Static body for 3D Physics. A static body is a simple body that is not intended to move. They don't consume any CPU resources in contrast to a [RigidBody3D] so they are great for scenario collision.
-	A static body can also be animated by using simulated motion mode. This is useful for implementing functionalities such as moving platforms. When this mode is active the body can be animated and automatically computes linear and angular velocity to apply in that frame and to influence other bodies.
-	Alternatively, a constant linear or angular velocity can be set for the static body, so even if it doesn't move, it affects other bodies as if it was moving (this is useful for simulating conveyor belts or conveyor wheels).
+		Static body for 3D Physics. A static body is a simple body that is not intended to move. They don't consume any CPU resources in contrast to a [RigidBody3D] so they are great for scenario collision.
+		A static body can also be animated by using simulated motion mode. This is useful for implementing functionalities such as moving platforms. When this mode is active the body can be animated and automatically computes linear and angular velocity to apply in that frame and to influence other bodies.
+		Alternatively, a constant linear or angular velocity can be set for the static body, so even if it doesn't move, it affects other bodies as if it was moving (this is useful for simulating conveyor belts or conveyor wheels).
 	</description>
 	<methods>
-		<method name="set_constant_linear_velocity">
-			<argument index="0" name="vel" type="Vector3">
-			</argument>
+		<method name="get_bounce" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set a constant linear velocity for the body. This does not move the body, but affects other bodies touching it, as if it was moving.
+				Return the body bounciness.
 			</description>
 		</method>
-		<method name="set_constant_angular_velocity">
-			<argument index="0" name="vel" type="Vector3">
-			</argument>
+		<method name="get_constant_angular_velocity" qualifiers="const">
+			<return type="Vector3">
+			</return>
 			<description>
-			Set a constant angular velocity for the body. This does not rotate the body, but affects other bodies touching it, as if it was rotating.
+				Return the constant angular velocity for the body.
 			</description>
 		</method>
 		<method name="get_constant_linear_velocity" qualifiers="const">
 			<return type="Vector3">
 			</return>
 			<description>
-			Return the constant linear velocity for the body.
+				Return the constant linear velocity for the body.
 			</description>
 		</method>
-		<method name="get_constant_angular_velocity" qualifiers="const">
-			<return type="Vector3">
+		<method name="get_friction" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return the constant angular velocity for the body.
+				Return the body friction.
 			</description>
 		</method>
-		<method name="set_friction">
-			<argument index="0" name="friction" type="float">
+		<method name="set_bounce">
+			<argument index="0" name="bounce" type="float">
 			</argument>
 			<description>
-			Set the body friction, from 0 (frictionless) to 1 (full friction).
+				Set the body bounciness, from 0 (not bouncy) to 1 (bouncy).
 			</description>
 		</method>
-		<method name="get_friction" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_constant_angular_velocity">
+			<argument index="0" name="vel" type="Vector3">
+			</argument>
 			<description>
-			Return the body friction.
+				Set a constant angular velocity for the body. This does not rotate the body, but affects other bodies touching it, as if it was rotating.
 			</description>
 		</method>
-		<method name="set_bounce">
-			<argument index="0" name="bounce" type="float">
+		<method name="set_constant_linear_velocity">
+			<argument index="0" name="vel" type="Vector3">
 			</argument>
 			<description>
-			Set the body bounciness, from 0 (not bouncy) to 1 (bouncy).
+				Set a constant linear velocity for the body. This does not move the body, but affects other bodies touching it, as if it was moving.
 			</description>
 		</method>
-		<method name="get_bounce" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_friction">
+			<argument index="0" name="friction" type="float">
+			</argument>
 			<description>
-			Return the body bounciness.
+				Set the body friction, from 0 (frictionless) to 1 (full friction).
 			</description>
 		</method>
 	</methods>
@@ -36681,68 +37047,68 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="StaticBody2D" inherits="PhysicsBody2D" category="Core">
 	<brief_description>
-	Static body for 2D Physics.
+		Static body for 2D Physics.
 	</brief_description>
 	<description>
-	Static body for 2D Physics. A static body is a simple body that is not intended to move. They don't consume any CPU resources in contrast to a [RigidBody2D] so they are great for scenario collision.
-	A static body can also be animated by using simulated motion mode. This is useful for implementing functionalities such as moving platforms. When this mode is active the body can be animated and automatically computes linear and angular velocity to apply in that frame and to influence other bodies.
-	Alternatively, a constant linear or angular velocity can be set for the static body, so even if it doesn't move, it affects other bodies as if it was moving (this is useful for simulating conveyor belts or conveyor wheels).
+		Static body for 2D Physics. A static body is a simple body that is not intended to move. They don't consume any CPU resources in contrast to a [RigidBody2D] so they are great for scenario collision.
+		A static body can also be animated by using simulated motion mode. This is useful for implementing functionalities such as moving platforms. When this mode is active the body can be animated and automatically computes linear and angular velocity to apply in that frame and to influence other bodies.
+		Alternatively, a constant linear or angular velocity can be set for the static body, so even if it doesn't move, it affects other bodies as if it was moving (this is useful for simulating conveyor belts or conveyor wheels).
 	</description>
 	<methods>
-		<method name="set_constant_linear_velocity">
-			<argument index="0" name="vel" type="Vector2">
-			</argument>
+		<method name="get_bounce" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set a constant linear velocity for the body. This does not move the body, but affects other bodies touching it, as if it was moving.
+				Return the body bounciness.
 			</description>
 		</method>
-		<method name="set_constant_angular_velocity">
-			<argument index="0" name="vel" type="float">
-			</argument>
+		<method name="get_constant_angular_velocity" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set a constant angular velocity for the body. This does not rotate the body, but affects other bodies touching it, as if it was rotating.
+				Return the constant angular velocity for the body.
 			</description>
 		</method>
 		<method name="get_constant_linear_velocity" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
-			Return the constant linear velocity for the body.
+				Return the constant linear velocity for the body.
 			</description>
 		</method>
-		<method name="get_constant_angular_velocity" qualifiers="const">
+		<method name="get_friction" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the constant angular velocity for the body.
+				Return the body friction.
 			</description>
 		</method>
-		<method name="set_friction">
-			<argument index="0" name="friction" type="float">
+		<method name="set_bounce">
+			<argument index="0" name="bounce" type="float">
 			</argument>
 			<description>
-			Set the body friction, from 0 (frictionless) to 1 (full friction).
+				Set the body bounciness, from 0 (not bouncy) to 1 (bouncy).
 			</description>
 		</method>
-		<method name="get_friction" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_constant_angular_velocity">
+			<argument index="0" name="vel" type="float">
+			</argument>
 			<description>
-			Return the body friction.
+				Set a constant angular velocity for the body. This does not rotate the body, but affects other bodies touching it, as if it was rotating.
 			</description>
 		</method>
-		<method name="set_bounce">
-			<argument index="0" name="bounce" type="float">
+		<method name="set_constant_linear_velocity">
+			<argument index="0" name="vel" type="Vector2">
 			</argument>
 			<description>
-			Set the body bounciness, from 0 (not bouncy) to 1 (bouncy).
+				Set a constant linear velocity for the body. This does not move the body, but affects other bodies touching it, as if it was moving.
 			</description>
 		</method>
-		<method name="get_bounce" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_friction">
+			<argument index="0" name="friction" type="float">
+			</argument>
 			<description>
-			Return the body bounciness.
+				Set the body friction, from 0 (frictionless) to 1 (full friction).
 			</description>
 		</method>
 	</methods>
@@ -36751,246 +37117,246 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="StreamPeer" inherits="Reference" category="Core">
 	<brief_description>
-	Abstraction and base class for stream-based protocols.
+		Abstraction and base class for stream-based protocols.
 	</brief_description>
 	<description>
-	StreamPeer is an abstraction and base class for stream-based protocols (such as TCP or Unix Sockets). It provides an API for sending and receiving data through streams as raw data or strings.
+		StreamPeer is an abstraction and base class for stream-based protocols (such as TCP or Unix Sockets). It provides an API for sending and receiving data through streams as raw data or strings.
 	</description>
 	<methods>
-		<method name="put_data">
+		<method name="get_16">
 			<return type="int">
 			</return>
-			<argument index="0" name="data" type="RawArray">
-			</argument>
 			<description>
-			Send a chunk of data through the connection, blocking if necessary until the data is done sending. This function returns an Error code.
+				Get a signed 16 bit value from the stream.
 			</description>
 		</method>
-		<method name="put_partial_data">
-			<return type="Array">
+		<method name="get_32">
+			<return type="int">
 			</return>
-			<argument index="0" name="data" type="RawArray">
-			</argument>
 			<description>
-			Send a chunk of data through the connection, if all the data could not be sent at once, only part of it will. This function returns two values, an Error code and an integer, describing how much data was actually sent.
+				Get a signed 32 bit value from the stream.
 			</description>
 		</method>
-		<method name="get_data">
-			<return type="Array">
+		<method name="get_64">
+			<return type="int">
 			</return>
-			<argument index="0" name="bytes" type="int">
-			</argument>
 			<description>
-			Return a chunk data with the received bytes. The amount of bytes to be received can be requested in the "bytes" argument. If not enough bytes are available, the function will block until the desired amount is received. This function returns two values, an Error code and a data array.
+				Get a signed 64 bit value from the stream.
 			</description>
 		</method>
-		<method name="get_partial_data">
-			<return type="Array">
+		<method name="get_8">
+			<return type="int">
 			</return>
-			<argument index="0" name="bytes" type="int">
-			</argument>
 			<description>
-			Return a chunk data with the received bytes. The amount of bytes to be received can be requested in the "bytes" argument. If not enough bytes are available, the function will return how many were actually received. This function returns two values, an Error code, and a data array.
+				Get a signed byte from the stream.
 			</description>
 		</method>
 		<method name="get_available_bytes" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the amount of bytes this [StreamPeer] has available.
+				Return the amount of bytes this [StreamPeer] has available.
 			</description>
 		</method>
-		<method name="set_big_endian">
-			<argument index="0" name="enable" type="bool">
+		<method name="get_data">
+			<return type="Array">
+			</return>
+			<argument index="0" name="bytes" type="int">
 			</argument>
 			<description>
-			Set this [StreamPeer] to use big-endian format. Default is false.
+				Return a chunk data with the received bytes. The amount of bytes to be received can be requested in the "bytes" argument. If not enough bytes are available, the function will block until the desired amount is received. This function returns two values, an Error code and a data array.
 			</description>
 		</method>
-		<method name="is_big_endian_enabled" qualifiers="const">
-			<return type="bool">
+		<method name="get_double">
+			<return type="float">
 			</return>
 			<description>
-			Return whether this [StreamPeer] is using big-endian format.
+				Get a double-precision float from the stream.
 			</description>
 		</method>
-		<method name="put_8">
-			<argument index="0" name="val" type="int">
-			</argument>
+		<method name="get_float">
+			<return type="float">
+			</return>
 			<description>
-			Put a signed byte into the stream.
+				Get a single-precision float from the stream.
 			</description>
 		</method>
-		<method name="put_u8">
-			<argument index="0" name="val" type="int">
+		<method name="get_partial_data">
+			<return type="Array">
+			</return>
+			<argument index="0" name="bytes" type="int">
 			</argument>
 			<description>
-			Put an unsigned byte into the stream.
+				Return a chunk data with the received bytes. The amount of bytes to be received can be requested in the "bytes" argument. If not enough bytes are available, the function will return how many were actually received. This function returns two values, an Error code, and a data array.
 			</description>
 		</method>
-		<method name="put_16">
-			<argument index="0" name="val" type="int">
+		<method name="get_string">
+			<return type="String">
+			</return>
+			<argument index="0" name="bytes" type="int">
 			</argument>
 			<description>
-			Put a signed 16 bit value into the stream.
+				Get a string with byte-length "bytes" from the stream.
 			</description>
 		</method>
-		<method name="put_u16">
-			<argument index="0" name="val" type="int">
-			</argument>
+		<method name="get_u16">
+			<return type="int">
+			</return>
 			<description>
-			Put an unsigned 16 bit value into the stream.
+				Get an unsigned 16 bit value from the stream.
 			</description>
 		</method>
-		<method name="put_32">
-			<argument index="0" name="val" type="int">
-			</argument>
+		<method name="get_u32">
+			<return type="int">
+			</return>
 			<description>
-			Put a signed 32 bit value into the stream.
+				Get an unsigned 32 bit value from the stream.
 			</description>
 		</method>
-		<method name="put_u32">
-			<argument index="0" name="val" type="int">
-			</argument>
+		<method name="get_u64">
+			<return type="int">
+			</return>
 			<description>
-			Put an unsigned 32 bit value into the stream.
+				Get an unsigned 16 bit value from the stream.
 			</description>
 		</method>
-		<method name="put_64">
-			<argument index="0" name="val" type="int">
-			</argument>
+		<method name="get_u8">
+			<return type="int">
+			</return>
 			<description>
-			Put a signed 64 bit value into the stream.
+				Get an unsigned byte from the stream.
 			</description>
 		</method>
-		<method name="put_u64">
-			<argument index="0" name="val" type="int">
+		<method name="get_utf8_string">
+			<return type="String">
+			</return>
+			<argument index="0" name="bytes" type="int">
 			</argument>
 			<description>
-			Put an unsigned 64 bit value into the stream.
+				Get an utf8 string with byte-length "bytes" from the stream (this decodes the string sent as utf8).
 			</description>
 		</method>
-		<method name="put_float">
-			<argument index="0" name="val" type="float">
-			</argument>
+		<method name="get_var">
+			<return type="Variant">
+			</return>
 			<description>
-			Put a single-precision float into the stream.
+				Get a Variant from the stream.
 			</description>
 		</method>
-		<method name="put_double">
-			<argument index="0" name="val" type="float">
-			</argument>
+		<method name="is_big_endian_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Put a double-precision float into the stream.
+				Return whether this [StreamPeer] is using big-endian format.
 			</description>
 		</method>
-		<method name="put_utf8_string">
-			<argument index="0" name="val" type="String">
+		<method name="put_16">
+			<argument index="0" name="val" type="int">
 			</argument>
 			<description>
-			Put a zero-terminated utf8 string into the stream.
+				Put a signed 16 bit value into the stream.
 			</description>
 		</method>
-		<method name="put_var">
-			<argument index="0" name="val" type="Variant">
+		<method name="put_32">
+			<argument index="0" name="val" type="int">
 			</argument>
 			<description>
-			Put a Variant into the stream.
+				Put a signed 32 bit value into the stream.
 			</description>
 		</method>
-		<method name="get_8">
-			<return type="int">
-			</return>
+		<method name="put_64">
+			<argument index="0" name="val" type="int">
+			</argument>
 			<description>
-			Get a signed byte from the stream.
+				Put a signed 64 bit value into the stream.
 			</description>
 		</method>
-		<method name="get_u8">
-			<return type="int">
-			</return>
+		<method name="put_8">
+			<argument index="0" name="val" type="int">
+			</argument>
 			<description>
-			Get an unsigned byte from the stream.
+				Put a signed byte into the stream.
 			</description>
 		</method>
-		<method name="get_16">
+		<method name="put_data">
 			<return type="int">
 			</return>
+			<argument index="0" name="data" type="RawArray">
+			</argument>
 			<description>
-			Get a signed 16 bit value from the stream.
+				Send a chunk of data through the connection, blocking if necessary until the data is done sending. This function returns an Error code.
 			</description>
 		</method>
-		<method name="get_u16">
-			<return type="int">
-			</return>
+		<method name="put_double">
+			<argument index="0" name="val" type="float">
+			</argument>
 			<description>
-			Get an unsigned 16 bit value from the stream.
+				Put a double-precision float into the stream.
 			</description>
 		</method>
-		<method name="get_32">
-			<return type="int">
-			</return>
+		<method name="put_float">
+			<argument index="0" name="val" type="float">
+			</argument>
 			<description>
-			Get a signed 32 bit value from the stream.
+				Put a single-precision float into the stream.
 			</description>
 		</method>
-		<method name="get_u32">
-			<return type="int">
+		<method name="put_partial_data">
+			<return type="Array">
 			</return>
+			<argument index="0" name="data" type="RawArray">
+			</argument>
 			<description>
-			Get an unsigned 32 bit value from the stream.
+				Send a chunk of data through the connection, if all the data could not be sent at once, only part of it will. This function returns two values, an Error code and an integer, describing how much data was actually sent.
 			</description>
 		</method>
-		<method name="get_64">
-			<return type="int">
-			</return>
+		<method name="put_u16">
+			<argument index="0" name="val" type="int">
+			</argument>
 			<description>
-			Get a signed 64 bit value from the stream.
+				Put an unsigned 16 bit value into the stream.
 			</description>
 		</method>
-		<method name="get_u64">
-			<return type="int">
-			</return>
+		<method name="put_u32">
+			<argument index="0" name="val" type="int">
+			</argument>
 			<description>
-			Get an unsigned 16 bit value from the stream.
+				Put an unsigned 32 bit value into the stream.
 			</description>
 		</method>
-		<method name="get_float">
-			<return type="float">
-			</return>
+		<method name="put_u64">
+			<argument index="0" name="val" type="int">
+			</argument>
 			<description>
-			Get a single-precision float from the stream.
+				Put an unsigned 64 bit value into the stream.
 			</description>
 		</method>
-		<method name="get_double">
-			<return type="float">
-			</return>
+		<method name="put_u8">
+			<argument index="0" name="val" type="int">
+			</argument>
 			<description>
-			Get a double-precision float from the stream.
+				Put an unsigned byte into the stream.
 			</description>
 		</method>
-		<method name="get_string">
-			<return type="String">
-			</return>
-			<argument index="0" name="bytes" type="int">
+		<method name="put_utf8_string">
+			<argument index="0" name="val" type="String">
 			</argument>
 			<description>
-			Get a string with byte-length "bytes" from the stream.
+				Put a zero-terminated utf8 string into the stream.
 			</description>
 		</method>
-		<method name="get_utf8_string">
-			<return type="String">
-			</return>
-			<argument index="0" name="bytes" type="int">
+		<method name="put_var">
+			<argument index="0" name="val" type="Variant">
 			</argument>
 			<description>
-			Get an utf8 string with byte-length "bytes" from the stream (this decodes the string sent as utf8).
+				Put a Variant into the stream.
 			</description>
 		</method>
-		<method name="get_var">
-			<return type="Variant">
-			</return>
+		<method name="set_big_endian">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Get a Variant from the stream.
+				Set this [StreamPeer] to use big-endian format. Default is false.
 			</description>
 		</method>
 	</methods>
@@ -36999,10 +37365,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="StreamPeerSSL" inherits="StreamPeer" category="Core">
 	<brief_description>
-	SSL Stream peer.
+		SSL Stream peer.
 	</brief_description>
 	<description>
-	SSL Stream peer. This object can be used to connect to SSL servers.
+		SSL Stream peer. This object can be used to connect to SSL servers.
 	</description>
 	<methods>
 		<method name="accept">
@@ -37023,19 +37389,19 @@ This method controls whether the position between two cached points is interpola
 			<argument index="2" name="for_hostname" type="String" default="&quot;&quot;">
 			</argument>
 			<description>
-			Connect to a peer using an underlying [StreamPeer] "stream", when "validate_certs" is true, [StreamPeerSSL] will validate that the certificate presented by the peer matches the "for_hostname".
+				Connect to a peer using an underlying [StreamPeer] "stream", when "validate_certs" is true, [StreamPeerSSL] will validate that the certificate presented by the peer matches the "for_hostname".
 			</description>
 		</method>
-		<method name="get_status" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="disconnect">
 			<description>
-			Return the status of the connection, one of STATUS_* enum.
+				Disconnect from host.
 			</description>
 		</method>
-		<method name="disconnect">
+		<method name="get_status" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Disconnect from host.
+				Return the status of the connection, one of STATUS_* enum.
 			</description>
 		</method>
 	</methods>
@@ -37056,10 +37422,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="StreamPeerTCP" inherits="StreamPeer" category="Core">
 	<brief_description>
-	TCP Stream peer.
+		TCP Stream peer.
 	</brief_description>
 	<description>
-	TCP Stream peer. This object can be used to connect to TCP servers, or also is returned by a tcp server.
+		TCP Stream peer. This object can be used to connect to TCP servers, or also is returned by a tcp server.
 	</description>
 	<methods>
 		<method name="connect">
@@ -37070,40 +37436,40 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="port" type="int">
 			</argument>
 			<description>
-			Connect to the specified IP:port pair. Returns [OK] on success or [FAILED] on failure.
+				Connect to the specified IP:port pair. Returns [OK] on success or [FAILED] on failure.
 			</description>
 		</method>
-		<method name="is_connected" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="disconnect">
 			<description>
-			Return whether this peer is connected. Returns true while connecting and connected.
+				Disconnect from host.
 			</description>
 		</method>
-		<method name="get_status" qualifiers="const">
-			<return type="int">
+		<method name="get_connected_host" qualifiers="const">
+			<return type="String">
 			</return>
 			<description>
-			Return the status of the connection, one of STATUS_* enum.
+				Return the IP of this peer.
 			</description>
 		</method>
-		<method name="get_connected_host" qualifiers="const">
-			<return type="String">
+		<method name="get_connected_port" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the IP of this peer.
+				Return the port of this peer.
 			</description>
 		</method>
-		<method name="get_connected_port" qualifiers="const">
+		<method name="get_status" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the port of this peer.
+				Return the status of the connection, one of STATUS_* enum.
 			</description>
 		</method>
-		<method name="disconnect">
+		<method name="is_connected" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Disconnect from host.
+				Return whether this peer is connected. Returns true while connecting and connected.
 			</description>
 		</method>
 	</methods>
@@ -37124,184 +37490,184 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="StreamPlayer" inherits="Node" category="Core">
 	<brief_description>
-	Base class for audio stream playback.
+		Base class for audio stream playback.
 	</brief_description>
 	<description>
-	Base class for audio stream playback. Audio stream players inherit from it.
+		Base class for audio stream playback. Audio stream players inherit from it.
 	</description>
 	<methods>
-		<method name="set_stream">
-			<argument index="0" name="stream" type="AudioStream">
-			</argument>
+		<method name="get_buffering_msec" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the [EventStream] this player will play.
+				Return the size of the audio buffer.
 			</description>
 		</method>
-		<method name="get_stream" qualifiers="const">
-			<return type="AudioStream">
+		<method name="get_length" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return the currently assigned stream.
+				Return the length of the stream, in seconds.
 			</description>
 		</method>
-		<method name="play">
-			<argument index="0" name="offset" type="float" default="0">
-			</argument>
+		<method name="get_loop_count" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Play the currently assigned stream, starting from a given position (in seconds).
+				Return the number of times the playback has looped.
 			</description>
 		</method>
-		<method name="stop">
+		<method name="get_loop_restart_time" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Stop the playback.
+				Return the point in time the stream will rewind to, when looping.
 			</description>
 		</method>
-		<method name="is_playing" qualifiers="const">
-			<return type="bool">
+		<method name="get_pos" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return whether this player is playing.
+				Return the playback position, in seconds.
 			</description>
 		</method>
-		<method name="set_paused">
-			<argument index="0" name="paused" type="bool">
-			</argument>
+		<method name="get_stream" qualifiers="const">
+			<return type="AudioStream">
+			</return>
 			<description>
-			Pause stream playback.
+				Return the currently assigned stream.
 			</description>
 		</method>
-		<method name="is_paused" qualifiers="const">
-			<return type="bool">
+		<method name="get_stream_name" qualifiers="const">
+			<return type="String">
 			</return>
 			<description>
-			Return whether the playback is currently paused.
+				Return the name of the currently assigned stream. This is not the file name, but a field inside the file. If no stream is assigned, if returns "&lt;No Stream&gt;".
 			</description>
 		</method>
-		<method name="set_loop">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
+		<method name="get_volume" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set whether the stream will be restarted at the end.
+				Return the playback volume for this player.
 			</description>
 		</method>
-		<method name="has_loop" qualifiers="const">
-			<return type="bool">
+		<method name="get_volume_db" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return whether the stream will be restarted at the end.
+				Return the playback volume for this player, in decibels.
 			</description>
 		</method>
-		<method name="set_volume">
-			<argument index="0" name="volume" type="float">
-			</argument>
+		<method name="has_autoplay" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the playback volume for this player. This is a float between 0.0 (silent) and 1.0 (full volume). Values over 1.0 will amplify sound even more, but may introduce distortion. Negative values will just invert the output waveform, which produces no audible difference.
+				Return whether this player will start playing as soon as it enters the scene tree.
 			</description>
 		</method>
-		<method name="get_volume" qualifiers="const">
-			<return type="float">
+		<method name="has_loop" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the playback volume for this player.
+				Return whether the stream will be restarted at the end.
 			</description>
 		</method>
-		<method name="set_volume_db">
-			<argument index="0" name="db" type="float">
-			</argument>
+		<method name="is_paused" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the playback volume for this player, in decibels. This is a float between -80.0 (silent) and 0.0 (full volume). Values under -79.0 get truncated to -80, but values over 0.0 do not, so the warnings for overamplifying (see [method set_volume]) still apply.
+				Return whether the playback is currently paused.
 			</description>
 		</method>
-		<method name="get_volume_db" qualifiers="const">
-			<return type="float">
+		<method name="is_playing" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the playback volume for this player, in decibels.
+				Return whether this player is playing.
 			</description>
 		</method>
-		<method name="set_buffering_msec">
-			<argument index="0" name="msec" type="int">
+		<method name="play">
+			<argument index="0" name="offset" type="float" default="0">
 			</argument>
 			<description>
-			Set the size (in milliseconds) of the audio buffer. A long audio buffer protects better against slowdowns, but responds worse to changes (in volume, stream played...). A shorter buffer takes less time to respond to changes, but may stutter if the application suffers some slowdown.
-			Default is 500 milliseconds.
+				Play the currently assigned stream, starting from a given position (in seconds).
 			</description>
 		</method>
-		<method name="get_buffering_msec" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="seek_pos">
+			<argument index="0" name="time" type="float">
+			</argument>
 			<description>
-			Return the size of the audio buffer.
+				Set the playback position, in seconds.
 			</description>
 		</method>
-		<method name="set_loop_restart_time">
-			<argument index="0" name="secs" type="float">
+		<method name="set_autoplay">
+			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
-			Set the point in time the stream will rewind to, when looping.
+				Set whether this player will start playing as soon as it enters the scene tree.
 			</description>
 		</method>
-		<method name="get_loop_restart_time" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_buffering_msec">
+			<argument index="0" name="msec" type="int">
+			</argument>
 			<description>
-			Return the point in time the stream will rewind to, when looping.
+				Set the size (in milliseconds) of the audio buffer. A long audio buffer protects better against slowdowns, but responds worse to changes (in volume, stream played...). A shorter buffer takes less time to respond to changes, but may stutter if the application suffers some slowdown.
+				Default is 500 milliseconds.
 			</description>
 		</method>
-		<method name="get_stream_name" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="set_loop">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
 			<description>
-			Return the name of the currently assigned stream. This is not the file name, but a field inside the file. If no stream is assigned, if returns "&lt;No Stream&gt;".
+				Set whether the stream will be restarted at the end.
 			</description>
 		</method>
-		<method name="get_loop_count" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_loop_restart_time">
+			<argument index="0" name="secs" type="float">
+			</argument>
 			<description>
-			Return the number of times the playback has looped.
+				Set the point in time the stream will rewind to, when looping.
 			</description>
 		</method>
-		<method name="get_pos" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_paused">
+			<argument index="0" name="paused" type="bool">
+			</argument>
 			<description>
-			Return the playback position, in seconds.
+				Pause stream playback.
 			</description>
 		</method>
-		<method name="seek_pos">
-			<argument index="0" name="time" type="float">
+		<method name="set_stream">
+			<argument index="0" name="stream" type="AudioStream">
 			</argument>
 			<description>
-			Set the playback position, in seconds.
+				Set the [EventStream] this player will play.
 			</description>
 		</method>
-		<method name="set_autoplay">
-			<argument index="0" name="enabled" type="bool">
+		<method name="set_volume">
+			<argument index="0" name="volume" type="float">
 			</argument>
 			<description>
-			Set whether this player will start playing as soon as it enters the scene tree.
+				Set the playback volume for this player. This is a float between 0.0 (silent) and 1.0 (full volume). Values over 1.0 will amplify sound even more, but may introduce distortion. Negative values will just invert the output waveform, which produces no audible difference.
 			</description>
 		</method>
-		<method name="has_autoplay" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_volume_db">
+			<argument index="0" name="db" type="float">
+			</argument>
 			<description>
-			Return whether this player will start playing as soon as it enters the scene tree.
+				Set the playback volume for this player, in decibels. This is a float between -80.0 (silent) and 0.0 (full volume). Values under -79.0 get truncated to -80, but values over 0.0 do not, so the warnings for overamplifying (see [method set_volume]) still apply.
 			</description>
 		</method>
-		<method name="get_length" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="stop">
 			<description>
-			Return the length of the stream, in seconds.
+				Stop the playback.
 			</description>
 		</method>
 	</methods>
 	<signals>
 		<signal name="finished">
 			<description>
-			This signal triggers when the player stops playing. It will not trigger on each loop.
+				This signal triggers when the player stops playing. It will not trigger on each loop.
 			</description>
 		</signal>
 	</signals>
@@ -37310,17 +37676,17 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="String" category="Built-In Types">
 	<brief_description>
-	Built-in string class.
+		Built-in string class.
 	</brief_description>
 	<description>
-	This is the built-in string class (and the one used by GDScript). It supports Unicode and provides all necessary means for string handling. Strings are reference counted and use a copy-on-write approach, so passing them around is cheap in resources.
+		This is the built-in string class (and the one used by GDScript). It supports Unicode and provides all necessary means for string handling. Strings are reference counted and use a copy-on-write approach, so passing them around is cheap in resources.
 	</description>
 	<methods>
 		<method name="basename">
 			<return type="String">
 			</return>
 			<description>
-			If the string is a path to a file, return the path to the file without the extension.
+				If the string is a path to a file, return the path to the file without the extension.
 			</description>
 		</method>
 		<method name="begins_with">
@@ -37329,33 +37695,35 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="text" type="String">
 			</argument>
 			<description>
-			Return true if the strings begins with the given string.
+				Return true if the strings begins with the given string.
 			</description>
 		</method>
 		<method name="bigrams">
 			<return type="StringArray">
 			</return>
 			<description>
-			Return the bigrams (pairs of consecutive letters) of this string.
+				Return the bigrams (pairs of consecutive letters) of this string.
 			</description>
 		</method>
 		<method name="c_escape">
 			<return type="String">
 			</return>
 			<description>
+				Return a copy of the string with special characters escaped using the C language standard.
 			</description>
 		</method>
 		<method name="c_unescape">
 			<return type="String">
 			</return>
 			<description>
+				Return a copy of the string with escaped characters replaced by their meanings according to the C language standard.
 			</description>
 		</method>
 		<method name="capitalize">
 			<return type="String">
 			</return>
 			<description>
-			Return the string in uppercase.
+				Change the case of some letters. Replace underscores with spaces, convert all letters to lowercase then capitalize first and every letter following the space character. For [code]capitalize camelCase mixed_with_underscores[/code] it will return [code]Capitalize Camelcase Mixed With Underscores[/code].
 			</description>
 		</method>
 		<method name="casecmp_to">
@@ -37364,14 +37732,14 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="to" type="String">
 			</argument>
 			<description>
-			Perform a case-sensitive comparison to another string, return -1 if less, 0 if equal and +1 if greater.
+				Perform a case-sensitive comparison to another string, return -1 if less, 0 if equal and +1 if greater.
 			</description>
 		</method>
 		<method name="empty">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if the string is empty.
+				Return true if the string is empty.
 			</description>
 		</method>
 		<method name="ends_with">
@@ -37380,6 +37748,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="text" type="String">
 			</argument>
 			<description>
+				Return true if the strings ends with the given string.
 			</description>
 		</method>
 		<method name="erase">
@@ -37388,13 +37757,14 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="chars" type="int">
 			</argument>
 			<description>
+				Erase [code]chars[/code] characters from the string starting from [code]pos[/code].
 			</description>
 		</method>
 		<method name="extension">
 			<return type="String">
 			</return>
 			<description>
-			If the string is a path to a file, return the extension.
+				If the string is a path to a file, return the extension.
 			</description>
 		</method>
 		<method name="find">
@@ -37405,7 +37775,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="from" type="int" default="0">
 			</argument>
 			<description>
-			Find the first occurrence of a substring, return the starting position of the substring or -1 if not found. Optionally, the initial search index can be passed.
+				Find the first occurrence of a substring, return the starting position of the substring or -1 if not found. Optionally, the initial search index can be passed.
 			</description>
 		</method>
 		<method name="find_last">
@@ -37414,7 +37784,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="what" type="String">
 			</argument>
 			<description>
-			Find the last occurrence of a substring, return the starting position of the substring or -1 if not found. Optionally, the initial search index can be passed.
+				Find the last occurrence of a substring, return the starting position of the substring or -1 if not found. Optionally, the initial search index can be passed.
 			</description>
 		</method>
 		<method name="findn">
@@ -37425,35 +37795,35 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="from" type="int" default="0">
 			</argument>
 			<description>
-			Find the first occurrence of a substring but search as case-insensitive, return the starting position of the substring or -1 if not found. Optionally, the initial search index can be passed.
+				Find the first occurrence of a substring but search as case-insensitive, return the starting position of the substring or -1 if not found. Optionally, the initial search index can be passed.
 			</description>
 		</method>
 		<method name="get_base_dir">
 			<return type="String">
 			</return>
 			<description>
-			If the string is a path to a file, return the base directory.
+				If the string is a path to a file, return the base directory.
 			</description>
 		</method>
 		<method name="get_file">
 			<return type="String">
 			</return>
 			<description>
-			If the string is a path to a file, return the file and ignore the base directory.
+				If the string is a path to a file, return the file and ignore the base directory.
 			</description>
 		</method>
 		<method name="hash">
 			<return type="int">
 			</return>
 			<description>
-			Hash the string and return a 32 bits integer.
+				Hash the string and return a 32 bits integer.
 			</description>
 		</method>
 		<method name="hex_to_int">
 			<return type="int">
 			</return>
 			<description>
-			Convert a string containing an hexadecimal number into an int.
+				Convert a string containing an hexadecimal number into an int.
 			</description>
 		</method>
 		<method name="insert">
@@ -37464,21 +37834,21 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="what" type="String">
 			</argument>
 			<description>
-			Insert a substring at a given position.
+				Insert a substring at a given position.
 			</description>
 		</method>
 		<method name="is_abs_path">
 			<return type="bool">
 			</return>
 			<description>
-			If the string is a path to a file or directory, return true if the path is absolute.
+				If the string is a path to a file or directory, return true if the path is absolute.
 			</description>
 		</method>
 		<method name="is_rel_path">
 			<return type="bool">
 			</return>
 			<description>
-			If the string is a path to a file or directory, return true if the path is relative.
+				If the string is a path to a file or directory, return true if the path is relative.
 			</description>
 		</method>
 		<method name="is_subsequence_of">
@@ -37487,7 +37857,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="text" type="String">
 			</argument>
 			<description>
-			Checked whether this string is a subsequence of the given string.
+				Check whether this string is a subsequence of the given string.
 			</description>
 		</method>
 		<method name="is_subsequence_ofi">
@@ -37496,47 +37866,49 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="text" type="String">
 			</argument>
 			<description>
-			Checked whether this string is a subsequence of the given string, without considering case.
+				Check whether this string is a subsequence of the given string, without considering case.
 			</description>
 		</method>
 		<method name="is_valid_float">
 			<return type="bool">
 			</return>
 			<description>
-			Check whether the string contains a valid float.
+				Check whether the string contains a valid float.
 			</description>
 		</method>
 		<method name="is_valid_html_color">
 			<return type="bool">
 			</return>
 			<description>
-			Check whether the string contains a valid color in HTML notation.
+				Check whether the string contains a valid color in HTML notation.
 			</description>
 		</method>
 		<method name="is_valid_identifier">
 			<return type="bool">
 			</return>
 			<description>
+				Check whether the string is a valid identifier. As is common in programming languages, a valid identifier may contain only letters, digits and underscores (_) and the first character may not be a digit.
 			</description>
 		</method>
 		<method name="is_valid_integer">
 			<return type="bool">
 			</return>
 			<description>
-			Check whether the string contains a valid integer.
+				Check whether the string contains a valid integer.
 			</description>
 		</method>
 		<method name="is_valid_ip_address">
 			<return type="bool">
 			</return>
 			<description>
-			Check whether the string contains a valid IP address.
+				Check whether the string contains a valid IP address.
 			</description>
 		</method>
 		<method name="json_escape">
 			<return type="String">
 			</return>
 			<description>
+				Return a copy of the string with special characters escaped using the JSON standard.
 			</description>
 		</method>
 		<method name="left">
@@ -37545,14 +37917,14 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="pos" type="int">
 			</argument>
 			<description>
-			Return an amount of characters from the left of the string.
+				Return an amount of characters from the left of the string.
 			</description>
 		</method>
 		<method name="length">
 			<return type="int">
 			</return>
 			<description>
-			Return the length of the string in characters.
+				Return the length of the string in characters.
 			</description>
 		</method>
 		<method name="match">
@@ -37561,7 +37933,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="expr" type="String">
 			</argument>
 			<description>
-			Do a simple expression match, where '*' matches zero or more arbitrary characters and '?' matches any single character except '.'.
+				Do a simple expression match, where '*' matches zero or more arbitrary characters and '?' matches any single character except '.'.
 			</description>
 		</method>
 		<method name="matchn">
@@ -37570,19 +37942,21 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="expr" type="String">
 			</argument>
 			<description>
-			Do a simple case insensitive expression match, using ? and * wildcards (see [method match]).
+				Do a simple case insensitive expression match, using ? and * wildcards (see [method match]).
 			</description>
 		</method>
 		<method name="md5_buffer">
 			<return type="RawArray">
 			</return>
 			<description>
+				Return the MD5 hash of the string as an array of bytes.
 			</description>
 		</method>
 		<method name="md5_text">
 			<return type="String">
 			</return>
 			<description>
+				Return the MD5 hash of the string as a string.
 			</description>
 		</method>
 		<method name="nocasecmp_to">
@@ -37591,7 +37965,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="to" type="String">
 			</argument>
 			<description>
-			Perform a case-insensitive comparison to another string, return -1 if less, 0 if equal and +1 if greater.
+				Perform a case-insensitive comparison to another string, return -1 if less, 0 if equal and +1 if greater.
 			</description>
 		</method>
 		<method name="ord_at">
@@ -37600,7 +37974,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="at" type="int">
 			</argument>
 			<description>
-			Return the character code at position "at".
+				Return the character code at position [code]at[/code].
 			</description>
 		</method>
 		<method name="pad_decimals">
@@ -37609,6 +37983,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="digits" type="int">
 			</argument>
 			<description>
+				Format a number to have an exact number of [code]digits[/code] after the decimal point.
 			</description>
 		</method>
 		<method name="pad_zeros">
@@ -37617,18 +37992,21 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="digits" type="int">
 			</argument>
 			<description>
+				Format a number to have an exact number of [code]digits[/code] before the decimal point.
 			</description>
 		</method>
 		<method name="percent_decode">
 			<return type="String">
 			</return>
 			<description>
+				Decode a percent-encoded string. See [method percent_encode].
 			</description>
 		</method>
 		<method name="percent_encode">
 			<return type="String">
 			</return>
 			<description>
+				Percent-encode a string. This is meant to encode parameters in a URL when sending a HTTP GET request and bodies of form-urlencoded POST request.
 			</description>
 		</method>
 		<method name="plus_file">
@@ -37637,6 +38015,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="file" type="String">
 			</argument>
 			<description>
+				If the string is a path, this concatenates [code]file[/code] at the end of the string as a subpath. E.g. [code]"this/is".plus_file("path") == "this/is/path"[/code].
 			</description>
 		</method>
 		<method name="replace">
@@ -37647,7 +38026,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="forwhat" type="String">
 			</argument>
 			<description>
-			Replace occurrences of a substring for different ones inside the string.
+				Replace occurrences of a substring for different ones inside the string.
 			</description>
 		</method>
 		<method name="replacen">
@@ -37658,7 +38037,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="forwhat" type="String">
 			</argument>
 			<description>
-			Replace occurrences of a substring for different ones inside the string, but search case-insensitive.
+				Replace occurrences of a substring for different ones inside the string, but search case-insensitive.
 			</description>
 		</method>
 		<method name="rfind">
@@ -37669,7 +38048,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="from" type="int" default="-1">
 			</argument>
 			<description>
-			Perform a search for a substring, but start from the end of the string instead of the beginning.
+				Perform a search for a substring, but start from the end of the string instead of the beginning.
 			</description>
 		</method>
 		<method name="rfindn">
@@ -37680,7 +38059,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="from" type="int" default="-1">
 			</argument>
 			<description>
-			Perform a search for a substring, but start from the end of the string instead of the beginning. Also search case-insensitive.
+				Perform a search for a substring, but start from the end of the string instead of the beginning. Also search case-insensitive.
 			</description>
 		</method>
 		<method name="right">
@@ -37689,13 +38068,20 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="pos" type="int">
 			</argument>
 			<description>
-			Return the right side of the string from a given position.
+				Return the right side of the string from a given position.
+			</description>
+		</method>
+		<method name="sha256_buffer">
+			<return type="RawArray">
+			</return>
+			<description>
 			</description>
 		</method>
 		<method name="sha256_text">
 			<return type="String">
 			</return>
 			<description>
+				Return the SHA-256 hash of the string as a string.
 			</description>
 		</method>
 		<method name="similarity">
@@ -37704,7 +38090,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="text" type="String">
 			</argument>
 			<description>
-			Return the similarity index of the text compared to this string. 1 means totally similar and 0 means totally dissimilar.
+				Return the similarity index of the text compared to this string. 1 means totally similar and 0 means totally dissimilar.
 			</description>
 		</method>
 		<method name="split">
@@ -37715,7 +38101,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="allow_empty" type="bool" default="True">
 			</argument>
 			<description>
-			Split the string by a divisor string, return an array of the substrings. Example "One,Two,Three" will return \["One","Two","Three"\] if split by ",".
+				Split the string by a divisor string, return an array of the substrings. Example "One,Two,Three" will return ["One","Two","Three"] if split by ",".
 			</description>
 		</method>
 		<method name="split_floats">
@@ -37726,7 +38112,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="allow_empty" type="bool" default="True">
 			</argument>
 			<description>
-			Split the string in floats by using a divisor string, return an array of the substrings. Example "1,2.5,3" will return \[1,2.5,3\] if split by ",".
+				Split the string in floats by using a divisor string, return an array of the substrings. Example "1,2.5,3" will return [1,2.5,3] if split by ",".
 			</description>
 		</method>
 		<method name="strip_edges">
@@ -37737,7 +38123,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="right" type="bool" default="True">
 			</argument>
 			<description>
-			Return a copy of the string stripped of any non-printable character at the beginning and the end. The optional arguments are used to toggle stripping on the left and right edges respectively.
+				Return a copy of the string stripped of any non-printable character at the beginning and the end. The optional arguments are used to toggle stripping on the left and right edges respectively.
 			</description>
 		</method>
 		<method name="substr">
@@ -37748,63 +38134,63 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="len" type="int">
 			</argument>
 			<description>
-			Return part of the string from "from", with length "len".
+				Return part of the string from the position [code]from[/code], with length [code]len[/code].
 			</description>
 		</method>
 		<method name="to_ascii">
 			<return type="RawArray">
 			</return>
 			<description>
-			Convert the String (which is a character array) to RawArray (which is an array of bytes). The conversion is speeded up in comparison to to_utf8() with the assumption that all the characters the String contains are only ASCII characters.
+				Convert the String (which is a character array) to RawArray (which is an array of bytes). The conversion is speeded up in comparison to to_utf8() with the assumption that all the characters the String contains are only ASCII characters.
 			</description>
 		</method>
 		<method name="to_float">
 			<return type="float">
 			</return>
 			<description>
-			Convert a string, containing a decimal number, into a float.
+				Convert a string, containing a decimal number, into a [code]float[/code].
 			</description>
 		</method>
 		<method name="to_int">
 			<return type="int">
 			</return>
 			<description>
-			Convert a string, containing an integer number, into an int.
+				Convert a string, containing an integer number, into an [code]int[/code].
 			</description>
 		</method>
 		<method name="to_lower">
 			<return type="String">
 			</return>
 			<description>
-			Return the string converted to lowercase.
+				Return the string converted to lowercase.
 			</description>
 		</method>
 		<method name="to_upper">
 			<return type="String">
 			</return>
 			<description>
-			Return the string converted to uppercase.
+				Return the string converted to uppercase.
 			</description>
 		</method>
 		<method name="to_utf8">
 			<return type="RawArray">
 			</return>
 			<description>
-			Convert the String (which is an array of characters) to RawArray (which is an array of bytes). The conversion is a bit slower than to_ascii(), but supports all UTF-8 characters. Therefore, you should prefer this function over to_ascii().
+				Convert the String (which is an array of characters) to RawArray (which is an array of bytes). The conversion is a bit slower than to_ascii(), but supports all UTF-8 characters. Therefore, you should prefer this function over to_ascii().
 			</description>
 		</method>
 		<method name="xml_escape">
 			<return type="String">
 			</return>
 			<description>
-			Perform XML escaping on the string.
+				Return a copy of the string with special characters escaped using the XML standard.
 			</description>
 		</method>
 		<method name="xml_unescape">
 			<return type="String">
 			</return>
 			<description>
-			Perform XML un-escaping of the string.
+				Return a copy of the string with escaped characters replaced by their meanings according to the XML standard.
 			</description>
 		</method>
 	</methods>
@@ -37813,24 +38199,70 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="StringArray" category="Built-In Types">
 	<brief_description>
-	String Array.
+		String Array.
 	</brief_description>
 	<description>
-	String Array. Array of strings. Can only contain strings. Optimized for memory usage, can't fragment the memory.
+		String Array. Array of strings. Can only contain strings. Optimized for memory usage, can't fragment the memory.
 	</description>
 	<methods>
+		<method name="StringArray">
+			<return type="StringArray">
+			</return>
+			<argument index="0" name="from" type="Array">
+			</argument>
+			<description>
+				Create from a generic array.
+			</description>
+		</method>
+		<method name="append">
+			<argument index="0" name="string" type="String">
+			</argument>
+			<description>
+				Append an element at the end of the array (alias of [method push_back]).
+			</description>
+		</method>
+		<method name="append_array">
+			<argument index="0" name="array" type="StringArray">
+			</argument>
+			<description>
+				Append an [StringArray] at the end of this array.
+			</description>
+		</method>
+		<method name="insert">
+			<return type="int">
+			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="string" type="String">
+			</argument>
+			<description>
+				Insert a new element at a given position in the array. The position must be valid, or at the end of the array (pos==size()).
+			</description>
+		</method>
+		<method name="invert">
+			<description>
+				Reverse the order of the elements in the array (so first element will now be the last).
+			</description>
+		</method>
 		<method name="push_back">
 			<argument index="0" name="string" type="String">
 			</argument>
 			<description>
-			Append a string element at end of the array.
+				Append a string element at end of the array.
+			</description>
+		</method>
+		<method name="remove">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<description>
+				Remove an element from the array by index.
 			</description>
 		</method>
 		<method name="resize">
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Set the size of the [StringArray]. If larger than the current size it will reserve some space beforehand, and if it is smaller it will cut off the array.
+				Set the size of the [StringArray]. If larger than the current size it will reserve some space beforehand, and if it is smaller it will cut off the array.
 			</description>
 		</method>
 		<method name="set">
@@ -37839,23 +38271,14 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="string" type="String">
 			</argument>
 			<description>
-			Change the [String] at the given index.
+				Change the [String] at the given index.
 			</description>
 		</method>
 		<method name="size">
 			<return type="int">
 			</return>
 			<description>
-			Return the size of the array.
-			</description>
-		</method>
-		<method name="StringArray">
-			<return type="StringArray">
-			</return>
-			<argument index="0" name="from" type="Array">
-			</argument>
-			<description>
-			Create from a generic array.
+				Return the size of the array.
 			</description>
 		</method>
 	</methods>
@@ -37864,30 +38287,24 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="StyleBox" inherits="Resource" category="Core">
 	<brief_description>
-	Base class for drawing stylized boxes for the UI.
+		Base class for drawing stylized boxes for the UI.
 	</brief_description>
 	<description>
-	StyleBox is [Resource] that provides an abstract base class for drawing stylized boxes for the UI. StyleBoxes are used for drawing the styles of buttons, line edit backgrounds, tree backgrounds, etc. and also for testing a transparency mask for pointer signals. If mask test fails on a StyleBox assigned as mask to a control, clicks and motion signals will go through it to the one below.
+		StyleBox is [Resource] that provides an abstract base class for drawing stylized boxes for the UI. StyleBoxes are used for drawing the styles of buttons, line edit backgrounds, tree backgrounds, etc. and also for testing a transparency mask for pointer signals. If mask test fails on a StyleBox assigned as mask to a control, clicks and motion signals will go through it to the one below.
 	</description>
 	<methods>
-		<method name="test_mask" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="point" type="Vector2">
+		<method name="draw" qualifiers="const">
+			<argument index="0" name="canvas_item" type="RID">
 			</argument>
 			<argument index="1" name="rect" type="Rect2">
 			</argument>
 			<description>
-			Test a position in a rectangle, return whether it passes the mask test.
 			</description>
 		</method>
-		<method name="set_default_margin">
-			<argument index="0" name="margin" type="int">
-			</argument>
-			<argument index="1" name="offset" type="float">
-			</argument>
+		<method name="get_center_size" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
-			Set the default offset "offset" of the margin "margin" (see MARGIN_* enum) for a StyleBox, Controls that draw styleboxes with context inside need to know the margin, so the border of the stylebox is not occluded.
 			</description>
 		</method>
 		<method name="get_default_margin" qualifiers="const">
@@ -37896,7 +38313,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="margin" type="int">
 			</argument>
 			<description>
-			Return the default offset of the margin "margin" (see MARGIN_* enum) of a StyleBox, Controls that draw styleboxes with context inside need to know the margin, so the border of the stylebox is not occluded.
+				Return the default offset of the margin "margin" (see MARGIN_* enum) of a StyleBox, Controls that draw styleboxes with context inside need to know the margin, so the border of the stylebox is not occluded.
 			</description>
 		</method>
 		<method name="get_margin" qualifiers="const">
@@ -37905,35 +38322,41 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="margin" type="int">
 			</argument>
 			<description>
-			Return the offset of margin "margin" (see MARGIN_* enum).
+				Return the offset of margin "margin" (see MARGIN_* enum).
 			</description>
 		</method>
 		<method name="get_minimum_size" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
-			Return the minimum size that this stylebox can be shrunk to.
+				Return the minimum size that this stylebox can be shrunk to.
 			</description>
 		</method>
-		<method name="get_center_size" qualifiers="const">
+		<method name="get_offset" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<description>
+				Return the "offset" of a stylebox, this is a helper function, like writing [code]Vector2(style.get_margin(MARGIN_LEFT), style.get_margin(MARGIN_TOP))[/code].
 			</description>
 		</method>
-		<method name="get_offset" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_default_margin">
+			<argument index="0" name="margin" type="int">
+			</argument>
+			<argument index="1" name="offset" type="float">
+			</argument>
 			<description>
-			Return the "offset" of a stylebox, this is a helper function, like writing [code]Vector2(style.get_margin(MARGIN_LEFT), style.get_margin(MARGIN_TOP))[/code].
+				Set the default offset "offset" of the margin "margin" (see MARGIN_* enum) for a StyleBox, Controls that draw styleboxes with context inside need to know the margin, so the border of the stylebox is not occluded.
 			</description>
 		</method>
-		<method name="draw" qualifiers="const">
-			<argument index="0" name="canvas_item" type="RID">
+		<method name="test_mask" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="point" type="Vector2">
 			</argument>
 			<argument index="1" name="rect" type="Rect2">
 			</argument>
 			<description>
+				Test a position in a rectangle, return whether it passes the mask test.
 			</description>
 		</method>
 	</methods>
@@ -37942,10 +38365,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="StyleBoxEmpty" inherits="StyleBox" category="Core">
 	<brief_description>
-	Empty stylebox (does not display anything).
+		Empty stylebox (does not display anything).
 	</brief_description>
 	<description>
-	Empty stylebox (really does not display anything).
+		Empty stylebox (really does not display anything).
 	</description>
 	<methods>
 	</methods>
@@ -37954,69 +38377,69 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="StyleBoxFlat" inherits="StyleBox" category="Core">
 	<brief_description>
-	Stylebox of a single color.
+		Stylebox of a single color.
 	</brief_description>
 	<description>
-	Stylebox of a single color. Displays the stylebox of a single color, alternatively a border with light/dark colors can be assigned.
+		Stylebox of a single color. Displays the stylebox of a single color, alternatively a border with light/dark colors can be assigned.
 	</description>
 	<methods>
-		<method name="set_bg_color">
-			<argument index="0" name="color" type="Color">
-			</argument>
+		<method name="get_bg_color" qualifiers="const">
+			<return type="Color">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_bg_color" qualifiers="const">
-			<return type="Color">
+		<method name="get_border_blend" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_light_color">
-			<argument index="0" name="color" type="Color">
-			</argument>
+		<method name="get_border_size" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_light_color" qualifiers="const">
+		<method name="get_dark_color" qualifiers="const">
 			<return type="Color">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_dark_color">
-			<argument index="0" name="color" type="Color">
-			</argument>
+		<method name="get_draw_center" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_dark_color" qualifiers="const">
+		<method name="get_light_color" qualifiers="const">
 			<return type="Color">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_border_size">
-			<argument index="0" name="size" type="int">
+		<method name="set_bg_color">
+			<argument index="0" name="color" type="Color">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_border_size" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_border_blend">
+			<argument index="0" name="blend" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_border_blend">
-			<argument index="0" name="blend" type="bool">
+		<method name="set_border_size">
+			<argument index="0" name="size" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_border_blend" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_dark_color">
+			<argument index="0" name="color" type="Color">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -38026,9 +38449,9 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_draw_center" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_light_color">
+			<argument index="0" name="color" type="Color">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -38038,38 +38461,40 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="StyleBoxImageMask" inherits="StyleBox" category="Core">
 	<brief_description>
-	Image mask based StyleBox, for mask test.
+		Image mask based StyleBox, for mask test.
 	</brief_description>
 	<description>
-	This StyleBox is similar to [StyleBoxTexture], but only meant to be used for mask testing. It takes an image and applies stretch rules to determine if the point clicked is masked or not.
+		This StyleBox is similar to [StyleBoxTexture], but only meant to be used for mask testing. It takes an image and applies stretch rules to determine if the point clicked is masked or not.
 	</description>
 	<methods>
-		<method name="set_image">
-			<argument index="0" name="image" type="Image">
+		<method name="get_expand" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+				Return whether the expand property is set(default). When expanding, the image will use the same rules as [StyleBoxTexture] for expand. If not expanding, the image will always be tested at its original size.
+			</description>
+		</method>
+		<method name="get_expand_margin_size" qualifiers="const">
+			<return type="float">
+			</return>
+			<argument index="0" name="margin" type="int">
 			</argument>
 			<description>
-			Set the image used for mask testing. Pixels (converted to grey) that have a value, less than 0.5 will fail the test.
+				Return the expand margin size (from enum MARGIN_*). Parts of the image below the size of the margin (and in the direction of the margin) will not expand.
 			</description>
 		</method>
 		<method name="get_image" qualifiers="const">
 			<return type="Image">
 			</return>
 			<description>
-			Return the image used for mask testing. (see [method set_image]).
+				Return the image used for mask testing. (see [method set_image]).
 			</description>
 		</method>
 		<method name="set_expand">
 			<argument index="0" name="expand" type="bool">
 			</argument>
 			<description>
-			Set the expand property (default). When expanding, the image will use the same rules as [StyleBoxTexture] for expand. If not expanding, the image will always be tested at its original size.
-			</description>
-		</method>
-		<method name="get_expand" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
-			Return whether the expand property is set(default). When expanding, the image will use the same rules as [StyleBoxTexture] for expand. If not expanding, the image will always be tested at its original size.
+				Set the expand property (default). When expanding, the image will use the same rules as [StyleBoxTexture] for expand. If not expanding, the image will always be tested at its original size.
 			</description>
 		</method>
 		<method name="set_expand_margin_size">
@@ -38078,16 +38503,14 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="size" type="float">
 			</argument>
 			<description>
-			Set an expand margin size (from enum MARGIN_*). Parts of the image below the size of the margin (and in the direction of the margin) will not expand.
+				Set an expand margin size (from enum MARGIN_*). Parts of the image below the size of the margin (and in the direction of the margin) will not expand.
 			</description>
 		</method>
-		<method name="get_expand_margin_size" qualifiers="const">
-			<return type="float">
-			</return>
-			<argument index="0" name="margin" type="int">
+		<method name="set_image">
+			<argument index="0" name="image" type="Image">
 			</argument>
 			<description>
-			Return the expand margin size (from enum MARGIN_*). Parts of the image below the size of the margin (and in the direction of the margin) will not expand.
+				Set the image used for mask testing. Pixels (converted to grey) that have a value, less than 0.5 will fail the test.
 			</description>
 		</method>
 	</methods>
@@ -38096,29 +38519,23 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="StyleBoxTexture" inherits="StyleBox" category="Core">
 	<brief_description>
-	Texture Based 3x3 scale style.
+		Texture Based 3x3 scale style.
 	</brief_description>
 	<description>
-	Texture Based 3x3 scale style. This stylebox performs a 3x3 scaling of a texture, where only the center cell is fully stretched. This allows for the easy creation of bordered styles.
+		Texture Based 3x3 scale style. This stylebox performs a 3x3 scaling of a texture, where only the center cell is fully stretched. This allows for the easy creation of bordered styles.
 	</description>
 	<methods>
-		<method name="set_texture">
-			<argument index="0" name="texture" type="Texture">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_texture" qualifiers="const">
-			<return type="Texture">
+		<method name="get_draw_center" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_margin_size">
+		<method name="get_expand_margin_size" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="margin" type="int">
 			</argument>
-			<argument index="1" name="size" type="float">
-			</argument>
 			<description>
 			</description>
 		</method>
@@ -38130,6 +38547,24 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
+		<method name="get_region_rect" qualifiers="const">
+			<return type="Rect2">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="get_texture" qualifiers="const">
+			<return type="Texture">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="set_draw_center">
+			<argument index="0" name="enable" type="bool">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="set_expand_margin_size">
 			<argument index="0" name="margin" type="int">
 			</argument>
@@ -38138,11 +38573,11 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_expand_margin_size" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_margin_size">
 			<argument index="0" name="margin" type="int">
 			</argument>
+			<argument index="1" name="size" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -38152,44 +38587,32 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_region_rect" qualifiers="const">
-			<return type="Rect2">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="set_draw_center">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_texture">
+			<argument index="0" name="texture" type="Texture">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_draw_center" qualifiers="const">
-			<return type="bool">
-			</return>
+	</methods>
+	<signals>
+		<signal name="texture_changed">
 			<description>
 			</description>
-		</method>
-	</methods>
+		</signal>
+	</signals>
 	<constants>
 	</constants>
 </class>
 <class name="SurfaceTool" inherits="Reference" category="Core">
 	<brief_description>
-	Helper tool to create geometry.
+		Helper tool to create geometry.
 	</brief_description>
 	<description>
-	Helper tool to create geometry.
+		Helper tool to create geometry.
 	</description>
 	<methods>
-		<method name="begin">
-			<argument index="0" name="primitive" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="add_vertex">
-			<argument index="0" name="vertex" type="Vector3">
+		<method name="add_bones">
+			<argument index="0" name="bones" type="IntArray">
 			</argument>
 			<description>
 			</description>
@@ -38206,12 +38629,34 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
+		<method name="add_smooth_group">
+			<argument index="0" name="smooth" type="bool">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="add_tangent">
 			<argument index="0" name="tangent" type="Plane">
 			</argument>
 			<description>
 			</description>
 		</method>
+		<method name="add_triangle_fan">
+			<argument index="0" name="vertexes" type="Vector3Array">
+			</argument>
+			<argument index="1" name="uvs" type="Vector2Array" default="Vector2Array([])">
+			</argument>
+			<argument index="2" name="colors" type="ColorArray" default="ColorArray([ColorArray])">
+			</argument>
+			<argument index="3" name="uv2s" type="Vector2Array" default="Vector2Array([])">
+			</argument>
+			<argument index="4" name="normals" type="Vector3Array" default="Vector3Array([])">
+			</argument>
+			<argument index="5" name="tangents" type="Array" default="Array()">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="add_uv">
 			<argument index="0" name="uv" type="Vector2">
 			</argument>
@@ -38224,8 +38669,8 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="add_bones">
-			<argument index="0" name="bones" type="IntArray">
+		<method name="add_vertex">
+			<argument index="0" name="vertex" type="Vector3">
 			</argument>
 			<description>
 			</description>
@@ -38236,38 +38681,24 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="add_smooth_group">
-			<argument index="0" name="smooth" type="bool">
+		<method name="begin">
+			<argument index="0" name="primitive" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="add_triangle_fan">
-			<argument index="0" name="vertexes" type="Vector3Array">
-			</argument>
-			<argument index="1" name="uvs" type="Vector2Array" default="Vector2Array()">
-			</argument>
-			<argument index="2" name="colors" type="ColorArray" default="ColorArray([ColorArray])">
-			</argument>
-			<argument index="3" name="uv2s" type="Vector2Array" default="Vector2Array()">
-			</argument>
-			<argument index="4" name="normals" type="Vector3Array" default="Vector3Array()">
-			</argument>
-			<argument index="5" name="tangents" type="Array" default="Array()">
-			</argument>
+		<method name="clear">
 			<description>
 			</description>
 		</method>
-		<method name="set_material">
-			<argument index="0" name="material" type="Material">
+		<method name="commit">
+			<return type="Mesh">
+			</return>
+			<argument index="0" name="existing" type="Mesh" default="NULL">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="index">
-			<description>
-			</description>
-		</method>
 		<method name="deindex">
 			<description>
 			</description>
@@ -38276,15 +38707,13 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="commit">
-			<return type="Mesh">
-			</return>
-			<argument index="0" name="existing" type="Mesh" default="NULL">
-			</argument>
+		<method name="index">
 			<description>
 			</description>
 		</method>
-		<method name="clear">
+		<method name="set_material">
+			<argument index="0" name="material" type="Material">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -38294,40 +38723,40 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="TCP_Server" inherits="Reference" category="Core">
 	<brief_description>
-	TCP Server.
+		TCP Server.
 	</brief_description>
 	<description>
-	TCP Server class. Listens to connections on a port and returns a [StreamPeerTCP] when got a connection.
+		TCP Server class. Listens to connections on a port and returns a [StreamPeerTCP] when got a connection.
 	</description>
 	<methods>
+		<method name="is_connection_available" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+				Return true if a connection is available for taking.
+			</description>
+		</method>
 		<method name="listen">
 			<return type="int">
 			</return>
 			<argument index="0" name="port" type="int">
 			</argument>
-			<argument index="1" name="accepted_hosts" type="StringArray" default="StringArray()">
+			<argument index="1" name="accepted_hosts" type="StringArray" default="StringArray([])">
 			</argument>
 			<description>
-			Listen on a port, alternatively give a white-list of accepted hosts.
+				Listen on a port, alternatively give a white-list of accepted hosts.
 			</description>
 		</method>
-		<method name="is_connection_available" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="stop">
 			<description>
-			Return true if a connection is available for taking.
+				Stop listening.
 			</description>
 		</method>
 		<method name="take_connection">
 			<return type="Object">
 			</return>
 			<description>
-			If a connection is available, return a StreamPeerTCP with the connection/
-			</description>
-		</method>
-		<method name="stop">
-			<description>
-			Stop listening.
+				If a connection is available, return a StreamPeerTCP with the connection/
 			</description>
 		</method>
 	</methods>
@@ -38336,32 +38765,25 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="TabContainer" inherits="Control" category="Core">
 	<brief_description>
-	Tabbed Container.
+		Tabbed Container.
 	</brief_description>
 	<description>
-	Tabbed Container. Contains several children controls, but shows only one at the same time. Clicking on the top tabs allows to change the currently visible one.
-	Children controls of this one automatically.
+		Tabbed Container. Contains several children controls, but shows only one at the same time. Clicking on the top tabs allows to change the currently visible one.
+		Children controls of this one automatically.
 	</description>
 	<methods>
-		<method name="get_tab_count" qualifiers="const">
-			<return type="int">
+		<method name="are_tabs_visible" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the amount of tabs.
-			</description>
-		</method>
-		<method name="set_current_tab">
-			<argument index="0" name="tab_idx" type="int">
-			</argument>
-			<description>
-			Bring a tab (and the Control it represents) to the front, and hide the rest.
+				Return whether the tabs should be visible or hidden.
 			</description>
 		</method>
 		<method name="get_current_tab" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the current tab that is being showed.
+				Return the current tab that is being showed.
 			</description>
 		</method>
 		<method name="get_current_tab_control" qualifiers="const">
@@ -38370,49 +38792,40 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_tab_control" qualifiers="const">
-			<return type="Control">
+		<method name="get_popup" qualifiers="const">
+			<return type="Popup">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_tab_align">
-			<argument index="0" name="align" type="int">
-			</argument>
-			<description>
-			Set tab alignment, from the ALIGN_* enum. Moves tabs to the left, right or center.
-			</description>
-		</method>
 		<method name="get_tab_align" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return tab alignment, from the ALIGN_* enum.
+				Return tab alignment, from the ALIGN_* enum.
 			</description>
 		</method>
-		<method name="set_tabs_visible">
-			<argument index="0" name="visible" type="bool">
+		<method name="get_tab_control" qualifiers="const">
+			<return type="Control">
+			</return>
+			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Set whether the tabs should be visible or hidden.
 			</description>
 		</method>
-		<method name="are_tabs_visible" qualifiers="const">
-			<return type="bool">
+		<method name="get_tab_count" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return whether the tabs should be visible or hidden.
+				Return the amount of tabs.
 			</description>
 		</method>
-		<method name="set_tab_title">
+		<method name="get_tab_icon" qualifiers="const">
+			<return type="Texture">
+			</return>
 			<argument index="0" name="tab_idx" type="int">
 			</argument>
-			<argument index="1" name="title" type="String">
-			</argument>
 			<description>
-			Set a title for the tab. Tab titles are by default the children node name, but this can be overridden.
 			</description>
 		</method>
 		<method name="get_tab_title" qualifiers="const">
@@ -38421,36 +38834,52 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="tab_idx" type="int">
 			</argument>
 			<description>
-			Return the title for the tab. Tab titles are by default the children node name, but this can be overridden.
+				Return the title for the tab. Tab titles are by default the children node name, but this can be overridden.
 			</description>
 		</method>
-		<method name="set_tab_icon">
+		<method name="set_current_tab">
 			<argument index="0" name="tab_idx" type="int">
 			</argument>
-			<argument index="1" name="icon" type="Texture">
+			<description>
+				Bring a tab (and the Control it represents) to the front, and hide the rest.
+			</description>
+		</method>
+		<method name="set_popup">
+			<argument index="0" name="popup" type="Popup">
 			</argument>
 			<description>
-			Set an icon for a tab.
 			</description>
 		</method>
-		<method name="get_tab_icon" qualifiers="const">
-			<return type="Texture">
-			</return>
+		<method name="set_tab_align">
+			<argument index="0" name="align" type="int">
+			</argument>
+			<description>
+				Set tab alignment, from the ALIGN_* enum. Moves tabs to the left, right or center.
+			</description>
+		</method>
+		<method name="set_tab_icon">
 			<argument index="0" name="tab_idx" type="int">
 			</argument>
+			<argument index="1" name="icon" type="Texture">
+			</argument>
 			<description>
+				Set an icon for a tab.
 			</description>
 		</method>
-		<method name="set_popup">
-			<argument index="0" name="popup" type="Popup">
+		<method name="set_tab_title">
+			<argument index="0" name="tab_idx" type="int">
+			</argument>
+			<argument index="1" name="title" type="String">
 			</argument>
 			<description>
+				Set a title for the tab. Tab titles are by default the children node name, but this can be overridden.
 			</description>
 		</method>
-		<method name="get_popup" qualifiers="const">
-			<return type="Popup">
-			</return>
+		<method name="set_tabs_visible">
+			<argument index="0" name="visible" type="bool">
+			</argument>
 			<description>
+				Set whether the tabs should be visible or hidden.
 			</description>
 		</method>
 	</methods>
@@ -38463,65 +38892,67 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="tab" type="int">
 			</argument>
 			<description>
-			Emitted when the current tab changes.
+				Emitted when the current tab changes.
 			</description>
 		</signal>
 	</signals>
 	<constants>
 	</constants>
 	<theme_items>
-		<theme_item name="label_valign_fg" type="int">
-		</theme_item>
-		<theme_item name="hseparation" type="int">
-		</theme_item>
-		<theme_item name="label_valign_bg" type="int">
+		<theme_item name="decrement" type="Texture">
 		</theme_item>
-		<theme_item name="top_margin" type="int">
+		<theme_item name="decrement_hilite" type="Texture">
 		</theme_item>
-		<theme_item name="side_margin" type="int">
+		<theme_item name="font" type="Font">
 		</theme_item>
 		<theme_item name="font_color_bg" type="Color">
 		</theme_item>
 		<theme_item name="font_color_fg" type="Color">
 		</theme_item>
-		<theme_item name="menu_hilite" type="Texture">
+		<theme_item name="hseparation" type="int">
+		</theme_item>
+		<theme_item name="increment" type="Texture">
 		</theme_item>
 		<theme_item name="increment_hilite" type="Texture">
 		</theme_item>
-		<theme_item name="menu" type="Texture">
+		<theme_item name="label_valign_bg" type="int">
 		</theme_item>
-		<theme_item name="decrement_hilite" type="Texture">
+		<theme_item name="label_valign_fg" type="int">
 		</theme_item>
-		<theme_item name="increment" type="Texture">
+		<theme_item name="menu" type="Texture">
 		</theme_item>
-		<theme_item name="decrement" type="Texture">
+		<theme_item name="menu_hilite" type="Texture">
 		</theme_item>
-		<theme_item name="font" type="Font">
+		<theme_item name="panel" type="StyleBox">
 		</theme_item>
-		<theme_item name="tab_fg" type="StyleBox">
+		<theme_item name="side_margin" type="int">
 		</theme_item>
 		<theme_item name="tab_bg" type="StyleBox">
 		</theme_item>
-		<theme_item name="panel" type="StyleBox">
+		<theme_item name="tab_fg" type="StyleBox">
+		</theme_item>
+		<theme_item name="top_margin" type="int">
 		</theme_item>
 	</theme_items>
 </class>
 <class name="Tabs" inherits="Control" category="Core">
 	<brief_description>
-	Tabs Control.
+		Tabs Control.
 	</brief_description>
 	<description>
-	Simple tabs control, similar to [TabContainer] but is only in charge of drawing tabs, not interact with children.
+		Simple tabs control, similar to [TabContainer] but is only in charge of drawing tabs, not interact with children.
 	</description>
 	<methods>
-		<method name="get_tab_count" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="add_tab">
+			<argument index="0" name="title" type="String">
+			</argument>
+			<argument index="1" name="icon" type="Texture">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_current_tab">
-			<argument index="0" name="tab_idx" type="int">
+		<method name="ensure_tab_visible">
+			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
 			</description>
@@ -38532,32 +38963,28 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="set_tab_title">
-			<argument index="0" name="tab_idx" type="int">
-			</argument>
-			<argument index="1" name="title" type="String">
-			</argument>
+		<method name="get_tab_align" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_tab_title" qualifiers="const">
-			<return type="String">
+		<method name="get_tab_count" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="tab_idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_tab_icon">
+		<method name="get_tab_icon" qualifiers="const">
+			<return type="Texture">
+			</return>
 			<argument index="0" name="tab_idx" type="int">
 			</argument>
-			<argument index="1" name="icon" type="Texture">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_tab_icon" qualifiers="const">
-			<return type="Texture">
+		<method name="get_tab_title" qualifiers="const">
+			<return type="String">
 			</return>
 			<argument index="0" name="tab_idx" type="int">
 			</argument>
@@ -38570,10 +38997,8 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="add_tab">
-			<argument index="0" name="title" type="String">
-			</argument>
-			<argument index="1" name="icon" type="Texture">
+		<method name="set_current_tab">
+			<argument index="0" name="tab_idx" type="int">
 			</argument>
 			<description>
 			</description>
@@ -38584,33 +39009,37 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_tab_align" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_tab_icon">
+			<argument index="0" name="tab_idx" type="int">
+			</argument>
+			<argument index="1" name="icon" type="Texture">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="ensure_tab_visible">
-			<argument index="0" name="idx" type="int">
+		<method name="set_tab_title">
+			<argument index="0" name="tab_idx" type="int">
+			</argument>
+			<argument index="1" name="title" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
 	</methods>
 	<signals>
-		<signal name="tab_close">
+		<signal name="right_button_pressed">
 			<argument index="0" name="tab" type="int">
 			</argument>
 			<description>
 			</description>
 		</signal>
-		<signal name="right_button_pressed">
+		<signal name="tab_changed">
 			<argument index="0" name="tab" type="int">
 			</argument>
 			<description>
 			</description>
 		</signal>
-		<signal name="tab_changed">
+		<signal name="tab_close">
 			<argument index="0" name="tab" type="int">
 			</argument>
 			<description>
@@ -38632,48 +39061,48 @@ This method controls whether the position between two cached points is interpola
 		</constant>
 	</constants>
 	<theme_items>
-		<theme_item name="label_valign_fg" type="int">
+		<theme_item name="button" type="StyleBox">
 		</theme_item>
-		<theme_item name="hseparation" type="int">
+		<theme_item name="button_pressed" type="StyleBox">
 		</theme_item>
-		<theme_item name="label_valign_bg" type="int">
+		<theme_item name="close" type="Texture">
 		</theme_item>
-		<theme_item name="top_margin" type="int">
+		<theme_item name="decrement" type="Texture">
+		</theme_item>
+		<theme_item name="decrement_hilite" type="Texture">
+		</theme_item>
+		<theme_item name="font" type="Font">
 		</theme_item>
 		<theme_item name="font_color_bg" type="Color">
 		</theme_item>
 		<theme_item name="font_color_fg" type="Color">
 		</theme_item>
-		<theme_item name="increment_hilite" type="Texture">
-		</theme_item>
-		<theme_item name="decrement_hilite" type="Texture">
+		<theme_item name="hseparation" type="int">
 		</theme_item>
 		<theme_item name="increment" type="Texture">
 		</theme_item>
-		<theme_item name="close" type="Texture">
-		</theme_item>
-		<theme_item name="decrement" type="Texture">
+		<theme_item name="increment_hilite" type="Texture">
 		</theme_item>
-		<theme_item name="font" type="Font">
+		<theme_item name="label_valign_bg" type="int">
 		</theme_item>
-		<theme_item name="tab_fg" type="StyleBox">
+		<theme_item name="label_valign_fg" type="int">
 		</theme_item>
-		<theme_item name="button" type="StyleBox">
+		<theme_item name="panel" type="StyleBox">
 		</theme_item>
 		<theme_item name="tab_bg" type="StyleBox">
 		</theme_item>
-		<theme_item name="panel" type="StyleBox">
+		<theme_item name="tab_fg" type="StyleBox">
 		</theme_item>
-		<theme_item name="button_pressed" type="StyleBox">
+		<theme_item name="top_margin" type="int">
 		</theme_item>
 	</theme_items>
 </class>
 <class name="TestCube" inherits="GeometryInstance" category="Core">
 	<brief_description>
-	A simple cube used for testing in 3D.
+		A simple cube used for testing in 3D.
 	</brief_description>
 	<description>
-	The TestCube is a simple 2x2x2 cube with a basic texture. It can be used as a placeholder, to verify how the lighting looks, to test shaders, or any other task you may need a textured model to test with.
+		The TestCube is a simple 2x2x2 cube with a basic texture. It can be used as a placeholder, to verify how the lighting looks, to test shaders, or any other task you may need a textured model to test with.
 	</description>
 	<methods>
 	</methods>
@@ -38682,201 +39111,174 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="TextEdit" inherits="Control" category="Core">
 	<brief_description>
-	Multiline text editing control.
+		Multiline text editing control.
 	</brief_description>
 	<description>
-	TextEdit is meant for editing large, multiline text. It also has facilities for editing code, such as syntax highlighting support and multiple levels of undo/redo.
+		TextEdit is meant for editing large, multiline text. It also has facilities for editing code, such as syntax highlighting support and multiple levels of undo/redo.
 	</description>
 	<methods>
-		<method name="set_text">
-			<argument index="0" name="text" type="String">
+		<method name="add_color_region">
+			<argument index="0" name="begin_key" type="String">
+			</argument>
+			<argument index="1" name="end_key" type="String">
+			</argument>
+			<argument index="2" name="color" type="Color">
+			</argument>
+			<argument index="3" name="line_only" type="bool" default="false">
 			</argument>
 			<description>
-			Set the entire text.
+				Add color region (given the delimiters) and its colors.
 			</description>
 		</method>
-		<method name="insert_text_at_cursor">
-			<argument index="0" name="text" type="String">
+		<method name="add_keyword_color">
+			<argument index="0" name="keyword" type="String">
+			</argument>
+			<argument index="1" name="color" type="Color">
 			</argument>
 			<description>
-			Insert a given text at the cursor position.
+				Add a keyword and its color.
 			</description>
 		</method>
-		<method name="get_line_count" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="clear_colors">
 			<description>
-			Return the amount of total lines in the text.
+				Clear all the syntax coloring information.
 			</description>
 		</method>
-		<method name="get_text">
-			<return type="String">
-			</return>
+		<method name="clear_undo_history">
 			<description>
-			Return the whole text.
+				Clear the undo history.
 			</description>
 		</method>
-		<method name="get_line" qualifiers="const">
-			<return type="String">
-			</return>
-			<argument index="0" name="line" type="int">
-			</argument>
+		<method name="copy">
 			<description>
-			Return the text of a specific line.
+				Copy the current selection.
 			</description>
 		</method>
-		<method name="cursor_set_column">
-			<argument index="0" name="column" type="int">
-			</argument>
-			<argument index="1" name="adjust_viewport" type="bool" default="false">
-			</argument>
+		<method name="cursor_get_blink_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
+				Gets whether the text editor caret is blinking.
 			</description>
 		</method>
-		<method name="cursor_set_line">
-			<argument index="0" name="line" type="int">
-			</argument>
-			<argument index="1" name="adjust_viewport" type="bool" default="false">
-			</argument>
+		<method name="cursor_get_blink_speed" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
+				Gets the text editor caret blink speed.
 			</description>
 		</method>
 		<method name="cursor_get_column" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the column the editing cursor is at.
+				Return the column the editing cursor is at.
 			</description>
 		</method>
 		<method name="cursor_get_line" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the line the editing cursor is at.
+				Return the line the editing cursor is at.
 			</description>
 		</method>
 		<method name="cursor_set_blink_enabled">
 			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Set the text editor caret to blink.
-			</description>
-		</method>
-		<method name="cursor_get_blink_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
-			Gets whether the text editor caret is blinking.
+				Set the text editor caret to blink.
 			</description>
 		</method>
 		<method name="cursor_set_blink_speed">
 			<argument index="0" name="blink_speed" type="float">
 			</argument>
 			<description>
-			Set the text editor caret blink speed. Cannot be less then or equal to 0.
-			</description>
-		</method>
-		<method name="cursor_get_blink_speed" qualifiers="const">
-			<return type="float">
-			</return>
-			<description>
-			Gets the text editor caret blink speed.
+				Set the text editor caret blink speed. Cannot be less then or equal to 0.
 			</description>
 		</method>
-		<method name="set_readonly">
-			<argument index="0" name="enable" type="bool">
+		<method name="cursor_set_column">
+			<argument index="0" name="column" type="int">
 			</argument>
-			<description>
-			Set the text editor as read-only. Text can be displayed but not edited.
-			</description>
-		</method>
-		<method name="set_wrap">
-			<argument index="0" name="enable" type="bool">
+			<argument index="1" name="adjust_viewport" type="bool" default="false">
 			</argument>
 			<description>
-			Enable text wrapping when it goes beyond he edge of what is visible.
 			</description>
 		</method>
-		<method name="set_max_chars">
-			<argument index="0" name="amount" type="int">
+		<method name="cursor_set_line">
+			<argument index="0" name="line" type="int">
+			</argument>
+			<argument index="1" name="adjust_viewport" type="bool" default="false">
 			</argument>
 			<description>
-			Set the maximum amount of characters editable.
 			</description>
 		</method>
 		<method name="cut">
 			<description>
-			Cut the current selection.
-			</description>
-		</method>
-		<method name="copy">
-			<description>
-			Copy the current selection.
+				Cut the current selection.
 			</description>
 		</method>
-		<method name="paste">
+		<method name="get_line" qualifiers="const">
+			<return type="String">
+			</return>
+			<argument index="0" name="line" type="int">
+			</argument>
 			<description>
-			Paste the current selection.
+				Return the text of a specific line.
 			</description>
 		</method>
-		<method name="select_all">
+		<method name="get_line_count" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Select all the text.
+				Return the amount of total lines in the text.
 			</description>
 		</method>
-		<method name="select">
-			<argument index="0" name="from_line" type="int">
-			</argument>
-			<argument index="1" name="from_column" type="int">
-			</argument>
-			<argument index="2" name="to_line" type="int">
-			</argument>
-			<argument index="3" name="to_column" type="int">
-			</argument>
+		<method name="get_menu" qualifiers="const">
+			<return type="PopupMenu">
+			</return>
 			<description>
-			Perform selection, from line/column to line/column.
 			</description>
 		</method>
-		<method name="is_selection_active" qualifiers="const">
-			<return type="bool">
+		<method name="get_selection_from_column" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return true if the selection is active.
+				Return the selection begin column.
 			</description>
 		</method>
 		<method name="get_selection_from_line" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the selection begin line.
+				Return the selection begin line.
 			</description>
 		</method>
-		<method name="get_selection_from_column" qualifiers="const">
-			<return type="int">
+		<method name="get_selection_text" qualifiers="const">
+			<return type="String">
 			</return>
 			<description>
-			Return the selection begin column.
+				Return the text inside the selection.
 			</description>
 		</method>
-		<method name="get_selection_to_line" qualifiers="const">
+		<method name="get_selection_to_column" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the selection end line.
+				Return the selection end column.
 			</description>
 		</method>
-		<method name="get_selection_to_column" qualifiers="const">
+		<method name="get_selection_to_line" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the selection end column.
+				Return the selection end line.
 			</description>
 		</method>
-		<method name="get_selection_text" qualifiers="const">
+		<method name="get_text">
 			<return type="String">
 			</return>
 			<description>
-			Return the text inside the selection.
+				Return the whole text.
 			</description>
 		</method>
 		<method name="get_word_under_cursor" qualifiers="const">
@@ -38885,6 +39287,43 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
+		<method name="insert_text_at_cursor">
+			<argument index="0" name="text" type="String">
+			</argument>
+			<description>
+				Insert a given text at the cursor position.
+			</description>
+		</method>
+		<method name="is_selection_active" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+				Return true if the selection is active.
+			</description>
+		</method>
+		<method name="is_syntax_coloring_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+				Return true if the syntax coloring is enabled.
+			</description>
+		</method>
+		<method name="menu_option">
+			<argument index="0" name="arg0" type="int">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="paste">
+			<description>
+				Paste the current selection.
+			</description>
+		</method>
+		<method name="redo">
+			<description>
+				Perform redo operation.
+			</description>
+		</method>
 		<method name="search" qualifiers="const">
 			<return type="IntArray">
 			</return>
@@ -38897,105 +39336,95 @@ This method controls whether the position between two cached points is interpola
 			<argument index="3" name="to_line" type="int">
 			</argument>
 			<description>
-			Perform a search inside the text. Search flags can be specified in the SEARCH_* enum.
-			</description>
-		</method>
-		<method name="undo">
-			<description>
-			Perform undo operation.
+				Perform a search inside the text. Search flags can be specified in the SEARCH_* enum.
 			</description>
 		</method>
-		<method name="redo">
+		<method name="select">
+			<argument index="0" name="from_line" type="int">
+			</argument>
+			<argument index="1" name="from_column" type="int">
+			</argument>
+			<argument index="2" name="to_line" type="int">
+			</argument>
+			<argument index="3" name="to_column" type="int">
+			</argument>
 			<description>
-			Perform redo operation.
+				Perform selection, from line/column to line/column.
 			</description>
 		</method>
-		<method name="clear_undo_history">
+		<method name="select_all">
 			<description>
-			Clear the undo history.
+				Select all the text.
 			</description>
 		</method>
-		<method name="set_syntax_coloring">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_custom_bg_color">
+			<argument index="0" name="color" type="Color">
 			</argument>
 			<description>
-			Set to enable the syntax coloring.
+				Set a custom background color. A background color with alpha==0 disables this.
 			</description>
 		</method>
-		<method name="is_syntax_coloring_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
-			Return true if the syntax coloring is enabled.
-			</description>
-		</method>
-		<method name="add_keyword_color">
-			<argument index="0" name="keyword" type="String">
-			</argument>
-			<argument index="1" name="color" type="Color">
+		<method name="set_max_chars">
+			<argument index="0" name="amount" type="int">
 			</argument>
 			<description>
-			Add a keyword and its color.
+				Set the maximum amount of characters editable.
 			</description>
 		</method>
-		<method name="add_color_region">
-			<argument index="0" name="begin_key" type="String">
-			</argument>
-			<argument index="1" name="end_key" type="String">
-			</argument>
-			<argument index="2" name="color" type="Color">
-			</argument>
-			<argument index="3" name="line_only" type="bool" default="false">
+		<method name="set_readonly">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Add color region (given the delimiters) and its colors.
+				Set the text editor as read-only. Text can be displayed but not edited.
 			</description>
 		</method>
 		<method name="set_symbol_color">
 			<argument index="0" name="color" type="Color">
 			</argument>
 			<description>
-			Set the color for symbols.
+				Set the color for symbols.
 			</description>
 		</method>
-		<method name="set_custom_bg_color">
-			<argument index="0" name="color" type="Color">
+		<method name="set_syntax_coloring">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Set a custom background color. A background color with alpha==0 disables this.
+				Set to enable the syntax coloring.
 			</description>
 		</method>
-		<method name="clear_colors">
+		<method name="set_text">
+			<argument index="0" name="text" type="String">
+			</argument>
 			<description>
-			Clear all the syntax coloring information.
+				Set the entire text.
 			</description>
 		</method>
-		<method name="menu_option">
-			<argument index="0" name="arg0" type="int">
+		<method name="set_wrap">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
+				Enable text wrapping when it goes beyond he edge of what is visible.
 			</description>
 		</method>
-		<method name="get_menu" qualifiers="const">
-			<return type="PopupMenu">
-			</return>
+		<method name="undo">
 			<description>
+				Perform undo operation.
 			</description>
 		</method>
 	</methods>
 	<signals>
-		<signal name="text_changed">
+		<signal name="cursor_changed">
 			<description>
-			Emitted when the text changes.
+				Emitted when the cursor changes.
 			</description>
 		</signal>
-		<signal name="cursor_changed">
+		<signal name="request_completion">
 			<description>
-			Emitted when the cursor changes.
 			</description>
 		</signal>
-		<signal name="request_completion">
+		<signal name="text_changed">
 			<description>
+				Emitted when the text changes.
 			</description>
 		</signal>
 	</signals>
@@ -39025,106 +39454,60 @@ This method controls whether the position between two cached points is interpola
 		</constant>
 	</constants>
 	<theme_items>
-		<theme_item name="line_spacing" type="int">
+		<theme_item name="brace_mismatch_color" type="Color">
 		</theme_item>
-		<theme_item name="completion_lines" type="int">
+		<theme_item name="breakpoint_color" type="Color">
 		</theme_item>
-		<theme_item name="completion_max_width" type="int">
+		<theme_item name="caret_color" type="Color">
 		</theme_item>
-		<theme_item name="completion_scroll_width" type="int">
+		<theme_item name="completion" type="StyleBox">
 		</theme_item>
-		<theme_item name="symbol_color" type="Color">
+		<theme_item name="completion_background_color" type="Color">
 		</theme_item>
-		<theme_item name="selection_color" type="Color">
+		<theme_item name="completion_existing_color" type="Color">
 		</theme_item>
-		<theme_item name="completion_existing" type="Color">
+		<theme_item name="completion_lines" type="int">
 		</theme_item>
-		<theme_item name="caret_color" type="Color">
+		<theme_item name="completion_max_width" type="int">
 		</theme_item>
-		<theme_item name="breakpoint_color" type="Color">
+		<theme_item name="completion_scroll_color" type="Color">
 		</theme_item>
-		<theme_item name="font_color_selected" type="Color">
+		<theme_item name="completion_scroll_width" type="int">
 		</theme_item>
-		<theme_item name="font_color" type="Color">
+		<theme_item name="completion_selected_color" type="Color">
 		</theme_item>
-		<theme_item name="completion_scroll_color" type="Color">
+		<theme_item name="current_line_color" type="Color">
 		</theme_item>
-		<theme_item name="brace_mismatch_color" type="Color">
+		<theme_item name="focus" type="StyleBox">
 		</theme_item>
-		<theme_item name="current_line_color" type="Color">
+		<theme_item name="font" type="Font">
 		</theme_item>
-		<theme_item name="mark_color" type="Color">
+		<theme_item name="font_color" type="Color">
 		</theme_item>
-		<theme_item name="tab" type="Texture">
+		<theme_item name="font_color_selected" type="Color">
 		</theme_item>
-		<theme_item name="font" type="Font">
+		<theme_item name="line_spacing" type="int">
 		</theme_item>
-		<theme_item name="focus" type="StyleBox">
+		<theme_item name="mark_color" type="Color">
 		</theme_item>
 		<theme_item name="normal" type="StyleBox">
 		</theme_item>
-		<theme_item name="completion_selected" type="StyleBox">
+		<theme_item name="selection_color" type="Color">
+		</theme_item>
+		<theme_item name="symbol_color" type="Color">
 		</theme_item>
-		<theme_item name="completion" type="StyleBox">
+		<theme_item name="tab" type="Texture">
 		</theme_item>
 	</theme_items>
 </class>
 <class name="Texture" inherits="Resource" category="Core">
 	<brief_description>
-	Texture for 2D and 3D.
+		Texture for 2D and 3D.
 	</brief_description>
 	<description>
-	A texture works by registering an image in the video hardware, which then can be used in 3D models or 2D [Sprite] or GUI [Control].
+		A texture works by registering an image in the video hardware, which then can be used in 3D models or 2D [Sprite] or GUI [Control].
 	</description>
 	<methods>
-		<method name="get_width" qualifiers="const">
-			<return type="int">
-			</return>
-			<description>
-			Return the texture width.
-			</description>
-		</method>
-		<method name="get_height" qualifiers="const">
-			<return type="int">
-			</return>
-			<description>
-			Return the texture height.
-			</description>
-		</method>
-		<method name="get_size" qualifiers="const">
-			<return type="Vector2">
-			</return>
-			<description>
-			Return the texture size.
-			</description>
-		</method>
-		<method name="get_rid" qualifiers="const">
-			<return type="RID">
-			</return>
-			<description>
-			Return the texture RID as used in the [VisualServer].
-			</description>
-		</method>
-		<method name="has_alpha" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="set_flags">
-			<argument index="0" name="flags" type="int">
-			</argument>
-			<description>
-			Change the texture flags.
-			</description>
-		</method>
-		<method name="get_flags" qualifiers="const">
-			<return type="int">
-			</return>
-			<description>
-			Return the current texture flags.
-			</description>
-		</method>
 		<method name="draw" qualifiers="const">
 			<argument index="0" name="canvas_item" type="RID">
 			</argument>
@@ -39165,6 +39548,54 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
+		<method name="get_flags" qualifiers="const">
+			<return type="int">
+			</return>
+			<description>
+				Return the current texture flags.
+			</description>
+		</method>
+		<method name="get_height" qualifiers="const">
+			<return type="int">
+			</return>
+			<description>
+				Return the texture height.
+			</description>
+		</method>
+		<method name="get_rid" qualifiers="const">
+			<return type="RID">
+			</return>
+			<description>
+				Return the texture RID as used in the [VisualServer].
+			</description>
+		</method>
+		<method name="get_size" qualifiers="const">
+			<return type="Vector2">
+			</return>
+			<description>
+				Return the texture size.
+			</description>
+		</method>
+		<method name="get_width" qualifiers="const">
+			<return type="int">
+			</return>
+			<description>
+				Return the texture width.
+			</description>
+		</method>
+		<method name="has_alpha" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="set_flags">
+			<argument index="0" name="flags" type="int">
+			</argument>
+			<description>
+				Change the texture flags.
+			</description>
+		</method>
 	</methods>
 	<constants>
 		<constant name="FLAG_MIPMAPS" value="1">
@@ -39192,106 +39623,106 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="TextureButton" inherits="BaseButton" category="Core">
 	<brief_description>
-	Button that can be themed with textures.
+		Button that can be themed with textures.
 	</brief_description>
 	<description>
-	Button that can be themed with textures. This is like a regular [Button] but can be themed by assigning textures to it. This button is intended to be easy to theme, however a regular button can expand (that uses styleboxes) and still be better if the interface is expect to have internationalization of texts.
-	Only the normal texture is required, the others are optional.
+		Button that can be themed with textures. This is like a regular [Button] but can be themed by assigning textures to it. This button is intended to be easy to theme, however a regular button can expand (that uses styleboxes) and still be better if the interface is expect to have internationalization of texts.
+		Only the normal texture is required, the others are optional.
 	</description>
 	<methods>
-		<method name="set_normal_texture">
-			<argument index="0" name="texture" type="Texture">
-			</argument>
+		<method name="get_click_mask" qualifiers="const">
+			<return type="BitMap">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_pressed_texture">
-			<argument index="0" name="texture" type="Texture">
-			</argument>
+		<method name="get_disabled_texture" qualifiers="const">
+			<return type="Texture">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_hover_texture">
-			<argument index="0" name="texture" type="Texture">
-			</argument>
+		<method name="get_focused_texture" qualifiers="const">
+			<return type="Texture">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_disabled_texture">
-			<argument index="0" name="texture" type="Texture">
-			</argument>
+		<method name="get_hover_texture" qualifiers="const">
+			<return type="Texture">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_focused_texture">
-			<argument index="0" name="texture" type="Texture">
-			</argument>
+		<method name="get_modulate" qualifiers="const">
+			<return type="Color">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_click_mask">
-			<argument index="0" name="mask" type="BitMap">
-			</argument>
+		<method name="get_normal_texture" qualifiers="const">
+			<return type="Texture">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_texture_scale">
-			<argument index="0" name="scale" type="Vector2">
-			</argument>
+		<method name="get_pressed_texture" qualifiers="const">
+			<return type="Texture">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_modulate">
-			<argument index="0" name="color" type="Color">
-			</argument>
+		<method name="get_texture_scale" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_normal_texture" qualifiers="const">
-			<return type="Texture">
-			</return>
+		<method name="set_click_mask">
+			<argument index="0" name="mask" type="BitMap">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_pressed_texture" qualifiers="const">
-			<return type="Texture">
-			</return>
+		<method name="set_disabled_texture">
+			<argument index="0" name="texture" type="Texture">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_hover_texture" qualifiers="const">
-			<return type="Texture">
-			</return>
+		<method name="set_focused_texture">
+			<argument index="0" name="texture" type="Texture">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_disabled_texture" qualifiers="const">
-			<return type="Texture">
-			</return>
+		<method name="set_hover_texture">
+			<argument index="0" name="texture" type="Texture">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_focused_texture" qualifiers="const">
-			<return type="Texture">
-			</return>
+		<method name="set_modulate">
+			<argument index="0" name="color" type="Color">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_click_mask" qualifiers="const">
-			<return type="BitMap">
-			</return>
+		<method name="set_normal_texture">
+			<argument index="0" name="texture" type="Texture">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_texture_scale" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_pressed_texture">
+			<argument index="0" name="texture" type="Texture">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_modulate" qualifiers="const">
-			<return type="Color">
-			</return>
+		<method name="set_texture_scale">
+			<argument index="0" name="scale" type="Vector2">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -39301,32 +39732,32 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="TextureFrame" inherits="Control" category="Core">
 	<brief_description>
-	Control Frame that draws a texture.
+		Control Frame that draws a texture.
 	</brief_description>
 	<description>
-	Control frame that simply draws an assigned texture. It can stretch or not. It's a simple way to just show an image in a UI.
+		Control frame that simply draws an assigned texture. It can stretch or not. It's a simple way to just show an image in a UI.
 	</description>
 	<methods>
-		<method name="set_texture">
-			<argument index="0" name="texture" type="Object">
-			</argument>
+		<method name="get_modulate" qualifiers="const">
+			<return type="Color">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_texture" qualifiers="const">
-			<return type="Object">
+		<method name="get_stretch_mode" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_modulate">
-			<argument index="0" name="modulate" type="Color">
-			</argument>
+		<method name="get_texture" qualifiers="const">
+			<return type="Object">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_modulate" qualifiers="const">
-			<return type="Color">
+		<method name="has_expand" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
@@ -39337,9 +39768,9 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="has_expand" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_modulate">
+			<argument index="0" name="modulate" type="Color">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -39349,9 +39780,9 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_stretch_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_texture">
+			<argument index="0" name="texture" type="Object">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -39375,27 +39806,27 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="TextureProgress" inherits="Range" category="Core">
 	<brief_description>
-	Textured progress bar implementation.
+		Textured progress bar implementation.
 	</brief_description>
 	<description>
-	[ProgressBar] implementation that is easier to theme (by just passing a few textures).
+		[ProgressBar] implementation that is easier to theme (by just passing a few textures).
 	</description>
 	<methods>
-		<method name="set_under_texture">
-			<argument index="0" name="tex" type="Object">
-			</argument>
+		<method name="get_fill_degrees">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_under_texture" qualifiers="const">
-			<return type="Object">
+		<method name="get_fill_mode">
+			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_progress_texture">
-			<argument index="0" name="tex" type="Object">
-			</argument>
+		<method name="get_over_texture" qualifiers="const">
+			<return type="Object">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -39405,39 +39836,45 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="set_over_texture">
-			<argument index="0" name="tex" type="Object">
-			</argument>
+		<method name="get_radial_center_offset">
+			<return type="Vector2">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_over_texture" qualifiers="const">
+		<method name="get_radial_initial_angle">
+			<return type="float">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="get_under_texture" qualifiers="const">
 			<return type="Object">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_fill_mode">
-			<argument index="0" name="mode" type="int">
+		<method name="set_fill_degrees">
+			<argument index="0" name="mode" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_fill_mode">
-			<return type="int">
-			</return>
+		<method name="set_fill_mode">
+			<argument index="0" name="mode" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_radial_initial_angle">
-			<argument index="0" name="mode" type="float">
+		<method name="set_over_texture">
+			<argument index="0" name="tex" type="Object">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_radial_initial_angle">
-			<return type="float">
-			</return>
+		<method name="set_progress_texture">
+			<argument index="0" name="tex" type="Object">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -39447,21 +39884,15 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_radial_center_offset">
-			<return type="Vector2">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="set_fill_degrees">
+		<method name="set_radial_initial_angle">
 			<argument index="0" name="mode" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_fill_degrees">
-			<return type="float">
-			</return>
+		<method name="set_under_texture">
+			<argument index="0" name="tex" type="Object">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -39483,26 +39914,22 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Theme" inherits="Resource" category="Core">
 	<brief_description>
-	Theme for controls.
+		Theme for controls.
 	</brief_description>
 	<description>
-	Theme for skinning controls. Controls can be skinned individually, but for complex applications it's more efficient to just create a global theme that defines everything. This theme can be applied to any [Control], and it and its children will automatically use it.
-	Theme resources can be alternatively loaded by writing them in a .theme file, see wiki for more info.
+		Theme for skinning controls. Controls can be skinned individually, but for complex applications it's more efficient to just create a global theme that defines everything. This theme can be applied to any [Control], and it and its children will automatically use it.
+		Theme resources can be alternatively loaded by writing them in a .theme file, see docs for more info.
 	</description>
 	<methods>
-		<method name="set_icon">
+		<method name="clear_color">
 			<argument index="0" name="name" type="String">
 			</argument>
 			<argument index="1" name="type" type="String">
 			</argument>
-			<argument index="2" name="texture" type="Texture">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_icon" qualifiers="const">
-			<return type="Texture">
-			</return>
+		<method name="clear_constant">
 			<argument index="0" name="name" type="String">
 			</argument>
 			<argument index="1" name="type" type="String">
@@ -39510,9 +39937,7 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="has_icon" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="clear_font">
 			<argument index="0" name="name" type="String">
 			</argument>
 			<argument index="1" name="type" type="String">
@@ -39528,26 +39953,20 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_icon_list" qualifiers="const">
-			<return type="StringArray">
-			</return>
-			<argument index="0" name="type" type="String">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="set_stylebox">
+		<method name="clear_stylebox">
 			<argument index="0" name="name" type="String">
 			</argument>
 			<argument index="1" name="type" type="String">
 			</argument>
-			<argument index="2" name="texture" type="StyleBox">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_stylebox" qualifiers="const">
-			<return type="StyleBox">
+		<method name="copy_default_theme">
+			<description>
+			</description>
+		</method>
+		<method name="get_color" qualifiers="const">
+			<return type="Color">
 			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
@@ -39556,17 +39975,17 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="has_stylebox" qualifiers="const">
-			<return type="bool">
+		<method name="get_color_list" qualifiers="const">
+			<return type="StringArray">
 			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
-			<argument index="1" name="type" type="String">
+			<argument index="0" name="type" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="clear_stylebox">
+		<method name="get_constant" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
 			<argument index="1" name="type" type="String">
@@ -39574,7 +39993,7 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_stylebox_list" qualifiers="const">
+		<method name="get_constant_list" qualifiers="const">
 			<return type="StringArray">
 			</return>
 			<argument index="0" name="type" type="String">
@@ -39582,24 +40001,32 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_stylebox_types" qualifiers="const">
-			<return type="StringArray">
+		<method name="get_default_font" qualifiers="const">
+			<return type="Object">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_font">
+		<method name="get_font" qualifiers="const">
+			<return type="Font">
+			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
 			<argument index="1" name="type" type="String">
 			</argument>
-			<argument index="2" name="font" type="Font">
+			<description>
+			</description>
+		</method>
+		<method name="get_font_list" qualifiers="const">
+			<return type="StringArray">
+			</return>
+			<argument index="0" name="type" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_font" qualifiers="const">
-			<return type="Font">
+		<method name="get_icon" qualifiers="const">
+			<return type="Texture">
 			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
@@ -39608,17 +40035,17 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="has_font" qualifiers="const">
-			<return type="bool">
+		<method name="get_icon_list" qualifiers="const">
+			<return type="StringArray">
 			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
-			<argument index="1" name="type" type="String">
+			<argument index="0" name="type" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="clear_font">
+		<method name="get_stylebox" qualifiers="const">
+			<return type="StyleBox">
+			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
 			<argument index="1" name="type" type="String">
@@ -39626,7 +40053,7 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_font_list" qualifiers="const">
+		<method name="get_stylebox_list" qualifiers="const">
 			<return type="StringArray">
 			</return>
 			<argument index="0" name="type" type="String">
@@ -39634,22 +40061,16 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="set_color">
-			<argument index="0" name="name" type="String">
-			</argument>
-			<argument index="1" name="type" type="String">
-			</argument>
-			<argument index="2" name="color" type="Color">
-			</argument>
+		<method name="get_stylebox_types" qualifiers="const">
+			<return type="StringArray">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_color" qualifiers="const">
-			<return type="Color">
+		<method name="get_type_list" qualifiers="const">
+			<return type="StringArray">
 			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
-			<argument index="1" name="type" type="String">
+			<argument index="0" name="type" type="String">
 			</argument>
 			<description>
 			</description>
@@ -39664,7 +40085,9 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="clear_color">
+		<method name="has_constant" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
 			<argument index="1" name="type" type="String">
@@ -39672,26 +40095,18 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_color_list" qualifiers="const">
-			<return type="StringArray">
+		<method name="has_font" qualifiers="const">
+			<return type="bool">
 			</return>
-			<argument index="0" name="type" type="String">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="set_constant">
 			<argument index="0" name="name" type="String">
 			</argument>
 			<argument index="1" name="type" type="String">
 			</argument>
-			<argument index="2" name="constant" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_constant" qualifiers="const">
-			<return type="int">
+		<method name="has_icon" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
@@ -39700,7 +40115,7 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="has_constant" qualifiers="const">
+		<method name="has_stylebox" qualifiers="const">
 			<return type="bool">
 			</return>
 			<argument index="0" name="name" type="String">
@@ -39710,18 +40125,22 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="clear_constant">
+		<method name="set_color">
 			<argument index="0" name="name" type="String">
 			</argument>
 			<argument index="1" name="type" type="String">
 			</argument>
+			<argument index="2" name="color" type="Color">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_constant_list" qualifiers="const">
-			<return type="StringArray">
-			</return>
-			<argument index="0" name="type" type="String">
+		<method name="set_constant">
+			<argument index="0" name="name" type="String">
+			</argument>
+			<argument index="1" name="type" type="String">
+			</argument>
+			<argument index="2" name="constant" type="int">
 			</argument>
 			<description>
 			</description>
@@ -39732,21 +40151,33 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_default_font" qualifiers="const">
-			<return type="Object">
-			</return>
+		<method name="set_font">
+			<argument index="0" name="name" type="String">
+			</argument>
+			<argument index="1" name="type" type="String">
+			</argument>
+			<argument index="2" name="font" type="Font">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_type_list" qualifiers="const">
-			<return type="StringArray">
-			</return>
-			<argument index="0" name="type" type="String">
+		<method name="set_icon">
+			<argument index="0" name="name" type="String">
+			</argument>
+			<argument index="1" name="type" type="String">
+			</argument>
+			<argument index="2" name="texture" type="Texture">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="copy_default_theme">
+		<method name="set_stylebox">
+			<argument index="0" name="name" type="String">
+			</argument>
+			<argument index="1" name="type" type="String">
+			</argument>
+			<argument index="2" name="texture" type="StyleBox">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -39756,12 +40187,26 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Thread" inherits="Reference" category="Core">
 	<brief_description>
-	A unit of execution in a process.
+		A unit of execution in a process.
 	</brief_description>
 	<description>
-	A unit of execution in a process. Can run methods on [Object]s simultaneously. The use of synchronization via [Mutex], [Semaphore] is advised if working with shared objects.
+		A unit of execution in a process. Can run methods on [Object]s simultaneously. The use of synchronization via [Mutex], [Semaphore] is advised if working with shared objects.
 	</description>
 	<methods>
+		<method name="get_id" qualifiers="const">
+			<return type="String">
+			</return>
+			<description>
+				Return the id of the thread, uniquely identifying it among all threads.
+			</description>
+		</method>
+		<method name="is_active" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+				Whether this thread is currently active, an active Thread cannot start work on a new method but can be joined with [method wait_to_finish].
+			</description>
+		</method>
 		<method name="start">
 			<return type="Error">
 			</return>
@@ -39774,29 +40219,15 @@ This method controls whether the position between two cached points is interpola
 			<argument index="3" name="priority" type="int" default="1">
 			</argument>
 			<description>
-			Start a new [Thread], it will run "method" on object "instance" using "userdata" as an argument and running with "priority", one of PRIORITY_* enum.
-			Returns OK on success, or ERR_CANT_CREATE on failure.
-			</description>
-		</method>
-		<method name="get_id" qualifiers="const">
-			<return type="String">
-			</return>
-			<description>
-			Return the id of the thread, uniquely identifying it among all threads.
-			</description>
-		</method>
-		<method name="is_active" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
-			Whether this thread is currently active, an active Thread cannot start work on a new method but can be joined with [method wait_to_finish].
+				Start a new [Thread], it will run "method" on object "instance" using "userdata" as an argument and running with "priority", one of PRIORITY_* enum.
+				Returns OK on success, or ERR_CANT_CREATE on failure.
 			</description>
 		</method>
 		<method name="wait_to_finish">
 			<return type="Variant">
 			</return>
 			<description>
-			Joins the [Thread] and waits for it to finish. Returns what the method called returned.
+				Joins the [Thread] and waits for it to finish. Returns what the method called returned.
 			</description>
 		</method>
 	</methods>
@@ -39811,240 +40242,199 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="TileMap" inherits="Node2D" category="Core">
 	<brief_description>
-	Node for 2D tile-based games.
+		Node for 2D tile-based games.
 	</brief_description>
 	<description>
-	Node for 2D tile-based games. Tilemaps use a [TileSet] which contain a list of tiles (textures, their rect and a collision) and are used to create complex grid-based maps.
-	To optimize drawing and culling (sort of like [GridMap]), you can specify a quadrant size, so chunks of the map will be batched together at drawing time.
+		Node for 2D tile-based games. Tilemaps use a [TileSet] which contain a list of tiles (textures, their rect and a collision) and are used to create complex grid-based maps.
+		To optimize drawing and culling (sort of like [GridMap]), you can specify a quadrant size, so chunks of the map will be batched together at drawing time.
 	</description>
 	<methods>
-		<method name="set_tileset">
-			<argument index="0" name="tileset" type="TileSet">
-			</argument>
+		<method name="clear">
 			<description>
-			Set the current tileset.
+				Clear all cells.
 			</description>
 		</method>
-		<method name="get_tileset" qualifiers="const">
-			<return type="TileSet">
+		<method name="get_cell" qualifiers="const">
+			<return type="int">
 			</return>
-			<description>
-			Return the current tileset.
-			</description>
-		</method>
-		<method name="set_mode">
-			<argument index="0" name="mode" type="int">
+			<argument index="0" name="x" type="int">
+			</argument>
+			<argument index="1" name="y" type="int">
 			</argument>
 			<description>
-			Set the orientation mode as square, isometric or custom (use MODE_* constants as argument).
+				Return the tile index of the referenced cell.
 			</description>
 		</method>
-		<method name="get_mode" qualifiers="const">
-			<return type="int">
+		<method name="get_cell_size" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<description>
-			Return the orientation mode.
+				Return the cell size.
 			</description>
 		</method>
-		<method name="set_half_offset">
-			<argument index="0" name="half_offset" type="int">
-			</argument>
-			<description>
-			Set an half offset on the X coordinate, Y coordinate, or none (use HALF_OFFSET_* constants as argument).
-			Half offset sets every other tile off by a half tile size in the specified direction.
-			</description>
-		</method>
-		<method name="get_half_offset" qualifiers="const">
+		<method name="get_cellv" qualifiers="const">
 			<return type="int">
 			</return>
-			<description>
-			Return the current half offset configuration.
-			</description>
-		</method>
-		<method name="set_custom_transform">
-			<argument index="0" name="custom_transform" type="Matrix32">
+			<argument index="0" name="pos" type="Vector2">
 			</argument>
 			<description>
-			Set custom transform matrix, to use in combination with the custom orientation mode.
+				Return the tile index of the cell referenced by a Vector2.
 			</description>
 		</method>
-		<method name="get_custom_transform" qualifiers="const">
-			<return type="Matrix32">
+		<method name="get_center_x" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the custom transform matrix.
+				Return true if tiles are to be centered in x coordinate (by default this is false and they are drawn from upper left cell corner).
 			</description>
 		</method>
-		<method name="set_cell_size">
-			<argument index="0" name="size" type="Vector2">
-			</argument>
+		<method name="get_center_y" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set the cell size.
+				Return true if tiles are to be centered in y coordinate (by default this is false and they are drawn from upper left cell corner).
 			</description>
 		</method>
-		<method name="get_cell_size" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_collision_bounce" qualifiers="const">
+			<return type="float">
 			</return>
 			<description>
-			Return the cell size.
+				Return the collision bounce parameter.
 			</description>
 		</method>
-		<method name="set_quadrant_size">
-			<argument index="0" name="size" type="int">
-			</argument>
+		<method name="get_collision_friction" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the quadrant size, this optimizes drawing by batching chunks of map at draw/cull time.
-			Allowed values are integers ranging from 1 to 128.
+				Return the collision friction parameter.
 			</description>
 		</method>
-		<method name="get_quadrant_size" qualifiers="const">
+		<method name="get_collision_layer" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the quadrant size.
+				Return the collision layer.
 			</description>
 		</method>
-		<method name="set_tile_origin">
-			<argument index="0" name="origin" type="int">
-			</argument>
-			<description>
-			Set the tile origin to the tile center or its top-left corner (use TILE_ORIGIN_* constants as argument).
-			</description>
-		</method>
-		<method name="get_tile_origin" qualifiers="const">
+		<method name="get_collision_mask" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the tile origin configuration.
+				Return the collision mask.
 			</description>
 		</method>
-		<method name="set_center_x">
-			<argument index="0" name="enable" type="bool">
-			</argument>
-			<description>
-			Set tiles to be centered in x coordinate. (by default this is false and they are drawn from upper left cell corner).
-			</description>
-		</method>
-		<method name="get_center_x" qualifiers="const">
+		<method name="get_collision_use_kinematic" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if tiles are to be centered in x coordinate (by default this is false and they are drawn from upper left cell corner).
+				Return whether the tilemap handles collisions as a kinematic body.
 			</description>
 		</method>
-		<method name="set_center_y">
-			<argument index="0" name="enable" type="bool">
-			</argument>
-			<description>
-			Set tiles to be centered in y coordinate. (by default this is false and they are drawn from upper left cell corner).
-			</description>
-		</method>
-		<method name="get_center_y" qualifiers="const">
-			<return type="bool">
+		<method name="get_custom_transform" qualifiers="const">
+			<return type="Matrix32">
 			</return>
 			<description>
-			Return true if tiles are to be centered in y coordinate (by default this is false and they are drawn from upper left cell corner).
-			</description>
-		</method>
-		<method name="set_y_sort_mode">
-			<argument index="0" name="enable" type="bool">
-			</argument>
-			<description>
-			Set the Y sort mode. Enabled Y sort mode means that children of the tilemap will be drawn in the order defined by their Y coordinate.
-			A tile with a higher Y coordinate will therefore be drawn later, potentially covering up the tile(s) above it if its sprite is higher than its cell size.
+				Return the custom transform matrix.
 			</description>
 		</method>
-		<method name="is_y_sort_mode_enabled" qualifiers="const">
-			<return type="bool">
+		<method name="get_half_offset" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return the Y sort mode.
+				Return the current half offset configuration.
 			</description>
 		</method>
-		<method name="set_collision_use_kinematic">
-			<argument index="0" name="use_kinematic" type="bool">
-			</argument>
+		<method name="get_mode" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the tilemap to handle collisions as a kinematic body (enabled) or a static body (disabled).
+				Return the orientation mode.
 			</description>
 		</method>
-		<method name="get_collision_use_kinematic" qualifiers="const">
-			<return type="bool">
+		<method name="get_occluder_light_mask" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return whether the tilemap handles collisions as a kinematic body.
 			</description>
 		</method>
-		<method name="set_collision_layer">
-			<argument index="0" name="mask" type="int">
-			</argument>
+		<method name="get_quadrant_size" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the collision layer.
-			Layers are referenced by binary indexes, so allowable values to describe the 20 available layers range from 0 to 2^20-1.
+				Return the quadrant size.
 			</description>
 		</method>
-		<method name="get_collision_layer" qualifiers="const">
+		<method name="get_tile_origin" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Return the collision layer.
+				Return the tile origin configuration.
 			</description>
 		</method>
-		<method name="set_collision_mask">
-			<argument index="0" name="mask" type="int">
-			</argument>
+		<method name="get_tileset" qualifiers="const">
+			<return type="TileSet">
+			</return>
 			<description>
-			Set the collision masks.
-			Masks are referenced by binary indexes, so allowable values to describe the 20 available masks range from 0 to 2^20-1.
+				Return the current tileset.
 			</description>
 		</method>
-		<method name="get_collision_mask" qualifiers="const">
-			<return type="int">
+		<method name="get_used_cells" qualifiers="const">
+			<return type="Array">
 			</return>
 			<description>
-			Return the collision mask.
+				Return an array of all cells containing a tile from the tileset (i.e. a tile index different from -1).
 			</description>
 		</method>
-		<method name="set_collision_friction">
-			<argument index="0" name="value" type="float">
+		<method name="is_cell_transposed" qualifiers="const">
+			<return type="bool">
+			</return>
+			<argument index="0" name="x" type="int">
+			</argument>
+			<argument index="1" name="y" type="int">
 			</argument>
 			<description>
-			Set the collision friction parameter.
-			Allowable values range from 0 to 1.
+				Return whether the referenced cell is transposed, i.e. the X and Y axes are swapped (mirroring with regard to the (1,1) vector).
 			</description>
 		</method>
-		<method name="get_collision_friction" qualifiers="const">
-			<return type="float">
+		<method name="is_cell_x_flipped" qualifiers="const">
+			<return type="bool">
 			</return>
-			<description>
-			Return the collision friction parameter.
-			</description>
-		</method>
-		<method name="set_collision_bounce">
-			<argument index="0" name="value" type="float">
+			<argument index="0" name="x" type="int">
+			</argument>
+			<argument index="1" name="y" type="int">
 			</argument>
 			<description>
-			Set the collision bounce parameter.
-			Allowable values range from 0 to 1.
+				Return whether the referenced cell is flipped over the X axis.
 			</description>
 		</method>
-		<method name="get_collision_bounce" qualifiers="const">
-			<return type="float">
+		<method name="is_cell_y_flipped" qualifiers="const">
+			<return type="bool">
 			</return>
+			<argument index="0" name="x" type="int">
+			</argument>
+			<argument index="1" name="y" type="int">
+			</argument>
 			<description>
-			Return the collision bounce parameter.
+				Return whether the referenced cell is flipped over the Y axis.
 			</description>
 		</method>
-		<method name="set_occluder_light_mask">
-			<argument index="0" name="mask" type="int">
-			</argument>
+		<method name="is_y_sort_mode_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
+				Return the Y sort mode.
 			</description>
 		</method>
-		<method name="get_occluder_light_mask" qualifiers="const">
-			<return type="int">
+		<method name="map_to_world" qualifiers="const">
+			<return type="Vector2">
 			</return>
+			<argument index="0" name="mappos" type="Vector2">
+			</argument>
+			<argument index="1" name="ignore_half_ofs" type="bool" default="false">
+			</argument>
 			<description>
+				Return the absolute world position corresponding to the tilemap (grid-based) coordinates given as an argument.
+				Optionally, the tilemap's potential half offset can be ignored.
 			</description>
 		</method>
 		<method name="set_cell">
@@ -40061,9 +40451,16 @@ This method controls whether the position between two cached points is interpola
 			<argument index="5" name="transpose" type="bool" default="false">
 			</argument>
 			<description>
-			Set the tile index for the cell referenced by its grid-based X and Y coordinates.
-			A tile index of -1 clears the cell.
-			Optionally, the tile can also be flipped over the X and Y coordinates or transposed.
+				Set the tile index for the cell referenced by its grid-based X and Y coordinates.
+				A tile index of -1 clears the cell.
+				Optionally, the tile can also be flipped over the X and Y coordinates or transposed.
+			</description>
+		</method>
+		<method name="set_cell_size">
+			<argument index="0" name="size" type="Vector2">
+			</argument>
+			<description>
+				Set the cell size.
 			</description>
 		</method>
 		<method name="set_cellv">
@@ -40078,86 +40475,118 @@ This method controls whether the position between two cached points is interpola
 			<argument index="4" name="transpose" type="bool" default="false">
 			</argument>
 			<description>
-			Set the tile index for the cell referenced by a Vector2 of grid-based coordinates.
-			A tile index of -1 clears the cell.
-			Optionally, the tile can also be flipped over the X and Y axes or transposed.
+				Set the tile index for the cell referenced by a Vector2 of grid-based coordinates.
+				A tile index of -1 clears the cell.
+				Optionally, the tile can also be flipped over the X and Y axes or transposed.
 			</description>
 		</method>
-		<method name="get_cell" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="x" type="int">
+		<method name="set_center_x">
+			<argument index="0" name="enable" type="bool">
 			</argument>
-			<argument index="1" name="y" type="int">
+			<description>
+				Set tiles to be centered in x coordinate. (by default this is false and they are drawn from upper left cell corner).
+			</description>
+		</method>
+		<method name="set_center_y">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Return the tile index of the referenced cell.
+				Set tiles to be centered in y coordinate. (by default this is false and they are drawn from upper left cell corner).
 			</description>
 		</method>
-		<method name="get_cellv" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="pos" type="Vector2">
+		<method name="set_collision_bounce">
+			<argument index="0" name="value" type="float">
 			</argument>
 			<description>
-			Return the tile index of the cell referenced by a Vector2.
+				Set the collision bounce parameter. Allowable values range from 0 to 1.
 			</description>
 		</method>
-		<method name="is_cell_x_flipped" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="x" type="int">
+		<method name="set_collision_friction">
+			<argument index="0" name="value" type="float">
 			</argument>
-			<argument index="1" name="y" type="int">
+			<description>
+				Set the collision friction parameter. Allowable values range from 0 to 1.
+			</description>
+		</method>
+		<method name="set_collision_layer">
+			<argument index="0" name="mask" type="int">
 			</argument>
 			<description>
-			Return whether the referenced cell is flipped over the X axis.
+				Set the collision layer.
+				Layers are referenced by binary indexes, so allowable values to describe the 20 available layers range from 0 to 2^20-1.
 			</description>
 		</method>
-		<method name="is_cell_y_flipped" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="x" type="int">
+		<method name="set_collision_mask">
+			<argument index="0" name="mask" type="int">
 			</argument>
-			<argument index="1" name="y" type="int">
+			<description>
+				Set the collision masks.
+				Masks are referenced by binary indexes, so allowable values to describe the 20 available masks range from 0 to 2^20-1.
+			</description>
+		</method>
+		<method name="set_collision_use_kinematic">
+			<argument index="0" name="use_kinematic" type="bool">
 			</argument>
 			<description>
-			Return whether the referenced cell is flipped over the Y axis.
+				Set the tilemap to handle collisions as a kinematic body (enabled) or a static body (disabled).
 			</description>
 		</method>
-		<method name="is_cell_transposed" qualifiers="const">
-			<return type="bool">
-			</return>
-			<argument index="0" name="x" type="int">
+		<method name="set_custom_transform">
+			<argument index="0" name="custom_transform" type="Matrix32">
 			</argument>
-			<argument index="1" name="y" type="int">
+			<description>
+				Set custom transform matrix, to use in combination with the custom orientation mode.
+			</description>
+		</method>
+		<method name="set_half_offset">
+			<argument index="0" name="half_offset" type="int">
 			</argument>
 			<description>
-			Return whether the referenced cell is transposed, i.e. the X and Y axes are swapped (mirroring with regard to the (1,1) vector).
+				Set an half offset on the X coordinate, Y coordinate, or none (use HALF_OFFSET_* constants as argument).
+				Half offset sets every other tile off by a half tile size in the specified direction.
 			</description>
 		</method>
-		<method name="clear">
+		<method name="set_mode">
+			<argument index="0" name="mode" type="int">
+			</argument>
 			<description>
-			Clear all cells.
+				Set the orientation mode as square, isometric or custom (use MODE_* constants as argument).
 			</description>
 		</method>
-		<method name="get_used_cells" qualifiers="const">
-			<return type="Array">
-			</return>
+		<method name="set_occluder_light_mask">
+			<argument index="0" name="mask" type="int">
+			</argument>
 			<description>
-			Return an array of all cells containing a tile from the tileset (i.e. a tile index different from -1).
 			</description>
 		</method>
-		<method name="map_to_world" qualifiers="const">
-			<return type="Vector2">
-			</return>
-			<argument index="0" name="mappos" type="Vector2">
+		<method name="set_quadrant_size">
+			<argument index="0" name="size" type="int">
 			</argument>
-			<argument index="1" name="ignore_half_ofs" type="bool" default="false">
+			<description>
+				Set the quadrant size, this optimizes drawing by batching chunks of map at draw/cull time.
+				Allowed values are integers ranging from 1 to 128.
+			</description>
+		</method>
+		<method name="set_tile_origin">
+			<argument index="0" name="origin" type="int">
+			</argument>
+			<description>
+				Set the tile origin to the tile center or its top-left corner (use TILE_ORIGIN_* constants as argument).
+			</description>
+		</method>
+		<method name="set_tileset">
+			<argument index="0" name="tileset" type="TileSet">
 			</argument>
 			<description>
-			Return the absolute world position corresponding to the tilemap (grid-based) coordinates given as an argument.
-			Optionally, the tilemap's potential half offset can be ignored.
+				Set the current tileset.
+			</description>
+		</method>
+		<method name="set_y_sort_mode">
+			<argument index="0" name="enable" type="bool">
+			</argument>
+			<description>
+				Set the Y sort mode. Enabled Y sort mode means that children of the tilemap will be drawn in the order defined by their Y coordinate.
+				A tile with a higher Y coordinate will therefore be drawn later, potentially covering up the tile(s) above it if its sprite is higher than its cell size.
 			</description>
 		</method>
 		<method name="world_to_map" qualifiers="const">
@@ -40166,14 +40595,14 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="worldpos" type="Vector2">
 			</argument>
 			<description>
-			Return the tilemap (grid-based) coordinates corresponding to the absolute world position given as an argument.
+				Return the tilemap (grid-based) coordinates corresponding to the absolute world position given as an argument.
 			</description>
 		</method>
 	</methods>
 	<signals>
 		<signal name="settings_changed">
 			<description>
-			Signal indicating that a tilemap setting has changed.
+				Signal indicating that a tilemap setting has changed.
 			</description>
 		</signal>
 	</signals>
@@ -40209,117 +40638,107 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="TileSet" inherits="Resource" category="Core">
 	<brief_description>
-	Tile library for tilemaps.
+		Tile library for tilemaps.
 	</brief_description>
 	<description>
-	A TileSet is a library of tiles for a [TileMap]. It contains a list of tiles, each consisting of a sprite and optional collision shapes.
-	Tiles are referenced by a unique integer ID.
+		A TileSet is a library of tiles for a [TileMap]. It contains a list of tiles, each consisting of a sprite and optional collision shapes.
+		Tiles are referenced by a unique integer ID.
 	</description>
 	<methods>
-		<method name="create_tile">
-			<argument index="0" name="id" type="int">
-			</argument>
+		<method name="clear">
 			<description>
-			Create a new tile which will be referenced by the given ID.
+				Clear all tiles.
 			</description>
 		</method>
-		<method name="tile_set_name">
+		<method name="create_tile">
 			<argument index="0" name="id" type="int">
 			</argument>
-			<argument index="1" name="name" type="String">
-			</argument>
 			<description>
-			Set the name of the tile, for descriptive purposes.
+				Create a new tile which will be referenced by the given ID.
 			</description>
 		</method>
-		<method name="tile_get_name" qualifiers="const">
-			<return type="String">
+		<method name="find_tile_by_name" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="id" type="int">
+			<argument index="0" name="name" type="String">
 			</argument>
 			<description>
-			Return the name of the tile.
+				Find the first tile matching the given name.
 			</description>
 		</method>
-		<method name="tile_set_texture">
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="texture" type="Texture">
-			</argument>
+		<method name="get_last_unused_tile_id" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Set the texture of the tile.
+				Return the ID following the last currently used ID, useful when creating a new tile.
 			</description>
 		</method>
-		<method name="tile_get_texture" qualifiers="const">
-			<return type="Texture">
+		<method name="get_tiles_ids" qualifiers="const">
+			<return type="Array">
 			</return>
-			<argument index="0" name="id" type="int">
-			</argument>
 			<description>
-			Return the texture of the tile.
+				Return an array of all currently used tile IDs.
 			</description>
 		</method>
-		<method name="tile_set_material">
+		<method name="remove_tile">
 			<argument index="0" name="id" type="int">
 			</argument>
-			<argument index="1" name="material" type="CanvasItemMaterial">
-			</argument>
 			<description>
-			Set the material of the tile.
+				Remove the tile referenced by the given ID.
 			</description>
 		</method>
-		<method name="tile_get_material" qualifiers="const">
-			<return type="CanvasItemMaterial">
+		<method name="tile_get_light_occluder" qualifiers="const">
+			<return type="OccluderPolygon2D">
 			</return>
 			<argument index="0" name="id" type="int">
 			</argument>
 			<description>
-			Return the material of the tile.
+				Return the light occluder of the tile.
 			</description>
 		</method>
-		<method name="tile_set_texture_offset">
+		<method name="tile_get_material" qualifiers="const">
+			<return type="CanvasItemMaterial">
+			</return>
 			<argument index="0" name="id" type="int">
 			</argument>
-			<argument index="1" name="texture_offset" type="Vector2">
-			</argument>
 			<description>
-			Set the texture offset of the tile.
+				Return the material of the tile.
 			</description>
 		</method>
-		<method name="tile_get_texture_offset" qualifiers="const">
-			<return type="Vector2">
+		<method name="tile_get_name" qualifiers="const">
+			<return type="String">
 			</return>
 			<argument index="0" name="id" type="int">
 			</argument>
 			<description>
-			Return the texture offset of the tile.
+				Return the name of the tile.
 			</description>
 		</method>
-		<method name="tile_set_shape_offset">
+		<method name="tile_get_navigation_polygon" qualifiers="const">
+			<return type="NavigationPolygon">
+			</return>
 			<argument index="0" name="id" type="int">
 			</argument>
-			<argument index="1" name="shape_offset" type="Vector2">
-			</argument>
 			<description>
-			Set the shape offset of the tile.
+				Return the navigation polygon of the tile.
 			</description>
 		</method>
-		<method name="tile_get_shape_offset" qualifiers="const">
+		<method name="tile_get_navigation_polygon_offset" qualifiers="const">
 			<return type="Vector2">
 			</return>
 			<argument index="0" name="id" type="int">
 			</argument>
 			<description>
-			Return the shape offset of the tile.
+				Return the offset of the tile's navigation polygon.
 			</description>
 		</method>
-		<method name="tile_set_region">
+		<method name="tile_get_occluder_offset" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<argument index="0" name="id" type="int">
 			</argument>
-			<argument index="1" name="region" type="Rect2">
-			</argument>
 			<description>
-			Set the tile sub-region in the texture. This is common in texture atlases.
+				Return the offset of the tile's light occluder.
 			</description>
 		</method>
 		<method name="tile_get_region" qualifiers="const">
@@ -40328,16 +40747,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="id" type="int">
 			</argument>
 			<description>
-			Return the tile sub-region in the texture.
-			</description>
-		</method>
-		<method name="tile_set_shape">
-			<argument index="0" name="id" type="int">
-			</argument>
-			<argument index="1" name="shape" type="Shape2D">
-			</argument>
-			<description>
-			Set a shape for the tile, enabling physics to collide with it.
+				Return the tile sub-region in the texture.
 			</description>
 		</method>
 		<method name="tile_get_shape" qualifiers="const">
@@ -40346,16 +40756,16 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="id" type="int">
 			</argument>
 			<description>
-			Return the shape of the tile.
+				Return the shape of the tile.
 			</description>
 		</method>
-		<method name="tile_set_shapes">
+		<method name="tile_get_shape_offset" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<argument index="0" name="id" type="int">
 			</argument>
-			<argument index="1" name="shapes" type="Array">
-			</argument>
 			<description>
-			Set an array of shapes for the tile, enabling physics to collide with it.
+				Return the shape offset of the tile.
 			</description>
 		</method>
 		<method name="tile_get_shapes" qualifiers="const">
@@ -40364,61 +40774,70 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="id" type="int">
 			</argument>
 			<description>
-			Return the array of shapes of the tile.
+				Return the array of shapes of the tile.
 			</description>
 		</method>
-		<method name="tile_set_navigation_polygon">
+		<method name="tile_get_texture" qualifiers="const">
+			<return type="Texture">
+			</return>
 			<argument index="0" name="id" type="int">
 			</argument>
-			<argument index="1" name="navigation_polygon" type="NavigationPolygon">
-			</argument>
 			<description>
-			Set a navigation polygon for the tile.
+				Return the texture of the tile.
 			</description>
 		</method>
-		<method name="tile_get_navigation_polygon" qualifiers="const">
-			<return type="NavigationPolygon">
+		<method name="tile_get_texture_offset" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<argument index="0" name="id" type="int">
 			</argument>
 			<description>
-			Return the navigation polygon of the tile.
+				Return the texture offset of the tile.
 			</description>
 		</method>
-		<method name="tile_set_navigation_polygon_offset">
+		<method name="tile_set_light_occluder">
 			<argument index="0" name="id" type="int">
 			</argument>
-			<argument index="1" name="navigation_polygon_offset" type="Vector2">
+			<argument index="1" name="light_occluder" type="OccluderPolygon2D">
 			</argument>
 			<description>
-			Set an offset for the tile's navigation polygon.
+				Set a light occluder for the tile.
 			</description>
 		</method>
-		<method name="tile_get_navigation_polygon_offset" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="tile_set_material">
 			<argument index="0" name="id" type="int">
 			</argument>
+			<argument index="1" name="material" type="CanvasItemMaterial">
+			</argument>
 			<description>
-			Return the offset of the tile's navigation polygon.
+				Set the material of the tile.
 			</description>
 		</method>
-		<method name="tile_set_light_occluder">
+		<method name="tile_set_name">
 			<argument index="0" name="id" type="int">
 			</argument>
-			<argument index="1" name="light_occluder" type="OccluderPolygon2D">
+			<argument index="1" name="name" type="String">
 			</argument>
 			<description>
-			Set a light occluder for the tile.
+				Set the name of the tile, for descriptive purposes.
 			</description>
 		</method>
-		<method name="tile_get_light_occluder" qualifiers="const">
-			<return type="OccluderPolygon2D">
-			</return>
+		<method name="tile_set_navigation_polygon">
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="navigation_polygon" type="NavigationPolygon">
+			</argument>
+			<description>
+				Set a navigation polygon for the tile.
+			</description>
+		</method>
+		<method name="tile_set_navigation_polygon_offset">
 			<argument index="0" name="id" type="int">
 			</argument>
+			<argument index="1" name="navigation_polygon_offset" type="Vector2">
+			</argument>
 			<description>
-			Return the light occluder of the tile.
+				Set an offset for the tile's navigation polygon.
 			</description>
 		</method>
 		<method name="tile_set_occluder_offset">
@@ -40427,51 +40846,61 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="occluder_offset" type="Vector2">
 			</argument>
 			<description>
-			Set an offset for the tile's light occluder.
+				Set an offset for the tile's light occluder.
 			</description>
 		</method>
-		<method name="tile_get_occluder_offset" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="tile_set_region">
 			<argument index="0" name="id" type="int">
 			</argument>
+			<argument index="1" name="region" type="Rect2">
+			</argument>
 			<description>
-			Return the offset of the tile's light occluder.
+				Set the tile sub-region in the texture. This is common in texture atlases.
 			</description>
 		</method>
-		<method name="remove_tile">
+		<method name="tile_set_shape">
 			<argument index="0" name="id" type="int">
 			</argument>
+			<argument index="1" name="shape" type="Shape2D">
+			</argument>
 			<description>
-			Remove the tile referenced by the given ID.
+				Set a shape for the tile, enabling physics to collide with it.
 			</description>
 		</method>
-		<method name="clear">
+		<method name="tile_set_shape_offset">
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="shape_offset" type="Vector2">
+			</argument>
 			<description>
-			Clear all tiles.
+				Set the shape offset of the tile.
 			</description>
 		</method>
-		<method name="get_last_unused_tile_id" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="tile_set_shapes">
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="shapes" type="Array">
+			</argument>
 			<description>
-			Return the ID following the last currently used ID, useful when creating a new tile.
+				Set an array of shapes for the tile, enabling physics to collide with it.
 			</description>
 		</method>
-		<method name="find_tile_by_name" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="name" type="String">
+		<method name="tile_set_texture">
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="texture" type="Texture">
 			</argument>
 			<description>
-			Find the first tile matching the given name.
+				Set the texture of the tile.
 			</description>
 		</method>
-		<method name="get_tiles_ids" qualifiers="const">
-			<return type="Array">
-			</return>
+		<method name="tile_set_texture_offset">
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="texture_offset" type="Vector2">
+			</argument>
 			<description>
-			Return an array of all currently used tile IDs.
+				Set the texture offset of the tile.
 			</description>
 		</method>
 	</methods>
@@ -40480,104 +40909,104 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Timer" inherits="Node" category="Core">
 	<brief_description>
-	A simple Timer node.
+		A simple Timer node.
 	</brief_description>
 	<description>
-	Timer node. This is a simple node that will emit a timeout callback when the timer runs out. It can optionally be set to loop.
+		Timer node. This is a simple node that will emit a timeout callback when the timer runs out. It can optionally be set to loop.
 	</description>
 	<methods>
-		<method name="set_wait_time">
-			<argument index="0" name="time_sec" type="float">
-			</argument>
-			<description>
-			Set wait time in seconds. When the time is over, it will emit the timeout signal.
-			</description>
-		</method>
-		<method name="get_wait_time" qualifiers="const">
+		<method name="get_time_left" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Return the wait time in seconds.
-			</description>
-		</method>
-		<method name="set_one_shot">
-			<argument index="0" name="enable" type="bool">
-			</argument>
-			<description>
-			Set as one-shot. If enabled, the timer will stop after timeout, otherwise it will automatically restart.
+				Return the time left for timeout in seconds if the timer is active, 0 otherwise.
 			</description>
 		</method>
-		<method name="is_one_shot" qualifiers="const">
-			<return type="bool">
+		<method name="get_timer_process_mode" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Return true if configured as one-shot.
+				Return the timer's processing mode.
 			</description>
 		</method>
-		<method name="set_autostart">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="get_wait_time" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set to automatically start when entering the scene.
+				Return the wait time in seconds.
 			</description>
 		</method>
 		<method name="has_autostart" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if set to automatically start when entering the scene.
+				Return true if set to automatically start when entering the scene.
 			</description>
 		</method>
-		<method name="start">
+		<method name="is_active" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Start the timer.
+				Return if the timer is active or not.
 			</description>
 		</method>
-		<method name="stop">
+		<method name="is_one_shot" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Stop (cancel) the timer.
+				Return true if configured as one-shot.
 			</description>
 		</method>
 		<method name="set_active">
 			<argument index="0" name="active" type="bool">
 			</argument>
 			<description>
-			Set whether the timer is active or not. An inactive timer will be paused until it is activated again.
+				Set whether the timer is active or not. An inactive timer will be paused until it is activated again.
 			</description>
 		</method>
-		<method name="is_active" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_autostart">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Return if the timer is active or not.
+				Set to automatically start when entering the scene.
 			</description>
 		</method>
-		<method name="get_time_left" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_one_shot">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Return the time left for timeout in seconds if the timer is active, 0 otherwise.
+				Set as one-shot. If enabled, the timer will stop after timeout, otherwise it will automatically restart.
 			</description>
 		</method>
 		<method name="set_timer_process_mode">
 			<argument index="0" name="mode" type="int">
 			</argument>
 			<description>
-			Set the timer's processing mode (fixed or idle, use TIMER_PROCESS_* constants as argument).
+				Set the timer's processing mode (fixed or idle, use TIMER_PROCESS_* constants as argument).
 			</description>
 		</method>
-		<method name="get_timer_process_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_wait_time">
+			<argument index="0" name="time_sec" type="float">
+			</argument>
+			<description>
+				Set wait time in seconds. When the time is over, it will emit the timeout signal.
+			</description>
+		</method>
+		<method name="start">
+			<description>
+				Start the timer.
+			</description>
+		</method>
+		<method name="stop">
 			<description>
-			Return the timer's processing mode.
+				Stop (cancel) the timer.
 			</description>
 		</method>
 	</methods>
 	<signals>
 		<signal name="timeout">
 			<description>
-			Emitted when the time runs out.
+				Emitted when the time runs out.
 			</description>
 		</signal>
 	</signals>
@@ -40600,28 +41029,28 @@ This method controls whether the position between two cached points is interpola
 	<constants>
 	</constants>
 	<theme_items>
-		<theme_item name="hseparation" type="int">
+		<theme_item name="disabled" type="StyleBox">
 		</theme_item>
-		<theme_item name="font_color_disabled" type="Color">
+		<theme_item name="focus" type="StyleBox">
+		</theme_item>
+		<theme_item name="font" type="Font">
 		</theme_item>
 		<theme_item name="font_color" type="Color">
 		</theme_item>
+		<theme_item name="font_color_disabled" type="Color">
+		</theme_item>
 		<theme_item name="font_color_hover" type="Color">
 		</theme_item>
 		<theme_item name="font_color_pressed" type="Color">
 		</theme_item>
-		<theme_item name="font" type="Font">
-		</theme_item>
 		<theme_item name="hover" type="StyleBox">
 		</theme_item>
-		<theme_item name="pressed" type="StyleBox">
-		</theme_item>
-		<theme_item name="focus" type="StyleBox">
-		</theme_item>
-		<theme_item name="disabled" type="StyleBox">
+		<theme_item name="hseparation" type="int">
 		</theme_item>
 		<theme_item name="normal" type="StyleBox">
 		</theme_item>
+		<theme_item name="pressed" type="StyleBox">
+		</theme_item>
 	</theme_items>
 </class>
 <class name="TouchScreenButton" inherits="Node2D" category="Core">
@@ -40630,21 +41059,21 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_texture">
-			<argument index="0" name="texture" type="Object">
-			</argument>
+		<method name="get_action" qualifiers="const">
+			<return type="String">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_texture" qualifiers="const">
+		<method name="get_bitmask" qualifiers="const">
 			<return type="Object">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_texture_pressed">
-			<argument index="0" name="texture_pressed" type="Object">
-			</argument>
+		<method name="get_texture" qualifiers="const">
+			<return type="Object">
+			</return>
 			<description>
 			</description>
 		</method>
@@ -40654,39 +41083,33 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="set_bitmask">
-			<argument index="0" name="bitmask" type="Object">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_bitmask" qualifiers="const">
-			<return type="Object">
+		<method name="get_visibility_mode" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_action">
-			<argument index="0" name="action" type="String">
-			</argument>
+		<method name="is_passby_press_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_action" qualifiers="const">
-			<return type="String">
+		<method name="is_pressed" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_visibility_mode">
-			<argument index="0" name="mode" type="int">
+		<method name="set_action">
+			<argument index="0" name="action" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_visibility_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_bitmask">
+			<argument index="0" name="bitmask" type="Object">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -40696,25 +41119,31 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="is_passby_press_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_texture">
+			<argument index="0" name="texture" type="Object">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_pressed" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_texture_pressed">
+			<argument index="0" name="texture_pressed" type="Object">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_visibility_mode">
+			<argument index="0" name="mode" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
 	</methods>
 	<signals>
-		<signal name="released">
+		<signal name="pressed">
 			<description>
 			</description>
 		</signal>
-		<signal name="pressed">
+		<signal name="released">
 			<description>
 			</description>
 		</signal>
@@ -40724,142 +41153,142 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Transform" category="Built-In Types">
 	<brief_description>
-	3D Transformation.
+		3D Transformation.
 	</brief_description>
 	<description>
-	Transform is used to store transformations, including translations. It consists of a Matrix3 "basis" and Vector3 "origin". Transform is used to represent transformations of any object in space. It is similar to a 4x3 matrix.
+		Transform is used to store transformations, including translations. It consists of a Matrix3 "basis" and Vector3 "origin". Transform is used to represent transformations of any object in space. It is similar to a 4x3 matrix.
 	</description>
 	<methods>
-		<method name="affine_inverse">
+		<method name="Transform">
 			<return type="Transform">
 			</return>
+			<argument index="0" name="x_axis" type="Vector3">
+			</argument>
+			<argument index="1" name="y_axis" type="Vector3">
+			</argument>
+			<argument index="2" name="z_axis" type="Vector3">
+			</argument>
+			<argument index="3" name="origin" type="Vector3">
+			</argument>
 			<description>
-			Returns the inverse of the transfrom, even if the transform has scale or the axis vectors are not orthogonal.
+				Construct the Transform from four Vector3. Each axis creates the basis.
 			</description>
 		</method>
-		<method name="inverse">
+		<method name="Transform">
 			<return type="Transform">
 			</return>
+			<argument index="0" name="basis" type="Matrix3">
+			</argument>
+			<argument index="1" name="origin" type="Vector3">
+			</argument>
 			<description>
-			Returns the inverse of the transform.
+				Construct the Transform from a Matrix3 and Vector3.
 			</description>
 		</method>
-		<method name="looking_at">
+		<method name="Transform">
 			<return type="Transform">
 			</return>
-			<argument index="0" name="target" type="Vector3">
-			</argument>
-			<argument index="1" name="up" type="Vector3">
+			<argument index="0" name="from" type="Matrix32">
 			</argument>
 			<description>
-			Rotate the transform around the up vector to face the target.
+				Construct the Transform from a Matrix32.
 			</description>
 		</method>
-		<method name="orthonormalized">
+		<method name="Transform">
 			<return type="Transform">
 			</return>
+			<argument index="0" name="from" type="Quat">
+			</argument>
 			<description>
-			Returns a transfrom with the basis orthogonal (90 degrees), and normalized axis vectors.
+				Construct the Transform from a Quat. The origin will be Vector3(0, 0, 0)
 			</description>
 		</method>
-		<method name="rotated">
+		<method name="Transform">
 			<return type="Transform">
 			</return>
-			<argument index="0" name="axis" type="Vector3">
-			</argument>
-			<argument index="1" name="phi" type="float">
+			<argument index="0" name="from" type="Matrix3">
 			</argument>
 			<description>
-			Rotate the transform locally.
+				Construct the Transform from a Matrix3. The origin will be Vector3(0, 0, 0)
 			</description>
 		</method>
-		<method name="scaled">
+		<method name="affine_inverse">
 			<return type="Transform">
 			</return>
-			<argument index="0" name="scale" type="Vector3">
-			</argument>
 			<description>
-			Scale the transform locally.
+				Returns the inverse of the transfrom, even if the transform has scale or the axis vectors are not orthogonal.
 			</description>
 		</method>
-		<method name="translated">
+		<method name="inverse">
 			<return type="Transform">
 			</return>
-			<argument index="0" name="ofs" type="Vector3">
-			</argument>
 			<description>
-			Translate the transform locally.
+				Returns the inverse of the transform.
 			</description>
 		</method>
-		<method name="xform">
-			<return type="var">
+		<method name="looking_at">
+			<return type="Transform">
 			</return>
-			<argument index="0" name="v" type="var">
+			<argument index="0" name="target" type="Vector3">
+			</argument>
+			<argument index="1" name="up" type="Vector3">
 			</argument>
 			<description>
-			Transforms vector "v" by this transform.
+				Rotate the transform around the up vector to face the target.
 			</description>
 		</method>
-		<method name="xform_inv">
-			<return type="var">
+		<method name="orthonormalized">
+			<return type="Transform">
 			</return>
-			<argument index="0" name="v" type="var">
-			</argument>
 			<description>
-			Inverse-transforms vector "v" by this transform.
+				Returns a transfrom with the basis orthogonal (90 degrees), and normalized axis vectors.
 			</description>
 		</method>
-		<method name="Transform">
+		<method name="rotated">
 			<return type="Transform">
 			</return>
-			<argument index="0" name="x_axis" type="Vector3">
-			</argument>
-			<argument index="1" name="y_axis" type="Vector3">
-			</argument>
-			<argument index="2" name="z_axis" type="Vector3">
+			<argument index="0" name="axis" type="Vector3">
 			</argument>
-			<argument index="3" name="origin" type="Vector3">
+			<argument index="1" name="phi" type="float">
 			</argument>
 			<description>
-			Construct the Transform from four Vector3. Each axis creates the basis.
+				Rotate the transform locally.
 			</description>
 		</method>
-		<method name="Transform">
+		<method name="scaled">
 			<return type="Transform">
 			</return>
-			<argument index="0" name="basis" type="Matrix3">
-			</argument>
-			<argument index="1" name="origin" type="Vector3">
+			<argument index="0" name="scale" type="Vector3">
 			</argument>
 			<description>
-			Construct the Transform from a Matrix3 and Vector3.
+				Scale the transform locally.
 			</description>
 		</method>
-		<method name="Transform">
+		<method name="translated">
 			<return type="Transform">
 			</return>
-			<argument index="0" name="from" type="Matrix32">
+			<argument index="0" name="ofs" type="Vector3">
 			</argument>
 			<description>
-			Construct the Transform from a Matrix32.
+				Translate the transform locally.
 			</description>
 		</method>
-		<method name="Transform">
-			<return type="Transform">
+		<method name="xform">
+			<return type="var">
 			</return>
-			<argument index="0" name="from" type="Quat">
+			<argument index="0" name="v" type="var">
 			</argument>
 			<description>
-			Construct the Transform from a Quat. The origin will be Vector3(0, 0, 0)
+				Transforms vector "v" by this transform.
 			</description>
 		</method>
-		<method name="Transform">
-			<return type="Transform">
+		<method name="xform_inv">
+			<return type="var">
 			</return>
-			<argument index="0" name="from" type="Matrix3">
+			<argument index="0" name="v" type="var">
 			</argument>
 			<description>
-			Construct the Transform from a Matrix3. The origin will be Vector3(0, 0, 0)
+				Inverse-transforms vector "v" by this transform.
 			</description>
 		</method>
 	</methods>
@@ -40876,33 +41305,33 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Translation" inherits="Resource" category="Core">
 	<brief_description>
-	Language Translation.
+		Language Translation.
 	</brief_description>
 	<description>
-	Translations are resources that can be loaded/unloaded on demand. They map a string to another string.
+		Translations are resources that can be loaded/unloaded on demand. They map a string to another string.
 	</description>
 	<methods>
-		<method name="set_locale">
-			<argument index="0" name="locale" type="String">
+		<method name="add_message">
+			<argument index="0" name="src_message" type="String">
+			</argument>
+			<argument index="1" name="xlated_message" type="String">
 			</argument>
 			<description>
-			Set the locale of the translation.
+				Add a message for translation.
 			</description>
 		</method>
-		<method name="get_locale" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="erase_message">
+			<argument index="0" name="src_message" type="String">
+			</argument>
 			<description>
-			Return the locale of the translation.
+				Erase a message.
 			</description>
 		</method>
-		<method name="add_message">
-			<argument index="0" name="src_message" type="String">
-			</argument>
-			<argument index="1" name="xlated_message" type="String">
-			</argument>
+		<method name="get_locale" qualifiers="const">
+			<return type="String">
+			</return>
 			<description>
-			Add a message for translation.
+				Return the locale of the translation.
 			</description>
 		</method>
 		<method name="get_message" qualifiers="const">
@@ -40911,27 +41340,27 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="src_message" type="String">
 			</argument>
 			<description>
-			Return a message for translation.
+				Return a message for translation.
 			</description>
 		</method>
-		<method name="erase_message">
-			<argument index="0" name="src_message" type="String">
-			</argument>
+		<method name="get_message_count" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
-			Erase a message.
 			</description>
 		</method>
 		<method name="get_message_list" qualifiers="const">
 			<return type="StringArray">
 			</return>
 			<description>
-			Return all the messages (keys).
+				Return all the messages (keys).
 			</description>
 		</method>
-		<method name="get_message_count" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_locale">
+			<argument index="0" name="locale" type="String">
+			</argument>
 			<description>
+				Set the locale of the translation.
 			</description>
 		</method>
 	</methods>
@@ -40940,44 +41369,44 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="TranslationServer" inherits="Object" category="Core">
 	<brief_description>
-	Server that manages all translations. Translations can be set to it and removed from it.
+		Server that manages all translations. Translations can be set to it and removed from it.
 	</brief_description>
 	<description>
 	</description>
 	<methods>
-		<method name="set_locale">
-			<argument index="0" name="locale" type="String">
+		<method name="add_translation">
+			<argument index="0" name="translation" type="Translation">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_locale" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="clear">
 			<description>
 			</description>
 		</method>
-		<method name="translate" qualifiers="const">
+		<method name="get_locale" qualifiers="const">
 			<return type="String">
 			</return>
-			<argument index="0" name="message" type="String">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="add_translation">
+		<method name="remove_translation">
 			<argument index="0" name="translation" type="Translation">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="remove_translation">
-			<argument index="0" name="translation" type="Translation">
+		<method name="set_locale">
+			<argument index="0" name="locale" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="clear">
+		<method name="translate" qualifiers="const">
+			<return type="String">
+			</return>
+			<argument index="0" name="message" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -40991,6 +41420,12 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
+		<method name="are_column_titles_visible" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+			</description>
+		</method>
 		<method name="clear">
 			<description>
 			</description>
@@ -41003,25 +41438,29 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_root">
-			<return type="TreeItem">
+		<method name="ensure_cursor_is_visible">
+			<description>
+			</description>
+		</method>
+		<method name="get_allow_rmb_select" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_column_min_width">
-			<argument index="0" name="column" type="int">
-			</argument>
-			<argument index="1" name="min_width" type="int">
+		<method name="get_column_at_pos" qualifiers="const">
+			<return type="int">
+			</return>
+			<argument index="0" name="pos" type="Vector2">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_column_expand">
+		<method name="get_column_title" qualifiers="const">
+			<return type="String">
+			</return>
 			<argument index="0" name="column" type="int">
 			</argument>
-			<argument index="1" name="expand" type="bool">
-			</argument>
 			<description>
 			</description>
 		</method>
@@ -41033,147 +41472,143 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="set_hide_root">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="get_columns" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_next_selected">
-			<return type="TreeItem">
+		<method name="get_custom_popup_rect" qualifiers="const">
+			<return type="Rect2">
 			</return>
-			<argument index="0" name="from" type="TreeItem">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_selected" qualifiers="const">
-			<return type="TreeItem">
+		<method name="get_drop_mode_flags" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_selected_column" qualifiers="const">
-			<return type="int">
+		<method name="get_edited" qualifiers="const">
+			<return type="TreeItem">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_pressed_button" qualifiers="const">
+		<method name="get_edited_column" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_select_mode">
-			<argument index="0" name="mode" type="int">
+		<method name="get_item_area_rect" qualifiers="const">
+			<return type="Rect2">
+			</return>
+			<argument index="0" name="item" type="TreeItem">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="set_columns">
-			<argument index="0" name="amount" type="int">
+			<argument index="1" name="column" type="int" default="-1">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_columns" qualifiers="const">
-			<return type="int">
+		<method name="get_item_at_pos" qualifiers="const">
+			<return type="TreeItem">
 			</return>
+			<argument index="0" name="pos" type="Vector2">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_edited" qualifiers="const">
+		<method name="get_next_selected">
 			<return type="TreeItem">
 			</return>
+			<argument index="0" name="from" type="TreeItem">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_edited_column" qualifiers="const">
+		<method name="get_pressed_button" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_custom_popup_rect" qualifiers="const">
-			<return type="Rect2">
+		<method name="get_root">
+			<return type="TreeItem">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_item_area_rect" qualifiers="const">
-			<return type="Rect2">
+		<method name="get_scroll" qualifiers="const">
+			<return type="Vector2">
 			</return>
-			<argument index="0" name="item" type="TreeItem">
-			</argument>
-			<argument index="1" name="column" type="int" default="-1">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_item_at_pos" qualifiers="const">
+		<method name="get_selected" qualifiers="const">
 			<return type="TreeItem">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_column_at_pos" qualifiers="const">
+		<method name="get_selected_column" qualifiers="const">
 			<return type="int">
 			</return>
-			<argument index="0" name="pos" type="Vector2">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="ensure_cursor_is_visible">
+		<method name="get_single_select_cell_editing_only_when_already_selected" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_column_titles_visible">
-			<argument index="0" name="visible" type="bool">
-			</argument>
+		<method name="is_folding_hidden" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="are_column_titles_visible" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_allow_rmb_select">
+			<argument index="0" name="allow" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_column_title">
+		<method name="set_column_expand">
 			<argument index="0" name="column" type="int">
 			</argument>
-			<argument index="1" name="title" type="String">
+			<argument index="1" name="expand" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_column_title" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="set_column_min_width">
 			<argument index="0" name="column" type="int">
 			</argument>
+			<argument index="1" name="min_width" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_scroll" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_column_title">
+			<argument index="0" name="column" type="int">
+			</argument>
+			<argument index="1" name="title" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_hide_folding">
-			<argument index="0" name="hide" type="bool">
+		<method name="set_column_titles_visible">
+			<argument index="0" name="visible" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_folding_hidden" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_columns">
+			<argument index="0" name="amount" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -41183,21 +41618,21 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_drop_mode_flags" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_hide_folding">
+			<argument index="0" name="hide" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_allow_rmb_select">
-			<argument index="0" name="allow" type="bool">
+		<method name="set_hide_root">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_allow_rmb_select" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_select_mode">
+			<argument index="0" name="mode" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -41207,50 +41642,48 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_single_select_cell_editing_only_when_already_selected" qualifiers="const">
-			<return type="bool">
-			</return>
-			<description>
-			</description>
-		</method>
 	</methods>
 	<signals>
-		<signal name="item_activated">
-			<description>
-			</description>
-		</signal>
-		<signal name="multi_selected">
+		<signal name="button_pressed">
 			<argument index="0" name="item" type="Object">
 			</argument>
 			<argument index="1" name="column" type="int">
 			</argument>
-			<argument index="2" name="selected" type="bool">
+			<argument index="2" name="id" type="int">
 			</argument>
 			<description>
 			</description>
 		</signal>
+		<signal name="cell_selected">
+			<description>
+			</description>
+		</signal>
 		<signal name="custom_popup_edited">
 			<argument index="0" name="arrow_clicked" type="bool">
 			</argument>
 			<description>
 			</description>
 		</signal>
-		<signal name="item_collapsed">
-			<argument index="0" name="item" type="Object">
+		<signal name="empty_tree_rmb_selected">
+			<argument index="0" name="pos" type="Vector2">
 			</argument>
 			<description>
 			</description>
 		</signal>
-		<signal name="item_edited">
+		<signal name="item_activated">
 			<description>
 			</description>
 		</signal>
-		<signal name="empty_tree_rmb_selected">
-			<argument index="0" name="pos" type="Vector2">
+		<signal name="item_collapsed">
+			<argument index="0" name="item" type="Object">
 			</argument>
 			<description>
 			</description>
 		</signal>
+		<signal name="item_edited">
+			<description>
+			</description>
+		</signal>
 		<signal name="item_rmb_selected">
 			<argument index="0" name="pos" type="Vector2">
 			</argument>
@@ -41261,16 +41694,12 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</signal>
-		<signal name="cell_selected">
-			<description>
-			</description>
-		</signal>
-		<signal name="button_pressed">
+		<signal name="multi_selected">
 			<argument index="0" name="item" type="Object">
 			</argument>
 			<argument index="1" name="column" type="int">
 			</argument>
-			<argument index="2" name="id" type="int">
+			<argument index="2" name="selected" type="bool">
 			</argument>
 			<description>
 			</description>
@@ -41291,69 +41720,69 @@ This method controls whether the position between two cached points is interpola
 		</constant>
 	</constants>
 	<theme_items>
-		<theme_item name="item_margin" type="int">
-		</theme_item>
-		<theme_item name="vseparation" type="int">
+		<theme_item name="arrow" type="Texture">
 		</theme_item>
-		<theme_item name="guide_width" type="int">
+		<theme_item name="arrow_collapsed" type="Texture">
 		</theme_item>
-		<theme_item name="hseparation" type="int">
+		<theme_item name="bg" type="StyleBox">
 		</theme_item>
-		<theme_item name="draw_relationship_lines" type="int">
+		<theme_item name="bg_focus" type="StyleBox">
 		</theme_item>
 		<theme_item name="button_margin" type="int">
 		</theme_item>
-		<theme_item name="title_button_color" type="Color">
+		<theme_item name="button_pressed" type="StyleBox">
 		</theme_item>
-		<theme_item name="guide_color" type="Color">
+		<theme_item name="checked" type="Texture">
+		</theme_item>
+		<theme_item name="cursor" type="StyleBox">
 		</theme_item>
 		<theme_item name="cursor_color" type="Color">
 		</theme_item>
-		<theme_item name="selection_color" type="Color">
+		<theme_item name="cursor_unfocused" type="StyleBox">
 		</theme_item>
-		<theme_item name="font_color_selected" type="Color">
+		<theme_item name="draw_relationship_lines" type="int">
+		</theme_item>
+		<theme_item name="drop_position_color" type="Color">
+		</theme_item>
+		<theme_item name="font" type="Font">
 		</theme_item>
 		<theme_item name="font_color" type="Color">
 		</theme_item>
-		<theme_item name="relationship_line_color" type="Color">
+		<theme_item name="font_color_selected" type="Color">
 		</theme_item>
-		<theme_item name="drop_position_color" type="Color">
+		<theme_item name="guide_color" type="Color">
 		</theme_item>
-		<theme_item name="arrow" type="Texture">
+		<theme_item name="guide_width" type="int">
 		</theme_item>
-		<theme_item name="updown" type="Texture">
+		<theme_item name="hseparation" type="int">
 		</theme_item>
-		<theme_item name="checked" type="Texture">
+		<theme_item name="item_margin" type="int">
 		</theme_item>
-		<theme_item name="arrow_collapsed" type="Texture">
+		<theme_item name="relationship_line_color" type="Color">
 		</theme_item>
 		<theme_item name="select_arrow" type="Texture">
 		</theme_item>
-		<theme_item name="unchecked" type="Texture">
+		<theme_item name="selected" type="StyleBox">
 		</theme_item>
-		<theme_item name="title_button_font" type="Font">
+		<theme_item name="selected_focus" type="StyleBox">
 		</theme_item>
-		<theme_item name="font" type="Font">
+		<theme_item name="selection_color" type="Color">
 		</theme_item>
-		<theme_item name="title_button_normal" type="StyleBox">
+		<theme_item name="title_button_color" type="Color">
 		</theme_item>
-		<theme_item name="cursor" type="StyleBox">
+		<theme_item name="title_button_font" type="Font">
 		</theme_item>
 		<theme_item name="title_button_hover" type="StyleBox">
 		</theme_item>
-		<theme_item name="selected_focus" type="StyleBox">
-		</theme_item>
-		<theme_item name="bg_focus" type="StyleBox">
-		</theme_item>
-		<theme_item name="button_pressed" type="StyleBox">
+		<theme_item name="title_button_normal" type="StyleBox">
 		</theme_item>
-		<theme_item name="cursor_unfocused" type="StyleBox">
+		<theme_item name="title_button_pressed" type="StyleBox">
 		</theme_item>
-		<theme_item name="selected" type="StyleBox">
+		<theme_item name="unchecked" type="Texture">
 		</theme_item>
-		<theme_item name="bg" type="StyleBox">
+		<theme_item name="updown" type="Texture">
 		</theme_item>
-		<theme_item name="title_button_pressed" type="StyleBox">
+		<theme_item name="vseparation" type="int">
 		</theme_item>
 	</theme_items>
 </class>
@@ -41363,95 +41792,63 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_cell_mode">
+		<method name="add_button">
 			<argument index="0" name="column" type="int">
 			</argument>
-			<argument index="1" name="mode" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_cell_mode" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="column" type="int">
+			<argument index="1" name="button" type="Texture">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="set_checked">
-			<argument index="0" name="column" type="int">
+			<argument index="2" name="button_idx" type="int" default="-1">
 			</argument>
-			<argument index="1" name="checked" type="bool">
+			<argument index="3" name="disabled" type="bool" default="false">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_checked" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="clear_custom_bg_color">
 			<argument index="0" name="column" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_text">
+		<method name="clear_custom_color">
 			<argument index="0" name="column" type="int">
 			</argument>
-			<argument index="1" name="text" type="String">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_text" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="deselect">
 			<argument index="0" name="column" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_icon">
+		<method name="erase_button">
 			<argument index="0" name="column" type="int">
 			</argument>
-			<argument index="1" name="texture" type="Texture">
+			<argument index="1" name="button_idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_icon" qualifiers="const">
+		<method name="get_button" qualifiers="const">
 			<return type="Texture">
 			</return>
 			<argument index="0" name="column" type="int">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="set_icon_region">
-			<argument index="0" name="column" type="int">
-			</argument>
-			<argument index="1" name="region" type="Rect2">
+			<argument index="1" name="button_idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_icon_region" qualifiers="const">
-			<return type="Rect2">
+		<method name="get_button_count" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="column" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_icon_max_width">
-			<argument index="0" name="column" type="int">
-			</argument>
-			<argument index="1" name="width" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_icon_max_width" qualifiers="const">
+		<method name="get_cell_mode" qualifiers="const">
 			<return type="int">
 			</return>
 			<argument index="0" name="column" type="int">
@@ -41459,49 +41856,41 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="set_range">
-			<argument index="0" name="column" type="int">
-			</argument>
-			<argument index="1" name="value" type="float">
-			</argument>
+		<method name="get_children">
+			<return type="TreeItem">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_range" qualifiers="const">
-			<return type="float">
+		<method name="get_custom_bg_color" qualifiers="const">
+			<return type="Color">
 			</return>
 			<argument index="0" name="column" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_range_config">
+		<method name="get_icon" qualifiers="const">
+			<return type="Texture">
+			</return>
 			<argument index="0" name="column" type="int">
 			</argument>
-			<argument index="1" name="min" type="float">
-			</argument>
-			<argument index="2" name="max" type="float">
-			</argument>
-			<argument index="3" name="step" type="float">
-			</argument>
-			<argument index="4" name="expr" type="bool" default="false">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_range_config">
-			<return type="Dictionary">
+		<method name="get_icon_max_width" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="column" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_metadata">
+		<method name="get_icon_region" qualifiers="const">
+			<return type="Rect2">
+			</return>
 			<argument index="0" name="column" type="int">
 			</argument>
-			<argument index="1" name="meta" type="Variant">
-			</argument>
 			<description>
 			</description>
 		</method>
@@ -41511,29 +41900,19 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="set_custom_draw">
-			<argument index="0" name="column" type="int">
-			</argument>
-			<argument index="1" name="object" type="Object">
-			</argument>
-			<argument index="2" name="callback" type="String">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="set_collapsed">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="get_next">
+			<return type="TreeItem">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="is_collapsed">
-			<return type="bool">
+		<method name="get_next_visible">
+			<return type="TreeItem">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_next">
+		<method name="get_parent">
 			<return type="TreeItem">
 			</return>
 			<description>
@@ -41545,47 +41924,55 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_parent">
+		<method name="get_prev_visible">
 			<return type="TreeItem">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_children">
-			<return type="TreeItem">
+		<method name="get_range" qualifiers="const">
+			<return type="float">
 			</return>
+			<argument index="0" name="column" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_next_visible">
-			<return type="TreeItem">
+		<method name="get_range_config">
+			<return type="Dictionary">
 			</return>
+			<argument index="0" name="column" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_prev_visible">
-			<return type="TreeItem">
+		<method name="get_text" qualifiers="const">
+			<return type="String">
 			</return>
+			<argument index="0" name="column" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="remove_child">
-			<return type="TreeItem">
+		<method name="get_tooltip" qualifiers="const">
+			<return type="String">
 			</return>
-			<argument index="0" name="child" type="Object">
+			<argument index="0" name="column" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_selectable">
+		<method name="is_button_disabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="column" type="int">
 			</argument>
-			<argument index="1" name="selectable" type="bool">
+			<argument index="1" name="button_idx" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_selectable" qualifiers="const">
+		<method name="is_checked" qualifiers="const">
 			<return type="bool">
 			</return>
 			<argument index="0" name="column" type="int">
@@ -41593,53 +41980,77 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="is_selected">
+		<method name="is_collapsed">
 			<return type="bool">
 			</return>
-			<argument index="0" name="column" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="select">
+		<method name="is_editable">
+			<return type="bool">
+			</return>
 			<argument index="0" name="column" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="deselect">
+		<method name="is_selectable" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="column" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_editable">
+		<method name="is_selected">
+			<return type="bool">
+			</return>
 			<argument index="0" name="column" type="int">
 			</argument>
-			<argument index="1" name="enabled" type="bool">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_editable">
-			<return type="bool">
+		<method name="move_to_bottom">
+			<description>
+			</description>
+		</method>
+		<method name="move_to_top">
+			<description>
+			</description>
+		</method>
+		<method name="remove_child">
+			<return type="TreeItem">
 			</return>
+			<argument index="0" name="child" type="Object">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="select">
 			<argument index="0" name="column" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_custom_color">
+		<method name="set_cell_mode">
 			<argument index="0" name="column" type="int">
 			</argument>
-			<argument index="1" name="color" type="Color">
+			<argument index="1" name="mode" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="clear_custom_color">
+		<method name="set_checked">
 			<argument index="0" name="column" type="int">
 			</argument>
+			<argument index="1" name="checked" type="bool">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="set_collapsed">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -41653,89 +42064,107 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="clear_custom_bg_color">
+		<method name="set_custom_color">
 			<argument index="0" name="column" type="int">
 			</argument>
+			<argument index="1" name="color" type="Color">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_custom_bg_color" qualifiers="const">
-			<return type="Color">
-			</return>
+		<method name="set_custom_draw">
 			<argument index="0" name="column" type="int">
 			</argument>
+			<argument index="1" name="object" type="Object">
+			</argument>
+			<argument index="2" name="callback" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="add_button">
+		<method name="set_editable">
 			<argument index="0" name="column" type="int">
 			</argument>
-			<argument index="1" name="button" type="Texture">
+			<argument index="1" name="enabled" type="bool">
 			</argument>
-			<argument index="2" name="button_idx" type="int" default="-1">
+			<description>
+			</description>
+		</method>
+		<method name="set_icon">
+			<argument index="0" name="column" type="int">
 			</argument>
-			<argument index="3" name="disabled" type="bool" default="false">
+			<argument index="1" name="texture" type="Texture">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_button_count" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_icon_max_width">
 			<argument index="0" name="column" type="int">
 			</argument>
+			<argument index="1" name="width" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_button" qualifiers="const">
-			<return type="Texture">
-			</return>
+		<method name="set_icon_region">
 			<argument index="0" name="column" type="int">
 			</argument>
-			<argument index="1" name="button_idx" type="int">
+			<argument index="1" name="region" type="Rect2">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="erase_button">
+		<method name="set_metadata">
 			<argument index="0" name="column" type="int">
 			</argument>
-			<argument index="1" name="button_idx" type="int">
+			<argument index="1" name="meta" type="Variant">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_button_disabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_range">
 			<argument index="0" name="column" type="int">
 			</argument>
-			<argument index="1" name="button_idx" type="int">
+			<argument index="1" name="value" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_tooltip">
+		<method name="set_range_config">
 			<argument index="0" name="column" type="int">
 			</argument>
-			<argument index="1" name="tooltip" type="String">
+			<argument index="1" name="min" type="float">
+			</argument>
+			<argument index="2" name="max" type="float">
+			</argument>
+			<argument index="3" name="step" type="float">
+			</argument>
+			<argument index="4" name="expr" type="bool" default="false">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_tooltip" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="set_selectable">
 			<argument index="0" name="column" type="int">
 			</argument>
+			<argument index="1" name="selectable" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="move_to_top">
+		<method name="set_text">
+			<argument index="0" name="column" type="int">
+			</argument>
+			<argument index="1" name="text" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="move_to_bottom">
+		<method name="set_tooltip">
+			<argument index="0" name="column" type="int">
+			</argument>
+			<argument index="1" name="tooltip" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -41757,102 +42186,202 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Tween" inherits="Node" category="Core">
 	<brief_description>
-	Node useful for animations with unknown start and end points.
+		Node useful for animations with unknown start and end points.
 	</brief_description>
 	<description>
-	Node useful for animations with unknown start and end points, procedural animations, making one node follow another, and other simple behavior.
-	Because it is easy to get it wrong, here is a quick usage example:
-	[codeblock]
-	var tween = get_node("Tween")
-	tween.interpolate_property(get_node("Node2D_to_move"), "transform/pos", Vector2(0,0), Vector2(100,100), Tween.TRANS_LINEAR, Tween.EASE_IN_OUT)
-	tween.start()
-	[/codeblock]
-	Some of the methods of this class require a property name. You can get the property name by hovering over the property in the inspector of the editor.
-	Many of the methods accept [code]trans_type[/code] and [code]ease_type[/code]. The first accepts an TRANS_* constant, and refers to the way the timing of the animation is handled (you might want to see [code]http://easings.net/[/code] for some examples). The second accepts an EASE_* constant, and controls the where [code]trans_type[/code] is applied to the interpolation (in the begining, the end, or both). If you don't know which transision and easing to pick, you can try different TRANS_* constants with EASE_IN_OUT, and use the one that looks best.
+		Node useful for animations with unknown start and end points, procedural animations, making one node follow another, and other simple behavior.
+		Because it is easy to get it wrong, here is a quick usage example:
+		[codeblock]
+		var tween = get_node("Tween")
+		tween.interpolate_property(get_node("Node2D_to_move"), "transform/pos", Vector2(0,0), Vector2(100,100), Tween.TRANS_LINEAR, Tween.EASE_IN_OUT)
+		tween.start()
+		[/codeblock]
+		Some of the methods of this class require a property name. You can get the property name by hovering over the property in the inspector of the editor.
+		Many of the methods accept [code]trans_type[/code] and [code]ease_type[/code]. The first accepts an TRANS_* constant, and refers to the way the timing of the animation is handled (you might want to see [code]http://easings.net/[/code] for some examples). The second accepts an EASE_* constant, and controls the where [code]trans_type[/code] is applied to the interpolation (in the begining, the end, or both). If you don't know which transision and easing to pick, you can try different TRANS_* constants with EASE_IN_OUT, and use the one that looks best.
 	</description>
 	<methods>
-		<method name="is_active" qualifiers="const">
+		<method name="follow_method">
 			<return type="bool">
 			</return>
-			<description>
-			Returns true if any tweens are currently running, and false otherwise. Note that this method doesn't consider tweens that have ended.
-			</description>
-		</method>
-		<method name="set_active">
-			<argument index="0" name="active" type="bool">
+			<argument index="0" name="object" type="Object">
+			</argument>
+			<argument index="1" name="method" type="String">
+			</argument>
+			<argument index="2" name="initial_val" type="Variant">
+			</argument>
+			<argument index="3" name="target" type="Object">
+			</argument>
+			<argument index="4" name="target_method" type="String">
+			</argument>
+			<argument index="5" name="times_in_sec" type="float">
+			</argument>
+			<argument index="6" name="trans_type" type="int">
+			</argument>
+			<argument index="7" name="ease_type" type="int">
+			</argument>
+			<argument index="8" name="delay" type="float" default="0">
 			</argument>
 			<description>
-			Activate/deactivate the tween. You can use this for pausing animations, though [method stop_all] and [method resume_all] might be more fit for this.
+				Follow [code]method[/code] of [code]object[/code] and apply the returned value on [code]target_method[/code] of [code]target[/code], beginning from [code]initial_val[/code] for [code]times_in_sec[/code] seconds, [code]delay[/code] later. Methods are animated by calling them with consequitive values.
+				[code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description.
 			</description>
 		</method>
-		<method name="is_repeat" qualifiers="const">
+		<method name="follow_property">
 			<return type="bool">
 			</return>
-			<description>
-			Returns true if repeat has been set from editor GUI or [method set_repeat].
-			</description>
-		</method>
-		<method name="set_repeat">
-			<argument index="0" name="repeat" type="bool">
+			<argument index="0" name="object" type="Object">
+			</argument>
+			<argument index="1" name="property" type="String">
+			</argument>
+			<argument index="2" name="initial_val" type="Variant">
+			</argument>
+			<argument index="3" name="target" type="Object">
+			</argument>
+			<argument index="4" name="target_property" type="String">
+			</argument>
+			<argument index="5" name="times_in_sec" type="float">
+			</argument>
+			<argument index="6" name="trans_type" type="int">
+			</argument>
+			<argument index="7" name="ease_type" type="int">
+			</argument>
+			<argument index="8" name="delay" type="float" default="0">
 			</argument>
 			<description>
-			Make the tween repeat after all tweens have finished.
+				Follow [code]property[/code] of [code]object[/code] and apply it on [code]target_property[/code] of [code]target[/code], beginning from [code]initial_val[/code] for [code]times_in_sec[/code] seconds, [code]delay[/code] seconds later. Note that [code]target:target_property[/code] would equal [code]object:property[/code] at the end of the tween.
+				[code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description.
 			</description>
 		</method>
-		<method name="set_speed">
-			<argument index="0" name="speed" type="float">
-			</argument>
+		<method name="get_runtime" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
-			Set the speed multiplier of the tween. Set it to 1 for normal speed, 2 for two times nromal speed, and 0.5 for half of the normal speed. Setting it to 0 would pause the animation, but you might consider using [method set_active] or [method stop_all] and [method resume_all] for this.
+				Returns the time needed for all tweens to end in seconds, measured from the start. Thus, if you have two tweens, one ending 10 seconds after the start and the other - 20 seconds, it would return 20 seconds, as by that time all tweens would have finished.
 			</description>
 		</method>
 		<method name="get_speed" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
-			Returns the speed that has been set from editor GUI or [method set_repeat].
+				Returns the speed that has been set from editor GUI or [method set_repeat].
 			</description>
 		</method>
-		<method name="set_tween_process_mode">
-			<argument index="0" name="mode" type="int">
+		<method name="get_tween_process_mode" qualifiers="const">
+			<return type="int">
+			</return>
+			<description>
+				Returns the process mode that has been set from editor GUI or [method set_tween_process_mode]
+			</description>
+		</method>
+		<method name="interpolate_callback">
+			<return type="bool">
+			</return>
+			<argument index="0" name="object" type="Object">
+			</argument>
+			<argument index="1" name="times_in_sec" type="float">
+			</argument>
+			<argument index="2" name="callback" type="String">
+			</argument>
+			<argument index="3" name="arg1" type="Variant" default="NULL">
+			</argument>
+			<argument index="4" name="arg2" type="Variant" default="NULL">
+			</argument>
+			<argument index="5" name="arg3" type="Variant" default="NULL">
+			</argument>
+			<argument index="6" name="arg4" type="Variant" default="NULL">
+			</argument>
+			<argument index="7" name="arg5" type="Variant" default="NULL">
 			</argument>
 			<description>
-			Set whether the Tween uses [code]_process[/code] or [code]_fixed_process[/code] (accepts TWEEN_PROCESS_IDLE and TWEEN_PROCESS_FIXED constants, respectively).
+				Call [code]callback[/code] of [code]object[/code] after [code]times_in_sec[/code]. [code]arg1[/code]-[code]arg5[/code] are arguments to be passed to the callback.
 			</description>
 		</method>
-		<method name="get_tween_process_mode" qualifiers="const">
-			<return type="int">
+		<method name="interpolate_deferred_callback">
+			<return type="bool">
 			</return>
+			<argument index="0" name="object" type="Object">
+			</argument>
+			<argument index="1" name="times_in_sec" type="float">
+			</argument>
+			<argument index="2" name="callback" type="String">
+			</argument>
+			<argument index="3" name="arg1" type="Variant" default="NULL">
+			</argument>
+			<argument index="4" name="arg2" type="Variant" default="NULL">
+			</argument>
+			<argument index="5" name="arg3" type="Variant" default="NULL">
+			</argument>
+			<argument index="6" name="arg4" type="Variant" default="NULL">
+			</argument>
+			<argument index="7" name="arg5" type="Variant" default="NULL">
+			</argument>
 			<description>
-			Returns the process mode that has been set from editor GUI or [method set_tween_process_mode]
+				Call [code]callback[/code] of [code]object[/code] after [code]times_in_sec[/code] on the main thread (similar to [methog Object.call_deferred). [code]arg1[/code]-[code]arg5[/code] are arguments to be passed to the callback.
 			</description>
 		</method>
-		<method name="start">
+		<method name="interpolate_method">
 			<return type="bool">
 			</return>
+			<argument index="0" name="object" type="Object">
+			</argument>
+			<argument index="1" name="method" type="String">
+			</argument>
+			<argument index="2" name="initial_val" type="Variant">
+			</argument>
+			<argument index="3" name="final_val" type="Variant">
+			</argument>
+			<argument index="4" name="times_in_sec" type="float">
+			</argument>
+			<argument index="5" name="trans_type" type="int">
+			</argument>
+			<argument index="6" name="ease_type" type="int">
+			</argument>
+			<argument index="7" name="delay" type="float" default="0">
+			</argument>
 			<description>
-			Start the tween node. You can define tweens both before and after this.
+				Animate [code]method[/code] of [code]object[/code] from [code]initial_val[/code] to [code]final_val[/code] for [code]times_in_sec[/code] seconds, [code]delay[/code] seconds later. Methods are animated by calling them with consecuitive values.
+				[code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description.
 			</description>
 		</method>
-		<method name="reset">
+		<method name="interpolate_property">
 			<return type="bool">
 			</return>
 			<argument index="0" name="object" type="Object">
 			</argument>
-			<argument index="1" name="key" type="String">
+			<argument index="1" name="property" type="String">
+			</argument>
+			<argument index="2" name="initial_val" type="Variant">
+			</argument>
+			<argument index="3" name="final_val" type="Variant">
+			</argument>
+			<argument index="4" name="times_in_sec" type="float">
+			</argument>
+			<argument index="5" name="trans_type" type="int">
+			</argument>
+			<argument index="6" name="ease_type" type="int">
+			</argument>
+			<argument index="7" name="delay" type="float" default="0">
 			</argument>
 			<description>
-			Resets a tween to the initial value (the one given, not the one before the tween), given its object and property/method pair.
+				Animate [code]property[/code] of [code]object[/code] from [code]initial_val[/code] to [code]final_val[/code] for [code]times_in_sec[/code] seconds, [code]delay[/code] seconds later.
+				[code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description.
 			</description>
 		</method>
-		<method name="reset_all">
+		<method name="is_active" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Resets all tweens to their initial values (the ones given, not those before the tween).
+				Returns true if any tweens are currently running, and false otherwise. Note that this method doesn't consider tweens that have ended.
 			</description>
 		</method>
-		<method name="stop">
+		<method name="is_repeat" qualifiers="const">
+			<return type="bool">
+			</return>
+			<description>
+				Returns true if repeat has been set from editor GUI or [method set_repeat].
+			</description>
+		</method>
+		<method name="remove">
 			<return type="bool">
 			</return>
 			<argument index="0" name="object" type="Object">
@@ -41860,17 +42389,17 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="key" type="String">
 			</argument>
 			<description>
-			Stop animating a tween, given its object and property/method pair.
+				Stop animating and completely remove a tween, given its object and property/method pair.
 			</description>
 		</method>
-		<method name="stop_all">
+		<method name="remove_all">
 			<return type="bool">
 			</return>
 			<description>
-			Stop animating all tweens.
+				Stop animating and completely remove all tweens.
 			</description>
 		</method>
-		<method name="resume">
+		<method name="reset">
 			<return type="bool">
 			</return>
 			<argument index="0" name="object" type="Object">
@@ -41878,17 +42407,17 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="key" type="String">
 			</argument>
 			<description>
-			Continue animating a stopped tween, given its object and property/method pair.
+				Resets a tween to the initial value (the one given, not the one before the tween), given its object and property/method pair.
 			</description>
 		</method>
-		<method name="resume_all">
+		<method name="reset_all">
 			<return type="bool">
 			</return>
 			<description>
-			Continue animating all stopped tweens.
+				Resets all tweens to their initial values (the ones given, not those before the tween).
 			</description>
 		</method>
-		<method name="remove">
+		<method name="resume">
 			<return type="bool">
 			</return>
 			<argument index="0" name="object" type="Object">
@@ -41896,14 +42425,14 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="key" type="String">
 			</argument>
 			<description>
-			Stop animating and completely remove a tween, given its object and property/method pair.
+				Continue animating a stopped tween, given its object and property/method pair.
 			</description>
 		</method>
-		<method name="remove_all">
+		<method name="resume_all">
 			<return type="bool">
 			</return>
 			<description>
-			Stop animating and completely remove all tweens.
+				Continue animating all stopped tweens.
 			</description>
 		</method>
 		<method name="seek">
@@ -41912,155 +42441,74 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="time" type="float">
 			</argument>
 			<description>
-			Seek the animation to the given [code]time[/code] in seconds.
+				Seek the animation to the given [code]time[/code] in seconds.
 			</description>
 		</method>
-		<method name="tell" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_active">
+			<argument index="0" name="active" type="bool">
+			</argument>
 			<description>
-			Returns the current time of the tween.
+				Activate/deactivate the tween. You can use this for pausing animations, though [method stop_all] and [method resume_all] might be more fit for this.
 			</description>
 		</method>
-		<method name="get_runtime" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_repeat">
+			<argument index="0" name="repeat" type="bool">
+			</argument>
 			<description>
-			Returns the time needed for all tweens to end in seconds, measured from the start. Thus, if you have two tweens, one ending 10 seconds after the start and the other - 20 seconds, it would return 20 seconds, as by that time all tweens would have finished.
+				Make the tween repeat after all tweens have finished.
 			</description>
 		</method>
-		<method name="interpolate_property">
-			<return type="bool">
-			</return>
-			<argument index="0" name="object" type="Object">
-			</argument>
-			<argument index="1" name="property" type="String">
-			</argument>
-			<argument index="2" name="initial_val" type="Variant">
-			</argument>
-			<argument index="3" name="final_val" type="Variant">
-			</argument>
-			<argument index="4" name="times_in_sec" type="float">
-			</argument>
-			<argument index="5" name="trans_type" type="int">
-			</argument>
-			<argument index="6" name="ease_type" type="int">
-			</argument>
-			<argument index="7" name="delay" type="float" default="0">
+		<method name="set_speed">
+			<argument index="0" name="speed" type="float">
 			</argument>
 			<description>
-			Animate [code]property[/code] of [code]object[/code] from [code]initial_val[/code] to [code]final_val[/code] for [code]times_in_sec[/code] seconds, [code]delay[/code] seconds later.
-			[code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description.
+				Set the speed multiplier of the tween. Set it to 1 for normal speed, 2 for two times nromal speed, and 0.5 for half of the normal speed. Setting it to 0 would pause the animation, but you might consider using [method set_active] or [method stop_all] and [method resume_all] for this.
 			</description>
 		</method>
-		<method name="interpolate_method">
-			<return type="bool">
-			</return>
-			<argument index="0" name="object" type="Object">
-			</argument>
-			<argument index="1" name="method" type="String">
-			</argument>
-			<argument index="2" name="initial_val" type="Variant">
-			</argument>
-			<argument index="3" name="final_val" type="Variant">
-			</argument>
-			<argument index="4" name="times_in_sec" type="float">
-			</argument>
-			<argument index="5" name="trans_type" type="int">
-			</argument>
-			<argument index="6" name="ease_type" type="int">
-			</argument>
-			<argument index="7" name="delay" type="float" default="0">
+		<method name="set_tween_process_mode">
+			<argument index="0" name="mode" type="int">
 			</argument>
 			<description>
-			Animate [code]method[/code] of [code]object[/code] from [code]initial_val[/code] to [code]final_val[/code] for [code]times_in_sec[/code] seconds, [code]delay[/code] seconds later. Methods are animated by calling them with consecuitive values.
-			[code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description.
+				Set whether the Tween uses [code]_process[/code] or [code]_fixed_process[/code] (accepts TWEEN_PROCESS_IDLE and TWEEN_PROCESS_FIXED constants, respectively).
 			</description>
 		</method>
-		<method name="interpolate_callback">
+		<method name="start">
 			<return type="bool">
 			</return>
-			<argument index="0" name="object" type="Object">
-			</argument>
-			<argument index="1" name="times_in_sec" type="float">
-			</argument>
-			<argument index="2" name="callback" type="String">
-			</argument>
-			<argument index="3" name="arg1" type="Variant" default="NULL">
-			</argument>
-			<argument index="4" name="arg2" type="Variant" default="NULL">
-			</argument>
-			<argument index="5" name="arg3" type="Variant" default="NULL">
-			</argument>
-			<argument index="6" name="arg4" type="Variant" default="NULL">
-			</argument>
-			<argument index="7" name="arg5" type="Variant" default="NULL">
-			</argument>
 			<description>
-			Call [code]callback[/code] of [code]object[/code] after [code]times_in_sec[/code]. [code]arg1[/code]-[code]arg5[/code] are arguments to be passed to the callback.
+				Start the tween node. You can define tweens both before and after this.
 			</description>
 		</method>
-		<method name="interpolate_deferred_callback">
+		<method name="stop">
 			<return type="bool">
 			</return>
 			<argument index="0" name="object" type="Object">
 			</argument>
-			<argument index="1" name="times_in_sec" type="float">
-			</argument>
-			<argument index="2" name="callback" type="String">
-			</argument>
-			<argument index="3" name="arg1" type="Variant" default="NULL">
-			</argument>
-			<argument index="4" name="arg2" type="Variant" default="NULL">
-			</argument>
-			<argument index="5" name="arg3" type="Variant" default="NULL">
-			</argument>
-			<argument index="6" name="arg4" type="Variant" default="NULL">
-			</argument>
-			<argument index="7" name="arg5" type="Variant" default="NULL">
+			<argument index="1" name="key" type="String">
 			</argument>
 			<description>
-			Call [code]callback[/code] of [code]object[/code] after [code]times_in_sec[/code] on the main thread (similar to [methog Object.call_deferred). [code]arg1[/code]-[code]arg5[/code] are arguments to be passed to the callback.
+				Stop animating a tween, given its object and property/method pair.
 			</description>
 		</method>
-		<method name="follow_property">
+		<method name="stop_all">
 			<return type="bool">
 			</return>
-			<argument index="0" name="object" type="Object">
-			</argument>
-			<argument index="1" name="property" type="String">
-			</argument>
-			<argument index="2" name="initial_val" type="Variant">
-			</argument>
-			<argument index="3" name="target" type="Object">
-			</argument>
-			<argument index="4" name="target_property" type="String">
-			</argument>
-			<argument index="5" name="times_in_sec" type="float">
-			</argument>
-			<argument index="6" name="trans_type" type="int">
-			</argument>
-			<argument index="7" name="ease_type" type="int">
-			</argument>
-			<argument index="8" name="delay" type="float" default="0">
-			</argument>
 			<description>
-			Follow [code]property[/code] of [code]object[/code] and apply it on [code]target_property[/code] of [code]target[/code], beginning from [code]initial_val[/code] for [code]times_in_sec[/code] seconds, [code]delay[/code] seconds later. Note that [code]target:target_property[/code] would equal [code]object:property[/code] at the end of the tween.
-			[code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description.
+				Stop animating all tweens.
 			</description>
 		</method>
-		<method name="follow_method">
+		<method name="targeting_method">
 			<return type="bool">
 			</return>
 			<argument index="0" name="object" type="Object">
 			</argument>
 			<argument index="1" name="method" type="String">
 			</argument>
-			<argument index="2" name="initial_val" type="Variant">
+			<argument index="2" name="initial" type="Object">
 			</argument>
-			<argument index="3" name="target" type="Object">
+			<argument index="3" name="initial_method" type="String">
 			</argument>
-			<argument index="4" name="target_method" type="String">
+			<argument index="4" name="final_val" type="Variant">
 			</argument>
 			<argument index="5" name="times_in_sec" type="float">
 			</argument>
@@ -42071,8 +42519,8 @@ This method controls whether the position between two cached points is interpola
 			<argument index="8" name="delay" type="float" default="0">
 			</argument>
 			<description>
-			Follow [code]method[/code] of [code]object[/code] and apply the returned value on [code]target_method[/code] of [code]target[/code], beginning from [code]initial_val[/code] for [code]times_in_sec[/code] seconds, [code]delay[/code] later. Methods are animated by calling them with consequitive values.
-			[code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description.
+				Animate [code]method[/code] of [code]object[/code] from the value returned by [code]initial.initial_method[/code] to [code]final_val[/code] for [code]times_in_sec[/code] seconds, [code]delay[/code] seconds later. Methods are animated by calling them with consecuitive values.
+				[code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description.
 			</description>
 		</method>
 		<method name="targeting_property">
@@ -42097,34 +42545,15 @@ This method controls whether the position between two cached points is interpola
 			<argument index="8" name="delay" type="float" default="0">
 			</argument>
 			<description>
-			Animate [code]property[/code] of [code]object[/code] from the current value of the [code]initial_val[/code] property of [code]initial[/code] to [code]final_val[/code] for [code]times_in_sec[/code] seconds, [code]delay[/code] seconds later.
-			[code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description.
+				Animate [code]property[/code] of [code]object[/code] from the current value of the [code]initial_val[/code] property of [code]initial[/code] to [code]final_val[/code] for [code]times_in_sec[/code] seconds, [code]delay[/code] seconds later.
+				[code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description.
 			</description>
 		</method>
-		<method name="targeting_method">
-			<return type="bool">
+		<method name="tell" qualifiers="const">
+			<return type="float">
 			</return>
-			<argument index="0" name="object" type="Object">
-			</argument>
-			<argument index="1" name="method" type="String">
-			</argument>
-			<argument index="2" name="initial" type="Object">
-			</argument>
-			<argument index="3" name="initial_method" type="String">
-			</argument>
-			<argument index="4" name="final_val" type="Variant">
-			</argument>
-			<argument index="5" name="times_in_sec" type="float">
-			</argument>
-			<argument index="6" name="trans_type" type="int">
-			</argument>
-			<argument index="7" name="ease_type" type="int">
-			</argument>
-			<argument index="8" name="delay" type="float" default="0">
-			</argument>
 			<description>
-			Animate [code]method[/code] of [code]object[/code] from the value returned by [code]initial.initial_method[/code] to [code]final_val[/code] for [code]times_in_sec[/code] seconds, [code]delay[/code] seconds later. Methods are animated by calling them with consecuitive values.
-			[code]trans_type[/code] accepts TRANS_* constants, and is the way the animation is interpolated, while [code]ease_type[/code] accepts EASE_* constants, and controls the place of the interpolation (the begining, the end, or both). You can read more about them in the class description.
+				Returns the current time of the tween.
 			</description>
 		</method>
 	</methods>
@@ -42135,29 +42564,29 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="key" type="String">
 			</argument>
 			<description>
-			This signal is emitted when a tween ends.
+				This signal is emitted when a tween ends.
 			</description>
 		</signal>
-		<signal name="tween_step">
+		<signal name="tween_start">
 			<argument index="0" name="object" type="Object">
 			</argument>
 			<argument index="1" name="key" type="String">
 			</argument>
-			<argument index="2" name="elapsed" type="float">
-			</argument>
-			<argument index="3" name="value" type="Object">
-			</argument>
 			<description>
-			This signal is emitted each step of the tweening.
+				This signal is emitted when a tween starts.
 			</description>
 		</signal>
-		<signal name="tween_start">
+		<signal name="tween_step">
 			<argument index="0" name="object" type="Object">
 			</argument>
 			<argument index="1" name="key" type="String">
 			</argument>
+			<argument index="2" name="elapsed" type="float">
+			</argument>
+			<argument index="3" name="value" type="Object">
+			</argument>
 			<description>
-			This signal is emitted when a tween starts.
+				This signal is emitted each step of the tweening.
 			</description>
 		</signal>
 	</signals>
@@ -42217,34 +42646,13 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="UndoRedo" inherits="Object" category="Core">
 	<brief_description>
-	Helper to manage UndoRedo in the editor or custom tools.
+		Helper to manage UndoRedo in the editor or custom tools.
 	</brief_description>
 	<description>
-	Helper to maange UndoRedo in the editor or custom tools. It works by
-	storing calls to functions in both 'do' an 'undo' lists.
-
-	Common behavior is to create an action, then add do/undo calls to
-	functions or property changes, then commiting the action.
+		Helper to maange UndoRedo in the editor or custom tools. It works by storing calls to functions in both 'do' an 'undo' lists.
+		Common behavior is to create an action, then add do/undo calls to functions or property changes, then commiting the action.
 	</description>
 	<methods>
-		<method name="create_action">
-			<argument index="0" name="name" type="String">
-			</argument>
-			<argument index="1" name="mergeable" type="bool" default="false">
-			</argument>
-			<description>
-			Create a new action. After this is called, do all
-			your calls to [method add_do_method],
-			[method add_undo_method], [method add_do_property]
-			and [method add_undo_property].
-			</description>
-		</method>
-		<method name="commit_action">
-			<description>
-			Commit the action. All 'do' methods/properties are
-			called/set when this function is called.
-			</description>
-		</method>
 		<method name="add_do_method">
 			<argument index="0" name="object" type="Object">
 			</argument>
@@ -42261,10 +42669,28 @@ This method controls whether the position between two cached points is interpola
 			<argument index="6" name="arg4" type="Variant" default="NULL">
 			</argument>
 			<description>
-			Add a call to a method in a given object with custom
+				Add a call to a method in a given object with custom
 			arguments.
 			</description>
 		</method>
+		<method name="add_do_property">
+			<argument index="0" name="object" type="Object">
+			</argument>
+			<argument index="1" name="property" type="String">
+			</argument>
+			<argument index="2" name="value" type="Variant">
+			</argument>
+			<description>
+				Set a property with a custom value.
+			</description>
+		</method>
+		<method name="add_do_reference">
+			<argument index="0" name="object" type="Object">
+			</argument>
+			<description>
+				Add a 'do' reference that will be erased if the 'do' history is lost. This is useful mostly for new nodes created for the 'do' call. Do not use for resources.
+			</description>
+		</method>
 		<method name="add_undo_method">
 			<argument index="0" name="object" type="Object">
 			</argument>
@@ -42281,12 +42707,10 @@ This method controls whether the position between two cached points is interpola
 			<argument index="6" name="arg4" type="Variant" default="NULL">
 			</argument>
 			<description>
-			Add a call to an undo method in a given object with
-			custom arguments. Undo calls are used to revert 'do'
-			calls.
+				Add a call to an undo method in a given object with custom arguments. Undo calls are used to revert 'do' calls.
 			</description>
 		</method>
-		<method name="add_do_property">
+		<method name="add_undo_property">
 			<argument index="0" name="object" type="Object">
 			</argument>
 			<argument index="1" name="property" type="String">
@@ -42294,62 +42718,49 @@ This method controls whether the position between two cached points is interpola
 			<argument index="2" name="value" type="Variant">
 			</argument>
 			<description>
-			Set a property with a custom value.
+				Undo setting of a property with a custom value.
 			</description>
 		</method>
-		<method name="add_undo_property">
+		<method name="add_undo_reference">
 			<argument index="0" name="object" type="Object">
 			</argument>
-			<argument index="1" name="property" type="String">
-			</argument>
-			<argument index="2" name="value" type="Variant">
-			</argument>
 			<description>
-			Undo setting of a property with a custom value.
+				Add an 'undo' reference that will be erased if the 'undo' history is lost. This is useful mostly for nodes rmoved with the 'do' call (not the 'undo' call!).
 			</description>
 		</method>
-		<method name="add_do_reference">
-			<argument index="0" name="object" type="Object">
-			</argument>
+		<method name="clear_history">
 			<description>
-			Add a 'do' reference that will be erased if the 'do'
-			history is lost. This is useful mostly for new nodes
-			created for the 'do' call. Do not use for resources.
+				Clear the undo/redo history and associated
+			references.
 			</description>
 		</method>
-		<method name="add_undo_reference">
-			<argument index="0" name="object" type="Object">
-			</argument>
+		<method name="commit_action">
 			<description>
-			Add an 'undo' reference that will be erased if the
-			'undo' history is lost. This is useful mostly for
-			nodes rmoved with the 'do' call (not the 'undo'
-			call!).
+				Commit the action. All 'do' methods/properties are called/set when this function is called.
 			</description>
 		</method>
-		<method name="clear_history">
+		<method name="create_action">
+			<argument index="0" name="name" type="String">
+			</argument>
+			<argument index="1" name="mergeable" type="bool" default="false">
+			</argument>
 			<description>
-			Clear the undo/redo history and associated
-			references.
+				Create a new action. After this is called, do all your calls to [method add_do_method], [method add_undo_method], [method add_do_property] and [method add_undo_property].
 			</description>
 		</method>
 		<method name="get_current_action_name" qualifiers="const">
 			<return type="String">
 			</return>
 			<description>
-			Get the name of the current action.
+				Get the name of the current action.
 			</description>
 		</method>
 		<method name="get_version" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
-			Get the version, each time a new action is commited,
-			the version number of the UndoRedo is increased
-			automatically.
-
-			This is useful mostly to check if something changed
-			from a saved version.
+				Get the version, each time a new action is commited, the version number of the UndoRedo is increased automatically.
+				This is useful mostly to check if something changed from a saved version.
 			</description>
 		</method>
 	</methods>
@@ -42358,10 +42769,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="VBoxContainer" inherits="BoxContainer" category="Core">
 	<brief_description>
-	Vertical box container.
+		Vertical box container.
 	</brief_description>
 	<description>
-	Vertical box container. See [BoxContainer].
+		Vertical box container. See [BoxContainer].
 	</description>
 	<methods>
 	</methods>
@@ -42374,10 +42785,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="VButtonArray" inherits="ButtonArray" category="Core">
 	<brief_description>
-	Vertical button array.
+		Vertical button array.
 	</brief_description>
 	<description>
-	Vertical button array. See [ButtonArray].
+		Vertical button array. See [ButtonArray].
 	</description>
 	<methods>
 	</methods>
@@ -42386,29 +42797,29 @@ This method controls whether the position between two cached points is interpola
 	<theme_items>
 		<theme_item name="button_separator" type="int">
 		</theme_item>
-		<theme_item name="icon_separator" type="int">
+		<theme_item name="focus" type="StyleBox">
 		</theme_item>
-		<theme_item name="font_color_selected" type="Color">
+		<theme_item name="font" type="Font">
 		</theme_item>
 		<theme_item name="font_color" type="Color">
 		</theme_item>
-		<theme_item name="font_selected" type="Font">
+		<theme_item name="font_color_selected" type="Color">
 		</theme_item>
-		<theme_item name="font" type="Font">
+		<theme_item name="font_selected" type="Font">
 		</theme_item>
 		<theme_item name="hover" type="StyleBox">
 		</theme_item>
-		<theme_item name="focus" type="StyleBox">
-		</theme_item>
-		<theme_item name="selected" type="StyleBox">
+		<theme_item name="icon_separator" type="int">
 		</theme_item>
 		<theme_item name="normal" type="StyleBox">
 		</theme_item>
+		<theme_item name="selected" type="StyleBox">
+		</theme_item>
 	</theme_items>
 </class>
 <class name="VScrollBar" inherits="ScrollBar" category="Core">
 	<brief_description>
-	Vertical version of [ScrollBar], which goes from left (min) to right (max).
+		Vertical version of [ScrollBar], which goes from left (min) to right (max).
 	</brief_description>
 	<description>
 	</description>
@@ -42417,30 +42828,30 @@ This method controls whether the position between two cached points is interpola
 	<constants>
 	</constants>
 	<theme_items>
-		<theme_item name="increment_hilite" type="Texture">
+		<theme_item name="decrement" type="Texture">
 		</theme_item>
 		<theme_item name="decrement_hilite" type="Texture">
 		</theme_item>
-		<theme_item name="increment" type="Texture">
-		</theme_item>
-		<theme_item name="decrement" type="Texture">
+		<theme_item name="grabber" type="StyleBox">
 		</theme_item>
 		<theme_item name="grabber_hilite" type="StyleBox">
 		</theme_item>
-		<theme_item name="grabber" type="StyleBox">
+		<theme_item name="increment" type="Texture">
 		</theme_item>
-		<theme_item name="scroll_focus" type="StyleBox">
+		<theme_item name="increment_hilite" type="Texture">
 		</theme_item>
 		<theme_item name="scroll" type="StyleBox">
 		</theme_item>
+		<theme_item name="scroll_focus" type="StyleBox">
+		</theme_item>
 	</theme_items>
 </class>
 <class name="VSeparator" inherits="Separator" category="Core">
 	<brief_description>
-	Vertical version of [Separator].
+		Vertical version of [Separator].
 	</brief_description>
 	<description>
-	Vertical version of [Separator]. It is used to separate objects horizontally, though (but it looks vertical!).
+		Vertical version of [Separator]. It is used to separate objects horizontally, though (but it looks vertical!).
 	</description>
 	<methods>
 	</methods>
@@ -42455,34 +42866,34 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="VSlider" inherits="Slider" category="Core">
 	<brief_description>
-	Vertical slider.
+		Vertical slider.
 	</brief_description>
 	<description>
-	Vertical slider. See [Slider]. This one goes from left (min) to right (max).
+		Vertical slider. See [Slider]. This one goes from left (min) to right (max).
 	</description>
 	<methods>
 	</methods>
 	<constants>
 	</constants>
 	<theme_items>
-		<theme_item name="tick" type="Texture">
+		<theme_item name="grabber" type="Texture">
 		</theme_item>
 		<theme_item name="grabber_hilite" type="Texture">
 		</theme_item>
-		<theme_item name="grabber" type="Texture">
-		</theme_item>
 		<theme_item name="grabber_hilite" type="StyleBox">
 		</theme_item>
 		<theme_item name="slider" type="StyleBox">
 		</theme_item>
+		<theme_item name="tick" type="Texture">
+		</theme_item>
 	</theme_items>
 </class>
 <class name="VSplitContainer" inherits="SplitContainer" category="Core">
 	<brief_description>
-	Vertical split container.
+		Vertical split container.
 	</brief_description>
 	<description>
-	Vertical split container. See [SplitContainer]. This goes from left to right.
+		Vertical split container. See [SplitContainer]. This goes from left to right.
 	</description>
 	<methods>
 	</methods>
@@ -42491,22 +42902,43 @@ This method controls whether the position between two cached points is interpola
 	<theme_items>
 		<theme_item name="autohide" type="int">
 		</theme_item>
-		<theme_item name="separation" type="int">
+		<theme_item name="bg" type="StyleBox">
 		</theme_item>
 		<theme_item name="grabber" type="Texture">
 		</theme_item>
-		<theme_item name="bg" type="StyleBox">
+		<theme_item name="separation" type="int">
 		</theme_item>
 	</theme_items>
 </class>
+<class name="Variant" category="Core">
+	<brief_description>
+	</brief_description>
+	<description>
+	</description>
+	<methods>
+	</methods>
+	<constants>
+	</constants>
+</class>
 <class name="Vector2" category="Built-In Types">
 	<brief_description>
-	Vector used for 2D Math.
+		Vector used for 2D Math.
 	</brief_description>
 	<description>
-	2-element structure that can be used to represent positions in 2d-space, or any other pair of numeric values.
+		2-element structure that can be used to represent positions in 2d-space, or any other pair of numeric values.
 	</description>
 	<methods>
+		<method name="Vector2">
+			<return type="Vector2">
+			</return>
+			<argument index="0" name="x" type="float">
+			</argument>
+			<argument index="1" name="y" type="float">
+			</argument>
+			<description>
+				Constructs a new Vector2 from the given x and y.
+			</description>
+		</method>
 		<method name="abs">
 			<return type="Vector2">
 			</return>
@@ -42517,8 +42949,8 @@ This method controls whether the position between two cached points is interpola
 			<return type="float">
 			</return>
 			<description>
-			Returns the result of atan2 when called with the Vector's x and y as parameters (Math::atan2(x,y)).
-			Be aware that it therefore returns an angle oriented clockwise with regard to the (0, 1) unit vector, and not an angle oriented counter-clockwise with regard to the (1, 0) unit vector (which would be the typical trigonometric representation of the angle when calling Math::atan2(y,x)).
+				Returns the result of atan2 when called with the Vector's x and y as parameters (Math::atan2(x,y)).
+				Be aware that it therefore returns an angle oriented clockwise with regard to the (0, 1) unit vector, and not an angle oriented counter-clockwise with regard to the (1, 0) unit vector (which would be the typical trigonometric representation of the angle when calling Math::atan2(y,x)).
 			</description>
 		</method>
 		<method name="angle_to">
@@ -42527,7 +42959,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="to" type="Vector2">
 			</argument>
 			<description>
-			Returns the angle in radians between the two vectors.
+				Returns the angle in radians between the two vectors.
 			</description>
 		</method>
 		<method name="angle_to_point">
@@ -42536,7 +42968,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="to" type="Vector2">
 			</argument>
 			<description>
-			Returns the angle in radians between the line connecting the two points and the x coordinate.
+				Returns the angle in radians between the line connecting the two points and the x coordinate.
 			</description>
 		</method>
 		<method name="cubic_interpolate">
@@ -42551,7 +42983,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="3" name="t" type="float">
 			</argument>
 			<description>
-			Cubicly interpolates between this Vector and "b", using "pre_a" and "post_b" as handles, and returning the result at position "t".
+				Cubicly interpolates between this Vector and "b", using "pre_a" and "post_b" as handles, and returning the result at position "t".
 			</description>
 		</method>
 		<method name="distance_squared_to">
@@ -42560,7 +42992,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="to" type="Vector2">
 			</argument>
 			<description>
-			Returns the squared distance to vector "b". Prefer this function over "distance_to" if you need to sort vectors or need the squared distance for some formula.
+				Returns the squared distance to vector "b". Prefer this function over "distance_to" if you need to sort vectors or need the squared distance for some formula.
 			</description>
 		</method>
 		<method name="distance_to">
@@ -42569,7 +43001,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="to" type="Vector2">
 			</argument>
 			<description>
-			Returns the distance to vector "b".
+				Returns the distance to vector "b".
 			</description>
 		</method>
 		<method name="dot">
@@ -42578,42 +43010,42 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="with" type="Vector2">
 			</argument>
 			<description>
-			Returns the dot product with vector "b".
+				Returns the dot product with vector "b".
 			</description>
 		</method>
 		<method name="floor">
 			<return type="Vector2">
 			</return>
 			<description>
-			Remove the fractional part of x and y.
+				Remove the fractional part of x and y.
 			</description>
 		</method>
 		<method name="floorf">
 			<return type="Vector2">
 			</return>
 			<description>
-			Remove the fractional part of x and y.
+				Remove the fractional part of x and y.
 			</description>
 		</method>
 		<method name="get_aspect">
 			<return type="float">
 			</return>
 			<description>
-			Returns the ratio of X to Y.
+				Returns the ratio of X to Y.
 			</description>
 		</method>
 		<method name="length">
 			<return type="float">
 			</return>
 			<description>
-			Returns the length of the vector.
+				Returns the length of the vector.
 			</description>
 		</method>
 		<method name="length_squared">
 			<return type="float">
 			</return>
 			<description>
-			Returns the squared length of the vector. Prefer this function over "length" if you need to sort vectors or need the squared length for some formula.
+				Returns the squared length of the vector. Prefer this function over "length" if you need to sort vectors or need the squared length for some formula.
 			</description>
 		</method>
 		<method name="linear_interpolate">
@@ -42624,14 +43056,14 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="t" type="float">
 			</argument>
 			<description>
-			Returns the result of the linear interpolation between this vector and "b", by amount "t".
+				Returns the result of the linear interpolation between this vector and "b", by amount "t".
 			</description>
 		</method>
 		<method name="normalized">
 			<return type="Vector2">
 			</return>
 			<description>
-			Returns a normalized vector to unit length.
+				Returns a normalized vector to unit length.
 			</description>
 		</method>
 		<method name="reflect">
@@ -42640,7 +43072,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="vec" type="Vector2">
 			</argument>
 			<description>
-			Like "slide", but reflects the Vector instead of continuing along the wall.
+				Like "slide", but reflects the Vector instead of continuing along the wall.
 			</description>
 		</method>
 		<method name="rotated">
@@ -42649,7 +43081,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="phi" type="float">
 			</argument>
 			<description>
-			Rotates the vector by "phi" radians.
+				Rotates the vector by "phi" radians.
 			</description>
 		</method>
 		<method name="slide">
@@ -42658,7 +43090,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="vec" type="Vector2">
 			</argument>
 			<description>
-			Slides the vector by the other vector.
+				Slides the vector by the other vector.
 			</description>
 		</method>
 		<method name="snapped">
@@ -42667,65 +43099,100 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="by" type="Vector2">
 			</argument>
 			<description>
-			Snaps the vector to a grid with the given size.
+				Snaps the vector to a grid with the given size.
 			</description>
 		</method>
 		<method name="tangent">
 			<return type="Vector2">
 			</return>
 			<description>
-			Returns a perpendicular vector.
-			</description>
-		</method>
-		<method name="Vector2">
-			<return type="Vector2">
-			</return>
-			<argument index="0" name="x" type="float">
-			</argument>
-			<argument index="1" name="y" type="float">
-			</argument>
-			<description>
-			Constructs a new Vector2 from the given x and y.
+				Returns a perpendicular vector.
 			</description>
 		</method>
 	</methods>
 	<members>
+		<member name="height" type="float">
+			Height of the vector (Same as Y).
+		</member>
+		<member name="width" type="float">
+			Width of the vector (Same as X).
+		</member>
 		<member name="x" type="float">
 			X component of the vector.
 		</member>
 		<member name="y" type="float">
 			Y component of the vector.
 		</member>
-		<member name="width" type="float">
-			Width of the vector (Same as X).
-		</member>
-		<member name="height" type="float">
-			Height of the vector (Same as Y).
-		</member>
 	</members>
 	<constants>
 	</constants>
 </class>
 <class name="Vector2Array" category="Built-In Types">
 	<brief_description>
-	An Array of Vector2.
+		An Array of Vector2.
 	</brief_description>
 	<description>
-	An Array specifically designed to hold Vector2.
+		An Array specifically designed to hold Vector2.
 	</description>
 	<methods>
+		<method name="Vector2Array">
+			<return type="Vector2Array">
+			</return>
+			<argument index="0" name="from" type="Array">
+			</argument>
+			<description>
+				Construct a new [Vector2Array]. Optionally, you can pass in an Array that will be converted.
+			</description>
+		</method>
+		<method name="append">
+			<argument index="0" name="vector2" type="Vector2">
+			</argument>
+			<description>
+				Append an element at the end of the array (alias of [method push_back]).
+			</description>
+		</method>
+		<method name="append_array">
+			<argument index="0" name="array" type="Vector2Array">
+			</argument>
+			<description>
+				Append an [Vector2Array] at the end of this array.
+			</description>
+		</method>
+		<method name="insert">
+			<return type="int">
+			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="vector2" type="Vector2">
+			</argument>
+			<description>
+				Insert a new element at a given position in the array. The position must be valid, or at the end of the array (pos==size()).
+			</description>
+		</method>
+		<method name="invert">
+			<description>
+				Reverse the order of the elements in the array (so first element will now be the last).
+			</description>
+		</method>
 		<method name="push_back">
 			<argument index="0" name="vector2" type="Vector2">
 			</argument>
 			<description>
-			Insert a [Vector2] at the end.
+				Insert a [Vector2] at the end.
+			</description>
+		</method>
+		<method name="remove">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<description>
+				Remove an element from the array by index.
 			</description>
 		</method>
 		<method name="resize">
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Set the size of the Vector2Array. If larger than the current size it will reserve some space beforehand, and if it is smaller it will cut off the array.
+				Set the size of the Vector2Array. If larger than the current size it will reserve some space beforehand, and if it is smaller it will cut off the array.
 			</description>
 		</method>
 		<method name="set">
@@ -42734,23 +43201,14 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="vector2" type="Vector2">
 			</argument>
 			<description>
-			Change the [Vector2] at the given index.
+				Change the [Vector2] at the given index.
 			</description>
 		</method>
 		<method name="size">
 			<return type="int">
 			</return>
 			<description>
-			Return the size of the array.
-			</description>
-		</method>
-		<method name="Vector2Array">
-			<return type="Vector2Array">
-			</return>
-			<argument index="0" name="from" type="Array">
-			</argument>
-			<description>
-			Construct a new [Vector2Array]. Optionally, you can pass in an Array that will be converted.
+				Return the size of the array.
 			</description>
 		</method>
 	</methods>
@@ -42759,24 +43217,37 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Vector3" category="Built-In Types">
 	<brief_description>
-	Vector class, which performs basic 3D vector math operations.
+		Vector class, which performs basic 3D vector math operations.
 	</brief_description>
 	<description>
-	Vector3 is one of the core classes of the engine, and includes several built-in helper functions to perform basic vector math operations.
+		Vector3 is one of the core classes of the engine, and includes several built-in helper functions to perform basic vector math operations.
 	</description>
 	<methods>
+		<method name="Vector3">
+			<return type="Vector3">
+			</return>
+			<argument index="0" name="x" type="float">
+			</argument>
+			<argument index="1" name="y" type="float">
+			</argument>
+			<argument index="2" name="z" type="float">
+			</argument>
+			<description>
+				Returns a Vector3 with the given components.
+			</description>
+		</method>
 		<method name="abs">
 			<return type="Vector3">
 			</return>
 			<description>
-			Returns a new vector with all components in absolute values (e.g. positive).
+				Returns a new vector with all components in absolute values (e.g. positive).
 			</description>
 		</method>
 		<method name="ceil">
 			<return type="Vector3">
 			</return>
 			<description>
-			Returns a new vector with all components rounded up.
+				Returns a new vector with all components rounded up.
 			</description>
 		</method>
 		<method name="cross">
@@ -42785,7 +43256,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="b" type="Vector3">
 			</argument>
 			<description>
-			Return the cross product with b.
+				Return the cross product with b.
 			</description>
 		</method>
 		<method name="cubic_interpolate">
@@ -42800,7 +43271,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="3" name="t" type="float">
 			</argument>
 			<description>
-			Perform a cubic interpolation between vectors pre_a, a, b, post_b (a is current), by the given amount (t).
+				Perform a cubic interpolation between vectors pre_a, a, b, post_b (a is current), by the given amount (t).
 			</description>
 		</method>
 		<method name="distance_squared_to">
@@ -42809,7 +43280,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="b" type="Vector3">
 			</argument>
 			<description>
-			Return the squared distance (distance minus the last square root) to b. Prefer this function over distance_to if you need to sort vectors or need the squared distance for some formula.
+				Return the squared distance (distance minus the last square root) to b. Prefer this function over distance_to if you need to sort vectors or need the squared distance for some formula.
 			</description>
 		</method>
 		<method name="distance_to">
@@ -42818,7 +43289,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="b" type="Vector3">
 			</argument>
 			<description>
-			Return the distance to b.
+				Return the distance to b.
 			</description>
 		</method>
 		<method name="dot">
@@ -42827,35 +43298,35 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="b" type="Vector3">
 			</argument>
 			<description>
-			Return the dot product with b.
+				Return the dot product with b.
 			</description>
 		</method>
 		<method name="floor">
 			<return type="Vector3">
 			</return>
 			<description>
-			Returns a new vector with all components rounded down.
+				Returns a new vector with all components rounded down.
 			</description>
 		</method>
 		<method name="inverse">
 			<return type="Vector3">
 			</return>
 			<description>
-			Returns the inverse of the vector. This is the same as Vector3( 1.0 / v.x, 1.0 / v.y, 1.0 / v.z )
+				Returns the inverse of the vector. This is the same as Vector3( 1.0 / v.x, 1.0 / v.y, 1.0 / v.z )
 			</description>
 		</method>
 		<method name="length">
 			<return type="float">
 			</return>
 			<description>
-			Return the length of the vector.
+				Return the length of the vector.
 			</description>
 		</method>
 		<method name="length_squared">
 			<return type="float">
 			</return>
 			<description>
-			Return the length of the vector, squared. Prefer this function over "length" if you need to sort vectors or need the squared length for some formula.
+				Return the length of the vector, squared. Prefer this function over "length" if you need to sort vectors or need the squared length for some formula.
 			</description>
 		</method>
 		<method name="linear_interpolate">
@@ -42866,28 +43337,28 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="t" type="float">
 			</argument>
 			<description>
-			Linearly interpolates the vector to a given one (b), by the given amount (t).
+				Linearly interpolates the vector to a given one (b), by the given amount (t).
 			</description>
 		</method>
 		<method name="max_axis">
 			<return type="int">
 			</return>
 			<description>
-			Returns AXIS_X, AXIS_Y or AXIS_Z depending on which axis is the largest.
+				Returns AXIS_X, AXIS_Y or AXIS_Z depending on which axis is the largest.
 			</description>
 		</method>
 		<method name="min_axis">
 			<return type="int">
 			</return>
 			<description>
-			Returns AXIS_X, AXIS_Y or AXIS_Z depending on which axis is the smallest.
+				Returns AXIS_X, AXIS_Y or AXIS_Z depending on which axis is the smallest.
 			</description>
 		</method>
 		<method name="normalized">
 			<return type="Vector3">
 			</return>
 			<description>
-			Return a copy of the normalized vector to unit length. This is the same as v / v.length().
+				Return a copy of the normalized vector to unit length. This is the same as v / v.length().
 			</description>
 		</method>
 		<method name="reflect">
@@ -42896,7 +43367,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="by" type="Vector3">
 			</argument>
 			<description>
-			Like "slide", but reflects the Vector instead of continuing along the wall.
+				Like "slide", but reflects the Vector instead of continuing along the wall.
 			</description>
 		</method>
 		<method name="rotated">
@@ -42907,7 +43378,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="phi" type="float">
 			</argument>
 			<description>
-			Rotates the vector around some axis by phi radians.
+				Rotates the vector around some axis by phi radians.
 			</description>
 		</method>
 		<method name="slide">
@@ -42916,7 +43387,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="by" type="Vector3">
 			</argument>
 			<description>
-			Slides the vector along a wall.
+				Slides the vector along a wall.
 			</description>
 		</method>
 		<method name="snapped">
@@ -42925,20 +43396,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="by" type="float">
 			</argument>
 			<description>
-			Return a copy of the vector, snapped to the lowest neared multiple.
-			</description>
-		</method>
-		<method name="Vector3">
-			<return type="Vector3">
-			</return>
-			<argument index="0" name="x" type="float">
-			</argument>
-			<argument index="1" name="y" type="float">
-			</argument>
-			<argument index="2" name="z" type="float">
-			</argument>
-			<description>
-			Returns a Vector3 with the given components.
+				Return a copy of the vector, snapped to the lowest neared multiple.
 			</description>
 		</method>
 	</methods>
@@ -42967,24 +43425,70 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Vector3Array" category="Built-In Types">
 	<brief_description>
-	An Array of Vector3.
+		An Array of Vector3.
 	</brief_description>
 	<description>
-	An Array specifically designed to hold Vector3.
+		An Array specifically designed to hold Vector3.
 	</description>
 	<methods>
+		<method name="Vector3Array">
+			<return type="Vector3Array">
+			</return>
+			<argument index="0" name="from" type="Array">
+			</argument>
+			<description>
+				Construct a new Vector3Array. Optionally, you can pass in an Array that will be converted.
+			</description>
+		</method>
+		<method name="append">
+			<argument index="0" name="vector3" type="Vector3">
+			</argument>
+			<description>
+				Append an element at the end of the array (alias of [method push_back]).
+			</description>
+		</method>
+		<method name="append_array">
+			<argument index="0" name="array" type="Vector3Array">
+			</argument>
+			<description>
+				Append an [Vector3Array] at the end of this array.
+			</description>
+		</method>
+		<method name="insert">
+			<return type="int">
+			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<argument index="1" name="vector3" type="Vector3">
+			</argument>
+			<description>
+				Insert a new element at a given position in the array. The position must be valid, or at the end of the array (pos==size()).
+			</description>
+		</method>
+		<method name="invert">
+			<description>
+				Reverse the order of the elements in the array (so first element will now be the last).
+			</description>
+		</method>
 		<method name="push_back">
 			<argument index="0" name="vector3" type="Vector3">
 			</argument>
 			<description>
-			Insert a Vector3 at the end.
+				Insert a Vector3 at the end.
+			</description>
+		</method>
+		<method name="remove">
+			<argument index="0" name="idx" type="int">
+			</argument>
+			<description>
+				Remove an element from the array by index.
 			</description>
 		</method>
 		<method name="resize">
 			<argument index="0" name="idx" type="int">
 			</argument>
 			<description>
-			Set the size of the Vector3Array. If larger than the current size it will reserve some space beforehand, and if it is smaller it will cut off the array.
+				Set the size of the Vector3Array. If larger than the current size it will reserve some space beforehand, and if it is smaller it will cut off the array.
 			</description>
 		</method>
 		<method name="set">
@@ -42993,23 +43497,14 @@ This method controls whether the position between two cached points is interpola
 			<argument index="1" name="vector3" type="Vector3">
 			</argument>
 			<description>
-			Change the [Vector3] at the given index.
+				Change the [Vector3] at the given index.
 			</description>
 		</method>
 		<method name="size">
 			<return type="int">
 			</return>
 			<description>
-			Return the size of the array.
-			</description>
-		</method>
-		<method name="Vector3Array">
-			<return type="Vector3Array">
-			</return>
-			<argument index="0" name="from" type="Array">
-			</argument>
-			<description>
-			Construct a new Vector3Array. Optionally, you can pass in an Array that will be converted.
+				Return the size of the array.
 			</description>
 		</method>
 	</methods>
@@ -43022,37 +43517,42 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_mass">
-			<argument index="0" name="mass" type="float">
-			</argument>
+		<method name="get_brake" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_mass" qualifiers="const">
+		<method name="get_engine_force" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_friction">
-			<argument index="0" name="friction" type="float">
-			</argument>
+		<method name="get_friction" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_friction" qualifiers="const">
-			<return type="float">
+		<method name="get_linear_velocity" qualifiers="const">
+			<return type="Vector3">
 			</return>
 			<description>
+				Returns the VehicleBody's velocity vector. To get the absolute speed in scalar value, get the length of the return vector in pixels/second. Example:
+				[codeblock]
+				# vehicle is an instance of VehicleBody
+				var speed = vehicle.get_linear_velocity().length()
+				[/codeblock]
 			</description>
 		</method>
-		<method name="set_engine_force">
-			<argument index="0" name="engine_force" type="float">
-			</argument>
+		<method name="get_mass" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_engine_force" qualifiers="const">
+		<method name="get_steering" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
@@ -43064,33 +43564,28 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_brake" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_engine_force">
+			<argument index="0" name="engine_force" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_steering">
-			<argument index="0" name="steering" type="float">
+		<method name="set_friction">
+			<argument index="0" name="friction" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_steering" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_mass">
+			<argument index="0" name="mass" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_linear_velocity" qualifiers="const">
-			<return type="Vector3">
-			</return>
+		<method name="set_steering">
+			<argument index="0" name="steering" type="float">
+			</argument>
 			<description>
-			Returns the VehicleBody's velocity vector. To get the absolute speed in scalar value, get the length of the return vector in pixels/second. Example:
-			[codeblock]
-			# vehicle is an instance of VehicleBody
-			var speed = vehicle.get_linear_velocity().length()
-			[/codeblock]
 			</description>
 		</method>
 	</methods>
@@ -43103,62 +43598,62 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_radius">
-			<argument index="0" name="length" type="float">
-			</argument>
+		<method name="get_damping_compression" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_radius" qualifiers="const">
+		<method name="get_damping_relaxation" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_suspension_rest_length">
-			<argument index="0" name="length" type="float">
-			</argument>
+		<method name="get_friction_slip" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_suspension_rest_length" qualifiers="const">
+		<method name="get_radius" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_suspension_travel">
-			<argument index="0" name="length" type="float">
-			</argument>
+		<method name="get_suspension_max_force" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_suspension_travel" qualifiers="const">
+		<method name="get_suspension_rest_length" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_suspension_stiffness">
-			<argument index="0" name="length" type="float">
-			</argument>
+		<method name="get_suspension_stiffness" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_suspension_stiffness" qualifiers="const">
+		<method name="get_suspension_travel" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_suspension_max_force">
-			<argument index="0" name="length" type="float">
-			</argument>
+		<method name="is_used_as_steering" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_suspension_max_force" qualifiers="const">
-			<return type="float">
+		<method name="is_used_as_traction" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
@@ -43169,57 +43664,57 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_damping_compression" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_damping_relaxation">
+			<argument index="0" name="length" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_damping_relaxation">
+		<method name="set_friction_slip">
 			<argument index="0" name="length" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_damping_relaxation" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_radius">
+			<argument index="0" name="length" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_use_as_traction">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_suspension_max_force">
+			<argument index="0" name="length" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_used_as_traction" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_suspension_rest_length">
+			<argument index="0" name="length" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_use_as_steering">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_suspension_stiffness">
+			<argument index="0" name="length" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="is_used_as_steering" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_suspension_travel">
+			<argument index="0" name="length" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_friction_slip">
-			<argument index="0" name="length" type="float">
+		<method name="set_use_as_steering">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_friction_slip" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_use_as_traction">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -43233,89 +43728,85 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_stream">
-			<argument index="0" name="stream" type="VideoStream">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="get_stream" qualifiers="const">
-			<return type="VideoStream">
+		<method name="get_audio_track" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="play">
+		<method name="get_buffering_msec" qualifiers="const">
+			<return type="int">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="stop">
+		<method name="get_stream" qualifiers="const">
+			<return type="VideoStream">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="is_playing" qualifiers="const">
-			<return type="bool">
+		<method name="get_stream_name" qualifiers="const">
+			<return type="String">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_paused">
-			<argument index="0" name="paused" type="bool">
-			</argument>
+		<method name="get_stream_pos" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="is_paused" qualifiers="const">
-			<return type="bool">
+		<method name="get_video_texture">
+			<return type="Texture">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_volume">
-			<argument index="0" name="volume" type="float">
-			</argument>
+		<method name="get_volume" qualifiers="const">
+			<return type="float">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_volume" qualifiers="const">
+		<method name="get_volume_db" qualifiers="const">
 			<return type="float">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_volume_db">
-			<argument index="0" name="db" type="float">
-			</argument>
+		<method name="has_autoplay" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_volume_db" qualifiers="const">
-			<return type="float">
+		<method name="has_expand" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_audio_track">
-			<argument index="0" name="track" type="int">
-			</argument>
+		<method name="is_paused" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_audio_track" qualifiers="const">
-			<return type="int">
+		<method name="is_playing" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_stream_name" qualifiers="const">
-			<return type="String">
-			</return>
+		<method name="play">
 			<description>
 			</description>
 		</method>
-		<method name="get_stream_pos" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="set_audio_track">
+			<argument index="0" name="track" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -43325,9 +43816,9 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="has_autoplay" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_buffering_msec">
+			<argument index="0" name="msec" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -43337,27 +43828,31 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="has_expand" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_paused">
+			<argument index="0" name="paused" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_buffering_msec">
-			<argument index="0" name="msec" type="int">
+		<method name="set_stream">
+			<argument index="0" name="stream" type="VideoStream">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_buffering_msec" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="set_volume">
+			<argument index="0" name="volume" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_video_texture">
-			<return type="Texture">
-			</return>
+		<method name="set_volume_db">
+			<argument index="0" name="db" type="float">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="stop">
 			<description>
 			</description>
 		</method>
@@ -43387,403 +43882,403 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="Viewport" inherits="Node" category="Core">
 	<brief_description>
-	Creates a sub-view into the screen.
+		Creates a sub-view into the screen.
 	</brief_description>
 	<description>
-	A Viewport creates a different view into the screen, or a sub-view inside another viewport. Children 2D Nodes will display on it, and children Camera 3D nodes will render on it too.
-	Optionally, a viewport can have its own 2D or 3D world, so they don't share what they draw with other viewports.
-	If a viewport is a child of a [Control], it will automatically take up its same rect and position, otherwise they must be set manually.
-	Viewports can also choose to be audio listeners, so they generate positional audio depending on a 2D or 3D camera child of it.
-	Also, viewports can be assigned to different screens in case the devices have multiple screens.
-	Finally, viewports can also behave as render targets, in which case they will not be visible unless the associated texture is used to draw.
+		A Viewport creates a different view into the screen, or a sub-view inside another viewport. Children 2D Nodes will display on it, and children Camera 3D nodes will render on it too.
+		Optionally, a viewport can have its own 2D or 3D world, so they don't share what they draw with other viewports.
+		If a viewport is a child of a [Control], it will automatically take up its same rect and position, otherwise they must be set manually.
+		Viewports can also choose to be audio listeners, so they generate positional audio depending on a 2D or 3D camera child of it.
+		Also, viewports can be assigned to different screens in case the devices have multiple screens.
+		Finally, viewports can also behave as render targets, in which case they will not be visible unless the associated texture is used to draw.
 	</description>
 	<methods>
-		<method name="set_rect">
-			<argument index="0" name="rect" type="Rect2">
-			</argument>
-			<description>
-			Set the viewport rect. If the viewport is child of a control, it will use the same rect as the parent.
-			</description>
-		</method>
-		<method name="get_rect" qualifiers="const">
-			<return type="Rect2">
+		<method name="find_world" qualifiers="const">
+			<return type="World">
 			</return>
 			<description>
-			Return the viewport rect. If the viewport is child of a control, it will use the same rect as the parent. Otherwise, if the rect is empty, the viewport will use all the allowed space.
+				Return the 3D world of the viewport, or if no such present, the one of the parent viewport.
 			</description>
 		</method>
 		<method name="find_world_2d" qualifiers="const">
 			<return type="World2D">
 			</return>
 			<description>
-			Return the 2D world of the viewport.
-			</description>
-		</method>
-		<method name="set_world">
-			<argument index="0" name="world" type="World">
-			</argument>
-			<description>
-			Change the 3D world of the viewport.
+				Return the 2D world of the viewport.
 			</description>
 		</method>
-		<method name="get_world" qualifiers="const">
-			<return type="World">
+		<method name="get_camera" qualifiers="const">
+			<return type="Camera">
 			</return>
 			<description>
-			Return the 3D world of the viewport.
+				Return the active 3D camera.
 			</description>
 		</method>
-		<method name="find_world" qualifiers="const">
-			<return type="World">
+		<method name="get_canvas_transform" qualifiers="const">
+			<return type="Matrix32">
 			</return>
 			<description>
-			Return the 3D world of the viewport, or if no such present, the one of the parent viewport.
+				Get the canvas transform of the viewport.
 			</description>
 		</method>
-		<method name="set_canvas_transform">
-			<argument index="0" name="xform" type="Matrix32">
-			</argument>
+		<method name="get_final_transform" qualifiers="const">
+			<return type="Matrix32">
+			</return>
 			<description>
-			Set the canvas transform of the viewport, useful for changing the on-screen positions of all child [CanvasItem]s. This is relative to the global canvas transform of the viewport.
+				Get the total transform of the viewport.
 			</description>
 		</method>
-		<method name="get_canvas_transform" qualifiers="const">
+		<method name="get_global_canvas_transform" qualifiers="const">
 			<return type="Matrix32">
 			</return>
 			<description>
-			Get the canvas transform of the viewport.
+				Get the global canvas transform of the viewport.
 			</description>
 		</method>
-		<method name="set_global_canvas_transform">
-			<argument index="0" name="xform" type="Matrix32">
-			</argument>
+		<method name="get_mouse_pos" qualifiers="const">
+			<return type="Vector2">
+			</return>
 			<description>
-			Set the global canvas transform of the viewport. The canvas transform is relative to this.
+				Get the mouse position, relative to the viewport.
 			</description>
 		</method>
-		<method name="get_global_canvas_transform" qualifiers="const">
-			<return type="Matrix32">
+		<method name="get_physics_object_picking">
+			<return type="bool">
 			</return>
 			<description>
-			Get the global canvas transform of the viewport.
+				Get whether picking for all physics objects inside the viewport is enabled.
 			</description>
 		</method>
-		<method name="get_final_transform" qualifiers="const">
-			<return type="Matrix32">
+		<method name="get_rect" qualifiers="const">
+			<return type="Rect2">
 			</return>
 			<description>
-			Get the total transform of the viewport.
+				Return the viewport rect. If the viewport is child of a control, it will use the same rect as the parent. Otherwise, if the rect is empty, the viewport will use all the allowed space.
 			</description>
 		</method>
-		<method name="get_visible_rect" qualifiers="const">
-			<return type="Rect2">
+		<method name="get_render_target_clear_on_new_frame" qualifiers="const">
+			<return type="bool">
 			</return>
 			<description>
-			Return the final, visible rect in global screen coordinates.
+				Return whether automatic clearing of the render target on each frame is enabled.
 			</description>
 		</method>
-		<method name="set_transparent_background">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="get_render_target_filter" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			If this viewport is a child of another viewport, keep the previously drawn background visible.
+				Get whether the rendered texture has filters enabled.
 			</description>
 		</method>
-		<method name="has_transparent_background" qualifiers="const">
+		<method name="get_render_target_gen_mipmaps" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return whether the viewport lets whatever is behind it to show.
+				Get whether the rendered texture will have mipmaps generated.
 			</description>
 		</method>
-		<method name="set_size_override">
-			<argument index="0" name="enable" type="bool">
-			</argument>
-			<argument index="1" name="size" type="Vector2" default="Vector2(-1,-1)">
-			</argument>
-			<argument index="2" name="margin" type="Vector2" default="Vector2(0,0)">
-			</argument>
+		<method name="get_render_target_texture" qualifiers="const">
+			<return type="RenderTargetTexture">
+			</return>
 			<description>
-			Set the size of the viewport. If the enable parameter is true, it would use the override, otherwise it would use the default size. If the size parameter is equal to [code](-1, -1)[/code], it won't update the size.
+				Get the render target's texture, for use with various objects that you want to texture with the viewport.
 			</description>
 		</method>
-		<method name="get_size_override" qualifiers="const">
-			<return type="Vector2">
+		<method name="get_render_target_update_mode" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
-			Get the size override set with [method set_size_override].
+				Get when the render target would be updated, will be one of the [code]RENDER_TARGET_UPDATE_*[/code] constants.
 			</description>
 		</method>
-		<method name="is_size_override_enabled" qualifiers="const">
+		<method name="get_render_target_vflip" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Get the enabled status of the size override set with [method set_size_override].
+				Set whether the render target is flipped on the Y axis.
 			</description>
 		</method>
-		<method name="set_size_override_stretch">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
+		<method name="get_screen_capture" qualifiers="const">
+			<return type="Image">
+			</return>
 			<description>
-			Set whether the size override affects stretch as well.
+				Return the captured screenshot after [method queue_screen_capture]. You might need to check more than one frame untill the right image is returned.
 			</description>
 		</method>
-		<method name="is_size_override_stretch_enabled" qualifiers="const">
-			<return type="bool">
+		<method name="get_size_override" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<description>
-			Get the enabled status of the size strech override set with [method set_size_override_stretch].
+				Get the size override set with [method set_size_override].
 			</description>
 		</method>
-		<method name="queue_screen_capture">
+		<method name="get_viewport" qualifiers="const">
+			<return type="RID">
+			</return>
 			<description>
-			Queue a multithreaded screenshot, you can retrive it at a later frame via [method get_screen_capture].
+				Get the viewport RID from the visual server.
 			</description>
 		</method>
-		<method name="get_screen_capture" qualifiers="const">
-			<return type="Image">
+		<method name="get_visible_rect" qualifiers="const">
+			<return type="Rect2">
 			</return>
 			<description>
-			Return the captured screenshot after [method queue_screen_capture]. You might need to check more than one frame untill the right image is returned.
+				Return the final, visible rect in global screen coordinates.
 			</description>
 		</method>
-		<method name="set_as_render_target">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="get_world" qualifiers="const">
+			<return type="World">
+			</return>
 			<description>
-			Set the viewport's render target mode.
+				Return the 3D world of the viewport.
 			</description>
 		</method>
-		<method name="is_set_as_render_target" qualifiers="const">
-			<return type="bool">
+		<method name="gui_get_drag_data" qualifiers="const">
+			<return type="Variant">
 			</return>
 			<description>
-			Return whether the viewport is set as a render target by [method set_as_render_target].
+				Returs the drag data from the GUI, that was previously returned by [method Control.get_drag_data].
 			</description>
 		</method>
-		<method name="set_render_target_vflip">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="gui_has_modal_stack" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set whether the render target should be flipped on the Y axis.
+				Returs whether there are shown modals on-screen.
 			</description>
 		</method>
-		<method name="get_render_target_vflip" qualifiers="const">
+		<method name="has_transparent_background" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Set whether the render target is flipped on the Y axis.
+				Return whether the viewport lets whatever is behind it to show.
 			</description>
 		</method>
-		<method name="set_render_target_clear_on_new_frame">
-			<argument index="0" name="enable" type="bool">
+		<method name="input">
+			<argument index="0" name="local_event" type="InputEvent">
 			</argument>
 			<description>
-			Enable/disable automatic clearing of the render target on each frame. You might find it better to disable this if you are using the viewport for rarely updated textures. To clear manually, check [method render_target_clear]
 			</description>
 		</method>
-		<method name="get_render_target_clear_on_new_frame" qualifiers="const">
+		<method name="is_audio_listener" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return whether automatic clearing of the render target on each frame is enabled.
+				Returns whether the viewport sends sounds to the speakers.
 			</description>
 		</method>
-		<method name="render_target_clear">
+		<method name="is_audio_listener_2d" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Clear the render target manually.
+				Returns whether the viewport sends soundsfrom 2D emitters to the speakers.
 			</description>
 		</method>
-		<method name="set_render_target_filter">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="is_input_disabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set whether the rendered texture should have filters enabled. Disable if you want the texture's pixels be visible.
+				Return whether input to the viewport is disabled.
 			</description>
 		</method>
-		<method name="get_render_target_filter" qualifiers="const">
+		<method name="is_set_as_render_target" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Get whether the rendered texture has filters enabled.
+				Return whether the viewport is set as a render target by [method set_as_render_target].
 			</description>
 		</method>
-		<method name="set_render_target_gen_mipmaps">
-			<argument index="0" name="enable" type="bool">
-			</argument>
+		<method name="is_size_override_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set whether the rendered texture should have mipmaps generated. Mipmaps allow the texture to have better antialiasing from far away.
+				Get the enabled status of the size override set with [method set_size_override].
 			</description>
 		</method>
-		<method name="get_render_target_gen_mipmaps" qualifiers="const">
+		<method name="is_size_override_stretch_enabled" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Get whether the rendered texture will have mipmaps generated.
+				Get the enabled status of the size strech override set with [method set_size_override_stretch].
 			</description>
 		</method>
-		<method name="set_render_target_update_mode">
-			<argument index="0" name="mode" type="int">
-			</argument>
+		<method name="is_using_own_world" qualifiers="const">
+			<return type="bool">
+			</return>
 			<description>
-			Set when the render target should be updated, has to be one of the [code]RENDER_TARGET_UPDATE_*[/code] constants.
+				Return whether the viewport is using a world separate from the parent viewport's world.
 			</description>
 		</method>
-		<method name="get_render_target_update_mode" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="queue_screen_capture">
 			<description>
-			Get when the render target would be updated, will be one of the [code]RENDER_TARGET_UPDATE_*[/code] constants.
+				Queue a multithreaded screenshot, you can retrive it at a later frame via [method get_screen_capture].
 			</description>
 		</method>
-		<method name="get_render_target_texture" qualifiers="const">
-			<return type="RenderTargetTexture">
-			</return>
+		<method name="render_target_clear">
 			<description>
-			Get the render target's texture, for use with various objects that you want to texture with the viewport.
+				Clear the render target manually.
 			</description>
 		</method>
-		<method name="set_physics_object_picking">
+		<method name="set_as_audio_listener">
 			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Enable/disable picking for all physics objects inside the viewport.
+				Makes the viewport send sounds to the speakers.
 			</description>
 		</method>
-		<method name="get_physics_object_picking">
-			<return type="bool">
-			</return>
+		<method name="set_as_audio_listener_2d">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Get whether picking for all physics objects inside the viewport is enabled.
+				Makes the viewport send sounds from 2D emitters to the speakers.
 			</description>
 		</method>
-		<method name="get_viewport" qualifiers="const">
-			<return type="RID">
-			</return>
+		<method name="set_as_render_target">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Get the viewport RID from the visual server.
+				Set the viewport's render target mode.
 			</description>
 		</method>
-		<method name="input">
-			<argument index="0" name="local_event" type="InputEvent">
+		<method name="set_canvas_transform">
+			<argument index="0" name="xform" type="Matrix32">
 			</argument>
 			<description>
+				Set the canvas transform of the viewport, useful for changing the on-screen positions of all child [CanvasItem]s. This is relative to the global canvas transform of the viewport.
 			</description>
 		</method>
-		<method name="unhandled_input">
-			<argument index="0" name="local_event" type="InputEvent">
+		<method name="set_disable_input">
+			<argument index="0" name="disable" type="bool">
 			</argument>
 			<description>
+				Set whether input to the viewport is disabled.
 			</description>
 		</method>
-		<method name="update_worlds">
+		<method name="set_global_canvas_transform">
+			<argument index="0" name="xform" type="Matrix32">
+			</argument>
 			<description>
-			Force update of the 2D and 3D worlds.
+				Set the global canvas transform of the viewport. The canvas transform is relative to this.
 			</description>
 		</method>
-		<method name="set_use_own_world">
+		<method name="set_physics_object_picking">
 			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Make the viewport use a world separate from the parent viewport's world.
+				Enable/disable picking for all physics objects inside the viewport.
 			</description>
 		</method>
-		<method name="is_using_own_world" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_rect">
+			<argument index="0" name="rect" type="Rect2">
+			</argument>
 			<description>
-			Return whether the viewport is using a world separate from the parent viewport's world.
+				Set the viewport rect. If the viewport is child of a control, it will use the same rect as the parent.
 			</description>
 		</method>
-		<method name="get_camera" qualifiers="const">
-			<return type="Camera">
-			</return>
+		<method name="set_render_target_clear_on_new_frame">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Return the active 3D camera.
+				Enable/disable automatic clearing of the render target on each frame. You might find it better to disable this if you are using the viewport for rarely updated textures. To clear manually, check [method render_target_clear]
 			</description>
 		</method>
-		<method name="set_as_audio_listener">
+		<method name="set_render_target_filter">
 			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Makes the viewport send sounds to the speakers.
+				Set whether the rendered texture should have filters enabled. Disable if you want the texture's pixels be visible.
 			</description>
 		</method>
-		<method name="is_audio_listener" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_render_target_gen_mipmaps">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Returns whether the viewport sends sounds to the speakers.
+				Set whether the rendered texture should have mipmaps generated. Mipmaps allow the texture to have better antialiasing from far away.
 			</description>
 		</method>
-		<method name="set_as_audio_listener_2d">
-			<argument index="0" name="enable" type="bool">
+		<method name="set_render_target_to_screen_rect">
+			<argument index="0" name="rect" type="Rect2">
 			</argument>
 			<description>
-			Makes the viewport send sounds from 2D emitters to the speakers.
+				Map a part of the screen to the render target directly.
 			</description>
 		</method>
-		<method name="is_audio_listener_2d" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_render_target_update_mode">
+			<argument index="0" name="mode" type="int">
+			</argument>
 			<description>
-			Returns whether the viewport sends soundsfrom 2D emitters to the speakers.
+				Set when the render target should be updated, has to be one of the [code]RENDER_TARGET_UPDATE_*[/code] constants.
 			</description>
 		</method>
-		<method name="set_render_target_to_screen_rect">
-			<argument index="0" name="rect" type="Rect2">
+		<method name="set_render_target_vflip">
+			<argument index="0" name="enable" type="bool">
 			</argument>
 			<description>
-			Map a part of the screen to the render target directly.
+				Set whether the render target should be flipped on the Y axis.
 			</description>
 		</method>
-		<method name="get_mouse_pos" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_size_override">
+			<argument index="0" name="enable" type="bool">
+			</argument>
+			<argument index="1" name="size" type="Vector2" default="Vector2(-1,-1)">
+			</argument>
+			<argument index="2" name="margin" type="Vector2" default="Vector2(0,0)">
+			</argument>
 			<description>
-			Get the mouse position, relative to the viewport.
+				Set the size of the viewport. If the enable parameter is true, it would use the override, otherwise it would use the default size. If the size parameter is equal to [code](-1, -1)[/code], it won't update the size.
 			</description>
 		</method>
-		<method name="warp_mouse">
-			<argument index="0" name="to_pos" type="Vector2">
+		<method name="set_size_override_stretch">
+			<argument index="0" name="enabled" type="bool">
 			</argument>
 			<description>
-			Wrap the mouse to a position, relative to the viewport.
+				Set whether the size override affects stretch as well.
 			</description>
 		</method>
-		<method name="gui_has_modal_stack" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_transparent_background">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Returs whether there are shown modals on-screen.
+				If this viewport is a child of another viewport, keep the previously drawn background visible.
 			</description>
 		</method>
-		<method name="gui_get_drag_data" qualifiers="const">
-			<return type="Variant">
-			</return>
+		<method name="set_use_own_world">
+			<argument index="0" name="enable" type="bool">
+			</argument>
 			<description>
-			Returs the drag data from the GUI, that was previously returned by [method Control.get_drag_data].
+				Make the viewport use a world separate from the parent viewport's world.
 			</description>
 		</method>
-		<method name="set_disable_input">
-			<argument index="0" name="disable" type="bool">
+		<method name="set_world">
+			<argument index="0" name="world" type="World">
 			</argument>
 			<description>
-			Set whether input to the viewport is disabled.
+				Change the 3D world of the viewport.
 			</description>
 		</method>
-		<method name="is_input_disabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="unhandled_input">
+			<argument index="0" name="local_event" type="InputEvent">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="update_worlds">
 			<description>
-			Return whether input to the viewport is disabled.
+				Force update of the 2D and 3D worlds.
+			</description>
+		</method>
+		<method name="warp_mouse">
+			<argument index="0" name="to_pos" type="Vector2">
+			</argument>
+			<description>
+				Wrap the mouse to a position, relative to the viewport.
 			</description>
 		</method>
 	</methods>
 	<signals>
 		<signal name="size_changed">
 			<description>
-			Emitted when the size of the viewport is changed, whether by [method set_size_override], resize of window, or some other means.
+				Emitted when the size of the viewport is changed, whether by [method set_size_override], resize of window, or some other means.
 			</description>
 		</signal>
 	</signals>
@@ -43804,66 +44299,66 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="ViewportSprite" inherits="Node2D" category="Core">
 	<brief_description>
-	Displays a viewport as a sprite.
+		Displays a viewport as a sprite.
 	</brief_description>
 	<description>
-	Used to display a [Viewport] node at some position in the world, without having to mess with [RenderTargetTexture]s.
+		Used to display a [Viewport] node at some position in the world, without having to mess with [RenderTargetTexture]s.
 	</description>
 	<methods>
-		<method name="set_viewport_path">
-			<argument index="0" name="path" type="NodePath">
-			</argument>
+		<method name="get_modulate" qualifiers="const">
+			<return type="Color">
+			</return>
 			<description>
-			Set the path to the shown [Viewport] node.
+				Get color modulation for the texture. All texture pixels are multiplied by this color.
 			</description>
 		</method>
-		<method name="get_viewport_path" qualifiers="const">
-			<return type="NodePath">
+		<method name="get_offset" qualifiers="const">
+			<return type="Vector2">
 			</return>
 			<description>
-			Return the path to the shown [Viewport] node.
+				get the offset to the origin of the texture.
 			</description>
 		</method>
-		<method name="set_centered">
-			<argument index="0" name="centered" type="bool">
-			</argument>
+		<method name="get_viewport_path" qualifiers="const">
+			<return type="NodePath">
+			</return>
 			<description>
-			Set whether the viewport's texture should be centered on the origin.
+				Return the path to the shown [Viewport] node.
 			</description>
 		</method>
 		<method name="is_centered" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return whether the viewport's texture is centered on the origin.
+				Return whether the viewport's texture is centered on the origin.
 			</description>
 		</method>
-		<method name="set_offset">
-			<argument index="0" name="offset" type="Vector2">
+		<method name="set_centered">
+			<argument index="0" name="centered" type="bool">
 			</argument>
 			<description>
-			Set the offset to the origin of the texture.
+				Set whether the viewport's texture should be centered on the origin.
 			</description>
 		</method>
-		<method name="get_offset" qualifiers="const">
-			<return type="Vector2">
-			</return>
+		<method name="set_modulate">
+			<argument index="0" name="modulate" type="Color">
+			</argument>
 			<description>
-			get the offset to the origin of the texture.
+				Set color modulation for the texture. All texture pixels are multiplied by this color. Color may contain rgb values above 1 to achieve a highlight effect.
 			</description>
 		</method>
-		<method name="set_modulate">
-			<argument index="0" name="modulate" type="Color">
+		<method name="set_offset">
+			<argument index="0" name="offset" type="Vector2">
 			</argument>
 			<description>
-			Set color modulation for the texture. All texture pixels are multiplied by this color. Color may contain rgb values above 1 to achieve a highlight effect.
+				Set the offset to the origin of the texture.
 			</description>
 		</method>
-		<method name="get_modulate" qualifiers="const">
-			<return type="Color">
-			</return>
+		<method name="set_viewport_path">
+			<argument index="0" name="path" type="NodePath">
+			</argument>
 			<description>
-			Get color modulation for the texture. All texture pixels are multiplied by this color.
+				Set the path to the shown [Viewport] node.
 			</description>
 		</method>
 	</methods>
@@ -43872,28 +44367,28 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="VisibilityEnabler" inherits="VisibilityNotifier" category="Core">
 	<brief_description>
-	Enable certain nodes only when visible.
+		Enable certain nodes only when visible.
 	</brief_description>
 	<description>
-	The VisibilityEnabler will disable [RigidBody] and [AnimationPlayer] nodes when they are not visible. It will only affect other nodes within the same scene as the VisibilityEnabler itself.
+		The VisibilityEnabler will disable [RigidBody] and [AnimationPlayer] nodes when they are not visible. It will only affect other nodes within the same scene as the VisibilityEnabler itself.
 	</description>
 	<methods>
-		<method name="set_enabler">
+		<method name="is_enabler_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="enabler" type="int">
 			</argument>
-			<argument index="1" name="enabled" type="bool">
-			</argument>
 			<description>
-			Set an enabler to true for all nodes of its type to be disabled when the VisibilityEnabler is not in view. See the constants for enablers and what they affect.
+				Returns whether the specified enabler was set to true or not.
 			</description>
 		</method>
-		<method name="is_enabler_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_enabler">
 			<argument index="0" name="enabler" type="int">
 			</argument>
+			<argument index="1" name="enabled" type="bool">
+			</argument>
 			<description>
-			Returns whether the specified enabler was set to true or not.
+				Set an enabler to true for all nodes of its type to be disabled when the VisibilityEnabler is not in view. See the constants for enablers and what they affect.
 			</description>
 		</method>
 	</methods>
@@ -43910,28 +44405,28 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="VisibilityEnabler2D" inherits="VisibilityNotifier2D" category="Core">
 	<brief_description>
-	Enable certain nodes only when visible.
+		Enable certain nodes only when visible.
 	</brief_description>
 	<description>
-	The VisibilityEnabler2D will disable [RigidBody2D], [AnimationPlayer], and other nodes when they are not visible. It will only affect other nodes within the same scene as the VisibilityEnabler2D itself.
+		The VisibilityEnabler2D will disable [RigidBody2D], [AnimationPlayer], and other nodes when they are not visible. It will only affect other nodes within the same scene as the VisibilityEnabler2D itself.
 	</description>
 	<methods>
-		<method name="set_enabler">
+		<method name="is_enabler_enabled" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="enabler" type="int">
 			</argument>
-			<argument index="1" name="enabled" type="bool">
-			</argument>
 			<description>
-			Set an enabler to true for all nodes of its type to be disabled when the VisibilityEnabler2D is not in view. See the constants for enablers and what they affect.
+				Returns whether the specified enabler was set to true or not.
 			</description>
 		</method>
-		<method name="is_enabler_enabled" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="set_enabler">
 			<argument index="0" name="enabler" type="int">
 			</argument>
+			<argument index="1" name="enabled" type="bool">
+			</argument>
 			<description>
-			Returns whether the specified enabler was set to true or not.
+				Set an enabler to true for all nodes of its type to be disabled when the VisibilityEnabler2D is not in view. See the constants for enablers and what they affect.
 			</description>
 		</method>
 	</methods>
@@ -43959,57 +44454,57 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="VisibilityNotifier" inherits="Spatial" category="Core">
 	<brief_description>
-	Detect when the node is visible on screen.
+		Detect when the node is visible on screen.
 	</brief_description>
 	<description>
-	The VisibilityNotifier is used to notify when its bounding box enters the screen, is visible on the screen, or when it exits the screen.
+		The VisibilityNotifier is used to notify when its bounding box enters the screen, is visible on the screen, or when it exits the screen.
 	</description>
 	<methods>
-		<method name="set_aabb">
-			<argument index="0" name="rect" type="AABB">
-			</argument>
-			<description>
-			Set the visibility bounding box of the VisibilityNotifier.
-			</description>
-		</method>
 		<method name="get_aabb" qualifiers="const">
 			<return type="AABB">
 			</return>
 			<description>
-			Return the visibility bounding box of the VisibilityNotifier.
+				Return the visibility bounding box of the VisibilityNotifier.
 			</description>
 		</method>
 		<method name="is_on_screen" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if any part of the bounding box is on the screen.
+				Return true if any part of the bounding box is on the screen.
 			</description>
 		</method>
-	</methods>
-	<signals>
-		<signal name="enter_screen">
+		<method name="set_aabb">
+			<argument index="0" name="rect" type="AABB">
+			</argument>
 			<description>
-			Emitted when the VisibilityNotifier enters the screen.
+				Set the visibility bounding box of the VisibilityNotifier.
 			</description>
-		</signal>
+		</method>
+	</methods>
+	<signals>
 		<signal name="enter_camera">
 			<argument index="0" name="camera" type="Object">
 			</argument>
 			<description>
-			Emitted when the VisibilityNotifier enters a [Camera]'s view.
+				Emitted when the VisibilityNotifier enters a [Camera]'s view.
 			</description>
 		</signal>
-		<signal name="exit_screen">
+		<signal name="enter_screen">
 			<description>
-			Emitted when the VisibilityNotifier exits the screen.
+				Emitted when the VisibilityNotifier enters the screen.
 			</description>
 		</signal>
 		<signal name="exit_camera">
 			<argument index="0" name="camera" type="Object">
 			</argument>
 			<description>
-			Emitted when the VisibilityNotifier exits a [Camera]'s view.
+				Emitted when the VisibilityNotifier exits a [Camera]'s view.
+			</description>
+		</signal>
+		<signal name="exit_screen">
+			<description>
+				Emitted when the VisibilityNotifier exits the screen.
 			</description>
 		</signal>
 	</signals>
@@ -44018,57 +44513,57 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="VisibilityNotifier2D" inherits="Node2D" category="Core">
 	<brief_description>
-	Detect when the node is visible on screen.
+		Detect when the node is visible on screen.
 	</brief_description>
 	<description>
-	The VisibilityNotifier2D is used to notify when its bounding rectangle enters the screen, is visible on the screen, or when it exits the screen.
+		The VisibilityNotifier2D is used to notify when its bounding rectangle enters the screen, is visible on the screen, or when it exits the screen.
 	</description>
 	<methods>
-		<method name="set_rect">
-			<argument index="0" name="rect" type="Rect2">
-			</argument>
-			<description>
-			Set the visibility bounding rectangle of the VisibilityNotifier2D.
-			</description>
-		</method>
 		<method name="get_rect" qualifiers="const">
 			<return type="Rect2">
 			</return>
 			<description>
-			Return the visibility bounding rectangle of the VisibilityNotifier2D.
+				Return the visibility bounding rectangle of the VisibilityNotifier2D.
 			</description>
 		</method>
 		<method name="is_on_screen" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Return true if any part of the bounding rectangle is on the screen.
+				Return true if any part of the bounding rectangle is on the screen.
+			</description>
+		</method>
+		<method name="set_rect">
+			<argument index="0" name="rect" type="Rect2">
+			</argument>
+			<description>
+				Set the visibility bounding rectangle of the VisibilityNotifier2D.
 			</description>
 		</method>
 	</methods>
 	<signals>
 		<signal name="enter_screen">
 			<description>
-			Emitted when the VisibilityNotifier2D enters the screen.
+				Emitted when the VisibilityNotifier2D enters the screen.
 			</description>
 		</signal>
 		<signal name="enter_viewport">
 			<argument index="0" name="viewport" type="Object">
 			</argument>
 			<description>
-			Emitted when the VisibilityNotifier2D enters a [Viewport].
+				Emitted when the VisibilityNotifier2D enters a [Viewport].
 			</description>
 		</signal>
 		<signal name="exit_screen">
 			<description>
-			Emitted when the VisibilityNotifier2D exits the screen.
+				Emitted when the VisibilityNotifier2D exits the screen.
 			</description>
 		</signal>
 		<signal name="exit_viewport">
 			<argument index="0" name="viewport" type="Object">
 			</argument>
 			<description>
-			Emitted when the VisibilityNotifier2D exits a [Viewport].
+				Emitted when the VisibilityNotifier2D exits a [Viewport].
 			</description>
 		</signal>
 	</signals>
@@ -44081,6 +44576,12 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
+		<method name="get_layer_mask" qualifiers="const">
+			<return type="int">
+			</return>
+			<description>
+			</description>
+		</method>
 		<method name="set_base">
 			<argument index="0" name="base" type="RID">
 			</argument>
@@ -44093,172 +44594,186 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_layer_mask" qualifiers="const">
-			<return type="int">
-			</return>
-			<description>
-			</description>
-		</method>
 	</methods>
 	<constants>
 	</constants>
 </class>
 <class name="VisualServer" inherits="Object" category="Core">
 	<brief_description>
-	Server for anything visible.
+		Server for anything visible.
 	</brief_description>
 	<description>
-	Server for anything visible. The visual server is the API backend for everything visible. The whole scene system mounts on it to display.
-	The visual server is completely opaque, the internals are entirely implementation specific and cannot be accessed.
+		Server for anything visible. The visual server is the API backend for everything visible. The whole scene system mounts on it to display.
+		The visual server is completely opaque, the internals are entirely implementation specific and cannot be accessed.
 	</description>
 	<methods>
-		<method name="texture_create">
-			<return type="RID">
-			</return>
-			<description>
-			</description>
-		</method>
-		<method name="texture_create_from_image">
-			<return type="RID">
-			</return>
-			<argument index="0" name="arg0" type="Image">
+		<method name="black_bars_set_images">
+			<argument index="0" name="left" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int" default="7">
+			<argument index="1" name="top" type="RID">
+			</argument>
+			<argument index="2" name="right" type="RID">
+			</argument>
+			<argument index="3" name="bottom" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="texture_set_flags">
-			<argument index="0" name="arg0" type="RID">
+		<method name="black_bars_set_margins">
+			<argument index="0" name="left" type="int">
 			</argument>
-			<argument index="1" name="arg1" type="int">
+			<argument index="1" name="top" type="int">
+			</argument>
+			<argument index="2" name="right" type="int">
+			</argument>
+			<argument index="3" name="bottom" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="texture_get_flags" qualifiers="const">
-			<return type="int">
+		<method name="camera_create">
+			<return type="RID">
 			</return>
-			<argument index="0" name="arg0" type="RID">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="texture_get_width" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="camera_set_orthogonal">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
+			<argument index="1" name="arg1" type="float">
+			</argument>
+			<argument index="2" name="arg2" type="float">
+			</argument>
+			<argument index="3" name="arg3" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="texture_get_height" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="camera_set_perspective">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="texture_set_shrink_all_x2_on_set_data">
-			<argument index="0" name="shrink" type="bool">
+			<argument index="1" name="arg1" type="float">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="shader_create">
-			<return type="RID">
-			</return>
-			<argument index="0" name="mode" type="int" default="0">
+			<argument index="2" name="arg2" type="float">
+			</argument>
+			<argument index="3" name="arg3" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="shader_set_mode">
-			<argument index="0" name="shader" type="RID">
+		<method name="camera_set_transform">
+			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="mode" type="int">
+			<argument index="1" name="arg1" type="Transform">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="material_create">
+		<method name="canvas_create">
 			<return type="RID">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="material_set_shader">
-			<argument index="0" name="shader" type="RID">
+		<method name="canvas_item_add_circle">
+			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="RID">
+			<argument index="1" name="arg1" type="Vector2">
+			</argument>
+			<argument index="2" name="arg2" type="float">
+			</argument>
+			<argument index="3" name="arg3" type="Color">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="material_get_shader" qualifiers="const">
-			<return type="RID">
-			</return>
+		<method name="canvas_item_add_line">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
+			<argument index="1" name="arg1" type="Vector2">
+			</argument>
+			<argument index="2" name="arg2" type="Vector2">
+			</argument>
+			<argument index="3" name="arg3" type="Color">
+			</argument>
+			<argument index="4" name="arg4" type="float" default="1">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="material_set_param">
+		<method name="canvas_item_add_rect">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="String">
+			<argument index="1" name="arg1" type="Rect2">
 			</argument>
-			<argument index="2" name="arg2" type="Variant">
+			<argument index="2" name="arg2" type="Color">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="material_get_param" qualifiers="const">
+		<method name="canvas_item_add_style_box">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="String">
+			<argument index="1" name="arg1" type="Rect2">
+			</argument>
+			<argument index="2" name="arg2" type="Rect2">
+			</argument>
+			<argument index="3" name="arg3" type="RID">
+			</argument>
+			<argument index="4" name="arg4" type="RealArray">
+			</argument>
+			<argument index="5" name="arg5" type="Color" default="Color(1,1,1,1)">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="material_set_flag">
+		<method name="canvas_item_add_texture_rect">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
+			<argument index="1" name="arg1" type="Rect2">
 			</argument>
-			<argument index="2" name="arg2" type="bool">
+			<argument index="2" name="arg2" type="RID">
+			</argument>
+			<argument index="3" name="arg3" type="bool">
+			</argument>
+			<argument index="4" name="arg4" type="Color" default="Color(1,1,1,1)">
+			</argument>
+			<argument index="5" name="arg5" type="bool" default="false">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="material_get_flag" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="canvas_item_add_texture_rect_region">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
+			<argument index="1" name="arg1" type="Rect2">
+			</argument>
+			<argument index="2" name="arg2" type="RID">
+			</argument>
+			<argument index="3" name="arg3" type="Rect2">
+			</argument>
+			<argument index="4" name="arg4" type="Color" default="Color(1,1,1,1)">
+			</argument>
+			<argument index="5" name="arg5" type="bool" default="false">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="material_set_blend_mode">
+		<method name="canvas_item_clear">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="material_get_blend_mode" qualifiers="const">
-			<return type="int">
+		<method name="canvas_item_create">
+			<return type="RID">
 			</return>
-			<argument index="0" name="arg0" type="RID">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="material_set_line_width">
+		<method name="canvas_item_get_opacity" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<argument index="1" name="arg1" type="float">
@@ -44266,69 +44781,81 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="material_get_line_width" qualifiers="const">
-			<return type="float">
+		<method name="canvas_item_get_parent" qualifiers="const">
+			<return type="RID">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="mesh_create">
-			<return type="RID">
+		<method name="canvas_item_get_self_opacity" qualifiers="const">
+			<return type="float">
 			</return>
+			<argument index="0" name="arg0" type="RID">
+			</argument>
+			<argument index="1" name="arg1" type="float">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="mesh_add_surface">
+		<method name="canvas_item_raise">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
+			<description>
+			</description>
+		</method>
+		<method name="canvas_item_set_clip">
+			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="2" name="arg2" type="Array">
+			<argument index="1" name="arg1" type="bool">
 			</argument>
-			<argument index="3" name="arg3" type="Array">
+			<description>
+			</description>
+		</method>
+		<method name="canvas_item_set_custom_rect">
+			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="4" name="arg4" type="bool" default="-1">
+			<argument index="1" name="arg1" type="bool">
+			</argument>
+			<argument index="2" name="arg2" type="Rect2">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="mesh_surface_set_material">
+		<method name="canvas_item_set_opacity">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
+			<argument index="1" name="arg1" type="float">
 			</argument>
-			<argument index="2" name="arg2" type="RID">
+			<description>
+			</description>
+		</method>
+		<method name="canvas_item_set_parent">
+			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="3" name="arg3" type="bool" default="false">
+			<argument index="1" name="arg1" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="mesh_surface_get_material" qualifiers="const">
-			<return type="RID">
-			</return>
+		<method name="canvas_item_set_self_opacity">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
+			<argument index="1" name="arg1" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="mesh_surface_get_array_len" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="canvas_item_set_transform">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
+			<argument index="1" name="arg1" type="Matrix32">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="mesh_surface_get_array_index_len" qualifiers="const">
-			<return type="int">
-			</return>
+		<method name="canvas_item_set_z">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<argument index="1" name="arg1" type="int">
@@ -44336,137 +44863,119 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="mesh_surface_get_format" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="arg0" type="RID">
+		<method name="cursor_set_pos">
+			<argument index="0" name="arg0" type="Vector2">
 			</argument>
 			<argument index="1" name="arg1" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="mesh_surface_get_primitive_type" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="arg0" type="RID">
+		<method name="cursor_set_rotation">
+			<argument index="0" name="arg0" type="float">
 			</argument>
 			<argument index="1" name="arg1" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="mesh_remove_surface">
+		<method name="cursor_set_texture">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
+			<argument index="1" name="arg1" type="Vector2">
+			</argument>
+			<argument index="2" name="arg2" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="mesh_get_surface_count" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="arg0" type="RID">
+		<method name="cursor_set_visible">
+			<argument index="0" name="arg0" type="bool">
+			</argument>
+			<argument index="1" name="arg1" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="multimesh_create">
-			<return type="RID">
-			</return>
+		<method name="draw">
 			<description>
 			</description>
 		</method>
-		<method name="multimesh_set_mesh">
+		<method name="free_rid">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="RID">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="multimesh_set_aabb">
-			<argument index="0" name="arg0" type="RID">
-			</argument>
-			<argument index="1" name="arg1" type="AABB">
+		<method name="get_render_info">
+			<return type="int">
+			</return>
+			<argument index="0" name="arg0" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="multimesh_instance_set_transform">
+		<method name="get_test_cube">
+			<return type="RID">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="instance_attach_object_instance_ID">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<argument index="1" name="arg1" type="int">
 			</argument>
-			<argument index="2" name="arg2" type="Transform">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="multimesh_instance_set_color">
+		<method name="instance_attach_skeleton">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
-			</argument>
-			<argument index="2" name="arg2" type="Color">
+			<argument index="1" name="arg1" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="multimesh_get_mesh" qualifiers="const">
+		<method name="instance_create">
 			<return type="RID">
 			</return>
-			<argument index="0" name="arg0" type="RID">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="multimesh_get_aabb" qualifiers="const">
-			<return type="AABB">
+		<method name="instance_geometry_get_material_param" qualifiers="const">
+			<return type="RID">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="AABB">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="multimesh_instance_get_transform" qualifiers="const">
-			<return type="Transform">
+		<method name="instance_geometry_override_material_param" qualifiers="const">
+			<return type="RID">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="multimesh_instance_get_color" qualifiers="const">
-			<return type="Color">
+		<method name="instance_get_base" qualifiers="const">
+			<return type="RID">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_create">
+		<method name="instance_get_base_aabb" qualifiers="const">
 			<return type="RID">
 			</return>
-			<description>
-			</description>
-		</method>
-		<method name="particles_set_amount">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_get_amount" qualifiers="const">
+		<method name="instance_get_object_instance_ID" qualifiers="const">
 			<return type="int">
 			</return>
 			<argument index="0" name="arg0" type="RID">
@@ -44474,106 +44983,104 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="particles_set_emitting">
+		<method name="instance_get_room" qualifiers="const">
+			<return type="RID">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="bool">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_is_emitting" qualifiers="const">
-			<return type="bool">
+		<method name="instance_get_skeleton" qualifiers="const">
+			<return type="RID">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_set_visibility_aabb">
+		<method name="instance_get_transform" qualifiers="const">
+			<return type="Transform">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="AABB">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_get_visibility_aabb" qualifiers="const">
-			<return type="AABB">
+		<method name="instance_is_exterior" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_set_variable">
+		<method name="instance_set_exterior">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
-			</argument>
-			<argument index="2" name="arg2" type="float">
+			<argument index="1" name="arg1" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_get_variable" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="instance_set_room">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
+			<argument index="1" name="arg1" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_set_randomness">
+		<method name="instance_set_transform">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
-			</argument>
-			<argument index="2" name="arg2" type="float">
+			<argument index="1" name="arg1" type="Transform">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_get_randomness" qualifiers="const">
-			<return type="float">
+		<method name="instances_cull_aabb" qualifiers="const">
+			<return type="Array">
 			</return>
-			<argument index="0" name="arg0" type="RID">
+			<argument index="0" name="arg0" type="AABB">
 			</argument>
-			<argument index="1" name="arg1" type="int">
+			<argument index="1" name="arg1" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_set_color_phases">
-			<argument index="0" name="arg0" type="RID">
+		<method name="instances_cull_convex" qualifiers="const">
+			<return type="Array">
+			</return>
+			<argument index="0" name="arg0" type="Array">
 			</argument>
-			<argument index="1" name="arg1" type="int">
+			<argument index="1" name="arg1" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_get_color_phases" qualifiers="const">
-			<return type="int">
+		<method name="instances_cull_ray" qualifiers="const">
+			<return type="Array">
 			</return>
-			<argument index="0" name="arg0" type="RID">
+			<argument index="0" name="arg0" type="Vector3">
+			</argument>
+			<argument index="1" name="arg1" type="Vector3">
+			</argument>
+			<argument index="2" name="arg2" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_set_color_phase_pos">
-			<argument index="0" name="arg0" type="RID">
-			</argument>
-			<argument index="1" name="arg1" type="int">
-			</argument>
-			<argument index="2" name="arg2" type="float">
+		<method name="light_create">
+			<return type="RID">
+			</return>
+			<argument index="0" name="arg0" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_get_color_phase_pos" qualifiers="const">
-			<return type="float">
+		<method name="light_get_color" qualifiers="const">
+			<return type="Color">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
@@ -44582,27 +45089,25 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="particles_set_color_phase_color">
+		<method name="light_get_projector" qualifiers="const">
+			<return type="RID">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
-			</argument>
-			<argument index="2" name="arg2" type="Color">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_get_color_phase_color" qualifiers="const">
-			<return type="Color">
+		<method name="light_get_type" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_set_attractors">
+		<method name="light_get_var" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<argument index="1" name="arg1" type="int">
@@ -44610,65 +45115,59 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="particles_get_attractors" qualifiers="const">
-			<return type="int">
+		<method name="light_has_shadow" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_set_attractor_pos">
+		<method name="light_is_volumetric" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
-			</argument>
-			<argument index="2" name="arg2" type="Vector3">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_get_attractor_pos" qualifiers="const">
-			<return type="Vector3">
-			</return>
+		<method name="light_set_color">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<argument index="1" name="arg1" type="int">
 			</argument>
+			<argument index="2" name="arg2" type="Color">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_set_attractor_strength">
+		<method name="light_set_projector">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
-			</argument>
-			<argument index="2" name="arg2" type="float">
+			<argument index="1" name="arg1" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_get_attractor_strength" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="light_set_shadow">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
+			<argument index="1" name="arg1" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_set_material">
+		<method name="light_set_var">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="RID">
+			<argument index="1" name="arg1" type="int">
 			</argument>
-			<argument index="2" name="arg2" type="bool" default="false">
+			<argument index="2" name="arg2" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="particles_set_height_from_velocity">
+		<method name="light_set_volumetric">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<argument index="1" name="arg1" type="bool">
@@ -44676,23 +45175,25 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="particles_has_height_from_velocity" qualifiers="const">
-			<return type="bool">
+		<method name="make_sphere_mesh">
+			<return type="RID">
 			</return>
-			<argument index="0" name="arg0" type="RID">
+			<argument index="0" name="arg0" type="int">
+			</argument>
+			<argument index="1" name="arg1" type="int">
+			</argument>
+			<argument index="2" name="arg2" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="light_create">
+		<method name="material_create">
 			<return type="RID">
 			</return>
-			<argument index="0" name="arg0" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="light_get_type" qualifiers="const">
+		<method name="material_get_blend_mode" qualifiers="const">
 			<return type="int">
 			</return>
 			<argument index="0" name="arg0" type="RID">
@@ -44700,109 +45201,113 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="light_set_color">
+		<method name="material_get_flag" qualifiers="const">
+			<return type="bool">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<argument index="1" name="arg1" type="int">
 			</argument>
-			<argument index="2" name="arg2" type="Color">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="light_get_color" qualifiers="const">
-			<return type="Color">
+		<method name="material_get_line_width" qualifiers="const">
+			<return type="float">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="light_set_shadow">
+		<method name="material_get_param" qualifiers="const">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="bool">
+			<argument index="1" name="arg1" type="String">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="light_has_shadow" qualifiers="const">
-			<return type="bool">
+		<method name="material_get_shader" qualifiers="const">
+			<return type="RID">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="light_set_volumetric">
+		<method name="material_set_blend_mode">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="bool">
+			<argument index="1" name="arg1" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="light_is_volumetric" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="material_set_flag">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
+			<argument index="1" name="arg1" type="int">
+			</argument>
+			<argument index="2" name="arg2" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="light_set_projector">
+		<method name="material_set_line_width">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="RID">
+			<argument index="1" name="arg1" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="light_get_projector" qualifiers="const">
-			<return type="RID">
-			</return>
+		<method name="material_set_param">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
+			<argument index="1" name="arg1" type="String">
+			</argument>
+			<argument index="2" name="arg2" type="Variant">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="light_set_var">
+		<method name="material_set_shader">
+			<argument index="0" name="shader" type="RID">
+			</argument>
+			<argument index="1" name="arg1" type="RID">
+			</argument>
+			<description>
+			</description>
+		</method>
+		<method name="mesh_add_surface">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<argument index="1" name="arg1" type="int">
 			</argument>
-			<argument index="2" name="arg2" type="float">
+			<argument index="2" name="arg2" type="Array">
+			</argument>
+			<argument index="3" name="arg3" type="Array">
+			</argument>
+			<argument index="4" name="arg4" type="bool" default="-1">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="light_get_var" qualifiers="const">
-			<return type="float">
-			</return>
+		<method name="mesh_add_surface_from_planes">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
+			<argument index="1" name="arg1" type="Array">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="skeleton_create">
+		<method name="mesh_create">
 			<return type="RID">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="skeleton_resize">
-			<argument index="0" name="arg0" type="RID">
-			</argument>
-			<argument index="1" name="arg1" type="int">
-			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="skeleton_get_bone_count" qualifiers="const">
+		<method name="mesh_get_surface_count" qualifiers="const">
 			<return type="int">
 			</return>
 			<argument index="0" name="arg0" type="RID">
@@ -44810,18 +45315,16 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="skeleton_bone_set_transform">
+		<method name="mesh_remove_surface">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<argument index="1" name="arg1" type="int">
 			</argument>
-			<argument index="2" name="arg2" type="Transform">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="skeleton_bone_get_transform">
-			<return type="Transform">
+		<method name="mesh_surface_get_array_index_len" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
@@ -44830,213 +45333,221 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="room_create">
-			<return type="RID">
+		<method name="mesh_surface_get_array_len" qualifiers="const">
+			<return type="int">
 			</return>
-			<description>
-			</description>
-		</method>
-		<method name="room_set_bounds">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="Dictionary">
+			<argument index="1" name="arg1" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="room_get_bounds" qualifiers="const">
-			<return type="Dictionary">
+		<method name="mesh_surface_get_format" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
+			<argument index="1" name="arg1" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="portal_create">
+		<method name="mesh_surface_get_material" qualifiers="const">
 			<return type="RID">
 			</return>
-			<description>
-			</description>
-		</method>
-		<method name="portal_set_shape">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="Vector2Array">
+			<argument index="1" name="arg1" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="portal_get_shape" qualifiers="const">
-			<return type="Vector2Array">
+		<method name="mesh_surface_get_primitive_type" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
+			<argument index="1" name="arg1" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="portal_set_enabled">
+		<method name="mesh_surface_set_material">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="bool">
+			<argument index="1" name="arg1" type="int">
+			</argument>
+			<argument index="2" name="arg2" type="RID">
+			</argument>
+			<argument index="3" name="arg3" type="bool" default="false">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="portal_is_enabled" qualifiers="const">
-			<return type="bool">
+		<method name="multimesh_create">
+			<return type="RID">
 			</return>
-			<argument index="0" name="arg0" type="RID">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="portal_set_disable_distance">
+		<method name="multimesh_get_aabb" qualifiers="const">
+			<return type="AABB">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="float">
+			<argument index="1" name="arg1" type="AABB">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="portal_get_disable_distance" qualifiers="const">
-			<return type="float">
+		<method name="multimesh_get_mesh" qualifiers="const">
+			<return type="RID">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="portal_set_disabled_color">
+		<method name="multimesh_instance_get_color" qualifiers="const">
+			<return type="Color">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="Color">
+			<argument index="1" name="arg1" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="portal_get_disabled_color" qualifiers="const">
-			<return type="Color">
+		<method name="multimesh_instance_get_transform" qualifiers="const">
+			<return type="Transform">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
+			<argument index="1" name="arg1" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="camera_create">
-			<return type="RID">
-			</return>
+		<method name="multimesh_instance_set_color">
+			<argument index="0" name="arg0" type="RID">
+			</argument>
+			<argument index="1" name="arg1" type="int">
+			</argument>
+			<argument index="2" name="arg2" type="Color">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="camera_set_perspective">
+		<method name="multimesh_instance_set_transform">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="float">
-			</argument>
-			<argument index="2" name="arg2" type="float">
+			<argument index="1" name="arg1" type="int">
 			</argument>
-			<argument index="3" name="arg3" type="float">
+			<argument index="2" name="arg2" type="Transform">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="camera_set_orthogonal">
+		<method name="multimesh_set_aabb">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="float">
-			</argument>
-			<argument index="2" name="arg2" type="float">
-			</argument>
-			<argument index="3" name="arg3" type="float">
+			<argument index="1" name="arg1" type="AABB">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="camera_set_transform">
+		<method name="multimesh_set_mesh">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="Transform">
+			<argument index="1" name="arg1" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="viewport_create">
+		<method name="particles_create">
 			<return type="RID">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="viewport_set_rect">
+		<method name="particles_get_amount" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="Rect2">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="viewport_get_rect" qualifiers="const">
-			<return type="Rect2">
+		<method name="particles_get_attractor_pos" qualifiers="const">
+			<return type="Vector3">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
+			<argument index="1" name="arg1" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="viewport_attach_camera">
+		<method name="particles_get_attractor_strength" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="RID" default="RID()">
+			<argument index="1" name="arg1" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="viewport_get_attached_camera" qualifiers="const">
-			<return type="RID">
+		<method name="particles_get_attractors" qualifiers="const">
+			<return type="int">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="viewport_get_scenario" qualifiers="const">
-			<return type="RID">
+		<method name="particles_get_color_phase_color" qualifiers="const">
+			<return type="Color">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
+			<argument index="1" name="arg1" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="viewport_attach_canvas">
+		<method name="particles_get_color_phase_pos" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="RID">
+			<argument index="1" name="arg1" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="viewport_remove_canvas">
+		<method name="particles_get_color_phases" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="RID">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="viewport_set_global_canvas_transform">
+		<method name="particles_get_randomness" qualifiers="const">
+			<return type="float">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="Matrix32">
+			<argument index="1" name="arg1" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="scenario_create">
-			<return type="RID">
+		<method name="particles_get_variable" qualifiers="const">
+			<return type="float">
 			</return>
-			<description>
-			</description>
-		</method>
-		<method name="scenario_set_debug">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<argument index="1" name="arg1" type="int">
@@ -45044,93 +45555,95 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="instance_create">
-			<return type="RID">
+		<method name="particles_get_visibility_aabb" qualifiers="const">
+			<return type="AABB">
 			</return>
+			<argument index="0" name="arg0" type="RID">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="instance_get_base" qualifiers="const">
-			<return type="RID">
+		<method name="particles_has_height_from_velocity" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="instance_get_base_aabb" qualifiers="const">
-			<return type="RID">
+		<method name="particles_is_emitting" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="instance_set_transform">
+		<method name="particles_set_amount">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="Transform">
+			<argument index="1" name="arg1" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="instance_get_transform" qualifiers="const">
-			<return type="Transform">
-			</return>
+		<method name="particles_set_attractor_pos">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
+			<argument index="1" name="arg1" type="int">
+			</argument>
+			<argument index="2" name="arg2" type="Vector3">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="instance_attach_object_instance_ID">
+		<method name="particles_set_attractor_strength">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<argument index="1" name="arg1" type="int">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="instance_get_object_instance_ID" qualifiers="const">
-			<return type="int">
-			</return>
-			<argument index="0" name="arg0" type="RID">
+			<argument index="2" name="arg2" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="instance_attach_skeleton">
+		<method name="particles_set_attractors">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="RID">
+			<argument index="1" name="arg1" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="instance_get_skeleton" qualifiers="const">
-			<return type="RID">
-			</return>
+		<method name="particles_set_color_phase_color">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
+			<argument index="1" name="arg1" type="int">
+			</argument>
+			<argument index="2" name="arg2" type="Color">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="instance_set_room">
+		<method name="particles_set_color_phase_pos">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="RID">
+			<argument index="1" name="arg1" type="int">
+			</argument>
+			<argument index="2" name="arg2" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="instance_get_room" qualifiers="const">
-			<return type="RID">
-			</return>
+		<method name="particles_set_color_phases">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
+			<argument index="1" name="arg1" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="instance_set_exterior">
+		<method name="particles_set_emitting">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<argument index="1" name="arg1" type="bool">
@@ -45138,115 +45651,107 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="instance_is_exterior" qualifiers="const">
-			<return type="bool">
-			</return>
+		<method name="particles_set_height_from_velocity">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
+			<argument index="1" name="arg1" type="bool">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="instances_cull_aabb" qualifiers="const">
-			<return type="Array">
-			</return>
-			<argument index="0" name="arg0" type="AABB">
+		<method name="particles_set_material">
+			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<argument index="1" name="arg1" type="RID">
 			</argument>
+			<argument index="2" name="arg2" type="bool" default="false">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="instances_cull_ray" qualifiers="const">
-			<return type="Array">
-			</return>
-			<argument index="0" name="arg0" type="Vector3">
+		<method name="particles_set_randomness">
+			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="Vector3">
+			<argument index="1" name="arg1" type="int">
 			</argument>
-			<argument index="2" name="arg2" type="RID">
+			<argument index="2" name="arg2" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="instances_cull_convex" qualifiers="const">
-			<return type="Array">
-			</return>
-			<argument index="0" name="arg0" type="Array">
+		<method name="particles_set_variable">
+			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="RID">
+			<argument index="1" name="arg1" type="int">
 			</argument>
-			<description>
-			</description>
-		</method>
-		<method name="instance_geometry_override_material_param" qualifiers="const">
-			<return type="RID">
-			</return>
-			<argument index="0" name="arg0" type="RID">
+			<argument index="2" name="arg2" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="instance_geometry_get_material_param" qualifiers="const">
-			<return type="RID">
-			</return>
+		<method name="particles_set_visibility_aabb">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
+			<argument index="1" name="arg1" type="AABB">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_test_cube">
+		<method name="portal_create">
 			<return type="RID">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="canvas_create">
-			<return type="RID">
+		<method name="portal_get_disable_distance" qualifiers="const">
+			<return type="float">
 			</return>
+			<argument index="0" name="arg0" type="RID">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="canvas_item_create">
-			<return type="RID">
+		<method name="portal_get_disabled_color" qualifiers="const">
+			<return type="Color">
 			</return>
+			<argument index="0" name="arg0" type="RID">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="canvas_item_set_parent">
+		<method name="portal_get_shape" qualifiers="const">
+			<return type="Vector2Array">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="RID">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="canvas_item_get_parent" qualifiers="const">
-			<return type="RID">
+		<method name="portal_is_enabled" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="canvas_item_set_transform">
+		<method name="portal_set_disable_distance">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="Matrix32">
+			<argument index="1" name="arg1" type="float">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="canvas_item_set_custom_rect">
+		<method name="portal_set_disabled_color">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="bool">
-			</argument>
-			<argument index="2" name="arg2" type="Rect2">
+			<argument index="1" name="arg1" type="Color">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="canvas_item_set_clip">
+		<method name="portal_set_enabled">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<argument index="1" name="arg1" type="bool">
@@ -45254,43 +45759,43 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="canvas_item_set_opacity">
+		<method name="portal_set_shape">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="float">
+			<argument index="1" name="arg1" type="Vector2Array">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="canvas_item_get_opacity" qualifiers="const">
-			<return type="float">
+		<method name="room_create">
+			<return type="RID">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="room_get_bounds" qualifiers="const">
+			<return type="Dictionary">
 			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="float">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="canvas_item_set_self_opacity">
+		<method name="room_set_bounds">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="float">
+			<argument index="1" name="arg1" type="Dictionary">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="canvas_item_get_self_opacity" qualifiers="const">
-			<return type="float">
+		<method name="scenario_create">
+			<return type="RID">
 			</return>
-			<argument index="0" name="arg0" type="RID">
-			</argument>
-			<argument index="1" name="arg1" type="float">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="canvas_item_set_z">
+		<method name="scenario_set_debug">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<argument index="1" name="arg1" type="int">
@@ -45298,214 +45803,204 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="canvas_item_add_line">
-			<argument index="0" name="arg0" type="RID">
-			</argument>
-			<argument index="1" name="arg1" type="Vector2">
-			</argument>
-			<argument index="2" name="arg2" type="Vector2">
-			</argument>
-			<argument index="3" name="arg3" type="Color">
-			</argument>
-			<argument index="4" name="arg4" type="float" default="1">
+		<method name="set_default_clear_color">
+			<argument index="0" name="arg0" type="Color">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="canvas_item_add_rect">
-			<argument index="0" name="arg0" type="RID">
+		<method name="shader_create">
+			<return type="RID">
+			</return>
+			<argument index="0" name="mode" type="int" default="0">
 			</argument>
-			<argument index="1" name="arg1" type="Rect2">
+			<description>
+			</description>
+		</method>
+		<method name="shader_set_mode">
+			<argument index="0" name="shader" type="RID">
 			</argument>
-			<argument index="2" name="arg2" type="Color">
+			<argument index="1" name="mode" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="canvas_item_add_texture_rect">
+		<method name="skeleton_bone_get_transform">
+			<return type="Transform">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="Rect2">
-			</argument>
-			<argument index="2" name="arg2" type="RID">
-			</argument>
-			<argument index="3" name="arg3" type="bool">
-			</argument>
-			<argument index="4" name="arg4" type="Color" default="Color(1,1,1,1)">
-			</argument>
-			<argument index="5" name="arg5" type="bool" default="false">
+			<argument index="1" name="arg1" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="canvas_item_add_texture_rect_region">
+		<method name="skeleton_bone_set_transform">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="Rect2">
-			</argument>
-			<argument index="2" name="arg2" type="RID">
-			</argument>
-			<argument index="3" name="arg3" type="Rect2">
-			</argument>
-			<argument index="4" name="arg4" type="Color" default="Color(1,1,1,1)">
+			<argument index="1" name="arg1" type="int">
 			</argument>
-			<argument index="5" name="arg5" type="bool" default="false">
+			<argument index="2" name="arg2" type="Transform">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="canvas_item_add_style_box">
+		<method name="skeleton_create">
+			<return type="RID">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="skeleton_get_bone_count" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="Rect2">
-			</argument>
-			<argument index="2" name="arg2" type="Rect2">
-			</argument>
-			<argument index="3" name="arg3" type="RID">
-			</argument>
-			<argument index="4" name="arg4" type="RealArray">
-			</argument>
-			<argument index="5" name="arg5" type="Color" default="Color(1,1,1,1)">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="canvas_item_add_circle">
+		<method name="skeleton_resize">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="Vector2">
-			</argument>
-			<argument index="2" name="arg2" type="float">
-			</argument>
-			<argument index="3" name="arg3" type="Color">
+			<argument index="1" name="arg1" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="viewport_set_canvas_transform">
-			<argument index="0" name="arg0" type="RID">
-			</argument>
-			<argument index="1" name="arg1" type="RID">
+		<method name="sync">
+			<description>
+			</description>
+		</method>
+		<method name="texture_create">
+			<return type="RID">
+			</return>
+			<description>
+			</description>
+		</method>
+		<method name="texture_create_from_image">
+			<return type="RID">
+			</return>
+			<argument index="0" name="arg0" type="Image">
 			</argument>
-			<argument index="2" name="arg2" type="Matrix32">
+			<argument index="1" name="arg1" type="int" default="7">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="canvas_item_clear">
+		<method name="texture_get_flags" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="canvas_item_raise">
+		<method name="texture_get_height" qualifiers="const">
+			<return type="int">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="cursor_set_rotation">
-			<argument index="0" name="arg0" type="float">
-			</argument>
-			<argument index="1" name="arg1" type="int">
+		<method name="texture_get_width" qualifiers="const">
+			<return type="int">
+			</return>
+			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="cursor_set_texture">
+		<method name="texture_set_flags">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="Vector2">
-			</argument>
-			<argument index="2" name="arg2" type="int">
+			<argument index="1" name="arg1" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="cursor_set_visible">
-			<argument index="0" name="arg0" type="bool">
-			</argument>
-			<argument index="1" name="arg1" type="int">
+		<method name="texture_set_shrink_all_x2_on_set_data">
+			<argument index="0" name="shrink" type="bool">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="cursor_set_pos">
-			<argument index="0" name="arg0" type="Vector2">
+		<method name="viewport_attach_camera">
+			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="int">
+			<argument index="1" name="arg1" type="RID" default="RID()">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="black_bars_set_margins">
-			<argument index="0" name="left" type="int">
-			</argument>
-			<argument index="1" name="top" type="int">
-			</argument>
-			<argument index="2" name="right" type="int">
+		<method name="viewport_attach_canvas">
+			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="3" name="bottom" type="int">
+			<argument index="1" name="arg1" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="black_bars_set_images">
-			<argument index="0" name="left" type="RID">
-			</argument>
-			<argument index="1" name="top" type="RID">
-			</argument>
-			<argument index="2" name="right" type="RID">
-			</argument>
-			<argument index="3" name="bottom" type="RID">
-			</argument>
+		<method name="viewport_create">
+			<return type="RID">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="make_sphere_mesh">
+		<method name="viewport_get_attached_camera" qualifiers="const">
 			<return type="RID">
 			</return>
-			<argument index="0" name="arg0" type="int">
-			</argument>
-			<argument index="1" name="arg1" type="int">
-			</argument>
-			<argument index="2" name="arg2" type="float">
+			<argument index="0" name="arg0" type="RID">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="mesh_add_surface_from_planes">
+		<method name="viewport_get_rect" qualifiers="const">
+			<return type="Rect2">
+			</return>
 			<argument index="0" name="arg0" type="RID">
 			</argument>
-			<argument index="1" name="arg1" type="Array">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="draw">
+		<method name="viewport_get_scenario" qualifiers="const">
+			<return type="RID">
+			</return>
+			<argument index="0" name="arg0" type="RID">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="sync">
+		<method name="viewport_remove_canvas">
+			<argument index="0" name="arg0" type="RID">
+			</argument>
+			<argument index="1" name="arg1" type="RID">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="free_rid">
+		<method name="viewport_set_canvas_transform">
 			<argument index="0" name="arg0" type="RID">
 			</argument>
+			<argument index="1" name="arg1" type="RID">
+			</argument>
+			<argument index="2" name="arg2" type="Matrix32">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="set_default_clear_color">
-			<argument index="0" name="arg0" type="Color">
+		<method name="viewport_set_global_canvas_transform">
+			<argument index="0" name="arg0" type="RID">
+			</argument>
+			<argument index="1" name="arg1" type="Matrix32">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_render_info">
-			<return type="int">
-			</return>
-			<argument index="0" name="arg0" type="int">
+		<method name="viewport_set_rect">
+			<argument index="0" name="arg0" type="RID">
+			</argument>
+			<argument index="1" name="arg1" type="Rect2">
 			</argument>
 			<description>
 			</description>
@@ -45740,17 +46235,17 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="WeakRef" inherits="Reference" category="Core">
 	<brief_description>
-	Holds an [Object], but does not contribute to the reference count if the object is a reference.
+		Holds an [Object], but does not contribute to the reference count if the object is a reference.
 	</brief_description>
 	<description>
-	A weakref can hold a [Reference], without contributing to the reference counter. A weakref can be created from an [Object] using [method @GDScript.weakref]. If this object is not a reference, weakref still works, however, it does not have any effect on the object. Weakrefs are useful in cases where multiple classes have variables that refer to eachother. Without weakrefs, using these classes could lead to memory leaks, since both references keep eachother from being released. Making part of the variables a weakref can prevent this cyclic dependency, and allows the references to be released.
+		A weakref can hold a [Reference], without contributing to the reference counter. A weakref can be created from an [Object] using [method @GDScript.weakref]. If this object is not a reference, weakref still works, however, it does not have any effect on the object. Weakrefs are useful in cases where multiple classes have variables that refer to eachother. Without weakrefs, using these classes could lead to memory leaks, since both references keep eachother from being released. Making part of the variables a weakref can prevent this cyclic dependency, and allows the references to be released.
 	</description>
 	<methods>
 		<method name="get_ref" qualifiers="const">
 			<return type="Object">
 			</return>
 			<description>
-			Returns the [Object] this weakref is referring to.
+				Returns the [Object] this weakref is referring to.
 			</description>
 		</method>
 	</methods>
@@ -45759,98 +46254,98 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="WindowDialog" inherits="Popup" category="Core">
 	<brief_description>
-	Base class for window dialogs.
+		Base class for window dialogs.
 	</brief_description>
 	<description>
-	Windowdialog is the base class for all window-based dialogs. It's a by-default toplevel [Control] that draws a window decoration and allows motion and resizing.
+		Windowdialog is the base class for all window-based dialogs. It's a by-default toplevel [Control] that draws a window decoration and allows motion and resizing.
 	</description>
 	<methods>
-		<method name="set_title">
-			<argument index="0" name="title" type="String">
-			</argument>
+		<method name="get_close_button">
+			<return type="TextureButton">
+			</return>
 			<description>
-			Set the title of the window.
+				Return the close [TextureButton].
 			</description>
 		</method>
 		<method name="get_title" qualifiers="const">
 			<return type="String">
 			</return>
 			<description>
-			Return the title of the window.
+				Return the title of the window.
 			</description>
 		</method>
-		<method name="get_close_button">
-			<return type="TextureButton">
-			</return>
+		<method name="set_title">
+			<argument index="0" name="title" type="String">
+			</argument>
 			<description>
-			Return the close [TextureButton].
+				Set the title of the window.
 			</description>
 		</method>
 	</methods>
 	<constants>
 	</constants>
 	<theme_items>
-		<theme_item name="close_h_ofs" type="int">
+		<theme_item name="close" type="Texture">
 		</theme_item>
-		<theme_item name="titlebar_height" type="int">
+		<theme_item name="close_h_ofs" type="int">
 		</theme_item>
-		<theme_item name="title_height" type="int">
+		<theme_item name="close_hilite" type="Texture">
 		</theme_item>
 		<theme_item name="close_v_ofs" type="int">
 		</theme_item>
-		<theme_item name="title_color" type="Color">
-		</theme_item>
-		<theme_item name="close_hilite" type="Texture">
+		<theme_item name="panel" type="StyleBox">
 		</theme_item>
-		<theme_item name="close" type="Texture">
+		<theme_item name="title_color" type="Color">
 		</theme_item>
 		<theme_item name="title_font" type="Font">
 		</theme_item>
-		<theme_item name="panel" type="StyleBox">
+		<theme_item name="title_height" type="int">
+		</theme_item>
+		<theme_item name="titlebar_height" type="int">
 		</theme_item>
 	</theme_items>
 </class>
 <class name="World" inherits="Resource" category="Core">
 	<brief_description>
-	Class that has everything pertaining to a world.
+		Class that has everything pertaining to a world.
 	</brief_description>
 	<description>
-	Class that has everything pertaining to a world. A physics space, a visual scenario and a sound space. Spatial nodes register their resources into the current world.
+		Class that has everything pertaining to a world. A physics space, a visual scenario and a sound space. Spatial nodes register their resources into the current world.
 	</description>
 	<methods>
-		<method name="get_space" qualifiers="const">
-			<return type="RID">
+		<method name="get_direct_space_state">
+			<return type="PhysicsDirectSpaceState">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_scenario" qualifiers="const">
-			<return type="RID">
+		<method name="get_environment" qualifiers="const">
+			<return type="Environment">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_sound_space" qualifiers="const">
+		<method name="get_scenario" qualifiers="const">
 			<return type="RID">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="set_environment">
-			<argument index="0" name="env" type="Environment">
-			</argument>
+		<method name="get_sound_space" qualifiers="const">
+			<return type="RID">
+			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_environment" qualifiers="const">
-			<return type="Environment">
+		<method name="get_space" qualifiers="const">
+			<return type="RID">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_direct_space_state">
-			<return type="PhysicsDirectSpaceState">
-			</return>
+		<method name="set_environment">
+			<argument index="0" name="env" type="Environment">
+			</argument>
 			<description>
 			</description>
 		</method>
@@ -45860,10 +46355,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="World2D" inherits="Resource" category="Core">
 	<brief_description>
-	Class that has everything pertaining to a 2D world.
+		Class that has everything pertaining to a 2D world.
 	</brief_description>
 	<description>
-	Class that has everything pertaining to a 2D world. A physics space, a visual scenario and a sound space. 2D nodes register their resources into the current 2D world.
+		Class that has everything pertaining to a 2D world. A physics space, a visual scenario and a sound space. 2D nodes register their resources into the current 2D world.
 	</description>
 	<methods>
 		<method name="get_canvas">
@@ -45872,8 +46367,8 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_space">
-			<return type="RID">
+		<method name="get_direct_space_state">
+			<return type="Physics2DDirectSpaceState">
 			</return>
 			<description>
 			</description>
@@ -45884,8 +46379,8 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_direct_space_state">
-			<return type="Physics2DDirectSpaceState">
+		<method name="get_space">
+			<return type="RID">
 			</return>
 			<description>
 			</description>
@@ -45900,18 +46395,18 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="set_environment">
-			<argument index="0" name="env" type="Environment">
-			</argument>
-			<description>
-			</description>
-		</method>
 		<method name="get_environment" qualifiers="const">
 			<return type="Environment">
 			</return>
 			<description>
 			</description>
 		</method>
+		<method name="set_environment">
+			<argument index="0" name="env" type="Environment">
+			</argument>
+			<description>
+			</description>
+		</method>
 	</methods>
 	<constants>
 	</constants>
@@ -45922,76 +46417,76 @@ This method controls whether the position between two cached points is interpola
 	<description>
 	</description>
 	<methods>
-		<method name="read">
+		<method name="get_attribute_count" qualifiers="const">
 			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_node_type">
-			<return type="int">
+		<method name="get_attribute_name" qualifiers="const">
+			<return type="String">
 			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_node_name" qualifiers="const">
+		<method name="get_attribute_value" qualifiers="const">
 			<return type="String">
 			</return>
+			<argument index="0" name="idx" type="int">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_node_data" qualifiers="const">
-			<return type="String">
+		<method name="get_current_line" qualifiers="const">
+			<return type="int">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="get_node_offset" qualifiers="const">
-			<return type="int">
+		<method name="get_named_attribute_value" qualifiers="const">
+			<return type="String">
 			</return>
+			<argument index="0" name="name" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_attribute_count" qualifiers="const">
-			<return type="int">
+		<method name="get_named_attribute_value_safe" qualifiers="const">
+			<return type="String">
 			</return>
+			<argument index="0" name="name" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_attribute_name" qualifiers="const">
+		<method name="get_node_data" qualifiers="const">
 			<return type="String">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_attribute_value" qualifiers="const">
+		<method name="get_node_name" qualifiers="const">
 			<return type="String">
 			</return>
-			<argument index="0" name="idx" type="int">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="has_attribute" qualifiers="const">
-			<return type="bool">
+		<method name="get_node_offset" qualifiers="const">
+			<return type="int">
 			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_named_attribute_value" qualifiers="const">
-			<return type="String">
+		<method name="get_node_type">
+			<return type="int">
 			</return>
-			<argument index="0" name="name" type="String">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="get_named_attribute_value_safe" qualifiers="const">
-			<return type="String">
+		<method name="has_attribute" qualifiers="const">
+			<return type="bool">
 			</return>
 			<argument index="0" name="name" type="String">
 			</argument>
@@ -46004,40 +46499,40 @@ This method controls whether the position between two cached points is interpola
 			<description>
 			</description>
 		</method>
-		<method name="get_current_line" qualifiers="const">
+		<method name="open">
 			<return type="int">
 			</return>
+			<argument index="0" name="file" type="String">
+			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="skip_section">
-			<description>
-			</description>
-		</method>
-		<method name="seek">
+		<method name="open_buffer">
 			<return type="int">
 			</return>
-			<argument index="0" name="pos" type="int">
+			<argument index="0" name="buffer" type="RawArray">
 			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="open">
+		<method name="read">
 			<return type="int">
 			</return>
-			<argument index="0" name="file" type="String">
-			</argument>
 			<description>
 			</description>
 		</method>
-		<method name="open_buffer">
+		<method name="seek">
 			<return type="int">
 			</return>
-			<argument index="0" name="buffer" type="RawArray">
+			<argument index="0" name="pos" type="int">
 			</argument>
 			<description>
 			</description>
 		</method>
+		<method name="skip_section">
+			<description>
+			</description>
+		</method>
 	</methods>
 	<constants>
 		<constant name="NODE_NONE" value="0">
@@ -46058,24 +46553,24 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="YSort" inherits="Node2D" category="Core">
 	<brief_description>
-	Sort all child nodes based on their Y positions.
+		Sort all child nodes based on their Y positions.
 	</brief_description>
 	<description>
-	Sort all child nodes based on their Y positions. The child node must inherit from [CanvasItem] for it to be sorted. Nodes that have a higher Y position will be drawn later, so they will appear on top of nodes that have a lower Y position.
+		Sort all child nodes based on their Y positions. The child node must inherit from [CanvasItem] for it to be sorted. Nodes that have a higher Y position will be drawn later, so they will appear on top of nodes that have a lower Y position.
 	</description>
 	<methods>
-		<method name="set_sort_enabled">
-			<argument index="0" name="enabled" type="bool">
-			</argument>
-			<description>
-			Set whether the children nodes are sorted or not. (default true)
-			</description>
-		</method>
 		<method name="is_sort_enabled" qualifiers="const">
 			<return type="bool">
 			</return>
 			<description>
-			Returns true if the children nodes are being sorted.
+				Returns true if the children nodes are being sorted.
+			</description>
+		</method>
+		<method name="set_sort_enabled">
+			<argument index="0" name="enabled" type="bool">
+			</argument>
+			<description>
+				Set whether the children nodes are sorted or not. (default true)
 			</description>
 		</method>
 	</methods>
@@ -46084,10 +46579,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="bool" category="Built-In Types">
 	<brief_description>
-	Boolean built-in type
+		Boolean built-in type
 	</brief_description>
 	<description>
-	Boolean built-in type.
+		Boolean built-in type.
 	</description>
 	<methods>
 		<method name="bool">
@@ -46096,7 +46591,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="from" type="int">
 			</argument>
 			<description>
-			Cast an [int] value to a boolean value, this method will return true if called with an integer value different to 0 and false in other case.
+				Cast an [int] value to a boolean value, this method will return true if called with an integer value different to 0 and false in other case.
 			</description>
 		</method>
 		<method name="bool">
@@ -46105,7 +46600,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="from" type="float">
 			</argument>
 			<description>
-			Cast a [float] value to a boolean value, this method will return true if called with a floating point value different to 0 and false in other case.
+				Cast a [float] value to a boolean value, this method will return true if called with a floating point value different to 0 and false in other case.
 			</description>
 		</method>
 		<method name="bool">
@@ -46114,7 +46609,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="from" type="String">
 			</argument>
 			<description>
-			Cast a [String] value to a boolean value, this method will return true if called with a non empty string and false in other case. Examples: [code]bool('False')[/code] returns true, [code]bool('')[/code]. returns false
+				Cast a [String] value to a boolean value, this method will return true if called with a non empty string and false in other case. Examples: [code]bool('False')[/code] returns true, [code]bool('')[/code]. returns false
 			</description>
 		</method>
 	</methods>
@@ -46123,10 +46618,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="float" category="Built-In Types">
 	<brief_description>
-	Float built-in type
+		Float built-in type
 	</brief_description>
 	<description>
-	Float built-in type.
+		Float built-in type.
 	</description>
 	<methods>
 		<method name="float">
@@ -46135,7 +46630,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="from" type="bool">
 			</argument>
 			<description>
-			Cast a [bool] value to a floating point value, [code]float(true)[/code] will be equals to 1.0 and [code]float(false)[/code] will be equals to 0.0.
+				Cast a [bool] value to a floating point value, [code]float(true)[/code] will be equals to 1.0 and [code]float(false)[/code] will be equals to 0.0.
 			</description>
 		</method>
 		<method name="float">
@@ -46144,7 +46639,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="from" type="int">
 			</argument>
 			<description>
-			Cast an [int] value to a floating point value, [code]float(1)[/code] will be equals to 1.0.
+				Cast an [int] value to a floating point value, [code]float(1)[/code] will be equals to 1.0.
 			</description>
 		</method>
 		<method name="float">
@@ -46153,7 +46648,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="from" type="String">
 			</argument>
 			<description>
-			Cast a [String] value to a floating point value. This method accepts float value strings like [code] '1.23' [/code] and exponential notation strings for its parameter so calling [code] float('1e3') [/code] will return 1000.0 and calling [code] float('1e-3') [/code] will return -0.001.
+				Cast a [String] value to a floating point value. This method accepts float value strings like [code] '1.23' [/code] and exponential notation strings for its parameter so calling [code] float('1e3') [/code] will return 1000.0 and calling [code] float('1e-3') [/code] will return -0.001.
 			</description>
 		</method>
 	</methods>
@@ -46162,10 +46657,10 @@ This method controls whether the position between two cached points is interpola
 </class>
 <class name="int" category="Built-In Types">
 	<brief_description>
-	Integer built-in type.
+		Integer built-in type.
 	</brief_description>
 	<description>
-	Integer built-in type.
+		Integer built-in type.
 	</description>
 	<methods>
 		<method name="int">
@@ -46174,7 +46669,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="from" type="bool">
 			</argument>
 			<description>
-			Cast a [bool] value to an integer value, [code]int(true)[/code] will be equals to 1 and [code]int(false)[/code] will be equals to 0.
+				Cast a [bool] value to an integer value, [code]int(true)[/code] will be equals to 1 and [code]int(false)[/code] will be equals to 0.
 			</description>
 		</method>
 		<method name="int">
@@ -46183,7 +46678,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="from" type="float">
 			</argument>
 			<description>
-			Cast a float value to an integer value, this method simply removes the number fractions, so for example [code]int(2.7)[/code] will be equals to 2, [code]int(.1)[/code] will be equals to 0 and [code]int(-2.7)[/code] will be equals to -2.
+				Cast a float value to an integer value, this method simply removes the number fractions, so for example [code]int(2.7)[/code] will be equals to 2, [code]int(.1)[/code] will be equals to 0 and [code]int(-2.7)[/code] will be equals to -2.
 			</description>
 		</method>
 		<method name="int">
@@ -46192,7 +46687,7 @@ This method controls whether the position between two cached points is interpola
 			<argument index="0" name="from" type="String">
 			</argument>
 			<description>
-			Cast a [String] value to an integer value, this method is an integer parser from a string, so calling this method with an invalid integer string will return 0, a valid string will be something like [code]'1.7'[/code]. This method will ignore all non-number characters, so calling [code]int('1e3')[/code] will return 13.
+				Cast a [String] value to an integer value, this method is an integer parser from a string, so calling this method with an invalid integer string will return 0, a valid string will be something like [code]'1.7'[/code]. This method will ignore all non-number characters, so calling [code]int('1e3')[/code] will return 13.
 			</description>
 		</method>
 	</methods>
diff --git a/doc/tools/makerst.py b/doc/tools/makerst.py
index 060dbc805d..45e690cb65 100644
--- a/doc/tools/makerst.py
+++ b/doc/tools/makerst.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
+import codecs
 import sys
 import xml.etree.ElementTree as ET
 
@@ -32,7 +33,7 @@ def ul_string(str,ul):
 
 def make_class_list(class_list, columns):
 
-	f = open('class_list.rst', 'wb')
+	f = codecs.open('class_list.rst', 'wb', 'utf-8')
 	prev = 0
 	col_max = len(class_list) / columns + 1
 	print ('col max is ', col_max)
@@ -347,7 +348,7 @@ def make_rst_class(node):
 
 	name = node.attrib['name']
 
-	f = open("class_"+name.lower() + '.rst', 'wb')
+	f = codecs.open("class_"+name.lower() + '.rst', 'wb', 'utf-8')
 
 	# Warn contributors not to edit this file directly
 	f.write(".. Generated automatically by doc/tools/makerst.py in Godot's source tree.\n")
diff --git a/drivers/builtin_openssl2/openssl/opensslconf.h b/drivers/builtin_openssl2/openssl/opensslconf.h
index 25429e94d6..c86bb60b94 100644
--- a/drivers/builtin_openssl2/openssl/opensslconf.h
+++ b/drivers/builtin_openssl2/openssl/opensslconf.h
@@ -213,8 +213,13 @@ extern "C" {
 
 #ifdef OPENSSL_USE_64_BITS
 
-#define SIXTY_FOUR_BIT_LONG
-#undef SIXTY_FOUR_BIT
+# ifdef _WIN32
+#  undef SIXTY_FOUR_BIT_LONG
+#  define SIXTY_FOUR_BIT
+# else
+#  define SIXTY_FOUR_BIT_LONG
+#  undef SIXTY_FOUR_BIT
+# endif
 #undef THIRTY_TWO_BIT
 
 #else
diff --git a/drivers/chibi/cp_envelope.cpp b/drivers/chibi/cp_envelope.cpp
index fab8a68ada..9892b6d4b0 100644
--- a/drivers/chibi/cp_envelope.cpp
+++ b/drivers/chibi/cp_envelope.cpp
@@ -359,7 +359,6 @@ uint8_t CPEnvelope::get_node_count() {
 
 const CPEnvelope::Point& CPEnvelope::get_node(int p_idx) {
 	
-	static Point errpoint;
 	if (p_idx<0 || p_idx>=node_count)
 		return node[node_count-1];
 	
diff --git a/drivers/chibi/cp_loader_xm.cpp b/drivers/chibi/cp_loader_xm.cpp
index 8ab6abc650..bff8615a32 100644
--- a/drivers/chibi/cp_loader_xm.cpp
+++ b/drivers/chibi/cp_loader_xm.cpp
@@ -560,8 +560,7 @@ CPLoader::Error CPLoader_XM::load_instrument_internal(CPInstrument *p_instr,bool
 			if (s_idx==-1) ABORT_LOAD;
 			//printf("free sample: %i\n",s_idx);
 			
-			
-			char auxb;
+
 			CPSample& sample=*song->get_sample(s_idx);
 			
 			int sample_size=file->get_dword();
@@ -611,6 +610,7 @@ CPLoader::Error CPLoader_XM::load_instrument_internal(CPInstrument *p_instr,bool
 			sm->set_c5_freq( sample_data, CPTables::get_linear_frequency(CPTables::get_linear_period(note_offset<<1,finetune)) );
 			//printf("NOTE %i,fine %i\n",note_offset,finetune);
 
+			char auxb;
 			auxb=file->get_byte(); //reserved?
 			file->get_byte_array((uint8_t*)instrname,22);
 			sample.set_name(instrname);
diff --git a/drivers/chibi/cp_player_data_events.cpp b/drivers/chibi/cp_player_data_events.cpp
index 8122988516..fb5090461b 100644
--- a/drivers/chibi/cp_player_data_events.cpp
+++ b/drivers/chibi/cp_player_data_events.cpp
@@ -325,8 +325,6 @@ void CPPlayer::update_mixer() {
 		printf("cgb %i\n",(int)v.master_channel->channel_global_volume);
 */
 
-
-		int cv=v.master_channel->channel_global_volume;
 		
 		tmpvol=(uint64_t)v.fadeout_volume;    /* max 1024 - 10 bits */
 		tmpvol*=(uint64_t)v.channel_volume;    /* * max 64 - 6 bits */
@@ -338,13 +336,9 @@ void CPPlayer::update_mixer() {
 		tmpvol*=(uint64_t)song->get_mixing_volume(); /* max 128 - 7 bits */
 		tmpvol*=(uint64_t)control.global_volume;   /* max 128 - 7 bits*/
 				/* total 10+6+8+6+7+7=44 bits */
-		uint64_t preshift=tmpvol;
+
 		tmpvol>>=43; /* Move back to 8 bits range , 44-19+8=43*/
 		
-		/*
-		if (!tmpvol && preshift>>35)
-			tmpvol=1; // even if the volume should be inaudible, some people WANTS to hear this.
-		*/
 		if (tmpvol>CP_VOL_MAX)
 			tmpvol=CP_VOL_MAX;
 		
diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp
index 8bd2fe3862..4cd97a7f6a 100644
--- a/drivers/gles2/rasterizer_gles2.cpp
+++ b/drivers/gles2/rasterizer_gles2.cpp
@@ -2205,8 +2205,6 @@ Error RasterizerGLES2::_surface_set_arrays(Surface *p_surface, uint8_t *p_mem,ui
 				AABB aabb;
 
 				float scale=1;
-				float max=0;
-
 
 
 				if (p_surface->array[VS::ARRAY_VERTEX].datatype==_GL_HALF_FLOAT_OES) {
@@ -5913,8 +5911,7 @@ Error RasterizerGLES2::_setup_geometry(const Geometry *p_geometry, const Materia
 					base = skinned_buffer;
 					//copy stuff and get it ready for the skeleton
 
-					int src_stride = surf->stride;
-						int dst_stride = surf->stride - ( surf->array[VS::ARRAY_BONES].size + surf->array[VS::ARRAY_WEIGHTS].size );
+					int dst_stride = surf->stride - ( surf->array[VS::ARRAY_BONES].size + surf->array[VS::ARRAY_WEIGHTS].size );
 					const uint8_t *src_weights=&surf->array_local[surf->array[VS::ARRAY_WEIGHTS].ofs];
 					const uint8_t *src_bones=&surf->array_local[surf->array[VS::ARRAY_BONES].ofs];
 					const Skeleton::Bone *skeleton = &p_skeleton->bones[0];
@@ -6316,9 +6313,9 @@ void RasterizerGLES2::_render(const Geometry *p_geometry,const Material *p_mater
 
 void RasterizerGLES2::_setup_shader_params(const Material *p_material) {
 
+#if 0
 	int idx=0;
 	int tex_idx=0;
-#if 0
 	for(Map<StringName,Variant>::Element *E=p_material->shader_cache->params.front();E;E=E->next(),idx++) {
 
 		Variant v; //
@@ -6384,7 +6381,6 @@ void RasterizerGLES2::_render_list_forward(RenderList *p_render_list,const Trans
 	uint16_t prev_light=0x777E;
 	const Geometry *prev_geometry_cmp=NULL;
 	uint8_t prev_light_type=0xEF;
-	const ParamOverrideMap* prev_overrides=NULL; // make it diferent than NULL
 	const Skeleton *prev_skeleton =NULL;
 	uint8_t prev_sort_flags=0xFF;
 	const BakedLightData *prev_baked_light=NULL;
@@ -6392,8 +6388,6 @@ void RasterizerGLES2::_render_list_forward(RenderList *p_render_list,const Trans
 	const float *prev_morph_values=NULL;
 	int prev_receive_shadows_state=-1;
 
-	Geometry::Type prev_geometry_type=Geometry::GEOMETRY_INVALID;
-
 	material_shader.set_conditional(MaterialShaderGLES2::USE_VERTEX_LIGHTING,!shadow && !p_fragment_light);
 	material_shader.set_conditional(MaterialShaderGLES2::USE_FRAGMENT_LIGHTING,!shadow && p_fragment_light);
 	material_shader.set_conditional(MaterialShaderGLES2::USE_SKELETON,false);
@@ -6450,12 +6444,10 @@ void RasterizerGLES2::_render_list_forward(RenderList *p_render_list,const Trans
 				prev_light=0x777E;
 				prev_geometry_cmp=NULL;
 				prev_light_type=0xEF;
-				prev_overrides=NULL; // make it diferent than NULL
 				prev_skeleton =NULL;
 				prev_sort_flags=0xFF;
 				prev_morph_values=NULL;
 				prev_receive_shadows_state=-1;
-				prev_geometry_type=Geometry::GEOMETRY_INVALID;
 				glEnable(GL_BLEND);
 				glDepthMask(GL_TRUE);
 				glEnable(GL_DEPTH_TEST);
@@ -6838,7 +6830,6 @@ void RasterizerGLES2::_render_list_forward(RenderList *p_render_list,const Trans
 		prev_sort_flags=sort_flags;
 		prev_baked_light=baked_light;
 		prev_morph_values=morph_values;
-//		prev_geometry_type=geometry->type;
 		prev_receive_shadows_state=receive_shadows_state;
 	}
 
@@ -8877,8 +8868,6 @@ void RasterizerGLES2::canvas_light_shadow_buffer_update(RID p_buffer, const Matr
 	glEnableVertexAttribArray(VS::ARRAY_VERTEX);
 	canvas_shadow_shader.bind();
 
-	const int vp_height = 10;
-
 	glViewport(0, 0, cls->size,cls->height);
 	_glClearDepth(1.0f);
 	glClearColor(1,1,1,1);
@@ -8920,12 +8909,6 @@ void RasterizerGLES2::canvas_light_shadow_buffer_update(RID p_buffer, const Matr
 		Vector3 cam_target=Matrix3(Vector3(0,0,Math_PI*2*(i/4.0))).xform(Vector3(0,1,0));
 		projection = projection * CameraMatrix(Transform().looking_at(cam_target,Vector3(0,0,-1)).affine_inverse());
 
-		//print_line("near: "+rtos(p_near));
-		//print_line("far: "+rtos(p_far));
-		//projection.set_perspective(60,size/float(vp_height),p_near,p_far);
-
-	//	CameraMatrix light_mat = projection * CameraMatrix(camera);
-
 		canvas_shadow_shader.set_uniform(CanvasShadowShaderGLES2::PROJECTION_MATRIX,projection);
 		canvas_shadow_shader.set_uniform(CanvasShadowShaderGLES2::LIGHT_MATRIX,light);
 
@@ -9501,19 +9484,15 @@ void RasterizerGLES2::canvas_render_items(CanvasItem *p_item_list,int p_z,const
 		if (ci->copy_back_buffer && framebuffer.active && framebuffer.scale==1) {
 
 			Rect2 rect;
-			int x,y,w,h;
+			int x,y;
 
 			if (ci->copy_back_buffer->full) {
 
 				x = viewport.x;
 				y = window_size.height-(viewport.height+viewport.y);
-				w = viewport.width;
-				h = viewport.height;
 			} else {
 				x = viewport.x+ci->copy_back_buffer->screen_rect.pos.x;
 				y = window_size.height-(viewport.y+ci->copy_back_buffer->screen_rect.pos.y+ci->copy_back_buffer->screen_rect.size.y);
-				w = ci->copy_back_buffer->screen_rect.size.x;
-				h = ci->copy_back_buffer->screen_rect.size.y;
 			}
 			glActiveTexture(GL_TEXTURE0+max_texture_units-1);
 			glBindTexture(GL_TEXTURE_2D,framebuffer.sample_color);
@@ -9531,9 +9510,6 @@ void RasterizerGLES2::canvas_render_items(CanvasItem *p_item_list,int p_z,const
 			} else {
 				glCopyTexSubImage2D(GL_TEXTURE_2D,0,x,y,x,y,viewport.width,viewport.height);
 			}
-//			if (current_clip) {
-//			//	print_line(" a clip ");
-//			}
 
 			canvas_texscreen_used=true;
 			glActiveTexture(GL_TEXTURE0);
@@ -10496,7 +10472,6 @@ void RasterizerGLES2::_update_framebuffer() {
 
 //	GLuint format_rgba = use_fp16_fb?_GL_RGBA16F_EXT:GL_RGBA;
 	GLuint format_rgba = GL_RGBA;
-	GLuint format_rgb = use_fp16_fb?_GL_RGB16F_EXT:GL_RGB;
 	GLuint format_type = use_fp16_fb?_GL_HALF_FLOAT_OES:GL_UNSIGNED_BYTE;
 	GLuint format_internal=GL_RGBA;
 
@@ -10998,10 +10973,9 @@ void RasterizerGLES2::init() {
 
 	{
 		//shadowmaps
-		OS::VideoMode vm=OS::get_singleton()->get_video_mode();
 
 		//don't use a shadowbuffer too big in GLES, this should be the maximum
-		int max_shadow_size = GLOBAL_DEF("rasterizer/max_shadow_buffer_size",1024);//nearest_power_of_2(MIN(vm.width,vm.height))/2;
+		int max_shadow_size = GLOBAL_DEF("rasterizer/max_shadow_buffer_size",1024);
 		int smsize=max_shadow_size;
 		while(smsize>=16) {
 
diff --git a/drivers/jpegd/image_loader_jpegd.cpp b/drivers/jpegd/image_loader_jpegd.cpp
index 913a7bdf39..496334605d 100644
--- a/drivers/jpegd/image_loader_jpegd.cpp
+++ b/drivers/jpegd/image_loader_jpegd.cpp
@@ -129,6 +129,8 @@ static Image _jpegd_mem_loader_func(const uint8_t* p_png,int p_size) {
 
 	Image img;
 	Error err = jpeg_load_image_from_buffer(&img,p_png,p_size);
+	if (err)
+		ERR_PRINT("Couldn't initialize ImageLoaderJPG with the given resource.");
 
 	return img;
 }
diff --git a/drivers/openssl/stream_peer_openssl.cpp b/drivers/openssl/stream_peer_openssl.cpp
index 67f58b6028..aa3d8a8f7f 100644
--- a/drivers/openssl/stream_peer_openssl.cpp
+++ b/drivers/openssl/stream_peer_openssl.cpp
@@ -309,6 +309,9 @@ Error StreamPeerOpenSSL::connect(Ref<StreamPeer> p_base, bool p_validate_certs,
 	validate_certs=p_validate_certs;
 	validate_hostname=p_for_hostname!="";
 
+
+
+
 	if (p_validate_certs) {
 
 
@@ -380,6 +383,10 @@ Error StreamPeerOpenSSL::connect(Ref<StreamPeer> p_base, bool p_validate_certs,
 	bio->ptr = this;
 	SSL_set_bio( ssl, bio, bio );
 
+	if (p_for_hostname!=String()) {
+		SSL_set_tlsext_host_name(ssl,p_for_hostname.utf8().get_data());
+	}
+
 	use_blocking=true; // let handshake use blocking
 	// Set the SSL to automatically retry on failure.
 	SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY);
@@ -462,7 +469,6 @@ Error StreamPeerOpenSSL::put_partial_data(const uint8_t* p_data,int p_bytes, int
 	if (p_bytes==0)
 		return OK;
 
-	int s=0;
 	Error err = put_data(p_data,p_bytes);
 	if (err!=OK)
 		return err;
diff --git a/drivers/png/arm/arm_init.c b/drivers/png/arm/arm_init.c
index 6a6a019acb..52c3f31fed 100644
--- a/drivers/png/arm/arm_init.c
+++ b/drivers/png/arm/arm_init.c
@@ -1,9 +1,9 @@
 
 /* arm_init.c - NEON optimised filter functions
  *
- * Copyright (c) 2013 Glenn Randers-Pehrson
+ * Copyright (c) 2014,2016 Glenn Randers-Pehrson
  * Written by Mans Rullgard, 2011.
- * Last changed in libpng 1.6.8 [December 19, 2013]
+ * Last changed in libpng 1.6.22 [June 9, 2016]
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer
@@ -17,134 +17,36 @@
 #include "../pngpriv.h"
 
 #ifdef PNG_READ_SUPPORTED
+
 #if PNG_ARM_NEON_OPT > 0
 #ifdef PNG_ARM_NEON_CHECK_SUPPORTED /* Do run-time checks */
-#include <signal.h> /* for sig_atomic_t */
-
-#ifdef __ANDROID__
-/* Linux provides access to information about CPU capabilites via
- * /proc/self/auxv, however Android blocks this while still claiming to be
- * Linux.  The Andoid NDK, however, provides appropriate support.
+/* WARNING: it is strongly recommended that you do not build libpng with
+ * run-time checks for CPU features if at all possible.  In the case of the ARM
+ * NEON instructions there is no processor-specific way of detecting the
+ * presence of the required support, therefore run-time detection is extremely
+ * OS specific.
  *
- * Documentation: http://www.kandroid.org/ndk/docs/CPU-ARM-NEON.html
- */
-#include <cpu-features.h>
-
-static int
-png_have_neon(png_structp png_ptr)
-{
-   /* This is a whole lot easier than the mess below, however it is probably
-    * implemented as below, therefore it is better to cache the result (these
-    * function calls may be slow!)
-    */
-   PNG_UNUSED(png_ptr)
-   return android_getCpuFamily() == ANDROID_CPU_FAMILY_ARM &&
-      (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
-}
-#elif defined(__linux__)
-/* The generic __linux__ implementation requires reading /proc/self/auxv and
- * looking at each element for one that records NEON capabilities.
- */
-#include <unistd.h> /* for POSIX 1003.1 */
-#include <errno.h>  /* for EINTR */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <elf.h>
-#include <asm/hwcap.h>
-
-/* A read call may be interrupted, in which case it returns -1 and sets errno to
- * EINTR if nothing was done, otherwise (if something was done) a partial read
- * may result.
+ * You may set the macro PNG_ARM_NEON_FILE to the file name of file containing
+ * a fragment of C source code which defines the png_have_neon function.  There
+ * are a number of implementations in contrib/arm-neon, but the only one that
+ * has partial support is contrib/arm-neon/linux.c - a generic Linux
+ * implementation which reads /proc/cpufino.
  */
-static size_t
-safe_read(png_structp png_ptr, int fd, void *buffer_in, size_t nbytes)
-{
-   size_t ntotal = 0;
-   char *buffer = png_voidcast(char*, buffer_in);
-
-   while (nbytes > 0)
-   {
-      unsigned int nread;
-      int iread;
-
-      /* Passing nread > INT_MAX to read is implementation defined in POSIX
-       * 1003.1, therefore despite the unsigned argument portable code must
-       * limit the value to INT_MAX!
-       */
-      if (nbytes > INT_MAX)
-         nread = INT_MAX;
-
-      else
-         nread = (unsigned int)/*SAFE*/nbytes;
-
-      iread = read(fd, buffer, nread);
-
-      if (iread == -1)
-      {
-         /* This is the devil in the details, a read can terminate early with 0
-          * bytes read because of EINTR, yet it still returns -1 otherwise end
-          * of file cannot be distinguished.
-          */
-         if (errno != EINTR)
-         {
-            png_warning(png_ptr, "/proc read failed");
-            return 0; /* I.e., a permanent failure */
-         }
-      }
-
-      else if (iread < 0)
-      {
-         /* Not a valid 'read' result: */
-         png_warning(png_ptr, "OS /proc read bug");
-         return 0;
-      }
-
-      else if (iread > 0)
-      {
-         /* Continue reading until a permanent failure, or EOF */
-         buffer += iread;
-         nbytes -= (unsigned int)/*SAFE*/iread;
-         ntotal += (unsigned int)/*SAFE*/iread;
-      }
-
-      else
-         return ntotal;
-   }
-
-   return ntotal; /* nbytes == 0 */
-}
+#ifndef PNG_ARM_NEON_FILE
+#  ifdef __linux__
+#     define PNG_ARM_NEON_FILE "contrib/arm-neon/linux.c"
+#  endif
+#endif
 
-static int
-png_have_neon(png_structp png_ptr)
-{
-   int fd = open("/proc/self/auxv", O_RDONLY);
-   Elf32_auxv_t aux;
+#ifdef PNG_ARM_NEON_FILE
 
-   /* Failsafe: failure to open means no NEON */
-   if (fd == -1)
-   {
-      png_warning(png_ptr, "/proc/self/auxv open failed");
-      return 0;
-   }
-
-   while (safe_read(png_ptr, fd, &aux, sizeof aux) == sizeof aux)
-   {
-      if (aux.a_type == AT_HWCAP && (aux.a_un.a_val & HWCAP_NEON) != 0)
-      {
-         close(fd);
-         return 1;
-      }
-   }
+#include <signal.h> /* for sig_atomic_t */
+static int png_have_neon(png_structp png_ptr);
+#include PNG_ARM_NEON_FILE
 
-   close(fd);
-   return 0;
-}
-#else
-   /* We don't know how to do a run-time check on this system */
-#  error "no support for run-time ARM NEON checks"
-#endif /* OS checks */
+#else  /* PNG_ARM_NEON_FILE */
+#  error "PNG_ARM_NEON_FILE undefined: no support for run-time ARM NEON checks"
+#endif /* PNG_ARM_NEON_FILE */
 #endif /* PNG_ARM_NEON_CHECK_SUPPORTED */
 
 #ifndef PNG_ALIGNED_MEMORY_SUPPORTED
@@ -164,6 +66,7 @@ png_init_filter_functions_neon(png_structp pp, unsigned int bpp)
     * wrong order of the 'ON' and 'default' cases.  UNSET now defaults to OFF,
     * as documented in png.h
     */
+   png_debug(1, "in png_init_filter_functions_neon");
 #ifdef PNG_ARM_NEON_API_SUPPORTED
    switch ((pp->options >> PNG_ARM_NEON) & 3)
    {
@@ -229,4 +132,4 @@ png_init_filter_functions_neon(png_structp pp, unsigned int bpp)
    }
 }
 #endif /* PNG_ARM_NEON_OPT > 0 */
-#endif /* PNG_READ_SUPPORTED */
+#endif /* READ */
diff --git a/drivers/png/arm/filter_neon.S b/drivers/png/arm/filter_neon.S
index 477df7c99b..3b061d6bbf 100644
--- a/drivers/png/arm/filter_neon.S
+++ b/drivers/png/arm/filter_neon.S
@@ -1,17 +1,17 @@
 
 /* filter_neon.S - NEON optimised filter functions
  *
- * Copyright (c) 2013 Glenn Randers-Pehrson
+ * Copyright (c) 2014 Glenn Randers-Pehrson
  * Written by Mans Rullgard, 2011.
- * Last changed in libpng 1.5.17 [June 27, 2013]
+ * Last changed in libpng 1.6.16 [December 22, 2014]
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer
  * and license in png.h
  */
 
-/* This is required to get the symbol renames, which are #defines, and also
- * includes the definition (or not) of PNG_ARM_NEON_OPT.
+/* This is required to get the symbol renames, which are #defines, and the
+ * definitions (or not) of PNG_ARM_NEON_OPT and PNG_ARM_NEON_IMPLEMENTATION.
  */
 #define PNG_VERSION_INFO_ONLY
 #include "../pngpriv.h"
@@ -20,6 +20,15 @@
 .section .note.GNU-stack,"",%progbits /* mark stack as non-executable */
 #endif
 
+#ifdef PNG_READ_SUPPORTED
+
+/* Assembler NEON support - only works for 32-bit ARM (i.e. it does not work for
+ * ARM64).  The code in arm/filter_neon_intrinsics.c supports ARM64, however it
+ * only works if -mfpu=neon is specified on the GCC command line.  See pngpriv.h
+ * for the logic which sets PNG_USE_ARM_NEON_ASM:
+ */
+#if PNG_ARM_NEON_IMPLEMENTATION == 2 /* hand-coded assembler */
+
 #if PNG_ARM_NEON_OPT > 0
 
 #ifdef __ELF__
@@ -38,6 +47,13 @@ ELF     .size   \name, . - \name
         .purgem endfunc
     .endm
         .text
+
+        /* Explicitly specifying alignment here because some versions of
+         * GAS don't align code correctly.  This is harmless in correctly
+         * written versions of GAS.
+         */
+        .align 2
+
     .if \export
         .global \name
     .endif
@@ -233,3 +249,5 @@ func    png_read_filter_row_paeth3_neon, export=1
         pop             {r4,pc}
 endfunc
 #endif /* PNG_ARM_NEON_OPT > 0 */
+#endif /* PNG_ARM_NEON_IMPLEMENTATION == 2 (assembler) */
+#endif /* READ */
diff --git a/drivers/png/arm/filter_neon_intrinsics.c b/drivers/png/arm/filter_neon_intrinsics.c
new file mode 100644
index 0000000000..be5ccc7107
--- /dev/null
+++ b/drivers/png/arm/filter_neon_intrinsics.c
@@ -0,0 +1,387 @@
+
+/* filter_neon_intrinsics.c - NEON optimised filter functions
+ *
+ * Copyright (c) 2014,2016 Glenn Randers-Pehrson
+ * Written by James Yu <james.yu at linaro.org>, October 2013.
+ * Based on filter_neon.S, written by Mans Rullgard, 2011.
+ *
+ * Last changed in libpng 1.6.22 [June 9, 2016]
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ */
+
+#include "../pngpriv.h"
+
+#ifdef PNG_READ_SUPPORTED
+
+/* This code requires -mfpu=neon on the command line: */
+#if PNG_ARM_NEON_IMPLEMENTATION == 1 /* intrinsics code from pngpriv.h */
+
+#include <arm_neon.h>
+
+/* libpng row pointers are not necessarily aligned to any particular boundary,
+ * however this code will only work with appropriate alignment.  arm/arm_init.c
+ * checks for this (and will not compile unless it is done). This code uses
+ * variants of png_aligncast to avoid compiler warnings.
+ */
+#define png_ptr(type,pointer) png_aligncast(type *,pointer)
+#define png_ptrc(type,pointer) png_aligncastconst(const type *,pointer)
+
+/* The following relies on a variable 'temp_pointer' being declared with type
+ * 'type'.  This is written this way just to hide the GCC strict aliasing
+ * warning; note that the code is safe because there never is an alias between
+ * the input and output pointers.
+ */
+#define png_ldr(type,pointer)\
+   (temp_pointer = png_ptr(type,pointer), *temp_pointer)
+
+#if PNG_ARM_NEON_OPT > 0
+
+void
+png_read_filter_row_up_neon(png_row_infop row_info, png_bytep row,
+   png_const_bytep prev_row)
+{
+   png_bytep rp = row;
+   png_bytep rp_stop = row + row_info->rowbytes;
+   png_const_bytep pp = prev_row;
+
+   png_debug(1, "in png_read_filter_row_up_neon");
+
+   for (; rp < rp_stop; rp += 16, pp += 16)
+   {
+      uint8x16_t qrp, qpp;
+
+      qrp = vld1q_u8(rp);
+      qpp = vld1q_u8(pp);
+      qrp = vaddq_u8(qrp, qpp);
+      vst1q_u8(rp, qrp);
+   }
+}
+
+void
+png_read_filter_row_sub3_neon(png_row_infop row_info, png_bytep row,
+   png_const_bytep prev_row)
+{
+   png_bytep rp = row;
+   png_bytep rp_stop = row + row_info->rowbytes;
+
+   uint8x16_t vtmp = vld1q_u8(rp);
+   uint8x8x2_t *vrpt = png_ptr(uint8x8x2_t, &vtmp);
+   uint8x8x2_t vrp = *vrpt;
+
+   uint8x8x4_t vdest;
+   vdest.val[3] = vdup_n_u8(0);
+
+   png_debug(1, "in png_read_filter_row_sub3_neon");
+
+   for (; rp < rp_stop;)
+   {
+      uint8x8_t vtmp1, vtmp2;
+      uint32x2_t *temp_pointer;
+
+      vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 3);
+      vdest.val[0] = vadd_u8(vdest.val[3], vrp.val[0]);
+      vtmp2 = vext_u8(vrp.val[0], vrp.val[1], 6);
+      vdest.val[1] = vadd_u8(vdest.val[0], vtmp1);
+
+      vtmp1 = vext_u8(vrp.val[1], vrp.val[1], 1);
+      vdest.val[2] = vadd_u8(vdest.val[1], vtmp2);
+      vdest.val[3] = vadd_u8(vdest.val[2], vtmp1);
+
+      vtmp = vld1q_u8(rp + 12);
+      vrpt = png_ptr(uint8x8x2_t, &vtmp);
+      vrp = *vrpt;
+
+      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[0]), 0);
+      rp += 3;
+      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[1]), 0);
+      rp += 3;
+      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[2]), 0);
+      rp += 3;
+      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[3]), 0);
+      rp += 3;
+   }
+
+   PNG_UNUSED(prev_row)
+}
+
+void
+png_read_filter_row_sub4_neon(png_row_infop row_info, png_bytep row,
+   png_const_bytep prev_row)
+{
+   png_bytep rp = row;
+   png_bytep rp_stop = row + row_info->rowbytes;
+
+   uint8x8x4_t vdest;
+   vdest.val[3] = vdup_n_u8(0);
+
+   png_debug(1, "in png_read_filter_row_sub4_neon");
+
+   for (; rp < rp_stop; rp += 16)
+   {
+      uint32x2x4_t vtmp = vld4_u32(png_ptr(uint32_t,rp));
+      uint8x8x4_t *vrpt = png_ptr(uint8x8x4_t,&vtmp);
+      uint8x8x4_t vrp = *vrpt;
+      uint32x2x4_t *temp_pointer;
+
+      vdest.val[0] = vadd_u8(vdest.val[3], vrp.val[0]);
+      vdest.val[1] = vadd_u8(vdest.val[0], vrp.val[1]);
+      vdest.val[2] = vadd_u8(vdest.val[1], vrp.val[2]);
+      vdest.val[3] = vadd_u8(vdest.val[2], vrp.val[3]);
+      vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0);
+   }
+
+   PNG_UNUSED(prev_row)
+}
+
+void
+png_read_filter_row_avg3_neon(png_row_infop row_info, png_bytep row,
+   png_const_bytep prev_row)
+{
+   png_bytep rp = row;
+   png_const_bytep pp = prev_row;
+   png_bytep rp_stop = row + row_info->rowbytes;
+
+   uint8x16_t vtmp;
+   uint8x8x2_t *vrpt;
+   uint8x8x2_t vrp;
+   uint8x8x4_t vdest;
+   vdest.val[3] = vdup_n_u8(0);
+
+   vtmp = vld1q_u8(rp);
+   vrpt = png_ptr(uint8x8x2_t,&vtmp);
+   vrp = *vrpt;
+
+   png_debug(1, "in png_read_filter_row_avg3_neon");
+
+   for (; rp < rp_stop; pp += 12)
+   {
+      uint8x8_t vtmp1, vtmp2, vtmp3;
+
+      uint8x8x2_t *vppt;
+      uint8x8x2_t vpp;
+
+      uint32x2_t *temp_pointer;
+
+      vtmp = vld1q_u8(pp);
+      vppt = png_ptr(uint8x8x2_t,&vtmp);
+      vpp = *vppt;
+
+      vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 3);
+      vdest.val[0] = vhadd_u8(vdest.val[3], vpp.val[0]);
+      vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]);
+
+      vtmp2 = vext_u8(vpp.val[0], vpp.val[1], 3);
+      vtmp3 = vext_u8(vrp.val[0], vrp.val[1], 6);
+      vdest.val[1] = vhadd_u8(vdest.val[0], vtmp2);
+      vdest.val[1] = vadd_u8(vdest.val[1], vtmp1);
+
+      vtmp2 = vext_u8(vpp.val[0], vpp.val[1], 6);
+      vtmp1 = vext_u8(vrp.val[1], vrp.val[1], 1);
+
+      vtmp = vld1q_u8(rp + 12);
+      vrpt = png_ptr(uint8x8x2_t,&vtmp);
+      vrp = *vrpt;
+
+      vdest.val[2] = vhadd_u8(vdest.val[1], vtmp2);
+      vdest.val[2] = vadd_u8(vdest.val[2], vtmp3);
+
+      vtmp2 = vext_u8(vpp.val[1], vpp.val[1], 1);
+
+      vdest.val[3] = vhadd_u8(vdest.val[2], vtmp2);
+      vdest.val[3] = vadd_u8(vdest.val[3], vtmp1);
+
+      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[0]), 0);
+      rp += 3;
+      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[1]), 0);
+      rp += 3;
+      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[2]), 0);
+      rp += 3;
+      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[3]), 0);
+      rp += 3;
+   }
+}
+
+void
+png_read_filter_row_avg4_neon(png_row_infop row_info, png_bytep row,
+   png_const_bytep prev_row)
+{
+   png_bytep rp = row;
+   png_bytep rp_stop = row + row_info->rowbytes;
+   png_const_bytep pp = prev_row;
+
+   uint8x8x4_t vdest;
+   vdest.val[3] = vdup_n_u8(0);
+
+   png_debug(1, "in png_read_filter_row_avg4_neon");
+
+   for (; rp < rp_stop; rp += 16, pp += 16)
+   {
+      uint32x2x4_t vtmp;
+      uint8x8x4_t *vrpt, *vppt;
+      uint8x8x4_t vrp, vpp;
+      uint32x2x4_t *temp_pointer;
+
+      vtmp = vld4_u32(png_ptr(uint32_t,rp));
+      vrpt = png_ptr(uint8x8x4_t,&vtmp);
+      vrp = *vrpt;
+      vtmp = vld4_u32(png_ptrc(uint32_t,pp));
+      vppt = png_ptr(uint8x8x4_t,&vtmp);
+      vpp = *vppt;
+
+      vdest.val[0] = vhadd_u8(vdest.val[3], vpp.val[0]);
+      vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]);
+      vdest.val[1] = vhadd_u8(vdest.val[0], vpp.val[1]);
+      vdest.val[1] = vadd_u8(vdest.val[1], vrp.val[1]);
+      vdest.val[2] = vhadd_u8(vdest.val[1], vpp.val[2]);
+      vdest.val[2] = vadd_u8(vdest.val[2], vrp.val[2]);
+      vdest.val[3] = vhadd_u8(vdest.val[2], vpp.val[3]);
+      vdest.val[3] = vadd_u8(vdest.val[3], vrp.val[3]);
+
+      vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0);
+   }
+}
+
+static uint8x8_t
+paeth(uint8x8_t a, uint8x8_t b, uint8x8_t c)
+{
+   uint8x8_t d, e;
+   uint16x8_t p1, pa, pb, pc;
+
+   p1 = vaddl_u8(a, b); /* a + b */
+   pc = vaddl_u8(c, c); /* c * 2 */
+   pa = vabdl_u8(b, c); /* pa */
+   pb = vabdl_u8(a, c); /* pb */
+   pc = vabdq_u16(p1, pc); /* pc */
+
+   p1 = vcleq_u16(pa, pb); /* pa <= pb */
+   pa = vcleq_u16(pa, pc); /* pa <= pc */
+   pb = vcleq_u16(pb, pc); /* pb <= pc */
+
+   p1 = vandq_u16(p1, pa); /* pa <= pb && pa <= pc */
+
+   d = vmovn_u16(pb);
+   e = vmovn_u16(p1);
+
+   d = vbsl_u8(d, b, c);
+   e = vbsl_u8(e, a, d);
+
+   return e;
+}
+
+void
+png_read_filter_row_paeth3_neon(png_row_infop row_info, png_bytep row,
+   png_const_bytep prev_row)
+{
+   png_bytep rp = row;
+   png_const_bytep pp = prev_row;
+   png_bytep rp_stop = row + row_info->rowbytes;
+
+   uint8x16_t vtmp;
+   uint8x8x2_t *vrpt;
+   uint8x8x2_t vrp;
+   uint8x8_t vlast = vdup_n_u8(0);
+   uint8x8x4_t vdest;
+   vdest.val[3] = vdup_n_u8(0);
+
+   vtmp = vld1q_u8(rp);
+   vrpt = png_ptr(uint8x8x2_t,&vtmp);
+   vrp = *vrpt;
+
+   png_debug(1, "in png_read_filter_row_paeth3_neon");
+
+   for (; rp < rp_stop; pp += 12)
+   {
+      uint8x8x2_t *vppt;
+      uint8x8x2_t vpp;
+      uint8x8_t vtmp1, vtmp2, vtmp3;
+      uint32x2_t *temp_pointer;
+
+      vtmp = vld1q_u8(pp);
+      vppt = png_ptr(uint8x8x2_t,&vtmp);
+      vpp = *vppt;
+
+      vdest.val[0] = paeth(vdest.val[3], vpp.val[0], vlast);
+      vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]);
+
+      vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 3);
+      vtmp2 = vext_u8(vpp.val[0], vpp.val[1], 3);
+      vdest.val[1] = paeth(vdest.val[0], vtmp2, vpp.val[0]);
+      vdest.val[1] = vadd_u8(vdest.val[1], vtmp1);
+
+      vtmp1 = vext_u8(vrp.val[0], vrp.val[1], 6);
+      vtmp3 = vext_u8(vpp.val[0], vpp.val[1], 6);
+      vdest.val[2] = paeth(vdest.val[1], vtmp3, vtmp2);
+      vdest.val[2] = vadd_u8(vdest.val[2], vtmp1);
+
+      vtmp1 = vext_u8(vrp.val[1], vrp.val[1], 1);
+      vtmp2 = vext_u8(vpp.val[1], vpp.val[1], 1);
+
+      vtmp = vld1q_u8(rp + 12);
+      vrpt = png_ptr(uint8x8x2_t,&vtmp);
+      vrp = *vrpt;
+
+      vdest.val[3] = paeth(vdest.val[2], vtmp2, vtmp3);
+      vdest.val[3] = vadd_u8(vdest.val[3], vtmp1);
+
+      vlast = vtmp2;
+
+      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[0]), 0);
+      rp += 3;
+      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[1]), 0);
+      rp += 3;
+      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[2]), 0);
+      rp += 3;
+      vst1_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2_t,&vdest.val[3]), 0);
+      rp += 3;
+   }
+}
+
+void
+png_read_filter_row_paeth4_neon(png_row_infop row_info, png_bytep row,
+   png_const_bytep prev_row)
+{
+   png_bytep rp = row;
+   png_bytep rp_stop = row + row_info->rowbytes;
+   png_const_bytep pp = prev_row;
+
+   uint8x8_t vlast = vdup_n_u8(0);
+   uint8x8x4_t vdest;
+   vdest.val[3] = vdup_n_u8(0);
+
+   png_debug(1, "in png_read_filter_row_paeth4_neon");
+
+   for (; rp < rp_stop; rp += 16, pp += 16)
+   {
+      uint32x2x4_t vtmp;
+      uint8x8x4_t *vrpt, *vppt;
+      uint8x8x4_t vrp, vpp;
+      uint32x2x4_t *temp_pointer;
+
+      vtmp = vld4_u32(png_ptr(uint32_t,rp));
+      vrpt = png_ptr(uint8x8x4_t,&vtmp);
+      vrp = *vrpt;
+      vtmp = vld4_u32(png_ptrc(uint32_t,pp));
+      vppt = png_ptr(uint8x8x4_t,&vtmp);
+      vpp = *vppt;
+
+      vdest.val[0] = paeth(vdest.val[3], vpp.val[0], vlast);
+      vdest.val[0] = vadd_u8(vdest.val[0], vrp.val[0]);
+      vdest.val[1] = paeth(vdest.val[0], vpp.val[1], vpp.val[0]);
+      vdest.val[1] = vadd_u8(vdest.val[1], vrp.val[1]);
+      vdest.val[2] = paeth(vdest.val[1], vpp.val[2], vpp.val[1]);
+      vdest.val[2] = vadd_u8(vdest.val[2], vrp.val[2]);
+      vdest.val[3] = paeth(vdest.val[2], vpp.val[3], vpp.val[2]);
+      vdest.val[3] = vadd_u8(vdest.val[3], vrp.val[3]);
+
+      vlast = vpp.val[3];
+
+      vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0);
+   }
+}
+
+#endif /* PNG_ARM_NEON_OPT > 0 */
+#endif /* PNG_ARM_NEON_IMPLEMENTATION == 1 (intrinsics) */
+#endif /* READ */
diff --git a/drivers/png/image_loader_png.cpp b/drivers/png/image_loader_png.cpp
index 50b26d601a..e10ac7493f 100644
--- a/drivers/png/image_loader_png.cpp
+++ b/drivers/png/image_loader_png.cpp
@@ -30,7 +30,7 @@
 
 #include "print_string.h"
 #include "os/os.h"
-
+#include <string.h>
 
 
 void ImageLoaderPNG::_read_png_data(png_structp png_ptr,png_bytep data, png_size_t p_length) {
@@ -62,7 +62,7 @@ static void _png_error_function(png_structp, png_const_charp text) {
 
 static void _png_warn_function(png_structp, png_const_charp text) {
 
-	ERR_PRINT(text);
+	WARN_PRINT(text);
 }
 
 typedef void (PNGAPI *png_error_ptr) PNGARG((png_structp, png_const_charp));
@@ -104,7 +104,6 @@ Error ImageLoaderPNG::_load_image(void *rf_up,png_rw_ptr p_func,Image *p_image)
 	png_read_info(png, info);
 	png_get_IHDR(png, info, &width, &height, &depth, &color, NULL, NULL, NULL);
 
-	png_textp t;
 	//https://svn.gov.pt/projects/ccidadao/repository/middleware-offline/trunk/_src/eidmw/FreeImagePTEiD/Source/FreeImage/PluginPNG.cpp
 	//png_get_text(png,info,)
 	/*
@@ -254,7 +253,7 @@ Error ImageLoaderPNG::load_image(Image *p_image,FileAccess *f) {
 }
 
 void ImageLoaderPNG::get_recognized_extensions(List<String> *p_extensions) const {
-	
+
 	p_extensions->push_back("png");
 }
 
@@ -362,7 +361,6 @@ static DVector<uint8_t> _lossless_pack_png(const Image& p_image) {
 	}
 
 	int pngf=0;
-	int pngb=8;
 	int cs=0;
 
 	switch(img.get_format()) {
@@ -451,7 +449,3 @@ ImageLoaderPNG::ImageLoaderPNG() {
 
 
 }
-
-
-
-
diff --git a/drivers/png/png.c b/drivers/png/png.c
index 711b7c4629..1720ca0eae 100644
--- a/drivers/png/png.c
+++ b/drivers/png/png.c
@@ -1,7 +1,7 @@
 
 /* png.c - location for general purpose libpng functions
  *
- * Last changed in libpng 1.5.23 [July 23, 2015]
+ * Last changed in libpng 1.6.19 [November 12, 2015]
  * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -14,7 +14,7 @@
 #include "pngpriv.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_5_27 Your_png_h_is_not_version_1_5_27;
+typedef png_libpng_version_1_6_23 Your_png_h_is_not_version_1_6_23;
 
 /* Tells libpng that we have already handled the first "num_bytes" bytes
  * of the PNG file signature.  If the PNG data is embedded into another
@@ -24,7 +24,7 @@ typedef png_libpng_version_1_5_27 Your_png_h_is_not_version_1_5_27;
 
 #ifdef PNG_READ_SUPPORTED
 void PNGAPI
-png_set_sig_bytes(png_structp png_ptr, int num_bytes)
+png_set_sig_bytes(png_structrp png_ptr, int num_bytes)
 {
    unsigned int nb = (unsigned int)num_bytes;
 
@@ -67,55 +67,46 @@ png_sig_cmp(png_const_bytep sig, png_size_t start, png_size_t num_to_check)
    if (start + num_to_check > 8)
       num_to_check = 8 - start;
 
-   return ((int)(png_memcmp(&sig[start], &png_signature[start], num_to_check)));
+   return ((int)(memcmp(&sig[start], &png_signature[start], num_to_check)));
 }
 
-#endif /* PNG_READ_SUPPORTED */
+#endif /* READ */
 
 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
 /* Function to allocate memory for zlib */
 PNG_FUNCTION(voidpf /* PRIVATE */,
 png_zalloc,(voidpf png_ptr, uInt items, uInt size),PNG_ALLOCATED)
 {
-   png_voidp ptr;
-   png_structp p;
-   png_uint_32 save_flags;
-   png_alloc_size_t num_bytes;
+   png_alloc_size_t num_bytes = size;
 
    if (png_ptr == NULL)
-      return (NULL);
-
-   p=(png_structp)png_ptr;
-   save_flags=p->flags;
+      return NULL;
 
-   if (items > PNG_UINT_32_MAX/size)
+   if (items >= (~(png_alloc_size_t)0)/size)
    {
-     png_warning (p, "Potential overflow in png_zalloc()");
-     return (NULL);
+      png_warning (png_voidcast(png_structrp, png_ptr),
+         "Potential overflow in png_zalloc()");
+      return NULL;
    }
-   num_bytes = (png_alloc_size_t)items * size;
-
-   p->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
-   ptr = (png_voidp)png_malloc((png_structp)png_ptr, num_bytes);
-   p->flags=save_flags;
 
-   return ((voidpf)ptr);
+   num_bytes *= items;
+   return png_malloc_warn(png_voidcast(png_structrp, png_ptr), num_bytes);
 }
 
 /* Function to free memory for zlib */
 void /* PRIVATE */
 png_zfree(voidpf png_ptr, voidpf ptr)
 {
-   png_free((png_structp)png_ptr, (png_voidp)ptr);
+   png_free(png_voidcast(png_const_structrp,png_ptr), ptr);
 }
 
 /* Reset the CRC variable to 32 bits of 1's.  Care must be taken
  * in case CRC is > 32 bits to leave the top bits 0.
  */
 void /* PRIVATE */
-png_reset_crc(png_structp png_ptr)
+png_reset_crc(png_structrp png_ptr)
 {
-   /* The cast is safe because the crc is a 32 bit value. */
+   /* The cast is safe because the crc is a 32-bit value. */
    png_ptr->crc = (png_uint_32)crc32(0, Z_NULL, 0);
 }
 
@@ -125,11 +116,11 @@ png_reset_crc(png_structp png_ptr)
  * trouble of calculating it.
  */
 void /* PRIVATE */
-png_calculate_crc(png_structp png_ptr, png_const_bytep ptr, png_size_t length)
+png_calculate_crc(png_structrp png_ptr, png_const_bytep ptr, png_size_t length)
 {
    int need_crc = 1;
 
-   if (PNG_CHUNK_ANCILLIARY(png_ptr->chunk_name))
+   if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0)
    {
       if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
           (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
@@ -138,34 +129,35 @@ png_calculate_crc(png_structp png_ptr, png_const_bytep ptr, png_size_t length)
 
    else /* critical */
    {
-      if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
+      if ((png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE) != 0)
          need_crc = 0;
    }
 
-   /* 'uLong' is defined as unsigned long, this means that on some systems it is
-    * a 64 bit value.  crc32, however, returns 32 bits so the following cast is
-    * safe.  'uInt' may be no more than 16 bits, so it is necessary to perform a
-    * loop here.
+   /* 'uLong' is defined in zlib.h as unsigned long; this means that on some
+    * systems it is a 64-bit value.  crc32, however, returns 32 bits so the
+    * following cast is safe.  'uInt' may be no more than 16 bits, so it is
+    * necessary to perform a loop here.
     */
-   if (need_crc && length > 0)
+   if (need_crc != 0 && length > 0)
    {
       uLong crc = png_ptr->crc; /* Should never issue a warning */
 
       do
       {
-         uInt safeLength = (uInt)length;
+         uInt safe_length = (uInt)length;
 #ifndef __COVERITY__
-         if (safeLength == 0)
-            safeLength = (uInt)-1; /* evil, but safe */
+         if (safe_length == 0)
+            safe_length = (uInt)-1; /* evil, but safe */
 #endif
-         crc = crc32(crc, ptr, safeLength);
 
-         /* The following should never issue compiler warnings, if they do the
+         crc = crc32(crc, ptr, safe_length);
+
+         /* The following should never issue compiler warnings; if they do the
           * target system has characteristics that will probably violate other
           * assumptions within the libpng code.
           */
-         ptr += safeLength;
-         length -= safeLength;
+         ptr += safe_length;
+         length -= safe_length;
       }
       while (length > 0);
 
@@ -175,10 +167,10 @@ png_calculate_crc(png_structp png_ptr, png_const_bytep ptr, png_size_t length)
 }
 
 /* Check a user supplied version number, called from both read and write
- * functions that create a png_struct
+ * functions that create a png_struct.
  */
 int
-png_user_version_check(png_structp png_ptr, png_const_charp user_png_ver)
+png_user_version_check(png_structrp png_ptr, png_const_charp user_png_ver)
 {
      /* Libpng versions 1.0.0 and later are binary compatible if the version
       * string matches through the second '.'; we must recompile any
@@ -231,43 +223,149 @@ png_user_version_check(png_structp png_ptr, png_const_charp user_png_ver)
    return 1;
 }
 
-/* Allocate the memory for an info_struct for the application.  We don't
- * really need the png_ptr, but it could potentially be useful in the
- * future.  This should be used in favour of malloc(png_sizeof(png_info))
- * and png_info_init() so that applications that want to use a shared
- * libpng don't have to be recompiled if png_info changes size.
+/* Generic function to create a png_struct for either read or write - this
+ * contains the common initialization.
  */
+PNG_FUNCTION(png_structp /* PRIVATE */,
+png_create_png_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
+    png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+    png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)
+{
+   png_struct create_struct;
+#  ifdef PNG_SETJMP_SUPPORTED
+      jmp_buf create_jmp_buf;
+#  endif
+
+   /* This temporary stack-allocated structure is used to provide a place to
+    * build enough context to allow the user provided memory allocator (if any)
+    * to be called.
+    */
+   memset(&create_struct, 0, (sizeof create_struct));
+
+   /* Added at libpng-1.2.6 */
+#  ifdef PNG_USER_LIMITS_SUPPORTED
+      create_struct.user_width_max = PNG_USER_WIDTH_MAX;
+      create_struct.user_height_max = PNG_USER_HEIGHT_MAX;
+
+#     ifdef PNG_USER_CHUNK_CACHE_MAX
+      /* Added at libpng-1.2.43 and 1.4.0 */
+      create_struct.user_chunk_cache_max = PNG_USER_CHUNK_CACHE_MAX;
+#     endif
+
+#     ifdef PNG_USER_CHUNK_MALLOC_MAX
+      /* Added at libpng-1.2.43 and 1.4.1, required only for read but exists
+       * in png_struct regardless.
+       */
+      create_struct.user_chunk_malloc_max = PNG_USER_CHUNK_MALLOC_MAX;
+#     endif
+#  endif
+
+   /* The following two API calls simply set fields in png_struct, so it is safe
+    * to do them now even though error handling is not yet set up.
+    */
+#  ifdef PNG_USER_MEM_SUPPORTED
+      png_set_mem_fn(&create_struct, mem_ptr, malloc_fn, free_fn);
+#  else
+      PNG_UNUSED(mem_ptr)
+      PNG_UNUSED(malloc_fn)
+      PNG_UNUSED(free_fn)
+#  endif
+
+   /* (*error_fn) can return control to the caller after the error_ptr is set,
+    * this will result in a memory leak unless the error_fn does something
+    * extremely sophisticated.  The design lacks merit but is implicit in the
+    * API.
+    */
+   png_set_error_fn(&create_struct, error_ptr, error_fn, warn_fn);
+
+#  ifdef PNG_SETJMP_SUPPORTED
+      if (!setjmp(create_jmp_buf))
+#  endif
+      {
+#  ifdef PNG_SETJMP_SUPPORTED
+         /* Temporarily fake out the longjmp information until we have
+          * successfully completed this function.  This only works if we have
+          * setjmp() support compiled in, but it is safe - this stuff should
+          * never happen.
+          */
+         create_struct.jmp_buf_ptr = &create_jmp_buf;
+         create_struct.jmp_buf_size = 0; /*stack allocation*/
+         create_struct.longjmp_fn = longjmp;
+#  endif
+         /* Call the general version checker (shared with read and write code):
+          */
+         if (png_user_version_check(&create_struct, user_png_ver) != 0)
+         {
+            png_structrp png_ptr = png_voidcast(png_structrp,
+               png_malloc_warn(&create_struct, (sizeof *png_ptr)));
+
+            if (png_ptr != NULL)
+            {
+               /* png_ptr->zstream holds a back-pointer to the png_struct, so
+                * this can only be done now:
+                */
+               create_struct.zstream.zalloc = png_zalloc;
+               create_struct.zstream.zfree = png_zfree;
+               create_struct.zstream.opaque = png_ptr;
+
+#              ifdef PNG_SETJMP_SUPPORTED
+               /* Eliminate the local error handling: */
+               create_struct.jmp_buf_ptr = NULL;
+               create_struct.jmp_buf_size = 0;
+               create_struct.longjmp_fn = 0;
+#              endif
+
+               *png_ptr = create_struct;
+
+               /* This is the successful return point */
+               return png_ptr;
+            }
+         }
+      }
+
+   /* A longjmp because of a bug in the application storage allocator or a
+    * simple failure to allocate the png_struct.
+    */
+   return NULL;
+}
+
+/* Allocate the memory for an info_struct for the application. */
 PNG_FUNCTION(png_infop,PNGAPI
-png_create_info_struct,(png_structp png_ptr),PNG_ALLOCATED)
+png_create_info_struct,(png_const_structrp png_ptr),PNG_ALLOCATED)
 {
-   png_infop info_ptr;
+   png_inforp info_ptr;
 
    png_debug(1, "in png_create_info_struct");
 
    if (png_ptr == NULL)
-      return (NULL);
+      return NULL;
+
+   /* Use the internal API that does not (or at least should not) error out, so
+    * that this call always returns ok.  The application typically sets up the
+    * error handling *after* creating the info_struct because this is the way it
+    * has always been done in 'example.c'.
+    */
+   info_ptr = png_voidcast(png_inforp, png_malloc_base(png_ptr,
+      (sizeof *info_ptr)));
 
-#ifdef PNG_USER_MEM_SUPPORTED
-   info_ptr = (png_infop)png_create_struct_2(PNG_STRUCT_INFO,
-      png_ptr->malloc_fn, png_ptr->mem_ptr);
-#else
-   info_ptr = (png_infop)png_create_struct(PNG_STRUCT_INFO);
-#endif
    if (info_ptr != NULL)
-      png_info_init_3(&info_ptr, png_sizeof(png_info));
+      memset(info_ptr, 0, (sizeof *info_ptr));
 
-   return (info_ptr);
+   return info_ptr;
 }
 
 /* This function frees the memory associated with a single info struct.
  * Normally, one would use either png_destroy_read_struct() or
  * png_destroy_write_struct() to free an info struct, but this may be
- * useful for some applications.
+ * useful for some applications.  From libpng 1.6.0 this function is also used
+ * internally to implement the png_info release part of the 'struct' destroy
+ * APIs.  This ensures that all possible approaches free the same data (all of
+ * it).
  */
 void PNGAPI
-png_destroy_info_struct(png_structp png_ptr, png_infopp info_ptr_ptr)
+png_destroy_info_struct(png_const_structrp png_ptr, png_infopp info_ptr_ptr)
 {
-   png_infop info_ptr = NULL;
+   png_inforp info_ptr = NULL;
 
    png_debug(1, "in png_destroy_info_struct");
 
@@ -279,48 +377,59 @@ png_destroy_info_struct(png_structp png_ptr, png_infopp info_ptr_ptr)
 
    if (info_ptr != NULL)
    {
-      png_info_destroy(png_ptr, info_ptr);
-
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)info_ptr, png_ptr->free_fn,
-          png_ptr->mem_ptr);
-#else
-      png_destroy_struct((png_voidp)info_ptr);
-#endif
+      /* Do this first in case of an error below; if the app implements its own
+       * memory management this can lead to png_free calling png_error, which
+       * will abort this routine and return control to the app error handler.
+       * An infinite loop may result if it then tries to free the same info
+       * ptr.
+       */
       *info_ptr_ptr = NULL;
+
+      png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
+      memset(info_ptr, 0, (sizeof *info_ptr));
+      png_free(png_ptr, info_ptr);
    }
 }
 
 /* Initialize the info structure.  This is now an internal function (0.89)
  * and applications using it are urged to use png_create_info_struct()
- * instead.
+ * instead.  Use deprecated in 1.6.0, internal use removed (used internally it
+ * is just a memset).
+ *
+ * NOTE: it is almost inconceivable that this API is used because it bypasses
+ * the user-memory mechanism and the user error handling/warning mechanisms in
+ * those cases where it does anything other than a memset.
  */
-
-void PNGAPI
-png_info_init_3(png_infopp ptr_ptr, png_size_t png_info_struct_size)
+PNG_FUNCTION(void,PNGAPI
+png_info_init_3,(png_infopp ptr_ptr, png_size_t png_info_struct_size),
+   PNG_DEPRECATED)
 {
-   png_infop info_ptr = *ptr_ptr;
+   png_inforp info_ptr = *ptr_ptr;
 
    png_debug(1, "in png_info_init_3");
 
    if (info_ptr == NULL)
       return;
 
-   if (png_sizeof(png_info) > png_info_struct_size)
+   if ((sizeof (png_info)) > png_info_struct_size)
    {
-      png_destroy_struct(info_ptr);
-      info_ptr = (png_infop)png_create_struct(PNG_STRUCT_INFO);
-      *ptr_ptr = info_ptr;
+      *ptr_ptr = NULL;
+      /* The following line is why this API should not be used: */
+      free(info_ptr);
+      info_ptr = png_voidcast(png_inforp, png_malloc_base(NULL,
+         (sizeof *info_ptr)));
       if (info_ptr == NULL)
          return;
+      *ptr_ptr = info_ptr;
    }
 
    /* Set everything to 0 */
-   png_memset(info_ptr, 0, png_sizeof(png_info));
+   memset(info_ptr, 0, (sizeof *info_ptr));
 }
 
+/* The following API is not called internally */
 void PNGAPI
-png_data_freer(png_structp png_ptr, png_infop info_ptr,
+png_data_freer(png_const_structrp png_ptr, png_inforp info_ptr,
    int freer, png_uint_32 mask)
 {
    png_debug(1, "in png_data_freer");
@@ -335,12 +444,11 @@ png_data_freer(png_structp png_ptr, png_infop info_ptr,
       info_ptr->free_me &= ~mask;
 
    else
-      png_warning(png_ptr,
-         "Unknown freer parameter in png_data_freer");
+      png_error(png_ptr, "Unknown freer parameter in png_data_freer");
 }
 
 void PNGAPI
-png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 mask,
+png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
    int num)
 {
    png_debug(1, "in png_free_data");
@@ -462,7 +570,7 @@ png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 mask,
    }
 #endif
 
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
+#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
    if (info_ptr->unknown_chunks != 0 &&
        ((mask & PNG_FREE_UNKN) & info_ptr->free_me) != 0)
    {
@@ -527,37 +635,14 @@ png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 mask,
 
    info_ptr->free_me &= ~mask;
 }
-
-/* This is an internal routine to free any memory that the info struct is
- * pointing to before re-using it or freeing the struct itself.  Recall
- * that png_free() checks for NULL pointers for us.
- */
-void /* PRIVATE */
-png_info_destroy(png_structp png_ptr, png_infop info_ptr)
-{
-   png_debug(1, "in png_info_destroy");
-
-   png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-   if (png_ptr->num_chunk_list)
-   {
-      png_free(png_ptr, png_ptr->chunk_list);
-      png_ptr->chunk_list = NULL;
-      png_ptr->num_chunk_list = 0;
-   }
-#endif
-
-   png_info_init_3(&info_ptr, png_sizeof(png_info));
-}
-#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
+#endif /* READ || WRITE */
 
 /* This function returns a pointer to the io_ptr associated with the user
  * functions.  The application should free any memory associated with this
  * pointer before png_write_destroy() or png_read_destroy() are called.
  */
 png_voidp PNGAPI
-png_get_io_ptr(png_structp png_ptr)
+png_get_io_ptr(png_const_structrp png_ptr)
 {
    if (png_ptr == NULL)
       return (NULL);
@@ -574,7 +659,7 @@ png_get_io_ptr(png_structp png_ptr)
  * function of your own because "FILE *" isn't necessarily available.
  */
 void PNGAPI
-png_init_io(png_structp png_ptr, png_FILE_p fp)
+png_init_io(png_structrp png_ptr, png_FILE_p fp)
 {
    png_debug(1, "in png_init_io");
 
@@ -585,42 +670,53 @@ png_init_io(png_structp png_ptr, png_FILE_p fp)
 }
 #  endif
 
+#  ifdef PNG_SAVE_INT_32_SUPPORTED
+/* PNG signed integers are saved in 32-bit 2's complement format.  ANSI C-90
+ * defines a cast of a signed integer to an unsigned integer either to preserve
+ * the value, if it is positive, or to calculate:
+ *
+ *     (UNSIGNED_MAX+1) + integer
+ *
+ * Where UNSIGNED_MAX is the appropriate maximum unsigned value, so when the
+ * negative integral value is added the result will be an unsigned value
+ * correspnding to the 2's complement representation.
+ */
+void PNGAPI
+png_save_int_32(png_bytep buf, png_int_32 i)
+{
+   png_save_uint_32(buf, i);
+}
+#  endif
+
 #  ifdef PNG_TIME_RFC1123_SUPPORTED
 /* Convert the supplied time into an RFC 1123 string suitable for use in
  * a "Creation Time" or other text-based time string.
  */
-png_const_charp PNGAPI
-png_convert_to_rfc1123(png_structp png_ptr, png_const_timep ptime)
+int PNGAPI
+png_convert_to_rfc1123_buffer(char out[29], png_const_timep ptime)
 {
    static PNG_CONST char short_months[12][4] =
         {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
          "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
 
-   if (png_ptr == NULL)
-      return (NULL);
+   if (out == NULL)
+      return 0;
 
    if (ptime->year > 9999 /* RFC1123 limitation */ ||
        ptime->month == 0    ||  ptime->month > 12  ||
        ptime->day   == 0    ||  ptime->day   > 31  ||
        ptime->hour  > 23    ||  ptime->minute > 59 ||
        ptime->second > 60)
-   {
-      png_warning(png_ptr, "Ignoring invalid time value");
-      return (NULL);
-   }
+      return 0;
 
    {
       size_t pos = 0;
       char number_buf[5]; /* enough for a four-digit year */
 
-#     define APPEND_STRING(string)\
-         pos = png_safecat(png_ptr->time_buffer, sizeof png_ptr->time_buffer,\
-            pos, (string))
+#     define APPEND_STRING(string) pos = png_safecat(out, 29, pos, (string))
 #     define APPEND_NUMBER(format, value)\
          APPEND_STRING(PNG_FORMAT_NUMBER(number_buf, format, (value)))
-#     define APPEND(ch)\
-         if (pos < (sizeof png_ptr->time_buffer)-1)\
-            png_ptr->time_buffer[pos++] = (ch)
+#     define APPEND(ch) if (pos < 28) out[pos++] = (ch)
 
       APPEND_NUMBER(PNG_NUMBER_FORMAT_u, (unsigned)ptime->day);
       APPEND(' ');
@@ -634,20 +730,44 @@ png_convert_to_rfc1123(png_structp png_ptr, png_const_timep ptime)
       APPEND(':');
       APPEND_NUMBER(PNG_NUMBER_FORMAT_02u, (unsigned)ptime->second);
       APPEND_STRING(" +0000"); /* This reliably terminates the buffer */
+      PNG_UNUSED (pos)
 
 #     undef APPEND
 #     undef APPEND_NUMBER
 #     undef APPEND_STRING
    }
 
-   return png_ptr->time_buffer;
+   return 1;
+}
+
+#    if PNG_LIBPNG_VER < 10700
+/* To do: remove the following from libpng-1.7 */
+/* Original API that uses a private buffer in png_struct.
+ * Deprecated because it causes png_struct to carry a spurious temporary
+ * buffer (png_struct::time_buffer), better to have the caller pass this in.
+ */
+png_const_charp PNGAPI
+png_convert_to_rfc1123(png_structrp png_ptr, png_const_timep ptime)
+{
+   if (png_ptr != NULL)
+   {
+      /* The only failure above if png_ptr != NULL is from an invalid ptime */
+      if (png_convert_to_rfc1123_buffer(png_ptr->time_buffer, ptime) == 0)
+         png_warning(png_ptr, "Ignoring invalid time value");
+
+      else
+         return png_ptr->time_buffer;
+   }
+
+   return NULL;
 }
-#  endif /* PNG_TIME_RFC1123_SUPPORTED */
+#    endif /* LIBPNG_VER < 10700 */
+#  endif /* TIME_RFC1123 */
 
-#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
+#endif /* READ || WRITE */
 
 png_const_charp PNGAPI
-png_get_copyright(png_const_structp png_ptr)
+png_get_copyright(png_const_structrp png_ptr)
 {
    PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
 #ifdef PNG_STRING_COPYRIGHT
@@ -655,14 +775,14 @@ png_get_copyright(png_const_structp png_ptr)
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-     "libpng version 1.5.27 - May 26, 2016" PNG_STRING_NEWLINE \
-     "Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson" \
-     PNG_STRING_NEWLINE \
-     "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
-     "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
-     PNG_STRING_NEWLINE;
+      "libpng version 1.6.23 - June 9, 2016" PNG_STRING_NEWLINE \
+      "Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson" \
+      PNG_STRING_NEWLINE \
+      "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
+      "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
+      PNG_STRING_NEWLINE;
 #  else
-      return "libpng version 1.5.27 - May 26, 2016\
+   return "libpng version 1.6.23 - June 9, 2016\
       Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
@@ -679,14 +799,14 @@ png_get_copyright(png_const_structp png_ptr)
  * it is guaranteed that png.c uses the correct version of png.h.
  */
 png_const_charp PNGAPI
-png_get_libpng_ver(png_const_structp png_ptr)
+png_get_libpng_ver(png_const_structrp png_ptr)
 {
    /* Version of *.c files used when building libpng */
    return png_get_header_ver(png_ptr);
 }
 
 png_const_charp PNGAPI
-png_get_header_ver(png_const_structp png_ptr)
+png_get_header_ver(png_const_structrp png_ptr)
 {
    /* Version of *.h files used when building libpng */
    PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
@@ -694,70 +814,137 @@ png_get_header_ver(png_const_structp png_ptr)
 }
 
 png_const_charp PNGAPI
-png_get_header_version(png_const_structp png_ptr)
+png_get_header_version(png_const_structrp png_ptr)
 {
    /* Returns longer string containing both version and date */
    PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
 #ifdef __STDC__
    return PNG_HEADER_VERSION_STRING
 #  ifndef PNG_READ_SUPPORTED
-   "     (NO READ SUPPORT)"
+      " (NO READ SUPPORT)"
 #  endif
-   PNG_STRING_NEWLINE;
+      PNG_STRING_NEWLINE;
 #else
    return PNG_HEADER_VERSION_STRING;
 #endif
 }
 
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+#ifdef PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
+/* NOTE: this routine is not used internally! */
+/* Build a grayscale palette.  Palette is assumed to be 1 << bit_depth
+ * large of png_color.  This lets grayscale images be treated as
+ * paletted.  Most useful for gamma correction and simplification
+ * of code.  This API is not used internally.
+ */
+void PNGAPI
+png_build_grayscale_palette(int bit_depth, png_colorp palette)
+{
+   int num_palette;
+   int color_inc;
+   int i;
+   int v;
+
+   png_debug(1, "in png_do_build_grayscale_palette");
+
+   if (palette == NULL)
+      return;
+
+   switch (bit_depth)
+   {
+      case 1:
+         num_palette = 2;
+         color_inc = 0xff;
+         break;
+
+      case 2:
+         num_palette = 4;
+         color_inc = 0x55;
+         break;
+
+      case 4:
+         num_palette = 16;
+         color_inc = 0x11;
+         break;
+
+      case 8:
+         num_palette = 256;
+         color_inc = 1;
+         break;
+
+      default:
+         num_palette = 0;
+         color_inc = 0;
+         break;
+   }
+
+   for (i = 0, v = 0; i < num_palette; i++, v += color_inc)
+   {
+      palette[i].red = (png_byte)(v & 0xff);
+      palette[i].green = (png_byte)(v & 0xff);
+      palette[i].blue = (png_byte)(v & 0xff);
+   }
+}
+#endif
+
+#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
 int PNGAPI
-png_handle_as_unknown(png_structp png_ptr, png_const_bytep chunk_name)
+png_handle_as_unknown(png_const_structrp png_ptr, png_const_bytep chunk_name)
 {
    /* Check chunk_name and return "keep" value if it's on the list, else 0 */
    png_const_bytep p, p_end;
 
-   if (png_ptr == NULL || chunk_name == NULL || png_ptr->num_chunk_list <= 0)
+   if (png_ptr == NULL || chunk_name == NULL || png_ptr->num_chunk_list == 0)
       return PNG_HANDLE_CHUNK_AS_DEFAULT;
 
    p_end = png_ptr->chunk_list;
    p = p_end + png_ptr->num_chunk_list*5; /* beyond end */
 
    /* The code is the fifth byte after each four byte string.  Historically this
-    * code was always searched from the end of the list, so it should continue
-    * to do so in case there are duplicated entries.
+    * code was always searched from the end of the list, this is no longer
+    * necessary because the 'set' routine handles duplicate entries correcty.
     */
    do /* num_chunk_list > 0, so at least one */
    {
       p -= 5;
-      if (!png_memcmp(chunk_name, p, 4))
+
+      if (memcmp(chunk_name, p, 4) == 0)
          return p[4];
    }
    while (p > p_end);
 
+   /* This means that known chunks should be processed and unknown chunks should
+    * be handled according to the value of png_ptr->unknown_default; this can be
+    * confusing because, as a result, there are two levels of defaulting for
+    * unknown chunks.
+    */
    return PNG_HANDLE_CHUNK_AS_DEFAULT;
 }
 
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) ||\
+   defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
 int /* PRIVATE */
-png_chunk_unknown_handling(png_structp png_ptr, png_uint_32 chunk_name)
+png_chunk_unknown_handling(png_const_structrp png_ptr, png_uint_32 chunk_name)
 {
    png_byte chunk_string[5];
 
    PNG_CSTRING_FROM_CHUNK(chunk_string, chunk_name);
    return png_handle_as_unknown(png_ptr, chunk_string);
 }
-#endif
+#endif /* READ_UNKNOWN_CHUNKS || HANDLE_AS_UNKNOWN */
+#endif /* SET_UNKNOWN_CHUNKS */
 
 #ifdef PNG_READ_SUPPORTED
 /* This function, added to libpng-1.0.6g, is untested. */
 int PNGAPI
-png_reset_zstream(png_structp png_ptr)
+png_reset_zstream(png_structrp png_ptr)
 {
    if (png_ptr == NULL)
       return Z_STREAM_ERROR;
 
+   /* WARNING: this resets the window bits to the maximum! */
    return (inflateReset(&png_ptr->zstream));
 }
-#endif /* PNG_READ_SUPPORTED */
+#endif /* READ */
 
 /* This function was added to libpng-1.0.7 */
 png_uint_32 PNGAPI
@@ -767,126 +954,291 @@ png_access_version_number(void)
    return((png_uint_32)PNG_LIBPNG_VER);
 }
 
+#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
+/* Ensure that png_ptr->zstream.msg holds some appropriate error message string.
+ * If it doesn't 'ret' is used to set it to something appropriate, even in cases
+ * like Z_OK or Z_STREAM_END where the error code is apparently a success code.
+ */
+void /* PRIVATE */
+png_zstream_error(png_structrp png_ptr, int ret)
+{
+   /* Translate 'ret' into an appropriate error string, priority is given to the
+    * one in zstream if set.  This always returns a string, even in cases like
+    * Z_OK or Z_STREAM_END where the error code is a success code.
+    */
+   if (png_ptr->zstream.msg == NULL) switch (ret)
+   {
+      default:
+      case Z_OK:
+         png_ptr->zstream.msg = PNGZ_MSG_CAST("unexpected zlib return code");
+         break;
+
+      case Z_STREAM_END:
+         /* Normal exit */
+         png_ptr->zstream.msg = PNGZ_MSG_CAST("unexpected end of LZ stream");
+         break;
 
+      case Z_NEED_DICT:
+         /* This means the deflate stream did not have a dictionary; this
+          * indicates a bogus PNG.
+          */
+         png_ptr->zstream.msg = PNGZ_MSG_CAST("missing LZ dictionary");
+         break;
+
+      case Z_ERRNO:
+         /* gz APIs only: should not happen */
+         png_ptr->zstream.msg = PNGZ_MSG_CAST("zlib IO error");
+         break;
+
+      case Z_STREAM_ERROR:
+         /* internal libpng error */
+         png_ptr->zstream.msg = PNGZ_MSG_CAST("bad parameters to zlib");
+         break;
+
+      case Z_DATA_ERROR:
+         png_ptr->zstream.msg = PNGZ_MSG_CAST("damaged LZ stream");
+         break;
+
+      case Z_MEM_ERROR:
+         png_ptr->zstream.msg = PNGZ_MSG_CAST("insufficient memory");
+         break;
+
+      case Z_BUF_ERROR:
+         /* End of input or output; not a problem if the caller is doing
+          * incremental read or write.
+          */
+         png_ptr->zstream.msg = PNGZ_MSG_CAST("truncated");
+         break;
+
+      case Z_VERSION_ERROR:
+         png_ptr->zstream.msg = PNGZ_MSG_CAST("unsupported zlib version");
+         break;
+
+      case PNG_UNEXPECTED_ZLIB_RETURN:
+         /* Compile errors here mean that zlib now uses the value co-opted in
+          * pngpriv.h for PNG_UNEXPECTED_ZLIB_RETURN; update the switch above
+          * and change pngpriv.h.  Note that this message is "... return",
+          * whereas the default/Z_OK one is "... return code".
+          */
+         png_ptr->zstream.msg = PNGZ_MSG_CAST("unexpected zlib return");
+         break;
+   }
+}
 
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
 /* png_convert_size: a PNGAPI but no longer in png.h, so deleted
  * at libpng 1.5.5!
  */
 
 /* Added at libpng version 1.2.34 and 1.4.0 (moved from pngset.c) */
-#  ifdef PNG_CHECK_cHRM_SUPPORTED
-
-int /* PRIVATE */
-png_check_cHRM_fixed(png_structp png_ptr,
-   png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,
-   png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,
-   png_fixed_point blue_x, png_fixed_point blue_y)
+#ifdef PNG_GAMMA_SUPPORTED /* always set if COLORSPACE */
+static int
+png_colorspace_check_gamma(png_const_structrp png_ptr,
+   png_colorspacerp colorspace, png_fixed_point gAMA, int from)
+   /* This is called to check a new gamma value against an existing one.  The
+    * routine returns false if the new gamma value should not be written.
+    *
+    * 'from' says where the new gamma value comes from:
+    *
+    *    0: the new gamma value is the libpng estimate for an ICC profile
+    *    1: the new gamma value comes from a gAMA chunk
+    *    2: the new gamma value comes from an sRGB chunk
+    */
 {
-   int ret = 1;
-   unsigned long xy_hi,xy_lo,yx_hi,yx_lo;
+   png_fixed_point gtest;
 
-   png_debug(1, "in function png_check_cHRM_fixed");
+   if ((colorspace->flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
+      (png_muldiv(&gtest, colorspace->gamma, PNG_FP_1, gAMA) == 0  ||
+      png_gamma_significant(gtest) != 0))
+   {
+      /* Either this is an sRGB image, in which case the calculated gamma
+       * approximation should match, or this is an image with a profile and the
+       * value libpng calculates for the gamma of the profile does not match the
+       * value recorded in the file.  The former, sRGB, case is an error, the
+       * latter is just a warning.
+       */
+      if ((colorspace->flags & PNG_COLORSPACE_FROM_sRGB) != 0 || from == 2)
+      {
+         png_chunk_report(png_ptr, "gamma value does not match sRGB",
+            PNG_CHUNK_ERROR);
+         /* Do not overwrite an sRGB value */
+         return from == 2;
+      }
 
-   if (png_ptr == NULL)
-      return 0;
+      else /* sRGB tag not involved */
+      {
+         png_chunk_report(png_ptr, "gamma value does not match libpng estimate",
+            PNG_CHUNK_WARNING);
+         return from == 1;
+      }
+   }
 
-   /* (x,y,z) values are first limited to 0..100000 (PNG_FP_1), the white
-    * y must also be greater than 0.  To test for the upper limit calculate
-    * (PNG_FP_1-y) - x must be <= to this for z to be >= 0 (and the expression
-    * cannot overflow.)  At this point we know x and y are >= 0 and (x+y) is
-    * <= PNG_FP_1.  The previous test on PNG_MAX_UINT_31 is removed because it
-    * pointless (and it produces compiler warnings!)
+   return 1;
+}
+
+void /* PRIVATE */
+png_colorspace_set_gamma(png_const_structrp png_ptr,
+   png_colorspacerp colorspace, png_fixed_point gAMA)
+{
+   /* Changed in libpng-1.5.4 to limit the values to ensure overflow can't
+    * occur.  Since the fixed point representation is asymetrical it is
+    * possible for 1/gamma to overflow the limit of 21474 and this means the
+    * gamma value must be at least 5/100000 and hence at most 20000.0.  For
+    * safety the limits here are a little narrower.  The values are 0.00016 to
+    * 6250.0, which are truly ridiculous gamma values (and will produce
+    * displays that are all black or all white.)
+    *
+    * In 1.6.0 this test replaces the ones in pngrutil.c, in the gAMA chunk
+    * handling code, which only required the value to be >0.
     */
-   if (white_x < 0 || white_y <= 0 ||
-         red_x < 0 ||   red_y <  0 ||
-       green_x < 0 || green_y <  0 ||
-        blue_x < 0 ||  blue_y <  0)
-   {
-      png_warning(png_ptr,
-        "Ignoring attempt to set negative chromaticity value");
-      ret = 0;
-   }
-   /* And (x+y) must be <= PNG_FP_1 (so z is >= 0) */
-   if (white_x > PNG_FP_1 - white_y)
-   {
-      png_warning(png_ptr, "Invalid cHRM white point");
-      ret = 0;
-   }
+   png_const_charp errmsg;
+
+   if (gAMA < 16 || gAMA > 625000000)
+      errmsg = "gamma value out of range";
+
+#  ifdef PNG_READ_gAMA_SUPPORTED
+   /* Allow the application to set the gamma value more than once */
+   else if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
+      (colorspace->flags & PNG_COLORSPACE_FROM_gAMA) != 0)
+      errmsg = "duplicate";
+#  endif
 
-   if (red_x > PNG_FP_1 - red_y)
+   /* Do nothing if the colorspace is already invalid */
+   else if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
+      return;
+
+   else
    {
-      png_warning(png_ptr, "Invalid cHRM red point");
-      ret = 0;
+      if (png_colorspace_check_gamma(png_ptr, colorspace, gAMA,
+          1/*from gAMA*/) != 0)
+      {
+         /* Store this gamma value. */
+         colorspace->gamma = gAMA;
+         colorspace->flags |=
+            (PNG_COLORSPACE_HAVE_GAMMA | PNG_COLORSPACE_FROM_gAMA);
+      }
+
+      /* At present if the check_gamma test fails the gamma of the colorspace is
+       * not updated however the colorspace is not invalidated.  This
+       * corresponds to the case where the existing gamma comes from an sRGB
+       * chunk or profile.  An error message has already been output.
+       */
+      return;
    }
 
-   if (green_x > PNG_FP_1 - green_y)
+   /* Error exit - errmsg has been set. */
+   colorspace->flags |= PNG_COLORSPACE_INVALID;
+   png_chunk_report(png_ptr, errmsg, PNG_CHUNK_WRITE_ERROR);
+}
+
+void /* PRIVATE */
+png_colorspace_sync_info(png_const_structrp png_ptr, png_inforp info_ptr)
+{
+   if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
    {
-      png_warning(png_ptr, "Invalid cHRM green point");
-      ret = 0;
+      /* Everything is invalid */
+      info_ptr->valid &= ~(PNG_INFO_gAMA|PNG_INFO_cHRM|PNG_INFO_sRGB|
+         PNG_INFO_iCCP);
+
+#     ifdef PNG_COLORSPACE_SUPPORTED
+      /* Clean up the iCCP profile now if it won't be used. */
+      png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, -1/*not used*/);
+#     else
+      PNG_UNUSED(png_ptr)
+#     endif
    }
 
-   if (blue_x > PNG_FP_1 - blue_y)
+   else
    {
-      png_warning(png_ptr, "Invalid cHRM blue point");
-      ret = 0;
-   }
+#     ifdef PNG_COLORSPACE_SUPPORTED
+      /* Leave the INFO_iCCP flag set if the pngset.c code has already set
+       * it; this allows a PNG to contain a profile which matches sRGB and
+       * yet still have that profile retrievable by the application.
+       */
+      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_MATCHES_sRGB) != 0)
+         info_ptr->valid |= PNG_INFO_sRGB;
+
+      else
+         info_ptr->valid &= ~PNG_INFO_sRGB;
 
-   png_64bit_product(green_x - red_x, blue_y - red_y, &xy_hi, &xy_lo);
-   png_64bit_product(green_y - red_y, blue_x - red_x, &yx_hi, &yx_lo);
+      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
+         info_ptr->valid |= PNG_INFO_cHRM;
 
-   if (xy_hi == yx_hi && xy_lo == yx_lo)
-   {
-      png_warning(png_ptr,
-         "Ignoring attempt to set cHRM RGB triangle with zero area");
-      ret = 0;
+      else
+         info_ptr->valid &= ~PNG_INFO_cHRM;
+#     endif
+
+      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0)
+         info_ptr->valid |= PNG_INFO_gAMA;
+
+      else
+         info_ptr->valid &= ~PNG_INFO_gAMA;
    }
+}
 
-   return ret;
+#ifdef PNG_READ_SUPPORTED
+void /* PRIVATE */
+png_colorspace_sync(png_const_structrp png_ptr, png_inforp info_ptr)
+{
+   if (info_ptr == NULL) /* reduce code size; check here not in the caller */
+      return;
+
+   info_ptr->colorspace = png_ptr->colorspace;
+   png_colorspace_sync_info(png_ptr, info_ptr);
 }
-#  endif /* PNG_CHECK_cHRM_SUPPORTED */
+#endif
+#endif /* GAMMA */
 
-#ifdef PNG_cHRM_SUPPORTED
+#ifdef PNG_COLORSPACE_SUPPORTED
 /* Added at libpng-1.5.5 to support read and write of true CIEXYZ values for
  * cHRM, as opposed to using chromaticities.  These internal APIs return
  * non-zero on a parameter error.  The X, Y and Z values are required to be
  * positive and less than 1.0.
  */
-int png_xy_from_XYZ(png_xy *xy, png_XYZ XYZ)
+static int
+png_xy_from_XYZ(png_xy *xy, const png_XYZ *XYZ)
 {
    png_int_32 d, dwhite, whiteX, whiteY;
 
-   d = XYZ.redX + XYZ.redY + XYZ.redZ;
-   if (!png_muldiv(&xy->redx, XYZ.redX, PNG_FP_1, d)) return 1;
-   if (!png_muldiv(&xy->redy, XYZ.redY, PNG_FP_1, d)) return 1;
+   d = XYZ->red_X + XYZ->red_Y + XYZ->red_Z;
+   if (png_muldiv(&xy->redx, XYZ->red_X, PNG_FP_1, d) == 0)
+      return 1;
+   if (png_muldiv(&xy->redy, XYZ->red_Y, PNG_FP_1, d) == 0)
+      return 1;
    dwhite = d;
-   whiteX = XYZ.redX;
-   whiteY = XYZ.redY;
+   whiteX = XYZ->red_X;
+   whiteY = XYZ->red_Y;
 
-   d = XYZ.greenX + XYZ.greenY + XYZ.greenZ;
-   if (!png_muldiv(&xy->greenx, XYZ.greenX, PNG_FP_1, d)) return 1;
-   if (!png_muldiv(&xy->greeny, XYZ.greenY, PNG_FP_1, d)) return 1;
+   d = XYZ->green_X + XYZ->green_Y + XYZ->green_Z;
+   if (png_muldiv(&xy->greenx, XYZ->green_X, PNG_FP_1, d) == 0)
+      return 1;
+   if (png_muldiv(&xy->greeny, XYZ->green_Y, PNG_FP_1, d) == 0)
+      return 1;
    dwhite += d;
-   whiteX += XYZ.greenX;
-   whiteY += XYZ.greenY;
+   whiteX += XYZ->green_X;
+   whiteY += XYZ->green_Y;
 
-   d = XYZ.blueX + XYZ.blueY + XYZ.blueZ;
-   if (!png_muldiv(&xy->bluex, XYZ.blueX, PNG_FP_1, d)) return 1;
-   if (!png_muldiv(&xy->bluey, XYZ.blueY, PNG_FP_1, d)) return 1;
+   d = XYZ->blue_X + XYZ->blue_Y + XYZ->blue_Z;
+   if (png_muldiv(&xy->bluex, XYZ->blue_X, PNG_FP_1, d) == 0)
+      return 1;
+   if (png_muldiv(&xy->bluey, XYZ->blue_Y, PNG_FP_1, d) == 0)
+      return 1;
    dwhite += d;
-   whiteX += XYZ.blueX;
-   whiteY += XYZ.blueY;
+   whiteX += XYZ->blue_X;
+   whiteY += XYZ->blue_Y;
 
-   /* The reference white is simply the same of the end-point (X,Y,Z) vectors,
+   /* The reference white is simply the sum of the end-point (X,Y,Z) vectors,
     * thus:
     */
-   if (!png_muldiv(&xy->whitex, whiteX, PNG_FP_1, dwhite)) return 1;
-   if (!png_muldiv(&xy->whitey, whiteY, PNG_FP_1, dwhite)) return 1;
+   if (png_muldiv(&xy->whitex, whiteX, PNG_FP_1, dwhite) == 0)
+      return 1;
+   if (png_muldiv(&xy->whitey, whiteY, PNG_FP_1, dwhite) == 0)
+      return 1;
 
    return 0;
 }
 
-int png_XYZ_from_xy(png_XYZ *XYZ, png_xy xy)
+static int
+png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy)
 {
    png_fixed_point red_inverse, green_inverse, blue_scale;
    png_fixed_point left, right, denominator;
@@ -894,16 +1246,16 @@ int png_XYZ_from_xy(png_XYZ *XYZ, png_xy xy)
    /* Check xy and, implicitly, z.  Note that wide gamut color spaces typically
     * have end points with 0 tristimulus values (these are impossible end
     * points, but they are used to cover the possible colors).  We check
-    * xy.whitey against 5, not 0, to avoid a possible integer overflow.
+    * xy->whitey against 5, not 0, to avoid a possible integer overflow.
     */
-   if (xy.redx < 0 || xy.redx > PNG_FP_1) return 1;
-   if (xy.redy < 0 || xy.redy > PNG_FP_1-xy.redx) return 1;
-   if (xy.greenx < 0 || xy.greenx > PNG_FP_1) return 1;
-   if (xy.greeny < 0 || xy.greeny > PNG_FP_1-xy.greenx) return 1;
-   if (xy.bluex < 0 || xy.bluex > PNG_FP_1) return 1;
-   if (xy.bluey < 0 || xy.bluey > PNG_FP_1-xy.bluex) return 1;
-   if (xy.whitex < 0 || xy.whitex > PNG_FP_1) return 1;
-   if (xy.whitey < 5 || xy.whitey > PNG_FP_1-xy.whitex) return 1;
+   if (xy->redx   < 0 || xy->redx > PNG_FP_1) return 1;
+   if (xy->redy   < 0 || xy->redy > PNG_FP_1-xy->redx) return 1;
+   if (xy->greenx < 0 || xy->greenx > PNG_FP_1) return 1;
+   if (xy->greeny < 0 || xy->greeny > PNG_FP_1-xy->greenx) return 1;
+   if (xy->bluex  < 0 || xy->bluex > PNG_FP_1) return 1;
+   if (xy->bluey  < 0 || xy->bluey > PNG_FP_1-xy->bluex) return 1;
+   if (xy->whitex < 0 || xy->whitex > PNG_FP_1) return 1;
+   if (xy->whitey < 5 || xy->whitey > PNG_FP_1-xy->whitex) return 1;
 
    /* The reverse calculation is more difficult because the original tristimulus
     * value had 9 independent values (red,green,blue)x(X,Y,Z) however only 8
@@ -978,7 +1330,7 @@ int png_XYZ_from_xy(png_XYZ *XYZ, png_xy xy)
     * (1/white-y), so we can immediately see that as white-y approaches 0 the
     * accuracy inherent in the cHRM chunk drops off substantially.
     *
-    * libpng arithmetic: a simple invertion of the above equations
+    * libpng arithmetic: a simple inversion of the above equations
     * ------------------------------------------------------------
     *
     *    white_scale = 1/white-y
@@ -1084,88 +1436,1034 @@ int png_XYZ_from_xy(png_XYZ *XYZ, png_xy xy)
    /* By the argument, above overflow should be impossible here. The return
     * value of 2 indicates an internal error to the caller.
     */
-   if (!png_muldiv(&left, xy.greenx-xy.bluex, xy.redy - xy.bluey, 7)) return 2;
-   if (!png_muldiv(&right, xy.greeny-xy.bluey, xy.redx - xy.bluex, 7)) return 2;
+   if (png_muldiv(&left, xy->greenx-xy->bluex, xy->redy - xy->bluey, 7) == 0)
+      return 2;
+   if (png_muldiv(&right, xy->greeny-xy->bluey, xy->redx - xy->bluex, 7) == 0)
+      return 2;
    denominator = left - right;
 
    /* Now find the red numerator. */
-   if (!png_muldiv(&left, xy.greenx-xy.bluex, xy.whitey-xy.bluey, 7)) return 2;
-   if (!png_muldiv(&right, xy.greeny-xy.bluey, xy.whitex-xy.bluex, 7)) return 2;
+   if (png_muldiv(&left, xy->greenx-xy->bluex, xy->whitey-xy->bluey, 7) == 0)
+      return 2;
+   if (png_muldiv(&right, xy->greeny-xy->bluey, xy->whitex-xy->bluex, 7) == 0)
+      return 2;
 
    /* Overflow is possible here and it indicates an extreme set of PNG cHRM
     * chunk values.  This calculation actually returns the reciprocal of the
     * scale value because this allows us to delay the multiplication of white-y
     * into the denominator, which tends to produce a small number.
     */
-   if (!png_muldiv(&red_inverse, xy.whitey, denominator, left-right) ||
-       red_inverse <= xy.whitey /* r+g+b scales = white scale */)
+   if (png_muldiv(&red_inverse, xy->whitey, denominator, left-right) == 0 ||
+       red_inverse <= xy->whitey /* r+g+b scales = white scale */)
       return 1;
 
    /* Similarly for green_inverse: */
-   if (!png_muldiv(&left, xy.redy-xy.bluey, xy.whitex-xy.bluex, 7)) return 2;
-   if (!png_muldiv(&right, xy.redx-xy.bluex, xy.whitey-xy.bluey, 7)) return 2;
-   if (!png_muldiv(&green_inverse, xy.whitey, denominator, left-right) ||
-       green_inverse <= xy.whitey)
+   if (png_muldiv(&left, xy->redy-xy->bluey, xy->whitex-xy->bluex, 7) == 0)
+      return 2;
+   if (png_muldiv(&right, xy->redx-xy->bluex, xy->whitey-xy->bluey, 7) == 0)
+      return 2;
+   if (png_muldiv(&green_inverse, xy->whitey, denominator, left-right) == 0 ||
+       green_inverse <= xy->whitey)
       return 1;
 
    /* And the blue scale, the checks above guarantee this can't overflow but it
     * can still produce 0 for extreme cHRM values.
     */
-   blue_scale = png_reciprocal(xy.whitey) - png_reciprocal(red_inverse) -
-      png_reciprocal(green_inverse);
-   if (blue_scale <= 0) return 1;
+   blue_scale = png_reciprocal(xy->whitey) - png_reciprocal(red_inverse) -
+       png_reciprocal(green_inverse);
+   if (blue_scale <= 0)
+      return 1;
 
 
    /* And fill in the png_XYZ: */
-   if (!png_muldiv(&XYZ->redX, xy.redx, PNG_FP_1, red_inverse)) return 1;
-   if (!png_muldiv(&XYZ->redY, xy.redy, PNG_FP_1, red_inverse)) return 1;
-   if (!png_muldiv(&XYZ->redZ, PNG_FP_1 - xy.redx - xy.redy, PNG_FP_1,
-      red_inverse))
+   if (png_muldiv(&XYZ->red_X, xy->redx, PNG_FP_1, red_inverse) == 0)
+      return 1;
+   if (png_muldiv(&XYZ->red_Y, xy->redy, PNG_FP_1, red_inverse) == 0)
+      return 1;
+   if (png_muldiv(&XYZ->red_Z, PNG_FP_1 - xy->redx - xy->redy, PNG_FP_1,
+       red_inverse) == 0)
       return 1;
 
-   if (!png_muldiv(&XYZ->greenX, xy.greenx, PNG_FP_1, green_inverse)) return 1;
-   if (!png_muldiv(&XYZ->greenY, xy.greeny, PNG_FP_1, green_inverse)) return 1;
-   if (!png_muldiv(&XYZ->greenZ, PNG_FP_1 - xy.greenx - xy.greeny, PNG_FP_1,
-      green_inverse))
+   if (png_muldiv(&XYZ->green_X, xy->greenx, PNG_FP_1, green_inverse) == 0)
+      return 1;
+   if (png_muldiv(&XYZ->green_Y, xy->greeny, PNG_FP_1, green_inverse) == 0)
+      return 1;
+   if (png_muldiv(&XYZ->green_Z, PNG_FP_1 - xy->greenx - xy->greeny, PNG_FP_1,
+       green_inverse) == 0)
       return 1;
 
-   if (!png_muldiv(&XYZ->blueX, xy.bluex, blue_scale, PNG_FP_1)) return 1;
-   if (!png_muldiv(&XYZ->blueY, xy.bluey, blue_scale, PNG_FP_1)) return 1;
-   if (!png_muldiv(&XYZ->blueZ, PNG_FP_1 - xy.bluex - xy.bluey, blue_scale,
-      PNG_FP_1))
+   if (png_muldiv(&XYZ->blue_X, xy->bluex, blue_scale, PNG_FP_1) == 0)
+      return 1;
+   if (png_muldiv(&XYZ->blue_Y, xy->bluey, blue_scale, PNG_FP_1) == 0)
+      return 1;
+   if (png_muldiv(&XYZ->blue_Z, PNG_FP_1 - xy->bluex - xy->bluey, blue_scale,
+       PNG_FP_1) == 0)
       return 1;
 
    return 0; /*success*/
 }
 
-int png_XYZ_from_xy_checked(png_structp png_ptr, png_XYZ *XYZ, png_xy xy)
+static int
+png_XYZ_normalize(png_XYZ *XYZ)
 {
-   switch (png_XYZ_from_xy(XYZ, xy))
+   png_int_32 Y;
+
+   if (XYZ->red_Y < 0 || XYZ->green_Y < 0 || XYZ->blue_Y < 0 ||
+      XYZ->red_X < 0 || XYZ->green_X < 0 || XYZ->blue_X < 0 ||
+      XYZ->red_Z < 0 || XYZ->green_Z < 0 || XYZ->blue_Z < 0)
+      return 1;
+
+   /* Normalize by scaling so the sum of the end-point Y values is PNG_FP_1.
+    * IMPLEMENTATION NOTE: ANSI requires signed overflow not to occur, therefore
+    * relying on addition of two positive values producing a negative one is not
+    * safe.
+    */
+   Y = XYZ->red_Y;
+   if (0x7fffffff - Y < XYZ->green_X)
+      return 1;
+   Y += XYZ->green_Y;
+   if (0x7fffffff - Y < XYZ->blue_X)
+      return 1;
+   Y += XYZ->blue_Y;
+
+   if (Y != PNG_FP_1)
    {
-      case 0: /* success */
+      if (png_muldiv(&XYZ->red_X, XYZ->red_X, PNG_FP_1, Y) == 0)
+         return 1;
+      if (png_muldiv(&XYZ->red_Y, XYZ->red_Y, PNG_FP_1, Y) == 0)
+         return 1;
+      if (png_muldiv(&XYZ->red_Z, XYZ->red_Z, PNG_FP_1, Y) == 0)
+         return 1;
+
+      if (png_muldiv(&XYZ->green_X, XYZ->green_X, PNG_FP_1, Y) == 0)
          return 1;
+      if (png_muldiv(&XYZ->green_Y, XYZ->green_Y, PNG_FP_1, Y) == 0)
+         return 1;
+      if (png_muldiv(&XYZ->green_Z, XYZ->green_Z, PNG_FP_1, Y) == 0)
+         return 1;
+
+      if (png_muldiv(&XYZ->blue_X, XYZ->blue_X, PNG_FP_1, Y) == 0)
+         return 1;
+      if (png_muldiv(&XYZ->blue_Y, XYZ->blue_Y, PNG_FP_1, Y) == 0)
+         return 1;
+      if (png_muldiv(&XYZ->blue_Z, XYZ->blue_Z, PNG_FP_1, Y) == 0)
+         return 1;
+   }
+
+   return 0;
+}
+
+static int
+png_colorspace_endpoints_match(const png_xy *xy1, const png_xy *xy2, int delta)
+{
+   /* Allow an error of +/-0.01 (absolute value) on each chromaticity */
+   if (PNG_OUT_OF_RANGE(xy1->whitex, xy2->whitex,delta) ||
+       PNG_OUT_OF_RANGE(xy1->whitey, xy2->whitey,delta) ||
+       PNG_OUT_OF_RANGE(xy1->redx,   xy2->redx,  delta) ||
+       PNG_OUT_OF_RANGE(xy1->redy,   xy2->redy,  delta) ||
+       PNG_OUT_OF_RANGE(xy1->greenx, xy2->greenx,delta) ||
+       PNG_OUT_OF_RANGE(xy1->greeny, xy2->greeny,delta) ||
+       PNG_OUT_OF_RANGE(xy1->bluex,  xy2->bluex, delta) ||
+       PNG_OUT_OF_RANGE(xy1->bluey,  xy2->bluey, delta))
+      return 0;
+   return 1;
+}
+
+/* Added in libpng-1.6.0, a different check for the validity of a set of cHRM
+ * chunk chromaticities.  Earlier checks used to simply look for the overflow
+ * condition (where the determinant of the matrix to solve for XYZ ends up zero
+ * because the chromaticity values are not all distinct.)  Despite this it is
+ * theoretically possible to produce chromaticities that are apparently valid
+ * but that rapidly degrade to invalid, potentially crashing, sets because of
+ * arithmetic inaccuracies when calculations are performed on them.  The new
+ * check is to round-trip xy -> XYZ -> xy and then check that the result is
+ * within a small percentage of the original.
+ */
+static int
+png_colorspace_check_xy(png_XYZ *XYZ, const png_xy *xy)
+{
+   int result;
+   png_xy xy_test;
+
+   /* As a side-effect this routine also returns the XYZ endpoints. */
+   result = png_XYZ_from_xy(XYZ, xy);
+   if (result != 0)
+      return result;
+
+   result = png_xy_from_XYZ(&xy_test, XYZ);
+   if (result != 0)
+      return result;
+
+   if (png_colorspace_endpoints_match(xy, &xy_test,
+       5/*actually, the math is pretty accurate*/) != 0)
+      return 0;
+
+   /* Too much slip */
+   return 1;
+}
+
+/* This is the check going the other way.  The XYZ is modified to normalize it
+ * (another side-effect) and the xy chromaticities are returned.
+ */
+static int
+png_colorspace_check_XYZ(png_xy *xy, png_XYZ *XYZ)
+{
+   int result;
+   png_XYZ XYZtemp;
+
+   result = png_XYZ_normalize(XYZ);
+   if (result != 0)
+      return result;
+
+   result = png_xy_from_XYZ(xy, XYZ);
+   if (result != 0)
+      return result;
+
+   XYZtemp = *XYZ;
+   return png_colorspace_check_xy(&XYZtemp, xy);
+}
+
+/* Used to check for an endpoint match against sRGB */
+static const png_xy sRGB_xy = /* From ITU-R BT.709-3 */
+{
+   /* color      x       y */
+   /* red   */ 64000, 33000,
+   /* green */ 30000, 60000,
+   /* blue  */ 15000,  6000,
+   /* white */ 31270, 32900
+};
+
+static int
+png_colorspace_set_xy_and_XYZ(png_const_structrp png_ptr,
+   png_colorspacerp colorspace, const png_xy *xy, const png_XYZ *XYZ,
+   int preferred)
+{
+   if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
+      return 0;
+
+   /* The consistency check is performed on the chromaticities; this factors out
+    * variations because of the normalization (or not) of the end point Y
+    * values.
+    */
+   if (preferred < 2 &&
+       (colorspace->flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
+   {
+      /* The end points must be reasonably close to any we already have.  The
+       * following allows an error of up to +/-.001
+       */
+      if (png_colorspace_endpoints_match(xy, &colorspace->end_points_xy,
+          100) == 0)
+      {
+         colorspace->flags |= PNG_COLORSPACE_INVALID;
+         png_benign_error(png_ptr, "inconsistent chromaticities");
+         return 0; /* failed */
+      }
+
+      /* Only overwrite with preferred values */
+      if (preferred == 0)
+         return 1; /* ok, but no change */
+   }
+
+   colorspace->end_points_xy = *xy;
+   colorspace->end_points_XYZ = *XYZ;
+   colorspace->flags |= PNG_COLORSPACE_HAVE_ENDPOINTS;
+
+   /* The end points are normally quoted to two decimal digits, so allow +/-0.01
+    * on this test.
+    */
+   if (png_colorspace_endpoints_match(xy, &sRGB_xy, 1000) != 0)
+      colorspace->flags |= PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB;
+
+   else
+      colorspace->flags &= PNG_COLORSPACE_CANCEL(
+         PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB);
+
+   return 2; /* ok and changed */
+}
+
+int /* PRIVATE */
+png_colorspace_set_chromaticities(png_const_structrp png_ptr,
+   png_colorspacerp colorspace, const png_xy *xy, int preferred)
+{
+   /* We must check the end points to ensure they are reasonable - in the past
+    * color management systems have crashed as a result of getting bogus
+    * colorant values, while this isn't the fault of libpng it is the
+    * responsibility of libpng because PNG carries the bomb and libpng is in a
+    * position to protect against it.
+    */
+   png_XYZ XYZ;
+
+   switch (png_colorspace_check_xy(&XYZ, xy))
+   {
+      case 0: /* success */
+         return png_colorspace_set_xy_and_XYZ(png_ptr, colorspace, xy, &XYZ,
+            preferred);
 
       case 1:
-         /* The chunk may be technically valid, but we got png_fixed_point
-          * overflow while trying to get XYZ values out of it.  This is
-          * entirely benign - the cHRM chunk is pretty extreme.
+         /* We can't invert the chromaticities so we can't produce value XYZ
+          * values.  Likely as not a color management system will fail too.
           */
-         png_warning(png_ptr,
-            "extreme cHRM chunk cannot be converted to tristimulus values");
+         colorspace->flags |= PNG_COLORSPACE_INVALID;
+         png_benign_error(png_ptr, "invalid chromaticities");
          break;
 
       default:
          /* libpng is broken; this should be a warning but if it happens we
           * want error reports so for the moment it is an error.
           */
-         png_error(png_ptr, "internal error in png_XYZ_from_xy");
+         colorspace->flags |= PNG_COLORSPACE_INVALID;
+         png_error(png_ptr, "internal error checking chromaticities");
+   }
+
+   return 0; /* failed */
+}
+
+int /* PRIVATE */
+png_colorspace_set_endpoints(png_const_structrp png_ptr,
+   png_colorspacerp colorspace, const png_XYZ *XYZ_in, int preferred)
+{
+   png_XYZ XYZ = *XYZ_in;
+   png_xy xy;
+
+   switch (png_colorspace_check_XYZ(&xy, &XYZ))
+   {
+      case 0:
+         return png_colorspace_set_xy_and_XYZ(png_ptr, colorspace, &xy, &XYZ,
+            preferred);
+
+      case 1:
+         /* End points are invalid. */
+         colorspace->flags |= PNG_COLORSPACE_INVALID;
+         png_benign_error(png_ptr, "invalid end points");
          break;
+
+      default:
+         colorspace->flags |= PNG_COLORSPACE_INVALID;
+         png_error(png_ptr, "internal error checking chromaticities");
+   }
+
+   return 0; /* failed */
+}
+
+#if defined(PNG_sRGB_SUPPORTED) || defined(PNG_iCCP_SUPPORTED)
+/* Error message generation */
+static char
+png_icc_tag_char(png_uint_32 byte)
+{
+   byte &= 0xff;
+   if (byte >= 32 && byte <= 126)
+      return (char)byte;
+   else
+      return '?';
+}
+
+static void
+png_icc_tag_name(char *name, png_uint_32 tag)
+{
+   name[0] = '\'';
+   name[1] = png_icc_tag_char(tag >> 24);
+   name[2] = png_icc_tag_char(tag >> 16);
+   name[3] = png_icc_tag_char(tag >>  8);
+   name[4] = png_icc_tag_char(tag      );
+   name[5] = '\'';
+}
+
+static int
+is_ICC_signature_char(png_alloc_size_t it)
+{
+   return it == 32 || (it >= 48 && it <= 57) || (it >= 65 && it <= 90) ||
+      (it >= 97 && it <= 122);
+}
+
+static int
+is_ICC_signature(png_alloc_size_t it)
+{
+   return is_ICC_signature_char(it >> 24) /* checks all the top bits */ &&
+      is_ICC_signature_char((it >> 16) & 0xff) &&
+      is_ICC_signature_char((it >> 8) & 0xff) &&
+      is_ICC_signature_char(it & 0xff);
+}
+
+static int
+png_icc_profile_error(png_const_structrp png_ptr, png_colorspacerp colorspace,
+   png_const_charp name, png_alloc_size_t value, png_const_charp reason)
+{
+   size_t pos;
+   char message[196]; /* see below for calculation */
+
+   if (colorspace != NULL)
+      colorspace->flags |= PNG_COLORSPACE_INVALID;
+
+   pos = png_safecat(message, (sizeof message), 0, "profile '"); /* 9 chars */
+   pos = png_safecat(message, pos+79, pos, name); /* Truncate to 79 chars */
+   pos = png_safecat(message, (sizeof message), pos, "': "); /* +2 = 90 */
+   if (is_ICC_signature(value) != 0)
+   {
+      /* So 'value' is at most 4 bytes and the following cast is safe */
+      png_icc_tag_name(message+pos, (png_uint_32)value);
+      pos += 6; /* total +8; less than the else clause */
+      message[pos++] = ':';
+      message[pos++] = ' ';
    }
+#  ifdef PNG_WARNINGS_SUPPORTED
+   else
+      {
+         char number[PNG_NUMBER_BUFFER_SIZE]; /* +24 = 114*/
+
+         pos = png_safecat(message, (sizeof message), pos,
+            png_format_number(number, number+(sizeof number),
+               PNG_NUMBER_FORMAT_x, value));
+         pos = png_safecat(message, (sizeof message), pos, "h: "); /*+2 = 116*/
+      }
+#  endif
+   /* The 'reason' is an arbitrary message, allow +79 maximum 195 */
+   pos = png_safecat(message, (sizeof message), pos, reason);
+   PNG_UNUSED(pos)
+
+   /* This is recoverable, but make it unconditionally an app_error on write to
+    * avoid writing invalid ICC profiles into PNG files (i.e., we handle them
+    * on read, with a warning, but on write unless the app turns off
+    * application errors the PNG won't be written.)
+    */
+   png_chunk_report(png_ptr, message,
+      (colorspace != NULL) ? PNG_CHUNK_ERROR : PNG_CHUNK_WRITE_ERROR);
 
-   /* ERROR RETURN */
    return 0;
 }
+#endif /* sRGB || iCCP */
+
+#ifdef PNG_sRGB_SUPPORTED
+int /* PRIVATE */
+png_colorspace_set_sRGB(png_const_structrp png_ptr, png_colorspacerp colorspace,
+   int intent)
+{
+   /* sRGB sets known gamma, end points and (from the chunk) intent. */
+   /* IMPORTANT: these are not necessarily the values found in an ICC profile
+    * because ICC profiles store values adapted to a D50 environment; it is
+    * expected that the ICC profile mediaWhitePointTag will be D50; see the
+    * checks and code elsewhere to understand this better.
+    *
+    * These XYZ values, which are accurate to 5dp, produce rgb to gray
+    * coefficients of (6968,23435,2366), which are reduced (because they add up
+    * to 32769 not 32768) to (6968,23434,2366).  These are the values that
+    * libpng has traditionally used (and are the best values given the 15bit
+    * algorithm used by the rgb to gray code.)
+    */
+   static const png_XYZ sRGB_XYZ = /* D65 XYZ (*not* the D50 adapted values!) */
+   {
+      /* color      X      Y      Z */
+      /* red   */ 41239, 21264,  1933,
+      /* green */ 35758, 71517, 11919,
+      /* blue  */ 18048,  7219, 95053
+   };
+
+   /* Do nothing if the colorspace is already invalidated. */
+   if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
+      return 0;
+
+   /* Check the intent, then check for existing settings.  It is valid for the
+    * PNG file to have cHRM or gAMA chunks along with sRGB, but the values must
+    * be consistent with the correct values.  If, however, this function is
+    * called below because an iCCP chunk matches sRGB then it is quite
+    * conceivable that an older app recorded incorrect gAMA and cHRM because of
+    * an incorrect calculation based on the values in the profile - this does
+    * *not* invalidate the profile (though it still produces an error, which can
+    * be ignored.)
+    */
+   if (intent < 0 || intent >= PNG_sRGB_INTENT_LAST)
+      return png_icc_profile_error(png_ptr, colorspace, "sRGB",
+         (unsigned)intent, "invalid sRGB rendering intent");
+
+   if ((colorspace->flags & PNG_COLORSPACE_HAVE_INTENT) != 0 &&
+      colorspace->rendering_intent != intent)
+      return png_icc_profile_error(png_ptr, colorspace, "sRGB",
+         (unsigned)intent, "inconsistent rendering intents");
+
+   if ((colorspace->flags & PNG_COLORSPACE_FROM_sRGB) != 0)
+   {
+      png_benign_error(png_ptr, "duplicate sRGB information ignored");
+      return 0;
+   }
+
+   /* If the standard sRGB cHRM chunk does not match the one from the PNG file
+    * warn but overwrite the value with the correct one.
+    */
+   if ((colorspace->flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0 &&
+      !png_colorspace_endpoints_match(&sRGB_xy, &colorspace->end_points_xy,
+         100))
+      png_chunk_report(png_ptr, "cHRM chunk does not match sRGB",
+         PNG_CHUNK_ERROR);
+
+   /* This check is just done for the error reporting - the routine always
+    * returns true when the 'from' argument corresponds to sRGB (2).
+    */
+   (void)png_colorspace_check_gamma(png_ptr, colorspace, PNG_GAMMA_sRGB_INVERSE,
+      2/*from sRGB*/);
+
+   /* intent: bugs in GCC force 'int' to be used as the parameter type. */
+   colorspace->rendering_intent = (png_uint_16)intent;
+   colorspace->flags |= PNG_COLORSPACE_HAVE_INTENT;
+
+   /* endpoints */
+   colorspace->end_points_xy = sRGB_xy;
+   colorspace->end_points_XYZ = sRGB_XYZ;
+   colorspace->flags |=
+      (PNG_COLORSPACE_HAVE_ENDPOINTS|PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB);
+
+   /* gamma */
+   colorspace->gamma = PNG_GAMMA_sRGB_INVERSE;
+   colorspace->flags |= PNG_COLORSPACE_HAVE_GAMMA;
+
+   /* Finally record that we have an sRGB profile */
+   colorspace->flags |=
+      (PNG_COLORSPACE_MATCHES_sRGB|PNG_COLORSPACE_FROM_sRGB);
+
+   return 1; /* set */
+}
+#endif /* sRGB */
+
+#ifdef PNG_iCCP_SUPPORTED
+/* Encoded value of D50 as an ICC XYZNumber.  From the ICC 2010 spec the value
+ * is XYZ(0.9642,1.0,0.8249), which scales to:
+ *
+ *    (63189.8112, 65536, 54060.6464)
+ */
+static const png_byte D50_nCIEXYZ[12] =
+   { 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d };
+
+int /* PRIVATE */
+png_icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace,
+   png_const_charp name, png_uint_32 profile_length)
+{
+   if (profile_length < 132)
+      return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
+         "too short");
+
+   return 1;
+}
+
+int /* PRIVATE */
+png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
+   png_const_charp name, png_uint_32 profile_length,
+   png_const_bytep profile/* first 132 bytes only */, int color_type)
+{
+   png_uint_32 temp;
+
+   /* Length check; this cannot be ignored in this code because profile_length
+    * is used later to check the tag table, so even if the profile seems over
+    * long profile_length from the caller must be correct.  The caller can fix
+    * this up on read or write by just passing in the profile header length.
+    */
+   temp = png_get_uint_32(profile);
+   if (temp != profile_length)
+      return png_icc_profile_error(png_ptr, colorspace, name, temp,
+         "length does not match profile");
+
+   temp = (png_uint_32) (*(profile+8));
+   if (temp > 3 && (profile_length & 3))
+      return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
+         "invalid length");
+
+   temp = png_get_uint_32(profile+128); /* tag count: 12 bytes/tag */
+   if (temp > 357913930 || /* (2^32-4-132)/12: maximum possible tag count */
+      profile_length < 132+12*temp) /* truncated tag table */
+      return png_icc_profile_error(png_ptr, colorspace, name, temp,
+         "tag count too large");
+
+   /* The 'intent' must be valid or we can't store it, ICC limits the intent to
+    * 16 bits.
+    */
+   temp = png_get_uint_32(profile+64);
+   if (temp >= 0xffff) /* The ICC limit */
+      return png_icc_profile_error(png_ptr, colorspace, name, temp,
+         "invalid rendering intent");
+
+   /* This is just a warning because the profile may be valid in future
+    * versions.
+    */
+   if (temp >= PNG_sRGB_INTENT_LAST)
+      (void)png_icc_profile_error(png_ptr, NULL, name, temp,
+         "intent outside defined range");
+
+   /* At this point the tag table can't be checked because it hasn't necessarily
+    * been loaded; however, various header fields can be checked.  These checks
+    * are for values permitted by the PNG spec in an ICC profile; the PNG spec
+    * restricts the profiles that can be passed in an iCCP chunk (they must be
+    * appropriate to processing PNG data!)
+    */
+
+   /* Data checks (could be skipped).  These checks must be independent of the
+    * version number; however, the version number doesn't accomodate changes in
+    * the header fields (just the known tags and the interpretation of the
+    * data.)
+    */
+   temp = png_get_uint_32(profile+36); /* signature 'ascp' */
+   if (temp != 0x61637370)
+      return png_icc_profile_error(png_ptr, colorspace, name, temp,
+         "invalid signature");
+
+   /* Currently the PCS illuminant/adopted white point (the computational
+    * white point) are required to be D50,
+    * however the profile contains a record of the illuminant so perhaps ICC
+    * expects to be able to change this in the future (despite the rationale in
+    * the introduction for using a fixed PCS adopted white.)  Consequently the
+    * following is just a warning.
+    */
+   if (memcmp(profile+68, D50_nCIEXYZ, 12) != 0)
+      (void)png_icc_profile_error(png_ptr, NULL, name, 0/*no tag value*/,
+         "PCS illuminant is not D50");
+
+   /* The PNG spec requires this:
+    * "If the iCCP chunk is present, the image samples conform to the colour
+    * space represented by the embedded ICC profile as defined by the
+    * International Color Consortium [ICC]. The colour space of the ICC profile
+    * shall be an RGB colour space for colour images (PNG colour types 2, 3, and
+    * 6), or a greyscale colour space for greyscale images (PNG colour types 0
+    * and 4)."
+    *
+    * This checking code ensures the embedded profile (on either read or write)
+    * conforms to the specification requirements.  Notice that an ICC 'gray'
+    * color-space profile contains the information to transform the monochrome
+    * data to XYZ or L*a*b (according to which PCS the profile uses) and this
+    * should be used in preference to the standard libpng K channel replication
+    * into R, G and B channels.
+    *
+    * Previously it was suggested that an RGB profile on grayscale data could be
+    * handled.  However it it is clear that using an RGB profile in this context
+    * must be an error - there is no specification of what it means.  Thus it is
+    * almost certainly more correct to ignore the profile.
+    */
+   temp = png_get_uint_32(profile+16); /* data colour space field */
+   switch (temp)
+   {
+      case 0x52474220: /* 'RGB ' */
+         if ((color_type & PNG_COLOR_MASK_COLOR) == 0)
+            return png_icc_profile_error(png_ptr, colorspace, name, temp,
+               "RGB color space not permitted on grayscale PNG");
+         break;
+
+      case 0x47524159: /* 'GRAY' */
+         if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
+            return png_icc_profile_error(png_ptr, colorspace, name, temp,
+               "Gray color space not permitted on RGB PNG");
+         break;
+
+      default:
+         return png_icc_profile_error(png_ptr, colorspace, name, temp,
+            "invalid ICC profile color space");
+   }
+
+   /* It is up to the application to check that the profile class matches the
+    * application requirements; the spec provides no guidance, but it's pretty
+    * weird if the profile is not scanner ('scnr'), monitor ('mntr'), printer
+    * ('prtr') or 'spac' (for generic color spaces).  Issue a warning in these
+    * cases.  Issue an error for device link or abstract profiles - these don't
+    * contain the records necessary to transform the color-space to anything
+    * other than the target device (and not even that for an abstract profile).
+    * Profiles of these classes may not be embedded in images.
+    */
+   temp = png_get_uint_32(profile+12); /* profile/device class */
+   switch (temp)
+   {
+      case 0x73636e72: /* 'scnr' */
+      case 0x6d6e7472: /* 'mntr' */
+      case 0x70727472: /* 'prtr' */
+      case 0x73706163: /* 'spac' */
+         /* All supported */
+         break;
+
+      case 0x61627374: /* 'abst' */
+         /* May not be embedded in an image */
+         return png_icc_profile_error(png_ptr, colorspace, name, temp,
+            "invalid embedded Abstract ICC profile");
+
+      case 0x6c696e6b: /* 'link' */
+         /* DeviceLink profiles cannot be interpreted in a non-device specific
+          * fashion, if an app uses the AToB0Tag in the profile the results are
+          * undefined unless the result is sent to the intended device,
+          * therefore a DeviceLink profile should not be found embedded in a
+          * PNG.
+          */
+         return png_icc_profile_error(png_ptr, colorspace, name, temp,
+            "unexpected DeviceLink ICC profile class");
+
+      case 0x6e6d636c: /* 'nmcl' */
+         /* A NamedColor profile is also device specific, however it doesn't
+          * contain an AToB0 tag that is open to misinterpretation.  Almost
+          * certainly it will fail the tests below.
+          */
+         (void)png_icc_profile_error(png_ptr, NULL, name, temp,
+            "unexpected NamedColor ICC profile class");
+         break;
+
+      default:
+         /* To allow for future enhancements to the profile accept unrecognized
+          * profile classes with a warning, these then hit the test below on the
+          * tag content to ensure they are backward compatible with one of the
+          * understood profiles.
+          */
+         (void)png_icc_profile_error(png_ptr, NULL, name, temp,
+            "unrecognized ICC profile class");
+         break;
+   }
+
+   /* For any profile other than a device link one the PCS must be encoded
+    * either in XYZ or Lab.
+    */
+   temp = png_get_uint_32(profile+20);
+   switch (temp)
+   {
+      case 0x58595a20: /* 'XYZ ' */
+      case 0x4c616220: /* 'Lab ' */
+         break;
+
+      default:
+         return png_icc_profile_error(png_ptr, colorspace, name, temp,
+            "unexpected ICC PCS encoding");
+   }
+
+   return 1;
+}
+
+int /* PRIVATE */
+png_icc_check_tag_table(png_const_structrp png_ptr, png_colorspacerp colorspace,
+   png_const_charp name, png_uint_32 profile_length,
+   png_const_bytep profile /* header plus whole tag table */)
+{
+   png_uint_32 tag_count = png_get_uint_32(profile+128);
+   png_uint_32 itag;
+   png_const_bytep tag = profile+132; /* The first tag */
+
+   /* First scan all the tags in the table and add bits to the icc_info value
+    * (temporarily in 'tags').
+    */
+   for (itag=0; itag < tag_count; ++itag, tag += 12)
+   {
+      png_uint_32 tag_id = png_get_uint_32(tag+0);
+      png_uint_32 tag_start = png_get_uint_32(tag+4); /* must be aligned */
+      png_uint_32 tag_length = png_get_uint_32(tag+8);/* not padded */
+
+      /* The ICC specification does not exclude zero length tags, therefore the
+       * start might actually be anywhere if there is no data, but this would be
+       * a clear abuse of the intent of the standard so the start is checked for
+       * being in range.  All defined tag types have an 8 byte header - a 4 byte
+       * type signature then 0.
+       */
+      if ((tag_start & 3) != 0)
+      {
+         /* CNHP730S.icc shipped with Microsoft Windows 64 violates this, it is
+          * only a warning here because libpng does not care about the
+          * alignment.
+          */
+         (void)png_icc_profile_error(png_ptr, NULL, name, tag_id,
+            "ICC profile tag start not a multiple of 4");
+      }
+
+      /* This is a hard error; potentially it can cause read outside the
+       * profile.
+       */
+      if (tag_start > profile_length || tag_length > profile_length - tag_start)
+         return png_icc_profile_error(png_ptr, colorspace, name, tag_id,
+            "ICC profile tag outside profile");
+   }
+
+   return 1; /* success, maybe with warnings */
+}
+
+#ifdef PNG_sRGB_SUPPORTED
+#if PNG_sRGB_PROFILE_CHECKS >= 0
+/* Information about the known ICC sRGB profiles */
+static const struct
+{
+   png_uint_32 adler, crc, length;
+   png_uint_32 md5[4];
+   png_byte    have_md5;
+   png_byte    is_broken;
+   png_uint_16 intent;
+
+#  define PNG_MD5(a,b,c,d) { a, b, c, d }, (a!=0)||(b!=0)||(c!=0)||(d!=0)
+#  define PNG_ICC_CHECKSUM(adler, crc, md5, intent, broke, date, length, fname)\
+      { adler, crc, length, md5, broke, intent },
+
+} png_sRGB_checks[] =
+{
+   /* This data comes from contrib/tools/checksum-icc run on downloads of
+    * all four ICC sRGB profiles from www.color.org.
+    */
+   /* adler32, crc32, MD5[4], intent, date, length, file-name */
+   PNG_ICC_CHECKSUM(0x0a3fd9f6, 0x3b8772b9,
+      PNG_MD5(0x29f83dde, 0xaff255ae, 0x7842fae4, 0xca83390d), 0, 0,
+      "2009/03/27 21:36:31", 3048, "sRGB_IEC61966-2-1_black_scaled.icc")
+
+   /* ICC sRGB v2 perceptual no black-compensation: */
+   PNG_ICC_CHECKSUM(0x4909e5e1, 0x427ebb21,
+      PNG_MD5(0xc95bd637, 0xe95d8a3b, 0x0df38f99, 0xc1320389), 1, 0,
+      "2009/03/27 21:37:45", 3052, "sRGB_IEC61966-2-1_no_black_scaling.icc")
+
+   PNG_ICC_CHECKSUM(0xfd2144a1, 0x306fd8ae,
+      PNG_MD5(0xfc663378, 0x37e2886b, 0xfd72e983, 0x8228f1b8), 0, 0,
+      "2009/08/10 17:28:01", 60988, "sRGB_v4_ICC_preference_displayclass.icc")
+
+   /* ICC sRGB v4 perceptual */
+   PNG_ICC_CHECKSUM(0x209c35d2, 0xbbef7812,
+      PNG_MD5(0x34562abf, 0x994ccd06, 0x6d2c5721, 0xd0d68c5d), 0, 0,
+      "2007/07/25 00:05:37", 60960, "sRGB_v4_ICC_preference.icc")
+
+   /* The following profiles have no known MD5 checksum. If there is a match
+    * on the (empty) MD5 the other fields are used to attempt a match and
+    * a warning is produced.  The first two of these profiles have a 'cprt' tag
+    * which suggests that they were also made by Hewlett Packard.
+    */
+   PNG_ICC_CHECKSUM(0xa054d762, 0x5d5129ce,
+      PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 0,
+      "2004/07/21 18:57:42", 3024, "sRGB_IEC61966-2-1_noBPC.icc")
+
+   /* This is a 'mntr' (display) profile with a mediaWhitePointTag that does not
+    * match the D50 PCS illuminant in the header (it is in fact the D65 values,
+    * so the white point is recorded as the un-adapted value.)  The profiles
+    * below only differ in one byte - the intent - and are basically the same as
+    * the previous profile except for the mediaWhitePointTag error and a missing
+    * chromaticAdaptationTag.
+    */
+   PNG_ICC_CHECKSUM(0xf784f3fb, 0x182ea552,
+      PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 0, 1/*broken*/,
+      "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 perceptual")
+
+   PNG_ICC_CHECKSUM(0x0398f3fc, 0xf29e526d,
+      PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 1/*broken*/,
+      "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 media-relative")
+};
+
+static int
+png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr,
+   png_const_bytep profile, uLong adler)
+{
+   /* The quick check is to verify just the MD5 signature and trust the
+    * rest of the data.  Because the profile has already been verified for
+    * correctness this is safe.  png_colorspace_set_sRGB will check the 'intent'
+    * field too, so if the profile has been edited with an intent not defined
+    * by sRGB (but maybe defined by a later ICC specification) the read of
+    * the profile will fail at that point.
+    */
+
+   png_uint_32 length = 0;
+   png_uint_32 intent = 0x10000; /* invalid */
+#if PNG_sRGB_PROFILE_CHECKS > 1
+   uLong crc = 0; /* the value for 0 length data */
+#endif
+   unsigned int i;
+
+#ifdef PNG_SET_OPTION_SUPPORTED
+   /* First see if PNG_SKIP_sRGB_CHECK_PROFILE has been set to "on" */
+   if (((png_ptr->options >> PNG_SKIP_sRGB_CHECK_PROFILE) & 3) ==
+               PNG_OPTION_ON)
+      return 0;
+#endif
+
+   for (i=0; i < (sizeof png_sRGB_checks) / (sizeof png_sRGB_checks[0]); ++i)
+   {
+      if (png_get_uint_32(profile+84) == png_sRGB_checks[i].md5[0] &&
+         png_get_uint_32(profile+88) == png_sRGB_checks[i].md5[1] &&
+         png_get_uint_32(profile+92) == png_sRGB_checks[i].md5[2] &&
+         png_get_uint_32(profile+96) == png_sRGB_checks[i].md5[3])
+      {
+         /* This may be one of the old HP profiles without an MD5, in that
+          * case we can only use the length and Adler32 (note that these
+          * are not used by default if there is an MD5!)
+          */
+#        if PNG_sRGB_PROFILE_CHECKS == 0
+            if (png_sRGB_checks[i].have_md5 != 0)
+               return 1+png_sRGB_checks[i].is_broken;
+#        endif
+
+         /* Profile is unsigned or more checks have been configured in. */
+         if (length == 0)
+         {
+            length = png_get_uint_32(profile);
+            intent = png_get_uint_32(profile+64);
+         }
+
+         /* Length *and* intent must match */
+         if (length == (png_uint_32) png_sRGB_checks[i].length &&
+            intent == (png_uint_32) png_sRGB_checks[i].intent)
+         {
+            /* Now calculate the adler32 if not done already. */
+            if (adler == 0)
+            {
+               adler = adler32(0, NULL, 0);
+               adler = adler32(adler, profile, length);
+            }
+
+            if (adler == png_sRGB_checks[i].adler)
+            {
+               /* These basic checks suggest that the data has not been
+                * modified, but if the check level is more than 1 perform
+                * our own crc32 checksum on the data.
+                */
+#              if PNG_sRGB_PROFILE_CHECKS > 1
+                  if (crc == 0)
+                  {
+                     crc = crc32(0, NULL, 0);
+                     crc = crc32(crc, profile, length);
+                  }
+
+                  /* So this check must pass for the 'return' below to happen.
+                   */
+                  if (crc == png_sRGB_checks[i].crc)
+#              endif
+               {
+                  if (png_sRGB_checks[i].is_broken != 0)
+                  {
+                     /* These profiles are known to have bad data that may cause
+                      * problems if they are used, therefore attempt to
+                      * discourage their use, skip the 'have_md5' warning below,
+                      * which is made irrelevant by this error.
+                      */
+                     png_chunk_report(png_ptr, "known incorrect sRGB profile",
+                        PNG_CHUNK_ERROR);
+                  }
+
+                  /* Warn that this being done; this isn't even an error since
+                   * the profile is perfectly valid, but it would be nice if
+                   * people used the up-to-date ones.
+                   */
+                  else if (png_sRGB_checks[i].have_md5 == 0)
+                  {
+                     png_chunk_report(png_ptr,
+                        "out-of-date sRGB profile with no signature",
+                        PNG_CHUNK_WARNING);
+                  }
+
+                  return 1+png_sRGB_checks[i].is_broken;
+               }
+            }
+
+# if PNG_sRGB_PROFILE_CHECKS > 0
+         /* The signature matched, but the profile had been changed in some
+          * way.  This probably indicates a data error or uninformed hacking.
+          * Fall through to "no match".
+          */
+         png_chunk_report(png_ptr,
+             "Not recognizing known sRGB profile that has been edited",
+             PNG_CHUNK_WARNING);
+         break;
+# endif
+         }
+      }
+   }
+
+   return 0; /* no match */
+}
+#endif /* PNG_sRGB_PROFILE_CHECKS >= 0 */
+
+void /* PRIVATE */
+png_icc_set_sRGB(png_const_structrp png_ptr,
+   png_colorspacerp colorspace, png_const_bytep profile, uLong adler)
+{
+   /* Is this profile one of the known ICC sRGB profiles?  If it is, just set
+    * the sRGB information.
+    */
+#if PNG_sRGB_PROFILE_CHECKS >= 0
+   if (png_compare_ICC_profile_with_sRGB(png_ptr, profile, adler) != 0)
 #endif
+      (void)png_colorspace_set_sRGB(png_ptr, colorspace,
+         (int)/*already checked*/png_get_uint_32(profile+64));
+}
+#endif /* sRGB */
+
+int /* PRIVATE */
+png_colorspace_set_ICC(png_const_structrp png_ptr, png_colorspacerp colorspace,
+   png_const_charp name, png_uint_32 profile_length, png_const_bytep profile,
+   int color_type)
+{
+   if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
+      return 0;
+
+   if (png_icc_check_length(png_ptr, colorspace, name, profile_length) != 0 &&
+       png_icc_check_header(png_ptr, colorspace, name, profile_length, profile,
+          color_type) != 0 &&
+       png_icc_check_tag_table(png_ptr, colorspace, name, profile_length,
+          profile) != 0)
+   {
+#     ifdef PNG_sRGB_SUPPORTED
+         /* If no sRGB support, don't try storing sRGB information */
+         png_icc_set_sRGB(png_ptr, colorspace, profile, 0);
+#     endif
+      return 1;
+   }
+
+   /* Failure case */
+   return 0;
+}
+#endif /* iCCP */
+
+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+void /* PRIVATE */
+png_colorspace_set_rgb_coefficients(png_structrp png_ptr)
+{
+   /* Set the rgb_to_gray coefficients from the colorspace. */
+   if (png_ptr->rgb_to_gray_coefficients_set == 0 &&
+      (png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
+   {
+      /* png_set_background has not been called, get the coefficients from the Y
+       * values of the colorspace colorants.
+       */
+      png_fixed_point r = png_ptr->colorspace.end_points_XYZ.red_Y;
+      png_fixed_point g = png_ptr->colorspace.end_points_XYZ.green_Y;
+      png_fixed_point b = png_ptr->colorspace.end_points_XYZ.blue_Y;
+      png_fixed_point total = r+g+b;
+
+      if (total > 0 &&
+         r >= 0 && png_muldiv(&r, r, 32768, total) && r >= 0 && r <= 32768 &&
+         g >= 0 && png_muldiv(&g, g, 32768, total) && g >= 0 && g <= 32768 &&
+         b >= 0 && png_muldiv(&b, b, 32768, total) && b >= 0 && b <= 32768 &&
+         r+g+b <= 32769)
+      {
+         /* We allow 0 coefficients here.  r+g+b may be 32769 if two or
+          * all of the coefficients were rounded up.  Handle this by
+          * reducing the *largest* coefficient by 1; this matches the
+          * approach used for the default coefficients in pngrtran.c
+          */
+         int add = 0;
+
+         if (r+g+b > 32768)
+            add = -1;
+         else if (r+g+b < 32768)
+            add = 1;
+
+         if (add != 0)
+         {
+            if (g >= r && g >= b)
+               g += add;
+            else if (r >= g && r >= b)
+               r += add;
+            else
+               b += add;
+         }
+
+         /* Check for an internal error. */
+         if (r+g+b != 32768)
+            png_error(png_ptr,
+               "internal error handling cHRM coefficients");
+
+         else
+         {
+            png_ptr->rgb_to_gray_red_coeff   = (png_uint_16)r;
+            png_ptr->rgb_to_gray_green_coeff = (png_uint_16)g;
+         }
+      }
+
+      /* This is a png_error at present even though it could be ignored -
+       * it should never happen, but it is important that if it does, the
+       * bug is fixed.
+       */
+      else
+         png_error(png_ptr, "internal error handling cHRM->XYZ");
+   }
+}
+#endif /* READ_RGB_TO_GRAY */
+
+#endif /* COLORSPACE */
 
 #ifdef __GNUC__
 /* This exists solely to work round a warning from GNU C. */
@@ -1179,7 +2477,7 @@ png_gt(size_t a, size_t b)
 #endif
 
 void /* PRIVATE */
-png_check_IHDR(png_structp png_ptr,
+png_check_IHDR(png_const_structrp png_ptr,
    png_uint_32 width, png_uint_32 height, int bit_depth,
    int color_type, int interlace_type, int compression_type,
    int filter_type)
@@ -1192,18 +2490,19 @@ png_check_IHDR(png_structp png_ptr,
       png_warning(png_ptr, "Image width is zero in IHDR");
       error = 1;
    }
-   else if (width > PNG_UINT_31_MAX)
+
+   if (width > PNG_UINT_31_MAX)
    {
       png_warning(png_ptr, "Invalid image width in IHDR");
       error = 1;
    }
 
-   else if (png_gt(width,
-                   (PNG_SIZE_MAX >> 3) /* 8-byte RGBA pixels */
-                   - 48                /* big_row_buf hack */
-                   - 1                 /* filter byte */
-                   - 7*8               /* rounding width to multiple of 8 pix */
-                   - 8))               /* extra max_pixel_depth pad */
+   if (png_gt(((width + 7) & (~7)),
+       ((PNG_SIZE_MAX
+           - 48        /* big_row_buf hack */
+           - 1)        /* filter byte */
+           / 8)        /* 8-byte RGBA pixels */
+           - 1))       /* extra max_pixel_depth pad */
    {
       /* The size of the row must be within the limits of this architecture.
        * Because the read code can perform arbitrary transformations the
@@ -1219,17 +2518,15 @@ png_check_IHDR(png_structp png_ptr,
       png_warning(png_ptr, "Image width is too large for this architecture");
       error = 1;
    }
-   else
+
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   if (width > png_ptr->user_width_max)
+#else
+   if (width > PNG_USER_WIDTH_MAX)
+#endif
    {
-#     ifdef PNG_SET_USER_LIMITS_SUPPORTED
-      if (width > png_ptr->user_width_max)
-#     else
-      if (width > PNG_USER_WIDTH_MAX)
-#     endif
-      {
-         png_warning(png_ptr, "Image width exceeds user limit in IHDR");
-         error = 1;
-      }
+      png_warning(png_ptr, "Image width exceeds user limit in IHDR");
+      error = 1;
    }
 
    if (height == 0)
@@ -1237,22 +2534,21 @@ png_check_IHDR(png_structp png_ptr,
       png_warning(png_ptr, "Image height is zero in IHDR");
       error = 1;
    }
-   else if (height > PNG_UINT_31_MAX)
+
+   if (height > PNG_UINT_31_MAX)
    {
       png_warning(png_ptr, "Invalid image height in IHDR");
       error = 1;
    }
-   else
+
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   if (height > png_ptr->user_height_max)
+#else
+   if (height > PNG_USER_HEIGHT_MAX)
+#endif
    {
-#     ifdef PNG_SET_USER_LIMITS_SUPPORTED
-      if (height > png_ptr->user_height_max)
-#     else
-      if (height > PNG_USER_HEIGHT_MAX)
-#     endif
-      {
-         png_warning(png_ptr, "Image height exceeds user limit in IHDR");
-         error = 1;
-      }
+      png_warning(png_ptr, "Image height exceeds user limit in IHDR");
+      error = 1;
    }
 
    /* Check other values */
@@ -1291,7 +2587,7 @@ png_check_IHDR(png_structp png_ptr,
       error = 1;
    }
 
-#  ifdef PNG_MNG_FEATURES_SUPPORTED
+#ifdef PNG_MNG_FEATURES_SUPPORTED
    /* Accept filter_method 64 (intrapixel differencing) only if
     * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
     * 2. Libpng did not read a PNG signature (this filter_method is only
@@ -1301,13 +2597,13 @@ png_check_IHDR(png_structp png_ptr,
     * 4. The filter_method is 64 and
     * 5. The color_type is RGB or RGBA
     */
-   if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) &&
-       png_ptr->mng_features_permitted)
+   if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0 &&
+       png_ptr->mng_features_permitted != 0)
       png_warning(png_ptr, "MNG features are not allowed in a PNG datastream");
 
    if (filter_type != PNG_FILTER_TYPE_BASE)
    {
-      if (!((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+      if (!((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
           (filter_type == PNG_INTRAPIXEL_DIFFERENCING) &&
           ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) == 0) &&
           (color_type == PNG_COLOR_TYPE_RGB ||
@@ -1317,20 +2613,20 @@ png_check_IHDR(png_structp png_ptr,
          error = 1;
       }
 
-      if (png_ptr->mode & PNG_HAVE_PNG_SIGNATURE)
+      if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0)
       {
          png_warning(png_ptr, "Invalid filter method in IHDR");
          error = 1;
       }
    }
 
-#  else
+#else
    if (filter_type != PNG_FILTER_TYPE_BASE)
    {
       png_warning(png_ptr, "Unknown filter method in IHDR");
       error = 1;
    }
-#  endif
+#endif
 
    if (error == 1)
       png_error(png_ptr, "Invalid IHDR data");
@@ -1377,7 +2673,7 @@ png_check_fp_number(png_const_charp string, png_size_t size, int *statep,
       switch ((state & PNG_FP_STATE) + (type & PNG_FP_SAW_ANY))
       {
       case PNG_FP_INTEGER + PNG_FP_SAW_SIGN:
-         if (state & PNG_FP_SAW_ANY)
+         if ((state & PNG_FP_SAW_ANY) != 0)
             goto PNG_FP_End; /* not a part of the number */
 
          png_fp_add(state, type);
@@ -1385,10 +2681,10 @@ png_check_fp_number(png_const_charp string, png_size_t size, int *statep,
 
       case PNG_FP_INTEGER + PNG_FP_SAW_DOT:
          /* Ok as trailer, ok as lead of fraction. */
-         if (state & PNG_FP_SAW_DOT) /* two dots */
+         if ((state & PNG_FP_SAW_DOT) != 0) /* two dots */
             goto PNG_FP_End;
 
-         else if (state & PNG_FP_SAW_DIGIT) /* trailing dot? */
+         else if ((state & PNG_FP_SAW_DIGIT) != 0) /* trailing dot? */
             png_fp_add(state, type);
 
          else
@@ -1397,7 +2693,7 @@ png_check_fp_number(png_const_charp string, png_size_t size, int *statep,
          break;
 
       case PNG_FP_INTEGER + PNG_FP_SAW_DIGIT:
-         if (state & PNG_FP_SAW_DOT) /* delayed fraction */
+         if ((state & PNG_FP_SAW_DOT) != 0) /* delayed fraction */
             png_fp_set(state, PNG_FP_FRACTION | PNG_FP_SAW_DOT);
 
          png_fp_add(state, type | PNG_FP_WAS_VALID);
@@ -1435,7 +2731,7 @@ png_check_fp_number(png_const_charp string, png_size_t size, int *statep,
          break;
 
       case PNG_FP_EXPONENT + PNG_FP_SAW_SIGN:
-         if (state & PNG_FP_SAW_ANY)
+         if ((state & PNG_FP_SAW_ANY) != 0)
             goto PNG_FP_End; /* not a part of the number */
 
          png_fp_add(state, PNG_FP_SAW_SIGN);
@@ -1478,13 +2774,13 @@ png_check_fp_string(png_const_charp string, png_size_t size)
    int        state=0;
    png_size_t char_index=0;
 
-   if (png_check_fp_number(string, size, &state, &char_index) &&
+   if (png_check_fp_number(string, size, &state, &char_index) != 0 &&
       (char_index == size || string[char_index] == 0))
       return state /* must be non-zero - see above */;
 
    return 0; /* i.e. fail */
 }
-#endif /* pCAL or sCAL */
+#endif /* pCAL || sCAL */
 
 #ifdef PNG_sCAL_SUPPORTED
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
@@ -1495,7 +2791,7 @@ static double
 png_pow10(int power)
 {
    int recip = 0;
-   double d = 1.0;
+   double d = 1;
 
    /* Handle negative exponent with a reciprocal at the end because
     * 10 is exact whereas .1 is inexact in base 2
@@ -1509,7 +2805,7 @@ png_pow10(int power)
    if (power > 0)
    {
       /* Decompose power bitwise. */
-      double mult = 10.0;
+      double mult = 10;
       do
       {
          if (power & 1) d *= mult;
@@ -1529,7 +2825,7 @@ png_pow10(int power)
  * precision.
  */
 void /* PRIVATE */
-png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
+png_ascii_from_fp(png_const_structrp png_ptr, png_charp ascii, png_size_t size,
     double fp, unsigned int precision)
 {
    /* We use standard functions from math.h, but not printf because
@@ -1556,7 +2852,7 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
 
       if (fp >= DBL_MIN && fp <= DBL_MAX)
       {
-         int exp_b10;       /* A base 10 exponent */
+         int exp_b10;   /* A base 10 exponent */
          double base;   /* 10^exp_b10 */
 
          /* First extract a base 10 exponent of the number,
@@ -1604,7 +2900,7 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
           */
 
          {
-            int czero, clead, cdigits;
+            unsigned int czero, clead, cdigits;
             char exponent[10];
 
             /* Allow up to two leading zeros - this will not lengthen
@@ -1628,21 +2924,20 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
             {
                double d;
 
-               fp *= 10.0;
-
+               fp *= 10;
                /* Use modf here, not floor and subtract, so that
                 * the separation is done in one step.  At the end
                 * of the loop don't break the number into parts so
                 * that the final digit is rounded.
                 */
-               if (cdigits+czero-clead+1 < (int)precision)
+               if (cdigits+czero+1 < precision+clead)
                   fp = modf(fp, &d);
 
                else
                {
                   d = floor(fp + .5);
 
-                  if (d > 9.0)
+                  if (d > 9)
                   {
                      /* Rounding up to 10, handle that here. */
                      if (czero > 0)
@@ -1650,10 +2945,9 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
                         --czero, d = 1;
                         if (cdigits == 0) --clead;
                      }
-
                      else
                      {
-                        while (cdigits > 0 && d > 9.0)
+                        while (cdigits > 0 && d > 9)
                         {
                            int ch = *--ascii;
 
@@ -1678,7 +2972,7 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
                          * exponent but take into account the leading
                          * decimal point.
                          */
-                        if (d > 9.0)  /* cdigits == 0 */
+                        if (d > 9)  /* cdigits == 0 */
                         {
                            if (exp_b10 == (-1))
                            {
@@ -1699,19 +2993,18 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
                               ++exp_b10;
 
                            /* In all cases we output a '1' */
-                           d = 1.0;
+                           d = 1;
                         }
                      }
                   }
                   fp = 0; /* Guarantees termination below. */
                }
 
-               if (d == 0.0)
+               if (d == 0)
                {
                   ++czero;
                   if (cdigits == 0) ++clead;
                }
-
                else
                {
                   /* Included embedded zeros in the digit count. */
@@ -1735,15 +3028,15 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
 
                   if (exp_b10 != (-1))
                   {
-                     if (exp_b10 == 0) *ascii++ = 46, --size; /* counted
-                                                                 above */
+                     if (exp_b10 == 0)
+                        *ascii++ = 46, --size; /* counted above */
+
                      --exp_b10;
                   }
-
                   *ascii++ = (char)(48 + (int)d), ++cdigits;
                }
             }
-            while (cdigits+czero-clead < (int)precision && fp > DBL_MIN);
+            while (cdigits+czero < precision+clead && fp > DBL_MIN);
 
             /* The total output count (max) is now 4+precision */
 
@@ -1811,7 +3104,7 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
             /* Need another size check here for the exponent digits, so
              * this need not be considered above.
              */
-            if ((int)size > cdigits)
+            if (size > cdigits)
             {
                while (cdigits > 0) *ascii++ = exponent[--cdigits];
 
@@ -1847,8 +3140,8 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
 /* Function to format a fixed point value in ASCII.
  */
 void /* PRIVATE */
-png_ascii_from_fixed(png_structp png_ptr, png_charp ascii, png_size_t size,
-    png_fixed_point fp)
+png_ascii_from_fixed(png_const_structrp png_ptr, png_charp ascii,
+    png_size_t size, png_fixed_point fp)
 {
    /* Require space for 10 decimal digits, a decimal point, a minus sign and a
     * trailing \0, 13 characters:
@@ -1859,7 +3152,7 @@ png_ascii_from_fixed(png_structp png_ptr, png_charp ascii, png_size_t size,
 
       /* Avoid overflow here on the minimum integer. */
       if (fp < 0)
-         *ascii++ = 45, --size, num = -fp;
+         *ascii++ = 45, num = -fp;
       else
          num = fp;
 
@@ -1915,23 +3208,32 @@ png_ascii_from_fixed(png_structp png_ptr, png_charp ascii, png_size_t size,
    png_error(png_ptr, "ASCII conversion buffer too small");
 }
 #   endif /* FIXED_POINT */
-#endif /* READ_SCAL */
+#endif /* SCAL */
 
 #if defined(PNG_FLOATING_POINT_SUPPORTED) && \
-   !defined(PNG_FIXED_POINT_MACRO_SUPPORTED)
+   !defined(PNG_FIXED_POINT_MACRO_SUPPORTED) && \
+   (defined(PNG_gAMA_SUPPORTED) || defined(PNG_cHRM_SUPPORTED) || \
+   defined(PNG_sCAL_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) || \
+   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)) || \
+   (defined(PNG_sCAL_SUPPORTED) && \
+   defined(PNG_FLOATING_ARITHMETIC_SUPPORTED))
 png_fixed_point
-png_fixed(png_structp png_ptr, double fp, png_const_charp text)
+png_fixed(png_const_structrp png_ptr, double fp, png_const_charp text)
 {
    double r = floor(100000 * fp + .5);
 
    if (r > 2147483647. || r < -2147483648.)
       png_fixed_error(png_ptr, text);
 
+#  ifndef PNG_ERROR_TEXT_SUPPORTED
+   PNG_UNUSED(text)
+#  endif
+
    return (png_fixed_point)r;
 }
 #endif
 
-#if defined(PNG_READ_GAMMA_SUPPORTED) || \
+#if defined(PNG_GAMMA_SUPPORTED) || defined(PNG_COLORSPACE_SUPPORTED) ||\
     defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG_READ_pHYs_SUPPORTED)
 /* muldiv functions */
 /* This API takes signed arguments and rounds the result to the nearest
@@ -2040,7 +3342,8 @@ png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,
                result = -result;
 
             /* Check for overflow. */
-            if ((negative && result <= 0) || (!negative && result >= 0))
+            if ((negative != 0 && result <= 0) ||
+                (negative == 0 && result >= 0))
             {
                *res = result;
                return 1;
@@ -2059,12 +3362,12 @@ png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,
  * result.
  */
 png_fixed_point
-png_muldiv_warn(png_structp png_ptr, png_fixed_point a, png_int_32 times,
+png_muldiv_warn(png_const_structrp png_ptr, png_fixed_point a, png_int_32 times,
     png_int_32 divisor)
 {
    png_fixed_point result;
 
-   if (png_muldiv(&result, a, times, divisor))
+   if (png_muldiv(&result, a, times, divisor) != 0)
       return result;
 
    png_warning(png_ptr, "fixed point overflow ignored");
@@ -2072,31 +3375,39 @@ png_muldiv_warn(png_structp png_ptr, png_fixed_point a, png_int_32 times,
 }
 #endif
 
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_cHRM_SUPPORTED)
-/* more fixed point functions for gamma and cHRM (xy/XYZ) suport. */
+#ifdef PNG_GAMMA_SUPPORTED /* more fixed point functions for gamma */
 /* Calculate a reciprocal, return 0 on div-by-zero or overflow. */
 png_fixed_point
 png_reciprocal(png_fixed_point a)
 {
-   if (a != 0)
-   {
 #ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-     double r = floor(1E10/a+.5);
+   double r = floor(1E10/a+.5);
 
-     if (r <= 2147483647. && r >= -2147483648.)
-        return (png_fixed_point)r;
+   if (r <= 2147483647. && r >= -2147483648.)
+      return (png_fixed_point)r;
 #else
-     png_fixed_point res;
+   png_fixed_point res;
 
-     if (png_muldiv(&res, 100000, 100000, a))
-        return res;
+   if (png_muldiv(&res, 100000, 100000, a) != 0)
+      return res;
 #endif
-   }
 
    return 0; /* error/overflow */
 }
 
+/* This is the shared test on whether a gamma value is 'significant' - whether
+ * it is worth doing gamma correction.
+ */
+int /* PRIVATE */
+png_gamma_significant(png_fixed_point gamma_val)
+{
+   return gamma_val < PNG_FP_1 - PNG_GAMMA_THRESHOLD_FIXED ||
+       gamma_val > PNG_FP_1 + PNG_GAMMA_THRESHOLD_FIXED;
+}
+#endif
+
 #ifdef PNG_READ_GAMMA_SUPPORTED
+#ifdef PNG_16BIT_SUPPORTED
 /* A local convenience routine. */
 static png_fixed_point
 png_product2(png_fixed_point a, png_fixed_point b)
@@ -2112,13 +3423,13 @@ png_product2(png_fixed_point a, png_fixed_point b)
 #else
    png_fixed_point res;
 
-   if (png_muldiv(&res, a, b, 100000))
+   if (png_muldiv(&res, a, b, 100000) != 0)
       return res;
 #endif
 
    return 0; /* overflow */
 }
-#endif /* READ_GAMMA */
+#endif /* 16BIT */
 
 /* The inverse of the above. */
 png_fixed_point
@@ -2136,10 +3447,10 @@ png_reciprocal2(png_fixed_point a, png_fixed_point b)
          return (png_fixed_point)r;
    }
 #else
-   /* This may overflow because the range of png_fixed_point isn't
-    * symmetric, but this API is only used for the product of file and
-    * screen gamma so it doesn't matter that the smallest number it can
-    * produce is 1/21474, not 1/100000
+   /* This may overflow because the range of png_fixed_point isn't symmetric,
+    * but this API is only used for the product of file and screen gamma so it
+    * doesn't matter that the smallest number it can produce is 1/21474, not
+    * 1/100000
     */
    png_fixed_point res = png_product2(a, b);
 
@@ -2149,75 +3460,30 @@ png_reciprocal2(png_fixed_point a, png_fixed_point b)
 
    return 0; /* overflow */
 }
-#endif /* READ_GAMMA || cHRM */
-
-#ifdef PNG_CHECK_cHRM_SUPPORTED
-/* Added at libpng version 1.2.34 (Dec 8, 2008) and 1.4.0 (Jan 2,
- * 2010: moved from pngset.c) */
-/*
- *    Multiply two 32-bit numbers, V1 and V2, using 32-bit
- *    arithmetic, to produce a 64-bit result in the HI/LO words.
- *
- *                  A B
- *                x C D
- *               ------
- *              AD || BD
- *        AC || CB || 0
- *
- *    where A and B are the high and low 16-bit words of V1,
- *    C and D are the 16-bit words of V2, AD is the product of
- *    A and D, and X || Y is (X << 16) + Y.
-*/
-
-void /* PRIVATE */
-png_64bit_product (long v1, long v2, unsigned long *hi_product,
-    unsigned long *lo_product)
-{
-   int a, b, c, d;
-   long lo, hi, x, y;
-
-   a = (v1 >> 16) & 0xffff;
-   b = v1 & 0xffff;
-   c = (v2 >> 16) & 0xffff;
-   d = v2 & 0xffff;
-
-   lo = b * d;                   /* BD */
-   x = a * d + c * b;            /* AD + CB */
-   y = ((lo >> 16) & 0xffff) + x;
-
-   lo = (lo & 0xffff) | ((y & 0xffff) << 16);
-   hi = (y >> 16) & 0xffff;
-
-   hi += a * c;                  /* AC */
-
-   *hi_product = (unsigned long)hi;
-   *lo_product = (unsigned long)lo;
-}
-#endif /* CHECK_cHRM */
+#endif /* READ_GAMMA */
 
 #ifdef PNG_READ_GAMMA_SUPPORTED /* gamma table code */
 #ifndef PNG_FLOATING_ARITHMETIC_SUPPORTED
 /* Fixed point gamma.
  *
+ * The code to calculate the tables used below can be found in the shell script
+ * contrib/tools/intgamma.sh
+ *
  * To calculate gamma this code implements fast log() and exp() calls using only
  * fixed point arithmetic.  This code has sufficient precision for either 8-bit
  * or 16-bit sample values.
  *
  * The tables used here were calculated using simple 'bc' programs, but C double
- * precision floating point arithmetic would work fine.  The programs are given
- * at the head of each table.
+ * precision floating point arithmetic would work fine.
  *
  * 8-bit log table
  *   This is a table of -log(value/255)/log(2) for 'value' in the range 128 to
  *   255, so it's the base 2 logarithm of a normalized 8-bit floating point
  *   mantissa.  The numbers are 32-bit fractions.
  */
-static png_uint_32
+static const png_uint_32
 png_8bit_l2[128] =
 {
-#  ifdef PNG_DO_BC
-      for (i=128;i<256;++i) { .5 - l(i/255)/l(2)*65536*65536; }
-#  else
    4270715492U, 4222494797U, 4174646467U, 4127164793U, 4080044201U, 4033279239U,
    3986864580U, 3940795015U, 3895065449U, 3849670902U, 3804606499U, 3759867474U,
    3715449162U, 3671346997U, 3627556511U, 3584073329U, 3540893168U, 3498011834U,
@@ -2240,7 +3506,6 @@ png_8bit_l2[128] =
    324227938U, 298676034U, 273229066U, 247886176U, 222646516U, 197509248U,
    172473545U, 147538590U, 122703574U, 97967701U, 73330182U, 48790236U,
    24347096U, 0U
-#  endif
 
 #if 0
    /* The following are the values for 16-bit tables - these work fine for the
@@ -2263,18 +3528,18 @@ png_8bit_l2[128] =
 #endif
 };
 
-PNG_STATIC png_int_32
+static png_int_32
 png_log8bit(unsigned int x)
 {
    unsigned int lg2 = 0;
    /* Each time 'x' is multiplied by 2, 1 must be subtracted off the final log,
     * because the log is actually negate that means adding 1.  The final
     * returned value thus has the range 0 (for 255 input) to 7.994 (for 1
-    * input), return 7.99998 for the overflow (log 0) case - so the result is
+    * input), return -1 for the overflow (log 0) case, - so the result is
     * always at most 19 bits.
     */
    if ((x &= 0xff) == 0)
-      return 0xffffffff;
+      return -1;
 
    if ((x & 0xf0) == 0)
       lg2  = 4, x <<= 4;
@@ -2319,14 +3584,15 @@ png_log8bit(unsigned int x)
  * Zero  (257):      0
  * End   (258):  23499
  */
-PNG_STATIC png_int_32
+#ifdef PNG_16BIT_SUPPORTED
+static png_int_32
 png_log16bit(png_uint_32 x)
 {
    unsigned int lg2 = 0;
 
    /* As above, but now the input has 16 bits. */
    if ((x &= 0xffff) == 0)
-      return 0xffffffff;
+      return -1;
 
    if ((x & 0xff00) == 0)
       lg2  = 8, x <<= 8;
@@ -2369,13 +3635,14 @@ png_log16bit(png_uint_32 x)
    /* Safe, because the result can't have more than 20 bits: */
    return (png_int_32)((lg2 + 2048) >> 12);
 }
+#endif /* 16BIT */
 
 /* The 'exp()' case must invert the above, taking a 20-bit fixed point
  * logarithmic value and returning a 16 or 8-bit number as appropriate.  In
  * each case only the low 16 bits are relevant - the fraction - since the
  * integer bits (the top 4) simply determine a shift.
  *
- * The worst case is the 16-bit distinction between 65535 and 65534, this
+ * The worst case is the 16-bit distinction between 65535 and 65534. This
  * requires perhaps spurious accuracy in the decoding of the logarithm to
  * distinguish log2(65535/65534.5) - 10^-5 or 17 bits.  There is little chance
  * of getting this accuracy in practice.
@@ -2384,21 +3651,17 @@ png_log16bit(png_uint_32 x)
  * frational part of the logarithm by using an accurate 32-bit value from the
  * top four fractional bits then multiplying in the remaining bits.
  */
-static png_uint_32
+static const png_uint_32
 png_32bit_exp[16] =
 {
-#  ifdef PNG_DO_BC
-      for (i=0;i<16;++i) { .5 + e(-i/16*l(2))*2^32; }
-#  else
    /* NOTE: the first entry is deliberately set to the maximum 32-bit value. */
    4294967295U, 4112874773U, 3938502376U, 3771522796U, 3611622603U, 3458501653U,
    3311872529U, 3171459999U, 3037000500U, 2908241642U, 2784941738U, 2666869345U,
    2553802834U, 2445529972U, 2341847524U, 2242560872U
-#  endif
 };
 
 /* Adjustment table; provided to explain the numbers in the code below. */
-#ifdef PNG_DO_BC
+#if 0
 for (i=11;i>=0;--i){ print i, " ", (1 - e(-(2^i)/65536*l(2))) * 2^(32-i), "\n"}
    11 44937.64284865548751208448
    10 45180.98734845585101160448
@@ -2414,13 +3677,13 @@ for (i=11;i>=0;--i){ print i, " ", (1 - e(-(2^i)/65536*l(2))) * 2^(32-i), "\n"}
     0 45425.85339951654943850496
 #endif
 
-PNG_STATIC png_uint_32
+static png_uint_32
 png_exp(png_fixed_point x)
 {
    if (x > 0 && x <= 0xfffff) /* Else overflow or zero (underflow) */
    {
       /* Obtain a 4-bit approximation */
-      png_uint_32 e = png_32bit_exp[(x >> 12) & 0xf];
+      png_uint_32 e = png_32bit_exp[(x >> 12) & 0x0f];
 
       /* Incorporate the low 12 bits - these decrease the returned value by
        * multiplying by a number less than 1 if the bit is set.  The multiplier
@@ -2462,21 +3725,22 @@ png_exp(png_fixed_point x)
    return 0;
 }
 
-PNG_STATIC png_byte
+static png_byte
 png_exp8bit(png_fixed_point lg2)
 {
    /* Get a 32-bit value: */
    png_uint_32 x = png_exp(lg2);
 
-   /* Convert the 32-bit value to 0..255 by multiplying by 256-1, note that the
+   /* Convert the 32-bit value to 0..255 by multiplying by 256-1. Note that the
     * second, rounding, step can't overflow because of the first, subtraction,
     * step.
     */
    x -= x >> 8;
-   return (png_byte)((x + 0x7fffffU) >> 24);
+   return (png_byte)(((x + 0x7fffffU) >> 24) & 0xff);
 }
 
-PNG_STATIC png_uint_16
+#ifdef PNG_16BIT_SUPPORTED
+static png_uint_16
 png_exp16bit(png_fixed_point lg2)
 {
    /* Get a 32-bit value: */
@@ -2486,6 +3750,7 @@ png_exp16bit(png_fixed_point lg2)
    x -= x >> 16;
    return (png_uint_16)((x + 32767U) >> 16);
 }
+#endif /* 16BIT */
 #endif /* FLOATING_ARITHMETIC */
 
 png_byte
@@ -2494,13 +3759,37 @@ png_gamma_8bit_correct(unsigned int value, png_fixed_point gamma_val)
    if (value > 0 && value < 255)
    {
 #     ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-         double r = floor(255*pow(value/255.,gamma_val*.00001)+.5);
+         /* 'value' is unsigned, ANSI-C90 requires the compiler to correctly
+          * convert this to a floating point value.  This includes values that
+          * would overflow if 'value' were to be converted to 'int'.
+          *
+          * Apparently GCC, however, does an intermediate conversion to (int)
+          * on some (ARM) but not all (x86) platforms, possibly because of
+          * hardware FP limitations.  (E.g. if the hardware conversion always
+          * assumes the integer register contains a signed value.)  This results
+          * in ANSI-C undefined behavior for large values.
+          *
+          * Other implementations on the same machine might actually be ANSI-C90
+          * conformant and therefore compile spurious extra code for the large
+          * values.
+          *
+          * We can be reasonably sure that an unsigned to float conversion
+          * won't be faster than an int to float one.  Therefore this code
+          * assumes responsibility for the undefined behavior, which it knows
+          * can't happen because of the check above.
+          *
+          * Note the argument to this routine is an (unsigned int) because, on
+          * 16-bit platforms, it is assigned a value which might be out of
+          * range for an (int); that would result in undefined behavior in the
+          * caller if the *argument* ('value') were to be declared (int).
+          */
+         double r = floor(255*pow((int)/*SAFE*/value/255.,gamma_val*.00001)+.5);
          return (png_byte)r;
 #     else
          png_int_32 lg2 = png_log8bit(value);
          png_fixed_point res;
 
-         if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1))
+         if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1) != 0)
             return png_exp8bit(res);
 
          /* Overflow. */
@@ -2508,22 +3797,29 @@ png_gamma_8bit_correct(unsigned int value, png_fixed_point gamma_val)
 #     endif
    }
 
-   return (png_byte)value;
+   return (png_byte)(value & 0xff);
 }
 
+#ifdef PNG_16BIT_SUPPORTED
 png_uint_16
 png_gamma_16bit_correct(unsigned int value, png_fixed_point gamma_val)
 {
    if (value > 0 && value < 65535)
    {
 #     ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-         double r = floor(65535*pow(value/65535.,gamma_val*.00001)+.5);
+         /* The same (unsigned int)->(double) constraints apply here as above,
+          * however in this case the (unsigned int) to (int) conversion can
+          * overflow on an ANSI-C90 compliant system so the cast needs to ensure
+          * that this is not possible.
+          */
+         double r = floor(65535*pow((png_int_32)value/65535.,
+                     gamma_val*.00001)+.5);
          return (png_uint_16)r;
 #     else
          png_int_32 lg2 = png_log16bit(value);
          png_fixed_point res;
 
-         if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1))
+         if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1) != 0)
             return png_exp16bit(res);
 
          /* Overflow. */
@@ -2533,6 +3829,7 @@ png_gamma_16bit_correct(unsigned int value, png_fixed_point gamma_val)
 
    return (png_uint_16)value;
 }
+#endif /* 16BIT */
 
 /* This does the right thing based on the bit_depth field of the
  * png_struct, interpreting values as 8-bit or 16-bit.  While the result
@@ -2540,29 +3837,24 @@ png_gamma_16bit_correct(unsigned int value, png_fixed_point gamma_val)
  * 8-bit (as are the arguments.)
  */
 png_uint_16 /* PRIVATE */
-png_gamma_correct(png_structp png_ptr, unsigned int value,
+png_gamma_correct(png_structrp png_ptr, unsigned int value,
     png_fixed_point gamma_val)
 {
    if (png_ptr->bit_depth == 8)
       return png_gamma_8bit_correct(value, gamma_val);
 
+#ifdef PNG_16BIT_SUPPORTED
    else
       return png_gamma_16bit_correct(value, gamma_val);
-}
-
-/* This is the shared test on whether a gamma value is 'significant' - whether
- * it is worth doing gamma correction.
- */
-int /* PRIVATE */
-png_gamma_significant(png_fixed_point gamma_val)
-{
-   return gamma_val < PNG_FP_1 - PNG_GAMMA_THRESHOLD_FIXED ||
-       gamma_val > PNG_FP_1 + PNG_GAMMA_THRESHOLD_FIXED;
+#else
+      /* should not reach this */
+      return 0;
+#endif /* 16BIT */
 }
 
 #ifdef PNG_16BIT_SUPPORTED
 /* Internal function to build a single 16-bit table - the table consists of
- * 'num' 256-entry subtables, where 'num' is determined by 'shift' - the amount
+ * 'num' 256 entry subtables, where 'num' is determined by 'shift' - the amount
  * to shift the input values right (or 16-number_of_signifiant_bits).
  *
  * The caller is responsible for ensuring that the table gets cleaned up on
@@ -2570,27 +3862,33 @@ png_gamma_significant(png_fixed_point gamma_val)
  * should be somewhere that will be cleaned.
  */
 static void
-png_build_16bit_table(png_structp png_ptr, png_uint_16pp *ptable,
+png_build_16bit_table(png_structrp png_ptr, png_uint_16pp *ptable,
    PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)
 {
    /* Various values derived from 'shift': */
    PNG_CONST unsigned int num = 1U << (8U - shift);
+#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
+   /* CSE the division and work round wacky GCC warnings (see the comments
+    * in png_gamma_8bit_correct for where these come from.)
+    */
+   PNG_CONST double fmax = 1./(((png_int_32)1 << (16U - shift))-1);
+#endif
    PNG_CONST unsigned int max = (1U << (16U - shift))-1U;
    PNG_CONST unsigned int max_by_2 = 1U << (15U-shift);
    unsigned int i;
 
    png_uint_16pp table = *ptable =
-       (png_uint_16pp)png_calloc(png_ptr, num * png_sizeof(png_uint_16p));
+       (png_uint_16pp)png_calloc(png_ptr, num * (sizeof (png_uint_16p)));
 
    for (i = 0; i < num; i++)
    {
       png_uint_16p sub_table = table[i] =
-          (png_uint_16p)png_malloc(png_ptr, 256 * png_sizeof(png_uint_16));
+          (png_uint_16p)png_malloc(png_ptr, 256 * (sizeof (png_uint_16)));
 
       /* The 'threshold' test is repeated here because it can arise for one of
        * the 16-bit tables even if the others don't hit it.
        */
-      if (png_gamma_significant(gamma_val))
+      if (png_gamma_significant(gamma_val) != 0)
       {
          /* The old code would overflow at the end and this would cause the
           * 'pow' function to return a result >1, resulting in an
@@ -2606,7 +3904,10 @@ png_build_16bit_table(png_structp png_ptr, png_uint_16pp *ptable,
             png_uint_32 ig = (j << (8-shift)) + i;
 #           ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
                /* Inline the 'max' scaling operation: */
-               double d = floor(65535*pow(ig/(double)max, gamma_val*.00001)+.5);
+               /* See png_gamma_8bit_correct for why the cast to (int) is
+                * required here.
+                */
+               double d = floor(65535.*pow(ig*fmax, gamma_val*.00001)+.5);
                sub_table[j] = (png_uint_16)d;
 #           else
                if (shift != 0)
@@ -2633,13 +3934,12 @@ png_build_16bit_table(png_structp png_ptr, png_uint_16pp *ptable,
       }
    }
 }
-#endif
 
 /* NOTE: this function expects the *inverse* of the overall gamma transformation
  * required.
  */
 static void
-png_build_16to8_table(png_structp png_ptr, png_uint_16pp *ptable,
+png_build_16to8_table(png_structrp png_ptr, png_uint_16pp *ptable,
    PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)
 {
    PNG_CONST unsigned int num = 1U << (8U - shift);
@@ -2648,15 +3948,15 @@ png_build_16to8_table(png_structp png_ptr, png_uint_16pp *ptable,
    png_uint_32 last;
 
    png_uint_16pp table = *ptable =
-       (png_uint_16pp)png_calloc(png_ptr, num * png_sizeof(png_uint_16p));
+       (png_uint_16pp)png_calloc(png_ptr, num * (sizeof (png_uint_16p)));
 
-   /* 'num' is the number of tables and also the number of low bits of the
-    * input 16-bit value used to select a table.  Each table is itself indexed
-    * by the high 8 bits of the value.
+   /* 'num' is the number of tables and also the number of low bits of low
+    * bits of the input 16-bit value used to select a table.  Each table is
+    * itself indexed by the high 8 bits of the value.
     */
    for (i = 0; i < num; i++)
       table[i] = (png_uint_16p)png_malloc(png_ptr,
-          256 * png_sizeof(png_uint_16));
+          256 * (sizeof (png_uint_16)));
 
    /* 'gamma_val' is set to the reciprocal of the value calculated above, so
     * pow(out,g) is an *input* value.  'last' is the last input value set.
@@ -2700,34 +4000,38 @@ png_build_16to8_table(png_structp png_ptr, png_uint_16pp *ptable,
       last++;
    }
 }
+#endif /* 16BIT */
 
 /* Build a single 8-bit table: same as the 16-bit case but much simpler (and
  * typically much faster).  Note that libpng currently does no sBIT processing
  * (apparently contrary to the spec) so a 256-entry table is always generated.
  */
 static void
-png_build_8bit_table(png_structp png_ptr, png_bytepp ptable,
+png_build_8bit_table(png_structrp png_ptr, png_bytepp ptable,
    PNG_CONST png_fixed_point gamma_val)
 {
    unsigned int i;
    png_bytep table = *ptable = (png_bytep)png_malloc(png_ptr, 256);
 
-   if (png_gamma_significant(gamma_val)) for (i=0; i<256; i++)
-      table[i] = png_gamma_8bit_correct(i, gamma_val);
+   if (png_gamma_significant(gamma_val) != 0)
+      for (i=0; i<256; i++)
+         table[i] = png_gamma_8bit_correct(i, gamma_val);
 
-   else for (i=0; i<256; ++i)
-      table[i] = (png_byte)i;
+   else
+      for (i=0; i<256; ++i)
+         table[i] = (png_byte)(i & 0xff);
 }
 
 /* Used from png_read_destroy and below to release the memory used by the gamma
  * tables.
  */
 void /* PRIVATE */
-png_destroy_gamma_table(png_structp png_ptr)
+png_destroy_gamma_table(png_structrp png_ptr)
 {
    png_free(png_ptr, png_ptr->gamma_table);
    png_ptr->gamma_table = NULL;
 
+#ifdef PNG_16BIT_SUPPORTED
    if (png_ptr->gamma_16_table != NULL)
    {
       int i;
@@ -2739,6 +4043,7 @@ png_destroy_gamma_table(png_structp png_ptr)
    png_free(png_ptr, png_ptr->gamma_16_table);
    png_ptr->gamma_16_table = NULL;
    }
+#endif /* 16BIT */
 
 #if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
    defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
@@ -2748,6 +4053,7 @@ png_destroy_gamma_table(png_structp png_ptr)
    png_free(png_ptr, png_ptr->gamma_to_1);
    png_ptr->gamma_to_1 = NULL;
 
+#ifdef PNG_16BIT_SUPPORTED
    if (png_ptr->gamma_16_from_1 != NULL)
    {
       int i;
@@ -2770,6 +4076,7 @@ png_destroy_gamma_table(png_structp png_ptr)
    png_free(png_ptr, png_ptr->gamma_16_to_1);
    png_ptr->gamma_16_to_1 = NULL;
    }
+#endif /* 16BIT */
 #endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
 }
 
@@ -2779,7 +4086,7 @@ png_destroy_gamma_table(png_structp png_ptr)
  * we don't need to allocate > 64K chunks for a full 16-bit table.
  */
 void /* PRIVATE */
-png_build_gamma_table(png_structp png_ptr, int bit_depth)
+png_build_gamma_table(png_structrp png_ptr, int bit_depth)
 {
   png_debug(1, "in png_build_gamma_table");
 
@@ -2798,28 +4105,29 @@ png_build_gamma_table(png_structp png_ptr, int bit_depth)
   if (bit_depth <= 8)
   {
      png_build_8bit_table(png_ptr, &png_ptr->gamma_table,
-         png_ptr->screen_gamma > 0 ?  png_reciprocal2(png_ptr->gamma,
+         png_ptr->screen_gamma > 0 ?  png_reciprocal2(png_ptr->colorspace.gamma,
          png_ptr->screen_gamma) : PNG_FP_1);
 
 #if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
    defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
    defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
-     if (png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY))
+     if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)
      {
         png_build_8bit_table(png_ptr, &png_ptr->gamma_to_1,
-            png_reciprocal(png_ptr->gamma));
+            png_reciprocal(png_ptr->colorspace.gamma));
 
         png_build_8bit_table(png_ptr, &png_ptr->gamma_from_1,
             png_ptr->screen_gamma > 0 ?  png_reciprocal(png_ptr->screen_gamma) :
-            png_ptr->gamma/* Probably doing rgb_to_gray */);
+            png_ptr->colorspace.gamma/* Probably doing rgb_to_gray */);
      }
 #endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
   }
+#ifdef PNG_16BIT_SUPPORTED
   else
   {
      png_byte shift, sig_bit;
 
-     if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+     if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
      {
         sig_bit = png_ptr->sig_bit.red;
 
@@ -2851,12 +4159,13 @@ png_build_gamma_table(png_structp png_ptr, int bit_depth)
       *
       */
      if (sig_bit > 0 && sig_bit < 16U)
-        shift = (png_byte)(16U - sig_bit); /* shift == insignificant bits */
+        /* shift == insignificant bits */
+        shift = (png_byte)((16U - sig_bit) & 0xff);
 
      else
         shift = 0; /* keep all 16 bits */
 
-     if (png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8))
+     if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0)
      {
         /* PNG_MAX_GAMMA_8 is the number of bits to keep - effectively
          * the significant bits in the *input* when the output will
@@ -2871,32 +4180,28 @@ png_build_gamma_table(png_structp png_ptr, int bit_depth)
 
      png_ptr->gamma_shift = shift;
 
-#ifdef PNG_16BIT_SUPPORTED
      /* NOTE: prior to 1.5.4 this test used to include PNG_BACKGROUND (now
       * PNG_COMPOSE).  This effectively smashed the background calculation for
       * 16-bit output because the 8-bit table assumes the result will be reduced
       * to 8 bits.
       */
-     if (png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8))
-#endif
+     if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0)
          png_build_16to8_table(png_ptr, &png_ptr->gamma_16_table, shift,
-         png_ptr->screen_gamma > 0 ? png_product2(png_ptr->gamma,
+         png_ptr->screen_gamma > 0 ? png_product2(png_ptr->colorspace.gamma,
          png_ptr->screen_gamma) : PNG_FP_1);
 
-#ifdef PNG_16BIT_SUPPORTED
      else
          png_build_16bit_table(png_ptr, &png_ptr->gamma_16_table, shift,
-         png_ptr->screen_gamma > 0 ? png_reciprocal2(png_ptr->gamma,
+         png_ptr->screen_gamma > 0 ? png_reciprocal2(png_ptr->colorspace.gamma,
          png_ptr->screen_gamma) : PNG_FP_1);
-#endif
 
 #if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
    defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
    defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
-     if (png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY))
+     if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)
      {
         png_build_16bit_table(png_ptr, &png_ptr->gamma_16_to_1, shift,
-            png_reciprocal(png_ptr->gamma));
+            png_reciprocal(png_ptr->colorspace.gamma));
 
         /* Notice that the '16 from 1' table should be full precision, however
          * the lookup on this table still uses gamma_shift, so it can't be.
@@ -2904,18 +4209,18 @@ png_build_gamma_table(png_structp png_ptr, int bit_depth)
          */
         png_build_16bit_table(png_ptr, &png_ptr->gamma_16_from_1, shift,
             png_ptr->screen_gamma > 0 ? png_reciprocal(png_ptr->screen_gamma) :
-            png_ptr->gamma/* Probably doing rgb_to_gray */);
+            png_ptr->colorspace.gamma/* Probably doing rgb_to_gray */);
      }
 #endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
   }
+#endif /* 16BIT */
 }
 #endif /* READ_GAMMA */
-#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
 
-/* HARDWARE OPTION SUPPORT */
+/* HARDWARE OR SOFTWARE OPTION SUPPORT */
 #ifdef PNG_SET_OPTION_SUPPORTED
 int PNGAPI
-png_set_option(png_structp png_ptr, int option, int onoff)
+png_set_option(png_structrp png_ptr, int option, int onoff)
 {
    if (png_ptr != NULL && option >= 0 && option < PNG_OPTION_NEXT &&
       (option & 1) == 0)
@@ -2924,7 +4229,7 @@ png_set_option(png_structp png_ptr, int option, int onoff)
       int setting = (2 + (onoff != 0)) << option;
       int current = png_ptr->options;
 
-      png_ptr->options = (png_byte)((current & ~mask) | setting);
+      png_ptr->options = (png_byte)(((current & ~mask) | setting) & 0xff);
 
       return (current & mask) >> option;
    }
@@ -2932,3 +4237,263 @@ png_set_option(png_structp png_ptr, int option, int onoff)
    return PNG_OPTION_INVALID;
 }
 #endif
+
+/* sRGB support */
+#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\
+   defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
+/* sRGB conversion tables; these are machine generated with the code in
+ * contrib/tools/makesRGB.c.  The actual sRGB transfer curve defined in the
+ * specification (see the article at http://en.wikipedia.org/wiki/SRGB)
+ * is used, not the gamma=1/2.2 approximation use elsewhere in libpng.
+ * The sRGB to linear table is exact (to the nearest 16-bit linear fraction).
+ * The inverse (linear to sRGB) table has accuracies as follows:
+ *
+ * For all possible (255*65535+1) input values:
+ *
+ *    error: -0.515566 - 0.625971, 79441 (0.475369%) of readings inexact
+ *
+ * For the input values corresponding to the 65536 16-bit values:
+ *
+ *    error: -0.513727 - 0.607759, 308 (0.469978%) of readings inexact
+ *
+ * In all cases the inexact readings are only off by one.
+ */
+
+#ifdef PNG_SIMPLIFIED_READ_SUPPORTED
+/* The convert-to-sRGB table is only currently required for read. */
+const png_uint_16 png_sRGB_table[256] =
+{
+   0,20,40,60,80,99,119,139,
+   159,179,199,219,241,264,288,313,
+   340,367,396,427,458,491,526,562,
+   599,637,677,718,761,805,851,898,
+   947,997,1048,1101,1156,1212,1270,1330,
+   1391,1453,1517,1583,1651,1720,1790,1863,
+   1937,2013,2090,2170,2250,2333,2418,2504,
+   2592,2681,2773,2866,2961,3058,3157,3258,
+   3360,3464,3570,3678,3788,3900,4014,4129,
+   4247,4366,4488,4611,4736,4864,4993,5124,
+   5257,5392,5530,5669,5810,5953,6099,6246,
+   6395,6547,6700,6856,7014,7174,7335,7500,
+   7666,7834,8004,8177,8352,8528,8708,8889,
+   9072,9258,9445,9635,9828,10022,10219,10417,
+   10619,10822,11028,11235,11446,11658,11873,12090,
+   12309,12530,12754,12980,13209,13440,13673,13909,
+   14146,14387,14629,14874,15122,15371,15623,15878,
+   16135,16394,16656,16920,17187,17456,17727,18001,
+   18277,18556,18837,19121,19407,19696,19987,20281,
+   20577,20876,21177,21481,21787,22096,22407,22721,
+   23038,23357,23678,24002,24329,24658,24990,25325,
+   25662,26001,26344,26688,27036,27386,27739,28094,
+   28452,28813,29176,29542,29911,30282,30656,31033,
+   31412,31794,32179,32567,32957,33350,33745,34143,
+   34544,34948,35355,35764,36176,36591,37008,37429,
+   37852,38278,38706,39138,39572,40009,40449,40891,
+   41337,41785,42236,42690,43147,43606,44069,44534,
+   45002,45473,45947,46423,46903,47385,47871,48359,
+   48850,49344,49841,50341,50844,51349,51858,52369,
+   52884,53401,53921,54445,54971,55500,56032,56567,
+   57105,57646,58190,58737,59287,59840,60396,60955,
+   61517,62082,62650,63221,63795,64372,64952,65535
+};
+#endif /* SIMPLIFIED_READ */
+
+/* The base/delta tables are required for both read and write (but currently
+ * only the simplified versions.)
+ */
+const png_uint_16 png_sRGB_base[512] =
+{
+   128,1782,3383,4644,5675,6564,7357,8074,
+   8732,9346,9921,10463,10977,11466,11935,12384,
+   12816,13233,13634,14024,14402,14769,15125,15473,
+   15812,16142,16466,16781,17090,17393,17690,17981,
+   18266,18546,18822,19093,19359,19621,19879,20133,
+   20383,20630,20873,21113,21349,21583,21813,22041,
+   22265,22487,22707,22923,23138,23350,23559,23767,
+   23972,24175,24376,24575,24772,24967,25160,25352,
+   25542,25730,25916,26101,26284,26465,26645,26823,
+   27000,27176,27350,27523,27695,27865,28034,28201,
+   28368,28533,28697,28860,29021,29182,29341,29500,
+   29657,29813,29969,30123,30276,30429,30580,30730,
+   30880,31028,31176,31323,31469,31614,31758,31902,
+   32045,32186,32327,32468,32607,32746,32884,33021,
+   33158,33294,33429,33564,33697,33831,33963,34095,
+   34226,34357,34486,34616,34744,34873,35000,35127,
+   35253,35379,35504,35629,35753,35876,35999,36122,
+   36244,36365,36486,36606,36726,36845,36964,37083,
+   37201,37318,37435,37551,37668,37783,37898,38013,
+   38127,38241,38354,38467,38580,38692,38803,38915,
+   39026,39136,39246,39356,39465,39574,39682,39790,
+   39898,40005,40112,40219,40325,40431,40537,40642,
+   40747,40851,40955,41059,41163,41266,41369,41471,
+   41573,41675,41777,41878,41979,42079,42179,42279,
+   42379,42478,42577,42676,42775,42873,42971,43068,
+   43165,43262,43359,43456,43552,43648,43743,43839,
+   43934,44028,44123,44217,44311,44405,44499,44592,
+   44685,44778,44870,44962,45054,45146,45238,45329,
+   45420,45511,45601,45692,45782,45872,45961,46051,
+   46140,46229,46318,46406,46494,46583,46670,46758,
+   46846,46933,47020,47107,47193,47280,47366,47452,
+   47538,47623,47709,47794,47879,47964,48048,48133,
+   48217,48301,48385,48468,48552,48635,48718,48801,
+   48884,48966,49048,49131,49213,49294,49376,49458,
+   49539,49620,49701,49782,49862,49943,50023,50103,
+   50183,50263,50342,50422,50501,50580,50659,50738,
+   50816,50895,50973,51051,51129,51207,51285,51362,
+   51439,51517,51594,51671,51747,51824,51900,51977,
+   52053,52129,52205,52280,52356,52432,52507,52582,
+   52657,52732,52807,52881,52956,53030,53104,53178,
+   53252,53326,53400,53473,53546,53620,53693,53766,
+   53839,53911,53984,54056,54129,54201,54273,54345,
+   54417,54489,54560,54632,54703,54774,54845,54916,
+   54987,55058,55129,55199,55269,55340,55410,55480,
+   55550,55620,55689,55759,55828,55898,55967,56036,
+   56105,56174,56243,56311,56380,56448,56517,56585,
+   56653,56721,56789,56857,56924,56992,57059,57127,
+   57194,57261,57328,57395,57462,57529,57595,57662,
+   57728,57795,57861,57927,57993,58059,58125,58191,
+   58256,58322,58387,58453,58518,58583,58648,58713,
+   58778,58843,58908,58972,59037,59101,59165,59230,
+   59294,59358,59422,59486,59549,59613,59677,59740,
+   59804,59867,59930,59993,60056,60119,60182,60245,
+   60308,60370,60433,60495,60558,60620,60682,60744,
+   60806,60868,60930,60992,61054,61115,61177,61238,
+   61300,61361,61422,61483,61544,61605,61666,61727,
+   61788,61848,61909,61969,62030,62090,62150,62211,
+   62271,62331,62391,62450,62510,62570,62630,62689,
+   62749,62808,62867,62927,62986,63045,63104,63163,
+   63222,63281,63340,63398,63457,63515,63574,63632,
+   63691,63749,63807,63865,63923,63981,64039,64097,
+   64155,64212,64270,64328,64385,64443,64500,64557,
+   64614,64672,64729,64786,64843,64900,64956,65013,
+   65070,65126,65183,65239,65296,65352,65409,65465
+};
+
+const png_byte png_sRGB_delta[512] =
+{
+   207,201,158,129,113,100,90,82,77,72,68,64,61,59,56,54,
+   52,50,49,47,46,45,43,42,41,40,39,39,38,37,36,36,
+   35,34,34,33,33,32,32,31,31,30,30,30,29,29,28,28,
+   28,27,27,27,27,26,26,26,25,25,25,25,24,24,24,24,
+   23,23,23,23,23,22,22,22,22,22,22,21,21,21,21,21,
+   21,20,20,20,20,20,20,20,20,19,19,19,19,19,19,19,
+   19,18,18,18,18,18,18,18,18,18,18,17,17,17,17,17,
+   17,17,17,17,17,17,16,16,16,16,16,16,16,16,16,16,
+   16,16,16,16,15,15,15,15,15,15,15,15,15,15,15,15,
+   15,15,15,15,14,14,14,14,14,14,14,14,14,14,14,14,
+   14,14,14,14,14,14,14,13,13,13,13,13,13,13,13,13,
+   13,13,13,13,13,13,13,13,13,13,13,13,13,13,12,12,
+   12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
+   12,12,12,12,12,12,12,12,12,12,12,12,11,11,11,11,
+   11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+   11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,
+   11,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+   10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+   10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
+   10,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
+   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
+   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
+   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
+   9,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+   8,8,8,8,8,8,8,8,8,7,7,7,7,7,7,7,
+   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
+};
+#endif /* SIMPLIFIED READ/WRITE sRGB support */
+
+/* SIMPLIFIED READ/WRITE SUPPORT */
+#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\
+   defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
+static int
+png_image_free_function(png_voidp argument)
+{
+   png_imagep image = png_voidcast(png_imagep, argument);
+   png_controlp cp = image->opaque;
+   png_control c;
+
+   /* Double check that we have a png_ptr - it should be impossible to get here
+    * without one.
+    */
+   if (cp->png_ptr == NULL)
+      return 0;
+
+   /* First free any data held in the control structure. */
+#  ifdef PNG_STDIO_SUPPORTED
+      if (cp->owned_file != 0)
+      {
+         FILE *fp = png_voidcast(FILE*, cp->png_ptr->io_ptr);
+         cp->owned_file = 0;
+
+         /* Ignore errors here. */
+         if (fp != NULL)
+         {
+            cp->png_ptr->io_ptr = NULL;
+            (void)fclose(fp);
+         }
+      }
+#  endif
+
+   /* Copy the control structure so that the original, allocated, version can be
+    * safely freed.  Notice that a png_error here stops the remainder of the
+    * cleanup, but this is probably fine because that would indicate bad memory
+    * problems anyway.
+    */
+   c = *cp;
+   image->opaque = &c;
+   png_free(c.png_ptr, cp);
+
+   /* Then the structures, calling the correct API. */
+   if (c.for_write != 0)
+   {
+#     ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
+         png_destroy_write_struct(&c.png_ptr, &c.info_ptr);
+#     else
+         png_error(c.png_ptr, "simplified write not supported");
+#     endif
+   }
+   else
+   {
+#     ifdef PNG_SIMPLIFIED_READ_SUPPORTED
+         png_destroy_read_struct(&c.png_ptr, &c.info_ptr, NULL);
+#     else
+         png_error(c.png_ptr, "simplified read not supported");
+#     endif
+   }
+
+   /* Success. */
+   return 1;
+}
+
+void PNGAPI
+png_image_free(png_imagep image)
+{
+   /* Safely call the real function, but only if doing so is safe at this point
+    * (if not inside an error handling context).  Otherwise assume
+    * png_safe_execute will call this API after the return.
+    */
+   if (image != NULL && image->opaque != NULL &&
+      image->opaque->error_buf == NULL)
+   {
+      /* Ignore errors here: */
+      (void)png_safe_execute(image, png_image_free_function, image);
+      image->opaque = NULL;
+   }
+}
+
+int /* PRIVATE */
+png_image_error(png_imagep image, png_const_charp error_message)
+{
+   /* Utility to log an error. */
+   png_safecat(image->message, (sizeof image->message), 0, error_message);
+   image->warning_or_error |= PNG_IMAGE_ERROR;
+   png_image_free(image);
+   return 0;
+}
+
+#endif /* SIMPLIFIED READ/WRITE */
+#endif /* READ || WRITE */
diff --git a/drivers/png/png.h b/drivers/png/png.h
index f726c7282f..1efb0b02a9 100644
--- a/drivers/png/png.h
+++ b/drivers/png/png.h
@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.5.27, May 26, 2016
+ * libpng version 1.6.23, June 9, 2016
  *
  * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -11,8 +11,8 @@
  *
  * Authors and maintainers:
  *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
- *   libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *   libpng versions 0.97, January 1998, through 1.5.27, May 26, 2016:
+ *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
+ *   libpng versions 0.97, January 1998, through 1.6.23, June 9, 2016:
  *     Glenn Randers-Pehrson.
  *   See also "Contributing Authors", below.
  */
@@ -25,7 +25,11 @@
  *
  * This code is released under the libpng license.
  *
- * libpng versions 1.0.7, July 1, 2000, through 1.5.27, May 26, 2016, are
+ * Some files in the "contrib" directory and some configure-generated
+ * files that are distributed with libpng have other copyright owners and
+ * are released under other open source licenses.
+ *
+ * libpng versions 1.0.7, July 1, 2000 through 1.6.23, June 9, 2016 are
  * Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
  * derived from libpng-1.0.6, and are distributed according to the same
  * disclaimer and license as libpng-1.0.6 with the following individuals
@@ -36,6 +40,7 @@
  *    Mans Rullgard
  *    Cosmin Truta
  *    Gilles Vollant
+ *    James Yu
  *
  * and with the following additions to the disclaimer:
  *
@@ -46,6 +51,10 @@
  *    risk of satisfactory quality, performance, accuracy, and effort is with
  *    the user.
  *
+ * Some files in the "contrib" directory have other copyright owners and
+ * are released under other open source licenses.
+ *
+ *
  * libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
  * Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
  * libpng-0.96, and are distributed according to the same disclaimer and
@@ -56,6 +65,9 @@
  *    Glenn Randers-Pehrson
  *    Willem van Schaik
  *
+ * Some files in the "scripts" directory have different copyright owners
+ * but are also released under this license.
+ *
  * libpng versions 0.89, June 1996, through 0.96, May 1997, are
  * Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
  * and are distributed according to the same disclaimer and license as
@@ -69,6 +81,9 @@
  *    Greg Roelofs
  *    Tom Tanner
  *
+ * Some files in the "scripts" directory have other copyright owners
+ * but are released under this license.
+ *
  * libpng versions 0.5, May 1995, through 0.88, January 1996, are
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
  *
@@ -201,6 +216,8 @@
  *    1.2.56                  13    10256  12.so.0.56[.0]
  *    ...
  *    1.5.27                  15    10527  15.so.15.27[.0]
+ *    ...
+ *    1.6.23                  16    10623  16.so.16.23[.0]
  *
  *    Henceforth the source version will match the shared-library major
  *    and minor numbers; the shared-library major version number will be
@@ -228,29 +245,30 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    May 26, 2016
+ *    June 9, 2016
  *
  *    Since the PNG Development group is an ad-hoc body, we can't make
  *    an official declaration.
  *
  *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.5.27 are Y2K compliant.  It is my belief that
+ *    upward through 1.6.23 are Y2K compliant.  It is my belief that
  *    earlier versions were also Y2K compliant.
  *
  *    Libpng only has two year fields.  One is a 2-byte unsigned integer
- *    that will hold years up to 65535.  The other holds the date in text
- *    format, and will hold years up to 9999.
+ *    that will hold years up to 65535.  The other, which is deprecated,
+ *    holds the date in text format, and will hold years up to 9999.
  *
  *    The integer is
  *        "png_uint_16 year" in png_time_struct.
  *
  *    The string is
- *        "char time_buffer[29]" in png_struct.  This will be no
- *    longer used in libpng-1.6.0 and will be removed from libpng-1.7.0.
+ *        "char time_buffer[29]" in png_struct.  This is no longer used
+ *    in libpng-1.6.x and will be removed from libpng-1.7.0.
  *
  *    There are seven time-related functions:
- *        png.c: png_convert_to_rfc_1123() in png.c
- *          (formerly png_convert_to_rfc_1152() in error)
+ *        png.c: png_convert_to_rfc_1123_buffer() in png.c
+ *          (formerly png_convert_to_rfc_1123() prior to libpng-1.5.x and
+ *          png_convert_to_rfc_1152() in error prior to libpng-0.98)
  *        png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c
  *        png_convert_from_time_t() in pngwrite.c
  *        png_get_tIME() in pngget.c
@@ -261,8 +279,8 @@
  *    All handle dates properly in a Y2K environment.  The
  *    png_convert_from_time_t() function calls gmtime() to convert from system
  *    clock time, which returns (year - 1900), which we properly convert to
- *    the full 4-digit year.  There is a possibility that applications using
- *    libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
+ *    the full 4-digit year.  There is a possibility that libpng applications
+ *    are not passing 4-digit years into the png_convert_to_rfc_1123_buffer()
  *    function, or that they are incorrectly passing only a 2-digit year
  *    instead of "year - 1900" into the png_convert_from_struct_tm() function,
  *    but this is not under our control.  The libpng documentation has always
@@ -295,17 +313,17 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.5.27"
+#define PNG_LIBPNG_VER_STRING "1.6.23"
 #define PNG_HEADER_VERSION_STRING \
-     " libpng version 1.5.27 - May 26, 2016\n"
+     " libpng version 1.6.23 - June 9, 2016\n"
 
-#define PNG_LIBPNG_VER_SONUM   15
-#define PNG_LIBPNG_VER_DLLNUM  15
+#define PNG_LIBPNG_VER_SONUM   16
+#define PNG_LIBPNG_VER_DLLNUM  16
 
 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
 #define PNG_LIBPNG_VER_MAJOR   1
-#define PNG_LIBPNG_VER_MINOR   5
-#define PNG_LIBPNG_VER_RELEASE 27
+#define PNG_LIBPNG_VER_MINOR   6
+#define PNG_LIBPNG_VER_RELEASE 23
 
 /* This should match the numeric part of the final component of
  * PNG_LIBPNG_VER_STRING, omitting any leading zero:
@@ -336,7 +354,7 @@
  * version 1.0.0 was mis-numbered 100 instead of 10000).  From
  * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release
  */
-#define PNG_LIBPNG_VER 10527 /* 1.5.27 */
+#define PNG_LIBPNG_VER 10623 /* 1.6.23 */
 
 /* Library configuration: these options cannot be changed after
  * the library has been built.
@@ -349,27 +367,9 @@
 #endif
 
 #ifndef PNG_VERSION_INFO_ONLY
-#  ifndef PNG_BUILDING_SYMBOL_TABLE
-  /*
-   *   Standard header files (not needed for the version info or while
-   *   building symbol table -- see scripts/pnglibconf.dfa)
-   */
-#    ifdef PNG_SETJMP_SUPPORTED
-#      include <setjmp.h>
-#    endif
-
-    /* Need the time information for converting tIME chunks, it
-     * defines struct tm:
-     */
-#    ifdef PNG_CONVERT_tIME_SUPPORTED
-       /* "time.h" functions are not supported on all operating systems */
-#      include <time.h>
-#    endif
-#  endif
-
-/* Machine specific configuration. */
+   /* Machine specific configuration. */
 #  include "pngconf.h"
-#endif /* PNG_VERSION_INFO_ONLY */
+#endif
 
 /*
  * Added at libpng-1.2.8
@@ -411,16 +411,22 @@ extern "C" {
 
 /* This file is arranged in several sections:
  *
- * 1. Any configuration options that can be specified by for the application
+ * 1. [omitted]
+ * 2. Any configuration options that can be specified by for the application
  *    code when it is built.  (Build time configuration is in pnglibconf.h)
- * 2. Type definitions (base types are defined in pngconf.h), structure
+ * 3. Type definitions (base types are defined in pngconf.h), structure
  *    definitions.
- * 3. Exported library functions.
+ * 4. Exported library functions.
+ * 5. Simplified API.
+ * 6. Implementation options.
  *
  * The library source code has additional files (principally pngpriv.h) that
  * allow configuration of the library.
  */
-/* Section 1: run time configuration
+
+/* Section 1: [omitted] */
+
+/* Section 2: run time configuration
  * See pnglibconf.h for build time configuration
  *
  * Run time configuration allows the application to choose between
@@ -450,7 +456,7 @@ extern "C" {
  * Otherwise the calls are mapped to png_error.
  */
 
-/* Section 2: type definitions, including structures and compile time
+/* Section 3: type definitions, including structures and compile time
  * constants.
  * See pngconf.h for base types that vary by machine/system
  */
@@ -458,7 +464,48 @@ extern "C" {
 /* This triggers a compiler error in png.c, if png.c and png.h
  * do not agree upon the version number.
  */
-typedef char* png_libpng_version_1_5_27;
+typedef char* png_libpng_version_1_6_23;
+
+/* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.
+ *
+ * png_struct is the cache of information used while reading or writing a single
+ * PNG file.  One of these is always required, although the simplified API
+ * (below) hides the creation and destruction of it.
+ */
+typedef struct png_struct_def png_struct;
+typedef const png_struct * png_const_structp;
+typedef png_struct * png_structp;
+typedef png_struct * * png_structpp;
+
+/* png_info contains information read from or to be written to a PNG file.  One
+ * or more of these must exist while reading or creating a PNG file.  The
+ * information is not used by libpng during read but is used to control what
+ * gets written when a PNG file is created.  "png_get_" function calls read
+ * information during read and "png_set_" functions calls write information
+ * when creating a PNG.
+ * been moved into a separate header file that is not accessible to
+ * applications.  Read libpng-manual.txt or libpng.3 for more info.
+ */
+typedef struct png_info_def png_info;
+typedef png_info * png_infop;
+typedef const png_info * png_const_infop;
+typedef png_info * * png_infopp;
+
+/* Types with names ending 'p' are pointer types.  The corresponding types with
+ * names ending 'rp' are identical pointer types except that the pointer is
+ * marked 'restrict', which means that it is the only pointer to the object
+ * passed to the function.  Applications should not use the 'restrict' types;
+ * it is always valid to pass 'p' to a pointer with a function argument of the
+ * corresponding 'rp' type.  Different compilers have different rules with
+ * regard to type matching in the presence of 'restrict'.  For backward
+ * compatibility libpng callbacks never have 'restrict' in their parameters and,
+ * consequentially, writing portable application code is extremely difficult if
+ * an attempt is made to use 'restrict'.
+ */
+typedef png_struct * PNG_RESTRICT png_structrp;
+typedef const png_struct * PNG_RESTRICT png_const_structrp;
+typedef png_info * PNG_RESTRICT png_inforp;
+typedef const png_info * PNG_RESTRICT png_const_inforp;
 
 /* Three color definitions.  The order of the red, green, and blue, (and the
  * exact size) is not important, although the size of the fields need to
@@ -470,9 +517,9 @@ typedef struct png_color_struct
    png_byte green;
    png_byte blue;
 } png_color;
-typedef png_color FAR * png_colorp;
-typedef PNG_CONST png_color FAR * png_const_colorp;
-typedef png_color FAR * FAR * png_colorpp;
+typedef png_color * png_colorp;
+typedef const png_color * png_const_colorp;
+typedef png_color * * png_colorpp;
 
 typedef struct png_color_16_struct
 {
@@ -482,9 +529,9 @@ typedef struct png_color_16_struct
    png_uint_16 blue;
    png_uint_16 gray;  /* for use in grayscale files */
 } png_color_16;
-typedef png_color_16 FAR * png_color_16p;
-typedef PNG_CONST png_color_16 FAR * png_const_color_16p;
-typedef png_color_16 FAR * FAR * png_color_16pp;
+typedef png_color_16 * png_color_16p;
+typedef const png_color_16 * png_const_color_16p;
+typedef png_color_16 * * png_color_16pp;
 
 typedef struct png_color_8_struct
 {
@@ -494,9 +541,9 @@ typedef struct png_color_8_struct
    png_byte gray;  /* for use in grayscale files */
    png_byte alpha; /* for alpha channel files */
 } png_color_8;
-typedef png_color_8 FAR * png_color_8p;
-typedef PNG_CONST png_color_8 FAR * png_const_color_8p;
-typedef png_color_8 FAR * FAR * png_color_8pp;
+typedef png_color_8 * png_color_8p;
+typedef const png_color_8 * png_const_color_8p;
+typedef png_color_8 * * png_color_8pp;
 
 /*
  * The following two structures are used for the in-core representation
@@ -510,9 +557,9 @@ typedef struct png_sPLT_entry_struct
    png_uint_16 alpha;
    png_uint_16 frequency;
 } png_sPLT_entry;
-typedef png_sPLT_entry FAR * png_sPLT_entryp;
-typedef PNG_CONST png_sPLT_entry FAR * png_const_sPLT_entryp;
-typedef png_sPLT_entry FAR * FAR * png_sPLT_entrypp;
+typedef png_sPLT_entry * png_sPLT_entryp;
+typedef const png_sPLT_entry * png_const_sPLT_entryp;
+typedef png_sPLT_entry * * png_sPLT_entrypp;
 
 /*  When the depth of the sPLT palette is 8 bits, the color and alpha samples
  *  occupy the LSB of their respective members, and the MSB of each member
@@ -526,9 +573,9 @@ typedef struct png_sPLT_struct
    png_sPLT_entryp entries;  /* palette entries */
    png_int_32 nentries;      /* number of palette entries */
 } png_sPLT_t;
-typedef png_sPLT_t FAR * png_sPLT_tp;
-typedef PNG_CONST png_sPLT_t FAR * png_const_sPLT_tp;
-typedef png_sPLT_t FAR * FAR * png_sPLT_tpp;
+typedef png_sPLT_t * png_sPLT_tp;
+typedef const png_sPLT_t * png_const_sPLT_tp;
+typedef png_sPLT_t * * png_sPLT_tpp;
 
 #ifdef PNG_TEXT_SUPPORTED
 /* png_text holds the contents of a text/ztxt/itxt chunk in a PNG file,
@@ -565,9 +612,9 @@ typedef struct png_text_struct
    png_charp lang_key;     /* keyword translated UTF-8 string, 0 or more
                               chars or a NULL pointer */
 } png_text;
-typedef png_text FAR * png_textp;
-typedef PNG_CONST png_text FAR * png_const_textp;
-typedef png_text FAR * FAR * png_textpp;
+typedef png_text * png_textp;
+typedef const png_text * png_const_textp;
+typedef png_text * * png_textpp;
 #endif
 
 /* Supported compression types for text in PNG files (tEXt, and zTXt).
@@ -595,49 +642,45 @@ typedef struct png_time_struct
    png_byte minute;  /* minute of hour, 0 - 59 */
    png_byte second;  /* second of minute, 0 - 60 (for leap seconds) */
 } png_time;
-typedef png_time FAR * png_timep;
-typedef PNG_CONST png_time FAR * png_const_timep;
-typedef png_time FAR * FAR * png_timepp;
+typedef png_time * png_timep;
+typedef const png_time * png_const_timep;
+typedef png_time * * png_timepp;
 
-#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) || \
-    defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
+#if defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) ||\
+   defined(PNG_USER_CHUNKS_SUPPORTED)
 /* png_unknown_chunk is a structure to hold queued chunks for which there is
  * no specific support.  The idea is that we can use this to queue
  * up private chunks for output even though the library doesn't actually
  * know about their semantics.
+ *
+ * The data in the structure is set by libpng on read and used on write.
  */
 typedef struct png_unknown_chunk_t
 {
-    png_byte name[5];
-    png_byte *data;
+    png_byte name[5]; /* Textual chunk name with '\0' terminator */
+    png_byte *data;   /* Data, should not be modified on read! */
     png_size_t size;
 
-    /* libpng-using applications should NOT directly modify this byte. */
+    /* On write 'location' must be set using the flag values listed below.
+     * Notice that on read it is set by libpng however the values stored have
+     * more bits set than are listed below.  Always treat the value as a
+     * bitmask.  On write set only one bit - setting multiple bits may cause the
+     * chunk to be written in multiple places.
+     */
     png_byte location; /* mode of operation at read time */
 }
-
-
 png_unknown_chunk;
-typedef png_unknown_chunk FAR * png_unknown_chunkp;
-typedef PNG_CONST png_unknown_chunk FAR * png_const_unknown_chunkp;
-typedef png_unknown_chunk FAR * FAR * png_unknown_chunkpp;
-#endif
 
-/* Values for the unknown chunk location byte */
+typedef png_unknown_chunk * png_unknown_chunkp;
+typedef const png_unknown_chunk * png_const_unknown_chunkp;
+typedef png_unknown_chunk * * png_unknown_chunkpp;
+#endif
 
+/* Flag values for the unknown chunk location byte. */
 #define PNG_HAVE_IHDR  0x01
 #define PNG_HAVE_PLTE  0x02
 #define PNG_AFTER_IDAT 0x08
 
-/* The complete definition of png_info has, as of libpng-1.5.0,
- * been moved into a separate header file that is not accessible to
- * applications.  Read libpng-manual.txt or libpng.3 for more info.
- */
-typedef struct png_info_def png_info;
-typedef png_info FAR * png_infop;
-typedef PNG_CONST png_info FAR * png_const_infop;
-typedef png_info FAR * FAR * png_infopp;
-
 /* Maximum positive integer used in PNG is (2^31)-1 */
 #define PNG_UINT_31_MAX ((png_uint_32)0x7fffffffL)
 #define PNG_UINT_32_MAX ((png_uint_32)(-1))
@@ -753,16 +796,8 @@ typedef struct png_row_info_struct
    png_byte pixel_depth; /* bits per pixel (depth * channels) */
 } png_row_info;
 
-typedef png_row_info FAR * png_row_infop;
-typedef png_row_info FAR * FAR * png_row_infopp;
-
-/* The complete definition of png_struct has, as of libpng-1.5.0,
- * been moved into a separate header file that is not accessible to
- * applications.  Read libpng-manual.txt or libpng.3 for more info.
- */
-typedef struct png_struct_def png_struct;
-typedef PNG_CONST png_struct FAR * png_const_structp;
-typedef png_struct FAR * png_structp;
+typedef png_row_info * png_row_infop;
+typedef png_row_info * * png_row_infopp;
 
 /* These are the function types for the I/O functions and for the functions
  * that allow the user to override the default I/O functions with his or her
@@ -809,7 +844,8 @@ typedef PNG_CALLBACK(int, *png_user_chunk_ptr, (png_structp,
     png_unknown_chunkp));
 #endif
 #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-typedef PNG_CALLBACK(void, *png_unknown_chunk_ptr, (png_structp));
+/* not used anywhere */
+/* typedef PNG_CALLBACK(void, *png_unknown_chunk_ptr, (png_structp)); */
 #endif
 
 #ifdef PNG_SETJMP_SUPPORTED
@@ -848,7 +884,9 @@ PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), PNGARG((jmp_buf, int)), typedef);
 #define PNG_TRANSFORM_GRAY_TO_RGB   0x2000      /* read only */
 /* Added to libpng-1.5.4 */
 #define PNG_TRANSFORM_EXPAND_16     0x4000      /* read only */
+#if INT_MAX >= 0x8000 /* else this might break */
 #define PNG_TRANSFORM_SCALE_16      0x8000      /* read only */
+#endif
 
 /* Flags for MNG supported features */
 #define PNG_FLAG_MNG_EMPTY_PLTE     0x01
@@ -865,9 +903,7 @@ typedef PNG_CALLBACK(png_voidp, *png_malloc_ptr, (png_structp,
     png_alloc_size_t));
 typedef PNG_CALLBACK(void, *png_free_ptr, (png_structp, png_voidp));
 
-typedef png_struct FAR * FAR * png_structpp;
-
-/* Section 3: exported functions
+/* Section 4: exported functions
  * Here are the function definitions most commonly used.  This is not
  * the place to find out how to use libpng.  See libpng-manual.txt for the
  * full explanation, see example.c for the summary.  This just provides
@@ -902,7 +938,7 @@ PNG_EXPORT(1, png_uint_32, png_access_version_number, (void));
 /* Tell lib we have already handled the first <num_bytes> magic bytes.
  * Handling more than 8 bytes from the beginning of the file is an error.
  */
-PNG_EXPORT(2, void, png_set_sig_bytes, (png_structp png_ptr, int num_bytes));
+PNG_EXPORT(2, void, png_set_sig_bytes, (png_structrp png_ptr, int num_bytes));
 
 /* Check sig[start] through sig[start + num_to_check - 1] to see if it's a
  * PNG file.  Returns zero if the supplied bytes match the 8-byte PNG
@@ -929,13 +965,11 @@ PNG_EXPORTA(5, png_structp, png_create_write_struct,
     png_error_ptr warn_fn),
     PNG_ALLOCATED);
 
-#ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
 PNG_EXPORT(6, png_size_t, png_get_compression_buffer_size,
-    (png_const_structp png_ptr));
+    (png_const_structrp png_ptr));
 
-PNG_EXPORT(7, void, png_set_compression_buffer_size, (png_structp png_ptr,
+PNG_EXPORT(7, void, png_set_compression_buffer_size, (png_structrp png_ptr,
     png_size_t size));
-#endif /* WRITE_CUSTOMIZE_COMPRESSION */
 
 /* Moved from pngconf.h in 1.4.0 and modified to ensure setjmp/longjmp
  * match up.
@@ -948,10 +982,10 @@ PNG_EXPORT(7, void, png_set_compression_buffer_size, (png_structp png_ptr,
  * allocated by the library - the call will return NULL on a mismatch
  * indicating an ABI mismatch.
  */
-PNG_EXPORT(8, jmp_buf*, png_set_longjmp_fn, (png_structp png_ptr,
+PNG_EXPORT(8, jmp_buf*, png_set_longjmp_fn, (png_structrp png_ptr,
     png_longjmp_ptr longjmp_fn, size_t jmp_buf_size));
 #  define png_jmpbuf(png_ptr) \
-      (*png_set_longjmp_fn((png_ptr), longjmp, sizeof (jmp_buf)))
+      (*png_set_longjmp_fn((png_ptr), longjmp, (sizeof (jmp_buf))))
 #else
 #  define png_jmpbuf(png_ptr) \
       (LIBPNG_WAS_COMPILED_WITH__PNG_NO_SETJMP)
@@ -961,12 +995,12 @@ PNG_EXPORT(8, jmp_buf*, png_set_longjmp_fn, (png_structp png_ptr,
  * will use it; otherwise it will call PNG_ABORT().  This function was
  * added in libpng-1.5.0.
  */
-PNG_EXPORTA(9, void, png_longjmp, (png_structp png_ptr, int val),
+PNG_EXPORTA(9, void, png_longjmp, (png_const_structrp png_ptr, int val),
     PNG_NORETURN);
 
 #ifdef PNG_READ_SUPPORTED
 /* Reset the compression stream */
-PNG_EXPORT(10, int, png_reset_zstream, (png_structp png_ptr));
+PNG_EXPORTA(10, int, png_reset_zstream, (png_structrp png_ptr), PNG_DEPRECATED);
 #endif
 
 /* New functions added in libpng-1.0.2 (not enabled by default until 1.2.0) */
@@ -984,81 +1018,92 @@ PNG_EXPORTA(12, png_structp, png_create_write_struct_2,
 #endif
 
 /* Write the PNG file signature. */
-PNG_EXPORT(13, void, png_write_sig, (png_structp png_ptr));
+PNG_EXPORT(13, void, png_write_sig, (png_structrp png_ptr));
 
 /* Write a PNG chunk - size, type, (optional) data, CRC. */
-PNG_EXPORT(14, void, png_write_chunk, (png_structp png_ptr, png_const_bytep
+PNG_EXPORT(14, void, png_write_chunk, (png_structrp png_ptr, png_const_bytep
     chunk_name, png_const_bytep data, png_size_t length));
 
 /* Write the start of a PNG chunk - length and chunk name. */
-PNG_EXPORT(15, void, png_write_chunk_start, (png_structp png_ptr,
+PNG_EXPORT(15, void, png_write_chunk_start, (png_structrp png_ptr,
     png_const_bytep chunk_name, png_uint_32 length));
 
 /* Write the data of a PNG chunk started with png_write_chunk_start(). */
-PNG_EXPORT(16, void, png_write_chunk_data, (png_structp png_ptr,
+PNG_EXPORT(16, void, png_write_chunk_data, (png_structrp png_ptr,
     png_const_bytep data, png_size_t length));
 
 /* Finish a chunk started with png_write_chunk_start() (includes CRC). */
-PNG_EXPORT(17, void, png_write_chunk_end, (png_structp png_ptr));
+PNG_EXPORT(17, void, png_write_chunk_end, (png_structrp png_ptr));
 
 /* Allocate and initialize the info structure */
-PNG_EXPORTA(18, png_infop, png_create_info_struct, (png_structp png_ptr),
+PNG_EXPORTA(18, png_infop, png_create_info_struct, (png_const_structrp png_ptr),
     PNG_ALLOCATED);
 
-PNG_EXPORT(19, void, png_info_init_3, (png_infopp info_ptr,
-    png_size_t png_info_struct_size));
+/* DEPRECATED: this function allowed init structures to be created using the
+ * default allocation method (typically malloc).  Use is deprecated in 1.6.0 and
+ * the API will be removed in the future.
+ */
+PNG_EXPORTA(19, void, png_info_init_3, (png_infopp info_ptr,
+    png_size_t png_info_struct_size), PNG_DEPRECATED);
 
 /* Writes all the PNG information before the image. */
 PNG_EXPORT(20, void, png_write_info_before_PLTE,
-    (png_structp png_ptr, png_infop info_ptr));
+    (png_structrp png_ptr, png_const_inforp info_ptr));
 PNG_EXPORT(21, void, png_write_info,
-    (png_structp png_ptr, png_infop info_ptr));
+    (png_structrp png_ptr, png_const_inforp info_ptr));
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read the information before the actual image data. */
 PNG_EXPORT(22, void, png_read_info,
-    (png_structp png_ptr, png_infop info_ptr));
+    (png_structrp png_ptr, png_inforp info_ptr));
 #endif
 
 #ifdef PNG_TIME_RFC1123_SUPPORTED
-PNG_EXPORT(23, png_const_charp, png_convert_to_rfc1123,
-    (png_structp png_ptr,
+   /* Convert to a US string format: there is no localization support in this
+    * routine.  The original implementation used a 29 character buffer in
+    * png_struct, this will be removed in future versions.
+    */
+#if PNG_LIBPNG_VER < 10700
+/* To do: remove this from libpng17 (and from libpng17/png.c and pngstruct.h) */
+PNG_EXPORTA(23, png_const_charp, png_convert_to_rfc1123, (png_structrp png_ptr,
+    png_const_timep ptime),PNG_DEPRECATED);
+#endif
+PNG_EXPORT(241, int, png_convert_to_rfc1123_buffer, (char out[29],
     png_const_timep ptime));
 #endif
 
 #ifdef PNG_CONVERT_tIME_SUPPORTED
 /* Convert from a struct tm to png_time */
 PNG_EXPORT(24, void, png_convert_from_struct_tm, (png_timep ptime,
-    PNG_CONST struct tm FAR * ttime));
+    const struct tm * ttime));
 
 /* Convert from time_t to png_time.  Uses gmtime() */
-PNG_EXPORT(25, void, png_convert_from_time_t,
-    (png_timep ptime, time_t ttime));
-#endif /* PNG_CONVERT_tIME_SUPPORTED */
+PNG_EXPORT(25, void, png_convert_from_time_t, (png_timep ptime, time_t ttime));
+#endif /* CONVERT_tIME */
 
 #ifdef PNG_READ_EXPAND_SUPPORTED
 /* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
-PNG_EXPORT(26, void, png_set_expand, (png_structp png_ptr));
-PNG_EXPORT(27, void, png_set_expand_gray_1_2_4_to_8, (png_structp png_ptr));
-PNG_EXPORT(28, void, png_set_palette_to_rgb, (png_structp png_ptr));
-PNG_EXPORT(29, void, png_set_tRNS_to_alpha, (png_structp png_ptr));
+PNG_EXPORT(26, void, png_set_expand, (png_structrp png_ptr));
+PNG_EXPORT(27, void, png_set_expand_gray_1_2_4_to_8, (png_structrp png_ptr));
+PNG_EXPORT(28, void, png_set_palette_to_rgb, (png_structrp png_ptr));
+PNG_EXPORT(29, void, png_set_tRNS_to_alpha, (png_structrp png_ptr));
 #endif
 
 #ifdef PNG_READ_EXPAND_16_SUPPORTED
 /* Expand to 16-bit channels, forces conversion of palette to RGB and expansion
  * of a tRNS chunk if present.
  */
-PNG_EXPORT(221, void, png_set_expand_16, (png_structp png_ptr));
+PNG_EXPORT(221, void, png_set_expand_16, (png_structrp png_ptr));
 #endif
 
 #if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
 /* Use blue, green, red order for pixels. */
-PNG_EXPORT(30, void, png_set_bgr, (png_structp png_ptr));
+PNG_EXPORT(30, void, png_set_bgr, (png_structrp png_ptr));
 #endif
 
 #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
 /* Expand the grayscale to 24-bit RGB if necessary. */
-PNG_EXPORT(31, void, png_set_gray_to_rgb, (png_structp png_ptr));
+PNG_EXPORT(31, void, png_set_gray_to_rgb, (png_structrp png_ptr));
 #endif
 
 #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
@@ -1068,12 +1113,12 @@ PNG_EXPORT(31, void, png_set_gray_to_rgb, (png_structp png_ptr));
 #define PNG_ERROR_ACTION_ERROR 3
 #define PNG_RGB_TO_GRAY_DEFAULT (-1)/*for red/green coefficients*/
 
-PNG_FP_EXPORT(32, void, png_set_rgb_to_gray, (png_structp png_ptr,
+PNG_FP_EXPORT(32, void, png_set_rgb_to_gray, (png_structrp png_ptr,
     int error_action, double red, double green))
-PNG_FIXED_EXPORT(33, void, png_set_rgb_to_gray_fixed, (png_structp png_ptr,
+PNG_FIXED_EXPORT(33, void, png_set_rgb_to_gray_fixed, (png_structrp png_ptr,
     int error_action, png_fixed_point red, png_fixed_point green))
 
-PNG_EXPORT(34, png_byte, png_get_rgb_to_gray_status, (png_const_structp
+PNG_EXPORT(34, png_byte, png_get_rgb_to_gray_status, (png_const_structrp
     png_ptr));
 #endif
 
@@ -1083,9 +1128,9 @@ PNG_EXPORT(35, void, png_build_grayscale_palette, (int bit_depth,
 #endif
 
 #ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-/* How the alpha channel is interpreted - this affects how the color channels of
- * a PNG file are returned when an alpha channel, or tRNS chunk in a palette
- * file, is present.
+/* How the alpha channel is interpreted - this affects how the color channels
+ * of a PNG file are returned to the calling application when an alpha channel,
+ * or a tRNS chunk in a palette file, is present.
  *
  * This has no effect on the way pixels are written into a PNG output
  * datastream. The color samples in a PNG datastream are never premultiplied
@@ -1093,33 +1138,19 @@ PNG_EXPORT(35, void, png_build_grayscale_palette, (int bit_depth,
  *
  * The default is to return data according to the PNG specification: the alpha
  * channel is a linear measure of the contribution of the pixel to the
- * corresponding composited pixel.  The gamma encoded color channels must be
- * scaled according to the contribution and to do this it is necessary to undo
+ * corresponding composited pixel, and the color channels are unassociated
+ * (not premultiplied).  The gamma encoded color channels must be scaled
+ * according to the contribution and to do this it is necessary to undo
  * the encoding, scale the color values, perform the composition and reencode
  * the values.  This is the 'PNG' mode.
  *
  * The alternative is to 'associate' the alpha with the color information by
- * storing color channel values that have been scaled by the alpha.  The
- * advantage is that the color channels can be resampled (the image can be
- * scaled) in this form.  The disadvantage is that normal practice is to store
- * linear, not (gamma) encoded, values and this requires 16-bit channels for
- * still images rather than the 8-bit channels that are just about sufficient if
- * gamma encoding is used.  In addition all non-transparent pixel values,
- * including completely opaque ones, must be gamma encoded to produce the final
- * image.  This is the 'STANDARD', 'ASSOCIATED' or 'PREMULTIPLIED' mode (the
- * latter being the two common names for associated alpha color channels.)
- *
- * Since it is not necessary to perform arithmetic on opaque color values so
- * long as they are not to be resampled and are in the final color space it is
- * possible to optimize the handling of alpha by storing the opaque pixels in
- * the PNG format (adjusted for the output color space) while storing partially
- * opaque pixels in the standard, linear, format.  The accuracy required for
- * standard alpha composition is relatively low, because the pixels are
- * isolated, therefore typically the accuracy loss in storing 8-bit linear
- * values is acceptable.  (This is not true if the alpha channel is used to
- * simulate transparency over large areas - use 16 bits or the PNG mode in
- * this case!)  This is the 'OPTIMIZED' mode.  For this mode a pixel is
- * treated as opaque only if the alpha value is equal to the maximum value.
+ * storing color channel values that have been scaled by the alpha.
+ * image.  These are the 'STANDARD', 'ASSOCIATED' or 'PREMULTIPLIED' modes
+ * (the latter being the two common names for associated alpha color channels).
+ *
+ * For the 'OPTIMIZED' mode, a pixel is treated as opaque only if the alpha
+ * value is equal to the maximum value.
  *
  * The final choice is to gamma encode the alpha channel as well.  This is
  * broken because, in practice, no implementation that uses this choice
@@ -1138,76 +1169,15 @@ PNG_EXPORT(35, void, png_build_grayscale_palette, (int bit_depth,
 #define PNG_ALPHA_OPTIMIZED     2 /* 'PNG' for opaque pixels, else 'STANDARD' */
 #define PNG_ALPHA_BROKEN        3 /* the alpha channel is gamma encoded */
 
-PNG_FP_EXPORT(227, void, png_set_alpha_mode, (png_structp png_ptr, int mode,
+PNG_FP_EXPORT(227, void, png_set_alpha_mode, (png_structrp png_ptr, int mode,
     double output_gamma))
-PNG_FIXED_EXPORT(228, void, png_set_alpha_mode_fixed, (png_structp png_ptr,
+PNG_FIXED_EXPORT(228, void, png_set_alpha_mode_fixed, (png_structrp png_ptr,
     int mode, png_fixed_point output_gamma))
 #endif
 
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_ALPHA_MODE_SUPPORTED)
+#if defined(PNG_GAMMA_SUPPORTED) || defined(PNG_READ_ALPHA_MODE_SUPPORTED)
 /* The output_gamma value is a screen gamma in libpng terminology: it expresses
- * how to decode the output values, not how they are encoded.  The values used
- * correspond to the normal numbers used to describe the overall gamma of a
- * computer display system; for example 2.2 for an sRGB conformant system.  The
- * values are scaled by 100000 in the _fixed version of the API (so 220000 for
- * sRGB.)
- *
- * The inverse of the value is always used to provide a default for the PNG file
- * encoding if it has no gAMA chunk and if png_set_gamma() has not been called
- * to override the PNG gamma information.
- *
- * When the ALPHA_OPTIMIZED mode is selected the output gamma is used to encode
- * opaque pixels however pixels with lower alpha values are not encoded,
- * regardless of the output gamma setting.
- *
- * When the standard Porter Duff handling is requested with mode 1 the output
- * encoding is set to be linear and the output_gamma value is only relevant
- * as a default for input data that has no gamma information.  The linear output
- * encoding will be overridden if png_set_gamma() is called - the results may be
- * highly unexpected!
- *
- * The following numbers are derived from the sRGB standard and the research
- * behind it.  sRGB is defined to be approximated by a PNG gAMA chunk value of
- * 0.45455 (1/2.2) for PNG.  The value implicitly includes any viewing
- * correction required to take account of any differences in the color
- * environment of the original scene and the intended display environment; the
- * value expresses how to *decode* the image for display, not how the original
- * data was *encoded*.
- *
- * sRGB provides a peg for the PNG standard by defining a viewing environment.
- * sRGB itself, and earlier TV standards, actually use a more complex transform
- * (a linear portion then a gamma 2.4 power law) than PNG can express.  (PNG is
- * limited to simple power laws.)  By saying that an image for direct display on
- * an sRGB conformant system should be stored with a gAMA chunk value of 45455
- * (11.3.3.2 and 11.3.3.5 of the ISO PNG specification) the PNG specification
- * makes it possible to derive values for other display systems and
- * environments.
- *
- * The Mac value is deduced from the sRGB based on an assumption that the actual
- * extra viewing correction used in early Mac display systems was implemented as
- * a power 1.45 lookup table.
- *
- * Any system where a programmable lookup table is used or where the behavior of
- * the final display device characteristics can be changed requires system
- * specific code to obtain the current characteristic.  However this can be
- * difficult and most PNG gamma correction only requires an approximate value.
- *
- * By default, if png_set_alpha_mode() is not called, libpng assumes that all
- * values are unencoded, linear, values and that the output device also has a
- * linear characteristic.  This is only very rarely correct - it is invariably
- * better to call png_set_alpha_mode() with PNG_DEFAULT_sRGB than rely on the
- * default if you don't know what the right answer is!
- *
- * The special value PNG_GAMMA_MAC_18 indicates an older Mac system (pre Mac OS
- * 10.6) which used a correction table to implement a somewhat lower gamma on an
- * otherwise sRGB system.
- *
- * Both these values are reserved (not simple gamma values) in order to allow
- * more precise correction internally in the future.
- *
- * NOTE: the following values can be passed to either the fixed or floating
- * point APIs, but the floating point API will also accept floating point
- * values.
+ * how to decode the output values, not how they are encoded.
  */
 #define PNG_DEFAULT_sRGB -1       /* sRGB gamma and color space */
 #define PNG_GAMMA_MAC_18 -2       /* Old Mac '1.8' gamma and color space */
@@ -1292,51 +1262,50 @@ PNG_FIXED_EXPORT(228, void, png_set_alpha_mode_fixed, (png_structp png_ptr,
  */
 
 #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-PNG_EXPORT(36, void, png_set_strip_alpha, (png_structp png_ptr));
+PNG_EXPORT(36, void, png_set_strip_alpha, (png_structrp png_ptr));
 #endif
 
 #if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
     defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
-PNG_EXPORT(37, void, png_set_swap_alpha, (png_structp png_ptr));
+PNG_EXPORT(37, void, png_set_swap_alpha, (png_structrp png_ptr));
 #endif
 
 #if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
     defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
-PNG_EXPORT(38, void, png_set_invert_alpha, (png_structp png_ptr));
+PNG_EXPORT(38, void, png_set_invert_alpha, (png_structrp png_ptr));
 #endif
 
 #if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
-/* Add a filler byte to 8-bit Gray or 24-bit RGB images. */
-PNG_EXPORT(39, void, png_set_filler, (png_structp png_ptr, png_uint_32 filler,
+/* Add a filler byte to 8-bit or 16-bit Gray or 24-bit or 48-bit RGB images. */
+PNG_EXPORT(39, void, png_set_filler, (png_structrp png_ptr, png_uint_32 filler,
     int flags));
 /* The values of the PNG_FILLER_ defines should NOT be changed */
 #  define PNG_FILLER_BEFORE 0
 #  define PNG_FILLER_AFTER 1
-/* Add an alpha byte to 8-bit Gray or 24-bit RGB images. */
-PNG_EXPORT(40, void, png_set_add_alpha,
-    (png_structp png_ptr, png_uint_32 filler,
-    int flags));
-#endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */
+/* Add an alpha byte to 8-bit or 16-bit Gray or 24-bit or 48-bit RGB images. */
+PNG_EXPORT(40, void, png_set_add_alpha, (png_structrp png_ptr,
+    png_uint_32 filler, int flags));
+#endif /* READ_FILLER || WRITE_FILLER */
 
 #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
 /* Swap bytes in 16-bit depth files. */
-PNG_EXPORT(41, void, png_set_swap, (png_structp png_ptr));
+PNG_EXPORT(41, void, png_set_swap, (png_structrp png_ptr));
 #endif
 
 #if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
 /* Use 1 byte per pixel in 1, 2, or 4-bit depth files. */
-PNG_EXPORT(42, void, png_set_packing, (png_structp png_ptr));
+PNG_EXPORT(42, void, png_set_packing, (png_structrp png_ptr));
 #endif
 
 #if defined(PNG_READ_PACKSWAP_SUPPORTED) || \
     defined(PNG_WRITE_PACKSWAP_SUPPORTED)
 /* Swap packing order of pixels in bytes. */
-PNG_EXPORT(43, void, png_set_packswap, (png_structp png_ptr));
+PNG_EXPORT(43, void, png_set_packswap, (png_structrp png_ptr));
 #endif
 
 #if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
 /* Converts files to legal bit depths. */
-PNG_EXPORT(44, void, png_set_shift, (png_structp png_ptr, png_const_color_8p
+PNG_EXPORT(44, void, png_set_shift, (png_structrp png_ptr, png_const_color_8p
     true_bits));
 #endif
 
@@ -1348,12 +1317,12 @@ PNG_EXPORT(44, void, png_set_shift, (png_structp png_ptr, png_const_color_8p
  * necessary to call png_read_row or png_read_rows png_get_image_height
  * times for each pass.
 */
-PNG_EXPORT(45, int, png_set_interlace_handling, (png_structp png_ptr));
+PNG_EXPORT(45, int, png_set_interlace_handling, (png_structrp png_ptr));
 #endif
 
 #if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
 /* Invert monochrome files */
-PNG_EXPORT(46, void, png_set_invert_mono, (png_structp png_ptr));
+PNG_EXPORT(46, void, png_set_invert_mono, (png_structrp png_ptr));
 #endif
 
 #ifdef PNG_READ_BACKGROUND_SUPPORTED
@@ -1362,10 +1331,10 @@ PNG_EXPORT(46, void, png_set_invert_mono, (png_structp png_ptr));
  * read.  Doing so will result in unexpected behavior and possible warnings or
  * errors if the PNG file contains a bKGD chunk.
  */
-PNG_FP_EXPORT(47, void, png_set_background, (png_structp png_ptr,
+PNG_FP_EXPORT(47, void, png_set_background, (png_structrp png_ptr,
     png_const_color_16p background_color, int background_gamma_code,
     int need_expand, double background_gamma))
-PNG_FIXED_EXPORT(215, void, png_set_background_fixed, (png_structp png_ptr,
+PNG_FIXED_EXPORT(215, void, png_set_background_fixed, (png_structrp png_ptr,
     png_const_color_16p background_color, int background_gamma_code,
     int need_expand, png_fixed_point background_gamma))
 #endif
@@ -1378,23 +1347,22 @@ PNG_FIXED_EXPORT(215, void, png_set_background_fixed, (png_structp png_ptr,
 
 #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
 /* Scale a 16-bit depth file down to 8-bit, accurately. */
-PNG_EXPORT(229, void, png_set_scale_16, (png_structp png_ptr));
+PNG_EXPORT(229, void, png_set_scale_16, (png_structrp png_ptr));
 #endif
 
 #ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
 #define PNG_READ_16_TO_8_SUPPORTED /* Name prior to 1.5.4 */
 /* Strip the second byte of information from a 16-bit depth file. */
-PNG_EXPORT(48, void, png_set_strip_16, (png_structp png_ptr));
+PNG_EXPORT(48, void, png_set_strip_16, (png_structrp png_ptr));
 #endif
 
 #ifdef PNG_READ_QUANTIZE_SUPPORTED
 /* Turn on quantizing, and reduce the palette to the number of colors
  * available.
  */
-PNG_EXPORT(49, void, png_set_quantize,
-    (png_structp png_ptr, png_colorp palette,
-    int num_palette, int maximum_colors, png_const_uint_16p histogram,
-    int full_quantize));
+PNG_EXPORT(49, void, png_set_quantize, (png_structrp png_ptr,
+    png_colorp palette, int num_palette, int maximum_colors,
+    png_const_uint_16p histogram, int full_quantize));
 #endif
 
 #ifdef PNG_READ_GAMMA_SUPPORTED
@@ -1414,71 +1382,69 @@ PNG_EXPORT(49, void, png_set_quantize,
  * API (floating point or fixed.)  Notice, however, that the 'file_gamma' value
  * is the inverse of a 'screen gamma' value.
  */
-PNG_FP_EXPORT(50, void, png_set_gamma,
-    (png_structp png_ptr, double screen_gamma,
-    double override_file_gamma))
-PNG_FIXED_EXPORT(208, void, png_set_gamma_fixed, (png_structp png_ptr,
+PNG_FP_EXPORT(50, void, png_set_gamma, (png_structrp png_ptr,
+    double screen_gamma, double override_file_gamma))
+PNG_FIXED_EXPORT(208, void, png_set_gamma_fixed, (png_structrp png_ptr,
     png_fixed_point screen_gamma, png_fixed_point override_file_gamma))
 #endif
 
 #ifdef PNG_WRITE_FLUSH_SUPPORTED
 /* Set how many lines between output flushes - 0 for no flushing */
-PNG_EXPORT(51, void, png_set_flush, (png_structp png_ptr, int nrows));
+PNG_EXPORT(51, void, png_set_flush, (png_structrp png_ptr, int nrows));
 /* Flush the current PNG output buffer */
-PNG_EXPORT(52, void, png_write_flush, (png_structp png_ptr));
+PNG_EXPORT(52, void, png_write_flush, (png_structrp png_ptr));
 #endif
 
 /* Optional update palette with requested transformations */
-PNG_EXPORT(53, void, png_start_read_image, (png_structp png_ptr));
+PNG_EXPORT(53, void, png_start_read_image, (png_structrp png_ptr));
 
 /* Optional call to update the users info structure */
-PNG_EXPORT(54, void, png_read_update_info,
-    (png_structp png_ptr, png_infop info_ptr));
+PNG_EXPORT(54, void, png_read_update_info, (png_structrp png_ptr,
+    png_inforp info_ptr));
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read one or more rows of image data. */
-PNG_EXPORT(55, void, png_read_rows, (png_structp png_ptr, png_bytepp row,
+PNG_EXPORT(55, void, png_read_rows, (png_structrp png_ptr, png_bytepp row,
     png_bytepp display_row, png_uint_32 num_rows));
 #endif
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read a row of data. */
-PNG_EXPORT(56, void, png_read_row, (png_structp png_ptr, png_bytep row,
+PNG_EXPORT(56, void, png_read_row, (png_structrp png_ptr, png_bytep row,
     png_bytep display_row));
 #endif
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read the whole image into memory at once. */
-PNG_EXPORT(57, void, png_read_image, (png_structp png_ptr, png_bytepp image));
+PNG_EXPORT(57, void, png_read_image, (png_structrp png_ptr, png_bytepp image));
 #endif
 
 /* Write a row of image data */
-PNG_EXPORT(58, void, png_write_row,
-    (png_structp png_ptr, png_const_bytep row));
+PNG_EXPORT(58, void, png_write_row, (png_structrp png_ptr,
+    png_const_bytep row));
 
 /* Write a few rows of image data: (*row) is not written; however, the type
  * is declared as writeable to maintain compatibility with previous versions
  * of libpng and to allow the 'display_row' array from read_rows to be passed
  * unchanged to write_rows.
  */
-PNG_EXPORT(59, void, png_write_rows, (png_structp png_ptr, png_bytepp row,
+PNG_EXPORT(59, void, png_write_rows, (png_structrp png_ptr, png_bytepp row,
     png_uint_32 num_rows));
 
 /* Write the image data */
-PNG_EXPORT(60, void, png_write_image,
-    (png_structp png_ptr, png_bytepp image));
+PNG_EXPORT(60, void, png_write_image, (png_structrp png_ptr, png_bytepp image));
 
 /* Write the end of the PNG file. */
-PNG_EXPORT(61, void, png_write_end,
-    (png_structp png_ptr, png_infop info_ptr));
+PNG_EXPORT(61, void, png_write_end, (png_structrp png_ptr,
+    png_inforp info_ptr));
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read the end of the PNG file. */
-PNG_EXPORT(62, void, png_read_end, (png_structp png_ptr, png_infop info_ptr));
+PNG_EXPORT(62, void, png_read_end, (png_structrp png_ptr, png_inforp info_ptr));
 #endif
 
 /* Free any memory associated with the png_info_struct */
-PNG_EXPORT(63, void, png_destroy_info_struct, (png_structp png_ptr,
+PNG_EXPORT(63, void, png_destroy_info_struct, (png_const_structrp png_ptr,
     png_infopp info_ptr_ptr));
 
 /* Free any memory associated with the png_struct and the png_info_structs */
@@ -1490,8 +1456,8 @@ PNG_EXPORT(65, void, png_destroy_write_struct, (png_structpp png_ptr_ptr,
     png_infopp info_ptr_ptr));
 
 /* Set the libpng method of handling chunk CRC errors */
-PNG_EXPORT(66, void, png_set_crc_action,
-    (png_structp png_ptr, int crit_action, int ancil_action));
+PNG_EXPORT(66, void, png_set_crc_action, (png_structrp png_ptr, int crit_action,
+    int ancil_action));
 
 /* Values for png_set_crc_action() say how to handle CRC errors in
  * ancillary and critical chunks, and whether to use the data contained
@@ -1509,6 +1475,7 @@ PNG_EXPORT(66, void, png_set_crc_action,
 #define PNG_CRC_QUIET_USE     4  /* quiet/use data      quiet/use data    */
 #define PNG_CRC_NO_CHANGE     5  /* use current value   use current value */
 
+#ifdef PNG_WRITE_SUPPORTED
 /* These functions give the user control over the scan-line filtering in
  * libpng and the compression methods used by zlib.  These functions are
  * mainly useful for testing, as the defaults should work with most users.
@@ -1520,8 +1487,9 @@ PNG_EXPORT(66, void, png_set_crc_action,
 /* Set the filtering method(s) used by libpng.  Currently, the only valid
  * value for "method" is 0.
  */
-PNG_EXPORT(67, void, png_set_filter,
-    (png_structp png_ptr, int method, int filters));
+PNG_EXPORT(67, void, png_set_filter, (png_structrp png_ptr, int method,
+    int filters));
+#endif /* WRITE */
 
 /* Flags for png_set_filter() to say which filters to use.  The flags
  * are chosen so that they don't conflict with real filter types
@@ -1547,15 +1515,16 @@ PNG_EXPORT(67, void, png_set_filter,
 #define PNG_FILTER_VALUE_PAETH 4
 #define PNG_FILTER_VALUE_LAST  5
 
+#ifdef PNG_WRITE_SUPPORTED
 #ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED /* DEPRECATED */
-PNG_FP_EXPORT(68, void, png_set_filter_heuristics, (png_structp png_ptr,
+PNG_FP_EXPORT(68, void, png_set_filter_heuristics, (png_structrp png_ptr,
     int heuristic_method, int num_weights, png_const_doublep filter_weights,
     png_const_doublep filter_costs))
 PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,
-    (png_structp png_ptr,
-    int heuristic_method, int num_weights, png_const_fixed_point_p
-    filter_weights, png_const_fixed_point_p filter_costs))
-#endif /*  PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
+    (png_structrp png_ptr, int heuristic_method, int num_weights,
+    png_const_fixed_point_p filter_weights,
+    png_const_fixed_point_p filter_costs))
+#endif /* WRITE_WEIGHTED_FILTER */
 
 /* The following are no longer used and will be removed from libpng-1.7: */
 #define PNG_FILTER_HEURISTIC_DEFAULT    0  /* Currently "UNWEIGHTED" */
@@ -1563,7 +1532,6 @@ PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,
 #define PNG_FILTER_HEURISTIC_WEIGHTED   2  /* Experimental feature */
 #define PNG_FILTER_HEURISTIC_LAST       3  /* Not a valid value */
 
-#ifdef PNG_WRITE_SUPPORTED
 /* Set the library compression level.  Currently, valid values range from
  * 0 - 9, corresponding directly to the zlib compression levels 0 - 9
  * (0 - no compression, 9 - "maximal" compression).  Note that tests have
@@ -1572,45 +1540,45 @@ PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,
  * these values may not correspond directly to the zlib compression levels.
  */
 #ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
-PNG_EXPORT(69, void, png_set_compression_level,
-    (png_structp png_ptr, int level));
+PNG_EXPORT(69, void, png_set_compression_level, (png_structrp png_ptr,
+    int level));
 
-PNG_EXPORT(70, void, png_set_compression_mem_level, (png_structp png_ptr,
+PNG_EXPORT(70, void, png_set_compression_mem_level, (png_structrp png_ptr,
     int mem_level));
 
-PNG_EXPORT(71, void, png_set_compression_strategy, (png_structp png_ptr,
+PNG_EXPORT(71, void, png_set_compression_strategy, (png_structrp png_ptr,
     int strategy));
 
 /* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a
  * smaller value of window_bits if it can do so safely.
  */
-PNG_EXPORT(72, void, png_set_compression_window_bits, (png_structp png_ptr,
+PNG_EXPORT(72, void, png_set_compression_window_bits, (png_structrp png_ptr,
     int window_bits));
 
-PNG_EXPORT(73, void, png_set_compression_method, (png_structp png_ptr,
+PNG_EXPORT(73, void, png_set_compression_method, (png_structrp png_ptr,
     int method));
 #endif /* WRITE_CUSTOMIZE_COMPRESSION */
 
 #ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
 /* Also set zlib parameters for compressing non-IDAT chunks */
-PNG_EXPORT(222, void, png_set_text_compression_level,
-    (png_structp png_ptr, int level));
+PNG_EXPORT(222, void, png_set_text_compression_level, (png_structrp png_ptr,
+    int level));
 
-PNG_EXPORT(223, void, png_set_text_compression_mem_level, (png_structp png_ptr,
+PNG_EXPORT(223, void, png_set_text_compression_mem_level, (png_structrp png_ptr,
     int mem_level));
 
-PNG_EXPORT(224, void, png_set_text_compression_strategy, (png_structp png_ptr,
+PNG_EXPORT(224, void, png_set_text_compression_strategy, (png_structrp png_ptr,
     int strategy));
 
 /* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a
  * smaller value of window_bits if it can do so safely.
  */
-PNG_EXPORT(225, void, png_set_text_compression_window_bits, (png_structp
-    png_ptr, int window_bits));
+PNG_EXPORT(225, void, png_set_text_compression_window_bits,
+    (png_structrp png_ptr, int window_bits));
 
-PNG_EXPORT(226, void, png_set_text_compression_method, (png_structp png_ptr,
+PNG_EXPORT(226, void, png_set_text_compression_method, (png_structrp png_ptr,
     int method));
-#endif /* PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED */
+#endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */
 #endif /* WRITE */
 
 /* These next functions are called for input/output, memory, and error
@@ -1624,7 +1592,7 @@ PNG_EXPORT(226, void, png_set_text_compression_method, (png_structp png_ptr,
 
 #ifdef PNG_STDIO_SUPPORTED
 /* Initialize the input/output for the PNG file to the default functions. */
-PNG_EXPORT(74, void, png_init_io, (png_structp png_ptr, png_FILE_p fp));
+PNG_EXPORT(74, void, png_init_io, (png_structrp png_ptr, png_FILE_p fp));
 #endif
 
 /* Replace the (error and abort), and warning functions with user
@@ -1635,12 +1603,11 @@ PNG_EXPORT(74, void, png_init_io, (png_structp png_ptr, png_FILE_p fp));
  * default function will be used.
  */
 
-PNG_EXPORT(75, void, png_set_error_fn,
-    (png_structp png_ptr, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warning_fn));
+PNG_EXPORT(75, void, png_set_error_fn, (png_structrp png_ptr,
+    png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warning_fn));
 
 /* Return the user pointer associated with the error functions */
-PNG_EXPORT(76, png_voidp, png_get_error_ptr, (png_const_structp png_ptr));
+PNG_EXPORT(76, png_voidp, png_get_error_ptr, (png_const_structrp png_ptr));
 
 /* Replace the default data output functions with a user supplied one(s).
  * If buffered output is not used, then output_flush_fn can be set to NULL.
@@ -1652,47 +1619,47 @@ PNG_EXPORT(76, png_voidp, png_get_error_ptr, (png_const_structp png_ptr));
  * default flush function, which uses the standard *FILE structure, will
  * be used.
  */
-PNG_EXPORT(77, void, png_set_write_fn, (png_structp png_ptr, png_voidp io_ptr,
+PNG_EXPORT(77, void, png_set_write_fn, (png_structrp png_ptr, png_voidp io_ptr,
     png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn));
 
 /* Replace the default data input function with a user supplied one. */
-PNG_EXPORT(78, void, png_set_read_fn, (png_structp png_ptr, png_voidp io_ptr,
+PNG_EXPORT(78, void, png_set_read_fn, (png_structrp png_ptr, png_voidp io_ptr,
     png_rw_ptr read_data_fn));
 
 /* Return the user pointer associated with the I/O functions */
-PNG_EXPORT(79, png_voidp, png_get_io_ptr, (png_structp png_ptr));
+PNG_EXPORT(79, png_voidp, png_get_io_ptr, (png_const_structrp png_ptr));
 
-PNG_EXPORT(80, void, png_set_read_status_fn, (png_structp png_ptr,
+PNG_EXPORT(80, void, png_set_read_status_fn, (png_structrp png_ptr,
     png_read_status_ptr read_row_fn));
 
-PNG_EXPORT(81, void, png_set_write_status_fn, (png_structp png_ptr,
+PNG_EXPORT(81, void, png_set_write_status_fn, (png_structrp png_ptr,
     png_write_status_ptr write_row_fn));
 
 #ifdef PNG_USER_MEM_SUPPORTED
 /* Replace the default memory allocation functions with user supplied one(s). */
-PNG_EXPORT(82, void, png_set_mem_fn, (png_structp png_ptr, png_voidp mem_ptr,
+PNG_EXPORT(82, void, png_set_mem_fn, (png_structrp png_ptr, png_voidp mem_ptr,
     png_malloc_ptr malloc_fn, png_free_ptr free_fn));
 /* Return the user pointer associated with the memory functions */
-PNG_EXPORT(83, png_voidp, png_get_mem_ptr, (png_const_structp png_ptr));
+PNG_EXPORT(83, png_voidp, png_get_mem_ptr, (png_const_structrp png_ptr));
 #endif
 
 #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-PNG_EXPORT(84, void, png_set_read_user_transform_fn, (png_structp png_ptr,
+PNG_EXPORT(84, void, png_set_read_user_transform_fn, (png_structrp png_ptr,
     png_user_transform_ptr read_user_transform_fn));
 #endif
 
 #ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-PNG_EXPORT(85, void, png_set_write_user_transform_fn, (png_structp png_ptr,
+PNG_EXPORT(85, void, png_set_write_user_transform_fn, (png_structrp png_ptr,
     png_user_transform_ptr write_user_transform_fn));
 #endif
 
 #ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-PNG_EXPORT(86, void, png_set_user_transform_info, (png_structp png_ptr,
+PNG_EXPORT(86, void, png_set_user_transform_info, (png_structrp png_ptr,
     png_voidp user_transform_ptr, int user_transform_depth,
     int user_transform_channels));
 /* Return the user pointer associated with the user transform functions */
 PNG_EXPORT(87, png_voidp, png_get_user_transform_ptr,
-    (png_const_structp png_ptr));
+    (png_const_structrp png_ptr));
 #endif
 
 #ifdef PNG_USER_TRANSFORM_INFO_SUPPORTED
@@ -1707,31 +1674,53 @@ PNG_EXPORT(87, png_voidp, png_get_user_transform_ptr,
  * find the output pixel (x,y) given an interlaced sub-image pixel
  * (row,col,pass).  (See below for these macros.)
  */
-PNG_EXPORT(217, png_uint_32, png_get_current_row_number, (png_const_structp));
-PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structp));
+PNG_EXPORT(217, png_uint_32, png_get_current_row_number, (png_const_structrp));
+PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structrp));
 #endif
 
-#ifdef PNG_USER_CHUNKS_SUPPORTED
-PNG_EXPORT(88, void, png_set_read_user_chunk_fn, (png_structp png_ptr,
+#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
+/* This callback is called only for *unknown* chunks.  If
+ * PNG_HANDLE_AS_UNKNOWN_SUPPORTED is set then it is possible to set known
+ * chunks to be treated as unknown, however in this case the callback must do
+ * any processing required by the chunk (e.g. by calling the appropriate
+ * png_set_ APIs.)
+ *
+ * There is no write support - on write, by default, all the chunks in the
+ * 'unknown' list are written in the specified position.
+ *
+ * The integer return from the callback function is interpreted thus:
+ *
+ * negative: An error occurred; png_chunk_error will be called.
+ *     zero: The chunk was not handled, the chunk will be saved. A critical
+ *           chunk will cause an error at this point unless it is to be saved.
+ * positive: The chunk was handled, libpng will ignore/discard it.
+ *
+ * See "INTERACTION WTIH USER CHUNK CALLBACKS" below for important notes about
+ * how this behavior will change in libpng 1.7
+ */
+PNG_EXPORT(88, void, png_set_read_user_chunk_fn, (png_structrp png_ptr,
     png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));
-PNG_EXPORT(89, png_voidp, png_get_user_chunk_ptr, (png_const_structp png_ptr));
+#endif
+
+#ifdef PNG_USER_CHUNKS_SUPPORTED
+PNG_EXPORT(89, png_voidp, png_get_user_chunk_ptr, (png_const_structrp png_ptr));
 #endif
 
 #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
 /* Sets the function callbacks for the push reader, and a pointer to a
  * user-defined structure available to the callback functions.
  */
-PNG_EXPORT(90, void, png_set_progressive_read_fn, (png_structp png_ptr,
+PNG_EXPORT(90, void, png_set_progressive_read_fn, (png_structrp png_ptr,
     png_voidp progressive_ptr, png_progressive_info_ptr info_fn,
     png_progressive_row_ptr row_fn, png_progressive_end_ptr end_fn));
 
 /* Returns the user pointer associated with the push read functions */
-PNG_EXPORT(91, png_voidp, png_get_progressive_ptr, (png_const_structp png_ptr));
+PNG_EXPORT(91, png_voidp, png_get_progressive_ptr,
+    (png_const_structrp png_ptr));
 
 /* Function to be called when data becomes available */
-PNG_EXPORT(92, void, png_process_data,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_bytep buffer, png_size_t buffer_size));
+PNG_EXPORT(92, void, png_process_data, (png_structrp png_ptr,
+    png_inforp info_ptr, png_bytep buffer, png_size_t buffer_size));
 
 /* A function which may be called *only* within png_process_data to stop the
  * processing of any more data.  The function returns the number of bytes
@@ -1740,7 +1729,7 @@ PNG_EXPORT(92, void, png_process_data,
  * 'save' is set to true the routine will first save all the pending data and
  * will always return 0.
  */
-PNG_EXPORT(219, png_size_t, png_process_data_pause, (png_structp, int save));
+PNG_EXPORT(219, png_size_t, png_process_data_pause, (png_structrp, int save));
 
 /* A function which may be called *only* outside (after) a call to
  * png_process_data.  It returns the number of bytes of data to skip in the
@@ -1748,92 +1737,95 @@ PNG_EXPORT(219, png_size_t, png_process_data_pause, (png_structp, int save));
  * application must skip than number of bytes of input data and pass the
  * following data to the next call to png_process_data.
  */
-PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structp));
+PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structrp));
 
-#ifdef PNG_READ_INTERLACING_SUPPORTED
 /* Function that combines rows.  'new_row' is a flag that should come from
  * the callback and be non-NULL if anything needs to be done; the library
  * stores its own version of the new data internally and ignores the passed
  * in value.
  */
-PNG_EXPORT(93, void, png_progressive_combine_row, (png_structp png_ptr,
+PNG_EXPORT(93, void, png_progressive_combine_row, (png_const_structrp png_ptr,
     png_bytep old_row, png_const_bytep new_row));
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+#endif /* PROGRESSIVE_READ */
 
-PNG_EXPORTA(94, png_voidp, png_malloc,
-    (png_structp png_ptr, png_alloc_size_t size),
-    PNG_ALLOCATED);
+PNG_EXPORTA(94, png_voidp, png_malloc, (png_const_structrp png_ptr,
+    png_alloc_size_t size), PNG_ALLOCATED);
 /* Added at libpng version 1.4.0 */
-PNG_EXPORTA(95, png_voidp, png_calloc,
-    (png_structp png_ptr, png_alloc_size_t size),
-    PNG_ALLOCATED);
+PNG_EXPORTA(95, png_voidp, png_calloc, (png_const_structrp png_ptr,
+    png_alloc_size_t size), PNG_ALLOCATED);
 
 /* Added at libpng version 1.2.4 */
-PNG_EXPORTA(96, png_voidp, png_malloc_warn, (png_structp png_ptr,
+PNG_EXPORTA(96, png_voidp, png_malloc_warn, (png_const_structrp png_ptr,
     png_alloc_size_t size), PNG_ALLOCATED);
 
 /* Frees a pointer allocated by png_malloc() */
-PNG_EXPORT(97, void, png_free, (png_structp png_ptr, png_voidp ptr));
+PNG_EXPORT(97, void, png_free, (png_const_structrp png_ptr, png_voidp ptr));
 
 /* Free data that was allocated internally */
-PNG_EXPORT(98, void, png_free_data,
-    (png_structp png_ptr, png_infop info_ptr, png_uint_32 free_me, int num));
+PNG_EXPORT(98, void, png_free_data, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 free_me, int num));
 
 /* Reassign responsibility for freeing existing data, whether allocated
- * by libpng or by the application */
-PNG_EXPORT(99, void, png_data_freer,
-    (png_structp png_ptr, png_infop info_ptr, int freer, png_uint_32 mask));
+ * by libpng or by the application; this works on the png_info structure passed
+ * in, it does not change the state for other png_info structures.
+ *
+ * It is unlikely that this function works correctly as of 1.6.0 and using it
+ * may result either in memory leaks or double free of allocated data.
+ */
+PNG_EXPORT(99, void, png_data_freer, (png_const_structrp png_ptr,
+    png_inforp info_ptr, int freer, png_uint_32 mask));
 
 /* Assignments for png_data_freer */
 #define PNG_DESTROY_WILL_FREE_DATA 1
 #define PNG_SET_WILL_FREE_DATA 1
 #define PNG_USER_WILL_FREE_DATA 2
 /* Flags for png_ptr->free_me and info_ptr->free_me */
-#define PNG_FREE_HIST 0x0008
-#define PNG_FREE_ICCP 0x0010
-#define PNG_FREE_SPLT 0x0020
-#define PNG_FREE_ROWS 0x0040
-#define PNG_FREE_PCAL 0x0080
-#define PNG_FREE_SCAL 0x0100
-#define PNG_FREE_UNKN 0x0200
-#define PNG_FREE_LIST 0x0400
-#define PNG_FREE_PLTE 0x1000
-#define PNG_FREE_TRNS 0x2000
-#define PNG_FREE_TEXT 0x4000
-#define PNG_FREE_ALL  0x7fff
-#define PNG_FREE_MUL  0x4220 /* PNG_FREE_SPLT|PNG_FREE_TEXT|PNG_FREE_UNKN */
+#define PNG_FREE_HIST 0x0008U
+#define PNG_FREE_ICCP 0x0010U
+#define PNG_FREE_SPLT 0x0020U
+#define PNG_FREE_ROWS 0x0040U
+#define PNG_FREE_PCAL 0x0080U
+#define PNG_FREE_SCAL 0x0100U
+#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
+#  define PNG_FREE_UNKN 0x0200U
+#endif
+/*      PNG_FREE_LIST 0x0400U   removed in 1.6.0 because it is ignored */
+#define PNG_FREE_PLTE 0x1000U
+#define PNG_FREE_TRNS 0x2000U
+#define PNG_FREE_TEXT 0x4000U
+#define PNG_FREE_ALL  0x7fffU
+#define PNG_FREE_MUL  0x4220U /* PNG_FREE_SPLT|PNG_FREE_TEXT|PNG_FREE_UNKN */
 
 #ifdef PNG_USER_MEM_SUPPORTED
-PNG_EXPORTA(100, png_voidp, png_malloc_default, (png_structp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED);
-PNG_EXPORT(101, void, png_free_default, (png_structp png_ptr, png_voidp ptr));
+PNG_EXPORTA(100, png_voidp, png_malloc_default, (png_const_structrp png_ptr,
+    png_alloc_size_t size), PNG_ALLOCATED PNG_DEPRECATED);
+PNG_EXPORTA(101, void, png_free_default, (png_const_structrp png_ptr,
+    png_voidp ptr), PNG_DEPRECATED);
 #endif
 
 #ifdef PNG_ERROR_TEXT_SUPPORTED
 /* Fatal error in PNG image of libpng - can't continue */
-PNG_EXPORTA(102, void, png_error,
-    (png_structp png_ptr, png_const_charp error_message),
-    PNG_NORETURN);
+PNG_EXPORTA(102, void, png_error, (png_const_structrp png_ptr,
+    png_const_charp error_message), PNG_NORETURN);
 
 /* The same, but the chunk name is prepended to the error string. */
-PNG_EXPORTA(103, void, png_chunk_error, (png_structp png_ptr,
+PNG_EXPORTA(103, void, png_chunk_error, (png_const_structrp png_ptr,
     png_const_charp error_message), PNG_NORETURN);
 
 #else
 /* Fatal error in PNG image of libpng - can't continue */
-PNG_EXPORTA(104, void, png_err, (png_structp png_ptr), PNG_NORETURN);
+PNG_EXPORTA(104, void, png_err, (png_const_structrp png_ptr), PNG_NORETURN);
 #  define png_error(s1,s2) png_err(s1)
 #  define png_chunk_error(s1,s2) png_err(s1)
 #endif
 
 #ifdef PNG_WARNINGS_SUPPORTED
 /* Non-fatal error in libpng.  Can continue, but may have a problem. */
-PNG_EXPORT(105, void, png_warning, (png_structp png_ptr,
+PNG_EXPORT(105, void, png_warning, (png_const_structrp png_ptr,
     png_const_charp warning_message));
 
 /* Non-fatal error in libpng, chunk name is prepended to message. */
-PNG_EXPORT(106, void, png_chunk_warning, (png_structp png_ptr,
+PNG_EXPORT(106, void, png_chunk_warning, (png_const_structrp png_ptr,
     png_const_charp warning_message));
 #else
 #  define png_warning(s1,s2) ((void)(s1))
@@ -1843,17 +1835,17 @@ PNG_EXPORT(106, void, png_chunk_warning, (png_structp png_ptr,
 #ifdef PNG_BENIGN_ERRORS_SUPPORTED
 /* Benign error in libpng.  Can continue, but may have a problem.
  * User can choose whether to handle as a fatal error or as a warning. */
-#  undef png_benign_error
-PNG_EXPORT(107, void, png_benign_error, (png_structp png_ptr,
+PNG_EXPORT(107, void, png_benign_error, (png_const_structrp png_ptr,
     png_const_charp warning_message));
 
-/* Same, chunk name is prepended to message. */
-#  undef png_chunk_benign_error
-PNG_EXPORT(108, void, png_chunk_benign_error, (png_structp png_ptr,
+#ifdef PNG_READ_SUPPORTED
+/* Same, chunk name is prepended to message (only during read) */
+PNG_EXPORT(108, void, png_chunk_benign_error, (png_const_structrp png_ptr,
     png_const_charp warning_message));
+#endif
 
 PNG_EXPORT(109, void, png_set_benign_errors,
-    (png_structp png_ptr, int allowed));
+    (png_structrp png_ptr, int allowed));
 #else
 #  ifdef PNG_ALLOW_BENIGN_ERRORS
 #    define png_benign_error png_warning
@@ -1877,121 +1869,119 @@ PNG_EXPORT(109, void, png_set_benign_errors,
  * png_info_struct.
  */
 /* Returns "flag" if chunk data is valid in info_ptr. */
-PNG_EXPORT(110, png_uint_32, png_get_valid,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_uint_32 flag));
+PNG_EXPORT(110, png_uint_32, png_get_valid, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr, png_uint_32 flag));
 
 /* Returns number of bytes needed to hold a transformed row. */
-PNG_EXPORT(111, png_size_t, png_get_rowbytes, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
+PNG_EXPORT(111, png_size_t, png_get_rowbytes, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr));
 
 #ifdef PNG_INFO_IMAGE_SUPPORTED
 /* Returns row_pointers, which is an array of pointers to scanlines that was
  * returned from png_read_png().
  */
-PNG_EXPORT(112, png_bytepp, png_get_rows,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
+PNG_EXPORT(112, png_bytepp, png_get_rows, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr));
+
 /* Set row_pointers, which is an array of pointers to scanlines for use
  * by png_write_png().
  */
-PNG_EXPORT(113, void, png_set_rows, (png_structp png_ptr,
-    png_infop info_ptr, png_bytepp row_pointers));
+PNG_EXPORT(113, void, png_set_rows, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_bytepp row_pointers));
 #endif
 
 /* Returns number of color channels in image. */
-PNG_EXPORT(114, png_byte, png_get_channels,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
+PNG_EXPORT(114, png_byte, png_get_channels, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr));
 
 #ifdef PNG_EASY_ACCESS_SUPPORTED
 /* Returns image width in pixels. */
-PNG_EXPORT(115, png_uint_32, png_get_image_width, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
+PNG_EXPORT(115, png_uint_32, png_get_image_width, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr));
 
 /* Returns image height in pixels. */
-PNG_EXPORT(116, png_uint_32, png_get_image_height, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
+PNG_EXPORT(116, png_uint_32, png_get_image_height, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr));
 
 /* Returns image bit_depth. */
-PNG_EXPORT(117, png_byte, png_get_bit_depth,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
+PNG_EXPORT(117, png_byte, png_get_bit_depth, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr));
 
 /* Returns image color_type. */
-PNG_EXPORT(118, png_byte, png_get_color_type, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
+PNG_EXPORT(118, png_byte, png_get_color_type, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr));
 
 /* Returns image filter_type. */
-PNG_EXPORT(119, png_byte, png_get_filter_type, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
+PNG_EXPORT(119, png_byte, png_get_filter_type, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr));
 
 /* Returns image interlace_type. */
-PNG_EXPORT(120, png_byte, png_get_interlace_type, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
+PNG_EXPORT(120, png_byte, png_get_interlace_type, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr));
 
 /* Returns image compression_type. */
-PNG_EXPORT(121, png_byte, png_get_compression_type, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
+PNG_EXPORT(121, png_byte, png_get_compression_type, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr));
 
 /* Returns image resolution in pixels per meter, from pHYs chunk data. */
 PNG_EXPORT(122, png_uint_32, png_get_pixels_per_meter,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
+    (png_const_structrp png_ptr, png_const_inforp info_ptr));
 PNG_EXPORT(123, png_uint_32, png_get_x_pixels_per_meter,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
+    (png_const_structrp png_ptr, png_const_inforp info_ptr));
 PNG_EXPORT(124, png_uint_32, png_get_y_pixels_per_meter,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
+    (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
 /* Returns pixel aspect ratio, computed from pHYs chunk data.  */
 PNG_FP_EXPORT(125, float, png_get_pixel_aspect_ratio,
-    (png_const_structp png_ptr, png_const_infop info_ptr))
+    (png_const_structrp png_ptr, png_const_inforp info_ptr))
 PNG_FIXED_EXPORT(210, png_fixed_point, png_get_pixel_aspect_ratio_fixed,
-    (png_const_structp png_ptr, png_const_infop info_ptr))
+    (png_const_structrp png_ptr, png_const_inforp info_ptr))
 
 /* Returns image x, y offset in pixels or microns, from oFFs chunk data. */
 PNG_EXPORT(126, png_int_32, png_get_x_offset_pixels,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
+    (png_const_structrp png_ptr, png_const_inforp info_ptr));
 PNG_EXPORT(127, png_int_32, png_get_y_offset_pixels,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
+    (png_const_structrp png_ptr, png_const_inforp info_ptr));
 PNG_EXPORT(128, png_int_32, png_get_x_offset_microns,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
+    (png_const_structrp png_ptr, png_const_inforp info_ptr));
 PNG_EXPORT(129, png_int_32, png_get_y_offset_microns,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
+    (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
-#endif /* PNG_EASY_ACCESS_SUPPORTED */
+#endif /* EASY_ACCESS */
 
+#ifdef PNG_READ_SUPPORTED
 /* Returns pointer to signature string read from PNG header */
-PNG_EXPORT(130, png_const_bytep, png_get_signature,
-    (png_const_structp png_ptr, png_infop info_ptr));
+PNG_EXPORT(130, png_const_bytep, png_get_signature, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr));
+#endif
 
 #ifdef PNG_bKGD_SUPPORTED
-PNG_EXPORT(131, png_uint_32, png_get_bKGD,
-    (png_const_structp png_ptr, png_infop info_ptr,
-    png_color_16p *background));
+PNG_EXPORT(131, png_uint_32, png_get_bKGD, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_color_16p *background));
 #endif
 
 #ifdef PNG_bKGD_SUPPORTED
-PNG_EXPORT(132, void, png_set_bKGD, (png_structp png_ptr, png_infop info_ptr,
-    png_const_color_16p background));
+PNG_EXPORT(132, void, png_set_bKGD, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_const_color_16p background));
 #endif
 
 #ifdef PNG_cHRM_SUPPORTED
-PNG_FP_EXPORT(133, png_uint_32, png_get_cHRM, (png_const_structp png_ptr,
-   png_const_infop info_ptr, double *white_x, double *white_y, double *red_x,
+PNG_FP_EXPORT(133, png_uint_32, png_get_cHRM, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr, double *white_x, double *white_y, double *red_x,
     double *red_y, double *green_x, double *green_y, double *blue_x,
     double *blue_y))
-PNG_FP_EXPORT(230, png_uint_32, png_get_cHRM_XYZ, (png_structp png_ptr,
-    png_const_infop info_ptr, double *red_X, double *red_Y, double *red_Z,
+PNG_FP_EXPORT(230, png_uint_32, png_get_cHRM_XYZ, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr, double *red_X, double *red_Y, double *red_Z,
     double *green_X, double *green_Y, double *green_Z, double *blue_X,
     double *blue_Y, double *blue_Z))
-#ifdef PNG_FIXED_POINT_SUPPORTED /* Otherwise not implemented */
 PNG_FIXED_EXPORT(134, png_uint_32, png_get_cHRM_fixed,
-    (png_const_structp png_ptr,
-    png_const_infop info_ptr, png_fixed_point *int_white_x,
-    png_fixed_point *int_white_y, png_fixed_point *int_red_x,
-    png_fixed_point *int_red_y, png_fixed_point *int_green_x,
-    png_fixed_point *int_green_y, png_fixed_point *int_blue_x,
-    png_fixed_point *int_blue_y))
-#endif
+    (png_const_structrp png_ptr, png_const_inforp info_ptr,
+    png_fixed_point *int_white_x, png_fixed_point *int_white_y,
+    png_fixed_point *int_red_x, png_fixed_point *int_red_y,
+    png_fixed_point *int_green_x, png_fixed_point *int_green_y,
+    png_fixed_point *int_blue_x, png_fixed_point *int_blue_y))
 PNG_FIXED_EXPORT(231, png_uint_32, png_get_cHRM_XYZ_fixed,
-    (png_structp png_ptr, png_const_infop info_ptr,
+    (png_const_structrp png_ptr, png_const_inforp info_ptr,
     png_fixed_point *int_red_X, png_fixed_point *int_red_Y,
     png_fixed_point *int_red_Z, png_fixed_point *int_green_X,
     png_fixed_point *int_green_Y, png_fixed_point *int_green_Z,
@@ -2000,22 +1990,22 @@ PNG_FIXED_EXPORT(231, png_uint_32, png_get_cHRM_XYZ_fixed,
 #endif
 
 #ifdef PNG_cHRM_SUPPORTED
-PNG_FP_EXPORT(135, void, png_set_cHRM,
-    (png_structp png_ptr, png_infop info_ptr,
+PNG_FP_EXPORT(135, void, png_set_cHRM, (png_const_structrp png_ptr,
+    png_inforp info_ptr,
     double white_x, double white_y, double red_x, double red_y, double green_x,
     double green_y, double blue_x, double blue_y))
-PNG_FP_EXPORT(232, void, png_set_cHRM_XYZ, (png_structp png_ptr,
-    png_infop info_ptr, double red_X, double red_Y, double red_Z,
+PNG_FP_EXPORT(232, void, png_set_cHRM_XYZ, (png_const_structrp png_ptr,
+    png_inforp info_ptr, double red_X, double red_Y, double red_Z,
     double green_X, double green_Y, double green_Z, double blue_X,
     double blue_Y, double blue_Z))
-PNG_FIXED_EXPORT(136, void, png_set_cHRM_fixed, (png_structp png_ptr,
-    png_infop info_ptr, png_fixed_point int_white_x,
+PNG_FIXED_EXPORT(136, void, png_set_cHRM_fixed, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_fixed_point int_white_x,
     png_fixed_point int_white_y, png_fixed_point int_red_x,
     png_fixed_point int_red_y, png_fixed_point int_green_x,
     png_fixed_point int_green_y, png_fixed_point int_blue_x,
     png_fixed_point int_blue_y))
-PNG_FIXED_EXPORT(233, void, png_set_cHRM_XYZ_fixed, (png_structp png_ptr,
-    png_infop info_ptr, png_fixed_point int_red_X, png_fixed_point int_red_Y,
+PNG_FIXED_EXPORT(233, void, png_set_cHRM_XYZ_fixed, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_fixed_point int_red_X, png_fixed_point int_red_Y,
     png_fixed_point int_red_Z, png_fixed_point int_green_X,
     png_fixed_point int_green_Y, png_fixed_point int_green_Z,
     png_fixed_point int_blue_X, png_fixed_point int_blue_Y,
@@ -2023,143 +2013,130 @@ PNG_FIXED_EXPORT(233, void, png_set_cHRM_XYZ_fixed, (png_structp png_ptr,
 #endif
 
 #ifdef PNG_gAMA_SUPPORTED
-PNG_FP_EXPORT(137, png_uint_32, png_get_gAMA,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    double *file_gamma))
+PNG_FP_EXPORT(137, png_uint_32, png_get_gAMA, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr, double *file_gamma))
 PNG_FIXED_EXPORT(138, png_uint_32, png_get_gAMA_fixed,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
+    (png_const_structrp png_ptr, png_const_inforp info_ptr,
     png_fixed_point *int_file_gamma))
 #endif
 
 #ifdef PNG_gAMA_SUPPORTED
-PNG_FP_EXPORT(139, void, png_set_gAMA, (png_structp png_ptr,
-    png_infop info_ptr, double file_gamma))
-PNG_FIXED_EXPORT(140, void, png_set_gAMA_fixed, (png_structp png_ptr,
-    png_infop info_ptr, png_fixed_point int_file_gamma))
+PNG_FP_EXPORT(139, void, png_set_gAMA, (png_const_structrp png_ptr,
+    png_inforp info_ptr, double file_gamma))
+PNG_FIXED_EXPORT(140, void, png_set_gAMA_fixed, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_fixed_point int_file_gamma))
 #endif
 
 #ifdef PNG_hIST_SUPPORTED
-PNG_EXPORT(141, png_uint_32, png_get_hIST,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_uint_16p *hist));
+PNG_EXPORT(141, png_uint_32, png_get_hIST, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_uint_16p *hist));
 #endif
 
 #ifdef PNG_hIST_SUPPORTED
-PNG_EXPORT(142, void, png_set_hIST, (png_structp png_ptr,
-    png_infop info_ptr, png_const_uint_16p hist));
+PNG_EXPORT(142, void, png_set_hIST, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_const_uint_16p hist));
 #endif
 
-PNG_EXPORT(143, png_uint_32, png_get_IHDR,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type,
-    int *interlace_method, int *compression_method, int *filter_method));
+PNG_EXPORT(143, png_uint_32, png_get_IHDR, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr, png_uint_32 *width, png_uint_32 *height,
+    int *bit_depth, int *color_type, int *interlace_method,
+    int *compression_method, int *filter_method));
 
-PNG_EXPORT(144, void, png_set_IHDR,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 width, png_uint_32 height, int bit_depth, int color_type,
-    int interlace_method, int compression_method, int filter_method));
+PNG_EXPORT(144, void, png_set_IHDR, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 width, png_uint_32 height, int bit_depth,
+    int color_type, int interlace_method, int compression_method,
+    int filter_method));
 
 #ifdef PNG_oFFs_SUPPORTED
-PNG_EXPORT(145, png_uint_32, png_get_oFFs,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type));
+PNG_EXPORT(145, png_uint_32, png_get_oFFs, (png_const_structrp png_ptr,
+   png_const_inforp info_ptr, png_int_32 *offset_x, png_int_32 *offset_y,
+   int *unit_type));
 #endif
 
 #ifdef PNG_oFFs_SUPPORTED
-PNG_EXPORT(146, void, png_set_oFFs,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_int_32 offset_x, png_int_32 offset_y, int unit_type));
+PNG_EXPORT(146, void, png_set_oFFs, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_int_32 offset_x, png_int_32 offset_y,
+    int unit_type));
 #endif
 
 #ifdef PNG_pCAL_SUPPORTED
-PNG_EXPORT(147, png_uint_32, png_get_pCAL,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type,
-    int *nparams,
-    png_charp *units, png_charpp *params));
+PNG_EXPORT(147, png_uint_32, png_get_pCAL, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_charp *purpose, png_int_32 *X0,
+    png_int_32 *X1, int *type, int *nparams, png_charp *units,
+    png_charpp *params));
 #endif
 
 #ifdef PNG_pCAL_SUPPORTED
-PNG_EXPORT(148, void, png_set_pCAL, (png_structp png_ptr,
-    png_infop info_ptr,
-    png_const_charp purpose, png_int_32 X0, png_int_32 X1, int type,
-    int nparams, png_const_charp units, png_charpp params));
+PNG_EXPORT(148, void, png_set_pCAL, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_const_charp purpose, png_int_32 X0, png_int_32 X1,
+    int type, int nparams, png_const_charp units, png_charpp params));
 #endif
 
 #ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(149, png_uint_32, png_get_pHYs,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
+PNG_EXPORT(149, png_uint_32, png_get_pHYs, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
+    int *unit_type));
 #endif
 
 #ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(150, void, png_set_pHYs,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 res_x, png_uint_32 res_y, int unit_type));
+PNG_EXPORT(150, void, png_set_pHYs, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 res_x, png_uint_32 res_y, int unit_type));
 #endif
 
-PNG_EXPORT(151, png_uint_32, png_get_PLTE,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_colorp *palette, int *num_palette));
+PNG_EXPORT(151, png_uint_32, png_get_PLTE, (png_const_structrp png_ptr,
+   png_inforp info_ptr, png_colorp *palette, int *num_palette));
 
-PNG_EXPORT(152, void, png_set_PLTE,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_const_colorp palette, int num_palette));
+PNG_EXPORT(152, void, png_set_PLTE, (png_structrp png_ptr,
+    png_inforp info_ptr, png_const_colorp palette, int num_palette));
 
 #ifdef PNG_sBIT_SUPPORTED
-PNG_EXPORT(153, png_uint_32, png_get_sBIT,
-    (png_const_structp png_ptr, png_infop info_ptr,
-    png_color_8p *sig_bit));
+PNG_EXPORT(153, png_uint_32, png_get_sBIT, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_color_8p *sig_bit));
 #endif
 
 #ifdef PNG_sBIT_SUPPORTED
-PNG_EXPORT(154, void, png_set_sBIT,
-    (png_structp png_ptr, png_infop info_ptr, png_const_color_8p sig_bit));
+PNG_EXPORT(154, void, png_set_sBIT, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_const_color_8p sig_bit));
 #endif
 
 #ifdef PNG_sRGB_SUPPORTED
-PNG_EXPORT(155, png_uint_32, png_get_sRGB, (png_const_structp png_ptr,
-    png_const_infop info_ptr, int *file_srgb_intent));
+PNG_EXPORT(155, png_uint_32, png_get_sRGB, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr, int *file_srgb_intent));
 #endif
 
 #ifdef PNG_sRGB_SUPPORTED
-PNG_EXPORT(156, void, png_set_sRGB,
-    (png_structp png_ptr, png_infop info_ptr, int srgb_intent));
-PNG_EXPORT(157, void, png_set_sRGB_gAMA_and_cHRM, (png_structp png_ptr,
-    png_infop info_ptr, int srgb_intent));
+PNG_EXPORT(156, void, png_set_sRGB, (png_const_structrp png_ptr,
+    png_inforp info_ptr, int srgb_intent));
+PNG_EXPORT(157, void, png_set_sRGB_gAMA_and_cHRM, (png_const_structrp png_ptr,
+    png_inforp info_ptr, int srgb_intent));
 #endif
 
 #ifdef PNG_iCCP_SUPPORTED
-PNG_EXPORT(158, png_uint_32, png_get_iCCP,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_charpp name, int *compression_type, png_bytepp profile,
-    png_uint_32 *proflen));
+PNG_EXPORT(158, png_uint_32, png_get_iCCP, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_charpp name, int *compression_type,
+    png_bytepp profile, png_uint_32 *proflen));
 #endif
 
 #ifdef PNG_iCCP_SUPPORTED
-PNG_EXPORT(159, void, png_set_iCCP,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_const_charp name, int compression_type, png_const_bytep profile,
-    png_uint_32 proflen));
+PNG_EXPORT(159, void, png_set_iCCP, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_const_charp name, int compression_type,
+    png_const_bytep profile, png_uint_32 proflen));
 #endif
 
 #ifdef PNG_sPLT_SUPPORTED
-PNG_EXPORT(160, png_uint_32, png_get_sPLT,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_sPLT_tpp entries));
+PNG_EXPORT(160, int, png_get_sPLT, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_sPLT_tpp entries));
 #endif
 
 #ifdef PNG_sPLT_SUPPORTED
-PNG_EXPORT(161, void, png_set_sPLT,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_const_sPLT_tp entries, int nentries));
+PNG_EXPORT(161, void, png_set_sPLT, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_const_sPLT_tp entries, int nentries));
 #endif
 
 #ifdef PNG_TEXT_SUPPORTED
 /* png_get_text also returns the number of text chunks in *num_text */
-PNG_EXPORT(162, png_uint_32, png_get_text,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_textp *text_ptr, int *num_text));
+PNG_EXPORT(162, int, png_get_text, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_textp *text_ptr, int *num_text));
 #endif
 
 /* Note while png_set_text() will accept a structure whose text,
@@ -2170,122 +2147,220 @@ PNG_EXPORT(162, png_uint_32, png_get_text,
  */
 
 #ifdef PNG_TEXT_SUPPORTED
-PNG_EXPORT(163, void, png_set_text,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_const_textp text_ptr, int num_text));
+PNG_EXPORT(163, void, png_set_text, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_const_textp text_ptr, int num_text));
 #endif
 
 #ifdef PNG_tIME_SUPPORTED
-PNG_EXPORT(164, png_uint_32, png_get_tIME,
-    (png_const_structp png_ptr, png_infop info_ptr, png_timep *mod_time));
+PNG_EXPORT(164, png_uint_32, png_get_tIME, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_timep *mod_time));
 #endif
 
 #ifdef PNG_tIME_SUPPORTED
-PNG_EXPORT(165, void, png_set_tIME,
-    (png_structp png_ptr, png_infop info_ptr, png_const_timep mod_time));
+PNG_EXPORT(165, void, png_set_tIME, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_const_timep mod_time));
 #endif
 
 #ifdef PNG_tRNS_SUPPORTED
-PNG_EXPORT(166, png_uint_32, png_get_tRNS,
-    (png_const_structp png_ptr, png_infop info_ptr,
-    png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color));
+PNG_EXPORT(166, png_uint_32, png_get_tRNS, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_bytep *trans_alpha, int *num_trans,
+    png_color_16p *trans_color));
 #endif
 
 #ifdef PNG_tRNS_SUPPORTED
-PNG_EXPORT(167, void, png_set_tRNS,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_const_bytep trans_alpha, int num_trans,
+PNG_EXPORT(167, void, png_set_tRNS, (png_structrp png_ptr,
+    png_inforp info_ptr, png_const_bytep trans_alpha, int num_trans,
     png_const_color_16p trans_color));
 #endif
 
 #ifdef PNG_sCAL_SUPPORTED
-PNG_FP_EXPORT(168, png_uint_32, png_get_sCAL,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    int *unit, double *width, double *height))
-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
+PNG_FP_EXPORT(168, png_uint_32, png_get_sCAL, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr, int *unit, double *width, double *height))
+#if defined(PNG_FLOATING_ARITHMETIC_SUPPORTED) || \
+   defined(PNG_FLOATING_POINT_SUPPORTED)
 /* NOTE: this API is currently implemented using floating point arithmetic,
  * consequently it can only be used on systems with floating point support.
  * In any case the range of values supported by png_fixed_point is small and it
  * is highly recommended that png_get_sCAL_s be used instead.
  */
 PNG_FIXED_EXPORT(214, png_uint_32, png_get_sCAL_fixed,
-    (png_structp png_ptr, png_const_infop info_ptr, int *unit,
-    png_fixed_point *width,
-    png_fixed_point *height))
+    (png_const_structrp png_ptr, png_const_inforp info_ptr, int *unit,
+    png_fixed_point *width, png_fixed_point *height))
 #endif
 PNG_EXPORT(169, png_uint_32, png_get_sCAL_s,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    int *unit, png_charpp swidth, png_charpp sheight));
-
-PNG_FP_EXPORT(170, void, png_set_sCAL,
-    (png_structp png_ptr, png_infop info_ptr,
-    int unit, double width, double height))
-PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_structp png_ptr,
-   png_infop info_ptr, int unit, png_fixed_point width,
-   png_fixed_point height))
-PNG_EXPORT(171, void, png_set_sCAL_s,
-    (png_structp png_ptr, png_infop info_ptr,
-    int unit, png_const_charp swidth, png_const_charp sheight));
-#endif /* PNG_sCAL_SUPPORTED */
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-/* Provide a list of chunks and how they are to be handled, if the built-in
-   handling or default unknown chunk handling is not desired.  Any chunks not
-   listed will be handled in the default manner.  The IHDR and IEND chunks
-   must not be listed.  Because this turns off the default handling for chunks
-   that would otherwise be recognized the behavior of libpng transformations may
-   well become incorrect!
-      keep = 0: PNG_HANDLE_CHUNK_AS_DEFAULT: follow default behavior
-           = 1: PNG_HANDLE_CHUNK_NEVER:      do not keep
-           = 2: PNG_HANDLE_CHUNK_IF_SAFE:    keep only if safe-to-copy
-           = 3: PNG_HANDLE_CHUNK_ALWAYS:     keep even if unsafe-to-copy
-*/
-PNG_EXPORT(172, void, png_set_keep_unknown_chunks,
-    (png_structp png_ptr, int keep,
-    png_const_bytep chunk_list, int num_chunks));
+    (png_const_structrp png_ptr, png_const_inforp info_ptr, int *unit,
+    png_charpp swidth, png_charpp sheight));
 
-/* The handling code is returned; the result is therefore true (non-zero) if
- * special handling is required, false for the default handling.
- */
-PNG_EXPORT(173, int, png_handle_as_unknown, (png_structp png_ptr,
+PNG_FP_EXPORT(170, void, png_set_sCAL, (png_const_structrp png_ptr,
+    png_inforp info_ptr, int unit, double width, double height))
+PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_const_structrp png_ptr,
+   png_inforp info_ptr, int unit, png_fixed_point width,
+   png_fixed_point height))
+PNG_EXPORT(171, void, png_set_sCAL_s, (png_const_structrp png_ptr,
+    png_inforp info_ptr, int unit,
+    png_const_charp swidth, png_const_charp sheight));
+#endif /* sCAL */
+
+#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
+/* Provide the default handling for all unknown chunks or, optionally, for
+ * specific unknown chunks.
+ *
+ * NOTE: prior to 1.6.0 the handling specified for particular chunks on read was
+ * ignored and the default was used, the per-chunk setting only had an effect on
+ * write.  If you wish to have chunk-specific handling on read in code that must
+ * work on earlier versions you must use a user chunk callback to specify the
+ * desired handling (keep or discard.)
+ *
+ * The 'keep' parameter is a PNG_HANDLE_CHUNK_ value as listed below.  The
+ * parameter is interpreted as follows:
+ *
+ * READ:
+ *    PNG_HANDLE_CHUNK_AS_DEFAULT:
+ *       Known chunks: do normal libpng processing, do not keep the chunk (but
+ *          see the comments below about PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
+ *       Unknown chunks: for a specific chunk use the global default, when used
+ *          as the default discard the chunk data.
+ *    PNG_HANDLE_CHUNK_NEVER:
+ *       Discard the chunk data.
+ *    PNG_HANDLE_CHUNK_IF_SAFE:
+ *       Keep the chunk data if the chunk is not critical else raise a chunk
+ *       error.
+ *    PNG_HANDLE_CHUNK_ALWAYS:
+ *       Keep the chunk data.
+ *
+ * If the chunk data is saved it can be retrieved using png_get_unknown_chunks,
+ * below.  Notice that specifying "AS_DEFAULT" as a global default is equivalent
+ * to specifying "NEVER", however when "AS_DEFAULT" is used for specific chunks
+ * it simply resets the behavior to the libpng default.
+ *
+ * INTERACTION WTIH USER CHUNK CALLBACKS:
+ * The per-chunk handling is always used when there is a png_user_chunk_ptr
+ * callback and the callback returns 0; the chunk is then always stored *unless*
+ * it is critical and the per-chunk setting is other than ALWAYS.  Notice that
+ * the global default is *not* used in this case.  (In effect the per-chunk
+ * value is incremented to at least IF_SAFE.)
+ *
+ * IMPORTANT NOTE: this behavior will change in libpng 1.7 - the global and
+ * per-chunk defaults will be honored.  If you want to preserve the current
+ * behavior when your callback returns 0 you must set PNG_HANDLE_CHUNK_IF_SAFE
+ * as the default - if you don't do this libpng 1.6 will issue a warning.
+ *
+ * If you want unhandled unknown chunks to be discarded in libpng 1.6 and
+ * earlier simply return '1' (handled).
+ *
+ * PNG_HANDLE_AS_UNKNOWN_SUPPORTED:
+ *    If this is *not* set known chunks will always be handled by libpng and
+ *    will never be stored in the unknown chunk list.  Known chunks listed to
+ *    png_set_keep_unknown_chunks will have no effect.  If it is set then known
+ *    chunks listed with a keep other than AS_DEFAULT will *never* be processed
+ *    by libpng, in addition critical chunks must either be processed by the
+ *    callback or saved.
+ *
+ *    The IHDR and IEND chunks must not be listed.  Because this turns off the
+ *    default handling for chunks that would otherwise be recognized the
+ *    behavior of libpng transformations may well become incorrect!
+ *
+ * WRITE:
+ *    When writing chunks the options only apply to the chunks specified by
+ *    png_set_unknown_chunks (below), libpng will *always* write known chunks
+ *    required by png_set_ calls and will always write the core critical chunks
+ *    (as required for PLTE).
+ *
+ *    Each chunk in the png_set_unknown_chunks list is looked up in the
+ *    png_set_keep_unknown_chunks list to find the keep setting, this is then
+ *    interpreted as follows:
+ *
+ *    PNG_HANDLE_CHUNK_AS_DEFAULT:
+ *       Write safe-to-copy chunks and write other chunks if the global
+ *       default is set to _ALWAYS, otherwise don't write this chunk.
+ *    PNG_HANDLE_CHUNK_NEVER:
+ *       Do not write the chunk.
+ *    PNG_HANDLE_CHUNK_IF_SAFE:
+ *       Write the chunk if it is safe-to-copy, otherwise do not write it.
+ *    PNG_HANDLE_CHUNK_ALWAYS:
+ *       Write the chunk.
+ *
+ * Note that the default behavior is effectively the opposite of the read case -
+ * in read unknown chunks are not stored by default, in write they are written
+ * by default.  Also the behavior of PNG_HANDLE_CHUNK_IF_SAFE is very different
+ * - on write the safe-to-copy bit is checked, on read the critical bit is
+ * checked and on read if the chunk is critical an error will be raised.
+ *
+ * num_chunks:
+ * ===========
+ *    If num_chunks is positive, then the "keep" parameter specifies the manner
+ *    for handling only those chunks appearing in the chunk_list array,
+ *    otherwise the chunk list array is ignored.
+ *
+ *    If num_chunks is 0 the "keep" parameter specifies the default behavior for
+ *    unknown chunks, as described above.
+ *
+ *    If num_chunks is negative, then the "keep" parameter specifies the manner
+ *    for handling all unknown chunks plus all chunks recognized by libpng
+ *    except for the IHDR, PLTE, tRNS, IDAT, and IEND chunks (which continue to
+ *    be processed by libpng.
+ */
+PNG_EXPORT(172, void, png_set_keep_unknown_chunks, (png_structrp png_ptr,
+    int keep, png_const_bytep chunk_list, int num_chunks));
+
+/* The "keep" PNG_HANDLE_CHUNK_ parameter for the specified chunk is returned;
+ * the result is therefore true (non-zero) if special handling is required,
+ * false for the default handling.
+ */
+PNG_EXPORT(173, int, png_handle_as_unknown, (png_const_structrp png_ptr,
     png_const_bytep chunk_name));
 #endif
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-PNG_EXPORT(174, void, png_set_unknown_chunks, (png_structp png_ptr,
-    png_infop info_ptr, png_const_unknown_chunkp unknowns,
+
+#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
+PNG_EXPORT(174, void, png_set_unknown_chunks, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_const_unknown_chunkp unknowns,
     int num_unknowns));
+   /* NOTE: prior to 1.6.0 this routine set the 'location' field of the added
+    * unknowns to the location currently stored in the png_struct.  This is
+    * invariably the wrong value on write.  To fix this call the following API
+    * for each chunk in the list with the correct location.  If you know your
+    * code won't be compiled on earlier versions you can rely on
+    * png_set_unknown_chunks(write-ptr, png_get_unknown_chunks(read-ptr)) doing
+    * the correct thing.
+    */
+
 PNG_EXPORT(175, void, png_set_unknown_chunk_location,
-    (png_structp png_ptr, png_infop info_ptr, int chunk, int location));
-PNG_EXPORT(176, int, png_get_unknown_chunks, (png_const_structp png_ptr,
-    png_const_infop info_ptr, png_unknown_chunkpp entries));
+    (png_const_structrp png_ptr, png_inforp info_ptr, int chunk, int location));
+
+PNG_EXPORT(176, int, png_get_unknown_chunks, (png_const_structrp png_ptr,
+    png_inforp info_ptr, png_unknown_chunkpp entries));
 #endif
 
 /* Png_free_data() will turn off the "valid" flag for anything it frees.
  * If you need to turn it off for a chunk that your application has freed,
  * you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK);
  */
-PNG_EXPORT(177, void, png_set_invalid,
-    (png_structp png_ptr, png_infop info_ptr, int mask));
+PNG_EXPORT(177, void, png_set_invalid, (png_const_structrp png_ptr,
+    png_inforp info_ptr, int mask));
 
 #ifdef PNG_INFO_IMAGE_SUPPORTED
 /* The "params" pointer is currently not used and is for future expansion. */
-PNG_EXPORT(178, void, png_read_png, (png_structp png_ptr, png_infop info_ptr,
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
+PNG_EXPORT(178, void, png_read_png, (png_structrp png_ptr, png_inforp info_ptr,
     int transforms, png_voidp params));
-PNG_EXPORT(179, void, png_write_png, (png_structp png_ptr, png_infop info_ptr,
+#endif
+#ifdef PNG_WRITE_SUPPORTED
+PNG_EXPORT(179, void, png_write_png, (png_structrp png_ptr, png_inforp info_ptr,
     int transforms, png_voidp params));
 #endif
+#endif
 
 PNG_EXPORT(180, png_const_charp, png_get_copyright,
-    (png_const_structp png_ptr));
+    (png_const_structrp png_ptr));
 PNG_EXPORT(181, png_const_charp, png_get_header_ver,
-    (png_const_structp png_ptr));
+    (png_const_structrp png_ptr));
 PNG_EXPORT(182, png_const_charp, png_get_header_version,
-    (png_const_structp png_ptr));
+    (png_const_structrp png_ptr));
 PNG_EXPORT(183, png_const_charp, png_get_libpng_ver,
-    (png_const_structp png_ptr));
+    (png_const_structrp png_ptr));
 
 #ifdef PNG_MNG_FEATURES_SUPPORTED
-PNG_EXPORT(184, png_uint_32, png_permit_mng_features, (png_structp png_ptr,
+PNG_EXPORT(184, png_uint_32, png_permit_mng_features, (png_structrp png_ptr,
     png_uint_32 mng_features_permitted));
 #endif
 
@@ -2294,75 +2369,77 @@ PNG_EXPORT(184, png_uint_32, png_permit_mng_features, (png_structp png_ptr,
 #define PNG_HANDLE_CHUNK_NEVER        1
 #define PNG_HANDLE_CHUNK_IF_SAFE      2
 #define PNG_HANDLE_CHUNK_ALWAYS       3
+#define PNG_HANDLE_CHUNK_LAST         4
 
 /* Strip the prepended error numbers ("#nnn ") from error and warning
  * messages before passing them to the error or warning handler.
  */
 #ifdef PNG_ERROR_NUMBERS_SUPPORTED
-PNG_EXPORT(185, void, png_set_strip_error_numbers,
-    (png_structp png_ptr,
+PNG_EXPORT(185, void, png_set_strip_error_numbers, (png_structrp png_ptr,
     png_uint_32 strip_mode));
 #endif
 
 /* Added in libpng-1.2.6 */
 #ifdef PNG_SET_USER_LIMITS_SUPPORTED
-PNG_EXPORT(186, void, png_set_user_limits, (png_structp png_ptr,
+PNG_EXPORT(186, void, png_set_user_limits, (png_structrp png_ptr,
     png_uint_32 user_width_max, png_uint_32 user_height_max));
 PNG_EXPORT(187, png_uint_32, png_get_user_width_max,
-    (png_const_structp png_ptr));
+    (png_const_structrp png_ptr));
 PNG_EXPORT(188, png_uint_32, png_get_user_height_max,
-    (png_const_structp png_ptr));
+    (png_const_structrp png_ptr));
 /* Added in libpng-1.4.0 */
-PNG_EXPORT(189, void, png_set_chunk_cache_max, (png_structp png_ptr,
+PNG_EXPORT(189, void, png_set_chunk_cache_max, (png_structrp png_ptr,
     png_uint_32 user_chunk_cache_max));
 PNG_EXPORT(190, png_uint_32, png_get_chunk_cache_max,
-    (png_const_structp png_ptr));
+    (png_const_structrp png_ptr));
 /* Added in libpng-1.4.1 */
-PNG_EXPORT(191, void, png_set_chunk_malloc_max, (png_structp png_ptr,
+PNG_EXPORT(191, void, png_set_chunk_malloc_max, (png_structrp png_ptr,
     png_alloc_size_t user_chunk_cache_max));
 PNG_EXPORT(192, png_alloc_size_t, png_get_chunk_malloc_max,
-    (png_const_structp png_ptr));
+    (png_const_structrp png_ptr));
 #endif
 
 #if defined(PNG_INCH_CONVERSIONS_SUPPORTED)
 PNG_EXPORT(193, png_uint_32, png_get_pixels_per_inch,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
+    (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
 PNG_EXPORT(194, png_uint_32, png_get_x_pixels_per_inch,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
+    (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
 PNG_EXPORT(195, png_uint_32, png_get_y_pixels_per_inch,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
+    (png_const_structrp png_ptr, png_const_inforp info_ptr));
 
 PNG_FP_EXPORT(196, float, png_get_x_offset_inches,
-    (png_const_structp png_ptr, png_const_infop info_ptr))
+    (png_const_structrp png_ptr, png_const_inforp info_ptr))
 #ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
 PNG_FIXED_EXPORT(211, png_fixed_point, png_get_x_offset_inches_fixed,
-    (png_structp png_ptr, png_const_infop info_ptr))
+    (png_const_structrp png_ptr, png_const_inforp info_ptr))
 #endif
 
-PNG_FP_EXPORT(197, float, png_get_y_offset_inches, (png_const_structp png_ptr,
-    png_const_infop info_ptr))
+PNG_FP_EXPORT(197, float, png_get_y_offset_inches, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr))
 #ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
 PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed,
-    (png_structp png_ptr, png_const_infop info_ptr))
+    (png_const_structrp png_ptr, png_const_inforp info_ptr))
 #endif
 
 #  ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structp png_ptr,
-    png_const_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
+PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
     int *unit_type));
-#  endif /* PNG_pHYs_SUPPORTED */
-#endif  /* PNG_INCH_CONVERSIONS_SUPPORTED */
+#  endif /* pHYs */
+#endif  /* INCH_CONVERSIONS */
 
 /* Added in libpng-1.4.0 */
 #ifdef PNG_IO_STATE_SUPPORTED
-PNG_EXPORT(199, png_uint_32, png_get_io_state, (png_structp png_ptr));
+PNG_EXPORT(199, png_uint_32, png_get_io_state, (png_const_structrp png_ptr));
+
+/* Removed from libpng 1.6; use png_get_io_chunk_type. */
+PNG_REMOVED(200, png_const_bytep, png_get_io_chunk_name, (png_structrp png_ptr),
+    PNG_DEPRECATED)
 
-PNG_EXPORTA(200, png_const_bytep, png_get_io_chunk_name,
-    (png_structp png_ptr), PNG_DEPRECATED);
 PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
-    (png_const_structp png_ptr));
+    (png_const_structrp png_ptr));
 
 /* The flags returned by png_get_io_state() are the following: */
 #  define PNG_IO_NONE        0x0000   /* no I/O at this moment */
@@ -2374,7 +2451,7 @@ PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
 #  define PNG_IO_CHUNK_CRC   0x0080   /* currently at the chunk crc */
 #  define PNG_IO_MASK_OP     0x000f   /* current operation: reading/writing */
 #  define PNG_IO_MASK_LOC    0x00f0   /* current location: sig/hdr/data/crc */
-#endif /* ?PNG_IO_STATE_SUPPORTED */
+#endif /* IO_STATE */
 
 /* Interlace support.  The following macros are always defined so that if
  * libpng interlace handling is turned off the macros may be used to handle
@@ -2418,10 +2495,10 @@ PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
  * necessary to find the row in the output image given a row in an interlaced
  * image, so two more macros:
  */
-#define PNG_ROW_FROM_PASS_ROW(yIn, pass) \
-   (((yIn)<<PNG_PASS_ROW_SHIFT(pass))+PNG_PASS_START_ROW(pass))
-#define PNG_COL_FROM_PASS_COL(xIn, pass) \
-   (((xIn)<<PNG_PASS_COL_SHIFT(pass))+PNG_PASS_START_COL(pass))
+#define PNG_ROW_FROM_PASS_ROW(y_in, pass) \
+   (((y_in)<<PNG_PASS_ROW_SHIFT(pass))+PNG_PASS_START_ROW(pass))
+#define PNG_COL_FROM_PASS_COL(x_in, pass) \
+   (((x_in)<<PNG_PASS_COL_SHIFT(pass))+PNG_PASS_START_COL(pass))
 
 /* Two macros which return a boolean (0 or 1) saying whether the given row
  * or column is in a particular pass.  These use a common utility macro that
@@ -2458,27 +2535,29 @@ PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
            * (png_uint_16)(alpha)                         \
            + (png_uint_16)(bg)*(png_uint_16)(255          \
            - (png_uint_16)(alpha)) + 128);                \
-       (composite) = (png_byte)((temp + (temp >> 8)) >> 8); }
+       (composite) = (png_byte)(((temp + (temp >> 8)) >> 8) & 0xff); }
 
 #  define png_composite_16(composite, fg, alpha, bg)       \
      { png_uint_32 temp = (png_uint_32)((png_uint_32)(fg)  \
            * (png_uint_32)(alpha)                          \
            + (png_uint_32)(bg)*(65535                      \
            - (png_uint_32)(alpha)) + 32768);               \
-       (composite) = (png_uint_16)((temp + (temp >> 16)) >> 16); }
+       (composite) = (png_uint_16)(0xffff & ((temp + (temp >> 16)) >> 16)); }
 
 #else  /* Standard method using integer division */
 
-#  define png_composite(composite, fg, alpha, bg)                          \
-     (composite) = (png_byte)(((png_uint_16)(fg) * (png_uint_16)(alpha) +  \
-     (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) +       \
-     127) / 255)
+#  define png_composite(composite, fg, alpha, bg)                        \
+     (composite) =                                                       \
+         (png_byte)(0xff & (((png_uint_16)(fg) * (png_uint_16)(alpha) +  \
+         (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) + \
+         127) / 255))
 
 #  define png_composite_16(composite, fg, alpha, bg)                         \
-     (composite) = (png_uint_16)(((png_uint_32)(fg) * (png_uint_32)(alpha) + \
-     (png_uint_32)(bg)*(png_uint_32)(65535 - (png_uint_32)(alpha)) +         \
-     32767) / 65535)
-#endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */
+     (composite) =                                                           \
+         (png_uint_16)(0xffff & (((png_uint_32)(fg) * (png_uint_32)(alpha) + \
+         (png_uint_32)(bg)*(png_uint_32)(65535 - (png_uint_32)(alpha)) +     \
+         32767) / 65535))
+#endif /* READ_COMPOSITE_NODIV */
 
 #ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
 PNG_EXPORT(201, png_uint_32, png_get_uint_32, (png_const_bytep buf));
@@ -2486,7 +2565,7 @@ PNG_EXPORT(202, png_uint_16, png_get_uint_16, (png_const_bytep buf));
 PNG_EXPORT(203, png_int_32, png_get_int_32, (png_const_bytep buf));
 #endif
 
-PNG_EXPORT(204, png_uint_32, png_get_uint_31, (png_structp png_ptr,
+PNG_EXPORT(204, png_uint_32, png_get_uint_31, (png_const_structrp png_ptr,
     png_const_bytep buf));
 /* No png_get_int_16 -- may be added if there's a real need for it. */
 
@@ -2512,7 +2591,7 @@ PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));
  * The png_get_int_32() routine assumes we are using two's complement
  * format for negative values, which is almost certainly true.
  */
-#  define png_get_uint_32(buf) \
+#  define PNG_get_uint_32(buf) \
      (((png_uint_32)(*(buf)) << 24) + \
       ((png_uint_32)(*((buf) + 1)) << 16) + \
       ((png_uint_32)(*((buf) + 2)) << 8) + \
@@ -2521,28 +2600,602 @@ PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));
    /* From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the
     * function) incorrectly returned a value of type png_uint_32.
     */
-#  define png_get_uint_16(buf) \
+#  define PNG_get_uint_16(buf) \
      ((png_uint_16) \
       (((unsigned int)(*(buf)) << 8) + \
        ((unsigned int)(*((buf) + 1)))))
 
-#  define png_get_int_32(buf) \
+#  define PNG_get_int_32(buf) \
      ((png_int_32)((*(buf) & 0x80) \
       ? -((png_int_32)(((png_get_uint_32(buf)^0xffffffffU)+1U)&0x7fffffffU)) \
       : (png_int_32)png_get_uint_32(buf)))
+
+   /* If PNG_PREFIX is defined the same thing as below happens in pnglibconf.h,
+    * but defining a macro name prefixed with PNG_PREFIX.
+    */
+#  ifndef PNG_PREFIX
+#     define png_get_uint_32(buf) PNG_get_uint_32(buf)
+#     define png_get_uint_16(buf) PNG_get_uint_16(buf)
+#     define png_get_int_32(buf)  PNG_get_int_32(buf)
+#  endif
+#else
+#  ifdef PNG_PREFIX
+      /* No macros; revert to the (redefined) function */
+#     define PNG_get_uint_32 (png_get_uint_32)
+#     define PNG_get_uint_16 (png_get_uint_16)
+#     define PNG_get_int_32  (png_get_int_32)
+#  endif
 #endif
 
 #ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-PNG_EXPORT(234, void, png_set_check_for_invalid_index, (png_structp png_ptr,
-    int allowed));
+PNG_EXPORT(242, void, png_set_check_for_invalid_index,
+    (png_structrp png_ptr, int allowed));
 #  ifdef PNG_GET_PALETTE_MAX_SUPPORTED
-PNG_EXPORT(235, int, png_get_palette_max, (png_const_structp png_ptr,
+PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,
     png_const_infop info_ptr));
 #  endif
 #endif /* CHECK_FOR_INVALID_INDEX */
 
 /*******************************************************************************
- *  IMPLEMENTATION OPTIONS
+ * Section 5: SIMPLIFIED API
+ *******************************************************************************
+ *
+ * Please read the documentation in libpng-manual.txt (TODO: write said
+ * documentation) if you don't understand what follows.
+ *
+ * The simplified API hides the details of both libpng and the PNG file format
+ * itself.  It allows PNG files to be read into a very limited number of
+ * in-memory bitmap formats or to be written from the same formats.  If these
+ * formats do not accomodate your needs then you can, and should, use the more
+ * sophisticated APIs above - these support a wide variety of in-memory formats
+ * and a wide variety of sophisticated transformations to those formats as well
+ * as a wide variety of APIs to manipulate ancillary information.
+ *
+ * To read a PNG file using the simplified API:
+ *
+ * 1) Declare a 'png_image' structure (see below) on the stack, set the
+ *    version field to PNG_IMAGE_VERSION and the 'opaque' pointer to NULL
+ *    (this is REQUIRED, your program may crash if you don't do it.)
+ * 2) Call the appropriate png_image_begin_read... function.
+ * 3) Set the png_image 'format' member to the required sample format.
+ * 4) Allocate a buffer for the image and, if required, the color-map.
+ * 5) Call png_image_finish_read to read the image and, if required, the
+ *    color-map into your buffers.
+ *
+ * There are no restrictions on the format of the PNG input itself; all valid
+ * color types, bit depths, and interlace methods are acceptable, and the
+ * input image is transformed as necessary to the requested in-memory format
+ * during the png_image_finish_read() step.  The only caveat is that if you
+ * request a color-mapped image from a PNG that is full-color or makes
+ * complex use of an alpha channel the transformation is extremely lossy and the
+ * result may look terrible.
+ *
+ * To write a PNG file using the simplified API:
+ *
+ * 1) Declare a 'png_image' structure on the stack and memset() it to all zero.
+ * 2) Initialize the members of the structure that describe the image, setting
+ *    the 'format' member to the format of the image samples.
+ * 3) Call the appropriate png_image_write... function with a pointer to the
+ *    image and, if necessary, the color-map to write the PNG data.
+ *
+ * png_image is a structure that describes the in-memory format of an image
+ * when it is being read or defines the in-memory format of an image that you
+ * need to write:
+ */
+#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) || \
+    defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
+
+#define PNG_IMAGE_VERSION 1
+
+typedef struct png_control *png_controlp;
+typedef struct
+{
+   png_controlp opaque;    /* Initialize to NULL, free with png_image_free */
+   png_uint_32  version;   /* Set to PNG_IMAGE_VERSION */
+   png_uint_32  width;     /* Image width in pixels (columns) */
+   png_uint_32  height;    /* Image height in pixels (rows) */
+   png_uint_32  format;    /* Image format as defined below */
+   png_uint_32  flags;     /* A bit mask containing informational flags */
+   png_uint_32  colormap_entries;
+                           /* Number of entries in the color-map */
+
+   /* In the event of an error or warning the following field will be set to a
+    * non-zero value and the 'message' field will contain a '\0' terminated
+    * string with the libpng error or warning message.  If both warnings and
+    * an error were encountered, only the error is recorded.  If there
+    * are multiple warnings, only the first one is recorded.
+    *
+    * The upper 30 bits of this value are reserved, the low two bits contain
+    * a value as follows:
+    */
+#  define PNG_IMAGE_WARNING 1
+#  define PNG_IMAGE_ERROR 2
+   /*
+    * The result is a two-bit code such that a value more than 1 indicates
+    * a failure in the API just called:
+    *
+    *    0 - no warning or error
+    *    1 - warning
+    *    2 - error
+    *    3 - error preceded by warning
+    */
+#  define PNG_IMAGE_FAILED(png_cntrl) ((((png_cntrl).warning_or_error)&0x03)>1)
+
+   png_uint_32  warning_or_error;
+
+   char         message[64];
+} png_image, *png_imagep;
+
+/* The samples of the image have one to four channels whose components have
+ * original values in the range 0 to 1.0:
+ *
+ * 1: A single gray or luminance channel (G).
+ * 2: A gray/luminance channel and an alpha channel (GA).
+ * 3: Three red, green, blue color channels (RGB).
+ * 4: Three color channels and an alpha channel (RGBA).
+ *
+ * The components are encoded in one of two ways:
+ *
+ * a) As a small integer, value 0..255, contained in a single byte.  For the
+ * alpha channel the original value is simply value/255.  For the color or
+ * luminance channels the value is encoded according to the sRGB specification
+ * and matches the 8-bit format expected by typical display devices.
+ *
+ * The color/gray channels are not scaled (pre-multiplied) by the alpha
+ * channel and are suitable for passing to color management software.
+ *
+ * b) As a value in the range 0..65535, contained in a 2-byte integer.  All
+ * channels can be converted to the original value by dividing by 65535; all
+ * channels are linear.  Color channels use the RGB encoding (RGB end-points) of
+ * the sRGB specification.  This encoding is identified by the
+ * PNG_FORMAT_FLAG_LINEAR flag below.
+ *
+ * When the simplified API needs to convert between sRGB and linear colorspaces,
+ * the actual sRGB transfer curve defined in the sRGB specification (see the
+ * article at http://en.wikipedia.org/wiki/SRGB) is used, not the gamma=1/2.2
+ * approximation used elsewhere in libpng.
+ *
+ * When an alpha channel is present it is expected to denote pixel coverage
+ * of the color or luminance channels and is returned as an associated alpha
+ * channel: the color/gray channels are scaled (pre-multiplied) by the alpha
+ * value.
+ *
+ * The samples are either contained directly in the image data, between 1 and 8
+ * bytes per pixel according to the encoding, or are held in a color-map indexed
+ * by bytes in the image data.  In the case of a color-map the color-map entries
+ * are individual samples, encoded as above, and the image data has one byte per
+ * pixel to select the relevant sample from the color-map.
+ */
+
+/* PNG_FORMAT_*
+ *
+ * #defines to be used in png_image::format.  Each #define identifies a
+ * particular layout of sample data and, if present, alpha values.  There are
+ * separate defines for each of the two component encodings.
+ *
+ * A format is built up using single bit flag values.  All combinations are
+ * valid.  Formats can be built up from the flag values or you can use one of
+ * the predefined values below.  When testing formats always use the FORMAT_FLAG
+ * macros to test for individual features - future versions of the library may
+ * add new flags.
+ *
+ * When reading or writing color-mapped images the format should be set to the
+ * format of the entries in the color-map then png_image_{read,write}_colormap
+ * called to read or write the color-map and set the format correctly for the
+ * image data.  Do not set the PNG_FORMAT_FLAG_COLORMAP bit directly!
+ *
+ * NOTE: libpng can be built with particular features disabled. If you see
+ * compiler errors because the definition of one of the following flags has been
+ * compiled out it is because libpng does not have the required support.  It is
+ * possible, however, for the libpng configuration to enable the format on just
+ * read or just write; in that case you may see an error at run time.  You can
+ * guard against this by checking for the definition of the appropriate
+ * "_SUPPORTED" macro, one of:
+ *
+ *    PNG_SIMPLIFIED_{READ,WRITE}_{BGR,AFIRST}_SUPPORTED
+ */
+#define PNG_FORMAT_FLAG_ALPHA    0x01U /* format with an alpha channel */
+#define PNG_FORMAT_FLAG_COLOR    0x02U /* color format: otherwise grayscale */
+#define PNG_FORMAT_FLAG_LINEAR   0x04U /* 2-byte channels else 1-byte */
+#define PNG_FORMAT_FLAG_COLORMAP 0x08U /* image data is color-mapped */
+
+#ifdef PNG_FORMAT_BGR_SUPPORTED
+#  define PNG_FORMAT_FLAG_BGR    0x10U /* BGR colors, else order is RGB */
+#endif
+
+#ifdef PNG_FORMAT_AFIRST_SUPPORTED
+#  define PNG_FORMAT_FLAG_AFIRST 0x20U /* alpha channel comes first */
+#endif
+
+/* Commonly used formats have predefined macros.
+ *
+ * First the single byte (sRGB) formats:
+ */
+#define PNG_FORMAT_GRAY 0
+#define PNG_FORMAT_GA   PNG_FORMAT_FLAG_ALPHA
+#define PNG_FORMAT_AG   (PNG_FORMAT_GA|PNG_FORMAT_FLAG_AFIRST)
+#define PNG_FORMAT_RGB  PNG_FORMAT_FLAG_COLOR
+#define PNG_FORMAT_BGR  (PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_BGR)
+#define PNG_FORMAT_RGBA (PNG_FORMAT_RGB|PNG_FORMAT_FLAG_ALPHA)
+#define PNG_FORMAT_ARGB (PNG_FORMAT_RGBA|PNG_FORMAT_FLAG_AFIRST)
+#define PNG_FORMAT_BGRA (PNG_FORMAT_BGR|PNG_FORMAT_FLAG_ALPHA)
+#define PNG_FORMAT_ABGR (PNG_FORMAT_BGRA|PNG_FORMAT_FLAG_AFIRST)
+
+/* Then the linear 2-byte formats.  When naming these "Y" is used to
+ * indicate a luminance (gray) channel.
+ */
+#define PNG_FORMAT_LINEAR_Y PNG_FORMAT_FLAG_LINEAR
+#define PNG_FORMAT_LINEAR_Y_ALPHA (PNG_FORMAT_FLAG_LINEAR|PNG_FORMAT_FLAG_ALPHA)
+#define PNG_FORMAT_LINEAR_RGB (PNG_FORMAT_FLAG_LINEAR|PNG_FORMAT_FLAG_COLOR)
+#define PNG_FORMAT_LINEAR_RGB_ALPHA \
+   (PNG_FORMAT_FLAG_LINEAR|PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_ALPHA)
+
+/* With color-mapped formats the image data is one byte for each pixel, the byte
+ * is an index into the color-map which is formatted as above.  To obtain a
+ * color-mapped format it is sufficient just to add the PNG_FOMAT_FLAG_COLORMAP
+ * to one of the above definitions, or you can use one of the definitions below.
+ */
+#define PNG_FORMAT_RGB_COLORMAP  (PNG_FORMAT_RGB|PNG_FORMAT_FLAG_COLORMAP)
+#define PNG_FORMAT_BGR_COLORMAP  (PNG_FORMAT_BGR|PNG_FORMAT_FLAG_COLORMAP)
+#define PNG_FORMAT_RGBA_COLORMAP (PNG_FORMAT_RGBA|PNG_FORMAT_FLAG_COLORMAP)
+#define PNG_FORMAT_ARGB_COLORMAP (PNG_FORMAT_ARGB|PNG_FORMAT_FLAG_COLORMAP)
+#define PNG_FORMAT_BGRA_COLORMAP (PNG_FORMAT_BGRA|PNG_FORMAT_FLAG_COLORMAP)
+#define PNG_FORMAT_ABGR_COLORMAP (PNG_FORMAT_ABGR|PNG_FORMAT_FLAG_COLORMAP)
+
+/* PNG_IMAGE macros
+ *
+ * These are convenience macros to derive information from a png_image
+ * structure.  The PNG_IMAGE_SAMPLE_ macros return values appropriate to the
+ * actual image sample values - either the entries in the color-map or the
+ * pixels in the image.  The PNG_IMAGE_PIXEL_ macros return corresponding values
+ * for the pixels and will always return 1 for color-mapped formats.  The
+ * remaining macros return information about the rows in the image and the
+ * complete image.
+ *
+ * NOTE: All the macros that take a png_image::format parameter are compile time
+ * constants if the format parameter is, itself, a constant.  Therefore these
+ * macros can be used in array declarations and case labels where required.
+ * Similarly the macros are also pre-processor constants (sizeof is not used) so
+ * they can be used in #if tests.
+ *
+ * First the information about the samples.
+ */
+#define PNG_IMAGE_SAMPLE_CHANNELS(fmt)\
+   (((fmt)&(PNG_FORMAT_FLAG_COLOR|PNG_FORMAT_FLAG_ALPHA))+1)
+   /* Return the total number of channels in a given format: 1..4 */
+
+#define PNG_IMAGE_SAMPLE_COMPONENT_SIZE(fmt)\
+   ((((fmt) & PNG_FORMAT_FLAG_LINEAR) >> 2)+1)
+   /* Return the size in bytes of a single component of a pixel or color-map
+    * entry (as appropriate) in the image: 1 or 2.
+    */
+
+#define PNG_IMAGE_SAMPLE_SIZE(fmt)\
+   (PNG_IMAGE_SAMPLE_CHANNELS(fmt) * PNG_IMAGE_SAMPLE_COMPONENT_SIZE(fmt))
+   /* This is the size of the sample data for one sample.  If the image is
+    * color-mapped it is the size of one color-map entry (and image pixels are
+    * one byte in size), otherwise it is the size of one image pixel.
+    */
+
+#define PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(fmt)\
+   (PNG_IMAGE_SAMPLE_CHANNELS(fmt) * 256)
+   /* The maximum size of the color-map required by the format expressed in a
+    * count of components.  This can be used to compile-time allocate a
+    * color-map:
+    *
+    * png_uint_16 colormap[PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(linear_fmt)];
+    *
+    * png_byte colormap[PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(sRGB_fmt)];
+    *
+    * Alternatively use the PNG_IMAGE_COLORMAP_SIZE macro below to use the
+    * information from one of the png_image_begin_read_ APIs and dynamically
+    * allocate the required memory.
+    */
+
+/* Corresponding information about the pixels */
+#define PNG_IMAGE_PIXEL_(test,fmt)\
+   (((fmt)&PNG_FORMAT_FLAG_COLORMAP)?1:test(fmt))
+
+#define PNG_IMAGE_PIXEL_CHANNELS(fmt)\
+   PNG_IMAGE_PIXEL_(PNG_IMAGE_SAMPLE_CHANNELS,fmt)
+   /* The number of separate channels (components) in a pixel; 1 for a
+    * color-mapped image.
+    */
+
+#define PNG_IMAGE_PIXEL_COMPONENT_SIZE(fmt)\
+   PNG_IMAGE_PIXEL_(PNG_IMAGE_SAMPLE_COMPONENT_SIZE,fmt)
+   /* The size, in bytes, of each component in a pixel; 1 for a color-mapped
+    * image.
+    */
+
+#define PNG_IMAGE_PIXEL_SIZE(fmt) PNG_IMAGE_PIXEL_(PNG_IMAGE_SAMPLE_SIZE,fmt)
+   /* The size, in bytes, of a complete pixel; 1 for a color-mapped image. */
+
+/* Information about the whole row, or whole image */
+#define PNG_IMAGE_ROW_STRIDE(image)\
+   (PNG_IMAGE_PIXEL_CHANNELS((image).format) * (image).width)
+   /* Return the total number of components in a single row of the image; this
+    * is the minimum 'row stride', the minimum count of components between each
+    * row.  For a color-mapped image this is the minimum number of bytes in a
+    * row.
+    *
+    * WARNING: this macro overflows for some images with more than one component
+    * and very large image widths.  libpng will refuse to process an image where
+    * this macro would overflow.
+    */
+
+#define PNG_IMAGE_BUFFER_SIZE(image, row_stride)\
+   (PNG_IMAGE_PIXEL_COMPONENT_SIZE((image).format)*(image).height*(row_stride))
+   /* Return the size, in bytes, of an image buffer given a png_image and a row
+    * stride - the number of components to leave space for in each row.
+    *
+    * WARNING: this macro overflows a 32-bit integer for some large PNG images,
+    * libpng will refuse to process an image where such an overflow would occur.
+    */
+
+#define PNG_IMAGE_SIZE(image)\
+   PNG_IMAGE_BUFFER_SIZE(image, PNG_IMAGE_ROW_STRIDE(image))
+   /* Return the size, in bytes, of the image in memory given just a png_image;
+    * the row stride is the minimum stride required for the image.
+    */
+
+#define PNG_IMAGE_COLORMAP_SIZE(image)\
+   (PNG_IMAGE_SAMPLE_SIZE((image).format) * (image).colormap_entries)
+   /* Return the size, in bytes, of the color-map of this image.  If the image
+    * format is not a color-map format this will return a size sufficient for
+    * 256 entries in the given format; check PNG_FORMAT_FLAG_COLORMAP if
+    * you don't want to allocate a color-map in this case.
+    */
+
+/* PNG_IMAGE_FLAG_*
+ *
+ * Flags containing additional information about the image are held in the
+ * 'flags' field of png_image.
+ */
+#define PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB 0x01
+   /* This indicates the the RGB values of the in-memory bitmap do not
+    * correspond to the red, green and blue end-points defined by sRGB.
+    */
+
+#define PNG_IMAGE_FLAG_FAST 0x02
+   /* On write emphasise speed over compression; the resultant PNG file will be
+    * larger but will be produced significantly faster, particular for large
+    * images.  Do not use this option for images which will be distributed, only
+    * used it when producing intermediate files that will be read back in
+    * repeatedly.  For a typical 24-bit image the option will double the read
+    * speed at the cost of increasing the image size by 25%, however for many
+    * more compressible images the PNG file can be 10 times larger with only a
+    * slight speed gain.
+    */
+
+#define PNG_IMAGE_FLAG_16BIT_sRGB 0x04
+   /* On read if the image is a 16-bit per component image and there is no gAMA
+    * or sRGB chunk assume that the components are sRGB encoded.  Notice that
+    * images output by the simplified API always have gamma information; setting
+    * this flag only affects the interpretation of 16-bit images from an
+    * external source.  It is recommended that the application expose this flag
+    * to the user; the user can normally easily recognize the difference between
+    * linear and sRGB encoding.  This flag has no effect on write - the data
+    * passed to the write APIs must have the correct encoding (as defined
+    * above.)
+    *
+    * If the flag is not set (the default) input 16-bit per component data is
+    * assumed to be linear.
+    *
+    * NOTE: the flag can only be set after the png_image_begin_read_ call,
+    * because that call initializes the 'flags' field.
+    */
+
+#ifdef PNG_SIMPLIFIED_READ_SUPPORTED
+/* READ APIs
+ * ---------
+ *
+ * The png_image passed to the read APIs must have been initialized by setting
+ * the png_controlp field 'opaque' to NULL (or, safer, memset the whole thing.)
+ */
+#ifdef PNG_STDIO_SUPPORTED
+PNG_EXPORT(234, int, png_image_begin_read_from_file, (png_imagep image,
+   const char *file_name));
+   /* The named file is opened for read and the image header is filled in
+    * from the PNG header in the file.
+    */
+
+PNG_EXPORT(235, int, png_image_begin_read_from_stdio, (png_imagep image,
+   FILE* file));
+   /* The PNG header is read from the stdio FILE object. */
+#endif /* STDIO */
+
+PNG_EXPORT(236, int, png_image_begin_read_from_memory, (png_imagep image,
+   png_const_voidp memory, png_size_t size));
+   /* The PNG header is read from the given memory buffer. */
+
+PNG_EXPORT(237, int, png_image_finish_read, (png_imagep image,
+   png_const_colorp background, void *buffer, png_int_32 row_stride,
+   void *colormap));
+   /* Finish reading the image into the supplied buffer and clean up the
+    * png_image structure.
+    *
+    * row_stride is the step, in byte or 2-byte units as appropriate,
+    * between adjacent rows.  A positive stride indicates that the top-most row
+    * is first in the buffer - the normal top-down arrangement.  A negative
+    * stride indicates that the bottom-most row is first in the buffer.
+    *
+    * background need only be supplied if an alpha channel must be removed from
+    * a png_byte format and the removal is to be done by compositing on a solid
+    * color; otherwise it may be NULL and any composition will be done directly
+    * onto the buffer.  The value is an sRGB color to use for the background,
+    * for grayscale output the green channel is used.
+    *
+    * background must be supplied when an alpha channel must be removed from a
+    * single byte color-mapped output format, in other words if:
+    *
+    * 1) The original format from png_image_begin_read_from_* had
+    *    PNG_FORMAT_FLAG_ALPHA set.
+    * 2) The format set by the application does not.
+    * 3) The format set by the application has PNG_FORMAT_FLAG_COLORMAP set and
+    *    PNG_FORMAT_FLAG_LINEAR *not* set.
+    *
+    * For linear output removing the alpha channel is always done by compositing
+    * on black and background is ignored.
+    *
+    * colormap must be supplied when PNG_FORMAT_FLAG_COLORMAP is set.  It must
+    * be at least the size (in bytes) returned by PNG_IMAGE_COLORMAP_SIZE.
+    * image->colormap_entries will be updated to the actual number of entries
+    * written to the colormap; this may be less than the original value.
+    */
+
+PNG_EXPORT(238, void, png_image_free, (png_imagep image));
+   /* Free any data allocated by libpng in image->opaque, setting the pointer to
+    * NULL.  May be called at any time after the structure is initialized.
+    */
+#endif /* SIMPLIFIED_READ */
+
+#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
+/* WRITE APIS
+ * ----------
+ * For write you must initialize a png_image structure to describe the image to
+ * be written.  To do this use memset to set the whole structure to 0 then
+ * initialize fields describing your image.
+ *
+ * version: must be set to PNG_IMAGE_VERSION
+ * opaque: must be initialized to NULL
+ * width: image width in pixels
+ * height: image height in rows
+ * format: the format of the data (image and color-map) you wish to write
+ * flags: set to 0 unless one of the defined flags applies; set
+ *    PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB for color format images where the RGB
+ *    values do not correspond to the colors in sRGB.
+ * colormap_entries: set to the number of entries in the color-map (0 to 256)
+ */
+#ifdef PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
+PNG_EXPORT(239, int, png_image_write_to_file, (png_imagep image,
+   const char *file, int convert_to_8bit, const void *buffer,
+   png_int_32 row_stride, const void *colormap));
+   /* Write the image to the named file. */
+
+PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
+   int convert_to_8_bit, const void *buffer, png_int_32 row_stride,
+   const void *colormap));
+   /* Write the image to the given (FILE*). */
+#endif /* SIMPLIFIED_WRITE_STDIO */
+
+/* With all write APIs if image is in one of the linear formats with 16-bit
+ * data then setting convert_to_8_bit will cause the output to be an 8-bit PNG
+ * gamma encoded according to the sRGB specification, otherwise a 16-bit linear
+ * encoded PNG file is written.
+ *
+ * With color-mapped data formats the colormap parameter point to a color-map
+ * with at least image->colormap_entries encoded in the specified format.  If
+ * the format is linear the written PNG color-map will be converted to sRGB
+ * regardless of the convert_to_8_bit flag.
+ *
+ * With all APIs row_stride is handled as in the read APIs - it is the spacing
+ * from one row to the next in component sized units (1 or 2 bytes) and if
+ * negative indicates a bottom-up row layout in the buffer.  If row_stride is
+ * zero, libpng will calculate it for you from the image width and number of
+ * channels.
+ *
+ * Note that the write API does not support interlacing, sub-8-bit pixels or
+ * most ancillary chunks.  If you need to write text chunks (e.g. for copyright
+ * notices) you need to use one of the other APIs.
+ */
+
+PNG_EXPORT(245, int, png_image_write_to_memory, (png_imagep image, void *memory,
+   png_alloc_size_t * PNG_RESTRICT memory_bytes, int convert_to_8_bit,
+   const void *buffer, png_int_32 row_stride, const void *colormap));
+   /* Write the image to the given memory buffer.  The function both writes the
+    * whole PNG data stream to *memory and updates *memory_bytes with the count
+    * of bytes written.
+    *
+    * 'memory' may be NULL.  In this case *memory_bytes is not read however on
+    * success the number of bytes which would have been written will still be
+    * stored in *memory_bytes.  On failure *memory_bytes will contain 0.
+    *
+    * If 'memory' is not NULL it must point to memory[*memory_bytes] of
+    * writeable memory.
+    *
+    * If the function returns success memory[*memory_bytes] (if 'memory' is not
+    * NULL) contains the written PNG data.  *memory_bytes will always be less
+    * than or equal to the original value.
+    *
+    * If the function returns false and *memory_bytes was not changed an error
+    * occured during write.  If *memory_bytes was changed, or is not 0 if
+    * 'memory' was NULL, the write would have succeeded but for the memory
+    * buffer being too small.  *memory_bytes contains the required number of
+    * bytes and will be bigger that the original value.
+    */
+
+#define png_image_write_get_memory_size(image, size, convert_to_8_bit, buffer,\
+   row_stride, colormap)\
+   png_image_write_to_memory(&(image), 0, &(size), convert_to_8_bit, buffer,\
+         row_stride, colormap)
+   /* Return the amount of memory in 'size' required to compress this image.
+    * The png_image structure 'image' must be filled in as in the above
+    * function and must not be changed before the actual write call, the buffer
+    * and all other parameters must also be identical to that in the final
+    * write call.  The 'size' variable need not be initialized.
+    *
+    * NOTE: the macro returns true/false, if false is returned 'size' will be
+    * set to zero and the write failed and probably will fail if tried again.
+    */
+
+/* You can pre-allocate the buffer by making sure it is of sufficient size
+ * regardless of the amount of compression achieved.  The buffer size will
+ * always be bigger than the original image and it will never be filled.  The
+ * following macros are provided to assist in allocating the buffer.
+ */
+#define PNG_IMAGE_DATA_SIZE(image) (PNG_IMAGE_SIZE(image)+(image).height)
+   /* The number of uncompressed bytes in the PNG byte encoding of the image;
+    * uncompressing the PNG IDAT data will give this number of bytes.
+    *
+    * NOTE: while PNG_IMAGE_SIZE cannot overflow for an image in memory this
+    * macro can because of the extra bytes used in the PNG byte encoding.  You
+    * need to avoid this macro if your image size approaches 2^30 in width or
+    * height.  The same goes for the remainder of these macros; they all produce
+    * bigger numbers than the actual in-memory image size.
+    */
+#ifndef PNG_ZLIB_MAX_SIZE
+#  define PNG_ZLIB_MAX_SIZE(b) ((b)+(((b)+7U)>>3)+(((b)+63U)>>6)+11U)
+   /* An upper bound on the number of compressed bytes given 'b' uncompressed
+    * bytes.  This is based on deflateBounds() in zlib; different
+    * implementations of zlib compression may conceivably produce more data so
+    * if your zlib implementation is not zlib itself redefine this macro
+    * appropriately.
+    */
+#endif
+
+#define PNG_IMAGE_COMPRESSED_SIZE_MAX(image)\
+   PNG_ZLIB_MAX_SIZE((png_alloc_size_t)PNG_IMAGE_DATA_SIZE(image))
+   /* An upper bound on the size of the data in the PNG IDAT chunks. */
+
+#define PNG_IMAGE_PNG_SIZE_MAX_(image, image_size)\
+   ((8U/*sig*/+25U/*IHDR*/+16U/*gAMA*/+44U/*cHRM*/+12U/*IEND*/+\
+    (((image).format&PNG_FORMAT_FLAG_COLORMAP)?/*colormap: PLTE, tRNS*/\
+     12U+3U*(image).colormap_entries/*PLTE data*/+\
+     (((image).format&PNG_FORMAT_FLAG_ALPHA)?\
+      12U/*tRNS*/+(image).colormap_entries:0U):0U)+\
+    12U)+(12U*((image_size)/PNG_ZBUF_SIZE))/*IDAT*/+(image_size))
+   /* A helper for the following macro; if your compiler cannot handle the
+    * following macro use this one with the result of
+    * PNG_IMAGE_COMPRESSED_SIZE_MAX(image) as the second argument (most
+    * compilers should handle this just fine.)
+    */
+
+#define PNG_IMAGE_PNG_SIZE_MAX(image)\
+   PNG_IMAGE_PNG_SIZE_MAX_(image, PNG_IMAGE_COMPRESSED_SIZE_MAX(image))
+   /* An upper bound on the total length of the PNG data stream for 'image'.
+    * The result is of type png_alloc_size_t, on 32-bit systems this may
+    * overflow even though PNG_IMAGE_DATA_SIZE does not overflow; the write will
+    * run out of buffer space but return a corrected size which should work.
+    */
+#endif /* SIMPLIFIED_WRITE */
+/*******************************************************************************
+ *  END OF SIMPLIFIED API
+ ******************************************************************************/
+#endif /* SIMPLIFIED_{READ|WRITE} */
+
+/*******************************************************************************
+ * Section 6: IMPLEMENTATION OPTIONS
  *******************************************************************************
  *
  * Support for arbitrary implementation-specific optimizations.  The API allows
@@ -2566,7 +3219,9 @@ PNG_EXPORT(235, int, png_get_palette_max, (png_const_structp png_ptr,
 #ifdef PNG_ARM_NEON_API_SUPPORTED
 #  define PNG_ARM_NEON   0 /* HARDWARE: ARM Neon SIMD instructions supported */
 #endif
-#define PNG_OPTION_NEXT  2 /* Next option - numbers must be even */
+#define PNG_MAXIMUM_INFLATE_WINDOW 2 /* SOFTWARE: force maximum window */
+#define PNG_SKIP_sRGB_CHECK_PROFILE 4 /* SOFTWARE: Check ICC profile for sRGB */
+#define PNG_OPTION_NEXT  6 /* Next option - numbers must be even */
 
 /* Return values: NOTE: there are four values and 'off' is *not* zero */
 #define PNG_OPTION_UNSET   0 /* Unset - defaults to off */
@@ -2574,24 +3229,23 @@ PNG_EXPORT(235, int, png_get_palette_max, (png_const_structp png_ptr,
 #define PNG_OPTION_OFF     2
 #define PNG_OPTION_ON      3
 
-PNG_EXPORT(236, int, png_set_option, (png_structp png_ptr, int option,
+PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,
    int onoff));
-#endif
+#endif /* SET_OPTION */
 
 /*******************************************************************************
- *  END OF HARDWARE OPTIONS
+ *  END OF HARDWARE AND SOFTWARE OPTIONS
  ******************************************************************************/
 
-/* Maintainer: Put new public prototypes here ^, in libpng.3, and project
- * defs
+/* Maintainer: Put new public prototypes here ^, in libpng.3, in project
+ * defs, and in scripts/symbols.def.
  */
 
 /* The last ordinal number (this is the *last* one already used; the next
- * one to use is one more than this.)  Maintainer, remember to add an entry to
- * scripts/symbols.def as well.
+ * one to use is one more than this.)
  */
 #ifdef PNG_EXPORT_LAST_ORDINAL
-  PNG_EXPORT_LAST_ORDINAL(236);
+  PNG_EXPORT_LAST_ORDINAL(245);
 #endif
 
 #ifdef __cplusplus
diff --git a/drivers/png/pngconf.h b/drivers/png/pngconf.h
index ce1ff5853f..b0ccc8c25e 100644
--- a/drivers/png/pngconf.h
+++ b/drivers/png/pngconf.h
@@ -1,9 +1,9 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.5.27, May 26, 2016
+ * libpng version 1.6.23, June 9, 2016
  *
- * Copyright (c) 1998-2002,2004,2006-2013 Glenn Randers-Pehrson
+ * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -20,34 +20,50 @@
 #ifndef PNGCONF_H
 #define PNGCONF_H
 
-#ifndef PNG_BUILDING_SYMBOL_TABLE
-/* PNG_NO_LIMITS_H may be used to turn off the use of the standard C
- * definition file for  machine specific limits, this may impact the
- * correctness of the definitions below (see uses of INT_MAX).
- */
-#  ifndef PNG_NO_LIMITS_H
-#    include <limits.h>
-#  endif
+#ifndef PNG_BUILDING_SYMBOL_TABLE /* else includes may cause problems */
 
-/* For the memory copy APIs (i.e. the standard definitions of these),
- * because this file defines png_memcpy and so on the base APIs must
- * be defined here.
+/* From libpng 1.6.0 libpng requires an ANSI X3.159-1989 ("ISOC90") compliant C
+ * compiler for correct compilation.  The following header files are required by
+ * the standard.  If your compiler doesn't provide these header files, or they
+ * do not match the standard, you will need to provide/improve them.
  */
-#  ifdef BSD
-#    include <strings.h>
-#  else
-#    include <string.h>
-#  endif
-
-/* For png_FILE_p - this provides the standard definition of a
- * FILE
+#include <limits.h>
+#include <stddef.h>
+
+/* Library header files.  These header files are all defined by ISOC90; libpng
+ * expects conformant implementations, however, an ISOC90 conformant system need
+ * not provide these header files if the functionality cannot be implemented.
+ * In this case it will be necessary to disable the relevant parts of libpng in
+ * the build of pnglibconf.h.
+ *
+ * Prior to 1.6.0 string.h was included here; the API changes in 1.6.0 to not
+ * include this unnecessary header file.
  */
-#  ifdef PNG_STDIO_SUPPORTED
-#    include <stdio.h>
-#  endif
+
+#ifdef PNG_STDIO_SUPPORTED
+   /* Required for the definition of FILE: */
+#  include <stdio.h>
 #endif
 
-/* This controls optimization of the reading of 16 and 32 bit values
+#ifdef PNG_SETJMP_SUPPORTED
+   /* Required for the definition of jmp_buf and the declaration of longjmp: */
+#  include <setjmp.h>
+#endif
+
+#ifdef PNG_CONVERT_tIME_SUPPORTED
+   /* Required for struct tm: */
+#  include <time.h>
+#endif
+
+#endif /* PNG_BUILDING_SYMBOL_TABLE */
+
+/* Prior to 1.6.0 it was possible to turn off 'const' in declarations using
+ * PNG_NO_CONST; this is no longer supported except for data declarations which
+ * apparently still cause problems in 2011 on some compilers.
+ */
+#define PNG_CONST const /* backward compatibility only */
+
+/* This controls optimization of the reading of 16-bit and 32-bit values
  * from PNG files.  It can be set on a per-app-file basis - it
  * just changes whether a macro is used when the function is called.
  * The library builder sets the default; if read functions are not
@@ -70,28 +86,13 @@
  * may be changed on a per-file basis when compiling against libpng.
  */
 
-/* The PNGARG macro protects us against machines that don't have function
- * prototypes (ie K&R style headers).  If your compiler does not handle
- * function prototypes, define this macro and use the included ansi2knr.
- * I've always been able to use _NO_PROTO as the indicator, but you may
- * need to drag the empty declaration out in front of here, or change the
- * ifdef to suit your own needs.
+/* The PNGARG macro was used in versions of libpng prior to 1.6.0 to protect
+ * against legacy (pre ISOC90) compilers that did not understand function
+ * prototypes.  It is not required for modern C compilers.
  */
 #ifndef PNGARG
-
-#  ifdef OF /* zlib prototype munger */
-#    define PNGARG(arglist) OF(arglist)
-#  else
-
-#    ifdef _NO_PROTO
-#      define PNGARG(arglist) ()
-#    else
-#      define PNGARG(arglist) arglist
-#    endif /* _NO_PROTO */
-
-#  endif /* OF */
-
-#endif /* PNGARG */
+#  define PNGARG(arglist) arglist
+#endif
 
 /* Function calling conventions.
  * =============================
@@ -215,10 +216,11 @@
 #      define PNGAPI _stdcall
 #    endif
 #  endif /* compiler/api */
+
   /* NOTE: PNGCBAPI always defaults to PNGCAPI. */
 
 #  if defined(PNGAPI) && !defined(PNG_USER_PRIVATEBUILD)
-   ERROR: PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed
+#     error "PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed"
 #  endif
 
 #  if (defined(_MSC_VER) && _MSC_VER < 800) ||\
@@ -293,11 +295,11 @@
     * table entries, so we discard it here.  See the .dfn files in the
     * scripts directory.
     */
-#ifndef PNG_EXPORTA
 
-#  define PNG_EXPORTA(ordinal, type, name, args, attributes)\
-      PNG_FUNCTION(PNG_EXPORT_TYPE(type),(PNGAPI name),PNGARG(args), \
-        extern attributes)
+#ifndef PNG_EXPORTA
+#  define PNG_EXPORTA(ordinal, type, name, args, attributes) \
+      PNG_FUNCTION(PNG_EXPORT_TYPE(type), (PNGAPI name), PNGARG(args), \
+      PNG_LINKAGE_API attributes)
 #endif
 
 /* ANSI-C (C90) does not permit a macro to be invoked with an empty argument,
@@ -305,7 +307,7 @@
  */
 #define PNG_EMPTY /*empty list*/
 
-#define PNG_EXPORT(ordinal, type, name, args)\
+#define PNG_EXPORT(ordinal, type, name, args) \
    PNG_EXPORTA(ordinal, type, name, args, PNG_EMPTY)
 
 /* Use PNG_REMOVED to comment out a removed interface. */
@@ -332,12 +334,38 @@
 
 #ifdef PNG_PEDANTIC_WARNINGS_SUPPORTED
   /* Support for compiler specific function attributes.  These are used
-   * so that where compiler support is available incorrect use of API
+   * so that where compiler support is available, incorrect use of API
    * functions in png.h will generate compiler warnings.  Added at libpng
-   * version 1.2.41.
+   * version 1.2.41.  Disabling these removes the warnings but may also produce
+   * less efficient code.
    */
+#  if defined(__clang__) && defined(__has_attribute)
+     /* Clang defines both __clang__ and __GNUC__. Check __clang__ first. */
+#    if !defined(PNG_USE_RESULT) && __has_attribute(__warn_unused_result__)
+#      define PNG_USE_RESULT __attribute__((__warn_unused_result__))
+#    endif
+#    if !defined(PNG_NORETURN) && __has_attribute(__noreturn__)
+#      define PNG_NORETURN __attribute__((__noreturn__))
+#    endif
+#    if !defined(PNG_ALLOCATED) && __has_attribute(__malloc__)
+#      define PNG_ALLOCATED __attribute__((__malloc__))
+#    endif
+#    if !defined(PNG_DEPRECATED) && __has_attribute(__deprecated__)
+#      define PNG_DEPRECATED __attribute__((__deprecated__))
+#    endif
+#    if !defined(PNG_PRIVATE)
+#      ifdef __has_extension
+#        if __has_extension(attribute_unavailable_with_message)
+#          define PNG_PRIVATE __attribute__((__unavailable__(\
+             "This function is not exported by libpng.")))
+#        endif
+#      endif
+#    endif
+#    ifndef PNG_RESTRICT
+#      define PNG_RESTRICT __restrict
+#    endif
 
-#  if defined(__GNUC__)
+#  elif defined(__GNUC__)
 #    ifndef PNG_USE_RESULT
 #      define PNG_USE_RESULT __attribute__((__warn_unused_result__))
 #    endif
@@ -360,15 +388,19 @@
             __attribute__((__deprecated__))
 #        endif
 #      endif
+#      if ((__GNUC__ > 3) || !defined(__GNUC_MINOR__) || (__GNUC_MINOR__ >= 1))
+#        ifndef PNG_RESTRICT
+#          define PNG_RESTRICT __restrict
+#        endif
+#      endif /* __GNUC__.__GNUC_MINOR__ > 3.0 */
 #    endif /* __GNUC__ >= 3 */
-#  endif /* __GNUC__ */
 
-#  if defined(_MSC_VER)  && (_MSC_VER >= 1300)
+#  elif defined(_MSC_VER)  && (_MSC_VER >= 1300)
 #    ifndef PNG_USE_RESULT
 #      define PNG_USE_RESULT /* not supported */
 #    endif
 #    ifndef PNG_NORETURN
-#      define PNG_NORETURN __declspec(noreturn)
+#      define PNG_NORETURN   __declspec(noreturn)
 #    endif
 #    ifndef PNG_ALLOCATED
 #      if (_MSC_VER >= 1400)
@@ -381,7 +413,17 @@
 #    ifndef PNG_PRIVATE
 #      define PNG_PRIVATE __declspec(deprecated)
 #    endif
-#  endif /* _MSC_VER */
+#    ifndef PNG_RESTRICT
+#      if (_MSC_VER >= 1400)
+#        define PNG_RESTRICT __restrict
+#      endif
+#    endif
+
+#  elif defined(__WATCOMC__)
+#    ifndef PNG_RESTRICT
+#      define PNG_RESTRICT __restrict
+#    endif
+#  endif
 #endif /* PNG_PEDANTIC_WARNINGS */
 
 #ifndef PNG_DEPRECATED
@@ -399,6 +441,10 @@
 #ifndef PNG_PRIVATE
 #  define PNG_PRIVATE     /* This is a private libpng function */
 #endif
+#ifndef PNG_RESTRICT
+#  define PNG_RESTRICT    /* The C99 "restrict" feature */
+#endif
+
 #ifndef PNG_FP_EXPORT     /* A floating point API. */
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
 #     define PNG_FP_EXPORT(ordinal, type, name, args)\
@@ -416,183 +462,161 @@
 #  endif
 #endif
 
-/* The following uses const char * instead of char * for error
- * and warning message functions, so some compilers won't complain.
- * If you do not want to use const, define PNG_NO_CONST here.
+#ifndef PNG_BUILDING_SYMBOL_TABLE
+/* Some typedefs to get us started.  These should be safe on most of the common
+ * platforms.
  *
- * This should not change how the APIs are called, so it can be done
- * on a per-file basis in the application.
+ * png_uint_32 and png_int_32 may, currently, be larger than required to hold a
+ * 32-bit value however this is not normally advisable.
+ *
+ * png_uint_16 and png_int_16 should always be two bytes in size - this is
+ * verified at library build time.
+ *
+ * png_byte must always be one byte in size.
+ *
+ * The checks below use constants from limits.h, as defined by the ISOC90
+ * standard.
  */
-#ifndef PNG_CONST
-#  ifndef PNG_NO_CONST
-#    define PNG_CONST const
-#  else
-#    define PNG_CONST
-#  endif
+#if CHAR_BIT == 8 && UCHAR_MAX == 255
+   typedef unsigned char png_byte;
+#else
+#  error "libpng requires 8-bit bytes"
 #endif
 
-/* Some typedefs to get us started.  These should be safe on most of the
- * common platforms.  The typedefs should be at least as large as the
- * numbers suggest (a png_uint_32 must be at least 32 bits long), but they
- * don't have to be exactly that size.  Some compilers dislike passing
- * unsigned shorts as function parameters, so you may be better off using
- * unsigned int for png_uint_16.
- */
+#if INT_MIN == -32768 && INT_MAX == 32767
+   typedef int png_int_16;
+#elif SHRT_MIN == -32768 && SHRT_MAX == 32767
+   typedef short png_int_16;
+#else
+#  error "libpng requires a signed 16-bit type"
+#endif
 
-#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
-typedef unsigned int png_uint_32;
-typedef int png_int_32;
+#if UINT_MAX == 65535
+   typedef unsigned int png_uint_16;
+#elif USHRT_MAX == 65535
+   typedef unsigned short png_uint_16;
 #else
-typedef unsigned long png_uint_32;
-typedef long png_int_32;
+#  error "libpng requires an unsigned 16-bit type"
 #endif
-typedef unsigned short png_uint_16;
-typedef short png_int_16;
-typedef unsigned char png_byte;
 
-#ifdef PNG_NO_SIZE_T
-typedef unsigned int png_size_t;
+#if INT_MIN < -2147483646 && INT_MAX > 2147483646
+   typedef int png_int_32;
+#elif LONG_MIN < -2147483646 && LONG_MAX > 2147483646
+   typedef long int png_int_32;
 #else
-typedef size_t png_size_t;
+#  error "libpng requires a signed 32-bit (or more) type"
 #endif
-#define png_sizeof(x) (sizeof (x))
 
-/* The following is needed for medium model support.  It cannot be in the
- * pngpriv.h header.  Needs modification for other compilers besides
- * MSC.  Model independent support declares all arrays and pointers to be
- * large using the far keyword.  The zlib version used must also support
- * model independent data.  As of version zlib 1.0.4, the necessary changes
- * have been made in zlib.  The USE_FAR_KEYWORD define triggers other
- * changes that are needed. (Tim Wegner)
- */
+#if UINT_MAX > 4294967294
+   typedef unsigned int png_uint_32;
+#elif ULONG_MAX > 4294967294
+   typedef unsigned long int png_uint_32;
+#else
+#  error "libpng requires an unsigned 32-bit (or more) type"
+#endif
 
-/* Separate compiler dependencies (problem here is that zlib.h always
- * defines FAR. (SJT)
- */
-#ifdef __BORLANDC__
-#  if defined(__LARGE__) || defined(__HUGE__) || defined(__COMPACT__)
-#    define LDATA 1
-#  else
-#    define LDATA 0
-#  endif
-  /* GRR:  why is Cygwin in here?  Cygwin is not Borland C... */
-#  if !defined(__WIN32__) && !defined(__FLAT__) && !defined(__CYGWIN__)
-#    define PNG_MAX_MALLOC_64K /* only used in build */
-#    if (LDATA != 1)
-#      ifndef FAR
-#        define FAR __far
-#      endif
-#      define USE_FAR_KEYWORD
-#    endif   /* LDATA != 1 */
-         /* Possibly useful for moving data out of default segment.
-          * Uncomment it if you want. Could also define FARDATA as
-          * const if your compiler supports it. (SJT)
-#        define FARDATA FAR
-          */
-#  endif  /* __WIN32__, __FLAT__, __CYGWIN__ */
-#endif   /* __BORLANDC__ */
-
-
-/* Suggest testing for specific compiler first before testing for
- * FAR.  The Watcom compiler defines both __MEDIUM__ and M_I86MM,
- * making reliance oncertain keywords suspect. (SJT)
+/* Prior to 1.6.0 it was possible to disable the use of size_t, 1.6.0, however,
+ * requires an ISOC90 compiler and relies on consistent behavior of sizeof.
  */
+typedef size_t png_size_t;
+typedef ptrdiff_t png_ptrdiff_t;
 
-/* MSC Medium model */
-#ifdef FAR
-#  ifdef M_I86MM
-#    define USE_FAR_KEYWORD
-#    define FARDATA FAR
-#    include <dos.h>
+/* libpng needs to know the maximum value of 'size_t' and this controls the
+ * definition of png_alloc_size_t, below.  This maximum value of size_t limits
+ * but does not control the maximum allocations the library makes - there is
+ * direct application control of this through png_set_user_limits().
+ */
+#ifndef PNG_SMALL_SIZE_T
+   /* Compiler specific tests for systems where size_t is known to be less than
+    * 32 bits (some of these systems may no longer work because of the lack of
+    * 'far' support; see above.)
+    */
+#  if (defined(__TURBOC__) && !defined(__FLAT__)) ||\
+   (defined(_MSC_VER) && defined(MAXSEG_64K))
+#     define PNG_SMALL_SIZE_T
 #  endif
 #endif
 
-/* SJT: default case */
-#ifndef FAR
-#  define FAR
+/* png_alloc_size_t is guaranteed to be no smaller than png_size_t, and no
+ * smaller than png_uint_32.  Casts from png_size_t or png_uint_32 to
+ * png_alloc_size_t are not necessary; in fact, it is recommended not to use
+ * them at all so that the compiler can complain when something turns out to be
+ * problematic.
+ *
+ * Casts in the other direction (from png_alloc_size_t to png_size_t or
+ * png_uint_32) should be explicitly applied; however, we do not expect to
+ * encounter practical situations that require such conversions.
+ *
+ * PNG_SMALL_SIZE_T must be defined if the maximum value of size_t is less than
+ * 4294967295 - i.e. less than the maximum value of png_uint_32.
+ */
+#ifdef PNG_SMALL_SIZE_T
+   typedef png_uint_32 png_alloc_size_t;
+#else
+   typedef png_size_t png_alloc_size_t;
 #endif
 
-/* At this point FAR is always defined */
-#ifndef FARDATA
-#  define FARDATA
-#endif
+/* Prior to 1.6.0 libpng offered limited support for Microsoft C compiler
+ * implementations of Intel CPU specific support of user-mode segmented address
+ * spaces, where 16-bit pointers address more than 65536 bytes of memory using
+ * separate 'segment' registers.  The implementation requires two different
+ * types of pointer (only one of which includes the segment value.)
+ *
+ * If required this support is available in version 1.2 of libpng and may be
+ * available in versions through 1.5, although the correctness of the code has
+ * not been verified recently.
+ */
 
-/* Typedef for floating-point numbers that are converted
- * to fixed-point with a multiple of 100,000, e.g., gamma
+/* Typedef for floating-point numbers that are converted to fixed-point with a
+ * multiple of 100,000, e.g., gamma
  */
 typedef png_int_32 png_fixed_point;
 
 /* Add typedefs for pointers */
-typedef void                      FAR * png_voidp;
-typedef PNG_CONST void            FAR * png_const_voidp;
-typedef png_byte                  FAR * png_bytep;
-typedef PNG_CONST png_byte        FAR * png_const_bytep;
-typedef png_uint_32               FAR * png_uint_32p;
-typedef PNG_CONST png_uint_32     FAR * png_const_uint_32p;
-typedef png_int_32                FAR * png_int_32p;
-typedef PNG_CONST png_int_32      FAR * png_const_int_32p;
-typedef png_uint_16               FAR * png_uint_16p;
-typedef PNG_CONST png_uint_16     FAR * png_const_uint_16p;
-typedef png_int_16                FAR * png_int_16p;
-typedef PNG_CONST png_int_16      FAR * png_const_int_16p;
-typedef char                      FAR * png_charp;
-typedef PNG_CONST char            FAR * png_const_charp;
-typedef png_fixed_point           FAR * png_fixed_point_p;
-typedef PNG_CONST png_fixed_point FAR * png_const_fixed_point_p;
-typedef png_size_t                FAR * png_size_tp;
-typedef PNG_CONST png_size_t      FAR * png_const_size_tp;
+typedef void                  * png_voidp;
+typedef const void            * png_const_voidp;
+typedef png_byte              * png_bytep;
+typedef const png_byte        * png_const_bytep;
+typedef png_uint_32           * png_uint_32p;
+typedef const png_uint_32     * png_const_uint_32p;
+typedef png_int_32            * png_int_32p;
+typedef const png_int_32      * png_const_int_32p;
+typedef png_uint_16           * png_uint_16p;
+typedef const png_uint_16     * png_const_uint_16p;
+typedef png_int_16            * png_int_16p;
+typedef const png_int_16      * png_const_int_16p;
+typedef char                  * png_charp;
+typedef const char            * png_const_charp;
+typedef png_fixed_point       * png_fixed_point_p;
+typedef const png_fixed_point * png_const_fixed_point_p;
+typedef png_size_t            * png_size_tp;
+typedef const png_size_t      * png_const_size_tp;
 
 #ifdef PNG_STDIO_SUPPORTED
 typedef FILE            * png_FILE_p;
 #endif
 
 #ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double           FAR * png_doublep;
-typedef PNG_CONST double FAR * png_const_doublep;
+typedef double       * png_doublep;
+typedef const double * png_const_doublep;
 #endif
 
 /* Pointers to pointers; i.e. arrays */
-typedef png_byte        FAR * FAR * png_bytepp;
-typedef png_uint_32     FAR * FAR * png_uint_32pp;
-typedef png_int_32      FAR * FAR * png_int_32pp;
-typedef png_uint_16     FAR * FAR * png_uint_16pp;
-typedef png_int_16      FAR * FAR * png_int_16pp;
-typedef PNG_CONST char  FAR * FAR * png_const_charpp;
-typedef char            FAR * FAR * png_charpp;
-typedef png_fixed_point FAR * FAR * png_fixed_point_pp;
+typedef png_byte        * * png_bytepp;
+typedef png_uint_32     * * png_uint_32pp;
+typedef png_int_32      * * png_int_32pp;
+typedef png_uint_16     * * png_uint_16pp;
+typedef png_int_16      * * png_int_16pp;
+typedef const char      * * png_const_charpp;
+typedef char            * * png_charpp;
+typedef png_fixed_point * * png_fixed_point_pp;
 #ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double          FAR * FAR * png_doublepp;
+typedef double          * * png_doublepp;
 #endif
 
 /* Pointers to pointers to pointers; i.e., pointer to array */
-typedef char            FAR * FAR * FAR * png_charppp;
+typedef char            * * * png_charppp;
 
-/* png_alloc_size_t is guaranteed to be no smaller than png_size_t,
- * and no smaller than png_uint_32.  Casts from png_size_t or png_uint_32
- * to png_alloc_size_t are not necessary; in fact, it is recommended
- * not to use them at all so that the compiler can complain when something
- * turns out to be problematic.
- * Casts in the other direction (from png_alloc_size_t to png_size_t or
- * png_uint_32) should be explicitly applied; however, we do not expect
- * to encounter practical situations that require such conversions.
- */
-#if defined(__TURBOC__) && !defined(__FLAT__)
-   typedef unsigned long png_alloc_size_t;
-#else
-#  if defined(_MSC_VER) && defined(MAXSEG_64K)
-     typedef unsigned long    png_alloc_size_t;
-#  else
-     /* This is an attempt to detect an old Windows system where (int) is
-      * actually 16 bits, in that case png_malloc must have an argument with a
-      * bigger size to accomodate the requirements of the library.
-      */
-#    if (defined(_Windows) || defined(_WINDOWS) || defined(_WINDOWS_)) && \
-        (!defined(INT_MAX) || INT_MAX <= 0x7ffffffeL)
-       typedef DWORD         png_alloc_size_t;
-#    else
-       typedef png_size_t    png_alloc_size_t;
-#    endif
-#  endif
-#endif
+#endif /* PNG_BUILDING_SYMBOL_TABLE */
 
 #endif /* PNGCONF_H */
diff --git a/drivers/png/pngdebug.h b/drivers/png/pngdebug.h
index 020369f061..15a7ed0c95 100644
--- a/drivers/png/pngdebug.h
+++ b/drivers/png/pngdebug.h
@@ -1,8 +1,8 @@
 
 /* pngdebug.h - Debugging macros for libpng, also used in pngtest.c
  *
- * Last changed in libpng 1.5.18 [February 6, 2014]
- * Copyright (c) 1998-2002,2004,2006-2014 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.8 [December 19, 2013]
+ * Copyright (c) 1998-2002,2004,2006-2013 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
diff --git a/drivers/png/pngerror.c b/drivers/png/pngerror.c
index 372d1b6fbd..3fc8092fa6 100644
--- a/drivers/png/pngerror.c
+++ b/drivers/png/pngerror.c
@@ -1,7 +1,7 @@
 
 /* pngerror.c - stub functions for i/o and memory allocation
  *
- * Last changed in libpng 1.5.19 [August 21, 2014]
+ * Last changed in libpng 1.6.15 [November 20, 2014]
  * Copyright (c) 1998-2002,2004,2006-2014 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -20,14 +20,14 @@
 
 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
 
-static PNG_FUNCTION(void, png_default_error,PNGARG((png_structp png_ptr,
+static PNG_FUNCTION(void, png_default_error,PNGARG((png_const_structrp png_ptr,
     png_const_charp error_message)),PNG_NORETURN);
 
 #ifdef PNG_WARNINGS_SUPPORTED
 static void /* PRIVATE */
-png_default_warning PNGARG((png_structp png_ptr,
+png_default_warning PNGARG((png_const_structrp png_ptr,
    png_const_charp warning_message));
-#endif /* PNG_WARNINGS_SUPPORTED */
+#endif /* WARNINGS */
 
 /* This function is called whenever there is a fatal error.  This function
  * should not be changed.  If there is a need to handle errors differently,
@@ -36,14 +36,15 @@ png_default_warning PNGARG((png_structp png_ptr,
  */
 #ifdef PNG_ERROR_TEXT_SUPPORTED
 PNG_FUNCTION(void,PNGAPI
-png_error,(png_structp png_ptr, png_const_charp error_message),PNG_NORETURN)
+png_error,(png_const_structrp png_ptr, png_const_charp error_message),
+   PNG_NORETURN)
 {
 #ifdef PNG_ERROR_NUMBERS_SUPPORTED
    char msg[16];
    if (png_ptr != NULL)
    {
-      if (png_ptr->flags&
-         (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
+      if ((png_ptr->flags &
+         (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0)
       {
          if (*error_message == PNG_LITERAL_SHARP)
          {
@@ -53,7 +54,7 @@ png_error,(png_structp png_ptr, png_const_charp error_message),PNG_NORETURN)
                if (error_message[offset] == ' ')
                   break;
 
-            if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
+            if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)
             {
                int i;
                for (i = 0; i < offset - 1; i++)
@@ -68,7 +69,7 @@ png_error,(png_structp png_ptr, png_const_charp error_message),PNG_NORETURN)
 
       else
       {
-         if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
+         if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)
          {
             msg[0] = '0';
             msg[1] = '\0';
@@ -79,7 +80,8 @@ png_error,(png_structp png_ptr, png_const_charp error_message),PNG_NORETURN)
    }
 #endif
    if (png_ptr != NULL && png_ptr->error_fn != NULL)
-      (*(png_ptr->error_fn))(png_ptr, error_message);
+      (*(png_ptr->error_fn))(png_constcast(png_structrp,png_ptr),
+          error_message);
 
    /* If the custom handler doesn't exist, or if it returns,
       use the default handler, which will not return. */
@@ -87,7 +89,7 @@ png_error,(png_structp png_ptr, png_const_charp error_message),PNG_NORETURN)
 }
 #else
 PNG_FUNCTION(void,PNGAPI
-png_err,(png_structp png_ptr),PNG_NORETURN)
+png_err,(png_const_structrp png_ptr),PNG_NORETURN)
 {
    /* Prior to 1.5.2 the error_fn received a NULL pointer, expressed
     * erroneously as '\0', instead of the empty string "".  This was
@@ -95,13 +97,13 @@ png_err,(png_structp png_ptr),PNG_NORETURN)
     * will crash in this case.
     */
    if (png_ptr != NULL && png_ptr->error_fn != NULL)
-      (*(png_ptr->error_fn))(png_ptr, "");
+      (*(png_ptr->error_fn))(png_constcast(png_structrp,png_ptr), "");
 
    /* If the custom handler doesn't exist, or if it returns,
       use the default handler, which will not return. */
    png_default_error(png_ptr, "");
 }
-#endif /* PNG_ERROR_TEXT_SUPPORTED */
+#endif /* ERROR_TEXT */
 
 /* Utility to safely appends strings to a buffer.  This never errors out so
  * error checking is not required in the caller.
@@ -150,7 +152,7 @@ png_format_number(png_const_charp start, png_charp end, int format,
          case PNG_NUMBER_FORMAT_fixed:
             /* Needs five digits (the fraction) */
             mincount = 5;
-            if (output || number % 10 != 0)
+            if (output != 0 || number % 10 != 0)
             {
                *--end = digits[number % 10];
                output = 1;
@@ -187,7 +189,7 @@ png_format_number(png_const_charp start, png_charp end, int format,
       ++count;
 
       /* Float a fixed number here: */
-      if (format == PNG_NUMBER_FORMAT_fixed) if (count == 5) if (end > start)
+      if ((format == PNG_NUMBER_FORMAT_fixed) && (count == 5) && (end > start))
       {
          /* End of the fraction, but maybe nothing was output?  In that case
           * drop the decimal point.  If the number is a true zero handle that
@@ -211,14 +213,14 @@ png_format_number(png_const_charp start, png_charp end, int format,
  * png_set_error_fn() to replace the warning function at run-time.
  */
 void PNGAPI
-png_warning(png_structp png_ptr, png_const_charp warning_message)
+png_warning(png_const_structrp png_ptr, png_const_charp warning_message)
 {
    int offset = 0;
    if (png_ptr != NULL)
    {
 #ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   if (png_ptr->flags&
-       (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
+   if ((png_ptr->flags &
+       (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0)
 #endif
       {
          if (*warning_message == PNG_LITERAL_SHARP)
@@ -230,7 +232,8 @@ png_warning(png_structp png_ptr, png_const_charp warning_message)
       }
    }
    if (png_ptr != NULL && png_ptr->warning_fn != NULL)
-      (*(png_ptr->warning_fn))(png_ptr, warning_message + offset);
+      (*(png_ptr->warning_fn))(png_constcast(png_structrp,png_ptr),
+         warning_message + offset);
    else
       png_default_warning(png_ptr, warning_message + offset);
 }
@@ -278,7 +281,7 @@ png_warning_parameter_signed(png_warning_parameters p, int number, int format,
 }
 
 void
-png_formatted_warning(png_structp png_ptr, png_warning_parameters p,
+png_formatted_warning(png_const_structrp png_ptr, png_warning_parameters p,
    png_const_charp message)
 {
    /* The internal buffer is just 192 bytes - enough for all our messages,
@@ -346,29 +349,79 @@ png_formatted_warning(png_structp png_ptr, png_warning_parameters p,
    /* i is always less than (sizeof msg), so: */
    msg[i] = '\0';
 
-   /* And this is the formatted message, it may be larger than
-    * PNG_MAX_ERROR_TEXT, but that is only used for 'chunk' errors and these are
-    * not (currently) formatted.
+   /* And this is the formatted message. It may be larger than
+    * PNG_MAX_ERROR_TEXT, but that is only used for 'chunk' errors and these
+    * are not (currently) formatted.
     */
    png_warning(png_ptr, msg);
 }
-#endif /* PNG_WARNINGS_SUPPORTED */
+#endif /* WARNINGS */
 
 #ifdef PNG_BENIGN_ERRORS_SUPPORTED
 void PNGAPI
-png_benign_error(png_structp png_ptr, png_const_charp error_message)
+png_benign_error(png_const_structrp png_ptr, png_const_charp error_message)
 {
-  if (png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN)
+   if ((png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN) != 0)
+   {
+#     ifdef PNG_READ_SUPPORTED
+         if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
+            png_ptr->chunk_name != 0)
+            png_chunk_warning(png_ptr, error_message);
+         else
+#     endif
+      png_warning(png_ptr, error_message);
+   }
+
+   else
+   {
+#     ifdef PNG_READ_SUPPORTED
+         if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
+            png_ptr->chunk_name != 0)
+            png_chunk_error(png_ptr, error_message);
+         else
+#     endif
+      png_error(png_ptr, error_message);
+   }
+
+#  ifndef PNG_ERROR_TEXT_SUPPORTED
+      PNG_UNUSED(error_message)
+#  endif
+}
+
+void /* PRIVATE */
+png_app_warning(png_const_structrp png_ptr, png_const_charp error_message)
+{
+  if ((png_ptr->flags & PNG_FLAG_APP_WARNINGS_WARN) != 0)
      png_warning(png_ptr, error_message);
   else
      png_error(png_ptr, error_message);
+
+#  ifndef PNG_ERROR_TEXT_SUPPORTED
+      PNG_UNUSED(error_message)
+#  endif
 }
-#endif
 
+void /* PRIVATE */
+png_app_error(png_const_structrp png_ptr, png_const_charp error_message)
+{
+  if ((png_ptr->flags & PNG_FLAG_APP_ERRORS_WARN) != 0)
+     png_warning(png_ptr, error_message);
+  else
+     png_error(png_ptr, error_message);
+
+#  ifndef PNG_ERROR_TEXT_SUPPORTED
+      PNG_UNUSED(error_message)
+#  endif
+}
+#endif /* BENIGN_ERRORS */
+
+#define PNG_MAX_ERROR_TEXT 196 /* Currently limited by profile_error in png.c */
+#if defined(PNG_WARNINGS_SUPPORTED) || \
+   (defined(PNG_READ_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED))
 /* These utilities are used internally to build an error message that relates
  * to the current chunk.  The chunk name comes from png_ptr->chunk_name,
- * this is used to prefix the message.  The message is limited in length
- * to 63 bytes, the name characters are output as hex digits wrapped in []
+ * which is used to prefix the message.  The message is limited in length
+ * to 63 bytes. The name characters are output as hex digits wrapped in []
  * if the character is invalid.
  */
 #define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
@@ -377,10 +430,8 @@ static PNG_CONST char png_digit[16] = {
    'A', 'B', 'C', 'D', 'E', 'F'
 };
 
-#define PNG_MAX_ERROR_TEXT 64
-#if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_ERROR_TEXT_SUPPORTED)
 static void /* PRIVATE */
-png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
+png_format_buffer(png_const_structrp png_ptr, png_charp buffer, png_const_charp
     error_message)
 {
    png_uint_32 chunk_name = png_ptr->chunk_name;
@@ -391,7 +442,7 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
       int c = (int)(chunk_name >> ishift) & 0xff;
 
       ishift -= 8;
-      if (isnonalpha(c))
+      if (isnonalpha(c) != 0)
       {
          buffer[iout++] = PNG_LITERAL_LEFT_SQUARE_BRACKET;
          buffer[iout++] = png_digit[(c & 0xf0) >> 4];
@@ -422,11 +473,11 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
       buffer[iout] = '\0';
    }
 }
-#endif /* PNG_WARNINGS_SUPPORTED || PNG_ERROR_TEXT_SUPPORTED */
+#endif /* WARNINGS || ERROR_TEXT */
 
 #if defined(PNG_READ_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED)
 PNG_FUNCTION(void,PNGAPI
-png_chunk_error,(png_structp png_ptr, png_const_charp error_message),
+png_chunk_error,(png_const_structrp png_ptr, png_const_charp error_message),
    PNG_NORETURN)
 {
    char msg[18+PNG_MAX_ERROR_TEXT];
@@ -439,11 +490,11 @@ png_chunk_error,(png_structp png_ptr, png_const_charp error_message),
       png_error(png_ptr, msg);
    }
 }
-#endif /* PNG_READ_SUPPORTED && PNG_ERROR_TEXT_SUPPORTED */
+#endif /* READ && ERROR_TEXT */
 
 #ifdef PNG_WARNINGS_SUPPORTED
 void PNGAPI
-png_chunk_warning(png_structp png_ptr, png_const_charp warning_message)
+png_chunk_warning(png_const_structrp png_ptr, png_const_charp warning_message)
 {
    char msg[18+PNG_MAX_ERROR_TEXT];
    if (png_ptr == NULL)
@@ -455,38 +506,83 @@ png_chunk_warning(png_structp png_ptr, png_const_charp warning_message)
       png_warning(png_ptr, msg);
    }
 }
-#endif /* PNG_WARNINGS_SUPPORTED */
+#endif /* WARNINGS */
 
 #ifdef PNG_READ_SUPPORTED
 #ifdef PNG_BENIGN_ERRORS_SUPPORTED
 void PNGAPI
-png_chunk_benign_error(png_structp png_ptr, png_const_charp error_message)
+png_chunk_benign_error(png_const_structrp png_ptr, png_const_charp
+    error_message)
 {
-   if (png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN)
+   if ((png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN) != 0)
       png_chunk_warning(png_ptr, error_message);
 
    else
       png_chunk_error(png_ptr, error_message);
+
+#  ifndef PNG_ERROR_TEXT_SUPPORTED
+      PNG_UNUSED(error_message)
+#  endif
 }
 #endif
-#endif /* PNG_READ_SUPPORTED */
+#endif /* READ */
+
+void /* PRIVATE */
+png_chunk_report(png_const_structrp png_ptr, png_const_charp message, int error)
+{
+#  ifndef PNG_WARNINGS_SUPPORTED
+      PNG_UNUSED(message)
+#  endif
+
+   /* This is always supported, but for just read or just write it
+    * unconditionally does the right thing.
+    */
+#  if defined(PNG_READ_SUPPORTED) && defined(PNG_WRITE_SUPPORTED)
+      if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
+#  endif
+
+#  ifdef PNG_READ_SUPPORTED
+      {
+         if (error < PNG_CHUNK_ERROR)
+            png_chunk_warning(png_ptr, message);
+
+         else
+            png_chunk_benign_error(png_ptr, message);
+      }
+#  endif
+
+#  if defined(PNG_READ_SUPPORTED) && defined(PNG_WRITE_SUPPORTED)
+      else if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
+#  endif
+
+#  ifdef PNG_WRITE_SUPPORTED
+      {
+         if (error < PNG_CHUNK_WRITE_ERROR)
+            png_app_warning(png_ptr, message);
+
+         else
+            png_app_error(png_ptr, message);
+      }
+#  endif
+}
 
 #ifdef PNG_ERROR_TEXT_SUPPORTED
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 PNG_FUNCTION(void,
-png_fixed_error,(png_structp png_ptr, png_const_charp name),PNG_NORETURN)
+png_fixed_error,(png_const_structrp png_ptr, png_const_charp name),PNG_NORETURN)
 {
 #  define fixed_message "fixed point overflow in "
 #  define fixed_message_ln ((sizeof fixed_message)-1)
    int  iin;
    char msg[fixed_message_ln+PNG_MAX_ERROR_TEXT];
-   png_memcpy(msg, fixed_message, fixed_message_ln);
+   memcpy(msg, fixed_message, fixed_message_ln);
    iin = 0;
-   if (name != NULL) while (iin < (PNG_MAX_ERROR_TEXT-1) && name[iin] != 0)
-   {
-      msg[fixed_message_ln + iin] = name[iin];
-      ++iin;
-   }
+   if (name != NULL)
+      while (iin < (PNG_MAX_ERROR_TEXT-1) && name[iin] != 0)
+      {
+         msg[fixed_message_ln + iin] = name[iin];
+         ++iin;
+      }
    msg[fixed_message_ln + iin] = 0;
    png_error(png_ptr, msg);
 }
@@ -498,14 +594,111 @@ png_fixed_error,(png_structp png_ptr, png_const_charp name),PNG_NORETURN)
  * otherwise it is necessary for png_default_error to be overridden.
  */
 jmp_buf* PNGAPI
-png_set_longjmp_fn(png_structp png_ptr, png_longjmp_ptr longjmp_fn,
+png_set_longjmp_fn(png_structrp png_ptr, png_longjmp_ptr longjmp_fn,
     size_t jmp_buf_size)
 {
-   if (png_ptr == NULL || jmp_buf_size != png_sizeof(jmp_buf))
+   /* From libpng 1.6.0 the app gets one chance to set a 'jmpbuf_size' value
+    * and it must not change after that.  Libpng doesn't care how big the
+    * buffer is, just that it doesn't change.
+    *
+    * If the buffer size is no *larger* than the size of jmp_buf when libpng is
+    * compiled a built in jmp_buf is returned; this preserves the pre-1.6.0
+    * semantics that this call will not fail.  If the size is larger, however,
+    * the buffer is allocated and this may fail, causing the function to return
+    * NULL.
+    */
+   if (png_ptr == NULL)
       return NULL;
 
+   if (png_ptr->jmp_buf_ptr == NULL)
+   {
+      png_ptr->jmp_buf_size = 0; /* not allocated */
+
+      if (jmp_buf_size <= (sizeof png_ptr->jmp_buf_local))
+         png_ptr->jmp_buf_ptr = &png_ptr->jmp_buf_local;
+
+      else
+      {
+         png_ptr->jmp_buf_ptr = png_voidcast(jmp_buf *,
+            png_malloc_warn(png_ptr, jmp_buf_size));
+
+         if (png_ptr->jmp_buf_ptr == NULL)
+            return NULL; /* new NULL return on OOM */
+
+         png_ptr->jmp_buf_size = jmp_buf_size;
+      }
+   }
+
+   else /* Already allocated: check the size */
+   {
+      size_t size = png_ptr->jmp_buf_size;
+
+      if (size == 0)
+      {
+         size = (sizeof png_ptr->jmp_buf_local);
+         if (png_ptr->jmp_buf_ptr != &png_ptr->jmp_buf_local)
+         {
+            /* This is an internal error in libpng: somehow we have been left
+             * with a stack allocated jmp_buf when the application regained
+             * control.  It's always possible to fix this up, but for the moment
+             * this is a png_error because that makes it easy to detect.
+             */
+            png_error(png_ptr, "Libpng jmp_buf still allocated");
+            /* png_ptr->jmp_buf_ptr = &png_ptr->jmp_buf_local; */
+         }
+      }
+
+      if (size != jmp_buf_size)
+      {
+         png_warning(png_ptr, "Application jmp_buf size changed");
+         return NULL; /* caller will probably crash: no choice here */
+      }
+   }
+
+   /* Finally fill in the function, now we have a satisfactory buffer. It is
+    * valid to change the function on every call.
+    */
    png_ptr->longjmp_fn = longjmp_fn;
-   return &png_ptr->longjmp_buffer;
+   return png_ptr->jmp_buf_ptr;
+}
+
+void /* PRIVATE */
+png_free_jmpbuf(png_structrp png_ptr)
+{
+   if (png_ptr != NULL)
+   {
+      jmp_buf *jb = png_ptr->jmp_buf_ptr;
+
+      /* A size of 0 is used to indicate a local, stack, allocation of the
+       * pointer; used here and in png.c
+       */
+      if (jb != NULL && png_ptr->jmp_buf_size > 0)
+      {
+
+         /* This stuff is so that a failure to free the error control structure
+          * does not leave libpng in a state with no valid error handling: the
+          * free always succeeds, if there is an error it gets ignored.
+          */
+         if (jb != &png_ptr->jmp_buf_local)
+         {
+            /* Make an internal, libpng, jmp_buf to return here */
+            jmp_buf free_jmp_buf;
+
+            if (!setjmp(free_jmp_buf))
+            {
+               png_ptr->jmp_buf_ptr = &free_jmp_buf; /* come back here */
+               png_ptr->jmp_buf_size = 0; /* stack allocation */
+               png_ptr->longjmp_fn = longjmp;
+               png_free(png_ptr, jb); /* Return to setjmp on error */
+            }
+         }
+      }
+
+      /* *Always* cancel everything out: */
+      png_ptr->jmp_buf_size = 0;
+      png_ptr->jmp_buf_ptr = NULL;
+      png_ptr->longjmp_fn = 0;
+   }
 }
 #endif
 
@@ -515,7 +708,7 @@ png_set_longjmp_fn(png_structp png_ptr, png_longjmp_ptr longjmp_fn,
  * error function pointer in png_set_error_fn().
  */
 static PNG_FUNCTION(void /* PRIVATE */,
-png_default_error,(png_structp png_ptr, png_const_charp error_message),
+png_default_error,(png_const_structrp png_ptr, png_const_charp error_message),
    PNG_NORETURN)
 {
 #ifdef PNG_CONSOLE_IO_SUPPORTED
@@ -562,27 +755,23 @@ png_default_error,(png_structp png_ptr, png_const_charp error_message),
 }
 
 PNG_FUNCTION(void,PNGAPI
-png_longjmp,(png_structp png_ptr, int val),PNG_NORETURN)
+png_longjmp,(png_const_structrp png_ptr, int val),PNG_NORETURN)
 {
 #ifdef PNG_SETJMP_SUPPORTED
-   if (png_ptr && png_ptr->longjmp_fn)
-   {
-#  ifdef USE_FAR_KEYWORD
-      {
-         jmp_buf tmp_jmpbuf;
-         png_memcpy(tmp_jmpbuf, png_ptr->longjmp_buffer, png_sizeof(jmp_buf));
-         png_ptr->longjmp_fn(tmp_jmpbuf, val);
-      }
-
-#  else
-   png_ptr->longjmp_fn(png_ptr->longjmp_buffer, val);
-#  endif
-   }
+   if (png_ptr != NULL && png_ptr->longjmp_fn != NULL &&
+       png_ptr->jmp_buf_ptr != NULL)
+      png_ptr->longjmp_fn(*png_ptr->jmp_buf_ptr, val);
 #else
-   PNG_UNUSED(png_ptr);
-   PNG_UNUSED(val);
+   PNG_UNUSED(png_ptr)
+   PNG_UNUSED(val)
 #endif
-   /* Here if not setjmp support or if png_ptr is null. */
+
+   /* If control reaches this point, png_longjmp() must not return. The only
+    * choice is to terminate the whole process (or maybe the thread); to do
+    * this the ANSI-C abort() function is used unless a different method is
+    * implemented by overriding the default configuration setting for
+    * PNG_ABORT().
+    */
    PNG_ABORT();
 }
 
@@ -593,7 +782,7 @@ png_longjmp,(png_structp png_ptr, int val),PNG_NORETURN)
  * not used, but it is passed in case it may be useful.
  */
 static void /* PRIVATE */
-png_default_warning(png_structp png_ptr, png_const_charp warning_message)
+png_default_warning(png_const_structrp png_ptr, png_const_charp warning_message)
 {
 #ifdef PNG_CONSOLE_IO_SUPPORTED
 #  ifdef PNG_ERROR_NUMBERS_SUPPORTED
@@ -635,15 +824,15 @@ png_default_warning(png_structp png_ptr, png_const_charp warning_message)
 #endif
    PNG_UNUSED(png_ptr) /* Make compiler happy */
 }
-#endif /* PNG_WARNINGS_SUPPORTED */
+#endif /* WARNINGS */
 
 /* This function is called when the application wants to use another method
  * of handling errors and warnings.  Note that the error function MUST NOT
  * return to the calling routine or serious problems will occur.  The return
- * method used in the default routine calls longjmp(png_ptr->longjmp_buffer, 1)
+ * method used in the default routine calls longjmp(png_ptr->jmp_buf_ptr, 1)
  */
 void PNGAPI
-png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,
+png_set_error_fn(png_structrp png_ptr, png_voidp error_ptr,
     png_error_ptr error_fn, png_error_ptr warning_fn)
 {
    if (png_ptr == NULL)
@@ -664,7 +853,7 @@ png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,
  * pointer before png_write_destroy and png_read_destroy are called.
  */
 png_voidp PNGAPI
-png_get_error_ptr(png_const_structp png_ptr)
+png_get_error_ptr(png_const_structrp png_ptr)
 {
    if (png_ptr == NULL)
       return NULL;
@@ -675,7 +864,7 @@ png_get_error_ptr(png_const_structp png_ptr)
 
 #ifdef PNG_ERROR_NUMBERS_SUPPORTED
 void PNGAPI
-png_set_strip_error_numbers(png_structp png_ptr, png_uint_32 strip_mode)
+png_set_strip_error_numbers(png_structrp png_ptr, png_uint_32 strip_mode)
 {
    if (png_ptr != NULL)
    {
@@ -685,4 +874,90 @@ png_set_strip_error_numbers(png_structp png_ptr, png_uint_32 strip_mode)
    }
 }
 #endif
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+
+#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\
+   defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
+   /* Currently the above both depend on SETJMP_SUPPORTED, however it would be
+    * possible to implement without setjmp support just so long as there is some
+    * way to handle the error return here:
+    */
+PNG_FUNCTION(void /* PRIVATE */, (PNGCBAPI
+png_safe_error),(png_structp png_nonconst_ptr, png_const_charp error_message),
+   PNG_NORETURN)
+{
+   const png_const_structrp png_ptr = png_nonconst_ptr;
+   png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr);
+
+   /* An error is always logged here, overwriting anything (typically a warning)
+    * that is already there:
+    */
+   if (image != NULL)
+   {
+      png_safecat(image->message, (sizeof image->message), 0, error_message);
+      image->warning_or_error |= PNG_IMAGE_ERROR;
+
+      /* Retrieve the jmp_buf from within the png_control, making this work for
+       * C++ compilation too is pretty tricky: C++ wants a pointer to the first
+       * element of a jmp_buf, but C doesn't tell us the type of that.
+       */
+      if (image->opaque != NULL && image->opaque->error_buf != NULL)
+         longjmp(png_control_jmp_buf(image->opaque), 1);
+
+      /* Missing longjmp buffer, the following is to help debugging: */
+      {
+         size_t pos = png_safecat(image->message, (sizeof image->message), 0,
+            "bad longjmp: ");
+         png_safecat(image->message, (sizeof image->message), pos,
+             error_message);
+      }
+   }
+
+   /* Here on an internal programming error. */
+   abort();
+}
+
+#ifdef PNG_WARNINGS_SUPPORTED
+void /* PRIVATE */ PNGCBAPI
+png_safe_warning(png_structp png_nonconst_ptr, png_const_charp warning_message)
+{
+   const png_const_structrp png_ptr = png_nonconst_ptr;
+   png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr);
+
+   /* A warning is only logged if there is no prior warning or error. */
+   if (image->warning_or_error == 0)
+   {
+      png_safecat(image->message, (sizeof image->message), 0, warning_message);
+      image->warning_or_error |= PNG_IMAGE_WARNING;
+   }
+}
+#endif
+
+int /* PRIVATE */
+png_safe_execute(png_imagep image_in, int (*function)(png_voidp), png_voidp arg)
+{
+   volatile png_imagep image = image_in;
+   volatile int result;
+   volatile png_voidp saved_error_buf;
+   jmp_buf safe_jmpbuf;
+
+   /* Safely execute function(arg) with png_error returning to this function. */
+   saved_error_buf = image->opaque->error_buf;
+   result = setjmp(safe_jmpbuf) == 0;
+
+   if (result != 0)
+   {
+
+      image->opaque->error_buf = safe_jmpbuf;
+      result = function(arg);
+   }
+
+   image->opaque->error_buf = saved_error_buf;
+
+   /* And do the cleanup prior to any failure return. */
+   if (result == 0)
+      png_image_free(image);
+
+   return result;
+}
+#endif /* SIMPLIFIED READ || SIMPLIFIED_WRITE */
+#endif /* READ || WRITE */
diff --git a/drivers/png/pngget.c b/drivers/png/pngget.c
index 5b1d757c66..14fc7be520 100644
--- a/drivers/png/pngget.c
+++ b/drivers/png/pngget.c
@@ -1,8 +1,8 @@
 
 /* pngget.c - retrieval of values from info struct
  *
- * Last changed in libpng 1.5.19 [August 21, 2014]
- * Copyright (c) 1998-2002,2004,2006-2014 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.17 [March 26, 2015]
+ * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -17,7 +17,7 @@
 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
 
 png_uint_32 PNGAPI
-png_get_valid(png_const_structp png_ptr, png_const_infop info_ptr,
+png_get_valid(png_const_structrp png_ptr, png_const_inforp info_ptr,
     png_uint_32 flag)
 {
    if (png_ptr != NULL && info_ptr != NULL)
@@ -27,7 +27,7 @@ png_get_valid(png_const_structp png_ptr, png_const_infop info_ptr,
 }
 
 png_size_t PNGAPI
-png_get_rowbytes(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_rowbytes(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return(info_ptr->rowbytes);
@@ -37,7 +37,7 @@ png_get_rowbytes(png_const_structp png_ptr, png_const_infop info_ptr)
 
 #ifdef PNG_INFO_IMAGE_SUPPORTED
 png_bytepp PNGAPI
-png_get_rows(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_rows(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return(info_ptr->row_pointers);
@@ -49,7 +49,7 @@ png_get_rows(png_const_structp png_ptr, png_const_infop info_ptr)
 #ifdef PNG_EASY_ACCESS_SUPPORTED
 /* Easy access to info, added in libpng-0.99 */
 png_uint_32 PNGAPI
-png_get_image_width(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_image_width(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->width;
@@ -58,7 +58,7 @@ png_get_image_width(png_const_structp png_ptr, png_const_infop info_ptr)
 }
 
 png_uint_32 PNGAPI
-png_get_image_height(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_image_height(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->height;
@@ -67,7 +67,7 @@ png_get_image_height(png_const_structp png_ptr, png_const_infop info_ptr)
 }
 
 png_byte PNGAPI
-png_get_bit_depth(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_bit_depth(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->bit_depth;
@@ -76,7 +76,7 @@ png_get_bit_depth(png_const_structp png_ptr, png_const_infop info_ptr)
 }
 
 png_byte PNGAPI
-png_get_color_type(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_color_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->color_type;
@@ -85,7 +85,7 @@ png_get_color_type(png_const_structp png_ptr, png_const_infop info_ptr)
 }
 
 png_byte PNGAPI
-png_get_filter_type(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_filter_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->filter_type;
@@ -94,7 +94,7 @@ png_get_filter_type(png_const_structp png_ptr, png_const_infop info_ptr)
 }
 
 png_byte PNGAPI
-png_get_interlace_type(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_interlace_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->interlace_type;
@@ -103,7 +103,7 @@ png_get_interlace_type(png_const_structp png_ptr, png_const_infop info_ptr)
 }
 
 png_byte PNGAPI
-png_get_compression_type(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_compression_type(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return info_ptr->compression_type;
@@ -112,10 +112,12 @@ png_get_compression_type(png_const_structp png_ptr, png_const_infop info_ptr)
 }
 
 png_uint_32 PNGAPI
-png_get_x_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_x_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp
+   info_ptr)
 {
 #ifdef PNG_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_pHYs) != 0)
       {
          png_debug1(1, "in %s retrieval function",
              "png_get_x_pixels_per_meter");
@@ -132,10 +134,12 @@ png_get_x_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
 }
 
 png_uint_32 PNGAPI
-png_get_y_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_y_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp
+    info_ptr)
 {
 #ifdef PNG_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_pHYs) != 0)
    {
       png_debug1(1, "in %s retrieval function",
           "png_get_y_pixels_per_meter");
@@ -152,10 +156,11 @@ png_get_y_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
 }
 
 png_uint_32 PNGAPI
-png_get_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
 #ifdef PNG_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_pHYs) != 0)
    {
       png_debug1(1, "in %s retrieval function", "png_get_pixels_per_meter");
 
@@ -173,10 +178,12 @@ png_get_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
 
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 float PNGAPI
-png_get_pixel_aspect_ratio(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_pixel_aspect_ratio(png_const_structrp png_ptr, png_const_inforp
+   info_ptr)
 {
 #ifdef PNG_READ_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_pHYs) != 0)
    {
       png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio");
 
@@ -195,14 +202,15 @@ png_get_pixel_aspect_ratio(png_const_structp png_ptr, png_const_infop info_ptr)
 
 #ifdef PNG_FIXED_POINT_SUPPORTED
 png_fixed_point PNGAPI
-png_get_pixel_aspect_ratio_fixed(png_const_structp png_ptr,
-    png_const_infop info_ptr)
+png_get_pixel_aspect_ratio_fixed(png_const_structrp png_ptr,
+    png_const_inforp info_ptr)
 {
 #ifdef PNG_READ_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs)
-       && info_ptr->x_pixels_per_unit > 0 && info_ptr->y_pixels_per_unit > 0
-       && info_ptr->x_pixels_per_unit <= PNG_UINT_31_MAX
-       && info_ptr->y_pixels_per_unit <= PNG_UINT_31_MAX)
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_pHYs) != 0 &&
+       info_ptr->x_pixels_per_unit > 0 && info_ptr->y_pixels_per_unit > 0 &&
+       info_ptr->x_pixels_per_unit <= PNG_UINT_31_MAX &&
+       info_ptr->y_pixels_per_unit <= PNG_UINT_31_MAX)
    {
       png_fixed_point res;
 
@@ -212,7 +220,7 @@ png_get_pixel_aspect_ratio_fixed(png_const_structp png_ptr,
        * range of 0..2^31-1; otherwise the cast might overflow.
        */
       if (png_muldiv(&res, (png_int_32)info_ptr->y_pixels_per_unit, PNG_FP_1,
-          (png_int_32)info_ptr->x_pixels_per_unit))
+          (png_int_32)info_ptr->x_pixels_per_unit) != 0)
          return res;
    }
 #else
@@ -225,10 +233,11 @@ png_get_pixel_aspect_ratio_fixed(png_const_structp png_ptr,
 #endif
 
 png_int_32 PNGAPI
-png_get_x_offset_microns(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_x_offset_microns(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
 #ifdef PNG_oFFs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_oFFs) != 0)
    {
       png_debug1(1, "in %s retrieval function", "png_get_x_offset_microns");
 
@@ -244,10 +253,11 @@ png_get_x_offset_microns(png_const_structp png_ptr, png_const_infop info_ptr)
 }
 
 png_int_32 PNGAPI
-png_get_y_offset_microns(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_y_offset_microns(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
 #ifdef PNG_oFFs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_oFFs) != 0)
    {
       png_debug1(1, "in %s retrieval function", "png_get_y_offset_microns");
 
@@ -263,10 +273,11 @@ png_get_y_offset_microns(png_const_structp png_ptr, png_const_infop info_ptr)
 }
 
 png_int_32 PNGAPI
-png_get_x_offset_pixels(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_x_offset_pixels(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
 #ifdef PNG_oFFs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_oFFs) != 0)
    {
       png_debug1(1, "in %s retrieval function", "png_get_x_offset_pixels");
 
@@ -282,10 +293,11 @@ png_get_x_offset_pixels(png_const_structp png_ptr, png_const_infop info_ptr)
 }
 
 png_int_32 PNGAPI
-png_get_y_offset_pixels(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_y_offset_pixels(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
 #ifdef PNG_oFFs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_oFFs) != 0)
    {
       png_debug1(1, "in %s retrieval function", "png_get_y_offset_pixels");
 
@@ -325,7 +337,7 @@ ppi_from_ppm(png_uint_32 ppm)
     */
    png_fixed_point result;
    if (ppm <= PNG_UINT_31_MAX && png_muldiv(&result, (png_int_32)ppm, 127,
-       5000))
+       5000) != 0)
       return result;
 
    /* Overflow. */
@@ -334,26 +346,26 @@ ppi_from_ppm(png_uint_32 ppm)
 }
 
 png_uint_32 PNGAPI
-png_get_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_pixels_per_inch(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    return ppi_from_ppm(png_get_pixels_per_meter(png_ptr, info_ptr));
 }
 
 png_uint_32 PNGAPI
-png_get_x_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_x_pixels_per_inch(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    return ppi_from_ppm(png_get_x_pixels_per_meter(png_ptr, info_ptr));
 }
 
 png_uint_32 PNGAPI
-png_get_y_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_y_pixels_per_inch(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    return ppi_from_ppm(png_get_y_pixels_per_meter(png_ptr, info_ptr));
 }
 
 #ifdef PNG_FIXED_POINT_SUPPORTED
 static png_fixed_point
-png_fixed_inches_from_microns(png_structp png_ptr, png_int_32 microns)
+png_fixed_inches_from_microns(png_const_structrp png_ptr, png_int_32 microns)
 {
    /* Convert from metres * 1,000,000 to inches * 100,000, meters to
     * inches is simply *(100/2.54), so we want *(10/2.54) == 500/127.
@@ -364,8 +376,8 @@ png_fixed_inches_from_microns(png_structp png_ptr, png_int_32 microns)
 }
 
 png_fixed_point PNGAPI
-png_get_x_offset_inches_fixed(png_structp png_ptr,
-    png_const_infop info_ptr)
+png_get_x_offset_inches_fixed(png_const_structrp png_ptr,
+    png_const_inforp info_ptr)
 {
    return png_fixed_inches_from_microns(png_ptr,
        png_get_x_offset_microns(png_ptr, info_ptr));
@@ -374,8 +386,8 @@ png_get_x_offset_inches_fixed(png_structp png_ptr,
 
 #ifdef PNG_FIXED_POINT_SUPPORTED
 png_fixed_point PNGAPI
-png_get_y_offset_inches_fixed(png_structp png_ptr,
-    png_const_infop info_ptr)
+png_get_y_offset_inches_fixed(png_const_structrp png_ptr,
+    png_const_inforp info_ptr)
 {
    return png_fixed_inches_from_microns(png_ptr,
        png_get_y_offset_microns(png_ptr, info_ptr));
@@ -384,7 +396,7 @@ png_get_y_offset_inches_fixed(png_structp png_ptr,
 
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 float PNGAPI
-png_get_x_offset_inches(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_x_offset_inches(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    /* To avoid the overflow do the conversion directly in floating
     * point.
@@ -395,7 +407,7 @@ png_get_x_offset_inches(png_const_structp png_ptr, png_const_infop info_ptr)
 
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 float PNGAPI
-png_get_y_offset_inches(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_y_offset_inches(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    /* To avoid the overflow do the conversion directly in floating
     * point.
@@ -406,12 +418,13 @@ png_get_y_offset_inches(png_const_structp png_ptr, png_const_infop info_ptr)
 
 #ifdef PNG_pHYs_SUPPORTED
 png_uint_32 PNGAPI
-png_get_pHYs_dpi(png_const_structp png_ptr, png_const_infop info_ptr,
+png_get_pHYs_dpi(png_const_structrp png_ptr, png_const_inforp info_ptr,
     png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
 {
    png_uint_32 retval = 0;
 
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_pHYs) != 0)
    {
       png_debug1(1, "in %s retrieval function", "pHYs");
 
@@ -442,15 +455,16 @@ png_get_pHYs_dpi(png_const_structp png_ptr, png_const_infop info_ptr,
 
    return (retval);
 }
-#endif /* PNG_pHYs_SUPPORTED */
-#endif  /* PNG_INCH_CONVERSIONS_SUPPORTED */
+#endif /* pHYs */
+#endif /* INCH_CONVERSIONS */
 
 /* png_get_channels really belongs in here, too, but it's been around longer */
 
-#endif  /* PNG_EASY_ACCESS_SUPPORTED */
+#endif /* EASY_ACCESS */
+
 
 png_byte PNGAPI
-png_get_channels(png_const_structp png_ptr, png_const_infop info_ptr)
+png_get_channels(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return(info_ptr->channels);
@@ -458,22 +472,25 @@ png_get_channels(png_const_structp png_ptr, png_const_infop info_ptr)
    return (0);
 }
 
+#ifdef PNG_READ_SUPPORTED
 png_const_bytep PNGAPI
-png_get_signature(png_const_structp png_ptr, png_infop info_ptr)
+png_get_signature(png_const_structrp png_ptr, png_const_inforp info_ptr)
 {
    if (png_ptr != NULL && info_ptr != NULL)
       return(info_ptr->signature);
 
    return (NULL);
 }
+#endif
 
 #ifdef PNG_bKGD_SUPPORTED
 png_uint_32 PNGAPI
-png_get_bKGD(png_const_structp png_ptr, png_infop info_ptr,
+png_get_bKGD(png_const_structrp png_ptr, png_inforp info_ptr,
    png_color_16p *background)
 {
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD)
-       && background != NULL)
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_bKGD) != 0 &&
+       background != NULL)
    {
       png_debug1(1, "in %s retrieval function", "bKGD");
 
@@ -490,87 +507,47 @@ png_get_bKGD(png_const_structp png_ptr, png_infop info_ptr,
  * same time to correct the rgb grayscale coefficient defaults obtained from the
  * cHRM chunk in 1.5.4
  */
-png_uint_32 PNGFAPI
-png_get_cHRM_XYZ_fixed(png_structp png_ptr, png_const_infop info_ptr,
-    png_fixed_point *int_red_X, png_fixed_point *int_red_Y,
-    png_fixed_point *int_red_Z, png_fixed_point *int_green_X,
-    png_fixed_point *int_green_Y, png_fixed_point *int_green_Z,
-    png_fixed_point *int_blue_X, png_fixed_point *int_blue_Y,
-    png_fixed_point *int_blue_Z)
-{
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
-   {
-      png_xy xy;
-      png_XYZ XYZ;
-
-      png_debug1(1, "in %s retrieval function", "cHRM_XYZ");
-
-      xy.whitex = info_ptr->x_white;
-      xy.whitey = info_ptr->y_white;
-      xy.redx = info_ptr->x_red;
-      xy.redy = info_ptr->y_red;
-      xy.greenx = info_ptr->x_green;
-      xy.greeny = info_ptr->y_green;
-      xy.bluex = info_ptr->x_blue;
-      xy.bluey = info_ptr->y_blue;
-
-      /* The *_checked function handles error reporting, so just return 0 if
-       * there is a failure here.
-       */
-      if (png_XYZ_from_xy_checked(png_ptr, &XYZ, xy))
-      {
-         if (int_red_X != NULL)
-            *int_red_X = XYZ.redX;
-         if (int_red_Y != NULL)
-            *int_red_Y = XYZ.redY;
-         if (int_red_Z != NULL)
-            *int_red_Z = XYZ.redZ;
-         if (int_green_X != NULL)
-            *int_green_X = XYZ.greenX;
-         if (int_green_Y != NULL)
-            *int_green_Y = XYZ.greenY;
-         if (int_green_Z != NULL)
-            *int_green_Z = XYZ.greenZ;
-         if (int_blue_X != NULL)
-            *int_blue_X = XYZ.blueX;
-         if (int_blue_Y != NULL)
-            *int_blue_Y = XYZ.blueY;
-         if (int_blue_Z != NULL)
-            *int_blue_Z = XYZ.blueZ;
-
-         return (PNG_INFO_cHRM);
-      }
-   }
-
-   return (0);
-}
-
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_cHRM(png_const_structp png_ptr, png_const_infop info_ptr,
+png_get_cHRM(png_const_structrp png_ptr, png_const_inforp info_ptr,
     double *white_x, double *white_y, double *red_x, double *red_y,
     double *green_x, double *green_y, double *blue_x, double *blue_y)
 {
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
+   /* Quiet API change: this code used to only return the end points if a cHRM
+    * chunk was present, but the end points can also come from iCCP or sRGB
+    * chunks, so in 1.6.0 the png_get_ APIs return the end points regardless and
+    * the png_set_ APIs merely check that set end points are mutually
+    * consistent.
+    */
+   if (png_ptr != NULL && info_ptr != NULL &&
+      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
    {
       png_debug1(1, "in %s retrieval function", "cHRM");
 
       if (white_x != NULL)
-         *white_x = png_float(png_ptr, info_ptr->x_white, "cHRM white X");
+         *white_x = png_float(png_ptr,
+            info_ptr->colorspace.end_points_xy.whitex, "cHRM white X");
       if (white_y != NULL)
-         *white_y = png_float(png_ptr, info_ptr->y_white, "cHRM white Y");
+         *white_y = png_float(png_ptr,
+            info_ptr->colorspace.end_points_xy.whitey, "cHRM white Y");
       if (red_x != NULL)
-         *red_x = png_float(png_ptr, info_ptr->x_red, "cHRM red X");
+         *red_x = png_float(png_ptr, info_ptr->colorspace.end_points_xy.redx,
+            "cHRM red X");
       if (red_y != NULL)
-         *red_y = png_float(png_ptr, info_ptr->y_red, "cHRM red Y");
+         *red_y = png_float(png_ptr, info_ptr->colorspace.end_points_xy.redy,
+            "cHRM red Y");
       if (green_x != NULL)
-         *green_x = png_float(png_ptr, info_ptr->x_green, "cHRM green X");
+         *green_x = png_float(png_ptr,
+            info_ptr->colorspace.end_points_xy.greenx, "cHRM green X");
       if (green_y != NULL)
-         *green_y = png_float(png_ptr, info_ptr->y_green, "cHRM green Y");
+         *green_y = png_float(png_ptr,
+            info_ptr->colorspace.end_points_xy.greeny, "cHRM green Y");
       if (blue_x != NULL)
-         *blue_x = png_float(png_ptr, info_ptr->x_blue, "cHRM blue X");
+         *blue_x = png_float(png_ptr, info_ptr->colorspace.end_points_xy.bluex,
+            "cHRM blue X");
       if (blue_y != NULL)
-         *blue_y = png_float(png_ptr, info_ptr->y_blue, "cHRM blue Y");
+         *blue_y = png_float(png_ptr, info_ptr->colorspace.end_points_xy.bluey,
+            "cHRM blue Y");
       return (PNG_INFO_cHRM);
    }
 
@@ -578,35 +555,43 @@ png_get_cHRM(png_const_structp png_ptr, png_const_infop info_ptr,
 }
 
 png_uint_32 PNGAPI
-png_get_cHRM_XYZ(png_structp png_ptr, png_const_infop info_ptr,
+png_get_cHRM_XYZ(png_const_structrp png_ptr, png_const_inforp info_ptr,
    double *red_X, double *red_Y, double *red_Z, double *green_X,
    double *green_Y, double *green_Z, double *blue_X, double *blue_Y,
    double *blue_Z)
 {
-   png_XYZ XYZ;
-
-   if (png_get_cHRM_XYZ_fixed(png_ptr, info_ptr,
-      &XYZ.redX, &XYZ.redY, &XYZ.redZ, &XYZ.greenX, &XYZ.greenY, &XYZ.greenZ,
-      &XYZ.blueX, &XYZ.blueY, &XYZ.blueZ) & PNG_INFO_cHRM)
+   if (png_ptr != NULL && info_ptr != NULL &&
+      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
    {
+      png_debug1(1, "in %s retrieval function", "cHRM_XYZ(float)");
+
       if (red_X != NULL)
-         *red_X = png_float(png_ptr, XYZ.redX, "cHRM red X");
+         *red_X = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_X,
+            "cHRM red X");
       if (red_Y != NULL)
-         *red_Y = png_float(png_ptr, XYZ.redY, "cHRM red Y");
+         *red_Y = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_Y,
+            "cHRM red Y");
       if (red_Z != NULL)
-         *red_Z = png_float(png_ptr, XYZ.redZ, "cHRM red Z");
+         *red_Z = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_Z,
+            "cHRM red Z");
       if (green_X != NULL)
-         *green_X = png_float(png_ptr, XYZ.greenX, "cHRM green X");
+         *green_X = png_float(png_ptr,
+            info_ptr->colorspace.end_points_XYZ.green_X, "cHRM green X");
       if (green_Y != NULL)
-         *green_Y = png_float(png_ptr, XYZ.greenY, "cHRM green Y");
+         *green_Y = png_float(png_ptr,
+            info_ptr->colorspace.end_points_XYZ.green_Y, "cHRM green Y");
       if (green_Z != NULL)
-         *green_Z = png_float(png_ptr, XYZ.greenZ, "cHRM green Z");
+         *green_Z = png_float(png_ptr,
+            info_ptr->colorspace.end_points_XYZ.green_Z, "cHRM green Z");
       if (blue_X != NULL)
-         *blue_X = png_float(png_ptr, XYZ.blueX, "cHRM blue X");
+         *blue_X = png_float(png_ptr,
+            info_ptr->colorspace.end_points_XYZ.blue_X, "cHRM blue X");
       if (blue_Y != NULL)
-         *blue_Y = png_float(png_ptr, XYZ.blueY, "cHRM blue Y");
+         *blue_Y = png_float(png_ptr,
+            info_ptr->colorspace.end_points_XYZ.blue_Y, "cHRM blue Y");
       if (blue_Z != NULL)
-         *blue_Z = png_float(png_ptr, XYZ.blueZ, "cHRM blue Z");
+         *blue_Z = png_float(png_ptr,
+            info_ptr->colorspace.end_points_XYZ.blue_Z, "cHRM blue Z");
       return (PNG_INFO_cHRM);
    }
 
@@ -616,31 +601,69 @@ png_get_cHRM_XYZ(png_structp png_ptr, png_const_infop info_ptr,
 
 #  ifdef PNG_FIXED_POINT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_cHRM_fixed(png_const_structp png_ptr, png_const_infop info_ptr,
+png_get_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
+    png_fixed_point *int_red_X, png_fixed_point *int_red_Y,
+    png_fixed_point *int_red_Z, png_fixed_point *int_green_X,
+    png_fixed_point *int_green_Y, png_fixed_point *int_green_Z,
+    png_fixed_point *int_blue_X, png_fixed_point *int_blue_Y,
+    png_fixed_point *int_blue_Z)
+{
+   if (png_ptr != NULL && info_ptr != NULL &&
+      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
+   {
+      png_debug1(1, "in %s retrieval function", "cHRM_XYZ");
+
+      if (int_red_X != NULL)
+         *int_red_X = info_ptr->colorspace.end_points_XYZ.red_X;
+      if (int_red_Y != NULL)
+         *int_red_Y = info_ptr->colorspace.end_points_XYZ.red_Y;
+      if (int_red_Z != NULL)
+         *int_red_Z = info_ptr->colorspace.end_points_XYZ.red_Z;
+      if (int_green_X != NULL)
+         *int_green_X = info_ptr->colorspace.end_points_XYZ.green_X;
+      if (int_green_Y != NULL)
+         *int_green_Y = info_ptr->colorspace.end_points_XYZ.green_Y;
+      if (int_green_Z != NULL)
+         *int_green_Z = info_ptr->colorspace.end_points_XYZ.green_Z;
+      if (int_blue_X != NULL)
+         *int_blue_X = info_ptr->colorspace.end_points_XYZ.blue_X;
+      if (int_blue_Y != NULL)
+         *int_blue_Y = info_ptr->colorspace.end_points_XYZ.blue_Y;
+      if (int_blue_Z != NULL)
+         *int_blue_Z = info_ptr->colorspace.end_points_XYZ.blue_Z;
+      return (PNG_INFO_cHRM);
+   }
+
+   return (0);
+}
+
+png_uint_32 PNGAPI
+png_get_cHRM_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
     png_fixed_point *white_x, png_fixed_point *white_y, png_fixed_point *red_x,
     png_fixed_point *red_y, png_fixed_point *green_x, png_fixed_point *green_y,
     png_fixed_point *blue_x, png_fixed_point *blue_y)
 {
    png_debug1(1, "in %s retrieval function", "cHRM");
 
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
+   if (png_ptr != NULL && info_ptr != NULL &&
+      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
    {
       if (white_x != NULL)
-         *white_x = info_ptr->x_white;
+         *white_x = info_ptr->colorspace.end_points_xy.whitex;
       if (white_y != NULL)
-         *white_y = info_ptr->y_white;
+         *white_y = info_ptr->colorspace.end_points_xy.whitey;
       if (red_x != NULL)
-         *red_x = info_ptr->x_red;
+         *red_x = info_ptr->colorspace.end_points_xy.redx;
       if (red_y != NULL)
-         *red_y = info_ptr->y_red;
+         *red_y = info_ptr->colorspace.end_points_xy.redy;
       if (green_x != NULL)
-         *green_x = info_ptr->x_green;
+         *green_x = info_ptr->colorspace.end_points_xy.greenx;
       if (green_y != NULL)
-         *green_y = info_ptr->y_green;
+         *green_y = info_ptr->colorspace.end_points_xy.greeny;
       if (blue_x != NULL)
-         *blue_x = info_ptr->x_blue;
+         *blue_x = info_ptr->colorspace.end_points_xy.bluex;
       if (blue_y != NULL)
-         *blue_y = info_ptr->y_blue;
+         *blue_y = info_ptr->colorspace.end_points_xy.bluey;
       return (PNG_INFO_cHRM);
    }
 
@@ -650,49 +673,57 @@ png_get_cHRM_fixed(png_const_structp png_ptr, png_const_infop info_ptr,
 #endif
 
 #ifdef PNG_gAMA_SUPPORTED
-png_uint_32 PNGFAPI
-png_get_gAMA_fixed(png_const_structp png_ptr, png_const_infop info_ptr,
+#  ifdef PNG_FIXED_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_gAMA_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
     png_fixed_point *file_gamma)
 {
    png_debug1(1, "in %s retrieval function", "gAMA");
 
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
-       && file_gamma != NULL)
+   if (png_ptr != NULL && info_ptr != NULL &&
+      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
+      file_gamma != NULL)
    {
-      *file_gamma = info_ptr->gamma;
+      *file_gamma = info_ptr->colorspace.gamma;
       return (PNG_INFO_gAMA);
    }
 
    return (0);
 }
+#  endif
+
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_gAMA(png_const_structp png_ptr, png_const_infop info_ptr,
+png_get_gAMA(png_const_structrp png_ptr, png_const_inforp info_ptr,
     double *file_gamma)
 {
-   png_fixed_point igamma;
-   png_uint_32 ok = png_get_gAMA_fixed(png_ptr, info_ptr, &igamma);
+   png_debug1(1, "in %s retrieval function", "gAMA(float)");
 
-   if (ok != 0)
-      *file_gamma = png_float(png_ptr, igamma, "png_get_gAMA");
+   if (png_ptr != NULL && info_ptr != NULL &&
+      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
+      file_gamma != NULL)
+   {
+      *file_gamma = png_float(png_ptr, info_ptr->colorspace.gamma,
+         "png_get_gAMA");
+      return (PNG_INFO_gAMA);
+   }
 
-   return ok;
+   return (0);
 }
-
 #  endif
 #endif
 
 #ifdef PNG_sRGB_SUPPORTED
 png_uint_32 PNGAPI
-png_get_sRGB(png_const_structp png_ptr, png_const_infop info_ptr,
+png_get_sRGB(png_const_structrp png_ptr, png_const_inforp info_ptr,
     int *file_srgb_intent)
 {
    png_debug1(1, "in %s retrieval function", "sRGB");
 
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB)
-       && file_srgb_intent != NULL)
+   if (png_ptr != NULL && info_ptr != NULL &&
+      (info_ptr->valid & PNG_INFO_sRGB) != 0 && file_srgb_intent != NULL)
    {
-      *file_srgb_intent = (int)info_ptr->srgb_intent;
+      *file_srgb_intent = info_ptr->colorspace.rendering_intent;
       return (PNG_INFO_sRGB);
    }
 
@@ -702,23 +733,24 @@ png_get_sRGB(png_const_structp png_ptr, png_const_infop info_ptr,
 
 #ifdef PNG_iCCP_SUPPORTED
 png_uint_32 PNGAPI
-png_get_iCCP(png_const_structp png_ptr, png_const_infop info_ptr,
+png_get_iCCP(png_const_structrp png_ptr, png_inforp info_ptr,
     png_charpp name, int *compression_type,
     png_bytepp profile, png_uint_32 *proflen)
 {
    png_debug1(1, "in %s retrieval function", "iCCP");
 
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP)
-       && name != NULL && compression_type != NULL && profile != NULL &&
-		 proflen != NULL)
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_iCCP) != 0 &&
+       name != NULL && compression_type != NULL && profile != NULL &&
+           proflen != NULL)
    {
       *name = info_ptr->iccp_name;
       *profile = info_ptr->iccp_profile;
-      /* Compression_type is a dummy so the API won't have to change
-       * if we introduce multiple compression types later.
+      *proflen = png_get_uint_32(info_ptr->iccp_profile);
+      /* This is somewhat irrelevant since the profile data returned has
+       * actually been uncompressed.
        */
-      *proflen = info_ptr->iccp_proflen;
-      *compression_type = info_ptr->iccp_compression;
+      *compression_type = PNG_COMPRESSION_TYPE_BASE;
       return (PNG_INFO_iCCP);
    }
 
@@ -727,14 +759,14 @@ png_get_iCCP(png_const_structp png_ptr, png_const_infop info_ptr,
 #endif
 
 #ifdef PNG_sPLT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_sPLT(png_const_structp png_ptr, png_const_infop info_ptr,
+int PNGAPI
+png_get_sPLT(png_const_structrp png_ptr, png_inforp info_ptr,
     png_sPLT_tpp spalettes)
 {
    if (png_ptr != NULL && info_ptr != NULL && spalettes != NULL)
    {
       *spalettes = info_ptr->splt_palettes;
-      return ((png_uint_32)info_ptr->splt_palettes_num);
+      return info_ptr->splt_palettes_num;
    }
 
    return (0);
@@ -743,13 +775,13 @@ png_get_sPLT(png_const_structp png_ptr, png_const_infop info_ptr,
 
 #ifdef PNG_hIST_SUPPORTED
 png_uint_32 PNGAPI
-png_get_hIST(png_const_structp png_ptr, png_const_infop info_ptr,
+png_get_hIST(png_const_structrp png_ptr, png_inforp info_ptr,
     png_uint_16p *hist)
 {
    png_debug1(1, "in %s retrieval function", "hIST");
 
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST)
-       && hist != NULL)
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_hIST) != 0 && hist != NULL)
    {
       *hist = info_ptr->hist;
       return (PNG_INFO_hIST);
@@ -760,11 +792,10 @@ png_get_hIST(png_const_structp png_ptr, png_const_infop info_ptr,
 #endif
 
 png_uint_32 PNGAPI
-png_get_IHDR(png_structp png_ptr, png_infop info_ptr,
+png_get_IHDR(png_const_structrp png_ptr, png_const_inforp info_ptr,
     png_uint_32 *width, png_uint_32 *height, int *bit_depth,
     int *color_type, int *interlace_type, int *compression_type,
     int *filter_type)
-
 {
    png_debug1(1, "in %s retrieval function", "IHDR");
 
@@ -797,7 +828,7 @@ png_get_IHDR(png_structp png_ptr, png_infop info_ptr,
     * application has ignored our advice not to mess with the members
     * of info_ptr directly.
     */
-   png_check_IHDR (png_ptr, info_ptr->width, info_ptr->height,
+   png_check_IHDR(png_ptr, info_ptr->width, info_ptr->height,
        info_ptr->bit_depth, info_ptr->color_type, info_ptr->interlace_type,
        info_ptr->compression_type, info_ptr->filter_type);
 
@@ -806,13 +837,14 @@ png_get_IHDR(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_oFFs_SUPPORTED
 png_uint_32 PNGAPI
-png_get_oFFs(png_const_structp png_ptr, png_const_infop info_ptr,
+png_get_oFFs(png_const_structrp png_ptr, png_const_inforp info_ptr,
     png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type)
 {
    png_debug1(1, "in %s retrieval function", "oFFs");
 
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs)
-       && offset_x != NULL && offset_y != NULL && unit_type != NULL)
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_oFFs) != 0 &&
+       offset_x != NULL && offset_y != NULL && unit_type != NULL)
    {
       *offset_x = info_ptr->x_offset;
       *offset_y = info_ptr->y_offset;
@@ -826,14 +858,15 @@ png_get_oFFs(png_const_structp png_ptr, png_const_infop info_ptr,
 
 #ifdef PNG_pCAL_SUPPORTED
 png_uint_32 PNGAPI
-png_get_pCAL(png_const_structp png_ptr, png_const_infop info_ptr,
+png_get_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,
     png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type, int *nparams,
     png_charp *units, png_charpp *params)
 {
    png_debug1(1, "in %s retrieval function", "pCAL");
 
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL)
-       && purpose != NULL && X0 != NULL && X1 != NULL && type != NULL &&
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_pCAL) != 0 &&
+       purpose != NULL && X0 != NULL && X1 != NULL && type != NULL &&
        nparams != NULL && units != NULL && params != NULL)
    {
       *purpose = info_ptr->pcal_purpose;
@@ -852,16 +885,20 @@ png_get_pCAL(png_const_structp png_ptr, png_const_infop info_ptr,
 
 #ifdef PNG_sCAL_SUPPORTED
 #  ifdef PNG_FIXED_POINT_SUPPORTED
-#    ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
+#    if defined(PNG_FLOATING_ARITHMETIC_SUPPORTED) || \
+         defined(PNG_FLOATING_POINT_SUPPORTED)
 png_uint_32 PNGAPI
-png_get_sCAL_fixed(png_structp png_ptr, png_const_infop info_ptr,
+png_get_sCAL_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
     int *unit, png_fixed_point *width, png_fixed_point *height)
 {
    if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_sCAL))
+       (info_ptr->valid & PNG_INFO_sCAL) != 0)
    {
       *unit = info_ptr->scal_unit;
-      /*TODO: make this work without FP support */
+      /*TODO: make this work without FP support; the API is currently eliminated
+       * if neither floating point APIs nor internal floating point arithmetic
+       * are enabled.
+       */
       *width = png_fixed(png_ptr, atof(info_ptr->scal_s_width), "sCAL width");
       *height = png_fixed(png_ptr, atof(info_ptr->scal_s_height),
          "sCAL height");
@@ -874,11 +911,11 @@ png_get_sCAL_fixed(png_structp png_ptr, png_const_infop info_ptr,
 #  endif /* FIXED_POINT */
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_sCAL(png_const_structp png_ptr, png_const_infop info_ptr,
+png_get_sCAL(png_const_structrp png_ptr, png_const_inforp info_ptr,
     int *unit, double *width, double *height)
 {
    if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_sCAL))
+       (info_ptr->valid & PNG_INFO_sCAL) != 0)
    {
       *unit = info_ptr->scal_unit;
       *width = atof(info_ptr->scal_s_width);
@@ -890,11 +927,11 @@ png_get_sCAL(png_const_structp png_ptr, png_const_infop info_ptr,
 }
 #  endif /* FLOATING POINT */
 png_uint_32 PNGAPI
-png_get_sCAL_s(png_const_structp png_ptr, png_const_infop info_ptr,
+png_get_sCAL_s(png_const_structrp png_ptr, png_const_inforp info_ptr,
     int *unit, png_charpp width, png_charpp height)
 {
    if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_sCAL))
+       (info_ptr->valid & PNG_INFO_sCAL) != 0)
    {
       *unit = info_ptr->scal_unit;
       *width = info_ptr->scal_s_width;
@@ -908,7 +945,7 @@ png_get_sCAL_s(png_const_structp png_ptr, png_const_infop info_ptr,
 
 #ifdef PNG_pHYs_SUPPORTED
 png_uint_32 PNGAPI
-png_get_pHYs(png_const_structp png_ptr, png_const_infop info_ptr,
+png_get_pHYs(png_const_structrp png_ptr, png_const_inforp info_ptr,
     png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
 {
    png_uint_32 retval = 0;
@@ -916,7 +953,7 @@ png_get_pHYs(png_const_structp png_ptr, png_const_infop info_ptr,
    png_debug1(1, "in %s retrieval function", "pHYs");
 
    if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_pHYs))
+       (info_ptr->valid & PNG_INFO_pHYs) != 0)
    {
       if (res_x != NULL)
       {
@@ -942,13 +979,13 @@ png_get_pHYs(png_const_structp png_ptr, png_const_infop info_ptr,
 #endif /* pHYs */
 
 png_uint_32 PNGAPI
-png_get_PLTE(png_const_structp png_ptr, png_const_infop info_ptr,
+png_get_PLTE(png_const_structrp png_ptr, png_inforp info_ptr,
     png_colorp *palette, int *num_palette)
 {
    png_debug1(1, "in %s retrieval function", "PLTE");
 
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_PLTE)
-       && palette != NULL)
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_PLTE) != 0 && palette != NULL)
    {
       *palette = info_ptr->palette;
       *num_palette = info_ptr->num_palette;
@@ -961,13 +998,13 @@ png_get_PLTE(png_const_structp png_ptr, png_const_infop info_ptr,
 
 #ifdef PNG_sBIT_SUPPORTED
 png_uint_32 PNGAPI
-png_get_sBIT(png_const_structp png_ptr, png_infop info_ptr,
+png_get_sBIT(png_const_structrp png_ptr, png_inforp info_ptr,
     png_color_8p *sig_bit)
 {
    png_debug1(1, "in %s retrieval function", "sBIT");
 
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT)
-       && sig_bit != NULL)
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_sBIT) != 0 && sig_bit != NULL)
    {
       *sig_bit = &(info_ptr->sig_bit);
       return (PNG_INFO_sBIT);
@@ -978,8 +1015,8 @@ png_get_sBIT(png_const_structp png_ptr, png_infop info_ptr,
 #endif
 
 #ifdef PNG_TEXT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_text(png_const_structp png_ptr, png_const_infop info_ptr,
+int PNGAPI
+png_get_text(png_const_structrp png_ptr, png_inforp info_ptr,
     png_textp *text_ptr, int *num_text)
 {
    if (png_ptr != NULL && info_ptr != NULL && info_ptr->num_text > 0)
@@ -993,7 +1030,7 @@ png_get_text(png_const_structp png_ptr, png_const_infop info_ptr,
       if (num_text != NULL)
          *num_text = info_ptr->num_text;
 
-      return ((png_uint_32)info_ptr->num_text);
+      return info_ptr->num_text;
    }
 
    if (num_text != NULL)
@@ -1005,12 +1042,13 @@ png_get_text(png_const_structp png_ptr, png_const_infop info_ptr,
 
 #ifdef PNG_tIME_SUPPORTED
 png_uint_32 PNGAPI
-png_get_tIME(png_const_structp png_ptr, png_infop info_ptr, png_timep *mod_time)
+png_get_tIME(png_const_structrp png_ptr, png_inforp info_ptr,
+    png_timep *mod_time)
 {
    png_debug1(1, "in %s retrieval function", "tIME");
 
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME)
-       && mod_time != NULL)
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_tIME) != 0 && mod_time != NULL)
    {
       *mod_time = &(info_ptr->mod_time);
       return (PNG_INFO_tIME);
@@ -1022,11 +1060,12 @@ png_get_tIME(png_const_structp png_ptr, png_infop info_ptr, png_timep *mod_time)
 
 #ifdef PNG_tRNS_SUPPORTED
 png_uint_32 PNGAPI
-png_get_tRNS(png_const_structp png_ptr, png_infop info_ptr,
+png_get_tRNS(png_const_structrp png_ptr, png_inforp info_ptr,
     png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color)
 {
    png_uint_32 retval = 0;
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_tRNS) != 0)
    {
       png_debug1(1, "in %s retrieval function", "tRNS");
 
@@ -1065,9 +1104,9 @@ png_get_tRNS(png_const_structp png_ptr, png_infop info_ptr,
 }
 #endif
 
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
+#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
 int PNGAPI
-png_get_unknown_chunks(png_const_structp png_ptr, png_const_infop info_ptr,
+png_get_unknown_chunks(png_const_structrp png_ptr, png_inforp info_ptr,
     png_unknown_chunkpp unknowns)
 {
    if (png_ptr != NULL && info_ptr != NULL && unknowns != NULL)
@@ -1082,7 +1121,7 @@ png_get_unknown_chunks(png_const_structp png_ptr, png_const_infop info_ptr,
 
 #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
 png_byte PNGAPI
-png_get_rgb_to_gray_status (png_const_structp png_ptr)
+png_get_rgb_to_gray_status (png_const_structrp png_ptr)
 {
    return (png_byte)(png_ptr ? png_ptr->rgb_to_gray_status : 0);
 }
@@ -1090,69 +1129,79 @@ png_get_rgb_to_gray_status (png_const_structp png_ptr)
 
 #ifdef PNG_USER_CHUNKS_SUPPORTED
 png_voidp PNGAPI
-png_get_user_chunk_ptr(png_const_structp png_ptr)
+png_get_user_chunk_ptr(png_const_structrp png_ptr)
 {
    return (png_ptr ? png_ptr->user_chunk_ptr : NULL);
 }
 #endif
 
 png_size_t PNGAPI
-png_get_compression_buffer_size(png_const_structp png_ptr)
+png_get_compression_buffer_size(png_const_structrp png_ptr)
 {
-   return (png_ptr ? png_ptr->zbuf_size : 0);
+   if (png_ptr == NULL)
+      return 0;
+
+#ifdef PNG_WRITE_SUPPORTED
+   if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
+#endif
+   {
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
+      return png_ptr->IDAT_read_size;
+#else
+      return PNG_IDAT_READ_SIZE;
+#endif
+   }
+
+#ifdef PNG_WRITE_SUPPORTED
+   else
+      return png_ptr->zbuffer_size;
+#endif
 }
 
 #ifdef PNG_SET_USER_LIMITS_SUPPORTED
 /* These functions were added to libpng 1.2.6 and were enabled
  * by default in libpng-1.4.0 */
 png_uint_32 PNGAPI
-png_get_user_width_max (png_const_structp png_ptr)
+png_get_user_width_max (png_const_structrp png_ptr)
 {
    return (png_ptr ? png_ptr->user_width_max : 0);
 }
 
 png_uint_32 PNGAPI
-png_get_user_height_max (png_const_structp png_ptr)
+png_get_user_height_max (png_const_structrp png_ptr)
 {
    return (png_ptr ? png_ptr->user_height_max : 0);
 }
 
 /* This function was added to libpng 1.4.0 */
 png_uint_32 PNGAPI
-png_get_chunk_cache_max (png_const_structp png_ptr)
+png_get_chunk_cache_max (png_const_structrp png_ptr)
 {
    return (png_ptr ? png_ptr->user_chunk_cache_max : 0);
 }
 
 /* This function was added to libpng 1.4.1 */
 png_alloc_size_t PNGAPI
-png_get_chunk_malloc_max (png_const_structp png_ptr)
+png_get_chunk_malloc_max (png_const_structrp png_ptr)
 {
    return (png_ptr ? png_ptr->user_chunk_malloc_max : 0);
 }
-#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
+#endif /* SET_USER_LIMITS */
 
 /* These functions were added to libpng 1.4.0 */
 #ifdef PNG_IO_STATE_SUPPORTED
 png_uint_32 PNGAPI
-png_get_io_state (png_structp png_ptr)
+png_get_io_state (png_const_structrp png_ptr)
 {
    return png_ptr->io_state;
 }
 
 png_uint_32 PNGAPI
-png_get_io_chunk_type (png_const_structp png_ptr)
+png_get_io_chunk_type (png_const_structrp png_ptr)
 {
    return png_ptr->chunk_name;
 }
-
-png_const_bytep PNGAPI
-png_get_io_chunk_name (png_structp png_ptr)
-{
-   PNG_CSTRING_FROM_CHUNK(png_ptr->io_chunk_string, png_ptr->chunk_name);
-   return png_ptr->io_chunk_string;
-}
-#endif /* ?PNG_IO_STATE_SUPPORTED */
+#endif /* IO_STATE */
 
 #ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
 #  ifdef PNG_GET_PALETTE_MAX_SUPPORTED
@@ -1167,4 +1216,4 @@ png_get_palette_max(png_const_structp png_ptr, png_const_infop info_ptr)
 #  endif
 #endif
 
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+#endif /* READ || WRITE */
diff --git a/drivers/png/pnginfo.h b/drivers/png/pnginfo.h
index c5b68c1e84..361ed8be70 100644
--- a/drivers/png/pnginfo.h
+++ b/drivers/png/pnginfo.h
@@ -1,8 +1,8 @@
 
 /* pnginfo.h - header file for PNG reference library
  *
- * Last changed in libpng 1.5.0 [January 6, 2011]
- * Copyright (c) 1998-2002,2004,2006-2011 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.1 [March 28, 2013]
+ * Copyright (c) 1998-2002,2004,2006-2013 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -54,7 +54,7 @@
 
 struct png_info_def
 {
-   /* the following are necessary for every PNG file */
+   /* The following are necessary for every PNG file */
    png_uint_32 width;  /* width of image in pixels (from IHDR) */
    png_uint_32 height; /* height of image in pixels (from IHDR) */
    png_uint_32 valid;  /* valid chunk data (see PNG_INFO_ below) */
@@ -69,11 +69,17 @@ struct png_info_def
    png_byte filter_type;    /* must be PNG_FILTER_TYPE_BASE (from IHDR) */
    png_byte interlace_type; /* One of PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
 
-   /* The following is informational only on read, and not used on writes. */
+   /* The following are set by png_set_IHDR, called from the application on
+    * write, but the are never actually used by the write code.
+    */
    png_byte channels;       /* number of data channels per pixel (1, 2, 3, 4) */
    png_byte pixel_depth;    /* number of bits per pixel */
    png_byte spare_byte;     /* to align the data, and for future use */
+
+#ifdef PNG_READ_SUPPORTED
+   /* This is never set during write */
    png_byte signature[8];   /* magic bytes read by libpng from start of file */
+#endif
 
    /* The rest of the data is optional.  If you are reading, check the
     * valid field to see if the information in these are valid.  If you
@@ -81,18 +87,25 @@ struct png_info_def
     * and initialize the appropriate fields below.
     */
 
-#if defined(PNG_gAMA_SUPPORTED)
-   /* The gAMA chunk describes the gamma characteristics of the system
-    * on which the image was created, normally in the range [1.0, 2.5].
-    * Data is valid if (valid & PNG_INFO_gAMA) is non-zero.
+#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)
+   /* png_colorspace only contains 'flags' if neither GAMMA or COLORSPACE are
+    * defined.  When COLORSPACE is switched on all the colorspace-defining
+    * chunks should be enabled, when GAMMA is switched on all the gamma-defining
+    * chunks should be enabled.  If this is not done it becomes possible to read
+    * inconsistent PNG files and assign a probably incorrect interpretation to
+    * the information.  (In other words, by carefully choosing which chunks to
+    * recognize the system configuration can select an interpretation for PNG
+    * files containing ambiguous data and this will result in inconsistent
+    * behavior between different libpng builds!)
     */
-   png_fixed_point gamma;
+   png_colorspace colorspace;
 #endif
 
-#ifdef PNG_sRGB_SUPPORTED
-    /* GR-P, 0.96a */
-    /* Data valid if (valid & PNG_INFO_sRGB) non-zero. */
-   png_byte srgb_intent; /* sRGB rendering intent [0, 1, 2, or 3] */
+#ifdef PNG_iCCP_SUPPORTED
+   /* iCCP chunk data. */
+   png_charp iccp_name;     /* profile name */
+   png_bytep iccp_profile;  /* International Color Consortium profile data */
+   png_uint_32 iccp_proflen;  /* ICC profile data length */
 #endif
 
 #ifdef PNG_TEXT_SUPPORTED
@@ -107,7 +120,7 @@ struct png_info_def
    int num_text; /* number of comments read or comments to write */
    int max_text; /* current size of text array */
    png_textp text; /* array of comments read or comments to write */
-#endif /* PNG_TEXT_SUPPORTED */
+#endif /* TEXT */
 
 #ifdef PNG_tIME_SUPPORTED
    /* The tIME chunk holds the last time the displayed image data was
@@ -182,23 +195,6 @@ defined(PNG_READ_BACKGROUND_SUPPORTED)
    png_uint_16p hist;
 #endif
 
-#ifdef PNG_cHRM_SUPPORTED
-   /* The cHRM chunk describes the CIE color characteristics of the monitor
-    * on which the PNG was created.  This data allows the viewer to do gamut
-    * mapping of the input image to ensure that the viewer sees the same
-    * colors in the image as the creator.  Values are in the range
-    * [0.0, 0.8].  Data valid if (valid & PNG_INFO_cHRM) non-zero.
-    */
-   png_fixed_point x_white;
-   png_fixed_point y_white;
-   png_fixed_point x_red;
-   png_fixed_point y_red;
-   png_fixed_point x_green;
-   png_fixed_point y_green;
-   png_fixed_point x_blue;
-   png_fixed_point y_blue;
-#endif
-
 #ifdef PNG_pCAL_SUPPORTED
    /* The pCAL chunk describes a transformation between the stored pixel
     * values and original physical data values used to create the image.
@@ -223,25 +219,20 @@ defined(PNG_READ_BACKGROUND_SUPPORTED)
 /* New members added in libpng-1.0.6 */
    png_uint_32 free_me;     /* flags items libpng is responsible for freeing */
 
-#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) || \
- defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
+#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
    /* Storage for unknown chunks that the library doesn't recognize. */
    png_unknown_chunkp unknown_chunks;
-   int unknown_chunks_num;
-#endif
 
-#ifdef PNG_iCCP_SUPPORTED
-   /* iCCP chunk data. */
-   png_charp iccp_name;     /* profile name */
-   png_bytep iccp_profile;  /* International Color Consortium profile data */
-   png_uint_32 iccp_proflen;  /* ICC profile data length */
-   png_byte iccp_compression; /* Always zero */
+   /* The type of this field is limited by the type of
+    * png_struct::user_chunk_cache_max, else overflow can occur.
+    */
+   int                unknown_chunks_num;
 #endif
 
 #ifdef PNG_sPLT_SUPPORTED
    /* Data on sPLT chunks (there may be more than one). */
    png_sPLT_tp splt_palettes;
-   int splt_palettes_num;
+   int         splt_palettes_num; /* Match type returned by png_get API */
 #endif
 
 #ifdef PNG_sCAL_SUPPORTED
diff --git a/drivers/png/pnglibconf.h b/drivers/png/pnglibconf.h
index 1df6146f29..3e70aa1170 100644
--- a/drivers/png/pnglibconf.h
+++ b/drivers/png/pnglibconf.h
@@ -1,9 +1,10 @@
-/* 1.5.27 STANDARD API DEFINITION */
+/* libpng 1.6.23 STANDARD API DEFINITION */
+
 /* pnglibconf.h - library build configuration */
 
-/* libpng version 1.5.27 - May 26, 2016 */
+/* Libpng version 1.6.23 - June 9, 2016 */
 
-/* Copyright (c) 2011-2015 Glenn Randers-Pehrson */
+/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */
 
 /* This code is released under the libpng license. */
 /* For conditions of distribution and use, see the disclaimer */
@@ -20,9 +21,11 @@
 /*#undef PNG_ARM_NEON_API_SUPPORTED*/
 /*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/
 #define PNG_BENIGN_ERRORS_SUPPORTED
+#define PNG_BENIGN_READ_ERRORS_SUPPORTED
+/*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/
 #define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
 #define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_CHECK_cHRM_SUPPORTED
+#define PNG_COLORSPACE_SUPPORTED
 #define PNG_CONSOLE_IO_SUPPORTED
 #define PNG_CONVERT_tIME_SUPPORTED
 #define PNG_EASY_ACCESS_SUPPORTED
@@ -31,6 +34,9 @@
 #define PNG_FIXED_POINT_SUPPORTED
 #define PNG_FLOATING_ARITHMETIC_SUPPORTED
 #define PNG_FLOATING_POINT_SUPPORTED
+#define PNG_FORMAT_AFIRST_SUPPORTED
+#define PNG_FORMAT_BGR_SUPPORTED
+#define PNG_GAMMA_SUPPORTED
 #define PNG_GET_PALETTE_MAX_SUPPORTED
 #define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
 #define PNG_INCH_CONVERSIONS_SUPPORTED
@@ -91,13 +97,22 @@
 #define PNG_READ_tIME_SUPPORTED
 #define PNG_READ_tRNS_SUPPORTED
 #define PNG_READ_zTXt_SUPPORTED
-/*#undef PNG_SAFE_LIMITS_SUPPORTED*/
 #define PNG_SAVE_INT_32_SUPPORTED
+#define PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
 #define PNG_SEQUENTIAL_READ_SUPPORTED
 #define PNG_SETJMP_SUPPORTED
-/*#undef PNG_SET_OPTION_SUPPORTED*/
+#define PNG_SET_OPTION_SUPPORTED
+#define PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
 #define PNG_SET_USER_LIMITS_SUPPORTED
+#define PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
+#define PNG_SIMPLIFIED_READ_BGR_SUPPORTED
+#define PNG_SIMPLIFIED_READ_SUPPORTED
+#define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
+#define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
+#define PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
+#define PNG_SIMPLIFIED_WRITE_SUPPORTED
 #define PNG_STDIO_SUPPORTED
+#define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
 #define PNG_TEXT_SUPPORTED
 #define PNG_TIME_RFC1123_SUPPORTED
 #define PNG_UNKNOWN_CHUNKS_SUPPORTED
@@ -173,15 +188,28 @@
 #define PNG_API_RULE 0
 #define PNG_DEFAULT_READ_MACROS 1
 #define PNG_GAMMA_THRESHOLD_FIXED 5000
+#define PNG_IDAT_READ_SIZE PNG_ZBUF_SIZE
+#define PNG_INFLATE_BUF_SIZE 1024
+#define PNG_LINKAGE_API extern
+#define PNG_LINKAGE_CALLBACK extern
+#define PNG_LINKAGE_DATA extern
+#define PNG_LINKAGE_FUNCTION extern
 #define PNG_MAX_GAMMA_8 11
 #define PNG_QUANTIZE_BLUE_BITS 5
 #define PNG_QUANTIZE_GREEN_BITS 5
 #define PNG_QUANTIZE_RED_BITS 5
+#define PNG_TEXT_Z_DEFAULT_COMPRESSION (-1)
+#define PNG_TEXT_Z_DEFAULT_STRATEGY 0
 #define PNG_USER_CHUNK_CACHE_MAX 1000
 #define PNG_USER_CHUNK_MALLOC_MAX 8000000
 #define PNG_USER_HEIGHT_MAX 1000000
 #define PNG_USER_WIDTH_MAX 1000000
 #define PNG_ZBUF_SIZE 8192
+#define PNG_ZLIB_VERNUM 0 /* unknown */
+#define PNG_Z_DEFAULT_COMPRESSION (-1)
+#define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
+#define PNG_Z_DEFAULT_STRATEGY 1
 #define PNG_sCAL_PRECISION 5
+#define PNG_sRGB_PROFILE_CHECKS 2
 /* end of settings */
 #endif /* PNGLCONF_H */
diff --git a/drivers/png/pngmem.c b/drivers/png/pngmem.c
index ae74dcace0..7bcfd00507 100644
--- a/drivers/png/pngmem.c
+++ b/drivers/png/pngmem.c
@@ -1,8 +1,8 @@
 
 /* pngmem.c - stub functions for memory allocation
  *
- * Last changed in libpng 1.5.13 [September 27, 2012]
- * Copyright (c) 1998-2002,2004,2006-2012 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.15 [November 20, 2014]
+ * Copyright (c) 1998-2002,2004,2006-2014 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -20,627 +20,244 @@
 #include "pngpriv.h"
 
 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-
-/* Borland DOS special memory handler */
-#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
-/* If you change this, be sure to change the one in png.h also */
-
-/* Allocate memory for a png_struct.  The malloc and memset can be replaced
-   by a single call to calloc() if this is thought to improve performance. */
-PNG_FUNCTION(png_voidp /* PRIVATE */,
-png_create_struct,(int type),PNG_ALLOCATED)
-{
-#  ifdef PNG_USER_MEM_SUPPORTED
-   return (png_create_struct_2(type, NULL, NULL));
-}
-
-/* Alternate version of png_create_struct, for use with user-defined malloc. */
-PNG_FUNCTION(png_voidp /* PRIVATE */,
-png_create_struct_2,(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr),
-   PNG_ALLOCATED)
-{
-#  endif /* PNG_USER_MEM_SUPPORTED */
-   png_size_t size;
-   png_voidp struct_ptr;
-
-   if (type == PNG_STRUCT_INFO)
-      size = png_sizeof(png_info);
-
-   else if (type == PNG_STRUCT_PNG)
-      size = png_sizeof(png_struct);
-
-   else
-      return (png_get_copyright(NULL));
-
-#  ifdef PNG_USER_MEM_SUPPORTED
-   if (malloc_fn != NULL)
-   {
-      png_struct dummy_struct;
-      png_memset(&dummy_struct, 0, sizeof dummy_struct);
-      dummy_struct.mem_ptr=mem_ptr;
-      struct_ptr = (*(malloc_fn))(&dummy_struct, (png_alloc_size_t)size);
-   }
-
-   else
-#  endif /* PNG_USER_MEM_SUPPORTED */
-   struct_ptr = (png_voidp)farmalloc(size);
-   if (struct_ptr != NULL)
-      png_memset(struct_ptr, 0, size);
-
-   return (struct_ptr);
-}
-
-/* Free memory allocated by a png_create_struct() call */
+/* Free a png_struct */
 void /* PRIVATE */
-png_destroy_struct(png_voidp struct_ptr)
+png_destroy_png_struct(png_structrp png_ptr)
 {
-#  ifdef PNG_USER_MEM_SUPPORTED
-   png_destroy_struct_2(struct_ptr, NULL, NULL);
-}
-
-/* Free memory allocated by a png_create_struct() call */
-void /* PRIVATE */
-png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
-    png_voidp mem_ptr)
-{
-#  endif
-   if (struct_ptr != NULL)
+   if (png_ptr != NULL)
    {
-#  ifdef PNG_USER_MEM_SUPPORTED
-      if (free_fn != NULL)
-      {
-         png_struct dummy_struct;
-         png_memset(&dummy_struct, 0, sizeof dummy_struct);
-         dummy_struct.mem_ptr=mem_ptr;
-         (*(free_fn))(&dummy_struct, struct_ptr);
-         return;
-      }
-
-#  endif /* PNG_USER_MEM_SUPPORTED */
-      farfree (struct_ptr);
+      /* png_free might call png_error and may certainly call
+       * png_get_mem_ptr, so fake a temporary png_struct to support this.
+       */
+      png_struct dummy_struct = *png_ptr;
+      memset(png_ptr, 0, (sizeof *png_ptr));
+      png_free(&dummy_struct, png_ptr);
+
+#     ifdef PNG_SETJMP_SUPPORTED
+         /* We may have a jmp_buf left to deallocate. */
+         png_free_jmpbuf(&dummy_struct);
+#     endif
    }
 }
 
 /* Allocate memory.  For reasonable files, size should never exceed
  * 64K.  However, zlib may allocate more than 64K if you don't tell
- * it not to.  See zconf.h and png.h for more information. zlib does
+ * it not to.  See zconf.h and png.h for more information.  zlib does
  * need to allocate exactly 64K, so whatever you call here must
  * have the ability to do that.
- *
- * Borland seems to have a problem in DOS mode for exactly 64K.
- * It gives you a segment with an offset of 8 (perhaps to store its
- * memory stuff).  zlib doesn't like this at all, so we have to
- * detect and deal with it.  This code should not be needed in
- * Windows or OS/2 modes, and only in 16 bit mode.  This code has
- * been updated by Alexander Lehmann for version 0.89 to waste less
- * memory.
- *
- * Note that we can't use png_size_t for the "size" declaration,
- * since on some systems a png_size_t is a 16-bit quantity, and as a
- * result, we would be truncating potentially larger memory requests
- * (which should cause a fatal error) and introducing major problems.
  */
 PNG_FUNCTION(png_voidp,PNGAPI
-png_calloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
+png_calloc,(png_const_structrp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
 {
    png_voidp ret;
 
-   ret = (png_malloc(png_ptr, size));
+   ret = png_malloc(png_ptr, size);
 
    if (ret != NULL)
-      png_memset(ret,0,(png_size_t)size);
-
-   return (ret);
-}
-
-PNG_FUNCTION(png_voidp,PNGAPI
-png_malloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-{
-   png_voidp ret;
-
-   if (png_ptr == NULL || size == 0)
-      return (NULL);
-
-#  ifdef PNG_USER_MEM_SUPPORTED
-   if (png_ptr->malloc_fn != NULL)
-      ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, size));
-
-   else
-      ret = (png_malloc_default(png_ptr, size));
-
-   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-       png_error(png_ptr, "Out of memory");
+      memset(ret, 0, size);
 
-   return (ret);
+   return ret;
 }
 
-PNG_FUNCTION(png_voidp,PNGAPI
-png_malloc_default,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
+/* png_malloc_base, an internal function added at libpng 1.6.0, does the work of
+ * allocating memory, taking into account limits and PNG_USER_MEM_SUPPORTED.
+ * Checking and error handling must happen outside this routine; it returns NULL
+ * if the allocation cannot be done (for any reason.)
+ */
+PNG_FUNCTION(png_voidp /* PRIVATE */,
+png_malloc_base,(png_const_structrp png_ptr, png_alloc_size_t size),
+   PNG_ALLOCATED)
 {
-   png_voidp ret;
-#  endif /* PNG_USER_MEM_SUPPORTED */
-
-   if (png_ptr == NULL || size == 0)
-      return (NULL);
-
-#  ifdef PNG_MAX_MALLOC_64K
-   if (size > (png_uint_32)65536L)
-   {
-      png_warning(png_ptr, "Cannot Allocate > 64K");
-      ret = NULL;
-   }
-
-   else
-#  endif
-
-   if (size != (size_t)size)
-      ret = NULL;
-
-   else if (size == (png_uint_32)65536L)
+   /* Moved to png_malloc_base from png_malloc_default in 1.6.0; the DOS
+    * allocators have also been removed in 1.6.0, so any 16-bit system now has
+    * to implement a user memory handler.  This checks to be sure it isn't
+    * called with big numbers.
+    */
+#ifndef PNG_USER_MEM_SUPPORTED
+   PNG_UNUSED(png_ptr)
+#endif
+
+   /* Some compilers complain that this is always true.  However, it
+    * can be false when integer overflow happens.
+    */
+   if (size > 0 && size <= PNG_SIZE_MAX
+#     ifdef PNG_MAX_MALLOC_64K
+         && size <= 65536U
+#     endif
+      )
    {
-      if (png_ptr->offset_table == NULL)
-      {
-         /* Try to see if we need to do any of this fancy stuff */
-         ret = farmalloc(size);
-         if (ret == NULL || ((png_size_t)ret & 0xffff))
-         {
-            int num_blocks;
-            png_uint_32 total_size;
-            png_bytep table;
-            int i, mem_level, window_bits;
-            png_byte huge * hptr;
-            int window_bits
-
-            if (ret != NULL)
-            {
-               farfree(ret);
-               ret = NULL;
-            }
-
-            window_bits =
-                png_ptr->zlib_window_bits >= png_ptr->zlib_text_window_bits ?
-                png_ptr->zlib_window_bits : png_ptr->zlib_text_window_bits;
-
-            if (window_bits > 14)
-               num_blocks = (int)(1 << (window_bits - 14));
-
-            else
-               num_blocks = 1;
-
-            mem_level =
-                png_ptr->zlib_mem_level >= png_ptr->zlib_text_mem_level ?
-                png_ptr->zlib_mem_level : png_ptr->zlib_text_mem_level;
-
-            if (mem_level >= 7)
-               num_blocks += (int)(1 << (mem_level - 7));
-
-            else
-               num_blocks++;
-
-            total_size = ((png_uint_32)65536L) * (png_uint_32)num_blocks+16;
-
-            table = farmalloc(total_size);
-
-            if (table == NULL)
-            {
-#  ifndef PNG_USER_MEM_SUPPORTED
-               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-                  png_error(png_ptr, "Out Of Memory"); /* Note "O", "M" */
-
-               else
-                  png_warning(png_ptr, "Out Of Memory");
-#  endif
-               return (NULL);
-            }
-
-            if ((png_size_t)table & 0xfff0)
-            {
-#  ifndef PNG_USER_MEM_SUPPORTED
-               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-                  png_error(png_ptr,
-                    "Farmalloc didn't return normalized pointer");
-
-               else
-                  png_warning(png_ptr,
-                    "Farmalloc didn't return normalized pointer");
-#  endif
-               return (NULL);
-            }
-
-            png_ptr->offset_table = table;
-            png_ptr->offset_table_ptr = farmalloc(num_blocks *
-               png_sizeof(png_bytep));
-
-            if (png_ptr->offset_table_ptr == NULL)
-            {
-#  ifndef PNG_USER_MEM_SUPPORTED
-               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-                  png_error(png_ptr, "Out Of memory"); /* Note "O", "m" */
-
-               else
-                  png_warning(png_ptr, "Out Of memory");
-#  endif
-               return (NULL);
-            }
-
-            hptr = (png_byte huge *)table;
-            if ((png_size_t)hptr & 0xf)
-            {
-               hptr = (png_byte huge *)((long)(hptr) & 0xfffffff0L);
-               hptr = hptr + 16L;  /* "hptr += 16L" fails on Turbo C++ 3.0 */
-            }
-
-            for (i = 0; i < num_blocks; i++)
-            {
-               png_ptr->offset_table_ptr[i] = (png_bytep)hptr;
-               hptr = hptr + (png_uint_32)65536L;  /* "+=" fails on TC++3.0 */
-            }
-
-            png_ptr->offset_table_number = num_blocks;
-            png_ptr->offset_table_count = 0;
-            png_ptr->offset_table_count_free = 0;
-         }
-      }
-
-      if (png_ptr->offset_table_count >= png_ptr->offset_table_number)
-      {
-#  ifndef PNG_USER_MEM_SUPPORTED
-         if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-            png_error(png_ptr, "Out of Memory"); /* Note "O" and "M" */
-
-         else
-            png_warning(png_ptr, "Out of Memory");
-#  endif
-         return (NULL);
-      }
-
-      ret = png_ptr->offset_table_ptr[png_ptr->offset_table_count++];
-   }
-
-   else
-      ret = farmalloc(size);
-
-#  ifndef PNG_USER_MEM_SUPPORTED
-   if (ret == NULL)
-   {
-      if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-         png_error(png_ptr, "Out of memory"); /* Note "o" and "m" */
+#ifdef PNG_USER_MEM_SUPPORTED
+      if (png_ptr != NULL && png_ptr->malloc_fn != NULL)
+         return png_ptr->malloc_fn(png_constcast(png_structrp,png_ptr), size);
 
       else
-         png_warning(png_ptr, "Out of memory"); /* Note "o" and "m" */
-   }
-#  endif
-
-   return (ret);
-}
-
-/* Free a pointer allocated by png_malloc().  In the default
- * configuration, png_ptr is not used, but is passed in case it
- * is needed.  If ptr is NULL, return without taking any action.
- */
-void PNGAPI
-png_free(png_structp png_ptr, png_voidp ptr)
-{
-   if (png_ptr == NULL || ptr == NULL)
-      return;
-
-#  ifdef PNG_USER_MEM_SUPPORTED
-   if (png_ptr->free_fn != NULL)
-   {
-      (*(png_ptr->free_fn))(png_ptr, ptr);
-      return;
+#endif
+         return malloc((size_t)size); /* checked for truncation above */
    }
 
    else
-      png_free_default(png_ptr, ptr);
+      return NULL;
 }
 
-void PNGAPI
-png_free_default(png_structp png_ptr, png_voidp ptr)
+#if defined(PNG_TEXT_SUPPORTED) || defined(PNG_sPLT_SUPPORTED) ||\
+   defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED)
+/* This is really here only to work round a spurious warning in GCC 4.6 and 4.7
+ * that arises because of the checks in png_realloc_array that are repeated in
+ * png_malloc_array.
+ */
+static png_voidp
+png_malloc_array_checked(png_const_structrp png_ptr, int nelements,
+   size_t element_size)
 {
-#  endif /* PNG_USER_MEM_SUPPORTED */
-
-   if (png_ptr == NULL || ptr == NULL)
-      return;
+   png_alloc_size_t req = nelements; /* known to be > 0 */
 
-   if (png_ptr->offset_table != NULL)
-   {
-      int i;
+   if (req <= PNG_SIZE_MAX/element_size)
+      return png_malloc_base(png_ptr, req * element_size);
 
-      for (i = 0; i < png_ptr->offset_table_count; i++)
-      {
-         if (ptr == png_ptr->offset_table_ptr[i])
-         {
-            ptr = NULL;
-            png_ptr->offset_table_count_free++;
-            break;
-         }
-      }
-      if (png_ptr->offset_table_count_free == png_ptr->offset_table_count)
-      {
-         farfree(png_ptr->offset_table);
-         farfree(png_ptr->offset_table_ptr);
-         png_ptr->offset_table = NULL;
-         png_ptr->offset_table_ptr = NULL;
-      }
-   }
-
-   if (ptr != NULL)
-      farfree(ptr);
+   /* The failure case when the request is too large */
+   return NULL;
 }
 
-#else /* Not the Borland DOS special memory handler */
-
-/* Allocate memory for a png_struct or a png_info.  The malloc and
-   memset can be replaced by a single call to calloc() if this is thought
-   to improve performance noticably. */
 PNG_FUNCTION(png_voidp /* PRIVATE */,
-png_create_struct,(int type),PNG_ALLOCATED)
+png_malloc_array,(png_const_structrp png_ptr, int nelements,
+   size_t element_size),PNG_ALLOCATED)
 {
-#  ifdef PNG_USER_MEM_SUPPORTED
-   return (png_create_struct_2(type, NULL, NULL));
+   if (nelements <= 0 || element_size == 0)
+      png_error(png_ptr, "internal error: array alloc");
+
+   return png_malloc_array_checked(png_ptr, nelements, element_size);
 }
 
-/* Allocate memory for a png_struct or a png_info.  The malloc and
-   memset can be replaced by a single call to calloc() if this is thought
-   to improve performance noticably. */
 PNG_FUNCTION(png_voidp /* PRIVATE */,
-png_create_struct_2,(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr),
-   PNG_ALLOCATED)
+png_realloc_array,(png_const_structrp png_ptr, png_const_voidp old_array,
+   int old_elements, int add_elements, size_t element_size),PNG_ALLOCATED)
 {
-#  endif /* PNG_USER_MEM_SUPPORTED */
-   png_size_t size;
-   png_voidp struct_ptr;
-
-   if (type == PNG_STRUCT_INFO)
-      size = png_sizeof(png_info);
-
-   else if (type == PNG_STRUCT_PNG)
-      size = png_sizeof(png_struct);
-
-   else
-      return (NULL);
-
-#  ifdef PNG_USER_MEM_SUPPORTED
-   if (malloc_fn != NULL)
+   /* These are internal errors: */
+   if (add_elements <= 0 || element_size == 0 || old_elements < 0 ||
+      (old_array == NULL && old_elements > 0))
+      png_error(png_ptr, "internal error: array realloc");
+
+   /* Check for overflow on the elements count (so the caller does not have to
+    * check.)
+    */
+   if (add_elements <= INT_MAX - old_elements)
    {
-      png_struct dummy_struct;
-      png_structp png_ptr = &dummy_struct;
-      png_ptr->mem_ptr=mem_ptr;
-      struct_ptr = (*(malloc_fn))(png_ptr, size);
-
-      if (struct_ptr != NULL)
-         png_memset(struct_ptr, 0, size);
-
-      return (struct_ptr);
-   }
-#  endif /* PNG_USER_MEM_SUPPORTED */
-
-#  if defined(__TURBOC__) && !defined(__FLAT__)
-   struct_ptr = (png_voidp)farmalloc(size);
-#  else
-#    if defined(_MSC_VER) && defined(MAXSEG_64K)
-   struct_ptr = (png_voidp)halloc(size, 1);
-#    else
-   struct_ptr = (png_voidp)malloc(size);
-#    endif
-#  endif
-
-   if (struct_ptr != NULL)
-      png_memset(struct_ptr, 0, size);
-
-   return (struct_ptr);
-}
-
+      png_voidp new_array = png_malloc_array_checked(png_ptr,
+         old_elements+add_elements, element_size);
 
-/* Free memory allocated by a png_create_struct() call */
-void /* PRIVATE */
-png_destroy_struct(png_voidp struct_ptr)
-{
-#  ifdef PNG_USER_MEM_SUPPORTED
-   png_destroy_struct_2(struct_ptr, NULL, NULL);
-}
-
-/* Free memory allocated by a png_create_struct() call */
-void /* PRIVATE */
-png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
-    png_voidp mem_ptr)
-{
-#  endif /* PNG_USER_MEM_SUPPORTED */
-   if (struct_ptr != NULL)
-   {
-#  ifdef PNG_USER_MEM_SUPPORTED
-      if (free_fn != NULL)
+      if (new_array != NULL)
       {
-         png_struct dummy_struct;
-         png_structp png_ptr = &dummy_struct;
-         png_ptr->mem_ptr=mem_ptr;
-         (*(free_fn))(png_ptr, struct_ptr);
-         return;
-      }
-#  endif /* PNG_USER_MEM_SUPPORTED */
-#  if defined(__TURBOC__) && !defined(__FLAT__)
-      farfree(struct_ptr);
-
-#  else
-#    if defined(_MSC_VER) && defined(MAXSEG_64K)
-      hfree(struct_ptr);
+         /* Because png_malloc_array worked the size calculations below cannot
+          * overflow.
+          */
+         if (old_elements > 0)
+            memcpy(new_array, old_array, element_size*(unsigned)old_elements);
 
-#    else
-      free(struct_ptr);
+         memset((char*)new_array + element_size*(unsigned)old_elements, 0,
+            element_size*(unsigned)add_elements);
 
-#    endif
-#  endif
+         return new_array;
+      }
    }
+
+   return NULL; /* error */
 }
+#endif /* TEXT || sPLT || STORE_UNKNOWN_CHUNKS */
 
-/* Allocate memory.  For reasonable files, size should never exceed
- * 64K.  However, zlib may allocate more than 64K if you don't tell
- * it not to.  See zconf.h and png.h for more information.  zlib does
- * need to allocate exactly 64K, so whatever you call here must
- * have the ability to do that.
+/* Various functions that have different error handling are derived from this.
+ * png_malloc always exists, but if PNG_USER_MEM_SUPPORTED is defined a separate
+ * function png_malloc_default is also provided.
  */
-
 PNG_FUNCTION(png_voidp,PNGAPI
-png_calloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
+png_malloc,(png_const_structrp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
 {
    png_voidp ret;
 
-   ret = (png_malloc(png_ptr, size));
+   if (png_ptr == NULL)
+      return NULL;
 
-   if (ret != NULL)
-      png_memset(ret,0,(png_size_t)size);
+   ret = png_malloc_base(png_ptr, size);
+
+   if (ret == NULL)
+       png_error(png_ptr, "Out of memory"); /* 'm' means png_malloc */
 
-   return (ret);
+   return ret;
 }
 
+#ifdef PNG_USER_MEM_SUPPORTED
 PNG_FUNCTION(png_voidp,PNGAPI
-png_malloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
+png_malloc_default,(png_const_structrp png_ptr, png_alloc_size_t size),
+   PNG_ALLOCATED PNG_DEPRECATED)
 {
    png_voidp ret;
 
-#  ifdef PNG_USER_MEM_SUPPORTED
-   if (png_ptr == NULL || size == 0)
-      return (NULL);
-
-   if (png_ptr->malloc_fn != NULL)
-      ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));
+   if (png_ptr == NULL)
+      return NULL;
 
-   else
-      ret = (png_malloc_default(png_ptr, size));
+   /* Passing 'NULL' here bypasses the application provided memory handler. */
+   ret = png_malloc_base(NULL/*use malloc*/, size);
 
-   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-       png_error(png_ptr, "Out of Memory");
+   if (ret == NULL)
+      png_error(png_ptr, "Out of Memory"); /* 'M' means png_malloc_default */
 
-   return (ret);
+   return ret;
 }
+#endif /* USER_MEM */
 
+/* This function was added at libpng version 1.2.3.  The png_malloc_warn()
+ * function will issue a png_warning and return NULL instead of issuing a
+ * png_error, if it fails to allocate the requested memory.
+ */
 PNG_FUNCTION(png_voidp,PNGAPI
-png_malloc_default,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
+png_malloc_warn,(png_const_structrp png_ptr, png_alloc_size_t size),
+   PNG_ALLOCATED)
 {
-   png_voidp ret;
-#  endif /* PNG_USER_MEM_SUPPORTED */
-
-   if (png_ptr == NULL || size == 0)
-      return (NULL);
-
-#  ifdef PNG_MAX_MALLOC_64K
-   if (size > (png_uint_32)65536L)
+   if (png_ptr != NULL)
    {
-#    ifndef PNG_USER_MEM_SUPPORTED
-      if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-         png_error(png_ptr, "Cannot Allocate > 64K");
-
-      else
-#    endif
-         return NULL;
-   }
-#  endif
-
-   /* Check for overflow */
-#  if defined(__TURBOC__) && !defined(__FLAT__)
-
-   if (size != (unsigned long)size)
-      ret = NULL;
-
-   else
-      ret = farmalloc(size);
-
-#  else
-#    if defined(_MSC_VER) && defined(MAXSEG_64K)
-   if (size != (unsigned long)size)
-      ret = NULL;
-
-   else
-      ret = halloc(size, 1);
+      png_voidp ret = png_malloc_base(png_ptr, size);
 
-#    else
-   if (size != (size_t)size)
-      ret = NULL;
+      if (ret != NULL)
+         return ret;
 
-   else
-      ret = malloc((size_t)size);
-#    endif
-#  endif
-
-#  ifndef PNG_USER_MEM_SUPPORTED
-   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-      png_error(png_ptr, "Out of Memory");
-#  endif
+      png_warning(png_ptr, "Out of memory");
+   }
 
-   return (ret);
+   return NULL;
 }
 
 /* Free a pointer allocated by png_malloc().  If ptr is NULL, return
  * without taking any action.
  */
 void PNGAPI
-png_free(png_structp png_ptr, png_voidp ptr)
+png_free(png_const_structrp png_ptr, png_voidp ptr)
 {
    if (png_ptr == NULL || ptr == NULL)
       return;
 
-#  ifdef PNG_USER_MEM_SUPPORTED
+#ifdef PNG_USER_MEM_SUPPORTED
    if (png_ptr->free_fn != NULL)
-   {
-      (*(png_ptr->free_fn))(png_ptr, ptr);
-      return;
-   }
+      png_ptr->free_fn(png_constcast(png_structrp,png_ptr), ptr);
 
    else
       png_free_default(png_ptr, ptr);
 }
 
-void PNGAPI
-png_free_default(png_structp png_ptr, png_voidp ptr)
+PNG_FUNCTION(void,PNGAPI
+png_free_default,(png_const_structrp png_ptr, png_voidp ptr),PNG_DEPRECATED)
 {
    if (png_ptr == NULL || ptr == NULL)
       return;
+#endif /* USER_MEM */
 
-#  endif /* PNG_USER_MEM_SUPPORTED */
-
-#  if defined(__TURBOC__) && !defined(__FLAT__)
-   farfree(ptr);
-
-#  else
-#    if defined(_MSC_VER) && defined(MAXSEG_64K)
-   hfree(ptr);
-
-#    else
    free(ptr);
-
-#    endif
-#  endif
-}
-#endif /* Not Borland DOS special memory handler */
-
-/* This function was added at libpng version 1.2.3.  The png_malloc_warn()
- * function will set up png_malloc() to issue a png_warning and return NULL
- * instead of issuing a png_error, if it fails to allocate the requested
- * memory.
- */
-PNG_FUNCTION(png_voidp,PNGAPI
-png_malloc_warn,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-{
-   png_voidp ptr;
-   png_uint_32 save_flags;
-   if (png_ptr == NULL)
-      return (NULL);
-
-   save_flags = png_ptr->flags;
-   png_ptr->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
-   ptr = (png_voidp)png_malloc((png_structp)png_ptr, size);
-   png_ptr->flags=save_flags;
-   return(ptr);
 }
 
-
 #ifdef PNG_USER_MEM_SUPPORTED
 /* This function is called when the application wants to use another method
  * of allocating and freeing memory.
  */
 void PNGAPI
-png_set_mem_fn(png_structp png_ptr, png_voidp mem_ptr, png_malloc_ptr
+png_set_mem_fn(png_structrp png_ptr, png_voidp mem_ptr, png_malloc_ptr
   malloc_fn, png_free_ptr free_fn)
 {
    if (png_ptr != NULL)
@@ -656,12 +273,12 @@ png_set_mem_fn(png_structp png_ptr, png_voidp mem_ptr, png_malloc_ptr
  * pointer before png_write_destroy and png_read_destroy are called.
  */
 png_voidp PNGAPI
-png_get_mem_ptr(png_const_structp png_ptr)
+png_get_mem_ptr(png_const_structrp png_ptr)
 {
    if (png_ptr == NULL)
-      return (NULL);
+      return NULL;
 
-   return ((png_voidp)png_ptr->mem_ptr);
+   return png_ptr->mem_ptr;
 }
-#endif /* PNG_USER_MEM_SUPPORTED */
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+#endif /* USER_MEM */
+#endif /* READ || WRITE */
diff --git a/drivers/png/pngpread.c b/drivers/png/pngpread.c
index 9cf987d7e3..ca300e7f16 100644
--- a/drivers/png/pngpread.c
+++ b/drivers/png/pngpread.c
@@ -1,8 +1,8 @@
 
 /* pngpread.c - read a png file in push mode
  *
- * Last changed in libpng 1.5.23 [July 23, 2015]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.23 [June 9, 2016]
+ * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -25,8 +25,15 @@
 #define PNG_READ_iTXt_MODE  7
 #define PNG_ERROR_MODE      8
 
+#define PNG_PUSH_SAVE_BUFFER_IF_FULL \
+if (png_ptr->push_length + 4 > png_ptr->buffer_size) \
+   { png_push_save_buffer(png_ptr); return; }
+#define PNG_PUSH_SAVE_BUFFER_IF_LT(N) \
+if (png_ptr->buffer_size < N) \
+   { png_push_save_buffer(png_ptr); return; }
+
 void PNGAPI
-png_process_data(png_structp png_ptr, png_infop info_ptr,
+png_process_data(png_structrp png_ptr, png_inforp info_ptr,
     png_bytep buffer, png_size_t buffer_size)
 {
    if (png_ptr == NULL || info_ptr == NULL)
@@ -41,11 +48,11 @@ png_process_data(png_structp png_ptr, png_infop info_ptr,
 }
 
 png_size_t PNGAPI
-png_process_data_pause(png_structp png_ptr, int save)
+png_process_data_pause(png_structrp png_ptr, int save)
 {
    if (png_ptr != NULL)
    {
-      /* It's easiest for the caller if we do the save, then the caller doesn't
+      /* It's easiest for the caller if we do the save; then the caller doesn't
        * have to supply the same data again:
        */
       if (save != 0)
@@ -68,16 +75,15 @@ png_process_data_pause(png_structp png_ptr, int save)
 }
 
 png_uint_32 PNGAPI
-png_process_data_skip(png_structp png_ptr)
+png_process_data_skip(png_structrp png_ptr)
 {
-    /* TODO: Deprecate and remove this API.
-     * Somewhere the implementation of this seems to have been lost,
-     * or abandoned.  It was only to support some internal back-door access
-     * to png_struct) in libpng-1.4.x.
-     */
-   png_warning(png_ptr,
-       "png_process_data_skip is not implemented in any current version"
-       " of libpng");
+  /* TODO: Deprecate and remove this API.
+   * Somewhere the implementation of this seems to have been lost,
+   * or abandoned.  It was only to support some internal back-door access
+   * to png_struct) in libpng-1.4.x.
+   */
+   png_app_warning(png_ptr,
+"png_process_data_skip is not implemented in any current version of libpng");
    return 0;
 }
 
@@ -85,7 +91,7 @@ png_process_data_skip(png_structp png_ptr)
  * doing before we ran out of data...
  */
 void /* PRIVATE */
-png_process_some_data(png_structp png_ptr, png_infop info_ptr)
+png_process_some_data(png_structrp png_ptr, png_inforp info_ptr)
 {
    if (png_ptr == NULL)
       return;
@@ -125,7 +131,7 @@ png_process_some_data(png_structp png_ptr, png_infop info_ptr)
  * routine.
  */
 void /* PRIVATE */
-png_push_read_sig(png_structp png_ptr, png_infop info_ptr)
+png_push_read_sig(png_structrp png_ptr, png_inforp info_ptr)
 {
    png_size_t num_checked = png_ptr->sig_bytes, /* SAFE, does not exceed 8 */
        num_to_check = 8 - num_checked;
@@ -148,7 +154,6 @@ png_push_read_sig(png_structp png_ptr, png_infop info_ptr)
       else
          png_error(png_ptr, "PNG file corrupted by ASCII conversion");
    }
-
    else
    {
       if (png_ptr->sig_bytes >= 8)
@@ -159,27 +164,25 @@ png_push_read_sig(png_structp png_ptr, png_infop info_ptr)
 }
 
 void /* PRIVATE */
-png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
+png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
 {
    png_uint_32 chunk_name;
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+   int keep; /* unknown handling method */
+#endif
 
-   /* First we make sure we have enough data for the 4 byte chunk name
-    * and the 4 byte chunk length before proceeding with decoding the
+   /* First we make sure we have enough data for the 4-byte chunk name
+    * and the 4-byte chunk length before proceeding with decoding the
     * chunk data.  To fully decode each of these chunks, we also make
-    * sure we have enough data in the buffer for the 4 byte CRC at the
+    * sure we have enough data in the buffer for the 4-byte CRC at the
     * end of every chunk (except IDAT, which is handled separately).
     */
-   if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
+   if ((png_ptr->mode & PNG_HAVE_CHUNK_HEADER) == 0)
    {
       png_byte chunk_length[4];
       png_byte chunk_tag[4];
 
-      if (png_ptr->buffer_size < 8)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_LT(8)
       png_push_fill_buffer(png_ptr, chunk_length, 4);
       png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
       png_reset_crc(png_ptr);
@@ -193,14 +196,31 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 
    if (chunk_name == png_IDAT)
    {
-      /* This is here above the if/else case statement below because if the
-       * unknown handling marks 'IDAT' as unknown then the IDAT handling case is
-       * completely skipped.
-       *
-       * TODO: there must be a better way of doing this.
-       */
-      if (png_ptr->mode & PNG_AFTER_IDAT)
+      if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
          png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
+
+      /* If we reach an IDAT chunk, this means we have read all of the
+       * header chunks, and we can start reading the image (or if this
+       * is called after the image has been read - we have an error).
+       */
+      if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+         png_error(png_ptr, "Missing IHDR before IDAT");
+
+      else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+          (png_ptr->mode & PNG_HAVE_PLTE) == 0)
+         png_error(png_ptr, "Missing PLTE before IDAT");
+
+      png_ptr->process_mode = PNG_READ_IDAT_MODE;
+
+      if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
+         if ((png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) == 0)
+            if (png_ptr->push_length == 0)
+               return;
+
+      png_ptr->mode |= PNG_HAVE_IDAT;
+
+      if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
+         png_benign_error(png_ptr, "Too many IDATs found");
    }
 
    if (chunk_name == png_IHDR)
@@ -208,23 +228,13 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
       if (png_ptr->push_length != 13)
          png_error(png_ptr, "Invalid IHDR length");
 
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length);
    }
 
    else if (chunk_name == png_IEND)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length);
 
       png_ptr->process_mode = PNG_READ_DONE_MODE;
@@ -232,70 +242,25 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
    }
 
 #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-   else if (png_chunk_unknown_handling(png_ptr, chunk_name))
+   else if ((keep = png_chunk_unknown_handling(png_ptr, chunk_name)) != 0)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      if (chunk_name == png_IDAT)
-         png_ptr->mode |= PNG_HAVE_IDAT;
-
-      png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
+      png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length, keep);
 
       if (chunk_name == png_PLTE)
          png_ptr->mode |= PNG_HAVE_PLTE;
-
-      else if (chunk_name == png_IDAT)
-      {
-         if (!(png_ptr->mode & PNG_HAVE_IHDR))
-            png_error(png_ptr, "Missing IHDR before IDAT");
-
-         else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-             !(png_ptr->mode & PNG_HAVE_PLTE))
-            png_error(png_ptr, "Missing PLTE before IDAT");
-      }
    }
 #endif
 
    else if (chunk_name == png_PLTE)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length);
    }
 
    else if (chunk_name == png_IDAT)
    {
-      /* If we reach an IDAT chunk, this means we have read all of the
-       * header chunks, and we can start reading the image (or if this
-       * is called after the image has been read - we have an error).
-       */
-
-      if (!(png_ptr->mode & PNG_HAVE_IHDR))
-         png_error(png_ptr, "Missing IHDR before IDAT");
-
-      else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-          !(png_ptr->mode & PNG_HAVE_PLTE))
-         png_error(png_ptr, "Missing PLTE before IDAT");
-
-      if (png_ptr->mode & PNG_HAVE_IDAT)
-      {
-         if (!(png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
-            if (png_ptr->push_length == 0)
-               return;
-
-         if (png_ptr->mode & PNG_AFTER_IDAT)
-            png_benign_error(png_ptr, "Too many IDATs found");
-      }
-
       png_ptr->idat_size = png_ptr->push_length;
-      png_ptr->mode |= PNG_HAVE_IDAT;
       png_ptr->process_mode = PNG_READ_IDAT_MODE;
       png_push_have_info(png_ptr, info_ptr);
       png_ptr->zstream.avail_out =
@@ -308,12 +273,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_READ_gAMA_SUPPORTED
    else if (png_ptr->chunk_name == png_gAMA)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length);
    }
 
@@ -321,12 +281,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_READ_sBIT_SUPPORTED
    else if (png_ptr->chunk_name == png_sBIT)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length);
    }
 
@@ -334,12 +289,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_READ_cHRM_SUPPORTED
    else if (png_ptr->chunk_name == png_cHRM)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
    }
 
@@ -347,12 +297,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_READ_sRGB_SUPPORTED
    else if (chunk_name == png_sRGB)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);
    }
 
@@ -360,12 +305,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_READ_iCCP_SUPPORTED
    else if (png_ptr->chunk_name == png_iCCP)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length);
    }
 
@@ -373,12 +313,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_READ_sPLT_SUPPORTED
    else if (chunk_name == png_sPLT)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length);
    }
 
@@ -386,12 +321,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_READ_tRNS_SUPPORTED
    else if (chunk_name == png_tRNS)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length);
    }
 
@@ -399,12 +329,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_READ_bKGD_SUPPORTED
    else if (chunk_name == png_bKGD)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length);
    }
 
@@ -412,12 +337,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_READ_hIST_SUPPORTED
    else if (chunk_name == png_hIST)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length);
    }
 
@@ -425,12 +345,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_READ_pHYs_SUPPORTED
    else if (chunk_name == png_pHYs)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_pHYs(png_ptr, info_ptr, png_ptr->push_length);
    }
 
@@ -438,12 +353,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_READ_oFFs_SUPPORTED
    else if (chunk_name == png_oFFs)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length);
    }
 #endif
@@ -451,12 +361,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_READ_pCAL_SUPPORTED
    else if (chunk_name == png_pCAL)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);
    }
 
@@ -464,12 +369,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_READ_sCAL_SUPPORTED
    else if (chunk_name == png_sCAL)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length);
    }
 
@@ -477,12 +377,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_READ_tIME_SUPPORTED
    else if (chunk_name == png_tIME)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length);
    }
 
@@ -490,12 +385,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_READ_tEXt_SUPPORTED
    else if (chunk_name == png_tEXt)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
    }
 
@@ -503,12 +393,7 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_READ_zTXt_SUPPORTED
    else if (chunk_name == png_zTXt)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
    }
 
@@ -516,25 +401,16 @@ png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_READ_iTXt_SUPPORTED
    else if (chunk_name == png_iTXt)
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
       png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
    }
-
 #endif
 
    else
    {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-      png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
+      PNG_PUSH_SAVE_BUFFER_IF_FULL
+      png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length,
+         PNG_HANDLE_CHUNK_AS_DEFAULT);
    }
 
    png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
@@ -549,8 +425,7 @@ png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
       return;
 
    ptr = buffer;
-
-   if (png_ptr->save_buffer_size)
+   if (png_ptr->save_buffer_size != 0)
    {
       png_size_t save_size;
 
@@ -560,15 +435,14 @@ png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
       else
          save_size = png_ptr->save_buffer_size;
 
-      png_memcpy(ptr, png_ptr->save_buffer_ptr, save_size);
+      memcpy(ptr, png_ptr->save_buffer_ptr, save_size);
       length -= save_size;
       ptr += save_size;
       png_ptr->buffer_size -= save_size;
       png_ptr->save_buffer_size -= save_size;
       png_ptr->save_buffer_ptr += save_size;
    }
-
-   if (length && png_ptr->current_buffer_size)
+   if (length != 0 && png_ptr->current_buffer_size != 0)
    {
       png_size_t save_size;
 
@@ -578,7 +452,7 @@ png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
       else
          save_size = png_ptr->current_buffer_size;
 
-      png_memcpy(ptr, png_ptr->current_buffer_ptr, save_size);
+      memcpy(ptr, png_ptr->current_buffer_ptr, save_size);
       png_ptr->buffer_size -= save_size;
       png_ptr->current_buffer_size -= save_size;
       png_ptr->current_buffer_ptr += save_size;
@@ -586,9 +460,9 @@ png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
 }
 
 void /* PRIVATE */
-png_push_save_buffer(png_structp png_ptr)
+png_push_save_buffer(png_structrp png_ptr)
 {
-   if (png_ptr->save_buffer_size)
+   if (png_ptr->save_buffer_size != 0)
    {
       if (png_ptr->save_buffer_ptr != png_ptr->save_buffer)
       {
@@ -597,7 +471,6 @@ png_push_save_buffer(png_structp png_ptr)
          png_bytep dp;
 
          istop = png_ptr->save_buffer_size;
-
          for (i = 0, sp = png_ptr->save_buffer_ptr, dp = png_ptr->save_buffer;
              i < istop; i++, sp++, dp++)
          {
@@ -605,7 +478,6 @@ png_push_save_buffer(png_structp png_ptr)
          }
       }
    }
-
    if (png_ptr->save_buffer_size + png_ptr->current_buffer_size >
        png_ptr->save_buffer_max)
    {
@@ -620,7 +492,8 @@ png_push_save_buffer(png_structp png_ptr)
 
       new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256;
       old_buffer = png_ptr->save_buffer;
-      png_ptr->save_buffer = (png_bytep)png_malloc_warn(png_ptr, new_max);
+      png_ptr->save_buffer = (png_bytep)png_malloc_warn(png_ptr,
+          (png_size_t)new_max);
 
       if (png_ptr->save_buffer == NULL)
       {
@@ -628,25 +501,26 @@ png_push_save_buffer(png_structp png_ptr)
          png_error(png_ptr, "Insufficient memory for save_buffer");
       }
 
-      png_memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
+      if (old_buffer)
+         memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
+      else if (png_ptr->save_buffer_size)
+         png_error(png_ptr, "save_buffer error");
       png_free(png_ptr, old_buffer);
       png_ptr->save_buffer_max = new_max;
    }
-
    if (png_ptr->current_buffer_size)
    {
-      png_memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,
+      memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,
          png_ptr->current_buffer_ptr, png_ptr->current_buffer_size);
       png_ptr->save_buffer_size += png_ptr->current_buffer_size;
       png_ptr->current_buffer_size = 0;
    }
-
    png_ptr->save_buffer_ptr = png_ptr->save_buffer;
    png_ptr->buffer_size = 0;
 }
 
 void /* PRIVATE */
-png_push_restore_buffer(png_structp png_ptr, png_bytep buffer,
+png_push_restore_buffer(png_structrp png_ptr, png_bytep buffer,
    png_size_t buffer_length)
 {
    png_ptr->current_buffer = buffer;
@@ -656,20 +530,15 @@ png_push_restore_buffer(png_structp png_ptr, png_bytep buffer,
 }
 
 void /* PRIVATE */
-png_push_read_IDAT(png_structp png_ptr)
+png_push_read_IDAT(png_structrp png_ptr)
 {
-   if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
+   if ((png_ptr->mode & PNG_HAVE_CHUNK_HEADER) == 0)
    {
       png_byte chunk_length[4];
       png_byte chunk_tag[4];
 
       /* TODO: this code can be commoned up with the same code in push_read */
-      if (png_ptr->buffer_size < 8)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_LT(8)
       png_push_fill_buffer(png_ptr, chunk_length, 4);
       png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
       png_reset_crc(png_ptr);
@@ -681,7 +550,7 @@ png_push_read_IDAT(png_structp png_ptr)
       {
          png_ptr->process_mode = PNG_READ_CHUNK_MODE;
 
-         if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+         if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)
             png_error(png_ptr, "Not enough compressed data");
 
          return;
@@ -690,7 +559,7 @@ png_push_read_IDAT(png_structp png_ptr)
       png_ptr->idat_size = png_ptr->push_length;
    }
 
-   if (png_ptr->idat_size && png_ptr->save_buffer_size)
+   if (png_ptr->idat_size != 0 && png_ptr->save_buffer_size != 0)
    {
       png_size_t save_size = png_ptr->save_buffer_size;
       png_uint_32 idat_size = png_ptr->idat_size;
@@ -699,7 +568,7 @@ png_push_read_IDAT(png_structp png_ptr)
        * are of different types and we don't know which variable has the fewest
        * bits.  Carefully select the smaller and cast it to the type of the
        * larger - this cannot overflow.  Do not cast in the following test - it
-       * will break on either 16 or 64 bit platforms.
+       * will break on either 16-bit or 64-bit platforms.
        */
       if (idat_size < save_size)
          save_size = (png_size_t)idat_size;
@@ -717,7 +586,7 @@ png_push_read_IDAT(png_structp png_ptr)
       png_ptr->save_buffer_ptr += save_size;
    }
 
-   if (png_ptr->idat_size && png_ptr->current_buffer_size)
+   if (png_ptr->idat_size != 0 && png_ptr->current_buffer_size != 0)
    {
       png_size_t save_size = png_ptr->current_buffer_size;
       png_uint_32 idat_size = png_ptr->idat_size;
@@ -743,22 +612,18 @@ png_push_read_IDAT(png_structp png_ptr)
       png_ptr->current_buffer_ptr += save_size;
    }
 
-   if (!png_ptr->idat_size)
+   if (png_ptr->idat_size == 0)
    {
-      if (png_ptr->buffer_size < 4)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
+      PNG_PUSH_SAVE_BUFFER_IF_LT(4)
       png_crc_finish(png_ptr, 0);
       png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
       png_ptr->mode |= PNG_AFTER_IDAT;
+      png_ptr->zowner = 0;
    }
 }
 
 void /* PRIVATE */
-png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
+png_process_IDAT_data(png_structrp png_ptr, png_bytep buffer,
    png_size_t buffer_length)
 {
    /* The caller checks for a non-zero buffer length. */
@@ -770,13 +635,14 @@ png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
     * handle the uncompressed results.
     */
    png_ptr->zstream.next_in = buffer;
+   /* TODO: WARNING: TRUNCATION ERROR: DANGER WILL ROBINSON: */
    png_ptr->zstream.avail_in = (uInt)buffer_length;
 
    /* Keep going until the decompressed data is all processed
     * or the stream marked as finished.
     */
    while (png_ptr->zstream.avail_in > 0 &&
-          !(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+      (png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)
    {
       int ret;
 
@@ -787,9 +653,9 @@ png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
        */
       if (!(png_ptr->zstream.avail_out > 0))
       {
-         png_ptr->zstream.avail_out =
-             (uInt) PNG_ROWBYTES(png_ptr->pixel_depth,
-             png_ptr->iwidth) + 1;
+         /* TODO: WARNING: TRUNCATION ERROR: DANGER WILL ROBINSON: */
+         png_ptr->zstream.avail_out = (uInt)(PNG_ROWBYTES(png_ptr->pixel_depth,
+             png_ptr->iwidth) + 1);
 
          png_ptr->zstream.next_out = png_ptr->row_buf;
       }
@@ -801,19 +667,14 @@ png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
        * change the current behavior (see comments in inflate.c
        * for why this doesn't happen at present with zlib 1.2.5).
        */
-      ret = inflate(&png_ptr->zstream, Z_SYNC_FLUSH);
-
-      /* Hack, added in 1.5.18: the progressive reader does not reset
-       * png_ptr->zstream, so any attempt to use it after the last IDAT fails
-       * (silently).  This allows the read code to do the reset when required.
-       */
-      png_ptr->flags |= PNG_FLAG_ZSTREAM_PROGRESSIVE;
+      ret = PNG_INFLATE(png_ptr, Z_SYNC_FLUSH);
 
       /* Check for any failure before proceeding. */
       if (ret != Z_OK && ret != Z_STREAM_END)
       {
          /* Terminate the decompression. */
-         png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+         png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
+         png_ptr->zowner = 0;
 
          /* This may be a truncated stream (missing or
           * damaged end code).  Treat that as a warning.
@@ -841,7 +702,8 @@ png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
          {
             /* Extra data. */
             png_warning(png_ptr, "Extra compressed data in IDAT");
-            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+            png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
+            png_ptr->zowner = 0;
 
             /* Do no more processing; skip the unprocessed
              * input check below.
@@ -856,7 +718,7 @@ png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
 
       /* And check for the end of the stream. */
       if (ret == Z_STREAM_END)
-         png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+         png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
    }
 
    /* All the data should have been processed, if anything
@@ -868,7 +730,7 @@ png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
 }
 
 void /* PRIVATE */
-png_push_process_row(png_structp png_ptr)
+png_push_process_row(png_structrp png_ptr)
 {
    /* 1.5.6: row_info moved out of png_struct to a local here. */
    png_row_info row_info;
@@ -894,10 +756,10 @@ png_push_process_row(png_structp png_ptr)
     * it may not be in the future, so this was changed just to copy the
     * interlaced row count:
     */
-   png_memcpy(png_ptr->prev_row, png_ptr->row_buf, row_info.rowbytes + 1);
+   memcpy(png_ptr->prev_row, png_ptr->row_buf, row_info.rowbytes + 1);
 
 #ifdef PNG_READ_TRANSFORMS_SUPPORTED
-   if (png_ptr->transformations)
+   if (png_ptr->transformations != 0)
       png_do_read_transformations(png_ptr, &row_info);
 #endif
 
@@ -914,15 +776,16 @@ png_push_process_row(png_structp png_ptr)
 
 
 #ifdef PNG_READ_INTERLACING_SUPPORTED
-   /* Blow up interlaced rows to full size */
-   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+   /* Expand interlaced rows to full size */
+   if (png_ptr->interlaced != 0 &&
+       (png_ptr->transformations & PNG_INTERLACE) != 0)
    {
       if (png_ptr->pass < 6)
          png_do_read_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass,
             png_ptr->transformations);
 
-    switch (png_ptr->pass)
-    {
+      switch (png_ptr->pass)
+      {
          case 0:
          {
             int i;
@@ -1097,26 +960,26 @@ png_push_process_row(png_structp png_ptr)
 }
 
 void /* PRIVATE */
-png_read_push_finish_row(png_structp png_ptr)
+png_read_push_finish_row(png_structrp png_ptr)
 {
 #ifdef PNG_READ_INTERLACING_SUPPORTED
    /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
 
    /* Start of interlace block */
-   static PNG_CONST png_byte FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
+   static PNG_CONST png_byte png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
 
    /* Offset to next interlace block */
-   static PNG_CONST png_byte FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
+   static PNG_CONST png_byte png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
 
    /* Start of interlace block in the y direction */
-   static PNG_CONST png_byte FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
+   static PNG_CONST png_byte png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
 
    /* Offset to next interlace block in the y direction */
-   static PNG_CONST png_byte FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
+   static PNG_CONST png_byte png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
 
    /* Height of interlace block.  This is not currently used - if you need
     * it, uncomment it here and in png.h
-   static PNG_CONST png_byte FARDATA png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
+   static PNG_CONST png_byte png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
    */
 #endif
 
@@ -1125,10 +988,10 @@ png_read_push_finish_row(png_structp png_ptr)
       return;
 
 #ifdef PNG_READ_INTERLACING_SUPPORTED
-   if (png_ptr->interlaced)
+   if (png_ptr->interlaced != 0)
    {
       png_ptr->row_number = 0;
-      png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
+      memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
 
       do
       {
@@ -1149,7 +1012,7 @@ png_read_push_finish_row(png_structp png_ptr)
              png_pass_start[png_ptr->pass]) /
              png_pass_inc[png_ptr->pass];
 
-         if (png_ptr->transformations & PNG_INTERLACE)
+         if ((png_ptr->transformations & PNG_INTERLACE) != 0)
             break;
 
          png_ptr->num_rows = (png_ptr->height +
@@ -1159,25 +1022,25 @@ png_read_push_finish_row(png_structp png_ptr)
 
       } while (png_ptr->iwidth == 0 || png_ptr->num_rows == 0);
    }
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
+#endif /* READ_INTERLACING */
 }
 
 void /* PRIVATE */
-png_push_have_info(png_structp png_ptr, png_infop info_ptr)
+png_push_have_info(png_structrp png_ptr, png_inforp info_ptr)
 {
    if (png_ptr->info_fn != NULL)
       (*(png_ptr->info_fn))(png_ptr, info_ptr);
 }
 
 void /* PRIVATE */
-png_push_have_end(png_structp png_ptr, png_infop info_ptr)
+png_push_have_end(png_structrp png_ptr, png_inforp info_ptr)
 {
    if (png_ptr->end_fn != NULL)
       (*(png_ptr->end_fn))(png_ptr, info_ptr);
 }
 
 void /* PRIVATE */
-png_push_have_row(png_structp png_ptr, png_bytep row)
+png_push_have_row(png_structrp png_ptr, png_bytep row)
 {
    if (png_ptr->row_fn != NULL)
       (*(png_ptr->row_fn))(png_ptr, row, png_ptr->row_number,
@@ -1186,7 +1049,7 @@ png_push_have_row(png_structp png_ptr, png_bytep row)
 
 #ifdef PNG_READ_INTERLACING_SUPPORTED
 void PNGAPI
-png_progressive_combine_row (png_structp png_ptr, png_bytep old_row,
+png_progressive_combine_row(png_const_structrp png_ptr, png_bytep old_row,
     png_const_bytep new_row)
 {
    if (png_ptr == NULL)
@@ -1199,10 +1062,10 @@ png_progressive_combine_row (png_structp png_ptr, png_bytep old_row,
    if (new_row != NULL)
       png_combine_row(png_ptr, old_row, 1/*blocky display*/);
 }
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
+#endif /* READ_INTERLACING */
 
 void PNGAPI
-png_set_progressive_read_fn(png_structp png_ptr, png_voidp progressive_ptr,
+png_set_progressive_read_fn(png_structrp png_ptr, png_voidp progressive_ptr,
     png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
     png_progressive_end_ptr end_fn)
 {
@@ -1217,11 +1080,11 @@ png_set_progressive_read_fn(png_structp png_ptr, png_voidp progressive_ptr,
 }
 
 png_voidp PNGAPI
-png_get_progressive_ptr(png_const_structp png_ptr)
+png_get_progressive_ptr(png_const_structrp png_ptr)
 {
    if (png_ptr == NULL)
       return (NULL);
 
    return png_ptr->io_ptr;
 }
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+#endif /* PROGRESSIVE_READ */
diff --git a/drivers/png/pngpriv.h b/drivers/png/pngpriv.h
index 8bdccccafb..9338df3144 100644
--- a/drivers/png/pngpriv.h
+++ b/drivers/png/pngpriv.h
@@ -1,8 +1,8 @@
 
 /* pngpriv.h - private declarations for use inside libpng
  *
- * Last changed in libpng 1.5.26 [December 17, 2015]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.22 [May 26, 2016]
+ * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -12,7 +12,7 @@
  */
 
 /* The symbols declared in this file (including the functions declared
- * as PNG_EXTERN) are PRIVATE.  They are not part of the libpng public
+ * as extern) are PRIVATE.  They are not part of the libpng public
  * interface, and are not recommended for use by regular applications.
  * Some of them may become public in the future; others may stay private,
  * change in an incompatible way, or even disappear.
@@ -38,16 +38,42 @@
 #define _POSIX_SOURCE 1 /* Just the POSIX 1003.1 and C89 APIs */
 
 #ifndef PNG_VERSION_INFO_ONLY
-/* This is required for the definition of abort(), used as a last ditch
- * error handler when all else fails.
+/* Standard library headers not required by png.h: */
+#  include <stdlib.h>
+#  include <string.h>
+#endif
+
+#define PNGLIB_BUILD /*libpng is being built, not used*/
+
+/* If HAVE_CONFIG_H is defined during the build then the build system must
+ * provide an appropriate "config.h" file on the include path.  The header file
+ * must provide definitions as required below (search for "HAVE_CONFIG_H");
+ * see configure.ac for more details of the requirements.  The macro
+ * "PNG_NO_CONFIG_H" is provided for maintainers to test for dependencies on
+ * 'configure'; define this macro to prevent the configure build including the
+ * configure generated config.h.  Libpng is expected to compile without *any*
+ * special build system support on a reasonably ANSI-C compliant system.
  */
-#include <stdlib.h>
+#if defined(HAVE_CONFIG_H) && !defined(PNG_NO_CONFIG_H)
+#  include <config.h>
 
-/* This is used to find 'offsetof', used below for alignment tests. */
-#include <stddef.h>
-#endif /* !PNG_VERSION_INFO_ONLY */
+   /* Pick up the definition of 'restrict' from config.h if it was read: */
+#  define PNG_RESTRICT restrict
+#endif
 
-#define PNGLIB_BUILD /*libpng is being built, not used*/
+/* To support symbol prefixing it is necessary to know *before* including png.h
+ * whether the fixed point (and maybe other) APIs are exported, because if they
+ * are not internal definitions may be required.  This is handled below just
+ * before png.h is included, but load the configuration now if it is available.
+ */
+#ifndef PNGLCONF_H
+#  include "pnglibconf.h"
+#endif
+
+/* Local renames may change non-exported API functions from png.h */
+#if defined(PNG_PREFIX) && !defined(PNGPREFIX_H)
+#  include "pngprefix.h"
+#endif
 
 #ifdef PNG_USER_CONFIG
 #  include "pngusr.h"
@@ -60,6 +86,102 @@
 #  endif
 #endif
 
+/* Compile time options.
+ * =====================
+ * In a multi-arch build the compiler may compile the code several times for the
+ * same object module, producing different binaries for different architectures.
+ * When this happens configure-time setting of the target host options cannot be
+ * done and this interferes with the handling of the ARM NEON optimizations, and
+ * possibly other similar optimizations.  Put additional tests here; in general
+ * this is needed when the same option can be changed at both compile time and
+ * run time depending on the target OS (i.e. iOS vs Android.)
+ *
+ * NOTE: symbol prefixing does not pass $(CFLAGS) to the preprocessor, because
+ * this is not possible with certain compilers (Oracle SUN OS CC), as a result
+ * it is necessary to ensure that all extern functions that *might* be used
+ * regardless of $(CFLAGS) get declared in this file.  The test on __ARM_NEON__
+ * below is one example of this behavior because it is controlled by the
+ * presence or not of -mfpu=neon on the GCC command line, it is possible to do
+ * this in $(CC), e.g. "CC=gcc -mfpu=neon", but people who build libpng rarely
+ * do this.
+ */
+#ifndef PNG_ARM_NEON_OPT
+   /* ARM NEON optimizations are being controlled by the compiler settings,
+    * typically the target FPU.  If the FPU has been set to NEON (-mfpu=neon
+    * with GCC) then the compiler will define __ARM_NEON__ and we can rely
+    * unconditionally on NEON instructions not crashing, otherwise we must
+    * disable use of NEON instructions.
+    *
+    * NOTE: at present these optimizations depend on 'ALIGNED_MEMORY', so they
+    * can only be turned on automatically if that is supported too.  If
+    * PNG_ARM_NEON_OPT is set in CPPFLAGS (to >0) then arm/arm_init.c will fail
+    * to compile with an appropriate #error if ALIGNED_MEMORY has been turned
+    * off.
+    *
+    * Note that gcc-4.9 defines __ARM_NEON instead of the deprecated
+    * __ARM_NEON__, so we check both variants.
+    *
+    * To disable ARM_NEON optimizations entirely, and skip compiling the
+    * associated assembler code, pass --enable-arm-neon=no to configure
+    * or put -DPNG_ARM_NEON_OPT=0 in CPPFLAGS.
+    */
+#  if (defined(__ARM_NEON__) || defined(__ARM_NEON)) && \
+   defined(PNG_ALIGNED_MEMORY_SUPPORTED)
+#     define PNG_ARM_NEON_OPT 2
+#  else
+#     define PNG_ARM_NEON_OPT 0
+#  endif
+#endif
+
+#if PNG_ARM_NEON_OPT > 0
+   /* NEON optimizations are to be at least considered by libpng, so enable the
+    * callbacks to do this.
+    */
+#  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_neon
+
+   /* By default the 'intrinsics' code in arm/filter_neon_intrinsics.c is used
+    * if possible - if __ARM_NEON__ is set and the compiler version is not known
+    * to be broken.  This is controlled by PNG_ARM_NEON_IMPLEMENTATION which can
+    * be:
+    *
+    *    1  The intrinsics code (the default with __ARM_NEON__)
+    *    2  The hand coded assembler (the default without __ARM_NEON__)
+    *
+    * It is possible to set PNG_ARM_NEON_IMPLEMENTATION in CPPFLAGS, however
+    * this is *NOT* supported and may cease to work even after a minor revision
+    * to libpng.  It *is* valid to do this for testing purposes, e.g. speed
+    * testing or a new compiler, but the results should be communicated to the
+    * libpng implementation list for incorporation in the next minor release.
+    */
+#  ifndef PNG_ARM_NEON_IMPLEMENTATION
+#     if defined(__ARM_NEON__) || defined(__ARM_NEON)
+#        if defined(__clang__)
+            /* At present it is unknown by the libpng developers which versions
+             * of clang support the intrinsics, however some or perhaps all
+             * versions do not work with the assembler so this may be
+             * irrelevant, so just use the default (do nothing here.)
+             */
+#        elif defined(__GNUC__)
+            /* GCC 4.5.4 NEON support is known to be broken.  4.6.3 is known to
+             * work, so if this *is* GCC, or G++, look for a version >4.5
+             */
+#           if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)
+#              define PNG_ARM_NEON_IMPLEMENTATION 2
+#           endif /* no GNUC support */
+#        endif /* __GNUC__ */
+#     else /* !defined __ARM_NEON__ */
+         /* The 'intrinsics' code simply won't compile without this -mfpu=neon:
+          */
+#        define PNG_ARM_NEON_IMPLEMENTATION 2
+#     endif /* __ARM_NEON__ */
+#  endif /* !PNG_ARM_NEON_IMPLEMENTATION */
+
+#  ifndef PNG_ARM_NEON_IMPLEMENTATION
+      /* Use the intrinsics code by default. */
+#     define PNG_ARM_NEON_IMPLEMENTATION 1
+#  endif
+#endif /* PNG_ARM_NEON_OPT > 0 */
+
 /* Is this a build of a DLL where compilation of the object modules requires
  * different preprocessor settings to those required for a simple library?  If
  * so PNG_BUILD_DLL must be set.
@@ -124,78 +246,75 @@
 #  define PNG_PRIVATE
 #endif
 
-#include "png.h"
+/* Symbol preprocessing support.
+ *
+ * To enable listing global, but internal, symbols the following macros should
+ * always be used to declare an extern data or function object in this file.
+ */
+#ifndef PNG_INTERNAL_DATA
+#  define PNG_INTERNAL_DATA(type, name, array) PNG_LINKAGE_DATA type name array
+#endif
 
-/* pngconf.h does not set PNG_DLL_EXPORT unless it is required, so: */
-#ifndef PNG_DLL_EXPORT
-#  define PNG_DLL_EXPORT
+#ifndef PNG_INTERNAL_FUNCTION
+#  define PNG_INTERNAL_FUNCTION(type, name, args, attributes)\
+      PNG_LINKAGE_FUNCTION PNG_FUNCTION(type, name, args, PNG_EMPTY attributes)
 #endif
 
-/* Compile time options.
- * =====================
- * In a multi-arch build the compiler may compile the code several times for the
- * same object module, producing different binaries for different architectures.
- * When this happens configure-time setting of the target host options cannot be
- * done and this interferes with the handling of the ARM NEON optimizations, and
- * possibly other similar optimizations.  Put additional tests here; in general
- * this is needed when the same option can be changed at both compile time and
- * run time depending on the target OS (i.e. iOS vs Android.)
+#ifndef PNG_INTERNAL_CALLBACK
+#  define PNG_INTERNAL_CALLBACK(type, name, args, attributes)\
+      PNG_LINKAGE_CALLBACK PNG_FUNCTION(type, (PNGCBAPI name), args,\
+         PNG_EMPTY attributes)
+#endif
+
+/* If floating or fixed point APIs are disabled they may still be compiled
+ * internally.  To handle this make sure they are declared as the appropriate
+ * internal extern function (otherwise the symbol prefixing stuff won't work and
+ * the functions will be used without definitions.)
  *
- * NOTE: symbol prefixing does not pass $(CFLAGS) to the preprocessor, because
- * this is not possible with certain compilers (Oracle SUN OS CC), as a result
- * it is necessary to ensure that all extern functions that *might* be used
- * regardless of $(CFLAGS) get declared in this file.  The test on __ARM_NEON__
- * below is one example of this behavior because it is controlled by the
- * presence or not of -mfpu=neon on the GCC command line, it is possible to do
- * this in $(CC), e.g. "CC=gcc -mfpu=neon", but people who build libpng rarely
- * do this.
- */
-#ifndef PNG_ARM_NEON_OPT
-   /* ARM NEON optimizations are being controlled by the compiler settings,
-    * typically the target FPU.  If the FPU has been set to NEON (-mfpu=neon
-    * with GCC) then the compiler will define __ARM_NEON__ and we can rely
-    * unconditionally on NEON instructions not crashing, otherwise we must
-    * disable use of NEON instructions.
-    *
-    * NOTE: at present these optimizations depend on 'ALIGNED_MEMORY', so they
-    * can only be turned on automatically if that is supported too.  If
-    * PNG_ARM_NEON_OPT is set in CPPFLAGS (to >0) then arm/arm_init.c will fail
-    * to compile with an appropriate #error if ALIGNED_MEMORY has been turned
-    * off.
-    */
-#  if defined(__ARM_NEON__) && defined(PNG_ALIGNED_MEMORY_SUPPORTED)
-#     define PNG_ARM_NEON_OPT 2
-#  else
-#     define PNG_ARM_NEON_OPT 0
+ * NOTE: although all the API functions are declared here they are not all
+ * actually built!  Because the declarations are still made it is necessary to
+ * fake out types that they depend on.
+ */
+#ifndef PNG_FP_EXPORT
+#  ifndef PNG_FLOATING_POINT_SUPPORTED
+#     define PNG_FP_EXPORT(ordinal, type, name, args)\
+         PNG_INTERNAL_FUNCTION(type, name, args, PNG_EMPTY);
+#     ifndef PNG_VERSION_INFO_ONLY
+         typedef struct png_incomplete png_double;
+         typedef png_double*           png_doublep;
+         typedef const png_double*     png_const_doublep;
+         typedef png_double**          png_doublepp;
+#     endif
+#  endif
+#endif
+#ifndef PNG_FIXED_EXPORT
+#  ifndef PNG_FIXED_POINT_SUPPORTED
+#     define PNG_FIXED_EXPORT(ordinal, type, name, args)\
+         PNG_INTERNAL_FUNCTION(type, name, args, PNG_EMPTY);
 #  endif
 #endif
 
+#include "png.h"
 
-#if PNG_ARM_NEON_OPT > 0
-   /* NEON optimizations are to be at least considered by libpng, so enable the
-    * callbacks to do this.
-    */
-#  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_neon
+/* pngconf.h does not set PNG_DLL_EXPORT unless it is required, so: */
+#ifndef PNG_DLL_EXPORT
+#  define PNG_DLL_EXPORT
 #endif
 
-/* SECURITY and SAFETY:
+/* This is a global switch to set the compilation for an installed system
+ * (a release build).  It can be set for testing debug builds to ensure that
+ * they will compile when the build type is switched to RC or STABLE, the
+ * default is just to use PNG_LIBPNG_BUILD_BASE_TYPE.  Set this in CPPFLAGS
+ * with either:
  *
- * By default libpng is built without any internal limits on image size,
- * individual heap (png_malloc) allocations or the total amount of memory used.
- * If PNG_SAFE_LIMITS_SUPPORTED is defined, however, the limits below are used
- * (unless individually overridden).  These limits are believed to be fairly
- * safe, but builders of secure systems should verify the values against the
- * real system capabilities.
- */
-
-/* config.h is created by and PNG_CONFIGURE_LIBPNG is set by the "configure"
- * script.  We may need it here to get the correct configuration on things
- * like limits.
+ *   -DPNG_RELEASE_BUILD Turns on the release compile path
+ *   -DPNG_RELEASE_BUILD=0 Turns it off
+ * or in your pngusr.h with
+ *   #define PNG_RELEASE_BUILD=1 Turns on the release compile path
+ *   #define PNG_RELEASE_BUILD=0 Turns it off
  */
-#ifdef PNG_CONFIGURE_LIBPNG
-#  ifdef HAVE_CONFIG_H
-#    include "config.h"
-#  endif
+#ifndef PNG_RELEASE_BUILD
+#  define PNG_RELEASE_BUILD (PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC)
 #endif
 
 /* SECURITY and SAFETY:
@@ -220,11 +339,6 @@
 #  define PNG_MAX_MALLOC_64K
 #endif
 
-/* Moved to pngpriv.h at libpng-1.5.0 */
-/* NOTE: some of these may have been used in external applications as
- * these definitions were exposed in pngconf.h prior to 1.5.
- */
-
 #ifndef PNG_UNUSED
 /* Unused formal parameter warnings are silenced using the following macro
  * which is expected to have no bad effects on performance (optimizing
@@ -243,30 +357,6 @@
 #  define PNG_ZBUF_SIZE 65536L
 #endif
 
-/* PNG_STATIC is used to mark internal file scope functions if they need to be
- * accessed for implementation tests (see the code in tests/?*).
- */
-#ifndef PNG_STATIC
-#   define PNG_STATIC static
-#endif
-
-/* C99 restrict is used where possible, to do this 'restrict' is defined as
- * empty if we can't be sure it is supported.  configure builds have already
- * done this work.
- */
-#ifdef PNG_CONFIGURE_LIBPNG
-#  define PNG_RESTRICT restrict
-#else
-   /* Modern compilers support restrict, but assume not for anything not
-    * recognized here:
-    */
-#  if defined(__GNUC__) || defined(_MSC_VER) || defined(__WATCOMC__)
-#     define PNG_RESTRICT restrict
-#  else
-#     define PNG_RESTRICT
-#  endif
-#endif
-
 /* If warnings or errors are turned off the code is disabled or redirected here.
  * From 1.5.4 functions have been added to allow very limited formatting of
  * error and warning messages - this code will also be disabled here.
@@ -291,23 +381,18 @@
  */
 #ifdef __cplusplus
 #  define png_voidcast(type, value) static_cast<type>(value)
+#  define png_constcast(type, value) const_cast<type>(value)
+#  define png_aligncast(type, value) \
+   static_cast<type>(static_cast<void*>(value))
+#  define png_aligncastconst(type, value) \
+   static_cast<type>(static_cast<const void*>(value))
 #else
 #  define png_voidcast(type, value) (value)
+#  define png_constcast(type, value) ((type)(value))
+#  define png_aligncast(type, value) ((void*)(value))
+#  define png_aligncastconst(type, value) ((const void*)(value))
 #endif /* __cplusplus */
 
-#ifndef PNG_EXTERN
-/* The functions exported by PNG_EXTERN are internal functions, which
- * aren't usually used outside the library (as far as I know), so it is
- * debatable if they should be exported at all.  In the future, when it
- * is possible to have run-time registry of chunk-handling functions,
- * some of these might be made available again.
- *
- * 1.5.7: turned the use of 'extern' back on, since it is localized to pngpriv.h
- * it should be safe now (it is unclear why it was turned off.)
- */
-#  define PNG_EXTERN extern
-#endif
-
 /* Some fixed point APIs are still required even if not exported because
  * they get used by the corresponding floating point APIs.  This magic
  * deals with this:
@@ -363,7 +448,7 @@
     defined(_WIN32) || defined(__WIN32__)
 #  include <windows.h>  /* defines _WINDOWS_ macro */
 #endif
-#endif /* !PNG_VERSION_INFO_ONLY */
+#endif /* PNG_VERSION_INFO_ONLY */
 
 /* Moved here around 1.5.0beta36 from pngconf.h */
 /* Users may want to use these so they are not private.  Any library
@@ -379,34 +464,6 @@
 #  endif
 #endif
 
-#ifdef USE_FAR_KEYWORD
-/* Use this to make far-to-near assignments */
-#  define CHECK   1
-#  define NOCHECK 0
-#  define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))
-#  define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))
-#  define png_strlen  _fstrlen
-#  define png_memcmp  _fmemcmp    /* SJT: added */
-#  define png_memcpy  _fmemcpy
-#  define png_memset  _fmemset
-#else
-#  ifdef _WINDOWS_  /* Favor Windows over C runtime fns */
-#    define CVT_PTR(ptr)         (ptr)
-#    define CVT_PTR_NOCHECK(ptr) (ptr)
-#    define png_strlen  lstrlenA
-#    define png_memcmp  memcmp
-#    define png_memcpy  memcpy
-#    define png_memset  memset
-#  else
-#    define CVT_PTR(ptr)         (ptr)
-#    define CVT_PTR_NOCHECK(ptr) (ptr)
-#    define png_strlen  strlen
-#    define png_memcmp  memcmp      /* SJT: added */
-#    define png_memcpy  memcpy
-#    define png_memset  memset
-#  endif
-#endif
-
 /* These macros may need to be architecture dependent. */
 #define PNG_ALIGN_NONE   0 /* do not use data alignment */
 #define PNG_ALIGN_ALWAYS 1 /* assume unaligned accesses are OK */
@@ -469,16 +526,17 @@
 #define PNG_HAVE_IDAT               0x04
 /* #define PNG_AFTER_IDAT           0x08 (defined in png.h) */
 #define PNG_HAVE_IEND               0x10
-#define PNG_HAVE_gAMA               0x20
-#define PNG_HAVE_cHRM               0x40
-#define PNG_HAVE_sRGB               0x80
+                   /*               0x20 (unused) */
+                   /*               0x40 (unused) */
+                   /*               0x80 (unused) */
 #define PNG_HAVE_CHUNK_HEADER      0x100
 #define PNG_WROTE_tIME             0x200
 #define PNG_WROTE_INFO_BEFORE_PLTE 0x400
 #define PNG_BACKGROUND_IS_GRAY     0x800
 #define PNG_HAVE_PNG_SIGNATURE    0x1000
 #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
-#define PNG_HAVE_iCCP             0x4000
+                   /*             0x4000 (unused) */
+#define PNG_IS_READ_STRUCT        0x8000 /* Else is a write struct */
 
 /* Flags for the transformations the PNG library does on the image data */
 #define PNG_BGR                 0x0001
@@ -506,49 +564,49 @@
 #define PNG_RGB_TO_GRAY_WARN  0x400000
 #define PNG_RGB_TO_GRAY       0x600000 /* two bits, RGB_TO_GRAY_ERR|WARN */
 #define PNG_ENCODE_ALPHA      0x800000 /* Added to libpng-1.5.4 */
-#define PNG_ADD_ALPHA         0x1000000 /* Added to libpng-1.2.7 */
-#define PNG_EXPAND_tRNS       0x2000000 /* Added to libpng-1.2.9 */
-#define PNG_SCALE_16_TO_8     0x4000000 /* Added to libpng-1.5.4 */
-                       /*   0x8000000 unused */
-                       /*  0x10000000 unused */
-                       /*  0x20000000 unused */
-                       /*  0x40000000 unused */
+#define PNG_ADD_ALPHA        0x1000000 /* Added to libpng-1.2.7 */
+#define PNG_EXPAND_tRNS      0x2000000 /* Added to libpng-1.2.9 */
+#define PNG_SCALE_16_TO_8    0x4000000 /* Added to libpng-1.5.4 */
+                       /*    0x8000000 unused */
+                       /*   0x10000000 unused */
+                       /*   0x20000000 unused */
+                       /*   0x40000000 unused */
 /* Flags for png_create_struct */
 #define PNG_STRUCT_PNG   0x0001
 #define PNG_STRUCT_INFO  0x0002
 
 /* Flags for the png_ptr->flags rather than declaring a byte for each one */
 #define PNG_FLAG_ZLIB_CUSTOM_STRATEGY     0x0001
-#define PNG_FLAG_ZLIB_CUSTOM_LEVEL        0x0002
-#define PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL    0x0004
-#define PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS  0x0008
-#define PNG_FLAG_ZLIB_CUSTOM_METHOD       0x0010
-#define PNG_FLAG_ZLIB_FINISHED            0x0020
+#define PNG_FLAG_ZSTREAM_INITIALIZED      0x0002 /* Added to libpng-1.6.0 */
+                                  /*      0x0004    unused */
+#define PNG_FLAG_ZSTREAM_ENDED            0x0008 /* Added to libpng-1.6.0 */
+                                  /*      0x0010    unused */
+                                  /*      0x0020    unused */
 #define PNG_FLAG_ROW_INIT                 0x0040
 #define PNG_FLAG_FILLER_AFTER             0x0080
 #define PNG_FLAG_CRC_ANCILLARY_USE        0x0100
 #define PNG_FLAG_CRC_ANCILLARY_NOWARN     0x0200
 #define PNG_FLAG_CRC_CRITICAL_USE         0x0400
 #define PNG_FLAG_CRC_CRITICAL_IGNORE      0x0800
-#define PNG_FLAG_ASSUME_sRGB              0x1000  /* Added to libpng-1.5.4 */
-#define PNG_FLAG_OPTIMIZE_ALPHA           0x2000  /* Added to libpng-1.5.4 */
-#define PNG_FLAG_DETECT_UNINITIALIZED     0x4000  /* Added to libpng-1.5.4 */
-#define PNG_FLAG_KEEP_UNKNOWN_CHUNKS      0x8000
-#define PNG_FLAG_KEEP_UNSAFE_CHUNKS       0x10000
-#define PNG_FLAG_LIBRARY_MISMATCH         0x20000
-#define PNG_FLAG_STRIP_ERROR_NUMBERS      0x40000
-#define PNG_FLAG_STRIP_ERROR_TEXT         0x80000
-#define PNG_FLAG_MALLOC_NULL_MEM_OK       0x100000
-#define PNG_FLAG_ZSTREAM_PROGRESSIVE      0x200000
-                                  /*      0x400000  unused */
-#define PNG_FLAG_BENIGN_ERRORS_WARN       0x800000  /* Added to libpng-1.4.0 */
-#define PNG_FLAG_ZTXT_CUSTOM_STRATEGY    0x1000000  /* 5 lines added */
-#define PNG_FLAG_ZTXT_CUSTOM_LEVEL       0x2000000  /* to libpng-1.5.4 */
-#define PNG_FLAG_ZTXT_CUSTOM_MEM_LEVEL   0x4000000
-#define PNG_FLAG_ZTXT_CUSTOM_WINDOW_BITS 0x8000000
-#define PNG_FLAG_ZTXT_CUSTOM_METHOD      0x10000000
-                                  /*     0x20000000  unused */
-                                  /*     0x40000000  unused */
+#define PNG_FLAG_ASSUME_sRGB              0x1000 /* Added to libpng-1.5.4 */
+#define PNG_FLAG_OPTIMIZE_ALPHA           0x2000 /* Added to libpng-1.5.4 */
+#define PNG_FLAG_DETECT_UNINITIALIZED     0x4000 /* Added to libpng-1.5.4 */
+/* #define PNG_FLAG_KEEP_UNKNOWN_CHUNKS      0x8000 */
+/* #define PNG_FLAG_KEEP_UNSAFE_CHUNKS      0x10000 */
+#define PNG_FLAG_LIBRARY_MISMATCH        0x20000
+#define PNG_FLAG_STRIP_ERROR_NUMBERS     0x40000
+#define PNG_FLAG_STRIP_ERROR_TEXT        0x80000
+#define PNG_FLAG_BENIGN_ERRORS_WARN     0x100000 /* Added to libpng-1.4.0 */
+#define PNG_FLAG_APP_WARNINGS_WARN      0x200000 /* Added to libpng-1.6.0 */
+#define PNG_FLAG_APP_ERRORS_WARN        0x400000 /* Added to libpng-1.6.0 */
+                                  /*    0x800000    unused */
+                                  /*   0x1000000    unused */
+                                  /*   0x2000000    unused */
+                                  /*   0x4000000    unused */
+                                  /*   0x8000000    unused */
+                                  /*  0x10000000    unused */
+                                  /*  0x20000000    unused */
+                                  /*  0x40000000    unused */
 
 #define PNG_FLAG_CRC_ANCILLARY_MASK (PNG_FLAG_CRC_ANCILLARY_USE | \
                                      PNG_FLAG_CRC_ANCILLARY_NOWARN)
@@ -559,24 +617,23 @@
 #define PNG_FLAG_CRC_MASK           (PNG_FLAG_CRC_ANCILLARY_MASK | \
                                      PNG_FLAG_CRC_CRITICAL_MASK)
 
-/* zlib.h declares a magic type 'uInt' that limits the amount of data that zlib
- * can handle at once.  This type need be no larger than 16 bits (so maximum of
- * 65535), this define allows us to discover how big it is, but limited by the
- * maximuum for png_size_t.  The value can be overriden in a library build
- * (pngusr.h, or set it in CPPFLAGS) and it works to set it to a considerably
- * lower value (e.g. 255 works).  A lower value may help memory usage (slightly)
- * and may even improve performance on some systems (and degrade it on others.)
- */
-#ifndef ZLIB_IO_MAX
-#  define ZLIB_IO_MAX ((uInt)-1)
-#endif
-
 /* Save typing and make code easier to understand */
 
 #define PNG_COLOR_DIST(c1, c2) (abs((int)((c1).red) - (int)((c2).red)) + \
    abs((int)((c1).green) - (int)((c2).green)) + \
    abs((int)((c1).blue) - (int)((c2).blue)))
 
+/* Added to libpng-1.6.0: scale a 16-bit value in the range 0..65535 to 0..255
+ * by dividing by 257 *with rounding*.  This macro is exact for the given range.
+ * See the discourse in pngrtran.c png_do_scale_16_to_8.  The values in the
+ * macro were established by experiment (modifying the added value).  The macro
+ * has a second variant that takes a value already scaled by 255 and divides by
+ * 65535 - this has a maximum error of .502.  Over the range 0..65535*65535 it
+ * only gives off-by-one errors and only for 0.5% (1 in 200) of the values.
+ */
+#define PNG_DIV65535(v24) (((v24) + 32895) >> 16)
+#define PNG_DIV257(v16) PNG_DIV65535((png_uint_32)(v16) * 255)
+
 /* Added to libpng-1.2.6 JB */
 #define PNG_ROWBYTES(pixel_bits, width) \
     ((pixel_bits) >= 8 ? \
@@ -608,7 +665,7 @@
 /* The fixed point conversion performs range checking and evaluates
  * its argument multiple times, so must be used with care.  The
  * range checking uses the PNG specification values for a signed
- * 32 bit fixed point value except that the values are deliberately
+ * 32-bit fixed point value except that the values are deliberately
  * rounded-to-zero to an integral value - 21474 (21474.83 is roughly
  * (2^31-1) * 100000). 's' is a string that describes the value being
  * converted.
@@ -624,12 +681,10 @@
 #ifdef PNG_FIXED_POINT_MACRO_SUPPORTED
 #define png_fixed(png_ptr, fp, s) ((fp) <= 21474 && (fp) >= -21474 ?\
     ((png_fixed_point)(100000 * (fp))) : (png_fixed_error(png_ptr, s),0))
-#else
-#ifndef PNG_VERSION_INFO_ONLY
-PNG_EXTERN png_fixed_point png_fixed PNGARG((png_structp png_ptr, double fp,
-   png_const_charp text));
-#endif /* !PNG_VERSION_INFO_ONLY */
 #endif
+/* else the corresponding function is defined below, inside the scope of the
+ * cplusplus test.
+ */
 #endif
 
 /* Constants for known chunk types.  If you need to add a chunk, define the name
@@ -646,53 +701,82 @@ PNG_EXTERN png_fixed_point png_fixed PNGARG((png_structp png_ptr, double fp,
  * architectures where (int) is only 16 bits.
  */
 #define PNG_32b(b,s) ((png_uint_32)(b) << (s))
-#define PNG_CHUNK(b1,b2,b3,b4) \
+#define PNG_U32(b1,b2,b3,b4) \
    (PNG_32b(b1,24) | PNG_32b(b2,16) | PNG_32b(b3,8) | PNG_32b(b4,0))
 
-#define png_IHDR PNG_CHUNK( 73,  72,  68,  82)
-#define png_IDAT PNG_CHUNK( 73,  68,  65,  84)
-#define png_IEND PNG_CHUNK( 73,  69,  78,  68)
-#define png_PLTE PNG_CHUNK( 80,  76,  84,  69)
-#define png_bKGD PNG_CHUNK( 98,  75,  71,  68)
-#define png_cHRM PNG_CHUNK( 99,  72,  82,  77)
-#define png_gAMA PNG_CHUNK(103,  65,  77,  65)
-#define png_hIST PNG_CHUNK(104,  73,  83,  84)
-#define png_iCCP PNG_CHUNK(105,  67,  67,  80)
-#define png_iTXt PNG_CHUNK(105,  84,  88, 116)
-#define png_oFFs PNG_CHUNK(111,  70,  70, 115)
-#define png_pCAL PNG_CHUNK(112,  67,  65,  76)
-#define png_sCAL PNG_CHUNK(115,  67,  65,  76)
-#define png_pHYs PNG_CHUNK(112,  72,  89, 115)
-#define png_sBIT PNG_CHUNK(115,  66,  73,  84)
-#define png_sPLT PNG_CHUNK(115,  80,  76,  84)
-#define png_sRGB PNG_CHUNK(115,  82,  71,  66)
-#define png_sTER PNG_CHUNK(115,  84,  69,  82)
-#define png_tEXt PNG_CHUNK(116,  69,  88, 116)
-#define png_tIME PNG_CHUNK(116,  73,  77,  69)
-#define png_tRNS PNG_CHUNK(116,  82,  78,  83)
-#define png_zTXt PNG_CHUNK(122,  84,  88, 116)
+/* Constants for known chunk types.
+ *
+ * MAINTAINERS: If you need to add a chunk, define the name here.
+ * For historical reasons these constants have the form png_<name>; i.e.
+ * the prefix is lower case.  Please use decimal values as the parameters to
+ * match the ISO PNG specification and to avoid relying on the C locale
+ * interpretation of character values.  Please keep the list sorted.
+ *
+ * Notice that PNG_U32 is used to define a 32-bit value for the 4 byte chunk
+ * type.  In fact the specification does not express chunk types this way,
+ * however using a 32-bit value means that the chunk type can be read from the
+ * stream using exactly the same code as used for a 32-bit unsigned value and
+ * can be examined far more efficiently (using one arithmetic compare).
+ *
+ * Prior to 1.5.6 the chunk type constants were expressed as C strings.  The
+ * libpng API still uses strings for 'unknown' chunks and a macro,
+ * PNG_STRING_FROM_CHUNK, allows a string to be generated if required.  Notice
+ * that for portable code numeric values must still be used; the string "IHDR"
+ * is not portable and neither is PNG_U32('I', 'H', 'D', 'R').
+ *
+ * In 1.7.0 the definitions will be made public in png.h to avoid having to
+ * duplicate the same definitions in application code.
+ */
+#define png_IDAT PNG_U32( 73,  68,  65,  84)
+#define png_IEND PNG_U32( 73,  69,  78,  68)
+#define png_IHDR PNG_U32( 73,  72,  68,  82)
+#define png_PLTE PNG_U32( 80,  76,  84,  69)
+#define png_bKGD PNG_U32( 98,  75,  71,  68)
+#define png_cHRM PNG_U32( 99,  72,  82,  77)
+#define png_fRAc PNG_U32(102,  82,  65,  99) /* registered, not defined */
+#define png_gAMA PNG_U32(103,  65,  77,  65)
+#define png_gIFg PNG_U32(103,  73,  70, 103)
+#define png_gIFt PNG_U32(103,  73,  70, 116) /* deprecated */
+#define png_gIFx PNG_U32(103,  73,  70, 120)
+#define png_hIST PNG_U32(104,  73,  83,  84)
+#define png_iCCP PNG_U32(105,  67,  67,  80)
+#define png_iTXt PNG_U32(105,  84,  88, 116)
+#define png_oFFs PNG_U32(111,  70,  70, 115)
+#define png_pCAL PNG_U32(112,  67,  65,  76)
+#define png_pHYs PNG_U32(112,  72,  89, 115)
+#define png_sBIT PNG_U32(115,  66,  73,  84)
+#define png_sCAL PNG_U32(115,  67,  65,  76)
+#define png_sPLT PNG_U32(115,  80,  76,  84)
+#define png_sRGB PNG_U32(115,  82,  71,  66)
+#define png_sTER PNG_U32(115,  84,  69,  82)
+#define png_tEXt PNG_U32(116,  69,  88, 116)
+#define png_tIME PNG_U32(116,  73,  77,  69)
+#define png_tRNS PNG_U32(116,  82,  78,  83)
+#define png_zTXt PNG_U32(122,  84,  88, 116)
 
 /* The following will work on (signed char*) strings, whereas the get_uint_32
  * macro will fail on top-bit-set values because of the sign extension.
  */
 #define PNG_CHUNK_FROM_STRING(s)\
-   PNG_CHUNK(0xff&(s)[0], 0xff&(s)[1], 0xff&(s)[2], 0xff&(s)[3])
+   PNG_U32(0xff & (s)[0], 0xff & (s)[1], 0xff & (s)[2], 0xff & (s)[3])
 
 /* This uses (char), not (png_byte) to avoid warnings on systems where (char) is
  * signed and the argument is a (char[])  This macro will fail miserably on
  * systems where (char) is more than 8 bits.
  */
 #define PNG_STRING_FROM_CHUNK(s,c)\
-   (void)(((char*)(s))[0]=(char)((c)>>24), ((char*)(s))[1]=(char)((c)>>16),\
-   ((char*)(s))[2]=(char)((c)>>8), ((char*)(s))[3]=(char)((c)))
+   (void)(((char*)(s))[0]=(char)(((c)>>24) & 0xff), \
+   ((char*)(s))[1]=(char)(((c)>>16) & 0xff),\
+   ((char*)(s))[2]=(char)(((c)>>8) & 0xff), \
+   ((char*)(s))[3]=(char)((c & 0xff)))
 
 /* Do the same but terminate with a null character. */
 #define PNG_CSTRING_FROM_CHUNK(s,c)\
    (void)(PNG_STRING_FROM_CHUNK(s,c), ((char*)(s))[4] = 0)
 
 /* Test on flag values as defined in the spec (section 5.4): */
-#define PNG_CHUNK_ANCILLIARY(c)   (1 & ((c) >> 29))
-#define PNG_CHUNK_CRITICAL(c)     (!PNG_CHUNK_ANCILLIARY(c))
+#define PNG_CHUNK_ANCILLARY(c)   (1 & ((c) >> 29))
+#define PNG_CHUNK_CRITICAL(c)     (!PNG_CHUNK_ANCILLARY(c))
 #define PNG_CHUNK_PRIVATE(c)      (1 & ((c) >> 21))
 #define PNG_CHUNK_RESERVED(c)     (1 & ((c) >> 13))
 #define PNG_CHUNK_SAFE_TO_COPY(c) (1 & ((c) >>  5))
@@ -710,117 +794,204 @@ PNG_EXTERN png_fixed_point png_fixed PNGARG((png_structp png_ptr, double fp,
 #include "pngstruct.h"
 #include "pnginfo.h"
 
-/* This is used for 16 bit gamma tables -- only the top level pointers are
+/* Validate the include paths - the include path used to generate pnglibconf.h
+ * must match that used in the build, or we must be using pnglibconf.h.prebuilt:
+ */
+#if PNG_ZLIB_VERNUM != 0 && PNG_ZLIB_VERNUM != ZLIB_VERNUM
+#  error ZLIB_VERNUM != PNG_ZLIB_VERNUM \
+      "-I (include path) error: see the notes in pngpriv.h"
+   /* This means that when pnglibconf.h was built the copy of zlib.h that it
+    * used is not the same as the one being used here.  Because the build of
+    * libpng makes decisions to use inflateInit2 and inflateReset2 based on the
+    * zlib version number and because this affects handling of certain broken
+    * PNG files the -I directives must match.
+    *
+    * The most likely explanation is that you passed a -I in CFLAGS. This will
+    * not work; all the preprocessor directories and in particular all the -I
+    * directives must be in CPPFLAGS.
+    */
+#endif
+
+/* This is used for 16-bit gamma tables -- only the top level pointers are
  * const; this could be changed:
  */
 typedef const png_uint_16p * png_const_uint_16pp;
 
+/* Added to libpng-1.5.7: sRGB conversion tables */
+#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\
+   defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
+#ifdef PNG_SIMPLIFIED_READ_SUPPORTED
+PNG_INTERNAL_DATA(const png_uint_16, png_sRGB_table, [256]);
+   /* Convert from an sRGB encoded value 0..255 to a 16-bit linear value,
+    * 0..65535.  This table gives the closest 16-bit answers (no errors).
+    */
+#endif
+
+PNG_INTERNAL_DATA(const png_uint_16, png_sRGB_base, [512]);
+PNG_INTERNAL_DATA(const png_byte, png_sRGB_delta, [512]);
+
+#define PNG_sRGB_FROM_LINEAR(linear) \
+  ((png_byte)(0xff & ((png_sRGB_base[(linear)>>15] \
+   + ((((linear) & 0x7fff)*png_sRGB_delta[(linear)>>15])>>12)) >> 8)))
+   /* Given a value 'linear' in the range 0..255*65535 calculate the 8-bit sRGB
+    * encoded value with maximum error 0.646365.  Note that the input is not a
+    * 16-bit value; it has been multiplied by 255! */
+#endif /* SIMPLIFIED_READ/WRITE */
+
+
 /* Inhibit C++ name-mangling for libpng functions but not for system calls. */
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-/* These functions are used internally in the code.  They generally
- * shouldn't be used unless you are writing code to add or replace some
- * functionality in libpng.  More information about most functions can
- * be found in the files where the functions are located.
+/* Internal functions; these are not exported from a DLL however because they
+ * are used within several of the C source files they have to be C extern.
+ *
+ * All of these functions must be declared with PNG_INTERNAL_FUNCTION.
  */
 
+/* Zlib support */
+#define PNG_UNEXPECTED_ZLIB_RETURN (-7)
+PNG_INTERNAL_FUNCTION(void, png_zstream_error,(png_structrp png_ptr, int ret),
+   PNG_EMPTY);
+   /* Used by the zlib handling functions to ensure that z_stream::msg is always
+    * set before they return.
+    */
+
+#ifdef PNG_WRITE_SUPPORTED
+PNG_INTERNAL_FUNCTION(void,png_free_buffer_list,(png_structrp png_ptr,
+   png_compression_bufferp *list),PNG_EMPTY);
+   /* Free the buffer list used by the compressed write code. */
+#endif
+
+#if defined(PNG_FLOATING_POINT_SUPPORTED) && \
+   !defined(PNG_FIXED_POINT_MACRO_SUPPORTED) && \
+   (defined(PNG_gAMA_SUPPORTED) || defined(PNG_cHRM_SUPPORTED) || \
+   defined(PNG_sCAL_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) || \
+   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)) || \
+   (defined(PNG_sCAL_SUPPORTED) && \
+   defined(PNG_FLOATING_ARITHMETIC_SUPPORTED))
+PNG_INTERNAL_FUNCTION(png_fixed_point,png_fixed,(png_const_structrp png_ptr,
+   double fp, png_const_charp text),PNG_EMPTY);
+#endif
+
 /* Check the user version string for compatibility, returns false if the version
  * numbers aren't compatible.
  */
-PNG_EXTERN int png_user_version_check(png_structp png_ptr,
-   png_const_charp user_png_ver);
+PNG_INTERNAL_FUNCTION(int,png_user_version_check,(png_structrp png_ptr,
+   png_const_charp user_png_ver),PNG_EMPTY);
 
-/* Allocate memory for an internal libpng struct */
-PNG_EXTERN PNG_FUNCTION(png_voidp,png_create_struct,PNGARG((int type)),
-   PNG_ALLOCATED);
+/* Internal base allocator - no messages, NULL on failure to allocate.  This
+ * does, however, call the application provided allocator and that could call
+ * png_error (although that would be a bug in the application implementation.)
+ */
+PNG_INTERNAL_FUNCTION(png_voidp,png_malloc_base,(png_const_structrp png_ptr,
+   png_alloc_size_t size),PNG_ALLOCATED);
 
-/* Free memory from internal libpng struct */
-PNG_EXTERN void png_destroy_struct PNGARG((png_voidp struct_ptr));
+#if defined(PNG_TEXT_SUPPORTED) || defined(PNG_sPLT_SUPPORTED) ||\
+   defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED)
+/* Internal array allocator, outputs no error or warning messages on failure,
+ * just returns NULL.
+ */
+PNG_INTERNAL_FUNCTION(png_voidp,png_malloc_array,(png_const_structrp png_ptr,
+   int nelements, size_t element_size),PNG_ALLOCATED);
 
-PNG_EXTERN PNG_FUNCTION(png_voidp,png_create_struct_2,
-   PNGARG((int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)),
-   PNG_ALLOCATED);
-PNG_EXTERN void png_destroy_struct_2 PNGARG((png_voidp struct_ptr,
-    png_free_ptr free_fn, png_voidp mem_ptr));
+/* The same but an existing array is extended by add_elements.  This function
+ * also memsets the new elements to 0 and copies the old elements.  The old
+ * array is not freed or altered.
+ */
+PNG_INTERNAL_FUNCTION(png_voidp,png_realloc_array,(png_const_structrp png_ptr,
+   png_const_voidp array, int old_elements, int add_elements,
+   size_t element_size),PNG_ALLOCATED);
+#endif /* text, sPLT or unknown chunks */
+
+/* Magic to create a struct when there is no struct to call the user supplied
+ * memory allocators.  Because error handling has not been set up the memory
+ * handlers can't safely call png_error, but this is an obscure and undocumented
+ * restriction so libpng has to assume that the 'free' handler, at least, might
+ * call png_error.
+ */
+PNG_INTERNAL_FUNCTION(png_structp,png_create_png_struct,
+   (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
+    png_error_ptr warn_fn, png_voidp mem_ptr, png_malloc_ptr malloc_fn,
+    png_free_ptr free_fn),PNG_ALLOCATED);
+
+/* Free memory from internal libpng struct */
+PNG_INTERNAL_FUNCTION(void,png_destroy_png_struct,(png_structrp png_ptr),
+   PNG_EMPTY);
 
-/* Free any memory that info_ptr points to and reset struct. */
-PNG_EXTERN void png_info_destroy PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
+/* Free an allocated jmp_buf (always succeeds) */
+PNG_INTERNAL_FUNCTION(void,png_free_jmpbuf,(png_structrp png_ptr),PNG_EMPTY);
 
 /* Function to allocate memory for zlib.  PNGAPI is disallowed. */
-PNG_EXTERN PNG_FUNCTION(voidpf,png_zalloc,PNGARG((voidpf png_ptr, uInt items,
-   uInt size)),PNG_ALLOCATED);
+PNG_INTERNAL_FUNCTION(voidpf,png_zalloc,(voidpf png_ptr, uInt items, uInt size),
+   PNG_ALLOCATED);
 
 /* Function to free memory for zlib.  PNGAPI is disallowed. */
-PNG_EXTERN void png_zfree PNGARG((voidpf png_ptr, voidpf ptr));
+PNG_INTERNAL_FUNCTION(void,png_zfree,(voidpf png_ptr, voidpf ptr),PNG_EMPTY);
 
 /* Next four functions are used internally as callbacks.  PNGCBAPI is required
  * but not PNG_EXPORT.  PNGAPI added at libpng version 1.2.3, changed to
  * PNGCBAPI at 1.5.0
  */
 
-PNG_EXTERN void PNGCBAPI png_default_read_data PNGARG((png_structp png_ptr,
-    png_bytep data, png_size_t length));
+PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_default_read_data,(png_structp png_ptr,
+    png_bytep data, png_size_t length),PNG_EMPTY);
 
 #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-PNG_EXTERN void PNGCBAPI png_push_fill_buffer PNGARG((png_structp png_ptr,
-    png_bytep buffer, png_size_t length));
+PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_push_fill_buffer,(png_structp png_ptr,
+    png_bytep buffer, png_size_t length),PNG_EMPTY);
 #endif
 
-PNG_EXTERN void PNGCBAPI png_default_write_data PNGARG((png_structp png_ptr,
-    png_bytep data, png_size_t length));
+PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_default_write_data,(png_structp png_ptr,
+    png_bytep data, png_size_t length),PNG_EMPTY);
 
 #ifdef PNG_WRITE_FLUSH_SUPPORTED
 #  ifdef PNG_STDIO_SUPPORTED
-PNG_EXTERN void PNGCBAPI png_default_flush PNGARG((png_structp png_ptr));
+PNG_INTERNAL_FUNCTION(void PNGCBAPI,png_default_flush,(png_structp png_ptr),
+   PNG_EMPTY);
 #  endif
 #endif
 
 /* Reset the CRC variable */
-PNG_EXTERN void png_reset_crc PNGARG((png_structp png_ptr));
+PNG_INTERNAL_FUNCTION(void,png_reset_crc,(png_structrp png_ptr),PNG_EMPTY);
 
 /* Write the "data" buffer to whatever output you are using */
-PNG_EXTERN void png_write_data PNGARG((png_structp png_ptr,
-    png_const_bytep data, png_size_t length));
+PNG_INTERNAL_FUNCTION(void,png_write_data,(png_structrp png_ptr,
+    png_const_bytep data, png_size_t length),PNG_EMPTY);
 
 /* Read and check the PNG file signature */
-PNG_EXTERN void png_read_sig PNGARG((png_structp png_ptr, png_infop info_ptr));
+PNG_INTERNAL_FUNCTION(void,png_read_sig,(png_structrp png_ptr,
+   png_inforp info_ptr),PNG_EMPTY);
 
 /* Read the chunk header (length + type name) */
-PNG_EXTERN png_uint_32 png_read_chunk_header PNGARG((png_structp png_ptr));
+PNG_INTERNAL_FUNCTION(png_uint_32,png_read_chunk_header,(png_structrp png_ptr),
+   PNG_EMPTY);
 
 /* Read data from whatever input you are using into the "data" buffer */
-PNG_EXTERN void png_read_data PNGARG((png_structp png_ptr, png_bytep data,
-    png_size_t length));
+PNG_INTERNAL_FUNCTION(void,png_read_data,(png_structrp png_ptr, png_bytep data,
+    png_size_t length),PNG_EMPTY);
 
 /* Read bytes into buf, and update png_ptr->crc */
-PNG_EXTERN void png_crc_read PNGARG((png_structp png_ptr, png_bytep buf,
-    png_size_t length));
-
-/* Decompress data in a chunk that uses compression */
-#if defined(PNG_READ_COMPRESSED_TEXT_SUPPORTED)
-PNG_EXTERN void png_decompress_chunk PNGARG((png_structp png_ptr,
-    int comp_type, png_size_t chunklength, png_size_t prefix_length,
-    png_size_t *data_length));
-#endif
+PNG_INTERNAL_FUNCTION(void,png_crc_read,(png_structrp png_ptr, png_bytep buf,
+    png_uint_32 length),PNG_EMPTY);
 
 /* Read "skip" bytes, read the file crc, and (optionally) verify png_ptr->crc */
-PNG_EXTERN int png_crc_finish PNGARG((png_structp png_ptr, png_uint_32 skip));
+PNG_INTERNAL_FUNCTION(int,png_crc_finish,(png_structrp png_ptr,
+   png_uint_32 skip),PNG_EMPTY);
 
 /* Read the CRC from the file and compare it to the libpng calculated CRC */
-PNG_EXTERN int png_crc_error PNGARG((png_structp png_ptr));
+PNG_INTERNAL_FUNCTION(int,png_crc_error,(png_structrp png_ptr),PNG_EMPTY);
 
 /* Calculate the CRC over a section of data.  Note that we are only
  * passing a maximum of 64K on systems that have this as a memory limit,
  * since this is the maximum buffer size we can specify.
  */
-PNG_EXTERN void png_calculate_crc PNGARG((png_structp png_ptr,
-    png_const_bytep ptr, png_size_t length));
+PNG_INTERNAL_FUNCTION(void,png_calculate_crc,(png_structrp png_ptr,
+   png_const_bytep ptr, png_size_t length),PNG_EMPTY);
 
 #ifdef PNG_WRITE_FLUSH_SUPPORTED
-PNG_EXTERN void png_flush PNGARG((png_structp png_ptr));
+PNG_INTERNAL_FUNCTION(void,png_flush,(png_structrp png_ptr),PNG_EMPTY);
 #endif
 
 /* Write various chunks */
@@ -828,136 +999,130 @@ PNG_EXTERN void png_flush PNGARG((png_structp png_ptr));
 /* Write the IHDR chunk, and update the png_struct with the necessary
  * information.
  */
-PNG_EXTERN void png_write_IHDR PNGARG((png_structp png_ptr, png_uint_32 width,
-    png_uint_32 height,
-    int bit_depth, int color_type, int compression_method, int filter_method,
-    int interlace_method));
+PNG_INTERNAL_FUNCTION(void,png_write_IHDR,(png_structrp png_ptr,
+   png_uint_32 width, png_uint_32 height, int bit_depth, int color_type,
+   int compression_method, int filter_method, int interlace_method),PNG_EMPTY);
 
-PNG_EXTERN void png_write_PLTE PNGARG((png_structp png_ptr,
-    png_const_colorp palette, png_uint_32 num_pal));
+PNG_INTERNAL_FUNCTION(void,png_write_PLTE,(png_structrp png_ptr,
+   png_const_colorp palette, png_uint_32 num_pal),PNG_EMPTY);
 
-PNG_EXTERN void png_write_IDAT PNGARG((png_structp png_ptr, png_bytep data,
-    png_size_t length));
+PNG_INTERNAL_FUNCTION(void,png_compress_IDAT,(png_structrp png_ptr,
+   png_const_bytep row_data, png_alloc_size_t row_data_length, int flush),
+   PNG_EMPTY);
 
-PNG_EXTERN void png_write_IEND PNGARG((png_structp png_ptr));
+PNG_INTERNAL_FUNCTION(void,png_write_IEND,(png_structrp png_ptr),PNG_EMPTY);
 
 #ifdef PNG_WRITE_gAMA_SUPPORTED
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-PNG_EXTERN void png_write_gAMA PNGARG((png_structp png_ptr, double file_gamma));
-#  endif
-PNG_EXTERN void png_write_gAMA_fixed PNGARG((png_structp png_ptr,
-    png_fixed_point file_gamma));
+PNG_INTERNAL_FUNCTION(void,png_write_gAMA_fixed,(png_structrp png_ptr,
+    png_fixed_point file_gamma),PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_sBIT_SUPPORTED
-PNG_EXTERN void png_write_sBIT PNGARG((png_structp png_ptr,
-    png_const_color_8p sbit, int color_type));
+PNG_INTERNAL_FUNCTION(void,png_write_sBIT,(png_structrp png_ptr,
+    png_const_color_8p sbit, int color_type),PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_cHRM_SUPPORTED
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-PNG_EXTERN void png_write_cHRM PNGARG((png_structp png_ptr,
-    double white_x, double white_y,
-    double red_x, double red_y, double green_x, double green_y,
-    double blue_x, double blue_y));
-#  endif
-PNG_EXTERN void png_write_cHRM_fixed PNGARG((png_structp png_ptr,
-    png_fixed_point int_white_x, png_fixed_point int_white_y,
-    png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
-    int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
-    png_fixed_point int_blue_y));
+PNG_INTERNAL_FUNCTION(void,png_write_cHRM_fixed,(png_structrp png_ptr,
+    const png_xy *xy), PNG_EMPTY);
+    /* The xy value must have been previously validated */
 #endif
 
 #ifdef PNG_WRITE_sRGB_SUPPORTED
-PNG_EXTERN void png_write_sRGB PNGARG((png_structp png_ptr,
-    int intent));
+PNG_INTERNAL_FUNCTION(void,png_write_sRGB,(png_structrp png_ptr,
+    int intent),PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_iCCP_SUPPORTED
-PNG_EXTERN void png_write_iCCP PNGARG((png_structp png_ptr,
-    png_const_charp name, int compression_type,
-    png_const_charp profile, int proflen));
-   /* Note to maintainer: profile should be png_bytep */
+PNG_INTERNAL_FUNCTION(void,png_write_iCCP,(png_structrp png_ptr,
+   png_const_charp name, png_const_bytep profile), PNG_EMPTY);
+   /* The profile must have been previously validated for correctness, the
+    * length comes from the first four bytes.  Only the base, deflate,
+    * compression is supported.
+    */
 #endif
 
 #ifdef PNG_WRITE_sPLT_SUPPORTED
-PNG_EXTERN void png_write_sPLT PNGARG((png_structp png_ptr,
-    png_const_sPLT_tp palette));
+PNG_INTERNAL_FUNCTION(void,png_write_sPLT,(png_structrp png_ptr,
+    png_const_sPLT_tp palette),PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_tRNS_SUPPORTED
-PNG_EXTERN void png_write_tRNS PNGARG((png_structp png_ptr,
+PNG_INTERNAL_FUNCTION(void,png_write_tRNS,(png_structrp png_ptr,
     png_const_bytep trans, png_const_color_16p values, int number,
-    int color_type));
+    int color_type),PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_bKGD_SUPPORTED
-PNG_EXTERN void png_write_bKGD PNGARG((png_structp png_ptr,
-    png_const_color_16p values, int color_type));
+PNG_INTERNAL_FUNCTION(void,png_write_bKGD,(png_structrp png_ptr,
+    png_const_color_16p values, int color_type),PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_hIST_SUPPORTED
-PNG_EXTERN void png_write_hIST PNGARG((png_structp png_ptr,
-    png_const_uint_16p hist, int num_hist));
+PNG_INTERNAL_FUNCTION(void,png_write_hIST,(png_structrp png_ptr,
+    png_const_uint_16p hist, int num_hist),PNG_EMPTY);
 #endif
 
+/* Chunks that have keywords */
 #ifdef PNG_WRITE_tEXt_SUPPORTED
-PNG_EXTERN void png_write_tEXt PNGARG((png_structp png_ptr, png_const_charp key,
-    png_const_charp text, png_size_t text_len));
+PNG_INTERNAL_FUNCTION(void,png_write_tEXt,(png_structrp png_ptr,
+   png_const_charp key, png_const_charp text, png_size_t text_len),PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_zTXt_SUPPORTED
-PNG_EXTERN void png_write_zTXt PNGARG((png_structp png_ptr, png_const_charp key,
-    png_const_charp text, png_size_t text_len, int compression));
+PNG_INTERNAL_FUNCTION(void,png_write_zTXt,(png_structrp png_ptr, png_const_charp
+    key, png_const_charp text, int compression),PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_iTXt_SUPPORTED
-PNG_EXTERN void png_write_iTXt PNGARG((png_structp png_ptr,
+PNG_INTERNAL_FUNCTION(void,png_write_iTXt,(png_structrp png_ptr,
     int compression, png_const_charp key, png_const_charp lang,
-    png_const_charp lang_key, png_const_charp text));
+    png_const_charp lang_key, png_const_charp text),PNG_EMPTY);
 #endif
 
 #ifdef PNG_TEXT_SUPPORTED  /* Added at version 1.0.14 and 1.2.4 */
-PNG_EXTERN int png_set_text_2 PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_const_textp text_ptr, int num_text));
+PNG_INTERNAL_FUNCTION(int,png_set_text_2,(png_const_structrp png_ptr,
+    png_inforp info_ptr, png_const_textp text_ptr, int num_text),PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_oFFs_SUPPORTED
-PNG_EXTERN void png_write_oFFs PNGARG((png_structp png_ptr,
-    png_int_32 x_offset, png_int_32 y_offset, int unit_type));
+PNG_INTERNAL_FUNCTION(void,png_write_oFFs,(png_structrp png_ptr,
+    png_int_32 x_offset, png_int_32 y_offset, int unit_type),PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_pCAL_SUPPORTED
-PNG_EXTERN void png_write_pCAL PNGARG((png_structp png_ptr, png_charp purpose,
-    png_int_32 X0, png_int_32 X1, int type, int nparams,
-    png_const_charp units, png_charpp params));
+PNG_INTERNAL_FUNCTION(void,png_write_pCAL,(png_structrp png_ptr,
+    png_charp purpose, png_int_32 X0, png_int_32 X1, int type, int nparams,
+    png_const_charp units, png_charpp params),PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_pHYs_SUPPORTED
-PNG_EXTERN void png_write_pHYs PNGARG((png_structp png_ptr,
+PNG_INTERNAL_FUNCTION(void,png_write_pHYs,(png_structrp png_ptr,
     png_uint_32 x_pixels_per_unit, png_uint_32 y_pixels_per_unit,
-    int unit_type));
+    int unit_type),PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_tIME_SUPPORTED
-PNG_EXTERN void png_write_tIME PNGARG((png_structp png_ptr,
-    png_const_timep mod_time));
+PNG_INTERNAL_FUNCTION(void,png_write_tIME,(png_structrp png_ptr,
+    png_const_timep mod_time),PNG_EMPTY);
 #endif
 
 #ifdef PNG_WRITE_sCAL_SUPPORTED
-PNG_EXTERN void png_write_sCAL_s PNGARG((png_structp png_ptr,
-    int unit, png_const_charp width, png_const_charp height));
+PNG_INTERNAL_FUNCTION(void,png_write_sCAL_s,(png_structrp png_ptr,
+    int unit, png_const_charp width, png_const_charp height),PNG_EMPTY);
 #endif
 
 /* Called when finished processing a row of data */
-PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr));
+PNG_INTERNAL_FUNCTION(void,png_write_finish_row,(png_structrp png_ptr),
+    PNG_EMPTY);
 
 /* Internal use only.   Called before first row of data */
-PNG_EXTERN void png_write_start_row PNGARG((png_structp png_ptr));
+PNG_INTERNAL_FUNCTION(void,png_write_start_row,(png_structrp png_ptr),
+    PNG_EMPTY);
 
 /* Combine a row of data, dealing with alpha, etc. if requested.  'row' is an
  * array of png_ptr->width pixels.  If the image is not interlaced or this
- * is the final pass this just does a png_memcpy, otherwise the "display" flag
+ * is the final pass this just does a memcpy, otherwise the "display" flag
  * is used to determine whether to copy pixels that are not in the current pass.
  *
  * Because 'png_do_read_interlace' (below) replicates pixels this allows this
@@ -981,8 +1146,8 @@ PNG_EXTERN void png_write_start_row PNGARG((png_structp png_ptr));
 #ifndef PNG_USE_COMPILE_TIME_MASKS
 #  define PNG_USE_COMPILE_TIME_MASKS 1
 #endif
-PNG_EXTERN void png_combine_row PNGARG((png_structp png_ptr, png_bytep row,
-    int display));
+PNG_INTERNAL_FUNCTION(void,png_combine_row,(png_const_structrp png_ptr,
+    png_bytep row, int display),PNG_EMPTY);
 
 #ifdef PNG_READ_INTERLACING_SUPPORTED
 /* Expand an interlaced row: the 'row_info' describes the pass data that has
@@ -991,188 +1156,107 @@ PNG_EXTERN void png_combine_row PNGARG((png_structp png_ptr, png_bytep row,
  * the pixels are *replicated* to the intervening space.  This is essential for
  * the correct operation of png_combine_row, above.
  */
-PNG_EXTERN void png_do_read_interlace PNGARG((png_row_infop row_info,
-    png_bytep row, int pass, png_uint_32 transformations));
+PNG_INTERNAL_FUNCTION(void,png_do_read_interlace,(png_row_infop row_info,
+    png_bytep row, int pass, png_uint_32 transformations),PNG_EMPTY);
 #endif
 
 /* GRR TO DO (2.0 or whenever):  simplify other internal calling interfaces */
 
 #ifdef PNG_WRITE_INTERLACING_SUPPORTED
 /* Grab pixels out of a row for an interlaced pass */
-PNG_EXTERN void png_do_write_interlace PNGARG((png_row_infop row_info,
-    png_bytep row, int pass));
+PNG_INTERNAL_FUNCTION(void,png_do_write_interlace,(png_row_infop row_info,
+    png_bytep row, int pass),PNG_EMPTY);
 #endif
 
 /* Unfilter a row: check the filter value before calling this, there is no point
  * calling it for PNG_FILTER_VALUE_NONE.
  */
-PNG_EXTERN void png_read_filter_row PNGARG((png_structp pp, png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row, int filter));
-
-PNG_EXTERN void png_read_filter_row_up_neon PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row));
-PNG_EXTERN void png_read_filter_row_sub3_neon PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row));
-PNG_EXTERN void png_read_filter_row_sub4_neon PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row));
-PNG_EXTERN void png_read_filter_row_avg3_neon PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row));
-PNG_EXTERN void png_read_filter_row_avg4_neon PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row));
-PNG_EXTERN void png_read_filter_row_paeth3_neon PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row));
-PNG_EXTERN void png_read_filter_row_paeth4_neon PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row));
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row,(png_structrp pp, png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row, int filter),PNG_EMPTY);
+
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_neon,(png_row_infop row_info,
+    png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_neon,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_neon,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_neon,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_neon,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_neon,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_neon,(png_row_infop
+    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
 
 /* Choose the best filter to use and filter the row data */
-PNG_EXTERN void png_write_find_filter PNGARG((png_structp png_ptr,
-    png_row_infop row_info));
+PNG_INTERNAL_FUNCTION(void,png_write_find_filter,(png_structrp png_ptr,
+    png_row_infop row_info),PNG_EMPTY);
+
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
+PNG_INTERNAL_FUNCTION(void,png_read_IDAT_data,(png_structrp png_ptr,
+   png_bytep output, png_alloc_size_t avail_out),PNG_EMPTY);
+   /* Read 'avail_out' bytes of data from the IDAT stream.  If the output buffer
+    * is NULL the function checks, instead, for the end of the stream.  In this
+    * case a benign error will be issued if the stream end is not found or if
+    * extra data has to be consumed.
+    */
+PNG_INTERNAL_FUNCTION(void,png_read_finish_IDAT,(png_structrp png_ptr),
+   PNG_EMPTY);
+   /* This cleans up when the IDAT LZ stream does not end when the last image
+    * byte is read; there is still some pending input.
+    */
 
-/* Finish a row while reading, dealing with interlacing passes, etc. */
-PNG_EXTERN void png_read_finish_row PNGARG((png_structp png_ptr));
+PNG_INTERNAL_FUNCTION(void,png_read_finish_row,(png_structrp png_ptr),
+   PNG_EMPTY);
+   /* Finish a row while reading, dealing with interlacing passes, etc. */
+#endif /* SEQUENTIAL_READ */
 
 /* Initialize the row buffers, etc. */
-PNG_EXTERN void png_read_start_row PNGARG((png_structp png_ptr));
+PNG_INTERNAL_FUNCTION(void,png_read_start_row,(png_structrp png_ptr),PNG_EMPTY);
+
+#if PNG_ZLIB_VERNUM >= 0x1240
+PNG_INTERNAL_FUNCTION(int,png_zlib_inflate,(png_structrp png_ptr, int flush),
+      PNG_EMPTY);
+#  define PNG_INFLATE(pp, flush) png_zlib_inflate(pp, flush)
+#else /* Zlib < 1.2.4 */
+#  define PNG_INFLATE(pp, flush) inflate(&(pp)->zstream, flush)
+#endif /* Zlib < 1.2.4 */
 
 #ifdef PNG_READ_TRANSFORMS_SUPPORTED
 /* Optional call to update the users info structure */
-PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
-#endif
-
-/* These are the functions that do the transformations */
-#ifdef PNG_READ_FILLER_SUPPORTED
-PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info,
-    png_bytep row, png_uint_32 filler, png_uint_32 flags));
-#endif
-
-#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
-PNG_EXTERN void png_do_read_swap_alpha PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
-PNG_EXTERN void png_do_write_swap_alpha PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-PNG_EXTERN void png_do_read_invert_alpha PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
-PNG_EXTERN void png_do_write_invert_alpha PNGARG((png_row_infop row_info,
-    png_bytep row));
+PNG_INTERNAL_FUNCTION(void,png_read_transform_info,(png_structrp png_ptr,
+    png_inforp info_ptr),PNG_EMPTY);
 #endif
 
+/* Shared transform functions, defined in pngtran.c */
 #if defined(PNG_WRITE_FILLER_SUPPORTED) || \
     defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
-PNG_EXTERN void png_do_strip_channel PNGARG((png_row_infop row_info,
-    png_bytep row, int at_start));
+PNG_INTERNAL_FUNCTION(void,png_do_strip_channel,(png_row_infop row_info,
+    png_bytep row, int at_start),PNG_EMPTY);
 #endif
 
 #ifdef PNG_16BIT_SUPPORTED
 #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-PNG_EXTERN void png_do_swap PNGARG((png_row_infop row_info,
-    png_bytep row));
+PNG_INTERNAL_FUNCTION(void,png_do_swap,(png_row_infop row_info,
+    png_bytep row),PNG_EMPTY);
 #endif
 #endif
 
 #if defined(PNG_READ_PACKSWAP_SUPPORTED) || \
     defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-PNG_EXTERN void png_do_packswap PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-PNG_EXTERN int png_do_rgb_to_gray PNGARG((png_structp png_ptr,
-    png_row_infop row_info, png_bytep row));
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-PNG_EXTERN void png_do_gray_to_rgb PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_READ_PACK_SUPPORTED
-PNG_EXTERN void png_do_unpack PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_READ_SHIFT_SUPPORTED
-PNG_EXTERN void png_do_unshift PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_color_8p sig_bits));
+PNG_INTERNAL_FUNCTION(void,png_do_packswap,(png_row_infop row_info,
+    png_bytep row),PNG_EMPTY);
 #endif
 
 #if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
-PNG_EXTERN void png_do_invert PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-PNG_EXTERN void png_do_scale_16_to_8 PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-PNG_EXTERN void png_do_chop PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-PNG_EXTERN void png_do_quantize PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_bytep palette_lookup,
-    png_const_bytep quantize_lookup));
-
-#  ifdef PNG_CORRECT_PALETTE_SUPPORTED
-PNG_EXTERN void png_correct_palette PNGARG((png_structp png_ptr,
-    png_colorp palette, int num_palette));
-#  endif
+PNG_INTERNAL_FUNCTION(void,png_do_invert,(png_row_infop row_info,
+    png_bytep row),PNG_EMPTY);
 #endif
 
 #if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
-PNG_EXTERN void png_do_bgr PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_WRITE_PACK_SUPPORTED
-PNG_EXTERN void png_do_pack PNGARG((png_row_infop row_info,
-   png_bytep row, png_uint_32 bit_depth));
-#endif
-
-#ifdef PNG_WRITE_SHIFT_SUPPORTED
-PNG_EXTERN void png_do_shift PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_color_8p bit_depth));
-#endif
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
-    defined(PNG_READ_ALPHA_MODE_SUPPORTED)
-PNG_EXTERN void png_do_compose PNGARG((png_row_infop row_info,
-    png_bytep row, png_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-PNG_EXTERN void png_do_gamma PNGARG((png_row_infop row_info,
-    png_bytep row, png_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-PNG_EXTERN void png_do_encode_alpha PNGARG((png_row_infop row_info,
-   png_bytep row, png_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-PNG_EXTERN void png_do_expand_palette PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_colorp palette, png_const_bytep trans,
-    int num_trans));
-PNG_EXTERN void png_do_expand PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_color_16p trans_color));
-#endif
-
-#ifdef PNG_READ_EXPAND_16_SUPPORTED
-PNG_EXTERN void png_do_expand_16 PNGARG((png_row_infop row_info,
-    png_bytep row));
+PNG_INTERNAL_FUNCTION(void,png_do_bgr,(png_row_infop row_info,
+    png_bytep row),PNG_EMPTY);
 #endif
 
 /* The following decodes the appropriate chunks, and does error correction,
@@ -1180,251 +1264,279 @@ PNG_EXTERN void png_do_expand_16 PNGARG((png_row_infop row_info,
  */
 
 /* Decode the IHDR chunk */
-PNG_EXTERN void png_handle_IHDR PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-PNG_EXTERN void png_handle_PLTE PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-PNG_EXTERN void png_handle_IEND PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
+PNG_INTERNAL_FUNCTION(void,png_handle_IHDR,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_handle_PLTE,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_handle_IEND,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
 
 #ifdef PNG_READ_bKGD_SUPPORTED
-PNG_EXTERN void png_handle_bKGD PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
+PNG_INTERNAL_FUNCTION(void,png_handle_bKGD,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
 #endif
 
 #ifdef PNG_READ_cHRM_SUPPORTED
-PNG_EXTERN void png_handle_cHRM PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
+PNG_INTERNAL_FUNCTION(void,png_handle_cHRM,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
 #endif
 
 #ifdef PNG_READ_gAMA_SUPPORTED
-PNG_EXTERN void png_handle_gAMA PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
+PNG_INTERNAL_FUNCTION(void,png_handle_gAMA,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
 #endif
 
 #ifdef PNG_READ_hIST_SUPPORTED
-PNG_EXTERN void png_handle_hIST PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
+PNG_INTERNAL_FUNCTION(void,png_handle_hIST,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
 #endif
 
 #ifdef PNG_READ_iCCP_SUPPORTED
-PNG_EXTERN void png_handle_iCCP PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-#endif /* PNG_READ_iCCP_SUPPORTED */
+PNG_INTERNAL_FUNCTION(void,png_handle_iCCP,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
+#endif /* READ_iCCP */
 
 #ifdef PNG_READ_iTXt_SUPPORTED
-PNG_EXTERN void png_handle_iTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
+PNG_INTERNAL_FUNCTION(void,png_handle_iTXt,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
 #endif
 
 #ifdef PNG_READ_oFFs_SUPPORTED
-PNG_EXTERN void png_handle_oFFs PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
+PNG_INTERNAL_FUNCTION(void,png_handle_oFFs,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
 #endif
 
 #ifdef PNG_READ_pCAL_SUPPORTED
-PNG_EXTERN void png_handle_pCAL PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
+PNG_INTERNAL_FUNCTION(void,png_handle_pCAL,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
 #endif
 
 #ifdef PNG_READ_pHYs_SUPPORTED
-PNG_EXTERN void png_handle_pHYs PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
+PNG_INTERNAL_FUNCTION(void,png_handle_pHYs,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
 #endif
 
 #ifdef PNG_READ_sBIT_SUPPORTED
-PNG_EXTERN void png_handle_sBIT PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
+PNG_INTERNAL_FUNCTION(void,png_handle_sBIT,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
 #endif
 
 #ifdef PNG_READ_sCAL_SUPPORTED
-PNG_EXTERN void png_handle_sCAL PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
+PNG_INTERNAL_FUNCTION(void,png_handle_sCAL,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
 #endif
 
 #ifdef PNG_READ_sPLT_SUPPORTED
-PNG_EXTERN void png_handle_sPLT PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-#endif /* PNG_READ_sPLT_SUPPORTED */
+PNG_INTERNAL_FUNCTION(void,png_handle_sPLT,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
+#endif /* READ_sPLT */
 
 #ifdef PNG_READ_sRGB_SUPPORTED
-PNG_EXTERN void png_handle_sRGB PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
+PNG_INTERNAL_FUNCTION(void,png_handle_sRGB,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
 #endif
 
 #ifdef PNG_READ_tEXt_SUPPORTED
-PNG_EXTERN void png_handle_tEXt PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
+PNG_INTERNAL_FUNCTION(void,png_handle_tEXt,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
 #endif
 
 #ifdef PNG_READ_tIME_SUPPORTED
-PNG_EXTERN void png_handle_tIME PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
+PNG_INTERNAL_FUNCTION(void,png_handle_tIME,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
 #endif
 
 #ifdef PNG_READ_tRNS_SUPPORTED
-PNG_EXTERN void png_handle_tRNS PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
+PNG_INTERNAL_FUNCTION(void,png_handle_tRNS,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
 #endif
 
 #ifdef PNG_READ_zTXt_SUPPORTED
-PNG_EXTERN void png_handle_zTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
+PNG_INTERNAL_FUNCTION(void,png_handle_zTXt,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
 #endif
 
-PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_uint_32 length));
+PNG_INTERNAL_FUNCTION(void,png_check_chunk_name,(png_structrp png_ptr,
+    png_uint_32 chunk_name),PNG_EMPTY);
 
-PNG_EXTERN void png_check_chunk_name PNGARG((png_structp png_ptr,
-    png_uint_32 chunk_name));
+PNG_INTERNAL_FUNCTION(void,png_handle_unknown,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length, int keep),PNG_EMPTY);
+   /* This is the function that gets called for unknown chunks.  The 'keep'
+    * argument is either non-zero for a known chunk that has been set to be
+    * handled as unknown or zero for an unknown chunk.  By default the function
+    * just skips the chunk or errors out if it is critical.
+    */
 
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-/* Exactly as png_handle_as_unknown() except that the argument is a 32-bit chunk
- * name, not a string.
- */
-PNG_EXTERN int png_chunk_unknown_handling PNGARG((png_structp png_ptr,
-    png_uint_32 chunk_name));
-#endif
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) ||\
+    defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
+PNG_INTERNAL_FUNCTION(int,png_chunk_unknown_handling,
+    (png_const_structrp png_ptr, png_uint_32 chunk_name),PNG_EMPTY);
+   /* Exactly as the API png_handle_as_unknown() except that the argument is a
+    * 32-bit chunk name, not a string.
+    */
+#endif /* READ_UNKNOWN_CHUNKS || HANDLE_AS_UNKNOWN */
 
 /* Handle the transformations for reading and writing */
 #ifdef PNG_READ_TRANSFORMS_SUPPORTED
-PNG_EXTERN void png_do_read_transformations PNGARG((png_structp png_ptr,
-   png_row_infop row_info));
+PNG_INTERNAL_FUNCTION(void,png_do_read_transformations,(png_structrp png_ptr,
+   png_row_infop row_info),PNG_EMPTY);
 #endif
 #ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
-PNG_EXTERN void png_do_write_transformations PNGARG((png_structp png_ptr,
-   png_row_infop row_info));
+PNG_INTERNAL_FUNCTION(void,png_do_write_transformations,(png_structrp png_ptr,
+   png_row_infop row_info),PNG_EMPTY);
 #endif
 
 #ifdef PNG_READ_TRANSFORMS_SUPPORTED
-PNG_EXTERN void png_init_read_transformations PNGARG((png_structp png_ptr));
+PNG_INTERNAL_FUNCTION(void,png_init_read_transformations,(png_structrp png_ptr),
+    PNG_EMPTY);
 #endif
 
 #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-PNG_EXTERN void png_push_read_chunk PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
-PNG_EXTERN void png_push_read_sig PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
-PNG_EXTERN void png_push_check_crc PNGARG((png_structp png_ptr));
-PNG_EXTERN void png_push_save_buffer PNGARG((png_structp png_ptr));
-PNG_EXTERN void png_push_restore_buffer PNGARG((png_structp png_ptr,
-    png_bytep buffer, png_size_t buffer_length));
-PNG_EXTERN void png_push_read_IDAT PNGARG((png_structp png_ptr));
-PNG_EXTERN void png_process_IDAT_data PNGARG((png_structp png_ptr,
-    png_bytep buffer, png_size_t buffer_length));
-PNG_EXTERN void png_push_process_row PNGARG((png_structp png_ptr));
-PNG_EXTERN void png_push_handle_unknown PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_uint_32 length));
-PNG_EXTERN void png_push_have_info PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-PNG_EXTERN void png_push_have_end PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-PNG_EXTERN void png_push_have_row PNGARG((png_structp png_ptr, png_bytep row));
-PNG_EXTERN void png_push_read_end PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
-PNG_EXTERN void png_process_some_data PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
-PNG_EXTERN void png_read_push_finish_row PNGARG((png_structp png_ptr));
+PNG_INTERNAL_FUNCTION(void,png_push_read_chunk,(png_structrp png_ptr,
+    png_inforp info_ptr),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_push_read_sig,(png_structrp png_ptr,
+    png_inforp info_ptr),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_push_check_crc,(png_structrp png_ptr),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_push_save_buffer,(png_structrp png_ptr),
+    PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_push_restore_buffer,(png_structrp png_ptr,
+    png_bytep buffer, png_size_t buffer_length),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_push_read_IDAT,(png_structrp png_ptr),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_process_IDAT_data,(png_structrp png_ptr,
+    png_bytep buffer, png_size_t buffer_length),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_push_process_row,(png_structrp png_ptr),
+    PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_push_handle_unknown,(png_structrp png_ptr,
+   png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_push_have_info,(png_structrp png_ptr,
+   png_inforp info_ptr),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_push_have_end,(png_structrp png_ptr,
+   png_inforp info_ptr),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_push_have_row,(png_structrp png_ptr,
+     png_bytep row),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_push_read_end,(png_structrp png_ptr,
+    png_inforp info_ptr),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_process_some_data,(png_structrp png_ptr,
+    png_inforp info_ptr),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_read_push_finish_row,(png_structrp png_ptr),
+    PNG_EMPTY);
 #  ifdef PNG_READ_tEXt_SUPPORTED
-PNG_EXTERN void png_push_handle_tEXt PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_uint_32 length));
-PNG_EXTERN void png_push_read_tEXt PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
+PNG_INTERNAL_FUNCTION(void,png_push_handle_tEXt,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_push_read_tEXt,(png_structrp png_ptr,
+    png_inforp info_ptr),PNG_EMPTY);
 #  endif
 #  ifdef PNG_READ_zTXt_SUPPORTED
-PNG_EXTERN void png_push_handle_zTXt PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_uint_32 length));
-PNG_EXTERN void png_push_read_zTXt PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
+PNG_INTERNAL_FUNCTION(void,png_push_handle_zTXt,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_push_read_zTXt,(png_structrp png_ptr,
+    png_inforp info_ptr),PNG_EMPTY);
 #  endif
 #  ifdef PNG_READ_iTXt_SUPPORTED
-PNG_EXTERN void png_push_handle_iTXt PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_uint_32 length));
-PNG_EXTERN void png_push_read_iTXt PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
+PNG_INTERNAL_FUNCTION(void,png_push_handle_iTXt,(png_structrp png_ptr,
+    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_push_read_iTXt,(png_structrp png_ptr,
+    png_inforp info_ptr),PNG_EMPTY);
 #  endif
 
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+#endif /* PROGRESSIVE_READ */
 
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-PNG_EXTERN void png_do_read_intrapixel PNGARG((png_row_infop row_info,
-    png_bytep row));
-PNG_EXTERN void png_do_write_intrapixel PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
+/* Added at libpng version 1.6.0 */
+#ifdef PNG_GAMMA_SUPPORTED
+PNG_INTERNAL_FUNCTION(void,png_colorspace_set_gamma,(png_const_structrp png_ptr,
+    png_colorspacerp colorspace, png_fixed_point gAMA), PNG_EMPTY);
+   /* Set the colorspace gamma with a value provided by the application or by
+    * the gAMA chunk on read.  The value will override anything set by an ICC
+    * profile.
+    */
 
-/* Added at libpng version 1.4.0 */
-#ifdef PNG_CHECK_cHRM_SUPPORTED
-PNG_EXTERN int png_check_cHRM_fixed PNGARG((png_structp png_ptr,
-    png_fixed_point int_white_x, png_fixed_point int_white_y,
-    png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
-    int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
-    png_fixed_point int_blue_y));
-#endif
+PNG_INTERNAL_FUNCTION(void,png_colorspace_sync_info,(png_const_structrp png_ptr,
+    png_inforp info_ptr), PNG_EMPTY);
+    /* Synchronize the info 'valid' flags with the colorspace */
 
-#ifdef PNG_CHECK_cHRM_SUPPORTED
-/* Added at libpng version 1.2.34 and 1.4.0 */
-/* Currently only used by png_check_cHRM_fixed */
-PNG_EXTERN void png_64bit_product PNGARG((long v1, long v2,
-    unsigned long *hi_product, unsigned long *lo_product));
+PNG_INTERNAL_FUNCTION(void,png_colorspace_sync,(png_const_structrp png_ptr,
+    png_inforp info_ptr), PNG_EMPTY);
+    /* Copy the png_struct colorspace to the info_struct and call the above to
+     * synchronize the flags.  Checks for NULL info_ptr and does nothing.
+     */
 #endif
 
-#ifdef PNG_cHRM_SUPPORTED
-/* Added at libpng version 1.5.5 */
-typedef struct png_xy
-{
-   png_fixed_point redx, redy;
-   png_fixed_point greenx, greeny;
-   png_fixed_point bluex, bluey;
-   png_fixed_point whitex, whitey;
-} png_xy;
-
-typedef struct png_XYZ
-{
-   png_fixed_point redX, redY, redZ;
-   png_fixed_point greenX, greenY, greenZ;
-   png_fixed_point blueX, blueY, blueZ;
-} png_XYZ;
-
-/* The conversion APIs return 0 on success, non-zero on a parameter error. They
- * allow conversion between the above representations of a color encoding.  When
- * converting from XYZ end points to chromaticities the absolute magnitude of
- * the end points is lost, when converting back the sum of the Y values of the
- * three end points will be 1.0
- */
-PNG_EXTERN int png_xy_from_XYZ PNGARG((png_xy *xy, png_XYZ XYZ));
-PNG_EXTERN int png_XYZ_from_xy PNGARG((png_XYZ *XYZ, png_xy xy));
-PNG_EXTERN int png_XYZ_from_xy_checked PNGARG((png_structp png_ptr,
-   png_XYZ *XYZ, png_xy xy));
+/* Added at libpng version 1.4.0 */
+#ifdef PNG_COLORSPACE_SUPPORTED
+/* These internal functions are for maintaining the colorspace structure within
+ * a png_info or png_struct (or, indeed, both).
+ */
+PNG_INTERNAL_FUNCTION(int,png_colorspace_set_chromaticities,
+   (png_const_structrp png_ptr, png_colorspacerp colorspace, const png_xy *xy,
+    int preferred), PNG_EMPTY);
+
+PNG_INTERNAL_FUNCTION(int,png_colorspace_set_endpoints,
+   (png_const_structrp png_ptr, png_colorspacerp colorspace, const png_XYZ *XYZ,
+    int preferred), PNG_EMPTY);
+
+#ifdef PNG_sRGB_SUPPORTED
+PNG_INTERNAL_FUNCTION(int,png_colorspace_set_sRGB,(png_const_structrp png_ptr,
+   png_colorspacerp colorspace, int intent), PNG_EMPTY);
+   /* This does set the colorspace gAMA and cHRM values too, but doesn't set the
+    * flags to write them, if it returns false there was a problem and an error
+    * message has already been output (but the colorspace may still need to be
+    * synced to record the invalid flag).
+    */
+#endif /* sRGB */
+
+#ifdef PNG_iCCP_SUPPORTED
+PNG_INTERNAL_FUNCTION(int,png_colorspace_set_ICC,(png_const_structrp png_ptr,
+   png_colorspacerp colorspace, png_const_charp name,
+   png_uint_32 profile_length, png_const_bytep profile, int color_type),
+   PNG_EMPTY);
+   /* The 'name' is used for information only */
+
+/* Routines for checking parts of an ICC profile. */
+PNG_INTERNAL_FUNCTION(int,png_icc_check_length,(png_const_structrp png_ptr,
+   png_colorspacerp colorspace, png_const_charp name,
+   png_uint_32 profile_length), PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(int,png_icc_check_header,(png_const_structrp png_ptr,
+   png_colorspacerp colorspace, png_const_charp name,
+   png_uint_32 profile_length,
+   png_const_bytep profile /* first 132 bytes only */, int color_type),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(int,png_icc_check_tag_table,(png_const_structrp png_ptr,
+   png_colorspacerp colorspace, png_const_charp name,
+   png_uint_32 profile_length,
+   png_const_bytep profile /* header plus whole tag table */), PNG_EMPTY);
+#ifdef PNG_sRGB_SUPPORTED
+PNG_INTERNAL_FUNCTION(void,png_icc_set_sRGB,(
+   png_const_structrp png_ptr, png_colorspacerp colorspace,
+   png_const_bytep profile, uLong adler), PNG_EMPTY);
+   /* 'adler' is the Adler32 checksum of the uncompressed profile data. It may
+    * be zero to indicate that it is not available.  It is used, if provided,
+    * as a fast check on the profile when checking to see if it is sRGB.
+    */
 #endif
+#endif /* iCCP */
+
+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+PNG_INTERNAL_FUNCTION(void,png_colorspace_set_rgb_coefficients,
+   (png_structrp png_ptr), PNG_EMPTY);
+   /* Set the rgb_to_gray coefficients from the colorspace Y values */
+#endif /* READ_RGB_TO_GRAY */
+#endif /* COLORSPACE */
 
 /* Added at libpng version 1.4.0 */
-PNG_EXTERN void png_check_IHDR PNGARG((png_structp png_ptr,
+PNG_INTERNAL_FUNCTION(void,png_check_IHDR,(png_const_structrp png_ptr,
     png_uint_32 width, png_uint_32 height, int bit_depth,
     int color_type, int interlace_type, int compression_type,
-    int filter_type));
+    int filter_type),PNG_EMPTY);
 
 /* Added at libpng version 1.5.10 */
 #if defined(PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED) || \
     defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED)
-PNG_EXTERN void png_do_check_palette_indexes PNGARG((png_structp png_ptr,
-    png_row_infop row_info));
+PNG_INTERNAL_FUNCTION(void,png_do_check_palette_indexes,
+   (png_structrp png_ptr, png_row_infop row_info),PNG_EMPTY);
 #endif
 
-/* Free all memory used by the read (old method - NOT DLL EXPORTED) */
-PNG_EXTERN void png_read_destroy PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_infop end_info_ptr));
-
-/* Free any memory used in png_ptr struct (old method - NOT DLL EXPORTED) */
-PNG_EXTERN void png_write_destroy PNGARG((png_structp png_ptr));
-
-#ifdef USE_FAR_KEYWORD  /* memory model conversion function */
-PNG_EXTERN void *png_far_to_near PNGARG((png_structp png_ptr, png_voidp ptr,
-    int check));
-#endif /* USE_FAR_KEYWORD */
-
 #if defined(PNG_FLOATING_POINT_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED)
-PNG_EXTERN PNG_FUNCTION(void, png_fixed_error, (png_structp png_ptr,
+PNG_INTERNAL_FUNCTION(void,png_fixed_error,(png_const_structrp png_ptr,
    png_const_charp name),PNG_NORETURN);
 #endif
 
@@ -1432,8 +1544,8 @@ PNG_EXTERN PNG_FUNCTION(void, png_fixed_error, (png_structp png_ptr,
  * the end.  Always leaves the buffer nul terminated.  Never errors out (and
  * there is no error code.)
  */
-PNG_EXTERN size_t png_safecat(png_charp buffer, size_t bufsize, size_t pos,
-    png_const_charp string);
+PNG_INTERNAL_FUNCTION(size_t,png_safecat,(png_charp buffer, size_t bufsize,
+   size_t pos, png_const_charp string),PNG_EMPTY);
 
 /* Various internal functions to handle formatted warning messages, currently
  * only implemented for warnings.
@@ -1444,8 +1556,8 @@ PNG_EXTERN size_t png_safecat(png_charp buffer, size_t bufsize, size_t pos,
  * Returns the pointer to the start of the formatted string.  This utility only
  * does unsigned values.
  */
-PNG_EXTERN png_charp png_format_number(png_const_charp start, png_charp end,
-   int format, png_alloc_size_t number);
+PNG_INTERNAL_FUNCTION(png_charp,png_format_number,(png_const_charp start,
+   png_charp end, int format, png_alloc_size_t number),PNG_EMPTY);
 
 /* Convenience macro that takes an array: */
 #define PNG_FORMAT_NUMBER(buffer,format,number) \
@@ -1469,7 +1581,7 @@ PNG_EXTERN png_charp png_format_number(png_const_charp start, png_charp end,
 #ifdef PNG_WARNINGS_SUPPORTED
 /* New defines and members adding in libpng-1.5.4 */
 #  define PNG_WARNING_PARAMETER_SIZE 32
-#  define PNG_WARNING_PARAMETER_COUNT 8
+#  define PNG_WARNING_PARAMETER_COUNT 8 /* Maximum 9; see pngerror.c */
 
 /* An l-value of this type has to be passed to the APIs below to cache the
  * values of the parameters to a formatted warning message.
@@ -1477,50 +1589,97 @@ PNG_EXTERN png_charp png_format_number(png_const_charp start, png_charp end,
 typedef char png_warning_parameters[PNG_WARNING_PARAMETER_COUNT][
    PNG_WARNING_PARAMETER_SIZE];
 
-PNG_EXTERN void png_warning_parameter(png_warning_parameters p, int number,
-    png_const_charp string);
-    /* Parameters are limited in size to PNG_WARNING_PARAMETER_SIZE characters,
-     * including the trailing '\0'.
-     */
-PNG_EXTERN void png_warning_parameter_unsigned(png_warning_parameters p,
-    int number, int format, png_alloc_size_t value);
-    /* Use png_alloc_size_t because it is an unsigned type as big as any we
-     * need to output.  Use the following for a signed value.
-     */
-PNG_EXTERN void png_warning_parameter_signed(png_warning_parameters p,
-    int number, int format, png_int_32 value);
-
-PNG_EXTERN void png_formatted_warning(png_structp png_ptr,
-    png_warning_parameters p, png_const_charp message);
-    /* 'message' follows the X/Open approach of using @1, @2 to insert
-     * parameters previously supplied using the above functions.  Errors in
-     * specifying the paramters will simple result in garbage substitutions.
-     */
+PNG_INTERNAL_FUNCTION(void,png_warning_parameter,(png_warning_parameters p,
+   int number, png_const_charp string),PNG_EMPTY);
+   /* Parameters are limited in size to PNG_WARNING_PARAMETER_SIZE characters,
+    * including the trailing '\0'.
+    */
+PNG_INTERNAL_FUNCTION(void,png_warning_parameter_unsigned,
+   (png_warning_parameters p, int number, int format, png_alloc_size_t value),
+   PNG_EMPTY);
+   /* Use png_alloc_size_t because it is an unsigned type as big as any we
+    * need to output.  Use the following for a signed value.
+    */
+PNG_INTERNAL_FUNCTION(void,png_warning_parameter_signed,
+   (png_warning_parameters p, int number, int format, png_int_32 value),
+   PNG_EMPTY);
+
+PNG_INTERNAL_FUNCTION(void,png_formatted_warning,(png_const_structrp png_ptr,
+   png_warning_parameters p, png_const_charp message),PNG_EMPTY);
+   /* 'message' follows the X/Open approach of using @1, @2 to insert
+    * parameters previously supplied using the above functions.  Errors in
+    * specifying the parameters will simply result in garbage substitutions.
+    */
 #endif
 
+#ifdef PNG_BENIGN_ERRORS_SUPPORTED
+/* Application errors (new in 1.6); use these functions (declared below) for
+ * errors in the parameters or order of API function calls on read.  The
+ * 'warning' should be used for an error that can be handled completely; the
+ * 'error' for one which can be handled safely but which may lose application
+ * information or settings.
+ *
+ * By default these both result in a png_error call prior to release, while in a
+ * released version the 'warning' is just a warning.  However if the application
+ * explicitly disables benign errors (explicitly permitting the code to lose
+ * information) they both turn into warnings.
+ *
+ * If benign errors aren't supported they end up as the corresponding base call
+ * (png_warning or png_error.)
+ */
+PNG_INTERNAL_FUNCTION(void,png_app_warning,(png_const_structrp png_ptr,
+   png_const_charp message),PNG_EMPTY);
+   /* The application provided invalid parameters to an API function or called
+    * an API function at the wrong time, libpng can completely recover.
+    */
+
+PNG_INTERNAL_FUNCTION(void,png_app_error,(png_const_structrp png_ptr,
+   png_const_charp message),PNG_EMPTY);
+   /* As above but libpng will ignore the call, or attempt some other partial
+    * recovery from the error.
+    */
+#else
+#  define png_app_warning(pp,s) png_warning(pp,s)
+#  define png_app_error(pp,s) png_error(pp,s)
+#endif
+
+PNG_INTERNAL_FUNCTION(void,png_chunk_report,(png_const_structrp png_ptr,
+   png_const_charp message, int error),PNG_EMPTY);
+   /* Report a recoverable issue in chunk data.  On read this is used to report
+    * a problem found while reading a particular chunk and the
+    * png_chunk_benign_error or png_chunk_warning function is used as
+    * appropriate.  On write this is used to report an error that comes from
+    * data set via an application call to a png_set_ API and png_app_error or
+    * png_app_warning is used as appropriate.
+    *
+    * The 'error' parameter must have one of the following values:
+    */
+#define PNG_CHUNK_WARNING     0 /* never an error */
+#define PNG_CHUNK_WRITE_ERROR 1 /* an error only on write */
+#define PNG_CHUNK_ERROR       2 /* always an error */
+
 /* ASCII to FP interfaces, currently only implemented if sCAL
  * support is required.
  */
-#ifdef PNG_sCAL_SUPPORTED
+#if defined(PNG_sCAL_SUPPORTED)
 /* MAX_DIGITS is actually the maximum number of characters in an sCAL
  * width or height, derived from the precision (number of significant
- * digits - a build time settable option) and assumpitions about the
+ * digits - a build time settable option) and assumptions about the
  * maximum ridiculous exponent.
  */
 #define PNG_sCAL_MAX_DIGITS (PNG_sCAL_PRECISION+1/*.*/+1/*E*/+10/*exponent*/)
-#endif
 
-#ifdef PNG_sCAL_SUPPORTED
 #ifdef PNG_FLOATING_POINT_SUPPORTED
-PNG_EXTERN void png_ascii_from_fp PNGARG((png_structp png_ptr, png_charp ascii,
-    png_size_t size, double fp, unsigned int precision));
+PNG_INTERNAL_FUNCTION(void,png_ascii_from_fp,(png_const_structrp png_ptr,
+   png_charp ascii, png_size_t size, double fp, unsigned int precision),
+   PNG_EMPTY);
 #endif /* FLOATING_POINT */
 
 #ifdef PNG_FIXED_POINT_SUPPORTED
-PNG_EXTERN void png_ascii_from_fixed PNGARG((png_structp png_ptr,
-    png_charp ascii, png_size_t size, png_fixed_point fp));
+PNG_INTERNAL_FUNCTION(void,png_ascii_from_fixed,(png_const_structrp png_ptr,
+   png_charp ascii, png_size_t size, png_fixed_point fp),PNG_EMPTY);
 #endif /* FIXED_POINT */
-#endif /* READ_sCAL */
+#endif /* sCAL */
 
 #if defined(PNG_sCAL_SUPPORTED) || defined(PNG_pCAL_SUPPORTED)
 /* An internal API to validate the format of a floating point number.
@@ -1544,7 +1703,7 @@ PNG_EXTERN void png_ascii_from_fixed PNGARG((png_structp png_ptr,
  * NOTE: The dangling E problem.
  *   There is a PNG valid floating point number in the following:
  *
- *       PNG floating point numb1.ers are not greedy.
+ *       PNG floating point numbers are not greedy.
  *
  *   Working this out requires *TWO* character lookahead (because of the
  *   sign), the parser does not do this - it will fail at the 'r' - this
@@ -1610,8 +1769,8 @@ PNG_EXTERN void png_ascii_from_fixed PNGARG((png_structp png_ptr,
  * that omits the last character (i.e. set the size to the index of
  * the problem character.)  This has not been tested within libpng.
  */
-PNG_EXTERN int png_check_fp_number PNGARG((png_const_charp string,
-    png_size_t size, int *statep, png_size_tp whereami));
+PNG_INTERNAL_FUNCTION(int,png_check_fp_number,(png_const_charp string,
+   png_size_t size, int *statep, png_size_tp whereami),PNG_EMPTY);
 
 /* This is the same but it checks a complete string and returns true
  * only if it just contains a floating point number.  As of 1.5.4 this
@@ -1619,11 +1778,11 @@ PNG_EXTERN int png_check_fp_number PNGARG((png_const_charp string,
  * it was valid (otherwise it returns 0.)  This can be used for testing
  * for negative or zero values using the sticky flag.
  */
-PNG_EXTERN int png_check_fp_string PNGARG((png_const_charp string,
-    png_size_t size));
+PNG_INTERNAL_FUNCTION(int,png_check_fp_string,(png_const_charp string,
+   png_size_t size),PNG_EMPTY);
 #endif /* pCAL || sCAL */
 
-#if defined(PNG_READ_GAMMA_SUPPORTED) ||\
+#if defined(PNG_GAMMA_SUPPORTED) ||\
     defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG_READ_pHYs_SUPPORTED)
 /* Added at libpng version 1.5.0 */
 /* This is a utility to provide a*times/div (rounded) and indicate
@@ -1631,29 +1790,37 @@ PNG_EXTERN int png_check_fp_string PNGARG((png_const_charp string,
  * for overflow, true (1) if no overflow, in which case *res
  * holds the result.
  */
-PNG_EXTERN int png_muldiv PNGARG((png_fixed_point_p res, png_fixed_point a,
-    png_int_32 multiplied_by, png_int_32 divided_by));
+PNG_INTERNAL_FUNCTION(int,png_muldiv,(png_fixed_point_p res, png_fixed_point a,
+   png_int_32 multiplied_by, png_int_32 divided_by),PNG_EMPTY);
 #endif
 
 #if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_INCH_CONVERSIONS_SUPPORTED)
 /* Same deal, but issue a warning on overflow and return 0. */
-PNG_EXTERN png_fixed_point png_muldiv_warn PNGARG((png_structp png_ptr,
-    png_fixed_point a, png_int_32 multiplied_by, png_int_32 divided_by));
+PNG_INTERNAL_FUNCTION(png_fixed_point,png_muldiv_warn,
+   (png_const_structrp png_ptr, png_fixed_point a, png_int_32 multiplied_by,
+   png_int_32 divided_by),PNG_EMPTY);
 #endif
 
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_GAMMA_SUPPORTED
 /* Calculate a reciprocal - used for gamma values.  This returns
- * 0 if the argument is 0 in order to maintain an undefined value,
+ * 0 if the argument is 0 in order to maintain an undefined value;
  * there are no warnings.
  */
-PNG_EXTERN png_fixed_point png_reciprocal PNGARG((png_fixed_point a));
+PNG_INTERNAL_FUNCTION(png_fixed_point,png_reciprocal,(png_fixed_point a),
+   PNG_EMPTY);
 
+#ifdef PNG_READ_GAMMA_SUPPORTED
 /* The same but gives a reciprocal of the product of two fixed point
  * values.  Accuracy is suitable for gamma calculations but this is
- * not exact - use png_muldiv for that.
+ * not exact - use png_muldiv for that.  Only required at present on read.
  */
-PNG_EXTERN png_fixed_point png_reciprocal2 PNGARG((png_fixed_point a,
-    png_fixed_point b));
+PNG_INTERNAL_FUNCTION(png_fixed_point,png_reciprocal2,(png_fixed_point a,
+   png_fixed_point b),PNG_EMPTY);
+#endif
+
+/* Return true if the gamma value is significantly different from 1.0 */
+PNG_INTERNAL_FUNCTION(int,png_gamma_significant,(png_fixed_point gamma_value),
+   PNG_EMPTY);
 #endif
 
 #ifdef PNG_READ_GAMMA_SUPPORTED
@@ -1664,73 +1831,73 @@ PNG_EXTERN png_fixed_point png_reciprocal2 PNGARG((png_fixed_point a,
  * While the input is an 'unsigned' value it must actually be the
  * correct bit value - 0..255 or 0..65535 as required.
  */
-PNG_EXTERN png_uint_16 png_gamma_correct PNGARG((png_structp png_ptr,
-    unsigned int value, png_fixed_point gamma_value));
-PNG_EXTERN int png_gamma_significant PNGARG((png_fixed_point gamma_value));
-PNG_EXTERN png_uint_16 png_gamma_16bit_correct PNGARG((unsigned int value,
-    png_fixed_point gamma_value));
-PNG_EXTERN png_byte png_gamma_8bit_correct PNGARG((unsigned int value,
-    png_fixed_point gamma_value));
-PNG_EXTERN void png_destroy_gamma_table(png_structp png_ptr);
-PNG_EXTERN void png_build_gamma_table PNGARG((png_structp png_ptr,
-    int bit_depth));
-#endif
-
-/* Missing declarations if FIXED_POINT is *not* supported - fixed properly
- * in libpng 1.6
- */
-#ifndef PNG_FIXED_POINT_SUPPORTED
-#ifdef PNG_cHRM_SUPPORTED
-PNG_EXTERN png_uint_32 png_get_cHRM_XYZ_fixed PNGARG(
-    (png_structp png_ptr, png_const_infop info_ptr,
-    png_fixed_point *int_red_X, png_fixed_point *int_red_Y,
-    png_fixed_point *int_red_Z, png_fixed_point *int_green_X,
-    png_fixed_point *int_green_Y, png_fixed_point *int_green_Z,
-    png_fixed_point *int_blue_X, png_fixed_point *int_blue_Y,
-    png_fixed_point *int_blue_Z));
-PNG_EXTERN void png_set_cHRM_XYZ_fixed PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_fixed_point int_red_X, png_fixed_point int_red_Y,
-    png_fixed_point int_red_Z, png_fixed_point int_green_X,
-    png_fixed_point int_green_Y, png_fixed_point int_green_Z,
-    png_fixed_point int_blue_X, png_fixed_point int_blue_Y,
-    png_fixed_point int_blue_Z));
-PNG_EXTERN void png_set_cHRM_fixed PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_fixed_point int_white_x,
-    png_fixed_point int_white_y, png_fixed_point int_red_x,
-    png_fixed_point int_red_y, png_fixed_point int_green_x,
-    png_fixed_point int_green_y, png_fixed_point int_blue_x,
-    png_fixed_point int_blue_y));
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-PNG_EXTERN png_uint_32 png_get_gAMA_fixed PNGARG(
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_fixed_point *int_file_gamma));
-PNG_EXTERN void png_set_gAMA_fixed PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_fixed_point int_file_gamma));
-#endif
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-PNG_EXTERN void png_set_background_fixed PNGARG((png_structp png_ptr,
-    png_const_color_16p background_color, int background_gamma_code,
-    int need_expand, png_fixed_point background_gamma));
-#endif
-
-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-PNG_EXTERN void png_set_alpha_mode_fixed PNGARG((png_structp png_ptr,
-    int mode, png_fixed_point output_gamma));
-#endif
+PNG_INTERNAL_FUNCTION(png_uint_16,png_gamma_correct,(png_structrp png_ptr,
+   unsigned int value, png_fixed_point gamma_value),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(png_uint_16,png_gamma_16bit_correct,(unsigned int value,
+   png_fixed_point gamma_value),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(png_byte,png_gamma_8bit_correct,(unsigned int value,
+   png_fixed_point gamma_value),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_destroy_gamma_table,(png_structrp png_ptr),
+   PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void,png_build_gamma_table,(png_structrp png_ptr,
+   int bit_depth),PNG_EMPTY);
+#endif
+
+/* SIMPLIFIED READ/WRITE SUPPORT */
+#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) ||\
+   defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
+/* The internal structure that png_image::opaque points to. */
+typedef struct png_control
+{
+   png_structp png_ptr;
+   png_infop   info_ptr;
+   png_voidp   error_buf;           /* Always a jmp_buf at present. */
 
-#ifdef PNG_READ_GAMMA_SUPPORTED
-PNG_EXTERN void png_set_gamma_fixed PNGARG((png_structp png_ptr,
-    png_fixed_point screen_gamma, png_fixed_point override_file_gamma));
+   png_const_bytep memory;          /* Memory buffer. */
+   png_size_t      size;            /* Size of the memory buffer. */
+
+   unsigned int for_write       :1; /* Otherwise it is a read structure */
+   unsigned int owned_file      :1; /* We own the file in io_ptr */
+} png_control;
+
+/* Return the pointer to the jmp_buf from a png_control: necessary because C
+ * does not reveal the type of the elements of jmp_buf.
+ */
+#ifdef __cplusplus
+#  define png_control_jmp_buf(pc) (((jmp_buf*)((pc)->error_buf))[0])
+#else
+#  define png_control_jmp_buf(pc) ((pc)->error_buf)
 #endif
 
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-PNG_EXTERN void png_set_rgb_to_gray_fixed PNGARG((png_structp png_ptr,
-    int error_action, png_fixed_point red, png_fixed_point green));
+/* Utility to safely execute a piece of libpng code catching and logging any
+ * errors that might occur.  Returns true on success, false on failure (either
+ * of the function or as a result of a png_error.)
+ */
+PNG_INTERNAL_CALLBACK(void,png_safe_error,(png_structp png_ptr,
+   png_const_charp error_message),PNG_NORETURN);
+
+#ifdef PNG_WARNINGS_SUPPORTED
+PNG_INTERNAL_CALLBACK(void,png_safe_warning,(png_structp png_ptr,
+   png_const_charp warning_message),PNG_EMPTY);
+#else
+#  define png_safe_warning 0/*dummy argument*/
 #endif
-#endif /* FIX MISSING !FIXED_POINT DECLARATIONS */
+
+PNG_INTERNAL_FUNCTION(int,png_safe_execute,(png_imagep image,
+   int (*function)(png_voidp), png_voidp arg),PNG_EMPTY);
+
+/* Utility to log an error; this also cleans up the png_image; the function
+ * always returns 0 (false).
+ */
+PNG_INTERNAL_FUNCTION(int,png_image_error,(png_imagep image,
+   png_const_charp error_message),PNG_EMPTY);
+
+#ifndef PNG_SIMPLIFIED_READ_SUPPORTED
+/* png_image_free is used by the write code but not exported */
+PNG_INTERNAL_FUNCTION(void, png_image_free, (png_imagep image), PNG_EMPTY);
+#endif /* !SIMPLIFIED_READ */
+
+#endif /* SIMPLIFIED READ/WRITE */
 
 /* These are initialization functions for hardware specific PNG filter
  * optimizations; list these here then select the appropriate one at compile
@@ -1738,17 +1905,21 @@ PNG_EXTERN void png_set_rgb_to_gray_fixed PNGARG((png_structp png_ptr,
  * the generic code is used.
  */
 #ifdef PNG_FILTER_OPTIMIZATIONS
-PNG_EXTERN void PNG_FILTER_OPTIMIZATIONS(png_structp png_ptr, unsigned int bpp);
+PNG_INTERNAL_FUNCTION(void, PNG_FILTER_OPTIMIZATIONS, (png_structp png_ptr,
+   unsigned int bpp), PNG_EMPTY);
    /* Just declare the optimization that will be used */
 #else
    /* List *all* the possible optimizations here - this branch is required if
     * the builder of libpng passes the definition of PNG_FILTER_OPTIMIZATIONS in
     * CFLAGS in place of CPPFLAGS *and* uses symbol prefixing.
     */
-PNG_EXTERN void png_init_filter_functions_neon(png_structp png_ptr,
-    unsigned int bpp);
+PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_neon,
+   (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
 #endif
 
+PNG_INTERNAL_FUNCTION(png_uint_32, png_check_keyword, (png_structrp png_ptr,
+   png_const_charp key, png_bytep new_key), PNG_EMPTY);
+
 /* Maintainer: Put new private prototypes here ^ */
 
 #include "pngdebug.h"
diff --git a/drivers/png/pngread.c b/drivers/png/pngread.c
index b90e017e62..0ff6238023 100644
--- a/drivers/png/pngread.c
+++ b/drivers/png/pngread.c
@@ -1,8 +1,8 @@
 
 /* pngread.c - read a PNG file
  *
- * Last changed in libpng 1.5.23 [July 23, 2015]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.23 [June 9, 2016]
+ * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -15,6 +15,9 @@
  */
 
 #include "pngpriv.h"
+#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) && defined(PNG_STDIO_SUPPORTED)
+#  include <errno.h>
+#endif
 
 #ifdef PNG_READ_SUPPORTED
 
@@ -23,10 +26,12 @@ PNG_FUNCTION(png_structp,PNGAPI
 png_create_read_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
     png_error_ptr error_fn, png_error_ptr warn_fn),PNG_ALLOCATED)
 {
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   return (png_create_read_struct_2(user_png_ver, error_ptr, error_fn,
-       warn_fn, NULL, NULL, NULL));
+#ifndef PNG_USER_MEM_SUPPORTED
+   png_structp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
+      error_fn, warn_fn, NULL, NULL, NULL);
+#else
+   return png_create_read_struct_2(user_png_ver, error_ptr, error_fn,
+       warn_fn, NULL, NULL, NULL);
 }
 
 /* Alternate create PNG structure for reading, and allocate any memory
@@ -37,131 +42,40 @@ png_create_read_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,
     png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
     png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)
 {
-#endif /* PNG_USER_MEM_SUPPORTED */
-
-#ifdef PNG_SETJMP_SUPPORTED
-   volatile
-#endif
-   png_structp png_ptr;
-   volatile int png_cleanup_needed = 0;
-
-#ifdef PNG_SETJMP_SUPPORTED
-#ifdef USE_FAR_KEYWORD
-   jmp_buf tmp_jmpbuf;
-#endif
-#endif
-
-   png_debug(1, "in png_create_read_struct");
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,
-       malloc_fn, mem_ptr);
-#else
-   png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
-#endif
-   if (png_ptr == NULL)
-      return (NULL);
-
-   /* Added at libpng-1.2.6 */
-#ifdef PNG_USER_LIMITS_SUPPORTED
-   png_ptr->user_width_max = PNG_USER_WIDTH_MAX;
-   png_ptr->user_height_max = PNG_USER_HEIGHT_MAX;
-
-   /* Added at libpng-1.2.43 and 1.4.0 */
-   png_ptr->user_chunk_cache_max = PNG_USER_CHUNK_CACHE_MAX;
-
-   /* Added at libpng-1.2.43 and 1.4.1 */
-   png_ptr->user_chunk_malloc_max = PNG_USER_CHUNK_MALLOC_MAX;
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-/* Applications that neglect to set up their own setjmp() and then
- * encounter a png_error() will longjmp here.  Since the jmpbuf is
- * then meaningless we abort instead of returning.
- */
-#ifdef USE_FAR_KEYWORD
-   if (setjmp(tmp_jmpbuf))
-#else
-   if (setjmp(png_jmpbuf(png_ptr))) /* Sets longjmp to match setjmp */
-#endif
-      PNG_ABORT();
-#ifdef USE_FAR_KEYWORD
-   png_memcpy(png_jmpbuf(png_ptr), tmp_jmpbuf, png_sizeof(jmp_buf));
-#endif
-#endif /* PNG_SETJMP_SUPPORTED */
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
-#endif
+   png_structp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
+      error_fn, warn_fn, mem_ptr, malloc_fn, free_fn);
+#endif /* USER_MEM */
 
-   png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
-
-   /* Call the general version checker (shared with read and write code): */
-   if (!png_user_version_check(png_ptr, user_png_ver))
-      png_cleanup_needed = 1;
-
-   if (png_cleanup_needed == 0)
+   if (png_ptr != NULL)
    {
-   /* Initialize zbuf - compression buffer */
-   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
-   png_ptr->zbuf = (png_bytep)png_malloc_warn(png_ptr, png_ptr->zbuf_size);
-
-   if (png_ptr->zbuf == NULL)
-      png_cleanup_needed = 1;
-   }
-
-   png_ptr->zstream.zalloc = png_zalloc;
-   png_ptr->zstream.zfree = png_zfree;
-   png_ptr->zstream.opaque = (voidpf)png_ptr;
+      png_ptr->mode = PNG_IS_READ_STRUCT;
 
-   if (png_cleanup_needed == 0)
-   {
-      switch (inflateInit(&png_ptr->zstream))
-      {
-         case Z_OK:
-            break; /* Do nothing */
-
-         case Z_MEM_ERROR:
-            png_warning(png_ptr, "zlib memory error");
-            png_cleanup_needed = 1;
-            break;
-
-         case Z_STREAM_ERROR:
-            png_warning(png_ptr, "zlib stream error");
-            png_cleanup_needed = 1;
-            break;
-
-         case Z_VERSION_ERROR:
-            png_warning(png_ptr, "zlib version error");
-            png_cleanup_needed = 1;
-            break;
+      /* Added in libpng-1.6.0; this can be used to detect a read structure if
+       * required (it will be zero in a write structure.)
+       */
+#     ifdef PNG_SEQUENTIAL_READ_SUPPORTED
+         png_ptr->IDAT_read_size = PNG_IDAT_READ_SIZE;
+#     endif
 
-         default: png_warning(png_ptr, "Unknown zlib error");
-            png_cleanup_needed = 1;
-      }
-   }
+#     ifdef PNG_BENIGN_READ_ERRORS_SUPPORTED
+         png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN;
 
-   if (png_cleanup_needed != 0)
-   {
-      /* Clean up PNG structure and deallocate any memory. */
-      png_free(png_ptr, png_ptr->zbuf);
-      png_ptr->zbuf = NULL;
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)png_ptr,
-          (png_free_ptr)free_fn, (png_voidp)mem_ptr);
-#else
-      png_destroy_struct((png_voidp)png_ptr);
-#endif
-      return (NULL);
+         /* In stable builds only warn if an application error can be completely
+          * handled.
+          */
+#        if PNG_RELEASE_BUILD
+            png_ptr->flags |= PNG_FLAG_APP_WARNINGS_WARN;
+#        endif
+#     endif
+
+      /* TODO: delay this, it can be done in png_init_io (if the app doesn't
+       * do it itself) avoiding setting the default function if it is not
+       * required.
+       */
+      png_set_read_fn(png_ptr, NULL, NULL);
    }
 
-   png_ptr->zstream.next_out = png_ptr->zbuf;
-   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-
-   png_set_read_fn(png_ptr, NULL, NULL);
-
-
-   return (png_ptr);
+   return png_ptr;
 }
 
 
@@ -175,8 +89,12 @@ png_create_read_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,
  * read if it is determined that this isn't a valid PNG file.
  */
 void PNGAPI
-png_read_info(png_structp png_ptr, png_infop info_ptr)
+png_read_info(png_structrp png_ptr, png_inforp info_ptr)
 {
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+   int keep;
+#endif
+
    png_debug(1, "in png_read_info");
 
    if (png_ptr == NULL || info_ptr == NULL)
@@ -190,13 +108,33 @@ png_read_info(png_structp png_ptr, png_infop info_ptr)
       png_uint_32 length = png_read_chunk_header(png_ptr);
       png_uint_32 chunk_name = png_ptr->chunk_name;
 
-      /* This should be a binary subdivision search or a hash for
-       * matching the chunk name rather than a linear search.
+      /* IDAT logic needs to happen here to simplify getting the two flags
+       * right.
        */
       if (chunk_name == png_IDAT)
-         if (png_ptr->mode & PNG_AFTER_IDAT)
-            png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
+      {
+         if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+            png_chunk_error(png_ptr, "Missing IHDR before IDAT");
+
+         else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+             (png_ptr->mode & PNG_HAVE_PLTE) == 0)
+            png_chunk_error(png_ptr, "Missing PLTE before IDAT");
+
+         else if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
+            png_chunk_benign_error(png_ptr, "Too many IDATs found");
+
+         png_ptr->mode |= PNG_HAVE_IDAT;
+      }
+
+      else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
+      {
+         png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
+         png_ptr->mode |= PNG_AFTER_IDAT;
+      }
 
+      /* This should be a binary subdivision search or a hash for
+       * matching the chunk name rather than a linear search.
+       */
       if (chunk_name == png_IHDR)
          png_handle_IHDR(png_ptr, info_ptr, length);
 
@@ -204,26 +142,16 @@ png_read_info(png_structp png_ptr, png_infop info_ptr)
          png_handle_IEND(png_ptr, info_ptr, length);
 
 #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-      else if (png_chunk_unknown_handling(png_ptr, chunk_name) !=
-         PNG_HANDLE_CHUNK_AS_DEFAULT)
+      else if ((keep = png_chunk_unknown_handling(png_ptr, chunk_name)) != 0)
       {
-         if (chunk_name == png_IDAT)
-            png_ptr->mode |= PNG_HAVE_IDAT;
-
-         png_handle_unknown(png_ptr, info_ptr, length);
+         png_handle_unknown(png_ptr, info_ptr, length, keep);
 
          if (chunk_name == png_PLTE)
             png_ptr->mode |= PNG_HAVE_PLTE;
 
          else if (chunk_name == png_IDAT)
          {
-            if (!(png_ptr->mode & PNG_HAVE_IHDR))
-               png_error(png_ptr, "Missing IHDR before IDAT");
-
-            else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-                !(png_ptr->mode & PNG_HAVE_PLTE))
-               png_error(png_ptr, "Missing PLTE before IDAT");
-
+            png_ptr->idat_size = 0; /* It has been consumed */
             break;
          }
       }
@@ -233,15 +161,7 @@ png_read_info(png_structp png_ptr, png_infop info_ptr)
 
       else if (chunk_name == png_IDAT)
       {
-         if (!(png_ptr->mode & PNG_HAVE_IHDR))
-            png_error(png_ptr, "Missing IHDR before IDAT");
-
-         else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-             !(png_ptr->mode & PNG_HAVE_PLTE))
-            png_error(png_ptr, "Missing PLTE before IDAT");
-
          png_ptr->idat_size = length;
-         png_ptr->mode |= PNG_HAVE_IDAT;
          break;
       }
 
@@ -331,27 +251,36 @@ png_read_info(png_structp png_ptr, png_infop info_ptr)
 #endif
 
       else
-         png_handle_unknown(png_ptr, info_ptr, length);
+         png_handle_unknown(png_ptr, info_ptr, length,
+            PNG_HANDLE_CHUNK_AS_DEFAULT);
    }
 }
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+#endif /* SEQUENTIAL_READ */
 
 /* Optional call to update the users info_ptr structure */
 void PNGAPI
-png_read_update_info(png_structp png_ptr, png_infop info_ptr)
+png_read_update_info(png_structrp png_ptr, png_inforp info_ptr)
 {
    png_debug(1, "in png_read_update_info");
 
-   if (png_ptr == NULL)
-      return;
+   if (png_ptr != NULL)
+   {
+      if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)
+      {
+         png_read_start_row(png_ptr);
 
-   png_read_start_row(png_ptr);
+#        ifdef PNG_READ_TRANSFORMS_SUPPORTED
+            png_read_transform_info(png_ptr, info_ptr);
+#        else
+            PNG_UNUSED(info_ptr)
+#        endif
+      }
 
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-   png_read_transform_info(png_ptr, info_ptr);
-#else
-   PNG_UNUSED(info_ptr)
-#endif
+      /* New in 1.6.0 this avoids the bug of doing the initializations twice */
+      else
+         png_app_error(png_ptr,
+            "png_read_update_info/png_start_read_image: duplicate call");
+   }
 }
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
@@ -361,21 +290,93 @@ png_read_update_info(png_structp png_ptr, png_infop info_ptr)
  * If the user doesn't call this, we will do it ourselves.
  */
 void PNGAPI
-png_start_read_image(png_structp png_ptr)
+png_start_read_image(png_structrp png_ptr)
 {
    png_debug(1, "in png_start_read_image");
 
    if (png_ptr != NULL)
-     png_read_start_row(png_ptr);
+   {
+      if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)
+         png_read_start_row(png_ptr);
+
+      /* New in 1.6.0 this avoids the bug of doing the initializations twice */
+      else
+         png_app_error(png_ptr,
+            "png_start_read_image/png_read_update_info: duplicate call");
+   }
 }
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+#endif /* SEQUENTIAL_READ */
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-void PNGAPI
-png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+/* Undoes intrapixel differencing,
+ * NOTE: this is apparently only supported in the 'sequential' reader.
+ */
+static void
+png_do_read_intrapixel(png_row_infop row_info, png_bytep row)
 {
-   int ret;
+   png_debug(1, "in png_do_read_intrapixel");
 
+   if (
+       (row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
+   {
+      int bytes_per_pixel;
+      png_uint_32 row_width = row_info->width;
+
+      if (row_info->bit_depth == 8)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 3;
+
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 4;
+
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            *(rp) = (png_byte)((256 + *rp + *(rp + 1)) & 0xff);
+            *(rp+2) = (png_byte)((256 + *(rp + 2) + *(rp + 1)) & 0xff);
+         }
+      }
+      else if (row_info->bit_depth == 16)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 6;
+
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 8;
+
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            png_uint_32 s0   = (*(rp    ) << 8) | *(rp + 1);
+            png_uint_32 s1   = (*(rp + 2) << 8) | *(rp + 3);
+            png_uint_32 s2   = (*(rp + 4) << 8) | *(rp + 5);
+            png_uint_32 red  = (s0 + s1 + 65536) & 0xffff;
+            png_uint_32 blue = (s2 + s1 + 65536) & 0xffff;
+            *(rp    ) = (png_byte)((red >> 8) & 0xff);
+            *(rp + 1) = (png_byte)(red & 0xff);
+            *(rp + 4) = (png_byte)((blue >> 8) & 0xff);
+            *(rp + 5) = (png_byte)(blue & 0xff);
+         }
+      }
+   }
+}
+#endif /* MNG_FEATURES */
+
+void PNGAPI
+png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row)
+{
    png_row_info row_info;
 
    if (png_ptr == NULL)
@@ -387,7 +388,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
    /* png_read_start_row sets the information (in particular iwidth) for this
     * interlace pass.
     */
-   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+   if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)
       png_read_start_row(png_ptr);
 
    /* 1.5.6: row_info moved out of png_struct to a local here. */
@@ -398,45 +399,47 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
    row_info.pixel_depth = png_ptr->pixel_depth;
    row_info.rowbytes = PNG_ROWBYTES(row_info.pixel_depth, row_info.width);
 
+#ifdef PNG_WARNINGS_SUPPORTED
    if (png_ptr->row_number == 0 && png_ptr->pass == 0)
    {
    /* Check for transforms that have been set but were defined out */
 #if defined(PNG_WRITE_INVERT_SUPPORTED) && !defined(PNG_READ_INVERT_SUPPORTED)
-   if (png_ptr->transformations & PNG_INVERT_MONO)
+   if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)
       png_warning(png_ptr, "PNG_READ_INVERT_SUPPORTED is not defined");
 #endif
 
 #if defined(PNG_WRITE_FILLER_SUPPORTED) && !defined(PNG_READ_FILLER_SUPPORTED)
-   if (png_ptr->transformations & PNG_FILLER)
+   if ((png_ptr->transformations & PNG_FILLER) != 0)
       png_warning(png_ptr, "PNG_READ_FILLER_SUPPORTED is not defined");
 #endif
 
 #if defined(PNG_WRITE_PACKSWAP_SUPPORTED) && \
     !defined(PNG_READ_PACKSWAP_SUPPORTED)
-   if (png_ptr->transformations & PNG_PACKSWAP)
+   if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
       png_warning(png_ptr, "PNG_READ_PACKSWAP_SUPPORTED is not defined");
 #endif
 
 #if defined(PNG_WRITE_PACK_SUPPORTED) && !defined(PNG_READ_PACK_SUPPORTED)
-   if (png_ptr->transformations & PNG_PACK)
+   if ((png_ptr->transformations & PNG_PACK) != 0)
       png_warning(png_ptr, "PNG_READ_PACK_SUPPORTED is not defined");
 #endif
 
 #if defined(PNG_WRITE_SHIFT_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED)
-   if (png_ptr->transformations & PNG_SHIFT)
+   if ((png_ptr->transformations & PNG_SHIFT) != 0)
       png_warning(png_ptr, "PNG_READ_SHIFT_SUPPORTED is not defined");
 #endif
 
 #if defined(PNG_WRITE_BGR_SUPPORTED) && !defined(PNG_READ_BGR_SUPPORTED)
-   if (png_ptr->transformations & PNG_BGR)
+   if ((png_ptr->transformations & PNG_BGR) != 0)
       png_warning(png_ptr, "PNG_READ_BGR_SUPPORTED is not defined");
 #endif
 
 #if defined(PNG_WRITE_SWAP_SUPPORTED) && !defined(PNG_READ_SWAP_SUPPORTED)
-   if (png_ptr->transformations & PNG_SWAP_BYTES)
+   if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)
       png_warning(png_ptr, "PNG_READ_SWAP_SUPPORTED is not defined");
 #endif
    }
+#endif /* WARNINGS */
 
 #ifdef PNG_READ_INTERLACING_SUPPORTED
    /* If interlaced and we do not need a new row, combine row and return.
@@ -445,7 +448,8 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
     * untransformed) and, because of the libpng API for interlaced images, this
     * means we must transform before de-interlacing.
     */
-   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+   if (png_ptr->interlaced != 0 &&
+       (png_ptr->transformations & PNG_INTERLACE) != 0)
    {
       switch (png_ptr->pass)
       {
@@ -502,6 +506,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
                return;
             }
             break;
+
          case 5:
             if ((png_ptr->row_number & 1) || png_ptr->width < 2)
             {
@@ -515,7 +520,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
 
          default:
          case 6:
-            if (!(png_ptr->row_number & 1))
+            if ((png_ptr->row_number & 1) == 0)
             {
                png_read_finish_row(png_ptr);
                return;
@@ -525,52 +530,11 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
    }
 #endif
 
-   if (!(png_ptr->mode & PNG_HAVE_IDAT))
+   if ((png_ptr->mode & PNG_HAVE_IDAT) == 0)
       png_error(png_ptr, "Invalid attempt to read row data");
 
-   png_ptr->zstream.next_out = png_ptr->row_buf;
-   png_ptr->zstream.avail_out =
-       (uInt)(PNG_ROWBYTES(png_ptr->pixel_depth,
-       png_ptr->iwidth) + 1);
-
-   do
-   {
-      if (!(png_ptr->zstream.avail_in))
-      {
-         while (!png_ptr->idat_size)
-         {
-            png_crc_finish(png_ptr, 0);
-
-            png_ptr->idat_size = png_read_chunk_header(png_ptr);
-            if (png_ptr->chunk_name != png_IDAT)
-               png_error(png_ptr, "Not enough image data");
-         }
-         png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
-         png_ptr->zstream.next_in = png_ptr->zbuf;
-         if (png_ptr->zbuf_size > png_ptr->idat_size)
-            png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
-         png_crc_read(png_ptr, png_ptr->zbuf,
-             (png_size_t)png_ptr->zstream.avail_in);
-         png_ptr->idat_size -= png_ptr->zstream.avail_in;
-      }
-
-      ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
-
-      if (ret == Z_STREAM_END)
-      {
-         if (png_ptr->zstream.avail_out || png_ptr->zstream.avail_in ||
-             png_ptr->idat_size)
-            png_benign_error(png_ptr, "Extra compressed data");
-         png_ptr->mode |= PNG_AFTER_IDAT;
-         png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-         break;
-      }
-
-      if (ret != Z_OK)
-         png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
-             "Decompression error");
-
-   } while (png_ptr->zstream.avail_out);
+   /* Fill the row with IDAT data: */
+   png_read_IDAT_data(png_ptr, png_ptr->row_buf, row_info.rowbytes + 1);
 
    if (png_ptr->row_buf[0] > PNG_FILTER_VALUE_NONE)
    {
@@ -586,10 +550,10 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
     * it may not be in the future, so this was changed just to copy the
     * interlaced count:
     */
-   png_memcpy(png_ptr->prev_row, png_ptr->row_buf, row_info.rowbytes + 1);
+   memcpy(png_ptr->prev_row, png_ptr->row_buf, row_info.rowbytes + 1);
 
 #ifdef PNG_MNG_FEATURES_SUPPORTED
-   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
        (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
    {
       /* Intrapixel differencing */
@@ -597,7 +561,6 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
    }
 #endif
 
-
 #ifdef PNG_READ_TRANSFORMS_SUPPORTED
    if (png_ptr->transformations)
       png_do_read_transformations(png_ptr, &row_info);
@@ -615,9 +578,9 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
       png_error(png_ptr, "internal sequential row size calculation error");
 
 #ifdef PNG_READ_INTERLACING_SUPPORTED
-   /* Blow up interlaced rows to full size */
-   if (png_ptr->interlaced &&
-       (png_ptr->transformations & PNG_INTERLACE))
+   /* Expand interlaced rows to full size */
+   if (png_ptr->interlaced != 0 &&
+      (png_ptr->transformations & PNG_INTERLACE) != 0)
    {
       if (png_ptr->pass < 6)
          png_do_read_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass,
@@ -643,8 +606,9 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
 
    if (png_ptr->read_row_fn != NULL)
       (*(png_ptr->read_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
+
 }
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+#endif /* SEQUENTIAL_READ */
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read one or more rows of image data.  If the image is interlaced,
@@ -672,7 +636,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
  */
 
 void PNGAPI
-png_read_rows(png_structp png_ptr, png_bytepp row,
+png_read_rows(png_structrp png_ptr, png_bytepp row,
     png_bytepp display_row, png_uint_32 num_rows)
 {
    png_uint_32 i;
@@ -711,7 +675,7 @@ png_read_rows(png_structp png_ptr, png_bytepp row,
          dp++;
       }
 }
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+#endif /* SEQUENTIAL_READ */
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read the entire image.  If the image has an alpha channel or a tRNS
@@ -727,7 +691,7 @@ png_read_rows(png_structp png_ptr, png_bytepp row,
  * [*] png_handle_alpha() does not exist yet, as of this version of libpng
  */
 void PNGAPI
-png_read_image(png_structp png_ptr, png_bytepp image)
+png_read_image(png_structrp png_ptr, png_bytepp image)
 {
    png_uint_32 i, image_height;
    int pass, j;
@@ -739,7 +703,7 @@ png_read_image(png_structp png_ptr, png_bytepp image)
       return;
 
 #ifdef PNG_READ_INTERLACING_SUPPORTED
-   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+   if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)
    {
       pass = png_set_interlace_handling(png_ptr);
       /* And make sure transforms are initialized. */
@@ -747,7 +711,8 @@ png_read_image(png_structp png_ptr, png_bytepp image)
    }
    else
    {
-      if (png_ptr->interlaced && !(png_ptr->transformations & PNG_INTERLACE))
+      if (png_ptr->interlaced != 0 &&
+          (png_ptr->transformations & PNG_INTERLACE) == 0)
       {
          /* Caller called png_start_read_image or png_read_update_info without
           * first turning on the PNG_INTERLACE transform.  We can fix this here,
@@ -784,7 +749,7 @@ png_read_image(png_structp png_ptr, png_bytepp image)
       }
    }
 }
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+#endif /* SEQUENTIAL_READ */
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read the end of the PNG file.  Will not read past the end of the
@@ -792,14 +757,24 @@ png_read_image(png_structp png_ptr, png_bytepp image)
  * or time information at the end of the file, if info is not NULL.
  */
 void PNGAPI
-png_read_end(png_structp png_ptr, png_infop info_ptr)
+png_read_end(png_structrp png_ptr, png_inforp info_ptr)
 {
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+   int keep;
+#endif
+
    png_debug(1, "in png_read_end");
 
    if (png_ptr == NULL)
       return;
 
-   png_crc_finish(png_ptr, 0); /* Finish off CRC from last IDAT chunk */
+   /* If png_read_end is called in the middle of reading the rows there may
+    * still be pending IDAT data and an owned zstream.  Deal with this here.
+    */
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+   if (png_chunk_unknown_handling(png_ptr, png_IDAT) == 0)
+#endif
+      png_read_finish_IDAT(png_ptr);
 
 #ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
    /* Report invalid palette index; added at libng-1.5.10 */
@@ -813,22 +788,28 @@ png_read_end(png_structp png_ptr, png_infop info_ptr)
       png_uint_32 length = png_read_chunk_header(png_ptr);
       png_uint_32 chunk_name = png_ptr->chunk_name;
 
-      if (chunk_name == png_IHDR)
-         png_handle_IHDR(png_ptr, info_ptr, length);
+      if (chunk_name != png_IDAT)
+         png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
 
-      else if (chunk_name == png_IEND)
+      if (chunk_name == png_IEND)
          png_handle_IEND(png_ptr, info_ptr, length);
 
+      else if (chunk_name == png_IHDR)
+         png_handle_IHDR(png_ptr, info_ptr, length);
+
+      else if (info_ptr == NULL)
+         png_crc_finish(png_ptr, length);
+
 #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-      else if (png_chunk_unknown_handling(png_ptr, chunk_name) !=
-         PNG_HANDLE_CHUNK_AS_DEFAULT)
+      else if ((keep = png_chunk_unknown_handling(png_ptr, chunk_name)) != 0)
       {
          if (chunk_name == png_IDAT)
          {
-            if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
-               png_benign_error(png_ptr, "Too many IDATs found");
+            if ((length > 0 && !(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED))
+                || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) != 0)
+               png_benign_error(png_ptr, ".Too many IDATs found");
          }
-         png_handle_unknown(png_ptr, info_ptr, length);
+         png_handle_unknown(png_ptr, info_ptr, length, keep);
          if (chunk_name == png_PLTE)
             png_ptr->mode |= PNG_HAVE_PLTE;
       }
@@ -837,10 +818,14 @@ png_read_end(png_structp png_ptr, png_infop info_ptr)
       else if (chunk_name == png_IDAT)
       {
          /* Zero length IDATs are legal after the last IDAT has been
-          * read, but not after other chunks have been read.
+          * read, but not after other chunks have been read.  1.6 does not
+          * always read all the deflate data; specifically it cannot be relied
+          * upon to read the Adler32 at the end.  If it doesn't ignore IDAT
+          * chunks which are longer than zero as well:
           */
-         if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
-            png_benign_error(png_ptr, "Too many IDATs found");
+         if ((length > 0 && !(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED))
+             || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) != 0)
+            png_benign_error(png_ptr, "..Too many IDATs found");
 
          png_crc_finish(png_ptr, length);
       }
@@ -933,181 +918,106 @@ png_read_end(png_structp png_ptr, png_infop info_ptr)
 #endif
 
       else
-         png_handle_unknown(png_ptr, info_ptr, length);
-   } while (!(png_ptr->mode & PNG_HAVE_IEND));
-}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-
-/* Free all memory used by the read */
-void PNGAPI
-png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr,
-    png_infopp end_info_ptr_ptr)
-{
-   png_structp png_ptr = NULL;
-   png_infop info_ptr = NULL, end_info_ptr = NULL;
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_free_ptr free_fn = NULL;
-   png_voidp mem_ptr = NULL;
-#endif
-
-   png_debug(1, "in png_destroy_read_struct");
-
-   if (png_ptr_ptr != NULL)
-      png_ptr = *png_ptr_ptr;
-   if (png_ptr == NULL)
-      return;
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   free_fn = png_ptr->free_fn;
-   mem_ptr = png_ptr->mem_ptr;
-#endif
-
-   if (info_ptr_ptr != NULL)
-      info_ptr = *info_ptr_ptr;
-
-   if (end_info_ptr_ptr != NULL)
-      end_info_ptr = *end_info_ptr_ptr;
-
-   png_read_destroy(png_ptr, info_ptr, end_info_ptr);
-
-   if (info_ptr != NULL)
-   {
-#ifdef PNG_TEXT_SUPPORTED
-      png_free_data(png_ptr, info_ptr, PNG_FREE_TEXT, -1);
-#endif
-
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)info_ptr, (png_free_ptr)free_fn,
-          (png_voidp)mem_ptr);
-#else
-      png_destroy_struct((png_voidp)info_ptr);
-#endif
-      *info_ptr_ptr = NULL;
-   }
-
-   if (end_info_ptr != NULL)
-   {
-#ifdef PNG_READ_TEXT_SUPPORTED
-      png_free_data(png_ptr, end_info_ptr, PNG_FREE_TEXT, -1);
-#endif
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)end_info_ptr, (png_free_ptr)free_fn,
-          (png_voidp)mem_ptr);
-#else
-      png_destroy_struct((png_voidp)end_info_ptr);
-#endif
-      *end_info_ptr_ptr = NULL;
-   }
-
-   if (png_ptr != NULL)
-   {
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)png_ptr, (png_free_ptr)free_fn,
-          (png_voidp)mem_ptr);
-#else
-      png_destroy_struct((png_voidp)png_ptr);
-#endif
-      *png_ptr_ptr = NULL;
-   }
+         png_handle_unknown(png_ptr, info_ptr, length,
+            PNG_HANDLE_CHUNK_AS_DEFAULT);
+   } while ((png_ptr->mode & PNG_HAVE_IEND) == 0);
 }
+#endif /* SEQUENTIAL_READ */
 
-/* Free all memory used by the read (old method) */
-void /* PRIVATE */
-png_read_destroy(png_structp png_ptr, png_infop info_ptr,
-    png_infop end_info_ptr)
+/* Free all memory used in the read struct */
+static void
+png_read_destroy(png_structrp png_ptr)
 {
-#ifdef PNG_SETJMP_SUPPORTED
-   jmp_buf tmp_jmp;
-#endif
-   png_error_ptr error_fn;
-#ifdef PNG_WARNINGS_SUPPORTED
-   png_error_ptr warning_fn;
-#endif
-   png_voidp error_ptr;
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_free_ptr free_fn;
-#endif
-
    png_debug(1, "in png_read_destroy");
 
-   if (info_ptr != NULL)
-      png_info_destroy(png_ptr, info_ptr);
-
-   if (end_info_ptr != NULL)
-      png_info_destroy(png_ptr, end_info_ptr);
-
 #ifdef PNG_READ_GAMMA_SUPPORTED
    png_destroy_gamma_table(png_ptr);
 #endif
 
-   png_free(png_ptr, png_ptr->zbuf);
    png_free(png_ptr, png_ptr->big_row_buf);
+   png_ptr->big_row_buf = NULL;
    png_free(png_ptr, png_ptr->big_prev_row);
-   png_free(png_ptr, png_ptr->chunkdata);
+   png_ptr->big_prev_row = NULL;
+   png_free(png_ptr, png_ptr->read_buffer);
+   png_ptr->read_buffer = NULL;
 
 #ifdef PNG_READ_QUANTIZE_SUPPORTED
    png_free(png_ptr, png_ptr->palette_lookup);
+   png_ptr->palette_lookup = NULL;
    png_free(png_ptr, png_ptr->quantize_index);
+   png_ptr->quantize_index = NULL;
 #endif
 
-   if (png_ptr->free_me & PNG_FREE_PLTE)
+   if ((png_ptr->free_me & PNG_FREE_PLTE) != 0)
+   {
       png_zfree(png_ptr, png_ptr->palette);
+      png_ptr->palette = NULL;
+   }
    png_ptr->free_me &= ~PNG_FREE_PLTE;
 
 #if defined(PNG_tRNS_SUPPORTED) || \
     defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-   if (png_ptr->free_me & PNG_FREE_TRNS)
+   if ((png_ptr->free_me & PNG_FREE_TRNS) != 0)
+   {
       png_free(png_ptr, png_ptr->trans_alpha);
+      png_ptr->trans_alpha = NULL;
+   }
    png_ptr->free_me &= ~PNG_FREE_TRNS;
 #endif
 
-#ifdef PNG_READ_hIST_SUPPORTED
-   if (png_ptr->free_me & PNG_FREE_HIST)
-      png_free(png_ptr, png_ptr->hist);
-   png_ptr->free_me &= ~PNG_FREE_HIST;
-#endif
-
    inflateEnd(&png_ptr->zstream);
 
 #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
    png_free(png_ptr, png_ptr->save_buffer);
+   png_ptr->save_buffer = NULL;
 #endif
 
-   /* Save the important info out of the png_struct, in case it is
-    * being used again.
-    */
-#ifdef PNG_SETJMP_SUPPORTED
-   png_memcpy(tmp_jmp, png_ptr->longjmp_buffer, png_sizeof(jmp_buf));
+#if defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) && \
+   defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+   png_free(png_ptr, png_ptr->unknown_chunk.data);
+   png_ptr->unknown_chunk.data = NULL;
 #endif
 
-   error_fn = png_ptr->error_fn;
-#ifdef PNG_WARNINGS_SUPPORTED
-   warning_fn = png_ptr->warning_fn;
-#endif
-   error_ptr = png_ptr->error_ptr;
-#ifdef PNG_USER_MEM_SUPPORTED
-   free_fn = png_ptr->free_fn;
+#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
+   png_free(png_ptr, png_ptr->chunk_list);
+   png_ptr->chunk_list = NULL;
 #endif
 
-   png_memset(png_ptr, 0, png_sizeof(png_struct));
+   /* NOTE: the 'setjmp' buffer may still be allocated and the memory and error
+    * callbacks are still set at this point.  They are required to complete the
+    * destruction of the png_struct itself.
+    */
+}
 
-   png_ptr->error_fn = error_fn;
-#ifdef PNG_WARNINGS_SUPPORTED
-   png_ptr->warning_fn = warning_fn;
-#endif
-   png_ptr->error_ptr = error_ptr;
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_ptr->free_fn = free_fn;
-#endif
+/* Free all memory used by the read */
+void PNGAPI
+png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr,
+    png_infopp end_info_ptr_ptr)
+{
+   png_structrp png_ptr = NULL;
 
-#ifdef PNG_SETJMP_SUPPORTED
-   png_memcpy(png_ptr->longjmp_buffer, tmp_jmp, png_sizeof(jmp_buf));
-#endif
+   png_debug(1, "in png_destroy_read_struct");
+
+   if (png_ptr_ptr != NULL)
+      png_ptr = *png_ptr_ptr;
+
+   if (png_ptr == NULL)
+      return;
 
+   /* libpng 1.6.0: use the API to destroy info structs to ensure consistent
+    * behavior.  Prior to 1.6.0 libpng did extra 'info' destruction in this API.
+    * The extra was, apparently, unnecessary yet this hides memory leak bugs.
+    */
+   png_destroy_info_struct(png_ptr, end_info_ptr_ptr);
+   png_destroy_info_struct(png_ptr, info_ptr_ptr);
+
+   *png_ptr_ptr = NULL;
+   png_read_destroy(png_ptr);
+   png_destroy_png_struct(png_ptr);
 }
 
 void PNGAPI
-png_set_read_status_fn(png_structp png_ptr, png_read_status_ptr read_row_fn)
+png_set_read_status_fn(png_structrp png_ptr, png_read_status_ptr read_row_fn)
 {
    if (png_ptr == NULL)
       return;
@@ -1119,11 +1029,10 @@ png_set_read_status_fn(png_structp png_ptr, png_read_status_ptr read_row_fn)
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 #ifdef PNG_INFO_IMAGE_SUPPORTED
 void PNGAPI
-png_read_png(png_structp png_ptr, png_infop info_ptr, int transforms,
-    voidp params)
+png_read_png(png_structrp png_ptr, png_inforp info_ptr,
+                           int transforms,
+                           voidp params)
 {
-   int row;
-
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
@@ -1131,124 +1040,153 @@ png_read_png(png_structp png_ptr, png_infop info_ptr, int transforms,
     * PNG file before the first IDAT (image data chunk).
     */
    png_read_info(png_ptr, info_ptr);
-   if (info_ptr->height > PNG_UINT_32_MAX/png_sizeof(png_bytep))
+   if (info_ptr->height > PNG_UINT_32_MAX/(sizeof (png_bytep)))
       png_error(png_ptr, "Image is too high to process with png_read_png()");
 
    /* -------------- image transformations start here ------------------- */
+   /* libpng 1.6.10: add code to cause a png_app_error if a selected TRANSFORM
+    * is not implemented.  This will only happen in de-configured (non-default)
+    * libpng builds.  The results can be unexpected - png_read_png may return
+    * short or mal-formed rows because the transform is skipped.
+    */
 
-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
    /* Tell libpng to strip 16-bit/color files down to 8 bits per color.
     */
-   if (transforms & PNG_TRANSFORM_SCALE_16)
-   {
-     /* Added at libpng-1.5.4. "strip_16" produces the same result that it
-      * did in earlier versions, while "scale_16" is now more accurate.
-      */
+   if ((transforms & PNG_TRANSFORM_SCALE_16) != 0)
+      /* Added at libpng-1.5.4. "strip_16" produces the same result that it
+       * did in earlier versions, while "scale_16" is now more accurate.
+       */
+#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
       png_set_scale_16(png_ptr);
-   }
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_SCALE_16 not supported");
 #endif
 
-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
    /* If both SCALE and STRIP are required pngrtran will effectively cancel the
     * latter by doing SCALE first.  This is ok and allows apps not to check for
     * which is supported to get the right answer.
     */
-   if (transforms & PNG_TRANSFORM_STRIP_16)
+   if ((transforms & PNG_TRANSFORM_STRIP_16) != 0)
+#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
       png_set_strip_16(png_ptr);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_STRIP_16 not supported");
 #endif
 
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
    /* Strip alpha bytes from the input data without combining with
     * the background (not recommended).
     */
-   if (transforms & PNG_TRANSFORM_STRIP_ALPHA)
+   if ((transforms & PNG_TRANSFORM_STRIP_ALPHA) != 0)
+#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
       png_set_strip_alpha(png_ptr);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_STRIP_ALPHA not supported");
 #endif
 
-#if defined(PNG_READ_PACK_SUPPORTED) && !defined(PNG_READ_EXPAND_SUPPORTED)
    /* Extract multiple pixels with bit depths of 1, 2, or 4 from a single
     * byte into separate bytes (useful for paletted and grayscale images).
     */
-   if (transforms & PNG_TRANSFORM_PACKING)
+   if ((transforms & PNG_TRANSFORM_PACKING) != 0)
+#ifdef PNG_READ_PACK_SUPPORTED
       png_set_packing(png_ptr);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_PACKING not supported");
 #endif
 
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
    /* Change the order of packed pixels to least significant bit first
     * (not useful if you are using png_set_packing).
     */
-   if (transforms & PNG_TRANSFORM_PACKSWAP)
+   if ((transforms & PNG_TRANSFORM_PACKSWAP) != 0)
+#ifdef PNG_READ_PACKSWAP_SUPPORTED
       png_set_packswap(png_ptr);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_PACKSWAP not supported");
 #endif
 
-#ifdef PNG_READ_EXPAND_SUPPORTED
    /* Expand paletted colors into true RGB triplets
     * Expand grayscale images to full 8 bits from 1, 2, or 4 bits/pixel
     * Expand paletted or RGB images with transparency to full alpha
     * channels so the data will be available as RGBA quartets.
     */
-   if (transforms & PNG_TRANSFORM_EXPAND)
-      if ((png_ptr->bit_depth < 8) ||
-          (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ||
-          (info_ptr->valid & PNG_INFO_tRNS))
-         png_set_expand(png_ptr);
+   if ((transforms & PNG_TRANSFORM_EXPAND) != 0)
+#ifdef PNG_READ_EXPAND_SUPPORTED
+      png_set_expand(png_ptr);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_EXPAND not supported");
 #endif
 
    /* We don't handle background color or gamma transformation or quantizing.
     */
 
-#ifdef PNG_READ_INVERT_SUPPORTED
    /* Invert monochrome files to have 0 as white and 1 as black
     */
-   if (transforms & PNG_TRANSFORM_INVERT_MONO)
+   if ((transforms & PNG_TRANSFORM_INVERT_MONO) != 0)
+#ifdef PNG_READ_INVERT_SUPPORTED
       png_set_invert_mono(png_ptr);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_MONO not supported");
 #endif
 
-#ifdef PNG_READ_SHIFT_SUPPORTED
    /* If you want to shift the pixel values from the range [0,255] or
     * [0,65535] to the original [0,7] or [0,31], or whatever range the
     * colors were originally in:
     */
-   if ((transforms & PNG_TRANSFORM_SHIFT) && (info_ptr->valid & PNG_INFO_sBIT))
-      png_set_shift(png_ptr, &info_ptr->sig_bit);
+   if ((transforms & PNG_TRANSFORM_SHIFT) != 0)
+#ifdef PNG_READ_SHIFT_SUPPORTED
+      if ((info_ptr->valid & PNG_INFO_sBIT) != 0)
+         png_set_shift(png_ptr, &info_ptr->sig_bit);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_SHIFT not supported");
 #endif
 
-#ifdef PNG_READ_BGR_SUPPORTED
    /* Flip the RGB pixels to BGR (or RGBA to BGRA) */
-   if (transforms & PNG_TRANSFORM_BGR)
+   if ((transforms & PNG_TRANSFORM_BGR) != 0)
+#ifdef PNG_READ_BGR_SUPPORTED
       png_set_bgr(png_ptr);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_BGR not supported");
 #endif
 
-#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
    /* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */
-   if (transforms & PNG_TRANSFORM_SWAP_ALPHA)
+   if ((transforms & PNG_TRANSFORM_SWAP_ALPHA) != 0)
+#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
       png_set_swap_alpha(png_ptr);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ALPHA not supported");
 #endif
 
-#ifdef PNG_READ_SWAP_SUPPORTED
    /* Swap bytes of 16-bit files to least significant byte first */
-   if (transforms & PNG_TRANSFORM_SWAP_ENDIAN)
+   if ((transforms & PNG_TRANSFORM_SWAP_ENDIAN) != 0)
+#ifdef PNG_READ_SWAP_SUPPORTED
       png_set_swap(png_ptr);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ENDIAN not supported");
 #endif
 
 /* Added at libpng-1.2.41 */
-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
    /* Invert the alpha channel from opacity to transparency */
-   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
+   if ((transforms & PNG_TRANSFORM_INVERT_ALPHA) != 0)
+#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
       png_set_invert_alpha(png_ptr);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_ALPHA not supported");
 #endif
 
 /* Added at libpng-1.2.41 */
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
    /* Expand grayscale image to RGB */
-   if (transforms & PNG_TRANSFORM_GRAY_TO_RGB)
+   if ((transforms & PNG_TRANSFORM_GRAY_TO_RGB) != 0)
+#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
       png_set_gray_to_rgb(png_ptr);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_GRAY_TO_RGB not supported");
 #endif
 
 /* Added at libpng-1.5.4 */
+   if ((transforms & PNG_TRANSFORM_EXPAND_16) != 0)
 #ifdef PNG_READ_EXPAND_16_SUPPORTED
-   if (transforms & PNG_TRANSFORM_EXPAND_16)
       png_set_expand_16(png_ptr);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_EXPAND_16 not supported");
 #endif
 
    /* We don't handle adding filler bytes */
@@ -1271,16 +1209,17 @@ png_read_png(png_structp png_ptr, png_infop info_ptr, int transforms,
    {
       png_uint_32 iptr;
 
-      info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr,
-          info_ptr->height * png_sizeof(png_bytep));
+      info_ptr->row_pointers = png_voidcast(png_bytepp, png_malloc(png_ptr,
+          info_ptr->height * (sizeof (png_bytep))));
+
       for (iptr=0; iptr<info_ptr->height; iptr++)
          info_ptr->row_pointers[iptr] = NULL;
 
       info_ptr->free_me |= PNG_FREE_ROWS;
 
-      for (row = 0; row < (int)info_ptr->height; row++)
-         info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr,
-             png_get_rowbytes(png_ptr, info_ptr));
+      for (iptr = 0; iptr < info_ptr->height; iptr++)
+         info_ptr->row_pointers[iptr] = png_voidcast(png_bytep,
+             png_malloc(png_ptr, info_ptr->rowbytes));
    }
 
    png_read_image(png_ptr, info_ptr->row_pointers);
@@ -1289,10 +1228,2945 @@ png_read_png(png_structp png_ptr, png_infop info_ptr, int transforms,
    /* Read rest of file, and get additional chunks in info_ptr - REQUIRED */
    png_read_end(png_ptr, info_ptr);
 
-   PNG_UNUSED(transforms)   /* Quiet compiler warnings */
    PNG_UNUSED(params)
+}
+#endif /* INFO_IMAGE */
+#endif /* SEQUENTIAL_READ */
+
+#ifdef PNG_SIMPLIFIED_READ_SUPPORTED
+/* SIMPLIFIED READ
+ *
+ * This code currently relies on the sequential reader, though it could easily
+ * be made to work with the progressive one.
+ */
+/* Arguments to png_image_finish_read: */
+
+/* Encoding of PNG data (used by the color-map code) */
+#  define P_NOTSET  0 /* File encoding not yet known */
+#  define P_sRGB    1 /* 8-bit encoded to sRGB gamma */
+#  define P_LINEAR  2 /* 16-bit linear: not encoded, NOT pre-multiplied! */
+#  define P_FILE    3 /* 8-bit encoded to file gamma, not sRGB or linear */
+#  define P_LINEAR8 4 /* 8-bit linear: only from a file value */
+
+/* Color-map processing: after libpng has run on the PNG image further
+ * processing may be needed to convert the data to color-map indices.
+ */
+#define PNG_CMAP_NONE      0
+#define PNG_CMAP_GA        1 /* Process GA data to a color-map with alpha */
+#define PNG_CMAP_TRANS     2 /* Process GA data to a background index */
+#define PNG_CMAP_RGB       3 /* Process RGB data */
+#define PNG_CMAP_RGB_ALPHA 4 /* Process RGBA data */
+
+/* The following document where the background is for each processing case. */
+#define PNG_CMAP_NONE_BACKGROUND      256
+#define PNG_CMAP_GA_BACKGROUND        231
+#define PNG_CMAP_TRANS_BACKGROUND     254
+#define PNG_CMAP_RGB_BACKGROUND       256
+#define PNG_CMAP_RGB_ALPHA_BACKGROUND 216
+
+typedef struct
+{
+   /* Arguments: */
+   png_imagep image;
+   png_voidp  buffer;
+   png_int_32 row_stride;
+   png_voidp  colormap;
+   png_const_colorp background;
+   /* Local variables: */
+   png_voidp       local_row;
+   png_voidp       first_row;
+   ptrdiff_t       row_bytes;           /* step between rows */
+   int             file_encoding;       /* E_ values above */
+   png_fixed_point gamma_to_linear;     /* For P_FILE, reciprocal of gamma */
+   int             colormap_processing; /* PNG_CMAP_ values above */
+} png_image_read_control;
+
+/* Do all the *safe* initialization - 'safe' means that png_error won't be
+ * called, so setting up the jmp_buf is not required.  This means that anything
+ * called from here must *not* call png_malloc - it has to call png_malloc_warn
+ * instead so that control is returned safely back to this routine.
+ */
+static int
+png_image_read_init(png_imagep image)
+{
+   if (image->opaque == NULL)
+   {
+      png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, image,
+          png_safe_error, png_safe_warning);
+
+      /* And set the rest of the structure to NULL to ensure that the various
+       * fields are consistent.
+       */
+      memset(image, 0, (sizeof *image));
+      image->version = PNG_IMAGE_VERSION;
+
+      if (png_ptr != NULL)
+      {
+         png_infop info_ptr = png_create_info_struct(png_ptr);
+
+         if (info_ptr != NULL)
+         {
+            png_controlp control = png_voidcast(png_controlp,
+               png_malloc_warn(png_ptr, (sizeof *control)));
+
+            if (control != NULL)
+            {
+               memset(control, 0, (sizeof *control));
+
+               control->png_ptr = png_ptr;
+               control->info_ptr = info_ptr;
+               control->for_write = 0;
+
+               image->opaque = control;
+               return 1;
+            }
+
+            /* Error clean up */
+            png_destroy_info_struct(png_ptr, &info_ptr);
+         }
+
+         png_destroy_read_struct(&png_ptr, NULL, NULL);
+      }
+
+      return png_image_error(image, "png_image_read: out of memory");
+   }
+
+   return png_image_error(image, "png_image_read: opaque pointer not NULL");
+}
+
+/* Utility to find the base format of a PNG file from a png_struct. */
+static png_uint_32
+png_image_format(png_structrp png_ptr)
+{
+   png_uint_32 format = 0;
+
+   if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
+      format |= PNG_FORMAT_FLAG_COLOR;
+
+   if ((png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)
+      format |= PNG_FORMAT_FLAG_ALPHA;
+
+   /* Use png_ptr here, not info_ptr, because by examination png_handle_tRNS
+    * sets the png_struct fields; that's all we are interested in here.  The
+    * precise interaction with an app call to png_set_tRNS and PNG file reading
+    * is unclear.
+    */
+   else if (png_ptr->num_trans > 0)
+      format |= PNG_FORMAT_FLAG_ALPHA;
+
+   if (png_ptr->bit_depth == 16)
+      format |= PNG_FORMAT_FLAG_LINEAR;
+
+   if ((png_ptr->color_type & PNG_COLOR_MASK_PALETTE) != 0)
+      format |= PNG_FORMAT_FLAG_COLORMAP;
+
+   return format;
+}
+
+/* Is the given gamma significantly different from sRGB?  The test is the same
+ * one used in pngrtran.c when deciding whether to do gamma correction.  The
+ * arithmetic optimizes the division by using the fact that the inverse of the
+ * file sRGB gamma is 2.2
+ */
+static int
+png_gamma_not_sRGB(png_fixed_point g)
+{
+   if (g < PNG_FP_1)
+   {
+      /* An uninitialized gamma is assumed to be sRGB for the simplified API. */
+      if (g == 0)
+         return 0;
+
+      return png_gamma_significant((g * 11 + 2)/5 /* i.e. *2.2, rounded */);
+   }
+
+   return 1;
+}
+
+/* Do the main body of a 'png_image_begin_read' function; read the PNG file
+ * header and fill in all the information.  This is executed in a safe context,
+ * unlike the init routine above.
+ */
+static int
+png_image_read_header(png_voidp argument)
+{
+   png_imagep image = png_voidcast(png_imagep, argument);
+   png_structrp png_ptr = image->opaque->png_ptr;
+   png_inforp info_ptr = image->opaque->info_ptr;
+
+   png_set_benign_errors(png_ptr, 1/*warn*/);
+   png_read_info(png_ptr, info_ptr);
+
+   /* Do this the fast way; just read directly out of png_struct. */
+   image->width = png_ptr->width;
+   image->height = png_ptr->height;
+
+   {
+      png_uint_32 format = png_image_format(png_ptr);
+
+      image->format = format;
+
+#ifdef PNG_COLORSPACE_SUPPORTED
+      /* Does the colorspace match sRGB?  If there is no color endpoint
+       * (colorant) information assume yes, otherwise require the
+       * 'ENDPOINTS_MATCHP_sRGB' colorspace flag to have been set.  If the
+       * colorspace has been determined to be invalid ignore it.
+       */
+      if ((format & PNG_FORMAT_FLAG_COLOR) != 0 && ((png_ptr->colorspace.flags
+         & (PNG_COLORSPACE_HAVE_ENDPOINTS|PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB|
+            PNG_COLORSPACE_INVALID)) == PNG_COLORSPACE_HAVE_ENDPOINTS))
+         image->flags |= PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB;
+#endif
+   }
+
+   /* We need the maximum number of entries regardless of the format the
+    * application sets here.
+    */
+   {
+      png_uint_32 cmap_entries;
+
+      switch (png_ptr->color_type)
+      {
+         case PNG_COLOR_TYPE_GRAY:
+            cmap_entries = 1U << png_ptr->bit_depth;
+            break;
+
+         case PNG_COLOR_TYPE_PALETTE:
+            cmap_entries = png_ptr->num_palette;
+            break;
+
+         default:
+            cmap_entries = 256;
+            break;
+      }
+
+      if (cmap_entries > 256)
+         cmap_entries = 256;
+
+      image->colormap_entries = cmap_entries;
+   }
+
+   return 1;
+}
+
+#ifdef PNG_STDIO_SUPPORTED
+int PNGAPI
+png_image_begin_read_from_stdio(png_imagep image, FILE* file)
+{
+   if (image != NULL && image->version == PNG_IMAGE_VERSION)
+   {
+      if (file != NULL)
+      {
+         if (png_image_read_init(image) != 0)
+         {
+            /* This is slightly evil, but png_init_io doesn't do anything other
+             * than this and we haven't changed the standard IO functions so
+             * this saves a 'safe' function.
+             */
+            image->opaque->png_ptr->io_ptr = file;
+            return png_safe_execute(image, png_image_read_header, image);
+         }
+      }
+
+      else
+         return png_image_error(image,
+            "png_image_begin_read_from_stdio: invalid argument");
+   }
+
+   else if (image != NULL)
+      return png_image_error(image,
+         "png_image_begin_read_from_stdio: incorrect PNG_IMAGE_VERSION");
+
+   return 0;
+}
+
+int PNGAPI
+png_image_begin_read_from_file(png_imagep image, const char *file_name)
+{
+   if (image != NULL && image->version == PNG_IMAGE_VERSION)
+   {
+      if (file_name != NULL)
+      {
+         FILE *fp = fopen(file_name, "rb");
+
+         if (fp != NULL)
+         {
+            if (png_image_read_init(image) != 0)
+            {
+               image->opaque->png_ptr->io_ptr = fp;
+               image->opaque->owned_file = 1;
+               return png_safe_execute(image, png_image_read_header, image);
+            }
+
+            /* Clean up: just the opened file. */
+            (void)fclose(fp);
+         }
+
+         else
+            return png_image_error(image, strerror(errno));
+      }
+
+      else
+         return png_image_error(image,
+            "png_image_begin_read_from_file: invalid argument");
+   }
 
+   else if (image != NULL)
+      return png_image_error(image,
+         "png_image_begin_read_from_file: incorrect PNG_IMAGE_VERSION");
+
+   return 0;
+}
+#endif /* STDIO */
+
+static void PNGCBAPI
+png_image_memory_read(png_structp png_ptr, png_bytep out, png_size_t need)
+{
+   if (png_ptr != NULL)
+   {
+      png_imagep image = png_voidcast(png_imagep, png_ptr->io_ptr);
+      if (image != NULL)
+      {
+         png_controlp cp = image->opaque;
+         if (cp != NULL)
+         {
+            png_const_bytep memory = cp->memory;
+            png_size_t size = cp->size;
+
+            if (memory != NULL && size >= need)
+            {
+               memcpy(out, memory, need);
+               cp->memory = memory + need;
+               cp->size = size - need;
+               return;
+            }
+
+            png_error(png_ptr, "read beyond end of data");
+         }
+      }
+
+      png_error(png_ptr, "invalid memory read");
+   }
+}
+
+int PNGAPI png_image_begin_read_from_memory(png_imagep image,
+   png_const_voidp memory, png_size_t size)
+{
+   if (image != NULL && image->version == PNG_IMAGE_VERSION)
+   {
+      if (memory != NULL && size > 0)
+      {
+         if (png_image_read_init(image) != 0)
+         {
+            /* Now set the IO functions to read from the memory buffer and
+             * store it into io_ptr.  Again do this in-place to avoid calling a
+             * libpng function that requires error handling.
+             */
+            image->opaque->memory = png_voidcast(png_const_bytep, memory);
+            image->opaque->size = size;
+            image->opaque->png_ptr->io_ptr = image;
+            image->opaque->png_ptr->read_data_fn = png_image_memory_read;
+
+            return png_safe_execute(image, png_image_read_header, image);
+         }
+      }
+
+      else
+         return png_image_error(image,
+            "png_image_begin_read_from_memory: invalid argument");
+   }
+
+   else if (image != NULL)
+      return png_image_error(image,
+         "png_image_begin_read_from_memory: incorrect PNG_IMAGE_VERSION");
+
+   return 0;
 }
-#endif /* PNG_INFO_IMAGE_SUPPORTED */
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-#endif /* PNG_READ_SUPPORTED */
+
+/* Utility function to skip chunks that are not used by the simplified image
+ * read functions and an appropriate macro to call it.
+ */
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+static void
+png_image_skip_unused_chunks(png_structrp png_ptr)
+{
+   /* Prepare the reader to ignore all recognized chunks whose data will not
+    * be used, i.e., all chunks recognized by libpng except for those
+    * involved in basic image reading:
+    *
+    *    IHDR, PLTE, IDAT, IEND
+    *
+    * Or image data handling:
+    *
+    *    tRNS, bKGD, gAMA, cHRM, sRGB, [iCCP] and sBIT.
+    *
+    * This provides a small performance improvement and eliminates any
+    * potential vulnerability to security problems in the unused chunks.
+    *
+    * At present the iCCP chunk data isn't used, so iCCP chunk can be ignored
+    * too.  This allows the simplified API to be compiled without iCCP support,
+    * however if the support is there the chunk is still checked to detect
+    * errors (which are unfortunately quite common.)
+    */
+   {
+         static PNG_CONST png_byte chunks_to_process[] = {
+            98,  75,  71,  68, '\0',  /* bKGD */
+            99,  72,  82,  77, '\0',  /* cHRM */
+           103,  65,  77,  65, '\0',  /* gAMA */
+#        ifdef PNG_READ_iCCP_SUPPORTED
+           105,  67,  67,  80, '\0',  /* iCCP */
+#        endif
+           115,  66,  73,  84, '\0',  /* sBIT */
+           115,  82,  71,  66, '\0',  /* sRGB */
+           };
+
+       /* Ignore unknown chunks and all other chunks except for the
+        * IHDR, PLTE, tRNS, IDAT, and IEND chunks.
+        */
+       png_set_keep_unknown_chunks(png_ptr, PNG_HANDLE_CHUNK_NEVER,
+         NULL, -1);
+
+       /* But do not ignore image data handling chunks */
+       png_set_keep_unknown_chunks(png_ptr, PNG_HANDLE_CHUNK_AS_DEFAULT,
+         chunks_to_process, (int)/*SAFE*/(sizeof chunks_to_process)/5);
+    }
+}
+
+#  define PNG_SKIP_CHUNKS(p) png_image_skip_unused_chunks(p)
+#else
+#  define PNG_SKIP_CHUNKS(p) ((void)0)
+#endif /* HANDLE_AS_UNKNOWN */
+
+/* The following macro gives the exact rounded answer for all values in the
+ * range 0..255 (it actually divides by 51.2, but the rounding still generates
+ * the correct numbers 0..5
+ */
+#define PNG_DIV51(v8) (((v8) * 5 + 130) >> 8)
+
+/* Utility functions to make particular color-maps */
+static void
+set_file_encoding(png_image_read_control *display)
+{
+   png_fixed_point g = display->image->opaque->png_ptr->colorspace.gamma;
+   if (png_gamma_significant(g) != 0)
+   {
+      if (png_gamma_not_sRGB(g) != 0)
+      {
+         display->file_encoding = P_FILE;
+         display->gamma_to_linear = png_reciprocal(g);
+      }
+
+      else
+         display->file_encoding = P_sRGB;
+   }
+
+   else
+      display->file_encoding = P_LINEAR8;
+}
+
+static unsigned int
+decode_gamma(png_image_read_control *display, png_uint_32 value, int encoding)
+{
+   if (encoding == P_FILE) /* double check */
+      encoding = display->file_encoding;
+
+   if (encoding == P_NOTSET) /* must be the file encoding */
+   {
+      set_file_encoding(display);
+      encoding = display->file_encoding;
+   }
+
+   switch (encoding)
+   {
+      case P_FILE:
+         value = png_gamma_16bit_correct(value*257, display->gamma_to_linear);
+         break;
+
+      case P_sRGB:
+         value = png_sRGB_table[value];
+         break;
+
+      case P_LINEAR:
+         break;
+
+      case P_LINEAR8:
+         value *= 257;
+         break;
+
+#ifdef __GNUC__
+      default:
+         png_error(display->image->opaque->png_ptr,
+            "unexpected encoding (internal error)");
+#endif
+   }
+
+   return value;
+}
+
+static png_uint_32
+png_colormap_compose(png_image_read_control *display,
+   png_uint_32 foreground, int foreground_encoding, png_uint_32 alpha,
+   png_uint_32 background, int encoding)
+{
+   /* The file value is composed on the background, the background has the given
+    * encoding and so does the result, the file is encoded with P_FILE and the
+    * file and alpha are 8-bit values.  The (output) encoding will always be
+    * P_LINEAR or P_sRGB.
+    */
+   png_uint_32 f = decode_gamma(display, foreground, foreground_encoding);
+   png_uint_32 b = decode_gamma(display, background, encoding);
+
+   /* The alpha is always an 8-bit value (it comes from the palette), the value
+    * scaled by 255 is what PNG_sRGB_FROM_LINEAR requires.
+    */
+   f = f * alpha + b * (255-alpha);
+
+   if (encoding == P_LINEAR)
+   {
+      /* Scale to 65535; divide by 255, approximately (in fact this is extremely
+       * accurate, it divides by 255.00000005937181414556, with no overflow.)
+       */
+      f *= 257; /* Now scaled by 65535 */
+      f += f >> 16;
+      f = (f+32768) >> 16;
+   }
+
+   else /* P_sRGB */
+      f = PNG_sRGB_FROM_LINEAR(f);
+
+   return f;
+}
+
+/* NOTE: P_LINEAR values to this routine must be 16-bit, but P_FILE values must
+ * be 8-bit.
+ */
+static void
+png_create_colormap_entry(png_image_read_control *display,
+   png_uint_32 ip, png_uint_32 red, png_uint_32 green, png_uint_32 blue,
+   png_uint_32 alpha, int encoding)
+{
+   png_imagep image = display->image;
+   const int output_encoding = (image->format & PNG_FORMAT_FLAG_LINEAR) != 0 ?
+      P_LINEAR : P_sRGB;
+   const int convert_to_Y = (image->format & PNG_FORMAT_FLAG_COLOR) == 0 &&
+      (red != green || green != blue);
+
+   if (ip > 255)
+      png_error(image->opaque->png_ptr, "color-map index out of range");
+
+   /* Update the cache with whether the file gamma is significantly different
+    * from sRGB.
+    */
+   if (encoding == P_FILE)
+   {
+      if (display->file_encoding == P_NOTSET)
+         set_file_encoding(display);
+
+      /* Note that the cached value may be P_FILE too, but if it is then the
+       * gamma_to_linear member has been set.
+       */
+      encoding = display->file_encoding;
+   }
+
+   if (encoding == P_FILE)
+   {
+      png_fixed_point g = display->gamma_to_linear;
+
+      red = png_gamma_16bit_correct(red*257, g);
+      green = png_gamma_16bit_correct(green*257, g);
+      blue = png_gamma_16bit_correct(blue*257, g);
+
+      if (convert_to_Y != 0 || output_encoding == P_LINEAR)
+      {
+         alpha *= 257;
+         encoding = P_LINEAR;
+      }
+
+      else
+      {
+         red = PNG_sRGB_FROM_LINEAR(red * 255);
+         green = PNG_sRGB_FROM_LINEAR(green * 255);
+         blue = PNG_sRGB_FROM_LINEAR(blue * 255);
+         encoding = P_sRGB;
+      }
+   }
+
+   else if (encoding == P_LINEAR8)
+   {
+      /* This encoding occurs quite frequently in test cases because PngSuite
+       * includes a gAMA 1.0 chunk with most images.
+       */
+      red *= 257;
+      green *= 257;
+      blue *= 257;
+      alpha *= 257;
+      encoding = P_LINEAR;
+   }
+
+   else if (encoding == P_sRGB &&
+       (convert_to_Y  != 0 || output_encoding == P_LINEAR))
+   {
+      /* The values are 8-bit sRGB values, but must be converted to 16-bit
+       * linear.
+       */
+      red = png_sRGB_table[red];
+      green = png_sRGB_table[green];
+      blue = png_sRGB_table[blue];
+      alpha *= 257;
+      encoding = P_LINEAR;
+   }
+
+   /* This is set if the color isn't gray but the output is. */
+   if (encoding == P_LINEAR)
+   {
+      if (convert_to_Y != 0)
+      {
+         /* NOTE: these values are copied from png_do_rgb_to_gray */
+         png_uint_32 y = (png_uint_32)6968 * red  + (png_uint_32)23434 * green +
+            (png_uint_32)2366 * blue;
+
+         if (output_encoding == P_LINEAR)
+            y = (y + 16384) >> 15;
+
+         else
+         {
+            /* y is scaled by 32768, we need it scaled by 255: */
+            y = (y + 128) >> 8;
+            y *= 255;
+            y = PNG_sRGB_FROM_LINEAR((y + 64) >> 7);
+            alpha = PNG_DIV257(alpha);
+            encoding = P_sRGB;
+         }
+
+         blue = red = green = y;
+      }
+
+      else if (output_encoding == P_sRGB)
+      {
+         red = PNG_sRGB_FROM_LINEAR(red * 255);
+         green = PNG_sRGB_FROM_LINEAR(green * 255);
+         blue = PNG_sRGB_FROM_LINEAR(blue * 255);
+         alpha = PNG_DIV257(alpha);
+         encoding = P_sRGB;
+      }
+   }
+
+   if (encoding != output_encoding)
+      png_error(image->opaque->png_ptr, "bad encoding (internal error)");
+
+   /* Store the value. */
+   {
+#     ifdef PNG_FORMAT_AFIRST_SUPPORTED
+         const int afirst = (image->format & PNG_FORMAT_FLAG_AFIRST) != 0 &&
+            (image->format & PNG_FORMAT_FLAG_ALPHA) != 0;
+#     else
+#        define afirst 0
+#     endif
+#     ifdef PNG_FORMAT_BGR_SUPPORTED
+         const int bgr = (image->format & PNG_FORMAT_FLAG_BGR) != 0 ? 2 : 0;
+#     else
+#        define bgr 0
+#     endif
+
+      if (output_encoding == P_LINEAR)
+      {
+         png_uint_16p entry = png_voidcast(png_uint_16p, display->colormap);
+
+         entry += ip * PNG_IMAGE_SAMPLE_CHANNELS(image->format);
+
+         /* The linear 16-bit values must be pre-multiplied by the alpha channel
+          * value, if less than 65535 (this is, effectively, composite on black
+          * if the alpha channel is removed.)
+          */
+         switch (PNG_IMAGE_SAMPLE_CHANNELS(image->format))
+         {
+            case 4:
+               entry[afirst ? 0 : 3] = (png_uint_16)alpha;
+               /* FALL THROUGH */
+
+            case 3:
+               if (alpha < 65535)
+               {
+                  if (alpha > 0)
+                  {
+                     blue = (blue * alpha + 32767U)/65535U;
+                     green = (green * alpha + 32767U)/65535U;
+                     red = (red * alpha + 32767U)/65535U;
+                  }
+
+                  else
+                     red = green = blue = 0;
+               }
+               entry[afirst + (2 ^ bgr)] = (png_uint_16)blue;
+               entry[afirst + 1] = (png_uint_16)green;
+               entry[afirst + bgr] = (png_uint_16)red;
+               break;
+
+            case 2:
+               entry[1 ^ afirst] = (png_uint_16)alpha;
+               /* FALL THROUGH */
+
+            case 1:
+               if (alpha < 65535)
+               {
+                  if (alpha > 0)
+                     green = (green * alpha + 32767U)/65535U;
+
+                  else
+                     green = 0;
+               }
+               entry[afirst] = (png_uint_16)green;
+               break;
+
+            default:
+               break;
+         }
+      }
+
+      else /* output encoding is P_sRGB */
+      {
+         png_bytep entry = png_voidcast(png_bytep, display->colormap);
+
+         entry += ip * PNG_IMAGE_SAMPLE_CHANNELS(image->format);
+
+         switch (PNG_IMAGE_SAMPLE_CHANNELS(image->format))
+         {
+            case 4:
+               entry[afirst ? 0 : 3] = (png_byte)alpha;
+            case 3:
+               entry[afirst + (2 ^ bgr)] = (png_byte)blue;
+               entry[afirst + 1] = (png_byte)green;
+               entry[afirst + bgr] = (png_byte)red;
+               break;
+
+            case 2:
+               entry[1 ^ afirst] = (png_byte)alpha;
+            case 1:
+               entry[afirst] = (png_byte)green;
+               break;
+
+            default:
+               break;
+         }
+      }
+
+#     ifdef afirst
+#        undef afirst
+#     endif
+#     ifdef bgr
+#        undef bgr
+#     endif
+   }
+}
+
+static int
+make_gray_file_colormap(png_image_read_control *display)
+{
+   unsigned int i;
+
+   for (i=0; i<256; ++i)
+      png_create_colormap_entry(display, i, i, i, i, 255, P_FILE);
+
+   return i;
+}
+
+static int
+make_gray_colormap(png_image_read_control *display)
+{
+   unsigned int i;
+
+   for (i=0; i<256; ++i)
+      png_create_colormap_entry(display, i, i, i, i, 255, P_sRGB);
+
+   return i;
+}
+#define PNG_GRAY_COLORMAP_ENTRIES 256
+
+static int
+make_ga_colormap(png_image_read_control *display)
+{
+   unsigned int i, a;
+
+   /* Alpha is retained, the output will be a color-map with entries
+    * selected by six levels of alpha.  One transparent entry, 6 gray
+    * levels for all the intermediate alpha values, leaving 230 entries
+    * for the opaque grays.  The color-map entries are the six values
+    * [0..5]*51, the GA processing uses PNG_DIV51(value) to find the
+    * relevant entry.
+    *
+    * if (alpha > 229) // opaque
+    * {
+    *    // The 231 entries are selected to make the math below work:
+    *    base = 0;
+    *    entry = (231 * gray + 128) >> 8;
+    * }
+    * else if (alpha < 26) // transparent
+    * {
+    *    base = 231;
+    *    entry = 0;
+    * }
+    * else // partially opaque
+    * {
+    *    base = 226 + 6 * PNG_DIV51(alpha);
+    *    entry = PNG_DIV51(gray);
+    * }
+    */
+   i = 0;
+   while (i < 231)
+   {
+      unsigned int gray = (i * 256 + 115) / 231;
+      png_create_colormap_entry(display, i++, gray, gray, gray, 255, P_sRGB);
+   }
+
+   /* 255 is used here for the component values for consistency with the code
+    * that undoes premultiplication in pngwrite.c.
+    */
+   png_create_colormap_entry(display, i++, 255, 255, 255, 0, P_sRGB);
+
+   for (a=1; a<5; ++a)
+   {
+      unsigned int g;
+
+      for (g=0; g<6; ++g)
+         png_create_colormap_entry(display, i++, g*51, g*51, g*51, a*51,
+            P_sRGB);
+   }
+
+   return i;
+}
+
+#define PNG_GA_COLORMAP_ENTRIES 256
+
+static int
+make_rgb_colormap(png_image_read_control *display)
+{
+   unsigned int i, r;
+
+   /* Build a 6x6x6 opaque RGB cube */
+   for (i=r=0; r<6; ++r)
+   {
+      unsigned int g;
+
+      for (g=0; g<6; ++g)
+      {
+         unsigned int b;
+
+         for (b=0; b<6; ++b)
+            png_create_colormap_entry(display, i++, r*51, g*51, b*51, 255,
+               P_sRGB);
+      }
+   }
+
+   return i;
+}
+
+#define PNG_RGB_COLORMAP_ENTRIES 216
+
+/* Return a palette index to the above palette given three 8-bit sRGB values. */
+#define PNG_RGB_INDEX(r,g,b) \
+   ((png_byte)(6 * (6 * PNG_DIV51(r) + PNG_DIV51(g)) + PNG_DIV51(b)))
+
+static int
+png_image_read_colormap(png_voidp argument)
+{
+   png_image_read_control *display =
+      png_voidcast(png_image_read_control*, argument);
+   const png_imagep image = display->image;
+
+   const png_structrp png_ptr = image->opaque->png_ptr;
+   const png_uint_32 output_format = image->format;
+   const int output_encoding = (output_format & PNG_FORMAT_FLAG_LINEAR) != 0 ?
+      P_LINEAR : P_sRGB;
+
+   unsigned int cmap_entries;
+   unsigned int output_processing;        /* Output processing option */
+   unsigned int data_encoding = P_NOTSET; /* Encoding libpng must produce */
+
+   /* Background information; the background color and the index of this color
+    * in the color-map if it exists (else 256).
+    */
+   unsigned int background_index = 256;
+   png_uint_32 back_r, back_g, back_b;
+
+   /* Flags to accumulate things that need to be done to the input. */
+   int expand_tRNS = 0;
+
+   /* Exclude the NYI feature of compositing onto a color-mapped buffer; it is
+    * very difficult to do, the results look awful, and it is difficult to see
+    * what possible use it is because the application can't control the
+    * color-map.
+    */
+   if (((png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0 ||
+         png_ptr->num_trans > 0) /* alpha in input */ &&
+      ((output_format & PNG_FORMAT_FLAG_ALPHA) == 0) /* no alpha in output */)
+   {
+      if (output_encoding == P_LINEAR) /* compose on black */
+         back_b = back_g = back_r = 0;
+
+      else if (display->background == NULL /* no way to remove it */)
+         png_error(png_ptr,
+            "a background color must be supplied to remove alpha/transparency");
+
+      /* Get a copy of the background color (this avoids repeating the checks
+       * below.)  The encoding is 8-bit sRGB or 16-bit linear, depending on the
+       * output format.
+       */
+      else
+      {
+         back_g = display->background->green;
+         if ((output_format & PNG_FORMAT_FLAG_COLOR) != 0)
+         {
+            back_r = display->background->red;
+            back_b = display->background->blue;
+         }
+         else
+            back_b = back_r = back_g;
+      }
+   }
+
+   else if (output_encoding == P_LINEAR)
+      back_b = back_r = back_g = 65535;
+
+   else
+      back_b = back_r = back_g = 255;
+
+   /* Default the input file gamma if required - this is necessary because
+    * libpng assumes that if no gamma information is present the data is in the
+    * output format, but the simplified API deduces the gamma from the input
+    * format.
+    */
+   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) == 0)
+   {
+      /* Do this directly, not using the png_colorspace functions, to ensure
+       * that it happens even if the colorspace is invalid (though probably if
+       * it is the setting will be ignored)  Note that the same thing can be
+       * achieved at the application interface with png_set_gAMA.
+       */
+      if (png_ptr->bit_depth == 16 &&
+         (image->flags & PNG_IMAGE_FLAG_16BIT_sRGB) == 0)
+         png_ptr->colorspace.gamma = PNG_GAMMA_LINEAR;
+
+      else
+         png_ptr->colorspace.gamma = PNG_GAMMA_sRGB_INVERSE;
+
+      png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
+   }
+
+   /* Decide what to do based on the PNG color type of the input data.  The
+    * utility function png_create_colormap_entry deals with most aspects of the
+    * output transformations; this code works out how to produce bytes of
+    * color-map entries from the original format.
+    */
+   switch (png_ptr->color_type)
+   {
+      case PNG_COLOR_TYPE_GRAY:
+         if (png_ptr->bit_depth <= 8)
+         {
+            /* There at most 256 colors in the output, regardless of
+             * transparency.
+             */
+            unsigned int step, i, val, trans = 256/*ignore*/, back_alpha = 0;
+
+            cmap_entries = 1U << png_ptr->bit_depth;
+            if (cmap_entries > image->colormap_entries)
+               png_error(png_ptr, "gray[8] color-map: too few entries");
+
+            step = 255 / (cmap_entries - 1);
+            output_processing = PNG_CMAP_NONE;
+
+            /* If there is a tRNS chunk then this either selects a transparent
+             * value or, if the output has no alpha, the background color.
+             */
+            if (png_ptr->num_trans > 0)
+            {
+               trans = png_ptr->trans_color.gray;
+
+               if ((output_format & PNG_FORMAT_FLAG_ALPHA) == 0)
+                  back_alpha = output_encoding == P_LINEAR ? 65535 : 255;
+            }
+
+            /* png_create_colormap_entry just takes an RGBA and writes the
+             * corresponding color-map entry using the format from 'image',
+             * including the required conversion to sRGB or linear as
+             * appropriate.  The input values are always either sRGB (if the
+             * gamma correction flag is 0) or 0..255 scaled file encoded values
+             * (if the function must gamma correct them).
+             */
+            for (i=val=0; i<cmap_entries; ++i, val += step)
+            {
+               /* 'i' is a file value.  While this will result in duplicated
+                * entries for 8-bit non-sRGB encoded files it is necessary to
+                * have non-gamma corrected values to do tRNS handling.
+                */
+               if (i != trans)
+                  png_create_colormap_entry(display, i, val, val, val, 255,
+                     P_FILE/*8-bit with file gamma*/);
+
+               /* Else this entry is transparent.  The colors don't matter if
+                * there is an alpha channel (back_alpha == 0), but it does no
+                * harm to pass them in; the values are not set above so this
+                * passes in white.
+                *
+                * NOTE: this preserves the full precision of the application
+                * supplied background color when it is used.
+                */
+               else
+                  png_create_colormap_entry(display, i, back_r, back_g, back_b,
+                     back_alpha, output_encoding);
+            }
+
+            /* We need libpng to preserve the original encoding. */
+            data_encoding = P_FILE;
+
+            /* The rows from libpng, while technically gray values, are now also
+             * color-map indices; however, they may need to be expanded to 1
+             * byte per pixel.  This is what png_set_packing does (i.e., it
+             * unpacks the bit values into bytes.)
+             */
+            if (png_ptr->bit_depth < 8)
+               png_set_packing(png_ptr);
+         }
+
+         else /* bit depth is 16 */
+         {
+            /* The 16-bit input values can be converted directly to 8-bit gamma
+             * encoded values; however, if a tRNS chunk is present 257 color-map
+             * entries are required.  This means that the extra entry requires
+             * special processing; add an alpha channel, sacrifice gray level
+             * 254 and convert transparent (alpha==0) entries to that.
+             *
+             * Use libpng to chop the data to 8 bits.  Convert it to sRGB at the
+             * same time to minimize quality loss.  If a tRNS chunk is present
+             * this means libpng must handle it too; otherwise it is impossible
+             * to do the exact match on the 16-bit value.
+             *
+             * If the output has no alpha channel *and* the background color is
+             * gray then it is possible to let libpng handle the substitution by
+             * ensuring that the corresponding gray level matches the background
+             * color exactly.
+             */
+            data_encoding = P_sRGB;
+
+            if (PNG_GRAY_COLORMAP_ENTRIES > image->colormap_entries)
+               png_error(png_ptr, "gray[16] color-map: too few entries");
+
+            cmap_entries = make_gray_colormap(display);
+
+            if (png_ptr->num_trans > 0)
+            {
+               unsigned int back_alpha;
+
+               if ((output_format & PNG_FORMAT_FLAG_ALPHA) != 0)
+                  back_alpha = 0;
+
+               else
+               {
+                  if (back_r == back_g && back_g == back_b)
+                  {
+                     /* Background is gray; no special processing will be
+                      * required.
+                      */
+                     png_color_16 c;
+                     png_uint_32 gray = back_g;
+
+                     if (output_encoding == P_LINEAR)
+                     {
+                        gray = PNG_sRGB_FROM_LINEAR(gray * 255);
+
+                        /* And make sure the corresponding palette entry
+                         * matches.
+                         */
+                        png_create_colormap_entry(display, gray, back_g, back_g,
+                           back_g, 65535, P_LINEAR);
+                     }
+
+                     /* The background passed to libpng, however, must be the
+                      * sRGB value.
+                      */
+                     c.index = 0; /*unused*/
+                     c.gray = c.red = c.green = c.blue = (png_uint_16)gray;
+
+                     /* NOTE: does this work without expanding tRNS to alpha?
+                      * It should be the color->gray case below apparently
+                      * doesn't.
+                      */
+                     png_set_background_fixed(png_ptr, &c,
+                        PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
+                        0/*gamma: not used*/);
+
+                     output_processing = PNG_CMAP_NONE;
+                     break;
+                  }
+#ifdef __COVERITY__
+                 /* Coverity claims that output_encoding cannot be 2 (P_LINEAR)
+                  * here.
+                  */
+                  back_alpha = 255;
+#else
+                  back_alpha = output_encoding == P_LINEAR ? 65535 : 255;
+#endif
+               }
+
+               /* output_processing means that the libpng-processed row will be
+                * 8-bit GA and it has to be processing to single byte color-map
+                * values.  Entry 254 is replaced by either a completely
+                * transparent entry or by the background color at full
+                * precision (and the background color is not a simple gray
+                * level in this case.)
+                */
+               expand_tRNS = 1;
+               output_processing = PNG_CMAP_TRANS;
+               background_index = 254;
+
+               /* And set (overwrite) color-map entry 254 to the actual
+                * background color at full precision.
+                */
+               png_create_colormap_entry(display, 254, back_r, back_g, back_b,
+                  back_alpha, output_encoding);
+            }
+
+            else
+               output_processing = PNG_CMAP_NONE;
+         }
+         break;
+
+      case PNG_COLOR_TYPE_GRAY_ALPHA:
+         /* 8-bit or 16-bit PNG with two channels - gray and alpha.  A minimum
+          * of 65536 combinations.  If, however, the alpha channel is to be
+          * removed there are only 256 possibilities if the background is gray.
+          * (Otherwise there is a subset of the 65536 possibilities defined by
+          * the triangle between black, white and the background color.)
+          *
+          * Reduce 16-bit files to 8-bit and sRGB encode the result.  No need to
+          * worry about tRNS matching - tRNS is ignored if there is an alpha
+          * channel.
+          */
+         data_encoding = P_sRGB;
+
+         if ((output_format & PNG_FORMAT_FLAG_ALPHA) != 0)
+         {
+            if (PNG_GA_COLORMAP_ENTRIES > image->colormap_entries)
+               png_error(png_ptr, "gray+alpha color-map: too few entries");
+
+            cmap_entries = make_ga_colormap(display);
+
+            background_index = PNG_CMAP_GA_BACKGROUND;
+            output_processing = PNG_CMAP_GA;
+         }
+
+         else /* alpha is removed */
+         {
+            /* Alpha must be removed as the PNG data is processed when the
+             * background is a color because the G and A channels are
+             * independent and the vector addition (non-parallel vectors) is a
+             * 2-D problem.
+             *
+             * This can be reduced to the same algorithm as above by making a
+             * colormap containing gray levels (for the opaque grays), a
+             * background entry (for a transparent pixel) and a set of four six
+             * level color values, one set for each intermediate alpha value.
+             * See the comments in make_ga_colormap for how this works in the
+             * per-pixel processing.
+             *
+             * If the background is gray, however, we only need a 256 entry gray
+             * level color map.  It is sufficient to make the entry generated
+             * for the background color be exactly the color specified.
+             */
+            if ((output_format & PNG_FORMAT_FLAG_COLOR) == 0 ||
+               (back_r == back_g && back_g == back_b))
+            {
+               /* Background is gray; no special processing will be required. */
+               png_color_16 c;
+               png_uint_32 gray = back_g;
+
+               if (PNG_GRAY_COLORMAP_ENTRIES > image->colormap_entries)
+                  png_error(png_ptr, "gray-alpha color-map: too few entries");
+
+               cmap_entries = make_gray_colormap(display);
+
+               if (output_encoding == P_LINEAR)
+               {
+                  gray = PNG_sRGB_FROM_LINEAR(gray * 255);
+
+                  /* And make sure the corresponding palette entry matches. */
+                  png_create_colormap_entry(display, gray, back_g, back_g,
+                     back_g, 65535, P_LINEAR);
+               }
+
+               /* The background passed to libpng, however, must be the sRGB
+                * value.
+                */
+               c.index = 0; /*unused*/
+               c.gray = c.red = c.green = c.blue = (png_uint_16)gray;
+
+               png_set_background_fixed(png_ptr, &c,
+                  PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
+                  0/*gamma: not used*/);
+
+               output_processing = PNG_CMAP_NONE;
+            }
+
+            else
+            {
+               png_uint_32 i, a;
+
+               /* This is the same as png_make_ga_colormap, above, except that
+                * the entries are all opaque.
+                */
+               if (PNG_GA_COLORMAP_ENTRIES > image->colormap_entries)
+                  png_error(png_ptr, "ga-alpha color-map: too few entries");
+
+               i = 0;
+               while (i < 231)
+               {
+                  png_uint_32 gray = (i * 256 + 115) / 231;
+                  png_create_colormap_entry(display, i++, gray, gray, gray,
+                     255, P_sRGB);
+               }
+
+               /* NOTE: this preserves the full precision of the application
+                * background color.
+                */
+               background_index = i;
+               png_create_colormap_entry(display, i++, back_r, back_g, back_b,
+#ifdef __COVERITY__
+                 /* Coverity claims that output_encoding cannot be 2 (P_LINEAR)
+                  * here.
+                  */ 255U,
+#else
+                  output_encoding == P_LINEAR ? 65535U : 255U,
+#endif
+                  output_encoding);
+
+               /* For non-opaque input composite on the sRGB background - this
+                * requires inverting the encoding for each component.  The input
+                * is still converted to the sRGB encoding because this is a
+                * reasonable approximate to the logarithmic curve of human
+                * visual sensitivity, at least over the narrow range which PNG
+                * represents.  Consequently 'G' is always sRGB encoded, while
+                * 'A' is linear.  We need the linear background colors.
+                */
+               if (output_encoding == P_sRGB) /* else already linear */
+               {
+                  /* This may produce a value not exactly matching the
+                   * background, but that's ok because these numbers are only
+                   * used when alpha != 0
+                   */
+                  back_r = png_sRGB_table[back_r];
+                  back_g = png_sRGB_table[back_g];
+                  back_b = png_sRGB_table[back_b];
+               }
+
+               for (a=1; a<5; ++a)
+               {
+                  unsigned int g;
+
+                  /* PNG_sRGB_FROM_LINEAR expects a 16-bit linear value scaled
+                   * by an 8-bit alpha value (0..255).
+                   */
+                  png_uint_32 alpha = 51 * a;
+                  png_uint_32 back_rx = (255-alpha) * back_r;
+                  png_uint_32 back_gx = (255-alpha) * back_g;
+                  png_uint_32 back_bx = (255-alpha) * back_b;
+
+                  for (g=0; g<6; ++g)
+                  {
+                     png_uint_32 gray = png_sRGB_table[g*51] * alpha;
+
+                     png_create_colormap_entry(display, i++,
+                        PNG_sRGB_FROM_LINEAR(gray + back_rx),
+                        PNG_sRGB_FROM_LINEAR(gray + back_gx),
+                        PNG_sRGB_FROM_LINEAR(gray + back_bx), 255, P_sRGB);
+                  }
+               }
+
+               cmap_entries = i;
+               output_processing = PNG_CMAP_GA;
+            }
+         }
+         break;
+
+      case PNG_COLOR_TYPE_RGB:
+      case PNG_COLOR_TYPE_RGB_ALPHA:
+         /* Exclude the case where the output is gray; we can always handle this
+          * with the cases above.
+          */
+         if ((output_format & PNG_FORMAT_FLAG_COLOR) == 0)
+         {
+            /* The color-map will be grayscale, so we may as well convert the
+             * input RGB values to a simple grayscale and use the grayscale
+             * code above.
+             *
+             * NOTE: calling this apparently damages the recognition of the
+             * transparent color in background color handling; call
+             * png_set_tRNS_to_alpha before png_set_background_fixed.
+             */
+            png_set_rgb_to_gray_fixed(png_ptr, PNG_ERROR_ACTION_NONE, -1,
+               -1);
+            data_encoding = P_sRGB;
+
+            /* The output will now be one or two 8-bit gray or gray+alpha
+             * channels.  The more complex case arises when the input has alpha.
+             */
+            if ((png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
+               png_ptr->num_trans > 0) &&
+               (output_format & PNG_FORMAT_FLAG_ALPHA) != 0)
+            {
+               /* Both input and output have an alpha channel, so no background
+                * processing is required; just map the GA bytes to the right
+                * color-map entry.
+                */
+               expand_tRNS = 1;
+
+               if (PNG_GA_COLORMAP_ENTRIES > image->colormap_entries)
+                  png_error(png_ptr, "rgb[ga] color-map: too few entries");
+
+               cmap_entries = make_ga_colormap(display);
+               background_index = PNG_CMAP_GA_BACKGROUND;
+               output_processing = PNG_CMAP_GA;
+            }
+
+            else
+            {
+               /* Either the input or the output has no alpha channel, so there
+                * will be no non-opaque pixels in the color-map; it will just be
+                * grayscale.
+                */
+               if (PNG_GRAY_COLORMAP_ENTRIES > image->colormap_entries)
+                  png_error(png_ptr, "rgb[gray] color-map: too few entries");
+
+               /* Ideally this code would use libpng to do the gamma correction,
+                * but if an input alpha channel is to be removed we will hit the
+                * libpng bug in gamma+compose+rgb-to-gray (the double gamma
+                * correction bug).  Fix this by dropping the gamma correction in
+                * this case and doing it in the palette; this will result in
+                * duplicate palette entries, but that's better than the
+                * alternative of double gamma correction.
+                */
+               if ((png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
+                  png_ptr->num_trans > 0) &&
+                  png_gamma_not_sRGB(png_ptr->colorspace.gamma) != 0)
+               {
+                  cmap_entries = make_gray_file_colormap(display);
+                  data_encoding = P_FILE;
+               }
+
+               else
+                  cmap_entries = make_gray_colormap(display);
+
+               /* But if the input has alpha or transparency it must be removed
+                */
+               if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
+                  png_ptr->num_trans > 0)
+               {
+                  png_color_16 c;
+                  png_uint_32 gray = back_g;
+
+                  /* We need to ensure that the application background exists in
+                   * the colormap and that completely transparent pixels map to
+                   * it.  Achieve this simply by ensuring that the entry
+                   * selected for the background really is the background color.
+                   */
+                  if (data_encoding == P_FILE) /* from the fixup above */
+                  {
+                     /* The app supplied a gray which is in output_encoding, we
+                      * need to convert it to a value of the input (P_FILE)
+                      * encoding then set this palette entry to the required
+                      * output encoding.
+                      */
+                     if (output_encoding == P_sRGB)
+                        gray = png_sRGB_table[gray]; /* now P_LINEAR */
+
+                     gray = PNG_DIV257(png_gamma_16bit_correct(gray,
+                        png_ptr->colorspace.gamma)); /* now P_FILE */
+
+                     /* And make sure the corresponding palette entry contains
+                      * exactly the required sRGB value.
+                      */
+                     png_create_colormap_entry(display, gray, back_g, back_g,
+                        back_g, 0/*unused*/, output_encoding);
+                  }
+
+                  else if (output_encoding == P_LINEAR)
+                  {
+                     gray = PNG_sRGB_FROM_LINEAR(gray * 255);
+
+                     /* And make sure the corresponding palette entry matches.
+                      */
+                     png_create_colormap_entry(display, gray, back_g, back_g,
+                        back_g, 0/*unused*/, P_LINEAR);
+                  }
+
+                  /* The background passed to libpng, however, must be the
+                   * output (normally sRGB) value.
+                   */
+                  c.index = 0; /*unused*/
+                  c.gray = c.red = c.green = c.blue = (png_uint_16)gray;
+
+                  /* NOTE: the following is apparently a bug in libpng. Without
+                   * it the transparent color recognition in
+                   * png_set_background_fixed seems to go wrong.
+                   */
+                  expand_tRNS = 1;
+                  png_set_background_fixed(png_ptr, &c,
+                     PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
+                     0/*gamma: not used*/);
+               }
+
+               output_processing = PNG_CMAP_NONE;
+            }
+         }
+
+         else /* output is color */
+         {
+            /* We could use png_quantize here so long as there is no transparent
+             * color or alpha; png_quantize ignores alpha.  Easier overall just
+             * to do it once and using PNG_DIV51 on the 6x6x6 reduced RGB cube.
+             * Consequently we always want libpng to produce sRGB data.
+             */
+            data_encoding = P_sRGB;
+
+            /* Is there any transparency or alpha? */
+            if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
+               png_ptr->num_trans > 0)
+            {
+               /* Is there alpha in the output too?  If so all four channels are
+                * processed into a special RGB cube with alpha support.
+                */
+               if ((output_format & PNG_FORMAT_FLAG_ALPHA) != 0)
+               {
+                  png_uint_32 r;
+
+                  if (PNG_RGB_COLORMAP_ENTRIES+1+27 > image->colormap_entries)
+                     png_error(png_ptr, "rgb+alpha color-map: too few entries");
+
+                  cmap_entries = make_rgb_colormap(display);
+
+                  /* Add a transparent entry. */
+                  png_create_colormap_entry(display, cmap_entries, 255, 255,
+                     255, 0, P_sRGB);
+
+                  /* This is stored as the background index for the processing
+                   * algorithm.
+                   */
+                  background_index = cmap_entries++;
+
+                  /* Add 27 r,g,b entries each with alpha 0.5. */
+                  for (r=0; r<256; r = (r << 1) | 0x7f)
+                  {
+                     png_uint_32 g;
+
+                     for (g=0; g<256; g = (g << 1) | 0x7f)
+                     {
+                        png_uint_32 b;
+
+                        /* This generates components with the values 0, 127 and
+                         * 255
+                         */
+                        for (b=0; b<256; b = (b << 1) | 0x7f)
+                           png_create_colormap_entry(display, cmap_entries++,
+                              r, g, b, 128, P_sRGB);
+                     }
+                  }
+
+                  expand_tRNS = 1;
+                  output_processing = PNG_CMAP_RGB_ALPHA;
+               }
+
+               else
+               {
+                  /* Alpha/transparency must be removed.  The background must
+                   * exist in the color map (achieved by setting adding it after
+                   * the 666 color-map).  If the standard processing code will
+                   * pick up this entry automatically that's all that is
+                   * required; libpng can be called to do the background
+                   * processing.
+                   */
+                  unsigned int sample_size =
+                     PNG_IMAGE_SAMPLE_SIZE(output_format);
+                  png_uint_32 r, g, b; /* sRGB background */
+
+                  if (PNG_RGB_COLORMAP_ENTRIES+1+27 > image->colormap_entries)
+                     png_error(png_ptr, "rgb-alpha color-map: too few entries");
+
+                  cmap_entries = make_rgb_colormap(display);
+
+                  png_create_colormap_entry(display, cmap_entries, back_r,
+                        back_g, back_b, 0/*unused*/, output_encoding);
+
+                  if (output_encoding == P_LINEAR)
+                  {
+                     r = PNG_sRGB_FROM_LINEAR(back_r * 255);
+                     g = PNG_sRGB_FROM_LINEAR(back_g * 255);
+                     b = PNG_sRGB_FROM_LINEAR(back_b * 255);
+                  }
+
+                  else
+                  {
+                     r = back_r;
+                     g = back_g;
+                     b = back_g;
+                  }
+
+                  /* Compare the newly-created color-map entry with the one the
+                   * PNG_CMAP_RGB algorithm will use.  If the two entries don't
+                   * match, add the new one and set this as the background
+                   * index.
+                   */
+                  if (memcmp((png_const_bytep)display->colormap +
+                        sample_size * cmap_entries,
+                     (png_const_bytep)display->colormap +
+                        sample_size * PNG_RGB_INDEX(r,g,b),
+                     sample_size) != 0)
+                  {
+                     /* The background color must be added. */
+                     background_index = cmap_entries++;
+
+                     /* Add 27 r,g,b entries each with created by composing with
+                      * the background at alpha 0.5.
+                      */
+                     for (r=0; r<256; r = (r << 1) | 0x7f)
+                     {
+                        for (g=0; g<256; g = (g << 1) | 0x7f)
+                        {
+                           /* This generates components with the values 0, 127
+                            * and 255
+                            */
+                           for (b=0; b<256; b = (b << 1) | 0x7f)
+                              png_create_colormap_entry(display, cmap_entries++,
+                                 png_colormap_compose(display, r, P_sRGB, 128,
+                                    back_r, output_encoding),
+                                 png_colormap_compose(display, g, P_sRGB, 128,
+                                    back_g, output_encoding),
+                                 png_colormap_compose(display, b, P_sRGB, 128,
+                                    back_b, output_encoding),
+                                 0/*unused*/, output_encoding);
+                        }
+                     }
+
+                     expand_tRNS = 1;
+                     output_processing = PNG_CMAP_RGB_ALPHA;
+                  }
+
+                  else /* background color is in the standard color-map */
+                  {
+                     png_color_16 c;
+
+                     c.index = 0; /*unused*/
+                     c.red = (png_uint_16)back_r;
+                     c.gray = c.green = (png_uint_16)back_g;
+                     c.blue = (png_uint_16)back_b;
+
+                     png_set_background_fixed(png_ptr, &c,
+                        PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
+                        0/*gamma: not used*/);
+
+                     output_processing = PNG_CMAP_RGB;
+                  }
+               }
+            }
+
+            else /* no alpha or transparency in the input */
+            {
+               /* Alpha in the output is irrelevant, simply map the opaque input
+                * pixels to the 6x6x6 color-map.
+                */
+               if (PNG_RGB_COLORMAP_ENTRIES > image->colormap_entries)
+                  png_error(png_ptr, "rgb color-map: too few entries");
+
+               cmap_entries = make_rgb_colormap(display);
+               output_processing = PNG_CMAP_RGB;
+            }
+         }
+         break;
+
+      case PNG_COLOR_TYPE_PALETTE:
+         /* It's already got a color-map.  It may be necessary to eliminate the
+          * tRNS entries though.
+          */
+         {
+            unsigned int num_trans = png_ptr->num_trans;
+            png_const_bytep trans = num_trans > 0 ? png_ptr->trans_alpha : NULL;
+            png_const_colorp colormap = png_ptr->palette;
+            const int do_background = trans != NULL &&
+               (output_format & PNG_FORMAT_FLAG_ALPHA) == 0;
+            unsigned int i;
+
+            /* Just in case: */
+            if (trans == NULL)
+               num_trans = 0;
+
+            output_processing = PNG_CMAP_NONE;
+            data_encoding = P_FILE; /* Don't change from color-map indices */
+            cmap_entries = png_ptr->num_palette;
+            if (cmap_entries > 256)
+               cmap_entries = 256;
+
+            if (cmap_entries > image->colormap_entries)
+               png_error(png_ptr, "palette color-map: too few entries");
+
+            for (i=0; i < cmap_entries; ++i)
+            {
+               if (do_background != 0 && i < num_trans && trans[i] < 255)
+               {
+                  if (trans[i] == 0)
+                     png_create_colormap_entry(display, i, back_r, back_g,
+                        back_b, 0, output_encoding);
+
+                  else
+                  {
+                     /* Must compose the PNG file color in the color-map entry
+                      * on the sRGB color in 'back'.
+                      */
+                     png_create_colormap_entry(display, i,
+                        png_colormap_compose(display, colormap[i].red, P_FILE,
+                           trans[i], back_r, output_encoding),
+                        png_colormap_compose(display, colormap[i].green, P_FILE,
+                           trans[i], back_g, output_encoding),
+                        png_colormap_compose(display, colormap[i].blue, P_FILE,
+                           trans[i], back_b, output_encoding),
+                        output_encoding == P_LINEAR ? trans[i] * 257U :
+                           trans[i],
+                        output_encoding);
+                  }
+               }
+
+               else
+                  png_create_colormap_entry(display, i, colormap[i].red,
+                     colormap[i].green, colormap[i].blue,
+                     i < num_trans ? trans[i] : 255U, P_FILE/*8-bit*/);
+            }
+
+            /* The PNG data may have indices packed in fewer than 8 bits, it
+             * must be expanded if so.
+             */
+            if (png_ptr->bit_depth < 8)
+               png_set_packing(png_ptr);
+         }
+         break;
+
+      default:
+         png_error(png_ptr, "invalid PNG color type");
+         /*NOT REACHED*/
+   }
+
+   /* Now deal with the output processing */
+   if (expand_tRNS != 0 && png_ptr->num_trans > 0 &&
+       (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) == 0)
+      png_set_tRNS_to_alpha(png_ptr);
+
+   switch (data_encoding)
+   {
+      case P_sRGB:
+         /* Change to 8-bit sRGB */
+         png_set_alpha_mode_fixed(png_ptr, PNG_ALPHA_PNG, PNG_GAMMA_sRGB);
+         /* FALL THROUGH */
+
+      case P_FILE:
+         if (png_ptr->bit_depth > 8)
+            png_set_scale_16(png_ptr);
+         break;
+
+#ifdef __GNUC__
+      default:
+         png_error(png_ptr, "bad data option (internal error)");
+#endif
+   }
+
+   if (cmap_entries > 256 || cmap_entries > image->colormap_entries)
+      png_error(png_ptr, "color map overflow (BAD internal error)");
+
+   image->colormap_entries = cmap_entries;
+
+   /* Double check using the recorded background index */
+   switch (output_processing)
+   {
+      case PNG_CMAP_NONE:
+         if (background_index != PNG_CMAP_NONE_BACKGROUND)
+            goto bad_background;
+         break;
+
+      case PNG_CMAP_GA:
+         if (background_index != PNG_CMAP_GA_BACKGROUND)
+            goto bad_background;
+         break;
+
+      case PNG_CMAP_TRANS:
+         if (background_index >= cmap_entries ||
+            background_index != PNG_CMAP_TRANS_BACKGROUND)
+            goto bad_background;
+         break;
+
+      case PNG_CMAP_RGB:
+         if (background_index != PNG_CMAP_RGB_BACKGROUND)
+            goto bad_background;
+         break;
+
+      case PNG_CMAP_RGB_ALPHA:
+         if (background_index != PNG_CMAP_RGB_ALPHA_BACKGROUND)
+            goto bad_background;
+         break;
+
+      default:
+         png_error(png_ptr, "bad processing option (internal error)");
+
+      bad_background:
+         png_error(png_ptr, "bad background index (internal error)");
+   }
+
+   display->colormap_processing = output_processing;
+
+   return 1/*ok*/;
+}
+
+/* The final part of the color-map read called from png_image_finish_read. */
+static int
+png_image_read_and_map(png_voidp argument)
+{
+   png_image_read_control *display = png_voidcast(png_image_read_control*,
+      argument);
+   png_imagep image = display->image;
+   png_structrp png_ptr = image->opaque->png_ptr;
+   int passes;
+
+   /* Called when the libpng data must be transformed into the color-mapped
+    * form.  There is a local row buffer in display->local and this routine must
+    * do the interlace handling.
+    */
+   switch (png_ptr->interlaced)
+   {
+      case PNG_INTERLACE_NONE:
+         passes = 1;
+         break;
+
+      case PNG_INTERLACE_ADAM7:
+         passes = PNG_INTERLACE_ADAM7_PASSES;
+         break;
+
+      default:
+         png_error(png_ptr, "unknown interlace type");
+   }
+
+   {
+      png_uint_32  height = image->height;
+      png_uint_32  width = image->width;
+      int          proc = display->colormap_processing;
+      png_bytep    first_row = png_voidcast(png_bytep, display->first_row);
+      ptrdiff_t    step_row = display->row_bytes;
+      int pass;
+
+      for (pass = 0; pass < passes; ++pass)
+      {
+         unsigned int     startx, stepx, stepy;
+         png_uint_32      y;
+
+         if (png_ptr->interlaced == PNG_INTERLACE_ADAM7)
+         {
+            /* The row may be empty for a short image: */
+            if (PNG_PASS_COLS(width, pass) == 0)
+               continue;
+
+            startx = PNG_PASS_START_COL(pass);
+            stepx = PNG_PASS_COL_OFFSET(pass);
+            y = PNG_PASS_START_ROW(pass);
+            stepy = PNG_PASS_ROW_OFFSET(pass);
+         }
+
+         else
+         {
+            y = 0;
+            startx = 0;
+            stepx = stepy = 1;
+         }
+
+         for (; y<height; y += stepy)
+         {
+            png_bytep inrow = png_voidcast(png_bytep, display->local_row);
+            png_bytep outrow = first_row + y * step_row;
+            png_const_bytep end_row = outrow + width;
+
+            /* Read read the libpng data into the temporary buffer. */
+            png_read_row(png_ptr, inrow, NULL);
+
+            /* Now process the row according to the processing option, note
+             * that the caller verifies that the format of the libpng output
+             * data is as required.
+             */
+            outrow += startx;
+            switch (proc)
+            {
+               case PNG_CMAP_GA:
+                  for (; outrow < end_row; outrow += stepx)
+                  {
+                     /* The data is always in the PNG order */
+                     unsigned int gray = *inrow++;
+                     unsigned int alpha = *inrow++;
+                     unsigned int entry;
+
+                     /* NOTE: this code is copied as a comment in
+                      * make_ga_colormap above.  Please update the
+                      * comment if you change this code!
+                      */
+                     if (alpha > 229) /* opaque */
+                     {
+                        entry = (231 * gray + 128) >> 8;
+                     }
+                     else if (alpha < 26) /* transparent */
+                     {
+                        entry = 231;
+                     }
+                     else /* partially opaque */
+                     {
+                        entry = 226 + 6 * PNG_DIV51(alpha) + PNG_DIV51(gray);
+                     }
+
+                     *outrow = (png_byte)entry;
+                  }
+                  break;
+
+               case PNG_CMAP_TRANS:
+                  for (; outrow < end_row; outrow += stepx)
+                  {
+                     png_byte gray = *inrow++;
+                     png_byte alpha = *inrow++;
+
+                     if (alpha == 0)
+                        *outrow = PNG_CMAP_TRANS_BACKGROUND;
+
+                     else if (gray != PNG_CMAP_TRANS_BACKGROUND)
+                        *outrow = gray;
+
+                     else
+                        *outrow = (png_byte)(PNG_CMAP_TRANS_BACKGROUND+1);
+                  }
+                  break;
+
+               case PNG_CMAP_RGB:
+                  for (; outrow < end_row; outrow += stepx)
+                  {
+                     *outrow = PNG_RGB_INDEX(inrow[0], inrow[1], inrow[2]);
+                     inrow += 3;
+                  }
+                  break;
+
+               case PNG_CMAP_RGB_ALPHA:
+                  for (; outrow < end_row; outrow += stepx)
+                  {
+                     unsigned int alpha = inrow[3];
+
+                     /* Because the alpha entries only hold alpha==0.5 values
+                      * split the processing at alpha==0.25 (64) and 0.75
+                      * (196).
+                      */
+
+                     if (alpha >= 196)
+                        *outrow = PNG_RGB_INDEX(inrow[0], inrow[1],
+                           inrow[2]);
+
+                     else if (alpha < 64)
+                        *outrow = PNG_CMAP_RGB_ALPHA_BACKGROUND;
+
+                     else
+                     {
+                        /* Likewise there are three entries for each of r, g
+                         * and b.  We could select the entry by popcount on
+                         * the top two bits on those architectures that
+                         * support it, this is what the code below does,
+                         * crudely.
+                         */
+                        unsigned int back_i = PNG_CMAP_RGB_ALPHA_BACKGROUND+1;
+
+                        /* Here are how the values map:
+                         *
+                         * 0x00 .. 0x3f -> 0
+                         * 0x40 .. 0xbf -> 1
+                         * 0xc0 .. 0xff -> 2
+                         *
+                         * So, as above with the explicit alpha checks, the
+                         * breakpoints are at 64 and 196.
+                         */
+                        if (inrow[0] & 0x80) back_i += 9; /* red */
+                        if (inrow[0] & 0x40) back_i += 9;
+                        if (inrow[0] & 0x80) back_i += 3; /* green */
+                        if (inrow[0] & 0x40) back_i += 3;
+                        if (inrow[0] & 0x80) back_i += 1; /* blue */
+                        if (inrow[0] & 0x40) back_i += 1;
+
+                        *outrow = (png_byte)back_i;
+                     }
+
+                     inrow += 4;
+                  }
+                  break;
+
+               default:
+                  break;
+            }
+         }
+      }
+   }
+
+   return 1;
+}
+
+static int
+png_image_read_colormapped(png_voidp argument)
+{
+   png_image_read_control *display = png_voidcast(png_image_read_control*,
+      argument);
+   png_imagep image = display->image;
+   png_controlp control = image->opaque;
+   png_structrp png_ptr = control->png_ptr;
+   png_inforp info_ptr = control->info_ptr;
+
+   int passes = 0; /* As a flag */
+
+   PNG_SKIP_CHUNKS(png_ptr);
+
+   /* Update the 'info' structure and make sure the result is as required; first
+    * make sure to turn on the interlace handling if it will be required
+    * (because it can't be turned on *after* the call to png_read_update_info!)
+    */
+   if (display->colormap_processing == PNG_CMAP_NONE)
+      passes = png_set_interlace_handling(png_ptr);
+
+   png_read_update_info(png_ptr, info_ptr);
+
+   /* The expected output can be deduced from the colormap_processing option. */
+   switch (display->colormap_processing)
+   {
+      case PNG_CMAP_NONE:
+         /* Output must be one channel and one byte per pixel, the output
+          * encoding can be anything.
+          */
+         if ((info_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
+            info_ptr->color_type == PNG_COLOR_TYPE_GRAY) &&
+            info_ptr->bit_depth == 8)
+            break;
+
+         goto bad_output;
+
+      case PNG_CMAP_TRANS:
+      case PNG_CMAP_GA:
+         /* Output must be two channels and the 'G' one must be sRGB, the latter
+          * can be checked with an exact number because it should have been set
+          * to this number above!
+          */
+         if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
+            info_ptr->bit_depth == 8 &&
+            png_ptr->screen_gamma == PNG_GAMMA_sRGB &&
+            image->colormap_entries == 256)
+            break;
+
+         goto bad_output;
+
+      case PNG_CMAP_RGB:
+         /* Output must be 8-bit sRGB encoded RGB */
+         if (info_ptr->color_type == PNG_COLOR_TYPE_RGB &&
+            info_ptr->bit_depth == 8 &&
+            png_ptr->screen_gamma == PNG_GAMMA_sRGB &&
+            image->colormap_entries == 216)
+            break;
+
+         goto bad_output;
+
+      case PNG_CMAP_RGB_ALPHA:
+         /* Output must be 8-bit sRGB encoded RGBA */
+         if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
+            info_ptr->bit_depth == 8 &&
+            png_ptr->screen_gamma == PNG_GAMMA_sRGB &&
+            image->colormap_entries == 244 /* 216 + 1 + 27 */)
+            break;
+
+         /* goto bad_output; */
+         /* FALL THROUGH */
+
+      default:
+      bad_output:
+         png_error(png_ptr, "bad color-map processing (internal error)");
+   }
+
+   /* Now read the rows.  Do this here if it is possible to read directly into
+    * the output buffer, otherwise allocate a local row buffer of the maximum
+    * size libpng requires and call the relevant processing routine safely.
+    */
+   {
+      png_voidp first_row = display->buffer;
+      ptrdiff_t row_bytes = display->row_stride;
+
+      /* The following expression is designed to work correctly whether it gives
+       * a signed or an unsigned result.
+       */
+      if (row_bytes < 0)
+      {
+         char *ptr = png_voidcast(char*, first_row);
+         ptr += (image->height-1) * (-row_bytes);
+         first_row = png_voidcast(png_voidp, ptr);
+      }
+
+      display->first_row = first_row;
+      display->row_bytes = row_bytes;
+   }
+
+   if (passes == 0)
+   {
+      int result;
+      png_voidp row = png_malloc(png_ptr, png_get_rowbytes(png_ptr, info_ptr));
+
+      display->local_row = row;
+      result = png_safe_execute(image, png_image_read_and_map, display);
+      display->local_row = NULL;
+      png_free(png_ptr, row);
+
+      return result;
+   }
+
+   else
+   {
+      png_alloc_size_t row_bytes = display->row_bytes;
+
+      while (--passes >= 0)
+      {
+         png_uint_32      y = image->height;
+         png_bytep        row = png_voidcast(png_bytep, display->first_row);
+
+         while (y-- > 0)
+         {
+            png_read_row(png_ptr, row, NULL);
+            row += row_bytes;
+         }
+      }
+
+      return 1;
+   }
+}
+
+/* Just the row reading part of png_image_read. */
+static int
+png_image_read_composite(png_voidp argument)
+{
+   png_image_read_control *display = png_voidcast(png_image_read_control*,
+      argument);
+   png_imagep image = display->image;
+   png_structrp png_ptr = image->opaque->png_ptr;
+   int passes;
+
+   switch (png_ptr->interlaced)
+   {
+      case PNG_INTERLACE_NONE:
+         passes = 1;
+         break;
+
+      case PNG_INTERLACE_ADAM7:
+         passes = PNG_INTERLACE_ADAM7_PASSES;
+         break;
+
+      default:
+         png_error(png_ptr, "unknown interlace type");
+   }
+
+   {
+      png_uint_32  height = image->height;
+      png_uint_32  width = image->width;
+      ptrdiff_t    step_row = display->row_bytes;
+      unsigned int channels =
+          (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1;
+      int pass;
+
+      for (pass = 0; pass < passes; ++pass)
+      {
+         unsigned int     startx, stepx, stepy;
+         png_uint_32      y;
+
+         if (png_ptr->interlaced == PNG_INTERLACE_ADAM7)
+         {
+            /* The row may be empty for a short image: */
+            if (PNG_PASS_COLS(width, pass) == 0)
+               continue;
+
+            startx = PNG_PASS_START_COL(pass) * channels;
+            stepx = PNG_PASS_COL_OFFSET(pass) * channels;
+            y = PNG_PASS_START_ROW(pass);
+            stepy = PNG_PASS_ROW_OFFSET(pass);
+         }
+
+         else
+         {
+            y = 0;
+            startx = 0;
+            stepx = channels;
+            stepy = 1;
+         }
+
+         for (; y<height; y += stepy)
+         {
+            png_bytep inrow = png_voidcast(png_bytep, display->local_row);
+            png_bytep outrow;
+            png_const_bytep end_row;
+
+            /* Read the row, which is packed: */
+            png_read_row(png_ptr, inrow, NULL);
+
+            outrow = png_voidcast(png_bytep, display->first_row);
+            outrow += y * step_row;
+            end_row = outrow + width * channels;
+
+            /* Now do the composition on each pixel in this row. */
+            outrow += startx;
+            for (; outrow < end_row; outrow += stepx)
+            {
+               png_byte alpha = inrow[channels];
+
+               if (alpha > 0) /* else no change to the output */
+               {
+                  unsigned int c;
+
+                  for (c=0; c<channels; ++c)
+                  {
+                     png_uint_32 component = inrow[c];
+
+                     if (alpha < 255) /* else just use component */
+                     {
+                        /* This is PNG_OPTIMIZED_ALPHA, the component value
+                         * is a linear 8-bit value.  Combine this with the
+                         * current outrow[c] value which is sRGB encoded.
+                         * Arithmetic here is 16-bits to preserve the output
+                         * values correctly.
+                         */
+                        component *= 257*255; /* =65535 */
+                        component += (255-alpha)*png_sRGB_table[outrow[c]];
+
+                        /* So 'component' is scaled by 255*65535 and is
+                         * therefore appropriate for the sRGB to linear
+                         * conversion table.
+                         */
+                        component = PNG_sRGB_FROM_LINEAR(component);
+                     }
+
+                     outrow[c] = (png_byte)component;
+                  }
+               }
+
+               inrow += channels+1; /* components and alpha channel */
+            }
+         }
+      }
+   }
+
+   return 1;
+}
+
+/* The do_local_background case; called when all the following transforms are to
+ * be done:
+ *
+ * PNG_RGB_TO_GRAY
+ * PNG_COMPOSITE
+ * PNG_GAMMA
+ *
+ * This is a work-around for the fact that both the PNG_RGB_TO_GRAY and
+ * PNG_COMPOSITE code performs gamma correction, so we get double gamma
+ * correction.  The fix-up is to prevent the PNG_COMPOSITE operation from
+ * happening inside libpng, so this routine sees an 8 or 16-bit gray+alpha
+ * row and handles the removal or pre-multiplication of the alpha channel.
+ */
+static int
+png_image_read_background(png_voidp argument)
+{
+   png_image_read_control *display = png_voidcast(png_image_read_control*,
+      argument);
+   png_imagep image = display->image;
+   png_structrp png_ptr = image->opaque->png_ptr;
+   png_inforp info_ptr = image->opaque->info_ptr;
+   png_uint_32 height = image->height;
+   png_uint_32 width = image->width;
+   int pass, passes;
+
+   /* Double check the convoluted logic below.  We expect to get here with
+    * libpng doing rgb to gray and gamma correction but background processing
+    * left to the png_image_read_background function.  The rows libpng produce
+    * might be 8 or 16-bit but should always have two channels; gray plus alpha.
+    */
+   if ((png_ptr->transformations & PNG_RGB_TO_GRAY) == 0)
+      png_error(png_ptr, "lost rgb to gray");
+
+   if ((png_ptr->transformations & PNG_COMPOSE) != 0)
+      png_error(png_ptr, "unexpected compose");
+
+   if (png_get_channels(png_ptr, info_ptr) != 2)
+      png_error(png_ptr, "lost/gained channels");
+
+   /* Expect the 8-bit case to always remove the alpha channel */
+   if ((image->format & PNG_FORMAT_FLAG_LINEAR) == 0 &&
+      (image->format & PNG_FORMAT_FLAG_ALPHA) != 0)
+      png_error(png_ptr, "unexpected 8-bit transformation");
+
+   switch (png_ptr->interlaced)
+   {
+      case PNG_INTERLACE_NONE:
+         passes = 1;
+         break;
+
+      case PNG_INTERLACE_ADAM7:
+         passes = PNG_INTERLACE_ADAM7_PASSES;
+         break;
+
+      default:
+         png_error(png_ptr, "unknown interlace type");
+   }
+
+   /* Use direct access to info_ptr here because otherwise the simplified API
+    * would require PNG_EASY_ACCESS_SUPPORTED (just for this.)  Note this is
+    * checking the value after libpng expansions, not the original value in the
+    * PNG.
+    */
+   switch (info_ptr->bit_depth)
+   {
+      case 8:
+         /* 8-bit sRGB gray values with an alpha channel; the alpha channel is
+          * to be removed by composing on a background: either the row if
+          * display->background is NULL or display->background->green if not.
+          * Unlike the code above ALPHA_OPTIMIZED has *not* been done.
+          */
+         {
+            png_bytep first_row = png_voidcast(png_bytep, display->first_row);
+            ptrdiff_t step_row = display->row_bytes;
+
+            for (pass = 0; pass < passes; ++pass)
+            {
+               png_bytep        row = png_voidcast(png_bytep,
+                                                   display->first_row);
+               unsigned int     startx, stepx, stepy;
+               png_uint_32      y;
+
+               if (png_ptr->interlaced == PNG_INTERLACE_ADAM7)
+               {
+                  /* The row may be empty for a short image: */
+                  if (PNG_PASS_COLS(width, pass) == 0)
+                     continue;
+
+                  startx = PNG_PASS_START_COL(pass);
+                  stepx = PNG_PASS_COL_OFFSET(pass);
+                  y = PNG_PASS_START_ROW(pass);
+                  stepy = PNG_PASS_ROW_OFFSET(pass);
+               }
+
+               else
+               {
+                  y = 0;
+                  startx = 0;
+                  stepx = stepy = 1;
+               }
+
+               if (display->background == NULL)
+               {
+                  for (; y<height; y += stepy)
+                  {
+                     png_bytep inrow = png_voidcast(png_bytep,
+                        display->local_row);
+                     png_bytep outrow = first_row + y * step_row;
+                     png_const_bytep end_row = outrow + width;
+
+                     /* Read the row, which is packed: */
+                     png_read_row(png_ptr, inrow, NULL);
+
+                     /* Now do the composition on each pixel in this row. */
+                     outrow += startx;
+                     for (; outrow < end_row; outrow += stepx)
+                     {
+                        png_byte alpha = inrow[1];
+
+                        if (alpha > 0) /* else no change to the output */
+                        {
+                           png_uint_32 component = inrow[0];
+
+                           if (alpha < 255) /* else just use component */
+                           {
+                              /* Since PNG_OPTIMIZED_ALPHA was not set it is
+                               * necessary to invert the sRGB transfer
+                               * function and multiply the alpha out.
+                               */
+                              component = png_sRGB_table[component] * alpha;
+                              component += png_sRGB_table[outrow[0]] *
+                                 (255-alpha);
+                              component = PNG_sRGB_FROM_LINEAR(component);
+                           }
+
+                           outrow[0] = (png_byte)component;
+                        }
+
+                        inrow += 2; /* gray and alpha channel */
+                     }
+                  }
+               }
+
+               else /* constant background value */
+               {
+                  png_byte background8 = display->background->green;
+                  png_uint_16 background = png_sRGB_table[background8];
+
+                  for (; y<height; y += stepy)
+                  {
+                     png_bytep inrow = png_voidcast(png_bytep,
+                        display->local_row);
+                     png_bytep outrow = first_row + y * step_row;
+                     png_const_bytep end_row = outrow + width;
+
+                     /* Read the row, which is packed: */
+                     png_read_row(png_ptr, inrow, NULL);
+
+                     /* Now do the composition on each pixel in this row. */
+                     outrow += startx;
+                     for (; outrow < end_row; outrow += stepx)
+                     {
+                        png_byte alpha = inrow[1];
+
+                        if (alpha > 0) /* else use background */
+                        {
+                           png_uint_32 component = inrow[0];
+
+                           if (alpha < 255) /* else just use component */
+                           {
+                              component = png_sRGB_table[component] * alpha;
+                              component += background * (255-alpha);
+                              component = PNG_sRGB_FROM_LINEAR(component);
+                           }
+
+                           outrow[0] = (png_byte)component;
+                        }
+
+                        else
+                           outrow[0] = background8;
+
+                        inrow += 2; /* gray and alpha channel */
+                     }
+
+                     row += display->row_bytes;
+                  }
+               }
+            }
+         }
+         break;
+
+      case 16:
+         /* 16-bit linear with pre-multiplied alpha; the pre-multiplication must
+          * still be done and, maybe, the alpha channel removed.  This code also
+          * handles the alpha-first option.
+          */
+         {
+            png_uint_16p first_row = png_voidcast(png_uint_16p,
+               display->first_row);
+            /* The division by two is safe because the caller passed in a
+             * stride which was multiplied by 2 (below) to get row_bytes.
+             */
+            ptrdiff_t    step_row = display->row_bytes / 2;
+            int preserve_alpha = (image->format & PNG_FORMAT_FLAG_ALPHA) != 0;
+            unsigned int outchannels = 1+preserve_alpha;
+            int swap_alpha = 0;
+
+#           ifdef PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
+               if (preserve_alpha != 0 &&
+                   (image->format & PNG_FORMAT_FLAG_AFIRST) != 0)
+                  swap_alpha = 1;
+#           endif
+
+            for (pass = 0; pass < passes; ++pass)
+            {
+               unsigned int     startx, stepx, stepy;
+               png_uint_32      y;
+
+               /* The 'x' start and step are adjusted to output components here.
+                */
+               if (png_ptr->interlaced == PNG_INTERLACE_ADAM7)
+               {
+                  /* The row may be empty for a short image: */
+                  if (PNG_PASS_COLS(width, pass) == 0)
+                     continue;
+
+                  startx = PNG_PASS_START_COL(pass) * outchannels;
+                  stepx = PNG_PASS_COL_OFFSET(pass) * outchannels;
+                  y = PNG_PASS_START_ROW(pass);
+                  stepy = PNG_PASS_ROW_OFFSET(pass);
+               }
+
+               else
+               {
+                  y = 0;
+                  startx = 0;
+                  stepx = outchannels;
+                  stepy = 1;
+               }
+
+               for (; y<height; y += stepy)
+               {
+                  png_const_uint_16p inrow;
+                  png_uint_16p outrow = first_row + y*step_row;
+                  png_uint_16p end_row = outrow + width * outchannels;
+
+                  /* Read the row, which is packed: */
+                  png_read_row(png_ptr, png_voidcast(png_bytep,
+                     display->local_row), NULL);
+                  inrow = png_voidcast(png_const_uint_16p, display->local_row);
+
+                  /* Now do the pre-multiplication on each pixel in this row.
+                   */
+                  outrow += startx;
+                  for (; outrow < end_row; outrow += stepx)
+                  {
+                     png_uint_32 component = inrow[0];
+                     png_uint_16 alpha = inrow[1];
+
+                     if (alpha > 0) /* else 0 */
+                     {
+                        if (alpha < 65535) /* else just use component */
+                        {
+                           component *= alpha;
+                           component += 32767;
+                           component /= 65535;
+                        }
+                     }
+
+                     else
+                        component = 0;
+
+                     outrow[swap_alpha] = (png_uint_16)component;
+                     if (preserve_alpha != 0)
+                        outrow[1 ^ swap_alpha] = alpha;
+
+                     inrow += 2; /* components and alpha channel */
+                  }
+               }
+            }
+         }
+         break;
+
+#ifdef __GNUC__
+      default:
+         png_error(png_ptr, "unexpected bit depth");
+#endif
+   }
+
+   return 1;
+}
+
+/* The guts of png_image_finish_read as a png_safe_execute callback. */
+static int
+png_image_read_direct(png_voidp argument)
+{
+   png_image_read_control *display = png_voidcast(png_image_read_control*,
+      argument);
+   png_imagep image = display->image;
+   png_structrp png_ptr = image->opaque->png_ptr;
+   png_inforp info_ptr = image->opaque->info_ptr;
+
+   png_uint_32 format = image->format;
+   int linear = (format & PNG_FORMAT_FLAG_LINEAR) != 0;
+   int do_local_compose = 0;
+   int do_local_background = 0; /* to avoid double gamma correction bug */
+   int passes = 0;
+
+   /* Add transforms to ensure the correct output format is produced then check
+    * that the required implementation support is there.  Always expand; always
+    * need 8 bits minimum, no palette and expanded tRNS.
+    */
+   png_set_expand(png_ptr);
+
+   /* Now check the format to see if it was modified. */
+   {
+      png_uint_32 base_format = png_image_format(png_ptr) &
+         ~PNG_FORMAT_FLAG_COLORMAP /* removed by png_set_expand */;
+      png_uint_32 change = format ^ base_format;
+      png_fixed_point output_gamma;
+      int mode; /* alpha mode */
+
+      /* Do this first so that we have a record if rgb to gray is happening. */
+      if ((change & PNG_FORMAT_FLAG_COLOR) != 0)
+      {
+         /* gray<->color transformation required. */
+         if ((format & PNG_FORMAT_FLAG_COLOR) != 0)
+            png_set_gray_to_rgb(png_ptr);
+
+         else
+         {
+            /* libpng can't do both rgb to gray and
+             * background/pre-multiplication if there is also significant gamma
+             * correction, because both operations require linear colors and
+             * the code only supports one transform doing the gamma correction.
+             * Handle this by doing the pre-multiplication or background
+             * operation in this code, if necessary.
+             *
+             * TODO: fix this by rewriting pngrtran.c (!)
+             *
+             * For the moment (given that fixing this in pngrtran.c is an
+             * enormous change) 'do_local_background' is used to indicate that
+             * the problem exists.
+             */
+            if ((base_format & PNG_FORMAT_FLAG_ALPHA) != 0)
+               do_local_background = 1/*maybe*/;
+
+            png_set_rgb_to_gray_fixed(png_ptr, PNG_ERROR_ACTION_NONE,
+               PNG_RGB_TO_GRAY_DEFAULT, PNG_RGB_TO_GRAY_DEFAULT);
+         }
+
+         change &= ~PNG_FORMAT_FLAG_COLOR;
+      }
+
+      /* Set the gamma appropriately, linear for 16-bit input, sRGB otherwise.
+       */
+      {
+         png_fixed_point input_gamma_default;
+
+         if ((base_format & PNG_FORMAT_FLAG_LINEAR) != 0 &&
+             (image->flags & PNG_IMAGE_FLAG_16BIT_sRGB) == 0)
+            input_gamma_default = PNG_GAMMA_LINEAR;
+         else
+            input_gamma_default = PNG_DEFAULT_sRGB;
+
+         /* Call png_set_alpha_mode to set the default for the input gamma; the
+          * output gamma is set by a second call below.
+          */
+         png_set_alpha_mode_fixed(png_ptr, PNG_ALPHA_PNG, input_gamma_default);
+      }
+
+      if (linear != 0)
+      {
+         /* If there *is* an alpha channel in the input it must be multiplied
+          * out; use PNG_ALPHA_STANDARD, otherwise just use PNG_ALPHA_PNG.
+          */
+         if ((base_format & PNG_FORMAT_FLAG_ALPHA) != 0)
+            mode = PNG_ALPHA_STANDARD; /* associated alpha */
+
+         else
+            mode = PNG_ALPHA_PNG;
+
+         output_gamma = PNG_GAMMA_LINEAR;
+      }
+
+      else
+      {
+         mode = PNG_ALPHA_PNG;
+         output_gamma = PNG_DEFAULT_sRGB;
+      }
+
+      /* If 'do_local_background' is set check for the presence of gamma
+       * correction; this is part of the work-round for the libpng bug
+       * described above.
+       *
+       * TODO: fix libpng and remove this.
+       */
+      if (do_local_background != 0)
+      {
+         png_fixed_point gtest;
+
+         /* This is 'png_gamma_threshold' from pngrtran.c; the test used for
+          * gamma correction, the screen gamma hasn't been set on png_struct
+          * yet; it's set below.  png_struct::gamma, however, is set to the
+          * final value.
+          */
+         if (png_muldiv(&gtest, output_gamma, png_ptr->colorspace.gamma,
+               PNG_FP_1) != 0 && png_gamma_significant(gtest) == 0)
+            do_local_background = 0;
+
+         else if (mode == PNG_ALPHA_STANDARD)
+         {
+            do_local_background = 2/*required*/;
+            mode = PNG_ALPHA_PNG; /* prevent libpng doing it */
+         }
+
+         /* else leave as 1 for the checks below */
+      }
+
+      /* If the bit-depth changes then handle that here. */
+      if ((change & PNG_FORMAT_FLAG_LINEAR) != 0)
+      {
+         if (linear != 0 /*16-bit output*/)
+            png_set_expand_16(png_ptr);
+
+         else /* 8-bit output */
+            png_set_scale_16(png_ptr);
+
+         change &= ~PNG_FORMAT_FLAG_LINEAR;
+      }
+
+      /* Now the background/alpha channel changes. */
+      if ((change & PNG_FORMAT_FLAG_ALPHA) != 0)
+      {
+         /* Removing an alpha channel requires composition for the 8-bit
+          * formats; for the 16-bit it is already done, above, by the
+          * pre-multiplication and the channel just needs to be stripped.
+          */
+         if ((base_format & PNG_FORMAT_FLAG_ALPHA) != 0)
+         {
+            /* If RGB->gray is happening the alpha channel must be left and the
+             * operation completed locally.
+             *
+             * TODO: fix libpng and remove this.
+             */
+            if (do_local_background != 0)
+               do_local_background = 2/*required*/;
+
+            /* 16-bit output: just remove the channel */
+            else if (linear != 0) /* compose on black (well, pre-multiply) */
+               png_set_strip_alpha(png_ptr);
+
+            /* 8-bit output: do an appropriate compose */
+            else if (display->background != NULL)
+            {
+               png_color_16 c;
+
+               c.index = 0; /*unused*/
+               c.red = display->background->red;
+               c.green = display->background->green;
+               c.blue = display->background->blue;
+               c.gray = display->background->green;
+
+               /* This is always an 8-bit sRGB value, using the 'green' channel
+                * for gray is much better than calculating the luminance here;
+                * we can get off-by-one errors in that calculation relative to
+                * the app expectations and that will show up in transparent
+                * pixels.
+                */
+               png_set_background_fixed(png_ptr, &c,
+                  PNG_BACKGROUND_GAMMA_SCREEN, 0/*need_expand*/,
+                  0/*gamma: not used*/);
+            }
+
+            else /* compose on row: implemented below. */
+            {
+               do_local_compose = 1;
+               /* This leaves the alpha channel in the output, so it has to be
+                * removed by the code below.  Set the encoding to the 'OPTIMIZE'
+                * one so the code only has to hack on the pixels that require
+                * composition.
+                */
+               mode = PNG_ALPHA_OPTIMIZED;
+            }
+         }
+
+         else /* output needs an alpha channel */
+         {
+            /* This is tricky because it happens before the swap operation has
+             * been accomplished; however, the swap does *not* swap the added
+             * alpha channel (weird API), so it must be added in the correct
+             * place.
+             */
+            png_uint_32 filler; /* opaque filler */
+            int where;
+
+            if (linear != 0)
+               filler = 65535;
+
+            else
+               filler = 255;
+
+#ifdef PNG_FORMAT_AFIRST_SUPPORTED
+            if ((format & PNG_FORMAT_FLAG_AFIRST) != 0)
+            {
+               where = PNG_FILLER_BEFORE;
+               change &= ~PNG_FORMAT_FLAG_AFIRST;
+            }
+
+            else
+#endif
+            where = PNG_FILLER_AFTER;
+
+            png_set_add_alpha(png_ptr, filler, where);
+         }
+
+         /* This stops the (irrelevant) call to swap_alpha below. */
+         change &= ~PNG_FORMAT_FLAG_ALPHA;
+      }
+
+      /* Now set the alpha mode correctly; this is always done, even if there is
+       * no alpha channel in either the input or the output because it correctly
+       * sets the output gamma.
+       */
+      png_set_alpha_mode_fixed(png_ptr, mode, output_gamma);
+
+#     ifdef PNG_FORMAT_BGR_SUPPORTED
+         if ((change & PNG_FORMAT_FLAG_BGR) != 0)
+         {
+            /* Check only the output format; PNG is never BGR; don't do this if
+             * the output is gray, but fix up the 'format' value in that case.
+             */
+            if ((format & PNG_FORMAT_FLAG_COLOR) != 0)
+               png_set_bgr(png_ptr);
+
+            else
+               format &= ~PNG_FORMAT_FLAG_BGR;
+
+            change &= ~PNG_FORMAT_FLAG_BGR;
+         }
+#     endif
+
+#     ifdef PNG_FORMAT_AFIRST_SUPPORTED
+         if ((change & PNG_FORMAT_FLAG_AFIRST) != 0)
+         {
+            /* Only relevant if there is an alpha channel - it's particularly
+             * important to handle this correctly because do_local_compose may
+             * be set above and then libpng will keep the alpha channel for this
+             * code to remove.
+             */
+            if ((format & PNG_FORMAT_FLAG_ALPHA) != 0)
+            {
+               /* Disable this if doing a local background,
+                * TODO: remove this when local background is no longer required.
+                */
+               if (do_local_background != 2)
+                  png_set_swap_alpha(png_ptr);
+            }
+
+            else
+               format &= ~PNG_FORMAT_FLAG_AFIRST;
+
+            change &= ~PNG_FORMAT_FLAG_AFIRST;
+         }
+#     endif
+
+      /* If the *output* is 16-bit then we need to check for a byte-swap on this
+       * architecture.
+       */
+      if (linear != 0)
+      {
+         PNG_CONST png_uint_16 le = 0x0001;
+
+         if ((*(png_const_bytep) & le) != 0)
+            png_set_swap(png_ptr);
+      }
+
+      /* If change is not now 0 some transformation is missing - error out. */
+      if (change != 0)
+         png_error(png_ptr, "png_read_image: unsupported transformation");
+   }
+
+   PNG_SKIP_CHUNKS(png_ptr);
+
+   /* Update the 'info' structure and make sure the result is as required; first
+    * make sure to turn on the interlace handling if it will be required
+    * (because it can't be turned on *after* the call to png_read_update_info!)
+    *
+    * TODO: remove the do_local_background fixup below.
+    */
+   if (do_local_compose == 0 && do_local_background != 2)
+      passes = png_set_interlace_handling(png_ptr);
+
+   png_read_update_info(png_ptr, info_ptr);
+
+   {
+      png_uint_32 info_format = 0;
+
+      if ((info_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
+         info_format |= PNG_FORMAT_FLAG_COLOR;
+
+      if ((info_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)
+      {
+         /* do_local_compose removes this channel below. */
+         if (do_local_compose == 0)
+         {
+            /* do_local_background does the same if required. */
+            if (do_local_background != 2 ||
+               (format & PNG_FORMAT_FLAG_ALPHA) != 0)
+               info_format |= PNG_FORMAT_FLAG_ALPHA;
+         }
+      }
+
+      else if (do_local_compose != 0) /* internal error */
+         png_error(png_ptr, "png_image_read: alpha channel lost");
+
+      if (info_ptr->bit_depth == 16)
+         info_format |= PNG_FORMAT_FLAG_LINEAR;
+
+#ifdef PNG_FORMAT_BGR_SUPPORTED
+      if ((png_ptr->transformations & PNG_BGR) != 0)
+         info_format |= PNG_FORMAT_FLAG_BGR;
+#endif
+
+#ifdef PNG_FORMAT_AFIRST_SUPPORTED
+         if (do_local_background == 2)
+         {
+            if ((format & PNG_FORMAT_FLAG_AFIRST) != 0)
+               info_format |= PNG_FORMAT_FLAG_AFIRST;
+         }
+
+         if ((png_ptr->transformations & PNG_SWAP_ALPHA) != 0 ||
+            ((png_ptr->transformations & PNG_ADD_ALPHA) != 0 &&
+            (png_ptr->flags & PNG_FLAG_FILLER_AFTER) == 0))
+         {
+            if (do_local_background == 2)
+               png_error(png_ptr, "unexpected alpha swap transformation");
+
+            info_format |= PNG_FORMAT_FLAG_AFIRST;
+         }
+#     endif
+
+      /* This is actually an internal error. */
+      if (info_format != format)
+         png_error(png_ptr, "png_read_image: invalid transformations");
+   }
+
+   /* Now read the rows.  If do_local_compose is set then it is necessary to use
+    * a local row buffer.  The output will be GA, RGBA or BGRA and must be
+    * converted to G, RGB or BGR as appropriate.  The 'local_row' member of the
+    * display acts as a flag.
+    */
+   {
+      png_voidp first_row = display->buffer;
+      ptrdiff_t row_bytes = display->row_stride;
+
+      if (linear != 0)
+         row_bytes *= 2;
+
+      /* The following expression is designed to work correctly whether it gives
+       * a signed or an unsigned result.
+       */
+      if (row_bytes < 0)
+      {
+         char *ptr = png_voidcast(char*, first_row);
+         ptr += (image->height-1) * (-row_bytes);
+         first_row = png_voidcast(png_voidp, ptr);
+      }
+
+      display->first_row = first_row;
+      display->row_bytes = row_bytes;
+   }
+
+   if (do_local_compose != 0)
+   {
+      int result;
+      png_voidp row = png_malloc(png_ptr, png_get_rowbytes(png_ptr, info_ptr));
+
+      display->local_row = row;
+      result = png_safe_execute(image, png_image_read_composite, display);
+      display->local_row = NULL;
+      png_free(png_ptr, row);
+
+      return result;
+   }
+
+   else if (do_local_background == 2)
+   {
+      int result;
+      png_voidp row = png_malloc(png_ptr, png_get_rowbytes(png_ptr, info_ptr));
+
+      display->local_row = row;
+      result = png_safe_execute(image, png_image_read_background, display);
+      display->local_row = NULL;
+      png_free(png_ptr, row);
+
+      return result;
+   }
+
+   else
+   {
+      png_alloc_size_t row_bytes = display->row_bytes;
+
+      while (--passes >= 0)
+      {
+         png_uint_32      y = image->height;
+         png_bytep        row = png_voidcast(png_bytep, display->first_row);
+
+         while (y-- > 0)
+         {
+            png_read_row(png_ptr, row, NULL);
+            row += row_bytes;
+         }
+      }
+
+      return 1;
+   }
+}
+
+int PNGAPI
+png_image_finish_read(png_imagep image, png_const_colorp background,
+   void *buffer, png_int_32 row_stride, void *colormap)
+{
+   if (image != NULL && image->version == PNG_IMAGE_VERSION)
+   {
+      /* Check for row_stride overflow.  This check is not performed on the
+       * original PNG format because it may not occur in the output PNG format
+       * and libpng deals with the issues of reading the original.
+       */
+      const unsigned int channels = PNG_IMAGE_PIXEL_CHANNELS(image->format);
+
+      if (image->width <= 0x7FFFFFFFU/channels) /* no overflow */
+      {
+         png_uint_32 check;
+         const png_uint_32 png_row_stride = image->width * channels;
+
+         if (row_stride == 0)
+            row_stride = (png_int_32)/*SAFE*/png_row_stride;
+
+         if (row_stride < 0)
+            check = -row_stride;
+
+         else
+            check = row_stride;
+
+         if (image->opaque != NULL && buffer != NULL && check >= png_row_stride)
+         {
+            /* Now check for overflow of the image buffer calculation; this
+             * limits the whole image size to 32 bits for API compatibility with
+             * the current, 32-bit, PNG_IMAGE_BUFFER_SIZE macro.
+             */
+            if (image->height <= 0xFFFFFFFF/png_row_stride)
+            {
+               if ((image->format & PNG_FORMAT_FLAG_COLORMAP) == 0 ||
+                  (image->colormap_entries > 0 && colormap != NULL))
+               {
+                  int result;
+                  png_image_read_control display;
+
+                  memset(&display, 0, (sizeof display));
+                  display.image = image;
+                  display.buffer = buffer;
+                  display.row_stride = row_stride;
+                  display.colormap = colormap;
+                  display.background = background;
+                  display.local_row = NULL;
+
+                  /* Choose the correct 'end' routine; for the color-map case
+                   * all the setup has already been done.
+                   */
+                  if ((image->format & PNG_FORMAT_FLAG_COLORMAP) != 0)
+                     result = png_safe_execute(image,
+                                    png_image_read_colormap, &display) &&
+                              png_safe_execute(image,
+                                    png_image_read_colormapped, &display);
+
+                  else
+                     result =
+                        png_safe_execute(image,
+                              png_image_read_direct, &display);
+
+                  png_image_free(image);
+                  return result;
+               }
+
+               else
+                  return png_image_error(image,
+                     "png_image_finish_read[color-map]: no color-map");
+            }
+
+            else
+               return png_image_error(image,
+                  "png_image_finish_read: image too large");
+         }
+
+         else
+            return png_image_error(image,
+               "png_image_finish_read: invalid argument");
+      }
+
+      else
+         return png_image_error(image,
+            "png_image_finish_read: row_stride too large");
+   }
+
+   else if (image != NULL)
+      return png_image_error(image,
+         "png_image_finish_read: damaged PNG_IMAGE_VERSION");
+
+   return 0;
+}
+
+#endif /* SIMPLIFIED_READ */
+#endif /* READ */
diff --git a/drivers/png/pngrio.c b/drivers/png/pngrio.c
index b4042e9ed3..5101d54a62 100644
--- a/drivers/png/pngrio.c
+++ b/drivers/png/pngrio.c
@@ -1,8 +1,8 @@
 
 /* pngrio.c - functions for data input
  *
- * Last changed in libpng 1.5.0 [January 6, 2011]
- * Copyright (c) 1998-2002,2004,2006-2011 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.17 [March 26, 2015]
+ * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -26,10 +26,10 @@
  * reads from a file pointer.  Note that this routine sometimes gets called
  * with very small lengths, so you should implement some kind of simple
  * buffering if you are using unbuffered reads.  This should never be asked
- * to read more than 64K on a 16 bit machine.
+ * to read more than 64K on a 16-bit machine.
  */
 void /* PRIVATE */
-png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+png_read_data(png_structrp png_ptr, png_bytep data, png_size_t length)
 {
    png_debug1(4, "reading %d bytes", (int)length);
 
@@ -46,7 +46,6 @@ png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
  * read_data function and use it at run time with png_set_read_fn(), rather
  * than changing the library.
  */
-#  ifndef USE_FAR_KEYWORD
 void PNGCBAPI
 png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
 {
@@ -58,68 +57,11 @@ png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
    /* fread() returns 0 on error, so it is OK to store this in a png_size_t
     * instead of an int, which is what fread() actually returns.
     */
-   check = fread(data, 1, length, (png_FILE_p)png_ptr->io_ptr);
+   check = fread(data, 1, length, png_voidcast(png_FILE_p, png_ptr->io_ptr));
 
    if (check != length)
       png_error(png_ptr, "Read Error");
 }
-#  else
-/* This is the model-independent version. Since the standard I/O library
-   can't handle far buffers in the medium and small models, we have to copy
-   the data.
-*/
-
-#define NEAR_BUF_SIZE 1024
-#define MIN(a,b) (a <= b ? a : b)
-
-static void PNGCBAPI
-png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
-{
-   png_size_t check;
-   png_byte *n_data;
-   png_FILE_p io_ptr;
-
-   if (png_ptr == NULL)
-      return;
-
-   /* Check if data really is near. If so, use usual code. */
-   n_data = (png_byte *)CVT_PTR_NOCHECK(data);
-   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
-
-   if ((png_bytep)n_data == data)
-   {
-      check = fread(n_data, 1, length, io_ptr);
-   }
-
-   else
-   {
-      png_byte buf[NEAR_BUF_SIZE];
-      png_size_t read, remaining, err;
-      check = 0;
-      remaining = length;
-
-      do
-      {
-         read = MIN(NEAR_BUF_SIZE, remaining);
-         err = fread(buf, 1, read, io_ptr);
-         png_memcpy(data, buf, read); /* copy far buffer to near buffer */
-
-         if (err != read)
-            break;
-
-         else
-            check += err;
-
-         data += read;
-         remaining -= read;
-      }
-      while (remaining != 0);
-   }
-
-   if ((png_uint_32)check != (png_uint_32)length)
-      png_error(png_ptr, "read Error");
-}
-#  endif
 #endif
 
 /* This function allows the application to supply a new input function
@@ -142,7 +84,7 @@ png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
  *                be used.
  */
 void PNGAPI
-png_set_read_fn(png_structp png_ptr, png_voidp io_ptr,
+png_set_read_fn(png_structrp png_ptr, png_voidp io_ptr,
    png_rw_ptr read_data_fn)
 {
    if (png_ptr == NULL)
@@ -160,6 +102,7 @@ png_set_read_fn(png_structp png_ptr, png_voidp io_ptr,
    png_ptr->read_data_fn = read_data_fn;
 #endif
 
+#ifdef PNG_WRITE_SUPPORTED
    /* It is an error to write to a read device */
    if (png_ptr->write_data_fn != NULL)
    {
@@ -168,9 +111,10 @@ png_set_read_fn(png_structp png_ptr, png_voidp io_ptr,
           "Can't set both read_data_fn and write_data_fn in the"
           " same structure");
    }
+#endif
 
 #ifdef PNG_WRITE_FLUSH_SUPPORTED
    png_ptr->output_flush_fn = NULL;
 #endif
 }
-#endif /* PNG_READ_SUPPORTED */
+#endif /* READ */
diff --git a/drivers/png/pngrtran.c b/drivers/png/pngrtran.c
index f273362616..3138147aff 100644
--- a/drivers/png/pngrtran.c
+++ b/drivers/png/pngrtran.c
@@ -1,8 +1,8 @@
 
 /* pngrtran.c - transforms the data in a row for PNG readers
  *
- * Last changed in libpng 1.5.24 [November 12, 2015]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.22 [May 26, 2016]
+ * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -22,7 +22,7 @@
 
 /* Set the action on getting a CRC error for an ancillary or critical chunk. */
 void PNGAPI
-png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action)
+png_set_crc_action(png_structrp png_ptr, int crit_action, int ancil_action)
 {
    png_debug(1, "in png_set_crc_action");
 
@@ -88,16 +88,47 @@ png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action)
    }
 }
 
+#ifdef PNG_READ_TRANSFORMS_SUPPORTED
+/* Is it OK to set a transformation now?  Only if png_start_read_image or
+ * png_read_update_info have not been called.  It is not necessary for the IHDR
+ * to have been read in all cases; the need_IHDR parameter allows for this
+ * check too.
+ */
+static int
+png_rtran_ok(png_structrp png_ptr, int need_IHDR)
+{
+   if (png_ptr != NULL)
+   {
+      if ((png_ptr->flags & PNG_FLAG_ROW_INIT) != 0)
+         png_app_error(png_ptr,
+            "invalid after png_start_read_image or png_read_update_info");
+
+      else if (need_IHDR && (png_ptr->mode & PNG_HAVE_IHDR) == 0)
+         png_app_error(png_ptr, "invalid before the PNG header has been read");
+
+      else
+      {
+         /* Turn on failure to initialize correctly for all transforms. */
+         png_ptr->flags |= PNG_FLAG_DETECT_UNINITIALIZED;
+
+         return 1; /* Ok */
+      }
+   }
+
+   return 0; /* no png_error possible! */
+}
+#endif
+
 #ifdef PNG_READ_BACKGROUND_SUPPORTED
 /* Handle alpha and tRNS via a background color */
 void PNGFAPI
-png_set_background_fixed(png_structp png_ptr,
+png_set_background_fixed(png_structrp png_ptr,
     png_const_color_16p background_color, int background_gamma_code,
     int need_expand, png_fixed_point background_gamma)
 {
    png_debug(1, "in png_set_background_fixed");
 
-   if (png_ptr == NULL)
+   if (png_rtran_ok(png_ptr, 0) == 0 || background_color == NULL)
       return;
 
    if (background_gamma_code == PNG_BACKGROUND_GAMMA_UNKNOWN)
@@ -110,8 +141,7 @@ png_set_background_fixed(png_structp png_ptr,
    png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
    png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
 
-   png_memcpy(&(png_ptr->background), background_color,
-      png_sizeof(png_color_16));
+   png_ptr->background = *background_color;
    png_ptr->background_gamma = background_gamma;
    png_ptr->background_gamma_type = (png_byte)(background_gamma_code);
    if (need_expand != 0)
@@ -122,14 +152,14 @@ png_set_background_fixed(png_structp png_ptr,
 
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
 void PNGAPI
-png_set_background(png_structp png_ptr,
+png_set_background(png_structrp png_ptr,
     png_const_color_16p background_color, int background_gamma_code,
     int need_expand, double background_gamma)
 {
    png_set_background_fixed(png_ptr, background_color, background_gamma_code,
       need_expand, png_fixed(png_ptr, background_gamma, "png_set_background"));
 }
-#  endif  /* FLOATING_POINT */
+#  endif /* FLOATING_POINT */
 #endif /* READ_BACKGROUND */
 
 /* Scale 16-bit depth files to 8-bit depth.  If both of these are set then the
@@ -138,11 +168,11 @@ png_set_background(png_structp png_ptr,
  */
 #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
 void PNGAPI
-png_set_scale_16(png_structp png_ptr)
+png_set_scale_16(png_structrp png_ptr)
 {
    png_debug(1, "in png_set_scale_16");
 
-   if (png_ptr == NULL)
+   if (png_rtran_ok(png_ptr, 0) == 0)
       return;
 
    png_ptr->transformations |= PNG_SCALE_16_TO_8;
@@ -152,11 +182,11 @@ png_set_scale_16(png_structp png_ptr)
 #ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
 /* Chop 16-bit depth files to 8-bit depth */
 void PNGAPI
-png_set_strip_16(png_structp png_ptr)
+png_set_strip_16(png_structrp png_ptr)
 {
    png_debug(1, "in png_set_strip_16");
 
-   if (png_ptr == NULL)
+   if (png_rtran_ok(png_ptr, 0) == 0)
       return;
 
    png_ptr->transformations |= PNG_16_TO_8;
@@ -165,11 +195,11 @@ png_set_strip_16(png_structp png_ptr)
 
 #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
 void PNGAPI
-png_set_strip_alpha(png_structp png_ptr)
+png_set_strip_alpha(png_structrp png_ptr)
 {
    png_debug(1, "in png_set_strip_alpha");
 
-   if (png_ptr == NULL)
+   if (png_rtran_ok(png_ptr, 0) == 0)
       return;
 
    png_ptr->transformations |= PNG_STRIP_ALPHA;
@@ -178,7 +208,7 @@ png_set_strip_alpha(png_structp png_ptr)
 
 #if defined(PNG_READ_ALPHA_MODE_SUPPORTED) || defined(PNG_READ_GAMMA_SUPPORTED)
 static png_fixed_point
-translate_gamma_flags(png_structp png_ptr, png_fixed_point output_gamma,
+translate_gamma_flags(png_structrp png_ptr, png_fixed_point output_gamma,
    int is_screen)
 {
    /* Check for flag values.  The main reason for having the old Mac value as a
@@ -217,7 +247,7 @@ translate_gamma_flags(png_structp png_ptr, png_fixed_point output_gamma,
 
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
 static png_fixed_point
-convert_gamma_value(png_structp png_ptr, double output_gamma)
+convert_gamma_value(png_structrp png_ptr, double output_gamma)
 {
    /* The following silently ignores cases where fixed point (times 100,000)
     * gamma values are passed to the floating point API.  This is safe and it
@@ -242,7 +272,7 @@ convert_gamma_value(png_structp png_ptr, double output_gamma)
 
 #ifdef PNG_READ_ALPHA_MODE_SUPPORTED
 void PNGFAPI
-png_set_alpha_mode_fixed(png_structp png_ptr, int mode,
+png_set_alpha_mode_fixed(png_structrp png_ptr, int mode,
    png_fixed_point output_gamma)
 {
    int compose = 0;
@@ -250,7 +280,7 @@ png_set_alpha_mode_fixed(png_structp png_ptr, int mode,
 
    png_debug(1, "in png_set_alpha_mode");
 
-   if (png_ptr == NULL)
+   if (png_rtran_ok(png_ptr, 0) == 0)
       return;
 
    output_gamma = translate_gamma_flags(png_ptr, output_gamma, 1/*screen*/);
@@ -259,9 +289,12 @@ png_set_alpha_mode_fixed(png_structp png_ptr, int mode,
     * is expected to be 1 or greater, but this range test allows for some
     * viewing correction values.  The intent is to weed out users of this API
     * who use the inverse of the gamma value accidentally!  Since some of these
-    * values are reasonable this may have to be changed.
+    * values are reasonable this may have to be changed:
+    *
+    * 1.6.x: changed from 0.07..3 to 0.01..100 (to accomodate the optimal 16-bit
+    * gamma of 36, and its reciprocal.)
     */
-   if (output_gamma < 70000 || output_gamma > 300000)
+   if (output_gamma < 1000 || output_gamma > 10000000)
       png_error(png_ptr, "output gamma out of expected range");
 
    /* The default file gamma is the inverse of the output gamma; the output
@@ -322,8 +355,11 @@ png_set_alpha_mode_fixed(png_structp png_ptr, int mode,
     * the side effect that the gamma in a second call to png_set_alpha_mode will
     * be ignored.)
     */
-   if (png_ptr->gamma == 0)
-      png_ptr->gamma = file_gamma;
+   if (png_ptr->colorspace.gamma == 0)
+   {
+      png_ptr->colorspace.gamma = file_gamma;
+      png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
+   }
 
    /* But always set the output gamma: */
    png_ptr->screen_gamma = output_gamma;
@@ -334,25 +370,22 @@ png_set_alpha_mode_fixed(png_structp png_ptr, int mode,
    if (compose != 0)
    {
       /* And obtain alpha pre-multiplication by composing on black: */
-      png_memset(&png_ptr->background, 0, sizeof png_ptr->background);
-      png_ptr->background_gamma = png_ptr->gamma; /* just in case */
+      memset(&png_ptr->background, 0, (sizeof png_ptr->background));
+      png_ptr->background_gamma = png_ptr->colorspace.gamma; /* just in case */
       png_ptr->background_gamma_type = PNG_BACKGROUND_GAMMA_FILE;
       png_ptr->transformations &= ~PNG_BACKGROUND_EXPAND;
 
-      if (png_ptr->transformations & PNG_COMPOSE)
+      if ((png_ptr->transformations & PNG_COMPOSE) != 0)
          png_error(png_ptr,
             "conflicting calls to set alpha mode and background");
 
       png_ptr->transformations |= PNG_COMPOSE;
    }
-
-   /* New API, make sure apps call the correct initializers: */
-   png_ptr->flags |= PNG_FLAG_DETECT_UNINITIALIZED;
 }
 
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
 void PNGAPI
-png_set_alpha_mode(png_structp png_ptr, int mode, double output_gamma)
+png_set_alpha_mode(png_structrp png_ptr, int mode, double output_gamma)
 {
    png_set_alpha_mode_fixed(png_ptr, mode, convert_gamma_value(png_ptr,
       output_gamma));
@@ -364,7 +397,7 @@ png_set_alpha_mode(png_structp png_ptr, int mode, double output_gamma)
 /* Dither file to 8-bit.  Supply a palette, the current number
  * of elements in the palette, the maximum number of elements
  * allowed, and a histogram if possible.  If the current number
- * of colors is greater then the maximum number, the palette will be
+ * of colors is greater than the maximum number, the palette will be
  * modified to fit in the maximum number.  "full_quantize" indicates
  * whether we need a quantizing cube set up for RGB images, or if we
  * simply are reducing the number of colors in a paletted image.
@@ -372,21 +405,21 @@ png_set_alpha_mode(png_structp png_ptr, int mode, double output_gamma)
 
 typedef struct png_dsort_struct
 {
-   struct png_dsort_struct FAR * next;
+   struct png_dsort_struct * next;
    png_byte left;
    png_byte right;
 } png_dsort;
-typedef png_dsort FAR *       png_dsortp;
-typedef png_dsort FAR * FAR * png_dsortpp;
+typedef png_dsort *   png_dsortp;
+typedef png_dsort * * png_dsortpp;
 
 void PNGAPI
-png_set_quantize(png_structp png_ptr, png_colorp palette,
+png_set_quantize(png_structrp png_ptr, png_colorp palette,
     int num_palette, int maximum_colors, png_const_uint_16p histogram,
     int full_quantize)
 {
    png_debug(1, "in png_set_quantize");
 
-   if (png_ptr == NULL)
+   if (png_rtran_ok(png_ptr, 0) == 0)
       return;
 
    png_ptr->transformations |= PNG_QUANTIZE;
@@ -396,7 +429,7 @@ png_set_quantize(png_structp png_ptr, png_colorp palette,
       int i;
 
       png_ptr->quantize_index = (png_bytep)png_malloc(png_ptr,
-          (png_uint_32)(num_palette * png_sizeof(png_byte)));
+          (png_uint_32)(num_palette * (sizeof (png_byte))));
       for (i = 0; i < num_palette; i++)
          png_ptr->quantize_index[i] = (png_byte)i;
    }
@@ -413,7 +446,7 @@ png_set_quantize(png_structp png_ptr, png_colorp palette,
 
          /* Initialize an array to sort colors */
          png_ptr->quantize_sort = (png_bytep)png_malloc(png_ptr,
-             (png_uint_32)(num_palette * png_sizeof(png_byte)));
+             (png_uint_32)(num_palette * (sizeof (png_byte))));
 
          /* Initialize the quantize_sort array */
          for (i = 0; i < num_palette; i++)
@@ -547,9 +580,9 @@ png_set_quantize(png_structp png_ptr, png_colorp palette,
 
          /* Initialize palette index arrays */
          png_ptr->index_to_palette = (png_bytep)png_malloc(png_ptr,
-             (png_uint_32)(num_palette * png_sizeof(png_byte)));
+             (png_uint_32)(num_palette * (sizeof (png_byte))));
          png_ptr->palette_to_index = (png_bytep)png_malloc(png_ptr,
-             (png_uint_32)(num_palette * png_sizeof(png_byte)));
+             (png_uint_32)(num_palette * (sizeof (png_byte))));
 
          /* Initialize the sort array */
          for (i = 0; i < num_palette; i++)
@@ -559,7 +592,7 @@ png_set_quantize(png_structp png_ptr, png_colorp palette,
          }
 
          hash = (png_dsortpp)png_calloc(png_ptr, (png_uint_32)(769 *
-             png_sizeof(png_dsortp)));
+             (sizeof (png_dsortp))));
 
          num_new_palette = num_palette;
 
@@ -589,7 +622,7 @@ png_set_quantize(png_structp png_ptr, png_colorp palette,
                   {
 
                      t = (png_dsortp)png_malloc_warn(png_ptr,
-                         (png_uint_32)(png_sizeof(png_dsort)));
+                         (png_uint_32)(sizeof (png_dsort)));
 
                      if (t == NULL)
                          break;
@@ -714,12 +747,12 @@ png_set_quantize(png_structp png_ptr, png_colorp palette,
       png_size_t num_entries = ((png_size_t)1 << total_bits);
 
       png_ptr->palette_lookup = (png_bytep)png_calloc(png_ptr,
-          (png_uint_32)(num_entries * png_sizeof(png_byte)));
+          (png_uint_32)(num_entries * (sizeof (png_byte))));
 
       distance = (png_bytep)png_malloc(png_ptr, (png_uint_32)(num_entries *
-          png_sizeof(png_byte)));
+          (sizeof (png_byte))));
 
-      png_memset(distance, 0xff, num_entries * png_sizeof(png_byte));
+      memset(distance, 0xff, num_entries * (sizeof (png_byte)));
 
       for (i = 0; i < num_palette; i++)
       {
@@ -764,23 +797,22 @@ png_set_quantize(png_structp png_ptr, png_colorp palette,
       png_free(png_ptr, distance);
    }
 }
-#endif /* PNG_READ_QUANTIZE_SUPPORTED */
+#endif /* READ_QUANTIZE */
 
 #ifdef PNG_READ_GAMMA_SUPPORTED
 void PNGFAPI
-png_set_gamma_fixed(png_structp png_ptr, png_fixed_point scrn_gamma,
+png_set_gamma_fixed(png_structrp png_ptr, png_fixed_point scrn_gamma,
    png_fixed_point file_gamma)
 {
    png_debug(1, "in png_set_gamma_fixed");
 
-   if (png_ptr == NULL)
+   if (png_rtran_ok(png_ptr, 0) == 0)
       return;
 
    /* New in libpng-1.5.4 - reserve particular negative values as flags. */
    scrn_gamma = translate_gamma_flags(png_ptr, scrn_gamma, 1/*screen*/);
    file_gamma = translate_gamma_flags(png_ptr, file_gamma, 0/*file*/);
 
-#if PNG_LIBPNG_VER >= 10600
    /* Checking the gamma values for being >0 was added in 1.5.4 along with the
     * premultiplied alpha support; this actually hides an undocumented feature
     * of the previous implementation which allowed gamma processing to be
@@ -789,31 +821,32 @@ png_set_gamma_fixed(png_structp png_ptr, png_fixed_point scrn_gamma,
     * accept '0' for the gamma value it takes, because it isn't always used.
     *
     * Since this is an API change (albeit a very minor one that removes an
-    * undocumented API feature) it will not be made until libpng-1.6.0.
+    * undocumented API feature) the following checks were only enabled in
+    * libpng-1.6.0.
     */
    if (file_gamma <= 0)
       png_error(png_ptr, "invalid file gamma in png_set_gamma");
 
    if (scrn_gamma <= 0)
       png_error(png_ptr, "invalid screen gamma in png_set_gamma");
-#endif
 
    /* Set the gamma values unconditionally - this overrides the value in the PNG
     * file if a gAMA chunk was present.  png_set_alpha_mode provides a
     * different, easier, way to default the file gamma.
     */
-   png_ptr->gamma = file_gamma;
+   png_ptr->colorspace.gamma = file_gamma;
+   png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
    png_ptr->screen_gamma = scrn_gamma;
 }
 
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
 void PNGAPI
-png_set_gamma(png_structp png_ptr, double scrn_gamma, double file_gamma)
+png_set_gamma(png_structrp png_ptr, double scrn_gamma, double file_gamma)
 {
    png_set_gamma_fixed(png_ptr, convert_gamma_value(png_ptr, scrn_gamma),
       convert_gamma_value(png_ptr, file_gamma));
 }
-#  endif /* FLOATING_POINT_SUPPORTED */
+#  endif /* FLOATING_POINT */
 #endif /* READ_GAMMA */
 
 #ifdef PNG_READ_EXPAND_SUPPORTED
@@ -822,15 +855,14 @@ png_set_gamma(png_structp png_ptr, double scrn_gamma, double file_gamma)
  * to alpha channels.
  */
 void PNGAPI
-png_set_expand(png_structp png_ptr)
+png_set_expand(png_structrp png_ptr)
 {
    png_debug(1, "in png_set_expand");
 
-   if (png_ptr == NULL)
+   if (png_rtran_ok(png_ptr, 0) == 0)
       return;
 
    png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
-   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
 }
 
 /* GRR 19990627:  the following three functions currently are identical
@@ -853,90 +885,85 @@ png_set_expand(png_structp png_ptr)
 
 /* Expand paletted images to RGB. */
 void PNGAPI
-png_set_palette_to_rgb(png_structp png_ptr)
+png_set_palette_to_rgb(png_structrp png_ptr)
 {
    png_debug(1, "in png_set_palette_to_rgb");
 
-   if (png_ptr == NULL)
+   if (png_rtran_ok(png_ptr, 0) == 0)
       return;
 
    png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
-   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
 }
 
 /* Expand grayscale images of less than 8-bit depth to 8 bits. */
 void PNGAPI
-png_set_expand_gray_1_2_4_to_8(png_structp png_ptr)
+png_set_expand_gray_1_2_4_to_8(png_structrp png_ptr)
 {
    png_debug(1, "in png_set_expand_gray_1_2_4_to_8");
 
-   if (png_ptr == NULL)
+   if (png_rtran_ok(png_ptr, 0) == 0)
       return;
 
    png_ptr->transformations |= PNG_EXPAND;
-   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
 }
 
-
-
 /* Expand tRNS chunks to alpha channels. */
 void PNGAPI
-png_set_tRNS_to_alpha(png_structp png_ptr)
+png_set_tRNS_to_alpha(png_structrp png_ptr)
 {
    png_debug(1, "in png_set_tRNS_to_alpha");
 
+   if (png_rtran_ok(png_ptr, 0) == 0)
+      return;
+
    png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
-   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
 }
-#endif /* defined(PNG_READ_EXPAND_SUPPORTED) */
+#endif /* READ_EXPAND */
 
 #ifdef PNG_READ_EXPAND_16_SUPPORTED
 /* Expand to 16-bit channels, expand the tRNS chunk too (because otherwise
  * it may not work correctly.)
  */
 void PNGAPI
-png_set_expand_16(png_structp png_ptr)
+png_set_expand_16(png_structrp png_ptr)
 {
    png_debug(1, "in png_set_expand_16");
 
-   if (png_ptr == NULL)
+   if (png_rtran_ok(png_ptr, 0) == 0)
       return;
 
    png_ptr->transformations |= (PNG_EXPAND_16 | PNG_EXPAND | PNG_EXPAND_tRNS);
-   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
-
-   /* New API, make sure apps call the correct initializers: */
-   png_ptr->flags |= PNG_FLAG_DETECT_UNINITIALIZED;
 }
 #endif
 
 #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
 void PNGAPI
-png_set_gray_to_rgb(png_structp png_ptr)
+png_set_gray_to_rgb(png_structrp png_ptr)
 {
    png_debug(1, "in png_set_gray_to_rgb");
 
-   if (png_ptr != NULL)
-   {
-      /* Because rgb must be 8 bits or more: */
-      png_set_expand_gray_1_2_4_to_8(png_ptr);
-      png_ptr->transformations |= PNG_GRAY_TO_RGB;
-      png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
-   }
+   if (png_rtran_ok(png_ptr, 0) == 0)
+      return;
+
+   /* Because rgb must be 8 bits or more: */
+   png_set_expand_gray_1_2_4_to_8(png_ptr);
+   png_ptr->transformations |= PNG_GRAY_TO_RGB;
 }
 #endif
 
 #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
 void PNGFAPI
-png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action,
+png_set_rgb_to_gray_fixed(png_structrp png_ptr, int error_action,
     png_fixed_point red, png_fixed_point green)
 {
    png_debug(1, "in png_set_rgb_to_gray");
 
-   if (png_ptr == NULL)
+   /* Need the IHDR here because of the check on color_type below. */
+   /* TODO: fix this */
+   if (png_rtran_ok(png_ptr, 1) == 0)
       return;
 
-   switch(error_action)
+   switch (error_action)
    {
       case PNG_ERROR_ACTION_NONE:
          png_ptr->transformations |= PNG_RGB_TO_GRAY;
@@ -952,17 +979,20 @@ png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action,
 
       default:
          png_error(png_ptr, "invalid error action to rgb_to_gray");
-         break;
    }
+
    if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
 #ifdef PNG_READ_EXPAND_SUPPORTED
       png_ptr->transformations |= PNG_EXPAND;
 #else
    {
-      png_warning(png_ptr,
+      /* Make this an error in 1.6 because otherwise the application may assume
+       * that it just worked and get a memory overwrite.
+       */
+      png_error(png_ptr,
         "Cannot do RGB_TO_GRAY without EXPAND_SUPPORTED");
 
-      png_ptr->transformations &= ~PNG_RGB_TO_GRAY;
+      /* png_ptr->transformations &= ~PNG_RGB_TO_GRAY; */
    }
 #endif
    {
@@ -986,7 +1016,7 @@ png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action,
       else
       {
          if (red >= 0 && green >= 0)
-            png_warning(png_ptr,
+            png_app_warning(png_ptr,
                "ignoring out of range rgb_to_gray coefficients");
 
          /* Use the defaults, from the cHRM chunk if set, else the historical
@@ -1012,31 +1042,25 @@ png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action,
  */
 
 void PNGAPI
-png_set_rgb_to_gray(png_structp png_ptr, int error_action, double red,
+png_set_rgb_to_gray(png_structrp png_ptr, int error_action, double red,
    double green)
 {
-   if (png_ptr == NULL)
-      return;
-
    png_set_rgb_to_gray_fixed(png_ptr, error_action,
       png_fixed(png_ptr, red, "rgb to gray red coefficient"),
       png_fixed(png_ptr, green, "rgb to gray green coefficient"));
 }
 #endif /* FLOATING POINT */
 
-#endif
+#endif /* RGB_TO_GRAY */
 
 #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
     defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
 void PNGAPI
-png_set_read_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
+png_set_read_user_transform_fn(png_structrp png_ptr, png_user_transform_ptr
     read_user_transform_fn)
 {
    png_debug(1, "in png_set_read_user_transform_fn");
 
-   if (png_ptr == NULL)
-      return;
-
 #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
    png_ptr->transformations |= PNG_USER_TRANSFORM;
    png_ptr->read_user_transform_fn = read_user_transform_fn;
@@ -1076,7 +1100,7 @@ png_gamma_threshold(png_fixed_point screen_gamma, png_fixed_point file_gamma)
  * extracted from 'png_init_read_transformations'.
  */
 static void /* PRIVATE */
-png_init_palette_transformations(png_structp png_ptr)
+png_init_palette_transformations(png_structrp png_ptr)
 {
    /* Called to handle the (input) palette case.  In png_do_read_transformations
     * the first step is to expand the palette if requested, so this code must
@@ -1132,8 +1156,8 @@ png_init_palette_transformations(png_structp png_ptr)
    /* The following code cannot be entered in the alpha pre-multiplication case
     * because PNG_BACKGROUND_EXPAND is cancelled below.
     */
-   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
-       (png_ptr->transformations & PNG_EXPAND))
+   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0 &&
+       (png_ptr->transformations & PNG_EXPAND) != 0)
    {
       {
          png_ptr->background.red   =
@@ -1144,9 +1168,9 @@ png_init_palette_transformations(png_structp png_ptr)
              png_ptr->palette[png_ptr->background.index].blue;
 
 #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-        if (png_ptr->transformations & PNG_INVERT_ALPHA)
+        if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0)
         {
-           if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
+           if ((png_ptr->transformations & PNG_EXPAND_tRNS) == 0)
            {
               /* Invert the alpha channel (in tRNS) unless the pixels are
                * going to be expanded, in which case leave it for later
@@ -1158,14 +1182,14 @@ png_init_palette_transformations(png_structp png_ptr)
                     png_ptr->trans_alpha[i]);
            }
         }
-#endif /* PNG_READ_INVERT_ALPHA_SUPPORTED */
+#endif /* READ_INVERT_ALPHA */
       }
    } /* background expand and (therefore) no alpha association. */
-#endif /* PNG_READ_EXPAND_SUPPORTED && PNG_READ_BACKGROUND_SUPPORTED */
+#endif /* READ_EXPAND && READ_BACKGROUND */
 }
 
 static void /* PRIVATE */
-png_init_rgb_transformations(png_structp png_ptr)
+png_init_rgb_transformations(png_structrp png_ptr)
 {
    /* Added to libpng-1.5.4: check the color type to determine whether there
     * is any alpha or transparency in the image and simply cancel the
@@ -1199,9 +1223,9 @@ png_init_rgb_transformations(png_structp png_ptr)
    /* The following code cannot be entered in the alpha pre-multiplication case
     * because PNG_BACKGROUND_EXPAND is cancelled below.
     */
-   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
-       (png_ptr->transformations & PNG_EXPAND) &&
-       !(png_ptr->color_type & PNG_COLOR_MASK_COLOR))
+   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0 &&
+       (png_ptr->transformations & PNG_EXPAND) != 0 &&
+       (png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
        /* i.e., GRAY or GRAY_ALPHA */
    {
       {
@@ -1229,7 +1253,7 @@ png_init_rgb_transformations(png_structp png_ptr)
             default:
 
             case 8:
-               /* FALL THROUGH (already 8 bits) */
+               /* FALL THROUGH (Already 8 bits) */
 
             case 16:
                /* Already a full 16 bits */
@@ -1239,18 +1263,18 @@ png_init_rgb_transformations(png_structp png_ptr)
          png_ptr->background.red = png_ptr->background.green =
             png_ptr->background.blue = (png_uint_16)gray;
 
-         if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
+         if ((png_ptr->transformations & PNG_EXPAND_tRNS) == 0)
          {
             png_ptr->trans_color.red = png_ptr->trans_color.green =
                png_ptr->trans_color.blue = (png_uint_16)trans_gray;
          }
       }
    } /* background expand and (therefore) no alpha association. */
-#endif /* PNG_READ_EXPAND_SUPPORTED && PNG_READ_BACKGROUND_SUPPORTED */
+#endif /* READ_EXPAND && READ_BACKGROUND */
 }
 
 void /* PRIVATE */
-png_init_read_transformations(png_structp png_ptr)
+png_init_read_transformations(png_structrp png_ptr)
 {
    png_debug(1, "in png_init_read_transformations");
 
@@ -1275,17 +1299,17 @@ png_init_read_transformations(png_structp png_ptr)
        */
       int gamma_correction = 0;
 
-      if (png_ptr->gamma != 0) /* has been set */
+      if (png_ptr->colorspace.gamma != 0) /* has been set */
       {
          if (png_ptr->screen_gamma != 0) /* screen set too */
-            gamma_correction = png_gamma_threshold(png_ptr->gamma,
+            gamma_correction = png_gamma_threshold(png_ptr->colorspace.gamma,
                png_ptr->screen_gamma);
 
          else
             /* Assume the output matches the input; a long time default behavior
              * of libpng, although the standard has nothing to say about this.
              */
-            png_ptr->screen_gamma = png_reciprocal(png_ptr->gamma);
+            png_ptr->screen_gamma = png_reciprocal(png_ptr->colorspace.gamma);
       }
 
       else if (png_ptr->screen_gamma != 0)
@@ -1294,7 +1318,7 @@ png_init_read_transformations(png_structp png_ptr)
           * png_set_alpha_mode (even if the alpha handling mode isn't required
           * or isn't changed from the default.)
           */
-         png_ptr->gamma = png_reciprocal(png_ptr->screen_gamma);
+         png_ptr->colorspace.gamma = png_reciprocal(png_ptr->screen_gamma);
 
       else /* neither are set */
          /* Just in case the following prevents any processing - file and screen
@@ -1302,7 +1326,10 @@ png_init_read_transformations(png_structp png_ptr)
           * third gamma value other than png_set_background with 'UNIQUE', and,
           * prior to 1.5.4
           */
-         png_ptr->screen_gamma = png_ptr->gamma = PNG_FP_1;
+         png_ptr->screen_gamma = png_ptr->colorspace.gamma = PNG_FP_1;
+
+      /* We have a gamma value now. */
+      png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
 
       /* Now turn the gamma transformation on or off as appropriate.  Notice
        * that PNG_GAMMA just refers to the file->screen correction.  Alpha
@@ -1339,19 +1366,19 @@ png_init_read_transformations(png_structp png_ptr)
     * 12) PNG_EXPAND_16
     * 13) PNG_GRAY_TO_RGB iff PNG_BACKGROUND_IS_GRAY
     * 14) PNG_INVERT_MONO
-    * 15) PNG_SHIFT
-    * 16) PNG_PACK
-    * 17) PNG_BGR
-    * 18) PNG_PACKSWAP
-    * 19) PNG_FILLER (includes PNG_ADD_ALPHA)
-    * 20) PNG_INVERT_ALPHA
+    * 15) PNG_INVERT_ALPHA
+    * 16) PNG_SHIFT
+    * 17) PNG_PACK
+    * 18) PNG_BGR
+    * 19) PNG_PACKSWAP
+    * 20) PNG_FILLER (includes PNG_ADD_ALPHA)
     * 21) PNG_SWAP_ALPHA
     * 22) PNG_SWAP_BYTES
     * 23) PNG_USER_TRANSFORM [must be last]
     */
 #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-   if ((png_ptr->transformations & PNG_STRIP_ALPHA) &&
-      !(png_ptr->transformations & PNG_COMPOSE))
+   if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0 &&
+       (png_ptr->transformations & PNG_COMPOSE) == 0)
    {
       /* Stripping the alpha channel happens immediately after the 'expand'
        * transformations, before all other transformation, so it cancels out
@@ -1377,16 +1404,23 @@ png_init_read_transformations(png_structp png_ptr)
    /* If the screen gamma is about 1.0 then the OPTIMIZE_ALPHA and ENCODE_ALPHA
     * settings will have no effect.
     */
-   if (!png_gamma_significant(png_ptr->screen_gamma))
+   if (png_gamma_significant(png_ptr->screen_gamma) == 0)
    {
       png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
       png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
    }
 #endif
 
-#if defined(PNG_READ_EXPAND_SUPPORTED) && \
-   defined(PNG_READ_BACKGROUND_SUPPORTED) && \
-   defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+   /* Make sure the coefficients for the rgb to gray conversion are set
+    * appropriately.
+    */
+   if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)
+      png_colorspace_set_rgb_coefficients(png_ptr);
+#endif
+
+#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
+#if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED)
    /* Detect gray background and attempt to enable optimization for
     * gray --> RGB case.
     *
@@ -1402,23 +1436,23 @@ png_init_read_transformations(png_structp png_ptr)
     * png_set_background, along with the bit depth, then the code has a record
     * of exactly what color space the background is currently in.
     */
-   if (png_ptr->transformations & PNG_BACKGROUND_EXPAND)
+   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0)
    {
       /* PNG_BACKGROUND_EXPAND: the background is in the file color space, so if
        * the file was grayscale the background value is gray.
        */
-      if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR))
+      if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
          png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;
    }
 
-   else if (png_ptr->transformations & PNG_COMPOSE)
+   else if ((png_ptr->transformations & PNG_COMPOSE) != 0)
    {
       /* PNG_COMPOSE: png_set_background was called with need_expand false,
        * so the color is in the color space of the output or png_set_alpha_mode
        * was called and the color is black.  Ignore RGB_TO_GRAY because that
        * happens before GRAY_TO_RGB.
        */
-      if (png_ptr->transformations & PNG_GRAY_TO_RGB)
+      if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0)
       {
          if (png_ptr->background.red == png_ptr->background.green &&
              png_ptr->background.red == png_ptr->background.blue)
@@ -1428,7 +1462,8 @@ png_init_read_transformations(png_structp png_ptr)
          }
       }
    }
-#endif /* PNG_READ_GRAY_TO_RGB_SUPPORTED (etc) */
+#endif /* READ_EXPAND && READ_BACKGROUND */
+#endif /* READ_GRAY_TO_RGB */
 
    /* For indexed PNG data (PNG_COLOR_TYPE_PALETTE) many of the transformations
     * can be performed directly on the palette, and some (such as rgb to gray)
@@ -1449,10 +1484,10 @@ png_init_read_transformations(png_structp png_ptr)
 
 #if defined(PNG_READ_BACKGROUND_SUPPORTED) && \
    defined(PNG_READ_EXPAND_16_SUPPORTED)
-   if ((png_ptr->transformations & PNG_EXPAND_16) &&
-      (png_ptr->transformations & PNG_COMPOSE) &&
-      !(png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
-      png_ptr->bit_depth != 16)
+   if ((png_ptr->transformations & PNG_EXPAND_16) != 0 &&
+       (png_ptr->transformations & PNG_COMPOSE) != 0 &&
+       (png_ptr->transformations & PNG_BACKGROUND_EXPAND) == 0 &&
+       png_ptr->bit_depth != 16)
    {
       /* TODO: fix this.  Because the expand_16 operation is after the compose
        * handling the background color must be 8, not 16, bits deep, but the
@@ -1464,22 +1499,22 @@ png_init_read_transformations(png_structp png_ptr)
        * NOTE: this discards the low 16 bits of the user supplied background
        * color, but until expand_16 works properly there is no choice!
        */
-#     define CHOP(x) (x)=((png_uint_16)(((png_uint_32)(x)*255+32895) >> 16))
+#     define CHOP(x) (x)=((png_uint_16)PNG_DIV257(x))
       CHOP(png_ptr->background.red);
       CHOP(png_ptr->background.green);
       CHOP(png_ptr->background.blue);
       CHOP(png_ptr->background.gray);
 #     undef CHOP
    }
-#endif /* PNG_READ_BACKGROUND_SUPPORTED && PNG_READ_EXPAND_16_SUPPORTED */
+#endif /* READ_BACKGROUND && READ_EXPAND_16 */
 
 #if defined(PNG_READ_BACKGROUND_SUPPORTED) && \
    (defined(PNG_READ_SCALE_16_TO_8_SUPPORTED) || \
    defined(PNG_READ_STRIP_16_TO_8_SUPPORTED))
-   if ((png_ptr->transformations & (PNG_16_TO_8|PNG_SCALE_16_TO_8)) &&
-      (png_ptr->transformations & PNG_COMPOSE) &&
-      !(png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
-      png_ptr->bit_depth == 16)
+   if ((png_ptr->transformations & (PNG_16_TO_8|PNG_SCALE_16_TO_8)) != 0 &&
+       (png_ptr->transformations & PNG_COMPOSE) != 0 &&
+       (png_ptr->transformations & PNG_BACKGROUND_EXPAND) == 0 &&
+       png_ptr->bit_depth == 16)
    {
       /* On the other hand, if a 16-bit file is to be reduced to 8-bits per
        * component this will also happen after PNG_COMPOSE and so the background
@@ -1522,25 +1557,24 @@ png_init_read_transformations(png_structp png_ptr)
     * file gamma - if it is not 1.0 both RGB_TO_GRAY and COMPOSE need the
     * tables.
     */
-   if ((png_ptr->transformations & PNG_GAMMA)
-      || ((png_ptr->transformations & PNG_RGB_TO_GRAY)
-         && (png_gamma_significant(png_ptr->gamma) ||
-            png_gamma_significant(png_ptr->screen_gamma)))
-      || ((png_ptr->transformations & PNG_COMPOSE)
-         && (png_gamma_significant(png_ptr->gamma)
-            || png_gamma_significant(png_ptr->screen_gamma)
+   if ((png_ptr->transformations & PNG_GAMMA) != 0 ||
+       ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0 &&
+        (png_gamma_significant(png_ptr->colorspace.gamma) != 0 ||
+         png_gamma_significant(png_ptr->screen_gamma) != 0)) ||
+        ((png_ptr->transformations & PNG_COMPOSE) != 0 &&
+         (png_gamma_significant(png_ptr->colorspace.gamma) != 0 ||
+          png_gamma_significant(png_ptr->screen_gamma) != 0
 #  ifdef PNG_READ_BACKGROUND_SUPPORTED
-            || (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_UNIQUE
-               && png_gamma_significant(png_ptr->background_gamma))
+         || (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_UNIQUE &&
+           png_gamma_significant(png_ptr->background_gamma) != 0)
 #  endif
-      )) || ((png_ptr->transformations & PNG_ENCODE_ALPHA)
-         && png_gamma_significant(png_ptr->screen_gamma))
-      )
+        )) || ((png_ptr->transformations & PNG_ENCODE_ALPHA) != 0 &&
+       png_gamma_significant(png_ptr->screen_gamma) != 0))
    {
       png_build_gamma_table(png_ptr, png_ptr->bit_depth);
 
 #ifdef PNG_READ_BACKGROUND_SUPPORTED
-      if (png_ptr->transformations & PNG_COMPOSE)
+      if ((png_ptr->transformations & PNG_COMPOSE) != 0)
       {
          /* Issue a warning about this combination: because RGB_TO_GRAY is
           * optimized to do the gamma transform if present yet do_background has
@@ -1548,11 +1582,11 @@ png_init_read_transformations(png_structp png_ptr)
           * double-gamma-correction happens.  This is true in all versions of
           * libpng to date.
           */
-         if (png_ptr->transformations & PNG_RGB_TO_GRAY)
+         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)
             png_warning(png_ptr,
                "libpng does not support gamma+background+rgb_to_gray");
 
-         if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+         if ((png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) != 0)
          {
             /* We don't get to here unless there is a tRNS chunk with non-opaque
              * entries - see the checking code at the start of this function.
@@ -1584,8 +1618,8 @@ png_init_read_transformations(png_structp png_ptr)
                      break;
 
                   case PNG_BACKGROUND_GAMMA_FILE:
-                     g = png_reciprocal(png_ptr->gamma);
-                     gs = png_reciprocal2(png_ptr->gamma,
+                     g = png_reciprocal(png_ptr->colorspace.gamma);
+                     gs = png_reciprocal2(png_ptr->colorspace.gamma,
                         png_ptr->screen_gamma);
                      break;
 
@@ -1600,7 +1634,7 @@ png_init_read_transformations(png_structp png_ptr)
                      break;
                }
 
-               if (png_gamma_significant(gs))
+               if (png_gamma_significant(gs) != 0)
                {
                   back.red = png_gamma_8bit_correct(png_ptr->background.red,
                       gs);
@@ -1617,7 +1651,7 @@ png_init_read_transformations(png_structp png_ptr)
                   back.blue  = (png_byte)png_ptr->background.blue;
                }
 
-               if (png_gamma_significant(g))
+               if (png_gamma_significant(g) != 0)
                {
                   back_1.red = png_gamma_8bit_correct(png_ptr->background.red,
                      g);
@@ -1693,8 +1727,9 @@ png_init_read_transformations(png_structp png_ptr)
                   break;
 
                case PNG_BACKGROUND_GAMMA_FILE:
-                  g = png_reciprocal(png_ptr->gamma);
-                  gs = png_reciprocal2(png_ptr->gamma, png_ptr->screen_gamma);
+                  g = png_reciprocal(png_ptr->colorspace.gamma);
+                  gs = png_reciprocal2(png_ptr->colorspace.gamma,
+                     png_ptr->screen_gamma);
                   break;
 
                case PNG_BACKGROUND_GAMMA_UNIQUE:
@@ -1765,7 +1800,7 @@ png_init_read_transformations(png_structp png_ptr)
 
       else
       /* Transformation does not include PNG_BACKGROUND */
-#endif /* PNG_READ_BACKGROUND_SUPPORTED */
+#endif /* READ_BACKGROUND */
       if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE
 #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
          /* RGB_TO_GRAY needs to have non-gamma-corrected values! */
@@ -1795,11 +1830,11 @@ png_init_read_transformations(png_structp png_ptr)
 #ifdef PNG_READ_BACKGROUND_SUPPORTED
    else
 #endif
-#endif /* PNG_READ_GAMMA_SUPPORTED */
+#endif /* READ_GAMMA */
 
 #ifdef PNG_READ_BACKGROUND_SUPPORTED
    /* No GAMMA transformation (see the hanging else 4 lines above) */
-   if ((png_ptr->transformations & PNG_COMPOSE) &&
+   if ((png_ptr->transformations & PNG_COMPOSE) != 0 &&
        (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE))
    {
       int i;
@@ -1834,11 +1869,11 @@ png_init_read_transformations(png_structp png_ptr)
 
       png_ptr->transformations &= ~PNG_COMPOSE;
    }
-#endif /* PNG_READ_BACKGROUND_SUPPORTED */
+#endif /* READ_BACKGROUND */
 
 #ifdef PNG_READ_SHIFT_SUPPORTED
-   if ((png_ptr->transformations & PNG_SHIFT) &&
-      !(png_ptr->transformations & PNG_EXPAND) &&
+   if ((png_ptr->transformations & PNG_SHIFT) != 0 &&
+       (png_ptr->transformations & PNG_EXPAND) == 0 &&
        (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE))
    {
       int i;
@@ -1851,33 +1886,36 @@ png_init_read_transformations(png_structp png_ptr)
        * the number of significant bits is 0 then no shift is done (this is an
        * error condition which is silently ignored.)
        */
-      if (shift > 0 && shift < 8) for (i=0; i<istop; ++i)
-      {
-         int component = png_ptr->palette[i].red;
+      if (shift > 0 && shift < 8)
+         for (i=0; i<istop; ++i)
+         {
+            int component = png_ptr->palette[i].red;
 
-         component >>= shift;
-         png_ptr->palette[i].red = (png_byte)component;
-      }
+            component >>= shift;
+            png_ptr->palette[i].red = (png_byte)component;
+         }
 
       shift = 8 - png_ptr->sig_bit.green;
-      if (shift > 0 && shift < 8) for (i=0; i<istop; ++i)
-      {
-         int component = png_ptr->palette[i].green;
+      if (shift > 0 && shift < 8)
+         for (i=0; i<istop; ++i)
+         {
+            int component = png_ptr->palette[i].green;
 
-         component >>= shift;
-         png_ptr->palette[i].green = (png_byte)component;
-      }
+            component >>= shift;
+            png_ptr->palette[i].green = (png_byte)component;
+         }
 
       shift = 8 - png_ptr->sig_bit.blue;
-      if (shift > 0 && shift < 8) for (i=0; i<istop; ++i)
-      {
-         int component = png_ptr->palette[i].blue;
+      if (shift > 0 && shift < 8)
+         for (i=0; i<istop; ++i)
+         {
+            int component = png_ptr->palette[i].blue;
 
-         component >>= shift;
-         png_ptr->palette[i].blue = (png_byte)component;
-      }
+            component >>= shift;
+            png_ptr->palette[i].blue = (png_byte)component;
+         }
    }
-#endif  /* PNG_READ_SHIFT_SUPPORTED */
+#endif /* READ_SHIFT */
 }
 
 /* Modify the info structure to reflect the transformations.  The
@@ -1885,12 +1923,12 @@ png_init_read_transformations(png_structp png_ptr)
  * assuming the transformations result in valid PNG data.
  */
 void /* PRIVATE */
-png_read_transform_info(png_structp png_ptr, png_infop info_ptr)
+png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr)
 {
    png_debug(1, "in png_read_transform_info");
 
 #ifdef PNG_READ_EXPAND_SUPPORTED
-   if (png_ptr->transformations & PNG_EXPAND)
+   if ((png_ptr->transformations & PNG_EXPAND) != 0)
    {
       if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
       {
@@ -1912,9 +1950,9 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr)
       }
       else
       {
-         if (png_ptr->num_trans)
+         if (png_ptr->num_trans != 0)
          {
-            if (png_ptr->transformations & PNG_EXPAND_tRNS)
+            if ((png_ptr->transformations & PNG_EXPAND_tRNS) != 0)
                info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
          }
          if (info_ptr->bit_depth < 8)
@@ -1930,7 +1968,7 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr)
    /* The following is almost certainly wrong unless the background value is in
     * the screen space!
     */
-   if (png_ptr->transformations & PNG_COMPOSE)
+   if ((png_ptr->transformations & PNG_COMPOSE) != 0)
       info_ptr->background = png_ptr->background;
 #endif
 
@@ -1939,25 +1977,29 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr)
     * however it seems that the code in png_init_read_transformations, which has
     * been called before this from png_read_update_info->png_read_start_row
     * sometimes does the gamma transform and cancels the flag.
+    *
+    * TODO: this looks wrong; the info_ptr should end up with a gamma equal to
+    * the screen_gamma value.  The following probably results in weirdness if
+    * the info_ptr is used by the app after the rows have been read.
     */
-   info_ptr->gamma = png_ptr->gamma;
+   info_ptr->colorspace.gamma = png_ptr->colorspace.gamma;
 #endif
 
    if (info_ptr->bit_depth == 16)
    {
 #  ifdef PNG_READ_16BIT_SUPPORTED
 #     ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-         if (png_ptr->transformations & PNG_SCALE_16_TO_8)
+         if ((png_ptr->transformations & PNG_SCALE_16_TO_8) != 0)
             info_ptr->bit_depth = 8;
 #     endif
 
 #     ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-         if (png_ptr->transformations & PNG_16_TO_8)
+         if ((png_ptr->transformations & PNG_16_TO_8) != 0)
             info_ptr->bit_depth = 8;
 #     endif
 
 #  else
-      /* No 16 bit support: force chopping 16-bit input down to 8, in this case
+      /* No 16-bit support: force chopping 16-bit input down to 8, in this case
        * the app program can chose if both APIs are available by setting the
        * correct scaling to use.
        */
@@ -1978,27 +2020,27 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr)
             CONFIGURATION ERROR: you must enable at least one 16 to 8 method
 #        endif
 #    endif
-#endif /* !READ_16BIT_SUPPORTED */
+#endif /* !READ_16BIT */
    }
 
 #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-   if (png_ptr->transformations & PNG_GRAY_TO_RGB)
+   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0)
       info_ptr->color_type = (png_byte)(info_ptr->color_type |
          PNG_COLOR_MASK_COLOR);
 #endif
 
 #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-   if (png_ptr->transformations & PNG_RGB_TO_GRAY)
+   if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)
       info_ptr->color_type = (png_byte)(info_ptr->color_type &
          ~PNG_COLOR_MASK_COLOR);
 #endif
 
 #ifdef PNG_READ_QUANTIZE_SUPPORTED
-   if (png_ptr->transformations & PNG_QUANTIZE)
+   if ((png_ptr->transformations & PNG_QUANTIZE) != 0)
    {
       if (((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
           (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)) &&
-          png_ptr->palette_lookup && info_ptr->bit_depth == 8)
+          png_ptr->palette_lookup != 0 && info_ptr->bit_depth == 8)
       {
          info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
       }
@@ -2006,29 +2048,31 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr)
 #endif
 
 #ifdef PNG_READ_EXPAND_16_SUPPORTED
-   if (png_ptr->transformations & PNG_EXPAND_16 && info_ptr->bit_depth == 8 &&
-      info_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
+   if ((png_ptr->transformations & PNG_EXPAND_16) != 0 &&
+       info_ptr->bit_depth == 8 &&
+       info_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
    {
       info_ptr->bit_depth = 16;
    }
 #endif
 
 #ifdef PNG_READ_PACK_SUPPORTED
-   if ((png_ptr->transformations & PNG_PACK) && (info_ptr->bit_depth < 8))
+   if ((png_ptr->transformations & PNG_PACK) != 0 &&
+       (info_ptr->bit_depth < 8))
       info_ptr->bit_depth = 8;
 #endif
 
    if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
       info_ptr->channels = 1;
 
-   else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
+   else if ((info_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
       info_ptr->channels = 3;
 
    else
       info_ptr->channels = 1;
 
 #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-   if (png_ptr->transformations & PNG_STRIP_ALPHA)
+   if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0)
    {
       info_ptr->color_type = (png_byte)(info_ptr->color_type &
          ~PNG_COLOR_MASK_ALPHA);
@@ -2036,30 +2080,30 @@ png_read_transform_info(png_structp png_ptr, png_infop info_ptr)
    }
 #endif
 
-   if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+   if ((info_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)
       info_ptr->channels++;
 
 #ifdef PNG_READ_FILLER_SUPPORTED
    /* STRIP_ALPHA and FILLER allowed:  MASK_ALPHA bit stripped above */
-   if ((png_ptr->transformations & PNG_FILLER) &&
-       ((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
-       (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)))
+   if ((png_ptr->transformations & PNG_FILLER) != 0 &&
+       (info_ptr->color_type == PNG_COLOR_TYPE_RGB ||
+       info_ptr->color_type == PNG_COLOR_TYPE_GRAY))
    {
       info_ptr->channels++;
       /* If adding a true alpha channel not just filler */
-      if (png_ptr->transformations & PNG_ADD_ALPHA)
+      if ((png_ptr->transformations & PNG_ADD_ALPHA) != 0)
          info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
    }
 #endif
 
 #if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) && \
 defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
-   if (png_ptr->transformations & PNG_USER_TRANSFORM)
+   if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)
    {
-      if (png_ptr->user_transform_depth)
+      if (png_ptr->user_transform_depth != 0)
          info_ptr->bit_depth = png_ptr->user_transform_depth;
 
-      if (png_ptr->user_transform_channels)
+      if (png_ptr->user_transform_channels != 0)
          info_ptr->channels = png_ptr->user_transform_channels;
    }
 #endif
@@ -2083,302 +2127,6 @@ defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
 #endif
 }
 
-/* Transform the row.  The order of transformations is significant,
- * and is very touchy.  If you add a transformation, take care to
- * decide how it fits in with the other transformations here.
- */
-void /* PRIVATE */
-png_do_read_transformations(png_structp png_ptr, png_row_infop row_info)
-{
-   png_debug(1, "in png_do_read_transformations");
-
-   if (png_ptr->row_buf == NULL)
-   {
-      /* Prior to 1.5.4 this output row/pass where the NULL pointer is, but this
-       * error is incredibly rare and incredibly easy to debug without this
-       * information.
-       */
-      png_error(png_ptr, "NULL row buffer");
-   }
-
-   /* The following is debugging; prior to 1.5.4 the code was never compiled in;
-    * in 1.5.4 PNG_FLAG_DETECT_UNINITIALIZED was added and the macro
-    * PNG_WARN_UNINITIALIZED_ROW removed.  In 1.5 the new flag is set only for
-    * selected new APIs to ensure that there is no API change.
-    */
-   if ((png_ptr->flags & PNG_FLAG_DETECT_UNINITIALIZED) != 0 &&
-      !(png_ptr->flags & PNG_FLAG_ROW_INIT))
-   {
-      /* Application has failed to call either png_read_start_image() or
-       * png_read_update_info() after setting transforms that expand pixels.
-       * This check added to libpng-1.2.19 (but not enabled until 1.5.4).
-       */
-      png_error(png_ptr, "Uninitialized row");
-   }
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-   if (png_ptr->transformations & PNG_EXPAND)
-   {
-      if (row_info->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         png_do_expand_palette(row_info, png_ptr->row_buf + 1,
-             png_ptr->palette, png_ptr->trans_alpha, png_ptr->num_trans);
-      }
-
-      else
-      {
-         if (png_ptr->num_trans &&
-             (png_ptr->transformations & PNG_EXPAND_tRNS))
-            png_do_expand(row_info, png_ptr->row_buf + 1,
-                &(png_ptr->trans_color));
-
-         else
-            png_do_expand(row_info, png_ptr->row_buf + 1,
-                NULL);
-      }
-   }
-#endif
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-   if ((png_ptr->transformations & PNG_STRIP_ALPHA) &&
-      !(png_ptr->transformations & PNG_COMPOSE) &&
-      (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
-      row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
-      png_do_strip_channel(row_info, png_ptr->row_buf + 1,
-         0 /* at_start == false, because SWAP_ALPHA happens later */);
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-   if (png_ptr->transformations & PNG_RGB_TO_GRAY)
-   {
-      int rgb_error =
-          png_do_rgb_to_gray(png_ptr, row_info,
-              png_ptr->row_buf + 1);
-
-      if (rgb_error != 0)
-      {
-         png_ptr->rgb_to_gray_status=1;
-         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
-             PNG_RGB_TO_GRAY_WARN)
-            png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel");
-
-         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
-             PNG_RGB_TO_GRAY_ERR)
-            png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel");
-      }
-   }
-#endif
-
-/* From Andreas Dilger e-mail to png-implement, 26 March 1998:
- *
- *   In most cases, the "simple transparency" should be done prior to doing
- *   gray-to-RGB, or you will have to test 3x as many bytes to check if a
- *   pixel is transparent.  You would also need to make sure that the
- *   transparency information is upgraded to RGB.
- *
- *   To summarize, the current flow is:
- *   - Gray + simple transparency -> compare 1 or 2 gray bytes and composite
- *                                   with background "in place" if transparent,
- *                                   convert to RGB if necessary
- *   - Gray + alpha -> composite with gray background and remove alpha bytes,
- *                                   convert to RGB if necessary
- *
- *   To support RGB backgrounds for gray images we need:
- *   - Gray + simple transparency -> convert to RGB + simple transparency,
- *                                   compare 3 or 6 bytes and composite with
- *                                   background "in place" if transparent
- *                                   (3x compare/pixel compared to doing
- *                                   composite with gray bkgrnd)
- *   - Gray + alpha -> convert to RGB + alpha, composite with background and
- *                                   remove alpha bytes (3x float
- *                                   operations/pixel compared with composite
- *                                   on gray background)
- *
- *  Greg's change will do this.  The reason it wasn't done before is for
- *  performance, as this increases the per-pixel operations.  If we would check
- *  in advance if the background was gray or RGB, and position the gray-to-RGB
- *  transform appropriately, then it would save a lot of work/time.
- */
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-   /* If gray -> RGB, do so now only if background is non-gray; else do later
-    * for performance reasons
-    */
-   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) &&
-       !(png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
-      png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1);
-#endif
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED)
-   if (png_ptr->transformations & PNG_COMPOSE)
-      png_do_compose(row_info, png_ptr->row_buf + 1, png_ptr);
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-   if ((png_ptr->transformations & PNG_GAMMA) &&
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-      /* Because RGB_TO_GRAY does the gamma transform. */
-      !(png_ptr->transformations & PNG_RGB_TO_GRAY) &&
-#endif
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED)
-      /* Because PNG_COMPOSE does the gamma transform if there is something to
-       * do (if there is an alpha channel or transparency.)
-       */
-       !((png_ptr->transformations & PNG_COMPOSE) &&
-       ((png_ptr->num_trans != 0) ||
-       (png_ptr->color_type & PNG_COLOR_MASK_ALPHA))) &&
-#endif
-      /* Because png_init_read_transformations transforms the palette, unless
-       * RGB_TO_GRAY will do the transform.
-       */
-       (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE))
-      png_do_gamma(row_info, png_ptr->row_buf + 1, png_ptr);
-#endif
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-   if ((png_ptr->transformations & PNG_STRIP_ALPHA) &&
-      (png_ptr->transformations & PNG_COMPOSE) &&
-      (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
-      row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
-      png_do_strip_channel(row_info, png_ptr->row_buf + 1,
-         0 /* at_start == false, because SWAP_ALPHA happens later */);
-#endif
-
-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-   if ((png_ptr->transformations & PNG_ENCODE_ALPHA) &&
-      (row_info->color_type & PNG_COLOR_MASK_ALPHA))
-      png_do_encode_alpha(row_info, png_ptr->row_buf + 1, png_ptr);
-#endif
-
-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-   if (png_ptr->transformations & PNG_SCALE_16_TO_8)
-      png_do_scale_16_to_8(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-   /* There is no harm in doing both of these because only one has any effect,
-    * by putting the 'scale' option first if the app asks for scale (either by
-    * calling the API or in a TRANSFORM flag) this is what happens.
-    */
-   if (png_ptr->transformations & PNG_16_TO_8)
-      png_do_chop(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-   if (png_ptr->transformations & PNG_QUANTIZE)
-   {
-      png_do_quantize(row_info, png_ptr->row_buf + 1,
-          png_ptr->palette_lookup, png_ptr->quantize_index);
-
-      if (row_info->rowbytes == 0)
-         png_error(png_ptr, "png_do_quantize returned rowbytes=0");
-   }
-#endif /* PNG_READ_QUANTIZE_SUPPORTED */
-
-#ifdef PNG_READ_EXPAND_16_SUPPORTED
-   /* Do the expansion now, after all the arithmetic has been done.  Notice
-    * that previous transformations can handle the PNG_EXPAND_16 flag if this
-    * is efficient (particularly true in the case of gamma correction, where
-    * better accuracy results faster!)
-    */
-   if (png_ptr->transformations & PNG_EXPAND_16)
-      png_do_expand_16(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-   /* NOTE: moved here in 1.5.4 (from much later in this list.) */
-   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) &&
-       (png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
-      png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_INVERT_SUPPORTED
-   if (png_ptr->transformations & PNG_INVERT_MONO)
-      png_do_invert(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_SHIFT_SUPPORTED
-   if (png_ptr->transformations & PNG_SHIFT)
-      png_do_unshift(row_info, png_ptr->row_buf + 1,
-          &(png_ptr->shift));
-#endif
-
-#ifdef PNG_READ_PACK_SUPPORTED
-   if (png_ptr->transformations & PNG_PACK)
-      png_do_unpack(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
-   /* Added at libpng-1.5.10 */
-   if (row_info->color_type == PNG_COLOR_TYPE_PALETTE &&
-       png_ptr->num_palette_max >= 0)
-      png_do_check_palette_indexes(png_ptr, row_info);
-#endif
-
-#ifdef PNG_READ_BGR_SUPPORTED
-   if (png_ptr->transformations & PNG_BGR)
-      png_do_bgr(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
-   if (png_ptr->transformations & PNG_PACKSWAP)
-      png_do_packswap(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_FILLER_SUPPORTED
-   if (png_ptr->transformations & PNG_FILLER)
-      png_do_read_filler(row_info, png_ptr->row_buf + 1,
-          (png_uint_32)png_ptr->filler, png_ptr->flags);
-#endif
-
-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-   if (png_ptr->transformations & PNG_INVERT_ALPHA)
-      png_do_read_invert_alpha(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
-   if (png_ptr->transformations & PNG_SWAP_ALPHA)
-      png_do_read_swap_alpha(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-#ifdef PNG_READ_SWAP_SUPPORTED
-   if (png_ptr->transformations & PNG_SWAP_BYTES)
-      png_do_swap(row_info, png_ptr->row_buf + 1);
-#endif
-#endif
-
-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-   if (png_ptr->transformations & PNG_USER_TRANSFORM)
-    {
-      if (png_ptr->read_user_transform_fn != NULL)
-         (*(png_ptr->read_user_transform_fn)) /* User read transform function */
-             (png_ptr,     /* png_ptr */
-             row_info,     /* row_info: */
-                /*  png_uint_32 width;       width of row */
-                /*  png_size_t rowbytes;     number of bytes in row */
-                /*  png_byte color_type;     color type of pixels */
-                /*  png_byte bit_depth;      bit depth of samples */
-                /*  png_byte channels;       number of channels (1-4) */
-                /*  png_byte pixel_depth;    bits per pixel (depth*channels) */
-             png_ptr->row_buf + 1);    /* start of pixel data for row */
-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-      if (png_ptr->user_transform_depth)
-         row_info->bit_depth = png_ptr->user_transform_depth;
-
-      if (png_ptr->user_transform_channels)
-         row_info->channels = png_ptr->user_transform_channels;
-#endif
-      row_info->pixel_depth = (png_byte)(row_info->bit_depth *
-          row_info->channels);
-
-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_info->width);
-   }
-#endif
-}
-
 #ifdef PNG_READ_PACK_SUPPORTED
 /* Unpack pixels of 1, 2, or 4 bits per pixel into 1 byte per pixel,
  * without changing the actual values.  Thus, if you had a row with
@@ -2386,7 +2134,7 @@ png_do_read_transformations(png_structp png_ptr, png_row_infop row_info)
  * the numbers 0 or 1.  If you would rather they contain 0 and 255, use
  * png_do_shift() after this.
  */
-void /* PRIVATE */
+static void
 png_do_unpack(png_row_infop row_info, png_bytep row)
 {
    png_debug(1, "in png_do_unpack");
@@ -2484,7 +2232,7 @@ png_do_unpack(png_row_infop row_info, png_bytep row)
  * a row of bit depth 8, but only 5 are significant, this will shift
  * the values back to 0 through 31.
  */
-void /* PRIVATE */
+static void
 png_do_unshift(png_row_infop row_info, png_bytep row,
     png_const_color_8p sig_bits)
 {
@@ -2501,7 +2249,7 @@ png_do_unshift(png_row_infop row_info, png_bytep row,
       int channels = 0;
       int bit_depth = row_info->bit_depth;
 
-      if (color_type & PNG_COLOR_MASK_COLOR)
+      if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
       {
          shift[channels++] = bit_depth - sig_bits->red;
          shift[channels++] = bit_depth - sig_bits->green;
@@ -2513,7 +2261,7 @@ png_do_unshift(png_row_infop row_info, png_bytep row,
          shift[channels++] = bit_depth - sig_bits->gray;
       }
 
-      if (color_type & PNG_COLOR_MASK_ALPHA)
+      if ((color_type & PNG_COLOR_MASK_ALPHA) != 0)
       {
          shift[channels++] = bit_depth - sig_bits->alpha;
       }
@@ -2611,7 +2359,7 @@ png_do_unshift(png_row_infop row_info, png_bytep row,
                if (++channel >= channels)
                   channel = 0;
                *bp++ = (png_byte)(value >> 8);
-               *bp++ = (png_byte)(value & 0xff);
+               *bp++ = (png_byte)value;
             }
             break;
          }
@@ -2623,7 +2371,7 @@ png_do_unshift(png_row_infop row_info, png_bytep row,
 
 #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
 /* Scale rows of bit depth 16 down to 8 accurately */
-void /* PRIVATE */
+static void
 png_do_scale_16_to_8(png_row_infop row_info, png_bytep row)
 {
    png_debug(1, "in png_do_scale_16_to_8");
@@ -2636,8 +2384,8 @@ png_do_scale_16_to_8(png_row_infop row_info, png_bytep row)
 
       while (sp < ep)
       {
-         /* The input is an array of 16 bit components, these must be scaled to
-          * 8 bits each.  For a 16 bit value V the required value (from the PNG
+         /* The input is an array of 16-bit components, these must be scaled to
+          * 8 bits each.  For a 16-bit value V the required value (from the PNG
           * specification) is:
           *
           *    (V * 255) / 65535
@@ -2658,7 +2406,7 @@ png_do_scale_16_to_8(png_row_infop row_info, png_bytep row)
           *
           * The approximate differs from the exact answer only when (vlo-vhi) is
           * 128; it then gives a correction of +1 when the exact correction is
-          * 0.  This gives 128 errors.  The exact answer (correct for all 16 bit
+          * 0.  This gives 128 errors.  The exact answer (correct for all 16-bit
           * input values) is:
           *
           *    error = (vlo-vhi+128)*65535 >> 24;
@@ -2681,7 +2429,7 @@ png_do_scale_16_to_8(png_row_infop row_info, png_bytep row)
 #endif
 
 #ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-void /* PRIVATE */
+static void
 /* Simply discard the low byte.  This was the default behavior prior
  * to libpng-1.5.4.
  */
@@ -2709,7 +2457,7 @@ png_do_chop(png_row_infop row_info, png_bytep row)
 #endif
 
 #ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
-void /* PRIVATE */
+static void
 png_do_read_swap_alpha(png_row_infop row_info, png_bytep row)
 {
    png_debug(1, "in png_do_read_swap_alpha");
@@ -2806,7 +2554,7 @@ png_do_read_swap_alpha(png_row_infop row_info, png_bytep row)
 #endif
 
 #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-void /* PRIVATE */
+static void
 png_do_read_invert_alpha(png_row_infop row_info, png_bytep row)
 {
    png_uint_32 row_width;
@@ -2908,7 +2656,7 @@ png_do_read_invert_alpha(png_row_infop row_info, png_bytep row)
 
 #ifdef PNG_READ_FILLER_SUPPORTED
 /* Add filler channel if we have RGB color */
-void /* PRIVATE */
+static void
 png_do_read_filler(png_row_infop row_info, png_bytep row,
     png_uint_32 filler, png_uint_32 flags)
 {
@@ -2916,9 +2664,9 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,
    png_uint_32 row_width = row_info->width;
 
 #ifdef PNG_READ_16BIT_SUPPORTED
-   png_byte hi_filler = (png_byte)((filler>>8) & 0xff);
+   png_byte hi_filler = (png_byte)(filler>>8);
 #endif
-   png_byte lo_filler = (png_byte)(filler & 0xff);
+   png_byte lo_filler = (png_byte)filler;
 
    png_debug(1, "in png_do_read_filler");
 
@@ -2927,7 +2675,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,
    {
       if (row_info->bit_depth == 8)
       {
-         if (flags & PNG_FLAG_FILLER_AFTER)
+         if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
          {
             /* This changes the data from G to GX */
             png_bytep sp = row + (png_size_t)row_width;
@@ -2962,7 +2710,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,
 #ifdef PNG_READ_16BIT_SUPPORTED
       else if (row_info->bit_depth == 16)
       {
-         if (flags & PNG_FLAG_FILLER_AFTER)
+         if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
          {
             /* This changes the data from GG to GGXX */
             png_bytep sp = row + (png_size_t)row_width * 2;
@@ -3004,7 +2752,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,
    {
       if (row_info->bit_depth == 8)
       {
-         if (flags & PNG_FLAG_FILLER_AFTER)
+         if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
          {
             /* This changes the data from RGB to RGBX */
             png_bytep sp = row + (png_size_t)row_width * 3;
@@ -3043,7 +2791,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,
 #ifdef PNG_READ_16BIT_SUPPORTED
       else if (row_info->bit_depth == 16)
       {
-         if (flags & PNG_FLAG_FILLER_AFTER)
+         if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
          {
             /* This changes the data from RRGGBB to RRGGBBXX */
             png_bytep sp = row + (png_size_t)row_width * 6;
@@ -3095,7 +2843,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,
 
 #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
 /* Expand grayscale files to RGB, with or without alpha */
-void /* PRIVATE */
+static void
 png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)
 {
    png_uint_32 i;
@@ -3104,7 +2852,7 @@ png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)
    png_debug(1, "in png_do_gray_to_rgb");
 
    if (row_info->bit_depth >= 8 &&
-       !(row_info->color_type & PNG_COLOR_MASK_COLOR))
+       (row_info->color_type & PNG_COLOR_MASK_COLOR) == 0)
    {
       if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
       {
@@ -3234,16 +2982,16 @@ png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)
  *  calculated to make the sum 32768.  This will result in different rounding
  *  to that used above.
  */
-int /* PRIVATE */
-png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)
+static int
+png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row)
 
 {
    int rgb_error = 0;
 
    png_debug(1, "in png_do_rgb_to_gray");
 
-   if (!(row_info->color_type & PNG_COLOR_MASK_PALETTE) &&
-       (row_info->color_type & PNG_COLOR_MASK_COLOR))
+   if ((row_info->color_type & PNG_COLOR_MASK_PALETTE) == 0 &&
+       (row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
    {
       PNG_CONST png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff;
       PNG_CONST png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff;
@@ -3254,7 +3002,7 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)
 
       if (row_info->bit_depth == 8)
       {
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+#ifdef PNG_READ_GAMMA_SUPPORTED
          /* Notice that gamma to/from 1 are not necessarily inverses (if
           * there is an overall gamma correction).  Prior to 1.5.5 this code
           * checked the linearized values for equality; this doesn't match
@@ -3331,7 +3079,7 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)
 
       else /* RGB bit_depth == 16 */
       {
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+#ifdef PNG_READ_GAMMA_SUPPORTED
          if (png_ptr->gamma_16_to_1 != NULL && png_ptr->gamma_16_from_1 != NULL)
          {
             png_bytep sp = row;
@@ -3341,22 +3089,17 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)
             for (i = 0; i < row_width; i++)
             {
                png_uint_16 red, green, blue, w;
-#if 0 /* Coverity doesn't like this */
-               red   = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-               green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-               blue  = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-#else
                png_byte hi,lo;
 
                hi=*(sp)++; lo=*(sp)++; red   = (png_uint_16)((hi << 8) | (lo));
                hi=*(sp)++; lo=*(sp)++; green = (png_uint_16)((hi << 8) | (lo));
                hi=*(sp)++; lo=*(sp)++; blue  = (png_uint_16)((hi << 8) | (lo));
-#endif
+
                if (red == green && red == blue)
                {
                   if (png_ptr->gamma_16_table != NULL)
-                     w = png_ptr->gamma_16_table[(red&0xff)
-                         >> png_ptr->gamma_shift][red>>8];
+                     w = png_ptr->gamma_16_table[(red & 0xff)
+                         >> png_ptr->gamma_shift][red >> 8];
 
                   else
                      w = red;
@@ -3364,16 +3107,16 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)
 
                else
                {
-                  png_uint_16 red_1   = png_ptr->gamma_16_to_1[(red&0xff)
+                  png_uint_16 red_1   = png_ptr->gamma_16_to_1[(red & 0xff)
                       >> png_ptr->gamma_shift][red>>8];
                   png_uint_16 green_1 =
-                      png_ptr->gamma_16_to_1[(green&0xff) >>
+                      png_ptr->gamma_16_to_1[(green & 0xff) >>
                       png_ptr->gamma_shift][green>>8];
-                  png_uint_16 blue_1  = png_ptr->gamma_16_to_1[(blue&0xff)
+                  png_uint_16 blue_1  = png_ptr->gamma_16_to_1[(blue & 0xff)
                       >> png_ptr->gamma_shift][blue>>8];
                   png_uint_16 gray16  = (png_uint_16)((rc*red_1 + gc*green_1
                       + bc*blue_1 + 16384)>>15);
-                  w = png_ptr->gamma_16_from_1[(gray16&0xff) >>
+                  w = png_ptr->gamma_16_from_1[(gray16 & 0xff) >>
                       png_ptr->gamma_shift][gray16 >> 8];
                   rgb_error |= 1;
                }
@@ -3398,21 +3141,22 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)
             for (i = 0; i < row_width; i++)
             {
                png_uint_16 red, green, blue, gray16;
+               png_byte hi,lo;
 
-               red   = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-               green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-               blue  = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
+               hi=*(sp)++; lo=*(sp)++; red   = (png_uint_16)((hi << 8) | (lo));
+               hi=*(sp)++; lo=*(sp)++; green = (png_uint_16)((hi << 8) | (lo));
+               hi=*(sp)++; lo=*(sp)++; blue  = (png_uint_16)((hi << 8) | (lo));
 
                if (red != green || red != blue)
                   rgb_error |= 1;
 
-               /* From 1.5.5 in the 16 bit case do the accurate conversion even
+               /* From 1.5.5 in the 16-bit case do the accurate conversion even
                 * in the 'fast' case - this is because this is where the code
-                * ends up when handling linear 16 bit data.
+                * ends up when handling linear 16-bit data.
                 */
                gray16  = (png_uint_16)((rc*red + gc*green + bc*blue + 16384) >>
                   15);
-               *(dp++) = (png_byte)((gray16>>8) & 0xff);
+               *(dp++) = (png_byte)((gray16 >> 8) & 0xff);
                *(dp++) = (png_byte)(gray16 & 0xff);
 
                if (have_alpha != 0)
@@ -3434,74 +3178,15 @@ png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)
    return rgb_error;
 }
 #endif
-#endif /* PNG_READ_TRANSFORMS_SUPPORTED */
-
-#ifdef PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
-/* Build a grayscale palette.  Palette is assumed to be 1 << bit_depth
- * large of png_color.  This lets grayscale images be treated as
- * paletted.  Most useful for gamma correction and simplification
- * of code.  This API is not used internally.
- */
-void PNGAPI
-png_build_grayscale_palette(int bit_depth, png_colorp palette)
-{
-   int num_palette;
-   int color_inc;
-   int i;
-   int v;
-
-   png_debug(1, "in png_do_build_grayscale_palette");
-
-   if (palette == NULL)
-      return;
 
-   switch (bit_depth)
-   {
-      case 1:
-         num_palette = 2;
-         color_inc = 0xff;
-         break;
-
-      case 2:
-         num_palette = 4;
-         color_inc = 0x55;
-         break;
-
-      case 4:
-         num_palette = 16;
-         color_inc = 0x11;
-         break;
-
-      case 8:
-         num_palette = 256;
-         color_inc = 1;
-         break;
-
-      default:
-         num_palette = 0;
-         color_inc = 0;
-         break;
-   }
-
-   for (i = 0, v = 0; i < num_palette; i++, v += color_inc)
-   {
-      palette[i].red = (png_byte)v;
-      palette[i].green = (png_byte)v;
-      palette[i].blue = (png_byte)v;
-   }
-}
-#endif
-
-
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
 #if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
    defined(PNG_READ_ALPHA_MODE_SUPPORTED)
 /* Replace any alpha or transparency with the supplied background color.
  * "background" is already in the screen gamma, while "background_1" is
  * at a gamma of 1.0.  Paletted files have already been taken care of.
  */
-void /* PRIVATE */
-png_do_compose(png_row_infop row_info, png_bytep row, png_structp png_ptr)
+static void
+png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr)
 {
 #ifdef PNG_READ_GAMMA_SUPPORTED
    png_const_bytep gamma_table = png_ptr->gamma_table;
@@ -3511,12 +3196,12 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structp png_ptr)
    png_const_uint_16pp gamma_16_from_1 = png_ptr->gamma_16_from_1;
    png_const_uint_16pp gamma_16_to_1 = png_ptr->gamma_16_to_1;
    int gamma_shift = png_ptr->gamma_shift;
+   int optimize = (png_ptr->flags & PNG_FLAG_OPTIMIZE_ALPHA) != 0;
 #endif
 
    png_bytep sp;
    png_uint_32 i;
    png_uint_32 row_width = row_info->width;
-   int optimize = (png_ptr->flags & PNG_FLAG_OPTIMIZE_ALPHA) != 0;
    int shift;
 
    png_debug(1, "in png_do_compose");
@@ -3537,8 +3222,9 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structp png_ptr)
                      if ((png_uint_16)((*sp >> shift) & 0x01)
                         == png_ptr->trans_color.gray)
                      {
-                        *sp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
-                        *sp |= (png_byte)(png_ptr->background.gray << shift);
+                        unsigned int tmp = *sp & (0x7f7f >> (7 - shift));
+                        tmp |= png_ptr->background.gray << shift;
+                        *sp = (png_byte)(tmp & 0xff);
                      }
 
                      if (shift == 0)
@@ -3565,17 +3251,19 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structp png_ptr)
                         if ((png_uint_16)((*sp >> shift) & 0x03)
                             == png_ptr->trans_color.gray)
                         {
-                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
-                           *sp |= (png_byte)(png_ptr->background.gray << shift);
+                           unsigned int tmp = *sp & (0x3f3f >> (6 - shift));
+                           tmp |= png_ptr->background.gray << shift;
+                           *sp = (png_byte)(tmp & 0xff);
                         }
 
                         else
                         {
-                           png_byte p = (png_byte)((*sp >> shift) & 0x03);
-                           png_byte g = (png_byte)((gamma_table [p | (p << 2) |
-                               (p << 4) | (p << 6)] >> 6) & 0x03);
-                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
-                           *sp |= (png_byte)(g << shift);
+                           unsigned int p = (*sp >> shift) & 0x03;
+                           unsigned int g = (gamma_table [p | (p << 2) |
+                               (p << 4) | (p << 6)] >> 6) & 0x03;
+                           unsigned int tmp = *sp & (0x3f3f >> (6 - shift));
+                           tmp |= g << shift;
+                           *sp = (png_byte)(tmp & 0xff);
                         }
 
                         if (shift == 0)
@@ -3599,8 +3287,9 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structp png_ptr)
                         if ((png_uint_16)((*sp >> shift) & 0x03)
                             == png_ptr->trans_color.gray)
                         {
-                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
-                           *sp |= (png_byte)(png_ptr->background.gray << shift);
+                           unsigned int tmp = *sp & (0x3f3f >> (6 - shift));
+                           tmp |= png_ptr->background.gray << shift;
+                           *sp = (png_byte)(tmp & 0xff);
                         }
 
                         if (shift == 0)
@@ -3628,17 +3317,19 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structp png_ptr)
                         if ((png_uint_16)((*sp >> shift) & 0x0f)
                             == png_ptr->trans_color.gray)
                         {
-                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
-                           *sp |= (png_byte)(png_ptr->background.gray << shift);
+                           unsigned int tmp = *sp & (0x0f0f >> (4 - shift));
+                           tmp |= png_ptr->background.gray << shift;
+                           *sp = (png_byte)(tmp & 0xff);
                         }
 
                         else
                         {
-                           png_byte p = (png_byte)((*sp >> shift) & 0x0f);
-                           png_byte g = (png_byte)((gamma_table[p |
-                               (p << 4)] >> 4) & 0x0f);
-                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
-                           *sp |= (png_byte)(g << shift);
+                           unsigned int p = (*sp >> shift) & 0x0f;
+                           unsigned int g = (gamma_table[p | (p << 4)] >> 4) &
+                              0x0f;
+                           unsigned int tmp = *sp & (0x0f0f >> (4 - shift));
+                           tmp |= g << shift;
+                           *sp = (png_byte)(tmp & 0xff);
                         }
 
                         if (shift == 0)
@@ -3662,8 +3353,9 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structp png_ptr)
                         if ((png_uint_16)((*sp >> shift) & 0x0f)
                             == png_ptr->trans_color.gray)
                         {
-                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
-                           *sp |= (png_byte)(png_ptr->background.gray << shift);
+                           unsigned int tmp = *sp & (0x0f0f >> (4 - shift));
+                           tmp |= png_ptr->background.gray << shift;
+                           *sp = (png_byte)(tmp & 0xff);
                         }
 
                         if (shift == 0)
@@ -3979,7 +3671,8 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structp png_ptr)
                         if (optimize != 0)
                            w = v;
                         else
-                           w = gamma_16_from_1[(v&0xff) >> gamma_shift][v >> 8];
+                           w = gamma_16_from_1[(v & 0xff) >>
+                               gamma_shift][v >> 8];
                         *sp = (png_byte)((w >> 8) & 0xff);
                         *(sp + 1) = (png_byte)(w & 0xff);
                      }
@@ -4143,16 +3836,16 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structp png_ptr)
                         v = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
                         png_composite_16(w, v, a, png_ptr->background_1.red);
                         if (optimize == 0)
-                           w = gamma_16_from_1[((w&0xff) >> gamma_shift)]
-                               [w >> 8];
+                           w = gamma_16_from_1[((w & 0xff) >> gamma_shift)][w >>
+                                8];
                         *sp = (png_byte)((w >> 8) & 0xff);
                         *(sp + 1) = (png_byte)(w & 0xff);
 
                         v = gamma_16_to_1[*(sp + 3) >> gamma_shift][*(sp + 2)];
                         png_composite_16(w, v, a, png_ptr->background_1.green);
                         if (optimize == 0)
-                           w = gamma_16_from_1[((w&0xff) >> gamma_shift)]
-                               [w >> 8];
+                           w = gamma_16_from_1[((w & 0xff) >> gamma_shift)][w >>
+                                8];
 
                         *(sp + 2) = (png_byte)((w >> 8) & 0xff);
                         *(sp + 3) = (png_byte)(w & 0xff);
@@ -4160,8 +3853,8 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structp png_ptr)
                         v = gamma_16_to_1[*(sp + 5) >> gamma_shift][*(sp + 4)];
                         png_composite_16(w, v, a, png_ptr->background_1.blue);
                         if (optimize == 0)
-                           w = gamma_16_from_1[((w&0xff) >> gamma_shift)]
-                               [w >> 8];
+                           w = gamma_16_from_1[((w & 0xff) >> gamma_shift)][w >>
+                                8];
 
                         *(sp + 4) = (png_byte)((w >> 8) & 0xff);
                         *(sp + 5) = (png_byte)(w & 0xff);
@@ -4224,7 +3917,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structp png_ptr)
       }
    }
 }
-#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_READ_ALPHA_MODE_SUPPORTED */
+#endif /* READ_BACKGROUND || READ_ALPHA_MODE */
 
 #ifdef PNG_READ_GAMMA_SUPPORTED
 /* Gamma correct the image, avoiding the alpha channel.  Make sure
@@ -4233,8 +3926,8 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structp png_ptr)
  * is 16, use gamma_16_table and gamma_shift.  Build these with
  * build_gamma_table().
  */
-void /* PRIVATE */
-png_do_gamma(png_row_infop row_info, png_bytep row, png_structp png_ptr)
+static void
+png_do_gamma(png_row_infop row_info, png_bytep row, png_structrp png_ptr)
 {
    png_const_bytep gamma_table = png_ptr->gamma_table;
    png_const_uint_16pp gamma_16_table = png_ptr->gamma_16_table;
@@ -4434,14 +4127,14 @@ png_do_gamma(png_row_infop row_info, png_bytep row, png_structp png_ptr)
  * linear.)  Called only with color types that have an alpha channel.  Needs the
  * from_1 tables.
  */
-void /* PRIVATE */
-png_do_encode_alpha(png_row_infop row_info, png_bytep row, png_structp png_ptr)
+static void
+png_do_encode_alpha(png_row_infop row_info, png_bytep row, png_structrp png_ptr)
 {
    png_uint_32 row_width = row_info->width;
 
    png_debug(1, "in png_do_encode_alpha");
 
-   if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
+   if ((row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0)
    {
       if (row_info->bit_depth == 8)
       {
@@ -4500,7 +4193,7 @@ png_do_encode_alpha(png_row_infop row_info, png_bytep row, png_structp png_ptr)
 /* Expands a palette row to an RGB or RGBA row depending
  * upon whether you supply trans and num_trans.
  */
-void /* PRIVATE */
+static void
 png_do_expand_palette(png_row_infop row_info, png_bytep row,
    png_const_colorp palette, png_const_bytep trans_alpha, int num_trans)
 {
@@ -4653,7 +4346,7 @@ png_do_expand_palette(png_row_infop row_info, png_bytep row,
 /* If the bit depth < 8, it is expanded to 8.  Also, if the already
  * expanded transparency value is supplied, an alpha channel is built.
  */
-void /* PRIVATE */
+static void
 png_do_expand(png_row_infop row_info, png_bytep row,
     png_const_color_16p trans_color)
 {
@@ -4667,7 +4360,7 @@ png_do_expand(png_row_infop row_info, png_bytep row,
    {
       if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
       {
-         png_uint_16 gray = (png_uint_16)(trans_color ? trans_color->gray : 0);
+         unsigned int gray = trans_color != NULL ? trans_color->gray : 0;
 
          if (row_info->bit_depth < 8)
          {
@@ -4675,7 +4368,7 @@ png_do_expand(png_row_infop row_info, png_bytep row,
             {
                case 1:
                {
-                  gray = (png_uint_16)((gray & 0x01) * 0xff);
+                  gray = (gray & 0x01) * 0xff;
                   sp = row + (png_size_t)((row_width - 1) >> 3);
                   dp = row + (png_size_t)row_width - 1;
                   shift = 7 - (int)((row_width + 7) & 0x07);
@@ -4703,7 +4396,7 @@ png_do_expand(png_row_infop row_info, png_bytep row,
 
                case 2:
                {
-                  gray = (png_uint_16)((gray & 0x03) * 0x55);
+                  gray = (gray & 0x03) * 0x55;
                   sp = row + (png_size_t)((row_width - 1) >> 2);
                   dp = row + (png_size_t)row_width - 1;
                   shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
@@ -4728,7 +4421,7 @@ png_do_expand(png_row_infop row_info, png_bytep row,
 
                case 4:
                {
-                  gray = (png_uint_16)((gray & 0x0f) * 0x11);
+                  gray = (gray & 0x0f) * 0x11;
                   sp = row + (png_size_t)((row_width - 1) >> 1);
                   dp = row + (png_size_t)row_width - 1;
                   shift = (int)((1 - ((row_width + 1) & 0x01)) << 2);
@@ -4763,15 +4456,13 @@ png_do_expand(png_row_infop row_info, png_bytep row,
          {
             if (row_info->bit_depth == 8)
             {
-               /* NOTE: prior to libpng 1.5.14 this cleared out the top bits of
-                * 'gray', however if those are set it is an error.
-                */
+               gray = gray & 0xff;
                sp = row + (png_size_t)row_width - 1;
                dp = row + (png_size_t)(row_width << 1) - 1;
 
                for (i = 0; i < row_width; i++)
                {
-                  if (*sp == gray)
+                  if ((*sp & 0xffU) == gray)
                      *dp-- = 0;
 
                   else
@@ -4783,13 +4474,14 @@ png_do_expand(png_row_infop row_info, png_bytep row,
 
             else if (row_info->bit_depth == 16)
             {
-               png_byte gray_high = (png_byte)((gray >> 8) & 0xff);
-               png_byte gray_low = (png_byte)(gray & 0xff);
+               unsigned int gray_high = (gray >> 8) & 0xff;
+               unsigned int gray_low = gray & 0xff;
                sp = row + row_info->rowbytes - 1;
                dp = row + (row_info->rowbytes << 1) - 1;
                for (i = 0; i < row_width; i++)
                {
-                  if (*(sp - 1) == gray_high && *(sp) == gray_low)
+                  if ((*(sp - 1) & 0xffU) == gray_high &&
+                      (*(sp) & 0xffU) == gray_low)
                   {
                      *dp-- = 0;
                      *dp-- = 0;
@@ -4813,7 +4505,8 @@ png_do_expand(png_row_infop row_info, png_bytep row,
                row_width);
          }
       }
-      else if (row_info->color_type == PNG_COLOR_TYPE_RGB && trans_color)
+      else if (row_info->color_type == PNG_COLOR_TYPE_RGB &&
+          trans_color != NULL)
       {
          if (row_info->bit_depth == 8)
          {
@@ -4885,7 +4578,7 @@ png_do_expand(png_row_infop row_info, png_bytep row,
 /* If the bit depth is 8 and the color type is not a palette type expand the
  * whole row to 16 bits.  Has no effect otherwise.
  */
-void /* PRIVATE */
+static void
 png_do_expand_16(png_row_infop row_info, png_bytep row)
 {
    if (row_info->bit_depth == 8 &&
@@ -4913,7 +4606,7 @@ png_do_expand_16(png_row_infop row_info, png_bytep row)
 #endif
 
 #ifdef PNG_READ_QUANTIZE_SUPPORTED
-void /* PRIVATE */
+static void
 png_do_quantize(png_row_infop row_info, png_bytep row,
     png_const_bytep palette_lookup, png_const_bytep quantize_lookup)
 {
@@ -5004,70 +4697,304 @@ png_do_quantize(png_row_infop row_info, png_bytep row,
       }
    }
 }
-#endif /* PNG_READ_QUANTIZE_SUPPORTED */
-#endif /* PNG_READ_TRANSFORMS_SUPPORTED */
+#endif /* READ_QUANTIZE */
 
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-/* Undoes intrapixel differencing  */
+/* Transform the row.  The order of transformations is significant,
+ * and is very touchy.  If you add a transformation, take care to
+ * decide how it fits in with the other transformations here.
+ */
 void /* PRIVATE */
-png_do_read_intrapixel(png_row_infop row_info, png_bytep row)
+png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
 {
-   png_debug(1, "in png_do_read_intrapixel");
+   png_debug(1, "in png_do_read_transformations");
 
-   if (
-       (row_info->color_type & PNG_COLOR_MASK_COLOR))
+   if (png_ptr->row_buf == NULL)
    {
-      int bytes_per_pixel;
-      png_uint_32 row_width = row_info->width;
+      /* Prior to 1.5.4 this output row/pass where the NULL pointer is, but this
+       * error is incredibly rare and incredibly easy to debug without this
+       * information.
+       */
+      png_error(png_ptr, "NULL row buffer");
+   }
 
-      if (row_info->bit_depth == 8)
-      {
-         png_bytep rp;
-         png_uint_32 i;
+   /* The following is debugging; prior to 1.5.4 the code was never compiled in;
+    * in 1.5.4 PNG_FLAG_DETECT_UNINITIALIZED was added and the macro
+    * PNG_WARN_UNINITIALIZED_ROW removed.  In 1.6 the new flag is set only for
+    * all transformations, however in practice the ROW_INIT always gets done on
+    * demand, if necessary.
+    */
+   if ((png_ptr->flags & PNG_FLAG_DETECT_UNINITIALIZED) != 0 &&
+       (png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)
+   {
+      /* Application has failed to call either png_read_start_image() or
+       * png_read_update_info() after setting transforms that expand pixels.
+       * This check added to libpng-1.2.19 (but not enabled until 1.5.4).
+       */
+      png_error(png_ptr, "Uninitialized row");
+   }
 
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-            bytes_per_pixel = 3;
+#ifdef PNG_READ_EXPAND_SUPPORTED
+   if ((png_ptr->transformations & PNG_EXPAND) != 0)
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_do_expand_palette(row_info, png_ptr->row_buf + 1,
+             png_ptr->palette, png_ptr->trans_alpha, png_ptr->num_trans);
+      }
 
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-            bytes_per_pixel = 4;
+      else
+      {
+         if (png_ptr->num_trans != 0 &&
+             (png_ptr->transformations & PNG_EXPAND_tRNS) != 0)
+            png_do_expand(row_info, png_ptr->row_buf + 1,
+                &(png_ptr->trans_color));
 
          else
-            return;
-
-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-         {
-            *(rp) = (png_byte)((256 + *rp + *(rp + 1)) & 0xff);
-            *(rp+2) = (png_byte)((256 + *(rp + 2) + *(rp + 1)) & 0xff);
-         }
+            png_do_expand(row_info, png_ptr->row_buf + 1,
+                NULL);
       }
-      else if (row_info->bit_depth == 16)
-      {
-         png_bytep rp;
-         png_uint_32 i;
+   }
+#endif
 
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-            bytes_per_pixel = 6;
+#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
+   if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0 &&
+       (png_ptr->transformations & PNG_COMPOSE) == 0 &&
+       (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
+       row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
+      png_do_strip_channel(row_info, png_ptr->row_buf + 1,
+         0 /* at_start == false, because SWAP_ALPHA happens later */);
+#endif
 
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-            bytes_per_pixel = 8;
+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+   if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)
+   {
+      int rgb_error =
+          png_do_rgb_to_gray(png_ptr, row_info,
+              png_ptr->row_buf + 1);
 
-         else
-            return;
+      if (rgb_error != 0)
+      {
+         png_ptr->rgb_to_gray_status=1;
+         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
+             PNG_RGB_TO_GRAY_WARN)
+            png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel");
 
-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-         {
-            png_uint_32 s0   = (*(rp    ) << 8) | *(rp + 1);
-            png_uint_32 s1   = (*(rp + 2) << 8) | *(rp + 3);
-            png_uint_32 s2   = (*(rp + 4) << 8) | *(rp + 5);
-            png_uint_32 red  = (s0 + s1 + 65536) & 0xffff;
-            png_uint_32 blue = (s2 + s1 + 65536) & 0xffff;
-            *(rp    ) = (png_byte)((red >> 8) & 0xff);
-            *(rp + 1) = (png_byte)(red & 0xff);
-            *(rp + 4) = (png_byte)((blue >> 8) & 0xff);
-            *(rp + 5) = (png_byte)(blue & 0xff);
-         }
+         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
+             PNG_RGB_TO_GRAY_ERR)
+            png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel");
       }
    }
+#endif
+
+/* From Andreas Dilger e-mail to png-implement, 26 March 1998:
+ *
+ *   In most cases, the "simple transparency" should be done prior to doing
+ *   gray-to-RGB, or you will have to test 3x as many bytes to check if a
+ *   pixel is transparent.  You would also need to make sure that the
+ *   transparency information is upgraded to RGB.
+ *
+ *   To summarize, the current flow is:
+ *   - Gray + simple transparency -> compare 1 or 2 gray bytes and composite
+ *                                   with background "in place" if transparent,
+ *                                   convert to RGB if necessary
+ *   - Gray + alpha -> composite with gray background and remove alpha bytes,
+ *                                   convert to RGB if necessary
+ *
+ *   To support RGB backgrounds for gray images we need:
+ *   - Gray + simple transparency -> convert to RGB + simple transparency,
+ *                                   compare 3 or 6 bytes and composite with
+ *                                   background "in place" if transparent
+ *                                   (3x compare/pixel compared to doing
+ *                                   composite with gray bkgrnd)
+ *   - Gray + alpha -> convert to RGB + alpha, composite with background and
+ *                                   remove alpha bytes (3x float
+ *                                   operations/pixel compared with composite
+ *                                   on gray background)
+ *
+ *  Greg's change will do this.  The reason it wasn't done before is for
+ *  performance, as this increases the per-pixel operations.  If we would check
+ *  in advance if the background was gray or RGB, and position the gray-to-RGB
+ *  transform appropriately, then it would save a lot of work/time.
+ */
+
+#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
+   /* If gray -> RGB, do so now only if background is non-gray; else do later
+    * for performance reasons
+    */
+   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0 &&
+       (png_ptr->mode & PNG_BACKGROUND_IS_GRAY) == 0)
+      png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
+   defined(PNG_READ_ALPHA_MODE_SUPPORTED)
+   if ((png_ptr->transformations & PNG_COMPOSE) != 0)
+      png_do_compose(row_info, png_ptr->row_buf + 1, png_ptr);
+#endif
+
+#ifdef PNG_READ_GAMMA_SUPPORTED
+   if ((png_ptr->transformations & PNG_GAMMA) != 0 &&
+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+      /* Because RGB_TO_GRAY does the gamma transform. */
+      (png_ptr->transformations & PNG_RGB_TO_GRAY) == 0 &&
+#endif
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
+   defined(PNG_READ_ALPHA_MODE_SUPPORTED)
+      /* Because PNG_COMPOSE does the gamma transform if there is something to
+       * do (if there is an alpha channel or transparency.)
+       */
+       !((png_ptr->transformations & PNG_COMPOSE) != 0 &&
+       ((png_ptr->num_trans != 0) ||
+       (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)) &&
+#endif
+      /* Because png_init_read_transformations transforms the palette, unless
+       * RGB_TO_GRAY will do the transform.
+       */
+       (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE))
+      png_do_gamma(row_info, png_ptr->row_buf + 1, png_ptr);
+#endif
+
+#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
+   if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0 &&
+       (png_ptr->transformations & PNG_COMPOSE) != 0 &&
+       (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
+       row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
+      png_do_strip_channel(row_info, png_ptr->row_buf + 1,
+          0 /* at_start == false, because SWAP_ALPHA happens later */);
+#endif
+
+#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
+   if ((png_ptr->transformations & PNG_ENCODE_ALPHA) != 0 &&
+       (row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0)
+      png_do_encode_alpha(row_info, png_ptr->row_buf + 1, png_ptr);
+#endif
+
+#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
+   if ((png_ptr->transformations & PNG_SCALE_16_TO_8) != 0)
+      png_do_scale_16_to_8(row_info, png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
+   /* There is no harm in doing both of these because only one has any effect,
+    * by putting the 'scale' option first if the app asks for scale (either by
+    * calling the API or in a TRANSFORM flag) this is what happens.
+    */
+   if ((png_ptr->transformations & PNG_16_TO_8) != 0)
+      png_do_chop(row_info, png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_QUANTIZE_SUPPORTED
+   if ((png_ptr->transformations & PNG_QUANTIZE) != 0)
+   {
+      png_do_quantize(row_info, png_ptr->row_buf + 1,
+          png_ptr->palette_lookup, png_ptr->quantize_index);
+
+      if (row_info->rowbytes == 0)
+         png_error(png_ptr, "png_do_quantize returned rowbytes=0");
+   }
+#endif /* READ_QUANTIZE */
+
+#ifdef PNG_READ_EXPAND_16_SUPPORTED
+   /* Do the expansion now, after all the arithmetic has been done.  Notice
+    * that previous transformations can handle the PNG_EXPAND_16 flag if this
+    * is efficient (particularly true in the case of gamma correction, where
+    * better accuracy results faster!)
+    */
+   if ((png_ptr->transformations & PNG_EXPAND_16) != 0)
+      png_do_expand_16(row_info, png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
+   /* NOTE: moved here in 1.5.4 (from much later in this list.) */
+   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0 &&
+       (png_ptr->mode & PNG_BACKGROUND_IS_GRAY) != 0)
+      png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_INVERT_SUPPORTED
+   if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)
+      png_do_invert(row_info, png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
+   if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0)
+      png_do_read_invert_alpha(row_info, png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_SHIFT_SUPPORTED
+   if ((png_ptr->transformations & PNG_SHIFT) != 0)
+      png_do_unshift(row_info, png_ptr->row_buf + 1,
+          &(png_ptr->shift));
+#endif
+
+#ifdef PNG_READ_PACK_SUPPORTED
+   if ((png_ptr->transformations & PNG_PACK) != 0)
+      png_do_unpack(row_info, png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
+   /* Added at libpng-1.5.10 */
+   if (row_info->color_type == PNG_COLOR_TYPE_PALETTE &&
+       png_ptr->num_palette_max >= 0)
+      png_do_check_palette_indexes(png_ptr, row_info);
+#endif
+
+#ifdef PNG_READ_BGR_SUPPORTED
+   if ((png_ptr->transformations & PNG_BGR) != 0)
+      png_do_bgr(row_info, png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_PACKSWAP_SUPPORTED
+   if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
+      png_do_packswap(row_info, png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_FILLER_SUPPORTED
+   if ((png_ptr->transformations & PNG_FILLER) != 0)
+      png_do_read_filler(row_info, png_ptr->row_buf + 1,
+          (png_uint_32)png_ptr->filler, png_ptr->flags);
+#endif
+
+#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
+   if ((png_ptr->transformations & PNG_SWAP_ALPHA) != 0)
+      png_do_read_swap_alpha(row_info, png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_READ_16BIT_SUPPORTED
+#ifdef PNG_READ_SWAP_SUPPORTED
+   if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)
+      png_do_swap(row_info, png_ptr->row_buf + 1);
+#endif
+#endif
+
+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
+   if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)
+   {
+      if (png_ptr->read_user_transform_fn != NULL)
+         (*(png_ptr->read_user_transform_fn)) /* User read transform function */
+             (png_ptr,     /* png_ptr */
+             row_info,     /* row_info: */
+                /*  png_uint_32 width;       width of row */
+                /*  png_size_t rowbytes;     number of bytes in row */
+                /*  png_byte color_type;     color type of pixels */
+                /*  png_byte bit_depth;      bit depth of samples */
+                /*  png_byte channels;       number of channels (1-4) */
+                /*  png_byte pixel_depth;    bits per pixel (depth*channels) */
+             png_ptr->row_buf + 1);    /* start of pixel data for row */
+#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
+      if (png_ptr->user_transform_depth != 0)
+         row_info->bit_depth = png_ptr->user_transform_depth;
+
+      if (png_ptr->user_transform_channels != 0)
+         row_info->channels = png_ptr->user_transform_channels;
+#endif
+      row_info->pixel_depth = (png_byte)(row_info->bit_depth *
+          row_info->channels);
+
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_info->width);
+   }
+#endif
 }
-#endif /* PNG_MNG_FEATURES_SUPPORTED */
-#endif /* PNG_READ_SUPPORTED */
+
+#endif /* READ_TRANSFORMS */
+#endif /* READ */
diff --git a/drivers/png/pngrutil.c b/drivers/png/pngrutil.c
index 6061651fef..c9747fc27d 100644
--- a/drivers/png/pngrutil.c
+++ b/drivers/png/pngrutil.c
@@ -1,7 +1,7 @@
 
 /* pngrutil.c - utilities to read a PNG file
  *
- * Last changed in libpng 1.5.25 [December 3, 2015]
+ * Last changed in libpng 1.6.20 [December 3, 2014]
  * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -19,7 +19,7 @@
 #ifdef PNG_READ_SUPPORTED
 
 png_uint_32 PNGAPI
-png_get_uint_31(png_structp png_ptr, png_const_bytep buf)
+png_get_uint_31(png_const_structrp png_ptr, png_const_bytep buf)
 {
    png_uint_32 uval = png_get_uint_32(buf);
 
@@ -38,7 +38,7 @@ png_get_uint_31(png_structp png_ptr, png_const_bytep buf)
 #define PNG_FIXED_ERROR (-1)
 
 static png_fixed_point /* PRIVATE */
-png_get_fixed_point(png_structp png_ptr, png_const_bytep buf)
+png_get_fixed_point(png_structrp png_ptr, png_const_bytep buf)
 {
    png_uint_32 uval = png_get_uint_32(buf);
 
@@ -104,7 +104,7 @@ png_get_uint_16)(png_const_bytep buf)
 {
    /* ANSI-C requires an int value to accomodate at least 16 bits so this
     * works and allows the compiler not to worry about possible narrowing
-    * on 32 bit systems.  (Pre-ANSI systems did not make integers smaller
+    * on 32-bit systems.  (Pre-ANSI systems did not make integers smaller
     * than 16 bits either.)
     */
    unsigned int val =
@@ -114,11 +114,11 @@ png_get_uint_16)(png_const_bytep buf)
    return (png_uint_16)val;
 }
 
-#endif /* PNG_READ_INT_FUNCTIONS_SUPPORTED */
+#endif /* READ_INT_FUNCTIONS */
 
 /* Read and check the PNG file signature */
 void /* PRIVATE */
-png_read_sig(png_structp png_ptr, png_infop info_ptr)
+png_read_sig(png_structrp png_ptr, png_inforp info_ptr)
 {
    png_size_t num_checked, num_to_check;
 
@@ -137,7 +137,7 @@ png_read_sig(png_structp png_ptr, png_infop info_ptr)
    png_read_data(png_ptr, &(info_ptr->signature[num_checked]), num_to_check);
    png_ptr->sig_bytes = 8;
 
-   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
+   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check) != 0)
    {
       if (num_checked < 4 &&
           png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
@@ -153,7 +153,7 @@ png_read_sig(png_structp png_ptr, png_infop info_ptr)
  * Put the type name into png_ptr->chunk_name, and return the length.
  */
 png_uint_32 /* PRIVATE */
-png_read_chunk_header(png_structp png_ptr)
+png_read_chunk_header(png_structrp png_ptr)
 {
    png_byte buf[8];
    png_uint_32 length;
@@ -190,7 +190,7 @@ png_read_chunk_header(png_structp png_ptr)
 
 /* Read data, and (optionally) run it through the CRC. */
 void /* PRIVATE */
-png_crc_read(png_structp png_ptr, png_bytep buf, png_size_t length)
+png_crc_read(png_structrp png_ptr, png_bytep buf, png_uint_32 length)
 {
    if (png_ptr == NULL)
       return;
@@ -200,40 +200,40 @@ png_crc_read(png_structp png_ptr, png_bytep buf, png_size_t length)
 }
 
 /* Optionally skip data and then check the CRC.  Depending on whether we
- * are reading a ancillary or critical chunk, and how the program has set
+ * are reading an ancillary or critical chunk, and how the program has set
  * things up, we may calculate the CRC on the data and print a message.
  * Returns '1' if there was a CRC error, '0' otherwise.
  */
 int /* PRIVATE */
-png_crc_finish(png_structp png_ptr, png_uint_32 skip)
+png_crc_finish(png_structrp png_ptr, png_uint_32 skip)
 {
-   png_size_t i;
-   png_size_t istop = png_ptr->zbuf_size;
-
-   for (i = (png_size_t)skip; i > istop; i -= istop)
+   /* The size of the local buffer for inflate is a good guess as to a
+    * reasonable size to use for buffering reads from the application.
+    */
+   while (skip > 0)
    {
-      png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
-   }
+      png_uint_32 len;
+      png_byte tmpbuf[PNG_INFLATE_BUF_SIZE];
 
-   if (i != 0)
-   {
-      png_crc_read(png_ptr, png_ptr->zbuf, i);
+      len = (sizeof tmpbuf);
+      if (len > skip)
+         len = skip;
+      skip -= len;
+
+      png_crc_read(png_ptr, tmpbuf, len);
    }
 
-   if (png_crc_error(png_ptr))
+   if (png_crc_error(png_ptr) != 0)
    {
-      if (PNG_CHUNK_ANCILLIARY(png_ptr->chunk_name) ?
-          !(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) :
-          (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE))
+      if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0 ?
+          (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) == 0 :
+          (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE) != 0)
       {
          png_chunk_warning(png_ptr, "CRC error");
       }
 
       else
-      {
-         png_chunk_benign_error(png_ptr, "CRC error");
-         return (0);
-      }
+         png_chunk_error(png_ptr, "CRC error");
 
       return (1);
    }
@@ -245,13 +245,13 @@ png_crc_finish(png_structp png_ptr, png_uint_32 skip)
  * the data it has read thus far.
  */
 int /* PRIVATE */
-png_crc_error(png_structp png_ptr)
+png_crc_error(png_structrp png_ptr)
 {
    png_byte crc_bytes[4];
    png_uint_32 crc;
    int need_crc = 1;
 
-   if (PNG_CHUNK_ANCILLIARY(png_ptr->chunk_name))
+   if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0)
    {
       if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
           (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
@@ -260,7 +260,7 @@ png_crc_error(png_structp png_ptr)
 
    else /* critical */
    {
-      if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
+      if ((png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE) != 0)
          need_crc = 0;
    }
 
@@ -281,259 +281,552 @@ png_crc_error(png_structp png_ptr)
       return (0);
 }
 
-#ifdef PNG_READ_COMPRESSED_TEXT_SUPPORTED
-static png_size_t
-png_inflate(png_structp png_ptr, png_bytep data, png_size_t size,
-    png_bytep output, png_size_t output_size)
+#if defined(PNG_READ_iCCP_SUPPORTED) || defined(PNG_READ_iTXt_SUPPORTED) ||\
+    defined(PNG_READ_pCAL_SUPPORTED) || defined(PNG_READ_sCAL_SUPPORTED) ||\
+    defined(PNG_READ_sPLT_SUPPORTED) || defined(PNG_READ_tEXt_SUPPORTED) ||\
+    defined(PNG_READ_zTXt_SUPPORTED) || defined(PNG_SEQUENTIAL_READ_SUPPORTED)
+/* Manage the read buffer; this simply reallocates the buffer if it is not small
+ * enough (or if it is not allocated).  The routine returns a pointer to the
+ * buffer; if an error occurs and 'warn' is set the routine returns NULL, else
+ * it will call png_error (via png_malloc) on failure.  (warn == 2 means
+ * 'silent').
+ */
+static png_bytep
+png_read_buffer(png_structrp png_ptr, png_alloc_size_t new_size, int warn)
 {
-   png_size_t count = 0;
+   png_bytep buffer = png_ptr->read_buffer;
 
-   /* HACK: added in libpng 1.5.18: the progressive reader always leaves
-    * png_ptr->zstream in a non-reset state.  This causes a reset if it needs to
-    * be used again.  This only copes with that one specific error; see libpng
-    * 1.6 for a better solution.
-    */
-   if ((png_ptr->flags & PNG_FLAG_ZSTREAM_PROGRESSIVE) != 0)
+   if (buffer != NULL && new_size > png_ptr->read_buffer_size)
    {
-      (void)inflateReset(&png_ptr->zstream);
-      png_ptr->flags &= ~PNG_FLAG_ZSTREAM_PROGRESSIVE;
+      png_ptr->read_buffer = NULL;
+      png_ptr->read_buffer = NULL;
+      png_ptr->read_buffer_size = 0;
+      png_free(png_ptr, buffer);
+      buffer = NULL;
    }
 
-   /* zlib can't necessarily handle more than 65535 bytes at once (i.e. it can't
-    * even necessarily handle 65536 bytes) because the type uInt is "16 bits or
-    * more".  Consequently it is necessary to chunk the input to zlib.  This
-    * code uses ZLIB_IO_MAX, from pngpriv.h, as the maximum (the maximum value
-    * that can be stored in a uInt.)  It is possible to set ZLIB_IO_MAX to a
-    * lower value in pngpriv.h and this may sometimes have a performance
-    * advantage, because it forces access of the input data to be separated from
-    * at least some of the use by some period of time.
-    */
-   png_ptr->zstream.next_in = data;
-   /* avail_in is set below from 'size' */
-   png_ptr->zstream.avail_in = 0;
-
-   while (1)
+   if (buffer == NULL)
    {
-      int ret, avail;
+      buffer = png_voidcast(png_bytep, png_malloc_base(png_ptr, new_size));
 
-      /* The setting of 'avail_in' used to be outside the loop; by setting it
-       * inside it is possible to chunk the input to zlib and simply rely on
-       * zlib to advance the 'next_in' pointer.  This allows arbitrary amounts o
-       * data to be passed through zlib at the unavoidable cost of requiring a
-       * window save (memcpy of up to 32768 output bytes) every ZLIB_IO_MAX
-       * input bytes.
-       */
-      if (png_ptr->zstream.avail_in == 0 && size > 0)
+      if (buffer != NULL)
       {
-         if (size <= ZLIB_IO_MAX)
-         {
-            /* The value is less than ZLIB_IO_MAX so the cast is safe: */
-            png_ptr->zstream.avail_in = (uInt)size;
-            size = 0;
-         }
+         png_ptr->read_buffer = buffer;
+         png_ptr->read_buffer_size = new_size;
+      }
+
+      else if (warn < 2) /* else silent */
+      {
+         if (warn != 0)
+             png_chunk_warning(png_ptr, "insufficient memory to read chunk");
 
          else
-         {
-            png_ptr->zstream.avail_in = ZLIB_IO_MAX;
-            size -= ZLIB_IO_MAX;
-         }
+             png_chunk_error(png_ptr, "insufficient memory to read chunk");
       }
+   }
 
-      /* Reset the output buffer each time round - we empty it
-       * after every inflate call.
-       */
-      png_ptr->zstream.next_out = png_ptr->zbuf;
-      png_ptr->zstream.avail_out = png_ptr->zbuf_size;
+   return buffer;
+}
+#endif /* READ_iCCP|iTXt|pCAL|sCAL|sPLT|tEXt|zTXt|SEQUENTIAL_READ */
 
-      ret = inflate(&png_ptr->zstream, Z_NO_FLUSH);
-      avail = png_ptr->zbuf_size - png_ptr->zstream.avail_out;
+/* png_inflate_claim: claim the zstream for some nefarious purpose that involves
+ * decompression.  Returns Z_OK on success, else a zlib error code.  It checks
+ * the owner but, in final release builds, just issues a warning if some other
+ * chunk apparently owns the stream.  Prior to release it does a png_error.
+ */
+static int
+png_inflate_claim(png_structrp png_ptr, png_uint_32 owner)
+{
+   if (png_ptr->zowner != 0)
+   {
+      char msg[64];
 
-      /* First copy/count any new output - but only if we didn't
-       * get an error code.
+      PNG_STRING_FROM_CHUNK(msg, png_ptr->zowner);
+      /* So the message that results is "<chunk> using zstream"; this is an
+       * internal error, but is very useful for debugging.  i18n requirements
+       * are minimal.
        */
-      if ((ret == Z_OK || ret == Z_STREAM_END) && avail > 0)
+      (void)png_safecat(msg, (sizeof msg), 4, " using zstream");
+#if PNG_RELEASE_BUILD
+      png_chunk_warning(png_ptr, msg);
+      png_ptr->zowner = 0;
+#else
+      png_chunk_error(png_ptr, msg);
+#endif
+   }
+
+   /* Implementation note: unlike 'png_deflate_claim' this internal function
+    * does not take the size of the data as an argument.  Some efficiency could
+    * be gained by using this when it is known *if* the zlib stream itself does
+    * not record the number; however, this is an illusion: the original writer
+    * of the PNG may have selected a lower window size, and we really must
+    * follow that because, for systems with with limited capabilities, we
+    * would otherwise reject the application's attempts to use a smaller window
+    * size (zlib doesn't have an interface to say "this or lower"!).
+    *
+    * inflateReset2 was added to zlib 1.2.4; before this the window could not be
+    * reset, therefore it is necessary to always allocate the maximum window
+    * size with earlier zlibs just in case later compressed chunks need it.
+    */
+   {
+      int ret; /* zlib return code */
+#if PNG_ZLIB_VERNUM >= 0x1240
+
+# if defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_MAXIMUM_INFLATE_WINDOW)
+      int window_bits;
+
+      if (((png_ptr->options >> PNG_MAXIMUM_INFLATE_WINDOW) & 3) ==
+          PNG_OPTION_ON)
       {
-         png_size_t space = avail; /* > 0, see above */
+         window_bits = 15;
+         png_ptr->zstream_start = 0; /* fixed window size */
+      }
 
-         if (output != 0 && output_size > count)
-         {
-            png_size_t copy = output_size - count;
+      else
+      {
+         window_bits = 0;
+         png_ptr->zstream_start = 1;
+      }
+# else
+#   define window_bits 0
+# endif
+#endif
 
-            if (space < copy)
-               copy = space;
+      /* Set this for safety, just in case the previous owner left pointers to
+       * memory allocations.
+       */
+      png_ptr->zstream.next_in = NULL;
+      png_ptr->zstream.avail_in = 0;
+      png_ptr->zstream.next_out = NULL;
+      png_ptr->zstream.avail_out = 0;
 
-            png_memcpy(output + count, png_ptr->zbuf, copy);
-         }
-         count += space;
+      if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0)
+      {
+#if PNG_ZLIB_VERNUM < 0x1240
+         ret = inflateReset(&png_ptr->zstream);
+#else
+         ret = inflateReset2(&png_ptr->zstream, window_bits);
+#endif
+      }
+
+      else
+      {
+#if PNG_ZLIB_VERNUM < 0x1240
+         ret = inflateInit(&png_ptr->zstream);
+#else
+         ret = inflateInit2(&png_ptr->zstream, window_bits);
+#endif
+
+         if (ret == Z_OK)
+            png_ptr->flags |= PNG_FLAG_ZSTREAM_INITIALIZED;
       }
 
       if (ret == Z_OK)
-         continue;
+         png_ptr->zowner = owner;
+
+      else
+         png_zstream_error(png_ptr, ret);
+
+      return ret;
+   }
+
+#ifdef window_bits
+# undef window_bits
+#endif
+}
+
+#if PNG_ZLIB_VERNUM >= 0x1240
+/* Handle the start of the inflate stream if we called inflateInit2(strm,0);
+ * in this case some zlib versions skip validation of the CINFO field and, in
+ * certain circumstances, libpng may end up displaying an invalid image, in
+ * contrast to implementations that call zlib in the normal way (e.g. libpng
+ * 1.5).
+ */
+int /* PRIVATE */
+png_zlib_inflate(png_structrp png_ptr, int flush)
+{
+   if (png_ptr->zstream_start && png_ptr->zstream.avail_in > 0)
+   {
+      if ((*png_ptr->zstream.next_in >> 4) > 7)
+      {
+         png_ptr->zstream.msg = "invalid window size (libpng)";
+         return Z_DATA_ERROR;
+      }
+
+      png_ptr->zstream_start = 0;
+   }
+
+   return inflate(&png_ptr->zstream, flush);
+}
+#endif /* Zlib >= 1.2.4 */
 
-      /* Termination conditions - always reset the zstream, it
-       * must be left in inflateInit state.
+#ifdef PNG_READ_COMPRESSED_TEXT_SUPPORTED
+/* png_inflate now returns zlib error codes including Z_OK and Z_STREAM_END to
+ * allow the caller to do multiple calls if required.  If the 'finish' flag is
+ * set Z_FINISH will be passed to the final inflate() call and Z_STREAM_END must
+ * be returned or there has been a problem, otherwise Z_SYNC_FLUSH is used and
+ * Z_OK or Z_STREAM_END will be returned on success.
+ *
+ * The input and output sizes are updated to the actual amounts of data consumed
+ * or written, not the amount available (as in a z_stream).  The data pointers
+ * are not changed, so the next input is (data+input_size) and the next
+ * available output is (output+output_size).
+ */
+static int
+png_inflate(png_structrp png_ptr, png_uint_32 owner, int finish,
+    /* INPUT: */ png_const_bytep input, png_uint_32p input_size_ptr,
+    /* OUTPUT: */ png_bytep output, png_alloc_size_t *output_size_ptr)
+{
+   if (png_ptr->zowner == owner) /* Else not claimed */
+   {
+      int ret;
+      png_alloc_size_t avail_out = *output_size_ptr;
+      png_uint_32 avail_in = *input_size_ptr;
+
+      /* zlib can't necessarily handle more than 65535 bytes at once (i.e. it
+       * can't even necessarily handle 65536 bytes) because the type uInt is
+       * "16 bits or more".  Consequently it is necessary to chunk the input to
+       * zlib.  This code uses ZLIB_IO_MAX, from pngpriv.h, as the maximum (the
+       * maximum value that can be stored in a uInt.)  It is possible to set
+       * ZLIB_IO_MAX to a lower value in pngpriv.h and this may sometimes have
+       * a performance advantage, because it reduces the amount of data accessed
+       * at each step and that may give the OS more time to page it in.
        */
+      png_ptr->zstream.next_in = PNGZ_INPUT_CAST(input);
+      /* avail_in and avail_out are set below from 'size' */
       png_ptr->zstream.avail_in = 0;
-      inflateReset(&png_ptr->zstream);
-
-      if (ret == Z_STREAM_END)
-         return count; /* NOTE: may be zero. */
+      png_ptr->zstream.avail_out = 0;
 
-      /* Now handle the error codes - the API always returns 0
-       * and the error message is dumped into the uncompressed
-       * buffer if available.
+      /* Read directly into the output if it is available (this is set to
+       * a local buffer below if output is NULL).
        */
-#     ifdef PNG_WARNINGS_SUPPORTED
+      if (output != NULL)
+         png_ptr->zstream.next_out = output;
+
+      do
       {
-         png_const_charp msg;
+         uInt avail;
+         Byte local_buffer[PNG_INFLATE_BUF_SIZE];
+
+         /* zlib INPUT BUFFER */
+         /* The setting of 'avail_in' used to be outside the loop; by setting it
+          * inside it is possible to chunk the input to zlib and simply rely on
+          * zlib to advance the 'next_in' pointer.  This allows arbitrary
+          * amounts of data to be passed through zlib at the unavoidable cost of
+          * requiring a window save (memcpy of up to 32768 output bytes)
+          * every ZLIB_IO_MAX input bytes.
+          */
+         avail_in += png_ptr->zstream.avail_in; /* not consumed last time */
 
-         if (png_ptr->zstream.msg != 0)
-            msg = png_ptr->zstream.msg;
+         avail = ZLIB_IO_MAX;
 
-         else switch (ret)
-         {
-            case Z_BUF_ERROR:
-               msg = "Buffer error in compressed datastream";
-               break;
+         if (avail_in < avail)
+            avail = (uInt)avail_in; /* safe: < than ZLIB_IO_MAX */
 
-            case Z_DATA_ERROR:
-               msg = "Data error in compressed datastream";
-               break;
+         avail_in -= avail;
+         png_ptr->zstream.avail_in = avail;
 
-            default:
-               msg = "Incomplete compressed datastream";
-               break;
+         /* zlib OUTPUT BUFFER */
+         avail_out += png_ptr->zstream.avail_out; /* not written last time */
+
+         avail = ZLIB_IO_MAX; /* maximum zlib can process */
+
+         if (output == NULL)
+         {
+            /* Reset the output buffer each time round if output is NULL and
+             * make available the full buffer, up to 'remaining_space'
+             */
+            png_ptr->zstream.next_out = local_buffer;
+            if ((sizeof local_buffer) < avail)
+               avail = (sizeof local_buffer);
          }
 
-         png_chunk_warning(png_ptr, msg);
-      }
-#     endif
+         if (avail_out < avail)
+            avail = (uInt)avail_out; /* safe: < ZLIB_IO_MAX */
+
+         png_ptr->zstream.avail_out = avail;
+         avail_out -= avail;
+
+         /* zlib inflate call */
+         /* In fact 'avail_out' may be 0 at this point, that happens at the end
+          * of the read when the final LZ end code was not passed at the end of
+          * the previous chunk of input data.  Tell zlib if we have reached the
+          * end of the output buffer.
+          */
+         ret = PNG_INFLATE(png_ptr, avail_out > 0 ? Z_NO_FLUSH :
+             (finish ? Z_FINISH : Z_SYNC_FLUSH));
+      } while (ret == Z_OK);
 
-      /* 0 means an error - notice that this code simply ignores
-       * zero length compressed chunks as a result.
+      /* For safety kill the local buffer pointer now */
+      if (output == NULL)
+         png_ptr->zstream.next_out = NULL;
+
+      /* Claw back the 'size' and 'remaining_space' byte counts. */
+      avail_in += png_ptr->zstream.avail_in;
+      avail_out += png_ptr->zstream.avail_out;
+
+      /* Update the input and output sizes; the updated values are the amount
+       * consumed or written, effectively the inverse of what zlib uses.
        */
-      return 0;
+      if (avail_out > 0)
+         *output_size_ptr -= avail_out;
+
+      if (avail_in > 0)
+         *input_size_ptr -= avail_in;
+
+      /* Ensure png_ptr->zstream.msg is set (even in the success case!) */
+      png_zstream_error(png_ptr, ret);
+      return ret;
+   }
+
+   else
+   {
+      /* This is a bad internal error.  The recovery assigns to the zstream msg
+       * pointer, which is not owned by the caller, but this is safe; it's only
+       * used on errors!
+       */
+      png_ptr->zstream.msg = PNGZ_MSG_CAST("zstream unclaimed");
+      return Z_STREAM_ERROR;
    }
 }
 
 /*
- * Decompress trailing data in a chunk.  The assumption is that chunkdata
+ * Decompress trailing data in a chunk.  The assumption is that read_buffer
  * points at an allocated area holding the contents of a chunk with a
  * trailing compressed part.  What we get back is an allocated area
  * holding the original prefix part and an uncompressed version of the
  * trailing part (the malloc area passed in is freed).
  */
-void /* PRIVATE */
-png_decompress_chunk(png_structp png_ptr, int comp_type,
-    png_size_t chunklength,
-    png_size_t prefix_size, png_size_t *newlength)
+static int
+png_decompress_chunk(png_structrp png_ptr,
+   png_uint_32 chunklength, png_uint_32 prefix_size,
+   png_alloc_size_t *newlength /* must be initialized to the maximum! */,
+   int terminate /*add a '\0' to the end of the uncompressed data*/)
 {
-   /* The caller should guarantee this */
-   if (prefix_size > chunklength)
-   {
-      /* The recovery is to delete the chunk. */
-      png_warning(png_ptr, "invalid chunklength");
-      prefix_size = 0; /* To delete everything */
-   }
+   /* TODO: implement different limits for different types of chunk.
+    *
+    * The caller supplies *newlength set to the maximum length of the
+    * uncompressed data, but this routine allocates space for the prefix and
+    * maybe a '\0' terminator too.  We have to assume that 'prefix_size' is
+    * limited only by the maximum chunk size.
+    */
+   png_alloc_size_t limit = PNG_SIZE_MAX;
+
+# ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   if (png_ptr->user_chunk_malloc_max > 0 &&
+       png_ptr->user_chunk_malloc_max < limit)
+      limit = png_ptr->user_chunk_malloc_max;
+# elif PNG_USER_CHUNK_MALLOC_MAX > 0
+   if (PNG_USER_CHUNK_MALLOC_MAX < limit)
+      limit = PNG_USER_CHUNK_MALLOC_MAX;
+# endif
 
-   else if (comp_type == PNG_COMPRESSION_TYPE_BASE)
+   if (limit >= prefix_size + (terminate != 0))
    {
-      png_size_t expanded_size = png_inflate(png_ptr,
-          (png_bytep)(png_ptr->chunkdata + prefix_size),
-          chunklength - prefix_size,
-          0,            /* output */
-          0);           /* output size */
+      int ret;
 
-      /* Now check the limits on this chunk - if the limit fails the
-       * compressed data will be removed, the prefix will remain.
-       */
-      if (prefix_size >= (~(png_size_t)0) - 1 ||
-         expanded_size >= (~(png_size_t)0) - 1 - prefix_size
-#ifdef PNG_USER_LIMITS_SUPPORTED
-         || (png_ptr->user_chunk_malloc_max &&
-          (prefix_size + expanded_size >= png_ptr->user_chunk_malloc_max - 1))
-#else
-         || ((PNG_USER_CHUNK_MALLOC_MAX > 0) &&
-          prefix_size + expanded_size >= PNG_USER_CHUNK_MALLOC_MAX - 1)
-#endif
-         )
-         png_warning(png_ptr, "Exceeded size limit while expanding chunk");
+      limit -= prefix_size + (terminate != 0);
 
-      /* If the size is zero either there was an error and a message
-       * has already been output (warning) or the size really is zero
-       * and we have nothing to do - the code will exit through the
-       * error case below.
-       */
-      else if (expanded_size > 0)
+      if (limit < *newlength)
+         *newlength = limit;
+
+      /* Now try to claim the stream. */
+      ret = png_inflate_claim(png_ptr, png_ptr->chunk_name);
+
+      if (ret == Z_OK)
       {
-         /* Success (maybe) - really uncompress the chunk. */
-         png_size_t new_size = 0;
-         png_charp text = (png_charp)png_malloc_warn(png_ptr,
-             prefix_size + expanded_size + 1);
+         png_uint_32 lzsize = chunklength - prefix_size;
 
-         if (text != NULL)
+         ret = png_inflate(png_ptr, png_ptr->chunk_name, 1/*finish*/,
+            /* input: */ png_ptr->read_buffer + prefix_size, &lzsize,
+            /* output: */ NULL, newlength);
+
+         if (ret == Z_STREAM_END)
          {
-            png_memcpy(text, png_ptr->chunkdata, prefix_size);
-            new_size = png_inflate(png_ptr,
-                (png_bytep)(png_ptr->chunkdata + prefix_size),
-                chunklength - prefix_size,
-                (png_bytep)(text + prefix_size), expanded_size);
-            text[prefix_size + expanded_size] = 0; /* just in case */
-
-            if (new_size == expanded_size)
+            /* Use 'inflateReset' here, not 'inflateReset2' because this
+             * preserves the previously decided window size (otherwise it would
+             * be necessary to store the previous window size.)  In practice
+             * this doesn't matter anyway, because png_inflate will call inflate
+             * with Z_FINISH in almost all cases, so the window will not be
+             * maintained.
+             */
+            if (inflateReset(&png_ptr->zstream) == Z_OK)
             {
-               png_free(png_ptr, png_ptr->chunkdata);
-               png_ptr->chunkdata = text;
-               *newlength = prefix_size + expanded_size;
-               return; /* The success return! */
+               /* Because of the limit checks above we know that the new,
+                * expanded, size will fit in a size_t (let alone an
+                * png_alloc_size_t).  Use png_malloc_base here to avoid an
+                * extra OOM message.
+                */
+               png_alloc_size_t new_size = *newlength;
+               png_alloc_size_t buffer_size = prefix_size + new_size +
+                  (terminate != 0);
+               png_bytep text = png_voidcast(png_bytep, png_malloc_base(png_ptr,
+                  buffer_size));
+
+               if (text != NULL)
+               {
+                  ret = png_inflate(png_ptr, png_ptr->chunk_name, 1/*finish*/,
+                     png_ptr->read_buffer + prefix_size, &lzsize,
+                     text + prefix_size, newlength);
+
+                  if (ret == Z_STREAM_END)
+                  {
+                     if (new_size == *newlength)
+                     {
+                        if (terminate != 0)
+                           text[prefix_size + *newlength] = 0;
+
+                        if (prefix_size > 0)
+                           memcpy(text, png_ptr->read_buffer, prefix_size);
+
+                        {
+                           png_bytep old_ptr = png_ptr->read_buffer;
+
+                           png_ptr->read_buffer = text;
+                           png_ptr->read_buffer_size = buffer_size;
+                           text = old_ptr; /* freed below */
+                        }
+                     }
+
+                     else
+                     {
+                        /* The size changed on the second read, there can be no
+                         * guarantee that anything is correct at this point.
+                         * The 'msg' pointer has been set to "unexpected end of
+                         * LZ stream", which is fine, but return an error code
+                         * that the caller won't accept.
+                         */
+                        ret = PNG_UNEXPECTED_ZLIB_RETURN;
+                     }
+                  }
+
+                  else if (ret == Z_OK)
+                     ret = PNG_UNEXPECTED_ZLIB_RETURN; /* for safety */
+
+                  /* Free the text pointer (this is the old read_buffer on
+                   * success)
+                   */
+                  png_free(png_ptr, text);
+
+                  /* This really is very benign, but it's still an error because
+                   * the extra space may otherwise be used as a Trojan Horse.
+                   */
+                  if (ret == Z_STREAM_END &&
+                     chunklength - prefix_size != lzsize)
+                     png_chunk_benign_error(png_ptr, "extra compressed data");
+               }
+
+               else
+               {
+                  /* Out of memory allocating the buffer */
+                  ret = Z_MEM_ERROR;
+                  png_zstream_error(png_ptr, Z_MEM_ERROR);
+               }
             }
 
-            png_warning(png_ptr, "png_inflate logic error");
-            png_free(png_ptr, text);
+            else
+            {
+               /* inflateReset failed, store the error message */
+               png_zstream_error(png_ptr, ret);
+
+               if (ret == Z_STREAM_END)
+                  ret = PNG_UNEXPECTED_ZLIB_RETURN;
+            }
          }
 
-         else
-            png_warning(png_ptr, "Not enough memory to decompress chunk");
+         else if (ret == Z_OK)
+            ret = PNG_UNEXPECTED_ZLIB_RETURN;
+
+         /* Release the claimed stream */
+         png_ptr->zowner = 0;
       }
+
+      else /* the claim failed */ if (ret == Z_STREAM_END) /* impossible! */
+         ret = PNG_UNEXPECTED_ZLIB_RETURN;
+
+      return ret;
    }
 
-   else /* if (comp_type != PNG_COMPRESSION_TYPE_BASE) */
+   else
    {
-      PNG_WARNING_PARAMETERS(p)
-      png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_d, comp_type);
-      png_formatted_warning(png_ptr, p, "Unknown compression type @1");
-
-      /* The recovery is to simply drop the data. */
+      /* Application/configuration limits exceeded */
+      png_zstream_error(png_ptr, Z_MEM_ERROR);
+      return Z_MEM_ERROR;
    }
+}
+#endif /* READ_COMPRESSED_TEXT */
 
-   /* Generic error return - leave the prefix, delete the compressed
-    * data, reallocate the chunkdata to remove the potentially large
-    * amount of compressed data.
-    */
+#ifdef PNG_READ_iCCP_SUPPORTED
+/* Perform a partial read and decompress, producing 'avail_out' bytes and
+ * reading from the current chunk as required.
+ */
+static int
+png_inflate_read(png_structrp png_ptr, png_bytep read_buffer, uInt read_size,
+   png_uint_32p chunk_bytes, png_bytep next_out, png_alloc_size_t *out_size,
+   int finish)
+{
+   if (png_ptr->zowner == png_ptr->chunk_name)
    {
-      png_charp text = (png_charp)png_malloc_warn(png_ptr, prefix_size + 1);
+      int ret;
 
-      if (text != NULL)
+      /* next_in and avail_in must have been initialized by the caller. */
+      png_ptr->zstream.next_out = next_out;
+      png_ptr->zstream.avail_out = 0; /* set in the loop */
+
+      do
       {
-         if (prefix_size > 0)
-            png_memcpy(text, png_ptr->chunkdata, prefix_size);
+         if (png_ptr->zstream.avail_in == 0)
+         {
+            if (read_size > *chunk_bytes)
+               read_size = (uInt)*chunk_bytes;
+            *chunk_bytes -= read_size;
 
-         png_free(png_ptr, png_ptr->chunkdata);
-         png_ptr->chunkdata = text;
+            if (read_size > 0)
+               png_crc_read(png_ptr, read_buffer, read_size);
 
-         /* This is an extra zero in the 'uncompressed' part. */
-         *(png_ptr->chunkdata + prefix_size) = 0x00;
+            png_ptr->zstream.next_in = read_buffer;
+            png_ptr->zstream.avail_in = read_size;
+         }
+
+         if (png_ptr->zstream.avail_out == 0)
+         {
+            uInt avail = ZLIB_IO_MAX;
+            if (avail > *out_size)
+               avail = (uInt)*out_size;
+            *out_size -= avail;
+
+            png_ptr->zstream.avail_out = avail;
+         }
+
+         /* Use Z_SYNC_FLUSH when there is no more chunk data to ensure that all
+          * the available output is produced; this allows reading of truncated
+          * streams.
+          */
+         ret = PNG_INFLATE(png_ptr,
+            *chunk_bytes > 0 ? Z_NO_FLUSH : (finish ? Z_FINISH : Z_SYNC_FLUSH));
       }
-      /* Ignore a malloc error here - it is safe. */
+      while (ret == Z_OK && (*out_size > 0 || png_ptr->zstream.avail_out > 0));
+
+      *out_size += png_ptr->zstream.avail_out;
+      png_ptr->zstream.avail_out = 0; /* Should not be required, but is safe */
+
+      /* Ensure the error message pointer is always set: */
+      png_zstream_error(png_ptr, ret);
+      return ret;
    }
 
-   *newlength = prefix_size;
+   else
+   {
+      png_ptr->zstream.msg = PNGZ_MSG_CAST("zstream unclaimed");
+      return Z_STREAM_ERROR;
+   }
 }
-#endif /* PNG_READ_COMPRESSED_TEXT_SUPPORTED */
+#endif
 
 /* Read and check the IDHR chunk */
+
 void /* PRIVATE */
-png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+png_handle_IHDR(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_byte buf[13];
    png_uint_32 width, height;
@@ -542,12 +835,12 @@ png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_IHDR");
 
-   if (png_ptr->mode & PNG_HAVE_IHDR)
-      png_error(png_ptr, "Out of place IHDR");
+   if ((png_ptr->mode & PNG_HAVE_IHDR) != 0)
+      png_chunk_error(png_ptr, "out of place");
 
    /* Check the length */
    if (length != 13)
-      png_error(png_ptr, "Invalid IHDR chunk");
+      png_chunk_error(png_ptr, "invalid");
 
    png_ptr->mode |= PNG_HAVE_IHDR;
 
@@ -596,8 +889,7 @@ png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    }
 
    /* Set up other useful info */
-   png_ptr->pixel_depth = (png_byte)(png_ptr->bit_depth *
-   png_ptr->channels);
+   png_ptr->pixel_depth = (png_byte)(png_ptr->bit_depth * png_ptr->channels);
    png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->width);
    png_debug1(3, "bit_depth = %d", png_ptr->bit_depth);
    png_debug1(3, "channels = %d", png_ptr->channels);
@@ -608,7 +900,7 @@ png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
 /* Read and check the palette */
 void /* PRIVATE */
-png_handle_PLTE(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_color palette[PNG_MAX_PALETTE_LENGTH];
    int max_palette_length, num, i;
@@ -618,26 +910,33 @@ png_handle_PLTE(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_PLTE");
 
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before PLTE");
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR");
+
+   /* Moved to before the 'after IDAT' check below because otherwise duplicate
+    * PLTE chunks are potentially ignored (the spec says there shall not be more
+    * than one PLTE, the error is not treated as benign, so this check trumps
+    * the requirement that PLTE appears before IDAT.)
+    */
+   else if ((png_ptr->mode & PNG_HAVE_PLTE) != 0)
+      png_chunk_error(png_ptr, "duplicate");
 
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
    {
-      png_warning(png_ptr, "Invalid PLTE after IDAT");
+      /* This is benign because the non-benign error happened before, when an
+       * IDAT was encountered in a color-mapped image with no PLTE.
+       */
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "out of place");
       return;
    }
 
-   else if (png_ptr->mode & PNG_HAVE_PLTE)
-      png_error(png_ptr, "Duplicate PLTE chunk");
-
    png_ptr->mode |= PNG_HAVE_PLTE;
 
-   if (!(png_ptr->color_type&PNG_COLOR_MASK_COLOR))
+   if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
    {
-      png_warning(png_ptr,
-          "Ignoring PLTE chunk in grayscale PNG");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "ignored in grayscale PNG");
       return;
    }
 
@@ -651,17 +950,15 @@ png_handle_PLTE(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
    if (length > 3*PNG_MAX_PALETTE_LENGTH || length % 3)
    {
+      png_crc_finish(png_ptr, length);
+
       if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
-      {
-         png_warning(png_ptr, "Invalid palette chunk");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
+         png_chunk_benign_error(png_ptr, "invalid");
 
       else
-      {
-         png_error(png_ptr, "Invalid palette chunk");
-      }
+         png_chunk_error(png_ptr, "invalid");
+
+      return;
    }
 
    /* The cast is safe because 'length' is less than 3*PNG_MAX_PALETTE_LENGTH */
@@ -716,214 +1013,198 @@ png_handle_PLTE(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    }
 
 #ifndef PNG_READ_OPT_PLTE_SUPPORTED
-   else if (png_crc_error(png_ptr))  /* Only if we have a CRC error */
+   else if (png_crc_error(png_ptr) != 0)  /* Only if we have a CRC error */
    {
       /* If we don't want to use the data from an ancillary chunk,
        * we have two options: an error abort, or a warning and we
        * ignore the data in this chunk (which should be OK, since
        * it's considered ancillary for a RGB or RGBA image).
+       *
+       * IMPLEMENTATION NOTE: this is only here because png_crc_finish uses the
+       * chunk type to determine whether to check the ancillary or the critical
+       * flags.
        */
-      if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE))
+      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE) == 0)
       {
-         if (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)
-         {
-            png_chunk_benign_error(png_ptr, "CRC error");
-         }
+         if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) != 0)
+            return;
 
          else
-         {
-            png_chunk_warning(png_ptr, "CRC error");
-            return;
-         }
+            png_chunk_error(png_ptr, "CRC error");
       }
 
       /* Otherwise, we (optionally) emit a warning and use the chunk. */
-      else if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN))
-      {
+      else if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) == 0)
          png_chunk_warning(png_ptr, "CRC error");
-      }
    }
 #endif
 
+   /* TODO: png_set_PLTE has the side effect of setting png_ptr->palette to its
+    * own copy of the palette.  This has the side effect that when png_start_row
+    * is called (this happens after any call to png_read_update_info) the
+    * info_ptr palette gets changed.  This is extremely unexpected and
+    * confusing.
+    *
+    * Fix this by not sharing the palette in this way.
+    */
    png_set_PLTE(png_ptr, info_ptr, palette, num);
 
+   /* The three chunks, bKGD, hIST and tRNS *must* appear after PLTE and before
+    * IDAT.  Prior to 1.6.0 this was not checked; instead the code merely
+    * checked the apparent validity of a tRNS chunk inserted before PLTE on a
+    * palette PNG.  1.6.0 attempts to rigorously follow the standard and
+    * therefore does a benign error if the erroneous condition is detected *and*
+    * cancels the tRNS if the benign error returns.  The alternative is to
+    * amend the standard since it would be rather hypocritical of the standards
+    * maintainers to ignore it.
+    */
 #ifdef PNG_READ_tRNS_SUPPORTED
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+   if (png_ptr->num_trans > 0 ||
+       (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS) != 0))
    {
-      if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
-      {
-         if (png_ptr->num_trans > (png_uint_16)num)
-         {
-            png_warning(png_ptr, "Truncating incorrect tRNS chunk length");
-            png_ptr->num_trans = (png_uint_16)num;
-         }
+      /* Cancel this because otherwise it would be used if the transforms
+       * require it.  Don't cancel the 'valid' flag because this would prevent
+       * detection of duplicate chunks.
+       */
+      png_ptr->num_trans = 0;
 
-         if (info_ptr->num_trans > (png_uint_16)num)
-         {
-            png_warning(png_ptr, "Truncating incorrect info tRNS chunk length");
-            info_ptr->num_trans = (png_uint_16)num;
-         }
-      }
+      if (info_ptr != NULL)
+         info_ptr->num_trans = 0;
+
+      png_chunk_benign_error(png_ptr, "tRNS must be after");
    }
 #endif
 
+#ifdef PNG_READ_hIST_SUPPORTED
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST) != 0)
+      png_chunk_benign_error(png_ptr, "hIST must be after");
+#endif
+
+#ifdef PNG_READ_bKGD_SUPPORTED
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD) != 0)
+      png_chunk_benign_error(png_ptr, "bKGD must be after");
+#endif
 }
 
 void /* PRIVATE */
-png_handle_IEND(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+png_handle_IEND(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_debug(1, "in png_handle_IEND");
 
-   if (!(png_ptr->mode & PNG_HAVE_IHDR) || !(png_ptr->mode & PNG_HAVE_IDAT))
-   {
-      png_error(png_ptr, "No image in file");
-   }
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0 ||
+       (png_ptr->mode & PNG_HAVE_IDAT) == 0)
+      png_chunk_error(png_ptr, "out of place");
 
    png_ptr->mode |= (PNG_AFTER_IDAT | PNG_HAVE_IEND);
 
-   if (length != 0)
-   {
-      png_warning(png_ptr, "Incorrect IEND chunk length");
-   }
-
    png_crc_finish(png_ptr, length);
 
-   PNG_UNUSED(info_ptr) /* Quiet compiler warnings about unused info_ptr */
+   if (length != 0)
+      png_chunk_benign_error(png_ptr, "invalid");
+
+   PNG_UNUSED(info_ptr)
 }
 
 #ifdef PNG_READ_gAMA_SUPPORTED
 void /* PRIVATE */
-png_handle_gAMA(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+png_handle_gAMA(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_fixed_point igamma;
    png_byte buf[4];
 
    png_debug(1, "in png_handle_gAMA");
 
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before gAMA");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid gAMA after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (png_ptr->mode & PNG_HAVE_PLTE)
-      /* Should be an error, but we can cope with it */
-      png_warning(png_ptr, "Out of place gAMA chunk");
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR");
 
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
-#ifdef PNG_READ_sRGB_SUPPORTED
-       && !(info_ptr->valid & PNG_INFO_sRGB)
-#endif
-       )
+   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
    {
-      png_warning(png_ptr, "Duplicate gAMA chunk");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "out of place");
       return;
    }
 
    if (length != 4)
    {
-      png_warning(png_ptr, "Incorrect gAMA chunk length");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "invalid");
       return;
    }
 
    png_crc_read(png_ptr, buf, 4);
 
-   if (png_crc_finish(png_ptr, 0))
+   if (png_crc_finish(png_ptr, 0) != 0)
       return;
 
    igamma = png_get_fixed_point(NULL, buf);
 
-   /* Check for zero gamma or an error. */
-   if (igamma <= 0)
-   {
-      png_warning(png_ptr,
-          "Ignoring gAMA chunk with out of range gamma");
-
-      return;
-   }
-
-#  ifdef PNG_READ_sRGB_SUPPORTED
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
-   {
-      if (PNG_OUT_OF_RANGE(igamma, 45500, 500))
-      {
-         PNG_WARNING_PARAMETERS(p)
-         png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_fixed, igamma);
-         png_formatted_warning(png_ptr, p,
-             "Ignoring incorrect gAMA value @1 when sRGB is also present");
-         return;
-      }
-   }
-#  endif /* PNG_READ_sRGB_SUPPORTED */
-
-#  ifdef PNG_READ_GAMMA_SUPPORTED
-   /* Gamma correction on read is supported. */
-   png_ptr->gamma = igamma;
-#  endif
-   /* And set the 'info' structure members. */
-   png_set_gAMA_fixed(png_ptr, info_ptr, igamma);
+   png_colorspace_set_gamma(png_ptr, &png_ptr->colorspace, igamma);
+   png_colorspace_sync(png_ptr, info_ptr);
 }
 #endif
 
 #ifdef PNG_READ_sBIT_SUPPORTED
 void /* PRIVATE */
-png_handle_sBIT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
-   png_size_t truelen;
+   unsigned int truelen, i;
+   png_byte sample_depth;
    png_byte buf[4];
 
    png_debug(1, "in png_handle_sBIT");
 
-   buf[0] = buf[1] = buf[2] = buf[3] = 0;
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR");
 
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before sBIT");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
    {
-      png_warning(png_ptr, "Invalid sBIT after IDAT");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "out of place");
       return;
    }
 
-   else if (png_ptr->mode & PNG_HAVE_PLTE)
-   {
-      /* Should be an error, but we can cope with it */
-      png_warning(png_ptr, "Out of place sBIT chunk");
-   }
-
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT))
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT) != 0)
    {
-      png_warning(png_ptr, "Duplicate sBIT chunk");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "duplicate");
       return;
    }
 
    if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
       truelen = 3;
+      sample_depth = 8;
+   }
 
    else
-      truelen = (png_size_t)png_ptr->channels;
+   {
+      truelen = png_ptr->channels;
+      sample_depth = png_ptr->bit_depth;
+   }
 
    if (length != truelen || length > 4)
    {
-      png_warning(png_ptr, "Incorrect sBIT chunk length");
+      png_chunk_benign_error(png_ptr, "invalid");
       png_crc_finish(png_ptr, length);
       return;
    }
 
+   buf[0] = buf[1] = buf[2] = buf[3] = sample_depth;
    png_crc_read(png_ptr, buf, truelen);
 
-   if (png_crc_finish(png_ptr, 0))
+   if (png_crc_finish(png_ptr, 0) != 0)
       return;
 
-   if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+   for (i=0; i<truelen; ++i)
+   {
+      if (buf[i] == 0 || buf[i] > sample_depth)
+      {
+         png_chunk_benign_error(png_ptr, "invalid");
+         return;
+      }
+   }
+
+   if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
    {
       png_ptr->sig_bit.red = buf[0];
       png_ptr->sig_bit.green = buf[1];
@@ -946,474 +1227,418 @@ png_handle_sBIT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
 #ifdef PNG_READ_cHRM_SUPPORTED
 void /* PRIVATE */
-png_handle_cHRM(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+png_handle_cHRM(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_byte buf[32];
-   png_fixed_point x_white, y_white, x_red, y_red, x_green, y_green, x_blue,
-      y_blue;
+   png_xy xy;
 
    png_debug(1, "in png_handle_cHRM");
 
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before cHRM");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid cHRM after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (png_ptr->mode & PNG_HAVE_PLTE)
-      /* Should be an error, but we can cope with it */
-      png_warning(png_ptr, "Out of place cHRM chunk");
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR");
 
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM)
-#  ifdef PNG_READ_sRGB_SUPPORTED
-       && !(info_ptr->valid & PNG_INFO_sRGB)
-#  endif
-      )
+   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
    {
-      png_warning(png_ptr, "Duplicate cHRM chunk");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "out of place");
       return;
    }
 
    if (length != 32)
    {
-      png_warning(png_ptr, "Incorrect cHRM chunk length");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "invalid");
       return;
    }
 
    png_crc_read(png_ptr, buf, 32);
 
-   if (png_crc_finish(png_ptr, 0))
+   if (png_crc_finish(png_ptr, 0) != 0)
       return;
 
-   x_white = png_get_fixed_point(NULL, buf);
-   y_white = png_get_fixed_point(NULL, buf + 4);
-   x_red   = png_get_fixed_point(NULL, buf + 8);
-   y_red   = png_get_fixed_point(NULL, buf + 12);
-   x_green = png_get_fixed_point(NULL, buf + 16);
-   y_green = png_get_fixed_point(NULL, buf + 20);
-   x_blue  = png_get_fixed_point(NULL, buf + 24);
-   y_blue  = png_get_fixed_point(NULL, buf + 28);
-
-   if (x_white == PNG_FIXED_ERROR ||
-       y_white == PNG_FIXED_ERROR ||
-       x_red   == PNG_FIXED_ERROR ||
-       y_red   == PNG_FIXED_ERROR ||
-       x_green == PNG_FIXED_ERROR ||
-       y_green == PNG_FIXED_ERROR ||
-       x_blue  == PNG_FIXED_ERROR ||
-       y_blue  == PNG_FIXED_ERROR)
-   {
-      png_warning(png_ptr, "Ignoring cHRM chunk with negative chromaticities");
+   xy.whitex = png_get_fixed_point(NULL, buf);
+   xy.whitey = png_get_fixed_point(NULL, buf + 4);
+   xy.redx   = png_get_fixed_point(NULL, buf + 8);
+   xy.redy   = png_get_fixed_point(NULL, buf + 12);
+   xy.greenx = png_get_fixed_point(NULL, buf + 16);
+   xy.greeny = png_get_fixed_point(NULL, buf + 20);
+   xy.bluex  = png_get_fixed_point(NULL, buf + 24);
+   xy.bluey  = png_get_fixed_point(NULL, buf + 28);
+
+   if (xy.whitex == PNG_FIXED_ERROR ||
+       xy.whitey == PNG_FIXED_ERROR ||
+       xy.redx   == PNG_FIXED_ERROR ||
+       xy.redy   == PNG_FIXED_ERROR ||
+       xy.greenx == PNG_FIXED_ERROR ||
+       xy.greeny == PNG_FIXED_ERROR ||
+       xy.bluex  == PNG_FIXED_ERROR ||
+       xy.bluey  == PNG_FIXED_ERROR)
+   {
+      png_chunk_benign_error(png_ptr, "invalid values");
       return;
    }
 
-#ifdef PNG_READ_sRGB_SUPPORTED
-   if ((info_ptr != NULL) && (info_ptr->valid & PNG_INFO_sRGB))
-   {
-      if (PNG_OUT_OF_RANGE(x_white, 31270,  1000) ||
-          PNG_OUT_OF_RANGE(y_white, 32900,  1000) ||
-          PNG_OUT_OF_RANGE(x_red,   64000,  1000) ||
-          PNG_OUT_OF_RANGE(y_red,   33000,  1000) ||
-          PNG_OUT_OF_RANGE(x_green, 30000,  1000) ||
-          PNG_OUT_OF_RANGE(y_green, 60000,  1000) ||
-          PNG_OUT_OF_RANGE(x_blue,  15000,  1000) ||
-          PNG_OUT_OF_RANGE(y_blue,   6000,  1000))
-      {
-         PNG_WARNING_PARAMETERS(p)
-
-         png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_fixed, x_white);
-         png_warning_parameter_signed(p, 2, PNG_NUMBER_FORMAT_fixed, y_white);
-         png_warning_parameter_signed(p, 3, PNG_NUMBER_FORMAT_fixed, x_red);
-         png_warning_parameter_signed(p, 4, PNG_NUMBER_FORMAT_fixed, y_red);
-         png_warning_parameter_signed(p, 5, PNG_NUMBER_FORMAT_fixed, x_green);
-         png_warning_parameter_signed(p, 6, PNG_NUMBER_FORMAT_fixed, y_green);
-         png_warning_parameter_signed(p, 7, PNG_NUMBER_FORMAT_fixed, x_blue);
-         png_warning_parameter_signed(p, 8, PNG_NUMBER_FORMAT_fixed, y_blue);
-
-         png_formatted_warning(png_ptr, p,
-             "Ignoring incorrect cHRM white(@1,@2) r(@3,@4)g(@5,@6)b(@7,@8) "
-             "when sRGB is also present");
-      }
+   /* If a colorspace error has already been output skip this chunk */
+   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
       return;
-   }
-#endif /* PNG_READ_sRGB_SUPPORTED */
 
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-   /* Store the _white values as default coefficients for the rgb to gray
-    * operation if it is supported.  Check if the transform is already set to
-    * avoid destroying the transform values.
-    */
-   if (!png_ptr->rgb_to_gray_coefficients_set)
+   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM) != 0)
    {
-      /* png_set_background has not been called and we haven't seen an sRGB
-       * chunk yet.  Find the XYZ of the three end points.
-       */
-      png_XYZ XYZ;
-      png_xy xy;
-
-      xy.redx = x_red;
-      xy.redy = y_red;
-      xy.greenx = x_green;
-      xy.greeny = y_green;
-      xy.bluex = x_blue;
-      xy.bluey = y_blue;
-      xy.whitex = x_white;
-      xy.whitey = y_white;
-
-      if (png_XYZ_from_xy_checked(png_ptr, &XYZ, xy))
-      {
-         /* The success case, because XYZ_from_xy normalises to a reference
-          * white Y of 1.0 we just need to scale the numbers.  This should
-          * always work just fine. It is an internal error if this overflows.
-          */
-         {
-            png_fixed_point r, g, b;
-            if (png_muldiv(&r, XYZ.redY, 32768, PNG_FP_1) &&
-               r >= 0 && r <= 32768 &&
-               png_muldiv(&g, XYZ.greenY, 32768, PNG_FP_1) &&
-               g >= 0 && g <= 32768 &&
-               png_muldiv(&b, XYZ.blueY, 32768, PNG_FP_1) &&
-               b >= 0 && b <= 32768 &&
-               r+g+b <= 32769)
-            {
-               /* We allow 0 coefficients here.  r+g+b may be 32769 if two or
-                * all of the coefficients were rounded up.  Handle this by
-                * reducing the *largest* coefficient by 1; this matches the
-                * approach used for the default coefficients in pngrtran.c
-                */
-               int add = 0;
-
-               if (r+g+b > 32768)
-                  add = -1;
-               else if (r+g+b < 32768)
-                  add = 1;
-
-               if (add != 0)
-               {
-                  if (g >= r && g >= b)
-                     g += add;
-                  else if (r >= g && r >= b)
-                     r += add;
-                  else
-                     b += add;
-               }
-
-               /* Check for an internal error. */
-               if (r+g+b != 32768)
-                  png_error(png_ptr,
-                     "internal error handling cHRM coefficients");
-
-               png_ptr->rgb_to_gray_red_coeff   = (png_uint_16)r;
-               png_ptr->rgb_to_gray_green_coeff = (png_uint_16)g;
-            }
-
-            /* This is a png_error at present even though it could be ignored -
-             * it should never happen, but it is important that if it does, the
-             * bug is fixed.
-             */
-            else
-               png_error(png_ptr, "internal error handling cHRM->XYZ");
-         }
-      }
+      png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;
+      png_colorspace_sync(png_ptr, info_ptr);
+      png_chunk_benign_error(png_ptr, "duplicate");
+      return;
    }
-#endif
 
-   png_set_cHRM_fixed(png_ptr, info_ptr, x_white, y_white, x_red, y_red,
-      x_green, y_green, x_blue, y_blue);
+   png_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
+   (void)png_colorspace_set_chromaticities(png_ptr, &png_ptr->colorspace, &xy,
+      1/*prefer cHRM values*/);
+   png_colorspace_sync(png_ptr, info_ptr);
 }
 #endif
 
 #ifdef PNG_READ_sRGB_SUPPORTED
 void /* PRIVATE */
-png_handle_sRGB(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+png_handle_sRGB(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
-   int intent;
-   png_byte buf[1];
+   png_byte intent;
 
    png_debug(1, "in png_handle_sRGB");
 
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before sRGB");
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR");
 
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
    {
-      png_warning(png_ptr, "Invalid sRGB after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (png_ptr->mode & PNG_HAVE_PLTE)
-      /* Should be an error, but we can cope with it */
-      png_warning(png_ptr, "Out of place sRGB chunk");
-
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
-   {
-      png_warning(png_ptr, "Duplicate sRGB chunk");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "out of place");
       return;
    }
 
    if (length != 1)
    {
-      png_warning(png_ptr, "Incorrect sRGB chunk length");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "invalid");
       return;
    }
 
-   png_crc_read(png_ptr, buf, 1);
+   png_crc_read(png_ptr, &intent, 1);
 
-   if (png_crc_finish(png_ptr, 0))
+   if (png_crc_finish(png_ptr, 0) != 0)
       return;
 
-   intent = buf[0];
-
-   /* Check for bad intent */
-   if (intent >= PNG_sRGB_INTENT_LAST)
-   {
-      png_warning(png_ptr, "Unknown sRGB intent");
+   /* If a colorspace error has already been output skip this chunk */
+   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
       return;
-   }
 
-#if defined(PNG_READ_gAMA_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED)
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA))
+   /* Only one sRGB or iCCP chunk is allowed, use the HAVE_INTENT flag to detect
+    * this.
+    */
+   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_INTENT) != 0)
    {
-      if (PNG_OUT_OF_RANGE(info_ptr->gamma, 45500, 500))
-      {
-         PNG_WARNING_PARAMETERS(p)
-
-         png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_fixed,
-            info_ptr->gamma);
-
-         png_formatted_warning(png_ptr, p,
-             "Ignoring incorrect gAMA value @1 when sRGB is also present");
-      }
+      png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;
+      png_colorspace_sync(png_ptr, info_ptr);
+      png_chunk_benign_error(png_ptr, "too many profiles");
+      return;
    }
-#endif /* PNG_READ_gAMA_SUPPORTED */
 
-#ifdef PNG_READ_cHRM_SUPPORTED
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
-      if (PNG_OUT_OF_RANGE(info_ptr->x_white, 31270,  1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->y_white, 32900,  1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->x_red,   64000,  1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->y_red,   33000,  1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->x_green, 30000,  1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->y_green, 60000,  1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->x_blue,  15000,  1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->y_blue,   6000,  1000))
-      {
-         png_warning(png_ptr,
-             "Ignoring incorrect cHRM value when sRGB is also present");
-      }
-#endif /* PNG_READ_cHRM_SUPPORTED */
-
-   /* This is recorded for use when handling the cHRM chunk above.  An sRGB
-    * chunk unconditionally overwrites the coefficients for grayscale conversion
-    * too.
-    */
-   png_ptr->is_sRGB = 1;
-
-#  ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-      /* Don't overwrite user supplied values: */
-      if (!png_ptr->rgb_to_gray_coefficients_set)
-      {
-         /* These numbers come from the sRGB specification (or, since one has to
-          * pay much money to get a copy, the wikipedia sRGB page) the
-          * chromaticity values quoted have been inverted to get the reverse
-          * transformation from RGB to XYZ and the 'Y' coefficients scaled by
-          * 32768 (then rounded).
-          *
-          * sRGB and ITU Rec-709 both truncate the values for the D65 white
-          * point to four digits and, even though it actually stores five
-          * digits, the PNG spec gives the truncated value.
-          *
-          * This means that when the chromaticities are converted back to XYZ
-          * end points we end up with (6968,23435,2366), which, as described in
-          * pngrtran.c, would overflow.  If the five digit precision and up is
-          * used we get, instead:
-          *
-          *    6968*R + 23435*G + 2365*B
-          *
-          * (Notice that this rounds the blue coefficient down, rather than the
-          * choice used in pngrtran.c which is to round the green one down.)
-          */
-         png_ptr->rgb_to_gray_red_coeff   =  6968; /* 0.212639005871510 */
-         png_ptr->rgb_to_gray_green_coeff = 23434; /* 0.715168678767756 */
-         /* png_ptr->rgb_to_gray_blue_coeff  =  2366; 0.072192315360734	*/
-
-         /* The following keeps the cHRM chunk from destroying the
-          * coefficients again in the event that it follows the sRGB chunk.
-          */
-         png_ptr->rgb_to_gray_coefficients_set = 1;
-      }
-#  endif
-
-   png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, intent);
+   (void)png_colorspace_set_sRGB(png_ptr, &png_ptr->colorspace, intent);
+   png_colorspace_sync(png_ptr, info_ptr);
 }
-#endif /* PNG_READ_sRGB_SUPPORTED */
+#endif /* READ_sRGB */
 
 #ifdef PNG_READ_iCCP_SUPPORTED
 void /* PRIVATE */
-png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-/* Note: this does not properly handle chunks that are > 64K under DOS */
+png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
+/* Note: this does not properly handle profiles that are > 64K under DOS */
 {
-   png_byte compression_type;
-   png_bytep pC;
-   png_charp profile;
-   png_uint_32 skip = 0;
-   png_uint_32 profile_size;
-   png_alloc_size_t profile_length;
-   png_size_t slength, prefix_length, data_length;
+   png_const_charp errmsg = NULL; /* error message output, or no error */
+   int finished = 0; /* crc checked */
 
    png_debug(1, "in png_handle_iCCP");
 
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before iCCP");
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR");
 
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
    {
-      png_warning(png_ptr, "Invalid iCCP after IDAT");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "out of place");
       return;
    }
 
-   else if (png_ptr->mode & PNG_HAVE_PLTE)
-      /* Should be an error, but we can cope with it */
-      png_warning(png_ptr, "Out of place iCCP chunk");
-
-   if ((png_ptr->mode & PNG_HAVE_iCCP) || (info_ptr != NULL &&
-      (info_ptr->valid & (PNG_INFO_iCCP|PNG_INFO_sRGB))))
+   /* Consistent with all the above colorspace handling an obviously *invalid*
+    * chunk is just ignored, so does not invalidate the color space.  An
+    * alternative is to set the 'invalid' flags at the start of this routine
+    * and only clear them in they were not set before and all the tests pass.
+    * The minimum 'deflate' stream is assumed to be just the 2 byte header and
+    * 4 byte checksum.  The keyword must be at least one character and there is
+    * a terminator (0) byte and the compression method.
+    */
+   if (length < 9)
    {
-      png_warning(png_ptr, "Duplicate iCCP chunk");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "too short");
       return;
    }
 
-   png_ptr->mode |= PNG_HAVE_iCCP;
-
-#ifdef PNG_MAX_MALLOC_64K
-   if (length > (png_uint_32)65535L)
+   /* If a colorspace error has already been output skip this chunk */
+   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
    {
-      png_warning(png_ptr, "iCCP chunk too large to fit in memory");
-      skip = length - (png_uint_32)65535L;
-      length = (png_uint_32)65535L;
+      png_crc_finish(png_ptr, length);
+      return;
    }
-#endif
 
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = (png_charp)png_malloc(png_ptr, length + 1);
-   slength = length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
-
-   if (png_crc_finish(png_ptr, skip))
+   /* Only one sRGB or iCCP chunk is allowed, use the HAVE_INTENT flag to detect
+    * this.
+    */
+   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_INTENT) == 0)
    {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
+      uInt read_length, keyword_length;
+      char keyword[81];
 
-   png_ptr->chunkdata[slength] = 0x00;
+      /* Find the keyword; the keyword plus separator and compression method
+       * bytes can be at most 81 characters long.
+       */
+      read_length = 81; /* maximum */
+      if (read_length > length)
+         read_length = (uInt)length;
 
-   for (profile = png_ptr->chunkdata; *profile; profile++)
-      /* Empty loop to find end of name */ ;
+      png_crc_read(png_ptr, (png_bytep)keyword, read_length);
+      length -= read_length;
 
-   ++profile;
+      keyword_length = 0;
+      while (keyword_length < 80 && keyword_length < read_length &&
+         keyword[keyword_length] != 0)
+         ++keyword_length;
 
-   /* There should be at least one zero (the compression type byte)
-    * following the separator, and we should be on it
-    */
-   if (slength < 1U || profile >= png_ptr->chunkdata + slength - 1U)
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      png_warning(png_ptr, "Malformed iCCP chunk");
-      return;
-   }
+      /* TODO: make the keyword checking common */
+      if (keyword_length >= 1 && keyword_length <= 79)
+      {
+         /* We only understand '0' compression - deflate - so if we get a
+          * different value we can't safely decode the chunk.
+          */
+         if (keyword_length+1 < read_length &&
+            keyword[keyword_length+1] == PNG_COMPRESSION_TYPE_BASE)
+         {
+            read_length -= keyword_length+2;
 
-   /* Compression_type should always be zero */
-   compression_type = *profile++;
+            if (png_inflate_claim(png_ptr, png_iCCP) == Z_OK)
+            {
+               Byte profile_header[132];
+               Byte local_buffer[PNG_INFLATE_BUF_SIZE];
+               png_alloc_size_t size = (sizeof profile_header);
 
-   if (compression_type != 0)
-   {
-      png_warning(png_ptr, "Ignoring nonzero compression type in iCCP chunk");
-      compression_type = 0x00;  /* Reset it to zero (libpng-1.0.6 through 1.0.8
-                                 wrote nonzero) */
-   }
+               png_ptr->zstream.next_in = (Bytef*)keyword + (keyword_length+2);
+               png_ptr->zstream.avail_in = read_length;
+               (void)png_inflate_read(png_ptr, local_buffer,
+                  (sizeof local_buffer), &length, profile_header, &size,
+                  0/*finish: don't, because the output is too small*/);
 
-   prefix_length = profile - png_ptr->chunkdata;
-   png_decompress_chunk(png_ptr, compression_type,
-       slength, prefix_length, &data_length);
+               if (size == 0)
+               {
+                  /* We have the ICC profile header; do the basic header checks.
+                   */
+                  const png_uint_32 profile_length =
+                     png_get_uint_32(profile_header);
 
-   profile_length = data_length - prefix_length;
+                  if (png_icc_check_length(png_ptr, &png_ptr->colorspace,
+                     keyword, profile_length) != 0)
+                  {
+                     /* The length is apparently ok, so we can check the 132
+                      * byte header.
+                      */
+                     if (png_icc_check_header(png_ptr, &png_ptr->colorspace,
+                        keyword, profile_length, profile_header,
+                        png_ptr->color_type) != 0)
+                     {
+                        /* Now read the tag table; a variable size buffer is
+                         * needed at this point, allocate one for the whole
+                         * profile.  The header check has already validated
+                         * that none of these stuff will overflow.
+                         */
+                        const png_uint_32 tag_count = png_get_uint_32(
+                           profile_header+128);
+                        png_bytep profile = png_read_buffer(png_ptr,
+                           profile_length, 2/*silent*/);
+
+                        if (profile != NULL)
+                        {
+                           memcpy(profile, profile_header,
+                              (sizeof profile_header));
+
+                           size = 12 * tag_count;
+
+                           (void)png_inflate_read(png_ptr, local_buffer,
+                              (sizeof local_buffer), &length,
+                              profile + (sizeof profile_header), &size, 0);
+
+                           /* Still expect a buffer error because we expect
+                            * there to be some tag data!
+                            */
+                           if (size == 0)
+                           {
+                              if (png_icc_check_tag_table(png_ptr,
+                                 &png_ptr->colorspace, keyword, profile_length,
+                                 profile) != 0)
+                              {
+                                 /* The profile has been validated for basic
+                                  * security issues, so read the whole thing in.
+                                  */
+                                 size = profile_length - (sizeof profile_header)
+                                    - 12 * tag_count;
+
+                                 (void)png_inflate_read(png_ptr, local_buffer,
+                                    (sizeof local_buffer), &length,
+                                    profile + (sizeof profile_header) +
+                                    12 * tag_count, &size, 1/*finish*/);
+
+                                 if (length > 0 && !(png_ptr->flags &
+                                       PNG_FLAG_BENIGN_ERRORS_WARN))
+                                    errmsg = "extra compressed data";
+
+                                 /* But otherwise allow extra data: */
+                                 else if (size == 0)
+                                 {
+                                    if (length > 0)
+                                    {
+                                       /* This can be handled completely, so
+                                        * keep going.
+                                        */
+                                       png_chunk_warning(png_ptr,
+                                          "extra compressed data");
+                                    }
+
+                                    png_crc_finish(png_ptr, length);
+                                    finished = 1;
+
+#                                   ifdef PNG_sRGB_SUPPORTED
+                                    /* Check for a match against sRGB */
+                                    png_icc_set_sRGB(png_ptr,
+                                       &png_ptr->colorspace, profile,
+                                       png_ptr->zstream.adler);
+#                                   endif
+
+                                    /* Steal the profile for info_ptr. */
+                                    if (info_ptr != NULL)
+                                    {
+                                       png_free_data(png_ptr, info_ptr,
+                                          PNG_FREE_ICCP, 0);
+
+                                       info_ptr->iccp_name = png_voidcast(char*,
+                                          png_malloc_base(png_ptr,
+                                          keyword_length+1));
+                                       if (info_ptr->iccp_name != NULL)
+                                       {
+                                          memcpy(info_ptr->iccp_name, keyword,
+                                             keyword_length+1);
+                                          info_ptr->iccp_proflen =
+                                             profile_length;
+                                          info_ptr->iccp_profile = profile;
+                                          png_ptr->read_buffer = NULL; /*steal*/
+                                          info_ptr->free_me |= PNG_FREE_ICCP;
+                                          info_ptr->valid |= PNG_INFO_iCCP;
+                                       }
+
+                                       else
+                                       {
+                                          png_ptr->colorspace.flags |=
+                                             PNG_COLORSPACE_INVALID;
+                                          errmsg = "out of memory";
+                                       }
+                                    }
+
+                                    /* else the profile remains in the read
+                                     * buffer which gets reused for subsequent
+                                     * chunks.
+                                     */
+
+                                    if (info_ptr != NULL)
+                                       png_colorspace_sync(png_ptr, info_ptr);
+
+                                    if (errmsg == NULL)
+                                    {
+                                       png_ptr->zowner = 0;
+                                       return;
+                                    }
+                                 }
+
+                                 else if (size > 0)
+                                    errmsg = "truncated";
+
+#ifndef __COVERITY__
+                                 else
+                                    errmsg = png_ptr->zstream.msg;
+#endif
+                              }
 
-   if (prefix_length > data_length || profile_length < 4)
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      png_warning(png_ptr, "Profile size field missing from iCCP chunk");
-      return;
-   }
+                              /* else png_icc_check_tag_table output an error */
+                           }
 
-   /* Check the profile_size recorded in the first 32 bits of the ICC profile */
-   pC = (png_bytep)(png_ptr->chunkdata + prefix_length);
-   profile_size = ((*(pC    )) << 24) |
-                  ((*(pC + 1)) << 16) |
-                  ((*(pC + 2)) <<  8) |
-                  ((*(pC + 3))      );
+                           else /* profile truncated */
+                              errmsg = png_ptr->zstream.msg;
+                        }
 
-   /* NOTE: the following guarantees that 'profile_length' fits into 32 bits,
-    * because profile_size is a 32 bit value.
-    */
-   if (profile_size < profile_length)
-      profile_length = profile_size;
+                        else
+                           errmsg = "out of memory";
+                     }
 
-   /* And the following guarantees that profile_size == profile_length. */
-   if (profile_size > profile_length)
-   {
-      PNG_WARNING_PARAMETERS(p)
+                     /* else png_icc_check_header output an error */
+                  }
 
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
+                  /* else png_icc_check_length output an error */
+               }
 
-      png_warning_parameter_unsigned(p, 1, PNG_NUMBER_FORMAT_u, profile_size);
-      png_warning_parameter_unsigned(p, 2, PNG_NUMBER_FORMAT_u, profile_length);
-      png_formatted_warning(png_ptr, p,
-         "Ignoring iCCP chunk with declared size = @1 and actual length = @2");
-      return;
+               else /* profile truncated */
+                  errmsg = png_ptr->zstream.msg;
+
+               /* Release the stream */
+               png_ptr->zowner = 0;
+            }
+
+            else /* png_inflate_claim failed */
+               errmsg = png_ptr->zstream.msg;
+         }
+
+         else
+            errmsg = "bad compression method"; /* or missing */
+      }
+
+      else
+         errmsg = "bad keyword";
    }
 
-   png_set_iCCP(png_ptr, info_ptr, png_ptr->chunkdata,
-       compression_type, (png_bytep)png_ptr->chunkdata + prefix_length,
-       profile_size);
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
+   else
+      errmsg = "too many profiles";
+
+   /* Failure: the reason is in 'errmsg' */
+   if (finished == 0)
+      png_crc_finish(png_ptr, length);
+
+   png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;
+   png_colorspace_sync(png_ptr, info_ptr);
+   if (errmsg != NULL) /* else already output */
+      png_chunk_benign_error(png_ptr, errmsg);
 }
-#endif /* PNG_READ_iCCP_SUPPORTED */
+#endif /* READ_iCCP */
 
 #ifdef PNG_READ_sPLT_SUPPORTED
 void /* PRIVATE */
-png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 /* Note: this does not properly handle chunks that are > 64K under DOS */
 {
-   png_bytep entry_start;
+   png_bytep entry_start, buffer;
    png_sPLT_t new_palette;
    png_sPLT_entryp pp;
    png_uint_32 data_length;
    int entry_size, i;
    png_uint_32 skip = 0;
-   png_size_t slength;
    png_uint_32 dl;
    png_size_t max_dl;
 
    png_debug(1, "in png_handle_sPLT");
 
 #ifdef PNG_USER_LIMITS_SUPPORTED
-
    if (png_ptr->user_chunk_cache_max != 0)
    {
       if (png_ptr->user_chunk_cache_max == 1)
@@ -1431,56 +1656,53 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    }
 #endif
 
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before sPLT");
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR");
 
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
    {
-      png_warning(png_ptr, "Invalid sPLT after IDAT");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "out of place");
       return;
    }
 
 #ifdef PNG_MAX_MALLOC_64K
-   if (length > (png_uint_32)65535L)
+   if (length > 65535U)
    {
-      png_warning(png_ptr, "sPLT chunk too large to fit in memory");
-      skip = length - (png_uint_32)65535L;
-      length = (png_uint_32)65535L;
+      png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "too large to fit in memory");
+      return;
    }
 #endif
 
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = (png_charp)png_malloc(png_ptr, length + 1);
+   buffer = png_read_buffer(png_ptr, length+1, 2/*silent*/);
+   if (buffer == NULL)
+   {
+      png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "out of memory");
+      return;
+   }
+
 
    /* WARNING: this may break if size_t is less than 32 bits; it is assumed
     * that the PNG_MAX_MALLOC_64K test is enabled in this case, but this is a
     * potential breakage point if the types in pngconf.h aren't exactly right.
     */
-   slength = length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
+   png_crc_read(png_ptr, buffer, length);
 
-   if (png_crc_finish(png_ptr, skip))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
+   if (png_crc_finish(png_ptr, skip) != 0)
       return;
-   }
 
-   png_ptr->chunkdata[slength] = 0x00;
+   buffer[length] = 0;
 
-   for (entry_start = (png_bytep)png_ptr->chunkdata; *entry_start;
-       entry_start++)
+   for (entry_start = buffer; *entry_start; entry_start++)
       /* Empty loop to find end of name */ ;
 
    ++entry_start;
 
    /* A sample depth should follow the separator, and we should be on it  */
-   if (slength < 2U ||
-       entry_start > (png_bytep)png_ptr->chunkdata + slength - 2U)
+   if (length < 2U || entry_start > buffer + (length - 2U))
    {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
       png_warning(png_ptr, "malformed sPLT chunk");
       return;
    }
@@ -1488,39 +1710,35 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    new_palette.depth = *entry_start++;
    entry_size = (new_palette.depth == 8 ? 6 : 10);
    /* This must fit in a png_uint_32 because it is derived from the original
-    * chunk data length (and use 'length', not 'slength' here for clarity -
-    * they are guaranteed to be the same, see the tests above.)
+    * chunk data length.
     */
-   data_length = length - (png_uint_32)(entry_start -
-      (png_bytep)png_ptr->chunkdata);
+   data_length = length - (png_uint_32)(entry_start - buffer);
 
    /* Integrity-check the data length */
-   if (data_length % entry_size)
+   if ((data_length % entry_size) != 0)
    {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
       png_warning(png_ptr, "sPLT chunk has bad length");
       return;
    }
 
    dl = (png_int_32)(data_length / entry_size);
-   max_dl = PNG_SIZE_MAX / png_sizeof(png_sPLT_entry);
+   max_dl = PNG_SIZE_MAX / (sizeof (png_sPLT_entry));
 
    if (dl > max_dl)
    {
-       png_warning(png_ptr, "sPLT chunk too long");
-       return;
+      png_warning(png_ptr, "sPLT chunk too long");
+      return;
    }
 
    new_palette.nentries = (png_int_32)(data_length / entry_size);
 
    new_palette.entries = (png_sPLT_entryp)png_malloc_warn(
-       png_ptr, new_palette.nentries * png_sizeof(png_sPLT_entry));
+       png_ptr, new_palette.nentries * (sizeof (png_sPLT_entry)));
 
    if (new_palette.entries == NULL)
    {
-       png_warning(png_ptr, "sPLT chunk requires too much memory");
-       return;
+      png_warning(png_ptr, "sPLT chunk requires too much memory");
+      return;
    }
 
 #ifdef PNG_POINTER_INDEXING_SUPPORTED
@@ -1573,38 +1791,36 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 #endif
 
    /* Discard all chunk data except the name and stash that */
-   new_palette.name = png_ptr->chunkdata;
+   new_palette.name = (png_charp)buffer;
 
    png_set_sPLT(png_ptr, info_ptr, &new_palette, 1);
 
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
    png_free(png_ptr, new_palette.entries);
 }
-#endif /* PNG_READ_sPLT_SUPPORTED */
+#endif /* READ_sPLT */
 
 #ifdef PNG_READ_tRNS_SUPPORTED
 void /* PRIVATE */
-png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_byte readbuf[PNG_MAX_PALETTE_LENGTH];
 
    png_debug(1, "in png_handle_tRNS");
 
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before tRNS");
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR");
 
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
    {
-      png_warning(png_ptr, "Invalid tRNS after IDAT");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "out of place");
       return;
    }
 
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS) != 0)
    {
-      png_warning(png_ptr, "Duplicate tRNS chunk");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "duplicate");
       return;
    }
 
@@ -1614,8 +1830,8 @@ png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
       if (length != 2)
       {
-         png_warning(png_ptr, "Incorrect tRNS chunk length");
          png_crc_finish(png_ptr, length);
+         png_chunk_benign_error(png_ptr, "invalid");
          return;
       }
 
@@ -1630,12 +1846,12 @@ png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
       if (length != 6)
       {
-         png_warning(png_ptr, "Incorrect tRNS chunk length");
          png_crc_finish(png_ptr, length);
+         png_chunk_benign_error(png_ptr, "invalid");
          return;
       }
 
-      png_crc_read(png_ptr, buf, (png_size_t)length);
+      png_crc_read(png_ptr, buf, length);
       png_ptr->num_trans = 1;
       png_ptr->trans_color.red = png_get_uint_16(buf);
       png_ptr->trans_color.green = png_get_uint_16(buf + 2);
@@ -1644,44 +1860,44 @@ png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
    else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
    {
-      if (!(png_ptr->mode & PNG_HAVE_PLTE))
-      {
-         /* Should be an error, but we can cope with it. */
-         png_warning(png_ptr, "Missing PLTE before tRNS");
-      }
-
-      if (length > (png_uint_32)png_ptr->num_palette ||
-          length > PNG_MAX_PALETTE_LENGTH)
+      if ((png_ptr->mode & PNG_HAVE_PLTE) == 0)
       {
-         png_warning(png_ptr, "Incorrect tRNS chunk length");
+         /* TODO: is this actually an error in the ISO spec? */
          png_crc_finish(png_ptr, length);
+         png_chunk_benign_error(png_ptr, "out of place");
          return;
       }
 
-      if (length == 0)
+      if (length > (unsigned int) png_ptr->num_palette ||
+         length > (unsigned int) PNG_MAX_PALETTE_LENGTH ||
+         length == 0)
       {
-         png_warning(png_ptr, "Zero length tRNS chunk");
          png_crc_finish(png_ptr, length);
+         png_chunk_benign_error(png_ptr, "invalid");
          return;
       }
 
-      png_crc_read(png_ptr, readbuf, (png_size_t)length);
+      png_crc_read(png_ptr, readbuf, length);
       png_ptr->num_trans = (png_uint_16)length;
    }
 
    else
    {
-      png_warning(png_ptr, "tRNS chunk not allowed with alpha channel");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "invalid with alpha channel");
       return;
    }
 
-   if (png_crc_finish(png_ptr, 0))
+   if (png_crc_finish(png_ptr, 0) != 0)
    {
       png_ptr->num_trans = 0;
       return;
    }
 
+   /* TODO: this is a horrible side effect in the palette case because the
+    * png_struct ends up with a pointer to the tRNS buffer owned by the
+    * png_info.  Fix this.
+    */
    png_set_tRNS(png_ptr, info_ptr, readbuf, png_ptr->num_trans,
        &(png_ptr->trans_color));
 }
@@ -1689,43 +1905,37 @@ png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
 #ifdef PNG_READ_bKGD_SUPPORTED
 void /* PRIVATE */
-png_handle_bKGD(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
-   png_size_t truelen;
+   unsigned int truelen;
    png_byte buf[6];
    png_color_16 background;
 
    png_debug(1, "in png_handle_bKGD");
 
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before bKGD");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid bKGD after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR");
 
-   else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-       !(png_ptr->mode & PNG_HAVE_PLTE))
+   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0 ||
+       (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+       (png_ptr->mode & PNG_HAVE_PLTE) == 0))
    {
-      png_warning(png_ptr, "Missing PLTE before bKGD");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "out of place");
       return;
    }
 
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD))
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD) != 0)
    {
-      png_warning(png_ptr, "Duplicate bKGD chunk");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "duplicate");
       return;
    }
 
    if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
       truelen = 1;
 
-   else if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+   else if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
       truelen = 6;
 
    else
@@ -1733,14 +1943,14 @@ png_handle_bKGD(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
    if (length != truelen)
    {
-      png_warning(png_ptr, "Incorrect bKGD chunk length");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "invalid");
       return;
    }
 
    png_crc_read(png_ptr, buf, truelen);
 
-   if (png_crc_finish(png_ptr, 0))
+   if (png_crc_finish(png_ptr, 0) != 0)
       return;
 
    /* We convert the index value into RGB components so that we can allow
@@ -1752,11 +1962,11 @@ png_handle_bKGD(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    {
       background.index = buf[0];
 
-      if (info_ptr && info_ptr->num_palette)
+      if (info_ptr != NULL && info_ptr->num_palette != 0)
       {
          if (buf[0] >= info_ptr->num_palette)
          {
-            png_warning(png_ptr, "Incorrect bKGD chunk index value");
+            png_chunk_benign_error(png_ptr, "invalid index");
             return;
          }
 
@@ -1771,7 +1981,7 @@ png_handle_bKGD(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
       background.gray = 0;
    }
 
-   else if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) /* GRAY */
+   else if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0) /* GRAY */
    {
       background.index = 0;
       background.red =
@@ -1795,47 +2005,41 @@ png_handle_bKGD(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
 #ifdef PNG_READ_hIST_SUPPORTED
 void /* PRIVATE */
-png_handle_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+png_handle_hIST(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    unsigned int num, i;
    png_uint_16 readbuf[PNG_MAX_PALETTE_LENGTH];
 
    png_debug(1, "in png_handle_hIST");
 
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before hIST");
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR");
 
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0 ||
+       (png_ptr->mode & PNG_HAVE_PLTE) == 0)
    {
-      png_warning(png_ptr, "Invalid hIST after IDAT");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "out of place");
       return;
    }
 
-   else if (!(png_ptr->mode & PNG_HAVE_PLTE))
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST) != 0)
    {
-      png_warning(png_ptr, "Missing PLTE before hIST");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "duplicate");
       return;
    }
 
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST))
-   {
-      png_warning(png_ptr, "Duplicate hIST chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
+   num = length / 2 ;
 
-   if (length > 2*PNG_MAX_PALETTE_LENGTH ||
-       length != (unsigned int) (2*png_ptr->num_palette))
+   if (num != (unsigned int) png_ptr->num_palette ||
+       num > (unsigned int) PNG_MAX_PALETTE_LENGTH)
    {
-      png_warning(png_ptr, "Incorrect hIST chunk length");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "invalid");
       return;
    }
 
-   num = length / 2 ;
-
    for (i = 0; i < num; i++)
    {
       png_byte buf[2];
@@ -1844,7 +2048,7 @@ png_handle_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
       readbuf[i] = png_get_uint_16(buf);
    }
 
-   if (png_crc_finish(png_ptr, 0))
+   if (png_crc_finish(png_ptr, 0) != 0)
       return;
 
    png_set_hIST(png_ptr, info_ptr, readbuf);
@@ -1853,7 +2057,7 @@ png_handle_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
 #ifdef PNG_READ_pHYs_SUPPORTED
 void /* PRIVATE */
-png_handle_pHYs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+png_handle_pHYs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_byte buf[9];
    png_uint_32 res_x, res_y;
@@ -1861,33 +2065,33 @@ png_handle_pHYs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_pHYs");
 
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before pHYs");
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR");
 
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
    {
-      png_warning(png_ptr, "Invalid pHYs after IDAT");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "out of place");
       return;
    }
 
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs) != 0)
    {
-      png_warning(png_ptr, "Duplicate pHYs chunk");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "duplicate");
       return;
    }
 
    if (length != 9)
    {
-      png_warning(png_ptr, "Incorrect pHYs chunk length");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "invalid");
       return;
    }
 
    png_crc_read(png_ptr, buf, 9);
 
-   if (png_crc_finish(png_ptr, 0))
+   if (png_crc_finish(png_ptr, 0) != 0)
       return;
 
    res_x = png_get_uint_32(buf);
@@ -1899,7 +2103,7 @@ png_handle_pHYs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
 #ifdef PNG_READ_oFFs_SUPPORTED
 void /* PRIVATE */
-png_handle_oFFs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+png_handle_oFFs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_byte buf[9];
    png_int_32 offset_x, offset_y;
@@ -1907,33 +2111,33 @@ png_handle_oFFs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_oFFs");
 
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before oFFs");
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR");
 
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
    {
-      png_warning(png_ptr, "Invalid oFFs after IDAT");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "out of place");
       return;
    }
 
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs) != 0)
    {
-      png_warning(png_ptr, "Duplicate oFFs chunk");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "duplicate");
       return;
    }
 
    if (length != 9)
    {
-      png_warning(png_ptr, "Incorrect oFFs chunk length");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "invalid");
       return;
    }
 
    png_crc_read(png_ptr, buf, 9);
 
-   if (png_crc_finish(png_ptr, 0))
+   if (png_crc_finish(png_ptr, 0) != 0)
       return;
 
    offset_x = png_get_int_32(buf);
@@ -1946,71 +2150,64 @@ png_handle_oFFs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 #ifdef PNG_READ_pCAL_SUPPORTED
 /* Read the pCAL chunk (described in the PNG Extensions document) */
 void /* PRIVATE */
-png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_int_32 X0, X1;
    png_byte type, nparams;
-   png_charp buf, units, endptr;
+   png_bytep buffer, buf, units, endptr;
    png_charpp params;
-   png_size_t slength;
    int i;
 
    png_debug(1, "in png_handle_pCAL");
 
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before pCAL");
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR");
 
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
    {
-      png_warning(png_ptr, "Invalid pCAL after IDAT");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "out of place");
       return;
    }
 
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL))
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL) != 0)
    {
-      png_warning(png_ptr, "Duplicate pCAL chunk");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "duplicate");
       return;
    }
 
    png_debug1(2, "Allocating and reading pCAL chunk data (%u bytes)",
        length + 1);
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
 
-   if (png_ptr->chunkdata == NULL)
+   buffer = png_read_buffer(png_ptr, length+1, 2/*silent*/);
+
+   if (buffer == NULL)
    {
-      png_warning(png_ptr, "No memory for pCAL purpose");
+      png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "out of memory");
       return;
    }
 
-   slength = length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
+   png_crc_read(png_ptr, buffer, length);
 
-   if (png_crc_finish(png_ptr, 0))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
+   if (png_crc_finish(png_ptr, 0) != 0)
       return;
-   }
 
-   png_ptr->chunkdata[slength] = 0x00; /* Null terminate the last string */
+   buffer[length] = 0; /* Null terminate the last string */
 
    png_debug(3, "Finding end of pCAL purpose string");
-   for (buf = png_ptr->chunkdata; *buf; buf++)
+   for (buf = buffer; *buf; buf++)
       /* Empty loop */ ;
 
-   endptr = png_ptr->chunkdata + slength;
+   endptr = buffer + length;
 
    /* We need to have at least 12 bytes after the purpose string
     * in order to get the parameter information.
     */
    if (endptr - buf <= 12)
    {
-      png_warning(png_ptr, "Invalid pCAL data");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
+      png_chunk_benign_error(png_ptr, "invalid");
       return;
    }
 
@@ -2030,15 +2227,13 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
        (type == PNG_EQUATION_ARBITRARY && nparams != 3) ||
        (type == PNG_EQUATION_HYPERBOLIC && nparams != 4))
    {
-      png_warning(png_ptr, "Invalid pCAL parameters for equation type");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
+      png_chunk_benign_error(png_ptr, "invalid parameter count");
       return;
    }
 
    else if (type >= PNG_EQUATION_LAST)
    {
-      png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
+      png_chunk_benign_error(png_ptr, "unrecognized equation type");
    }
 
    for (buf = units; *buf; buf++)
@@ -2046,43 +2241,37 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
    png_debug(3, "Allocating pCAL parameters array");
 
-   params = (png_charpp)png_malloc_warn(png_ptr,
-       (png_size_t)(nparams * png_sizeof(png_charp)));
+   params = png_voidcast(png_charpp, png_malloc_warn(png_ptr,
+       nparams * (sizeof (png_charp))));
 
    if (params == NULL)
    {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      png_warning(png_ptr, "No memory for pCAL params");
+      png_chunk_benign_error(png_ptr, "out of memory");
       return;
    }
 
    /* Get pointers to the start of each parameter string. */
-   for (i = 0; i < (int)nparams; i++)
+   for (i = 0; i < nparams; i++)
    {
       buf++; /* Skip the null string terminator from previous parameter. */
 
       png_debug1(3, "Reading pCAL parameter %d", i);
 
-      for (params[i] = buf; buf <= endptr && *buf != 0x00; buf++)
+      for (params[i] = (png_charp)buf; buf <= endptr && *buf != 0; buf++)
          /* Empty loop to move past each parameter string */ ;
 
       /* Make sure we haven't run out of data yet */
       if (buf > endptr)
       {
-         png_warning(png_ptr, "Invalid pCAL data");
-         png_free(png_ptr, png_ptr->chunkdata);
-         png_ptr->chunkdata = NULL;
          png_free(png_ptr, params);
+         png_chunk_benign_error(png_ptr, "invalid data");
          return;
       }
    }
 
-   png_set_pCAL(png_ptr, info_ptr, png_ptr->chunkdata, X0, X1, type, nparams,
-      units, params);
+   png_set_pCAL(png_ptr, info_ptr, (png_charp)buffer, X0, X1, type, nparams,
+      (png_charp)units, params);
 
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
    png_free(png_ptr, params);
 }
 #endif
@@ -2090,67 +2279,61 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 #ifdef PNG_READ_sCAL_SUPPORTED
 /* Read the sCAL chunk */
 void /* PRIVATE */
-png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
-   png_size_t slength, i;
+   png_bytep buffer;
+   png_size_t i;
    int state;
 
    png_debug(1, "in png_handle_sCAL");
 
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before sCAL");
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR");
 
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
    {
-      png_warning(png_ptr, "Invalid sCAL after IDAT");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "out of place");
       return;
    }
 
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sCAL))
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sCAL) != 0)
    {
-      png_warning(png_ptr, "Duplicate sCAL chunk");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "duplicate");
       return;
    }
 
    /* Need unit type, width, \0, height: minimum 4 bytes */
    else if (length < 4)
    {
-      png_warning(png_ptr, "sCAL chunk too short");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "invalid");
       return;
    }
 
    png_debug1(2, "Allocating and reading sCAL chunk data (%u bytes)",
       length + 1);
 
-   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   buffer = png_read_buffer(png_ptr, length+1, 2/*silent*/);
 
-   if (png_ptr->chunkdata == NULL)
+   if (buffer == NULL)
    {
-      png_warning(png_ptr, "Out of memory while processing sCAL chunk");
+      png_chunk_benign_error(png_ptr, "out of memory");
       png_crc_finish(png_ptr, length);
       return;
    }
 
-   slength = length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
-   png_ptr->chunkdata[slength] = 0x00; /* Null terminate the last string */
+   png_crc_read(png_ptr, buffer, length);
+   buffer[length] = 0; /* Null terminate the last string */
 
-   if (png_crc_finish(png_ptr, 0))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
+   if (png_crc_finish(png_ptr, 0) != 0)
       return;
-   }
 
    /* Validate the unit. */
-   if (png_ptr->chunkdata[0] != 1 && png_ptr->chunkdata[0] != 2)
+   if (buffer[0] != 1 && buffer[0] != 2)
    {
-      png_warning(png_ptr, "Invalid sCAL ignored: invalid unit");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
+      png_chunk_benign_error(png_ptr, "invalid unit");
       return;
    }
 
@@ -2160,70 +2343,65 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    i = 1;
    state = 0;
 
-   if (!png_check_fp_number(png_ptr->chunkdata, slength, &state, &i) ||
-       i >= slength || png_ptr->chunkdata[i++] != 0)
-      png_warning(png_ptr, "Invalid sCAL chunk ignored: bad width format");
+   if (png_check_fp_number((png_const_charp)buffer, length, &state, &i) == 0 ||
+       i >= length || buffer[i++] != 0)
+      png_chunk_benign_error(png_ptr, "bad width format");
 
-   else if (!PNG_FP_IS_POSITIVE(state))
-      png_warning(png_ptr, "Invalid sCAL chunk ignored: non-positive width");
+   else if (PNG_FP_IS_POSITIVE(state) == 0)
+      png_chunk_benign_error(png_ptr, "non-positive width");
 
    else
    {
       png_size_t heighti = i;
 
       state = 0;
-      if (!png_check_fp_number(png_ptr->chunkdata, slength, &state, &i) ||
-          i != slength)
-         png_warning(png_ptr, "Invalid sCAL chunk ignored: bad height format");
+      if (png_check_fp_number((png_const_charp)buffer, length,
+          &state, &i) == 0 || i != length)
+         png_chunk_benign_error(png_ptr, "bad height format");
 
-      else if (!PNG_FP_IS_POSITIVE(state))
-         png_warning(png_ptr,
-            "Invalid sCAL chunk ignored: non-positive height");
+      else if (PNG_FP_IS_POSITIVE(state) == 0)
+         png_chunk_benign_error(png_ptr, "non-positive height");
 
       else
          /* This is the (only) success case. */
-         png_set_sCAL_s(png_ptr, info_ptr, png_ptr->chunkdata[0],
-            png_ptr->chunkdata+1, png_ptr->chunkdata+heighti);
+         png_set_sCAL_s(png_ptr, info_ptr, buffer[0],
+            (png_charp)buffer+1, (png_charp)buffer+heighti);
    }
-
-   /* Clean up - just free the temporarily allocated buffer. */
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
 }
 #endif
 
 #ifdef PNG_READ_tIME_SUPPORTED
 void /* PRIVATE */
-png_handle_tIME(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+png_handle_tIME(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_byte buf[7];
    png_time mod_time;
 
    png_debug(1, "in png_handle_tIME");
 
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Out of place tIME chunk");
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR");
 
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME))
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME) != 0)
    {
-      png_warning(png_ptr, "Duplicate tIME chunk");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "duplicate");
       return;
    }
 
-   if (png_ptr->mode & PNG_HAVE_IDAT)
+   if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
       png_ptr->mode |= PNG_AFTER_IDAT;
 
    if (length != 7)
    {
-      png_warning(png_ptr, "Incorrect tIME chunk length");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "invalid");
       return;
    }
 
    png_crc_read(png_ptr, buf, 7);
 
-   if (png_crc_finish(png_ptr, 0))
+   if (png_crc_finish(png_ptr, 0) != 0)
       return;
 
    mod_time.second = buf[6];
@@ -2240,14 +2418,13 @@ png_handle_tIME(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 #ifdef PNG_READ_tEXt_SUPPORTED
 /* Note: this does not properly handle chunks that are > 64K under DOS */
 void /* PRIVATE */
-png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+png_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
-   png_textp text_ptr;
+   png_text  text_info;
+   png_bytep buffer;
    png_charp key;
    png_charp text;
    png_uint_32 skip = 0;
-   png_size_t slength;
-   int ret;
 
    png_debug(1, "in png_handle_tEXt");
 
@@ -2262,84 +2439,59 @@ png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
       if (--png_ptr->user_chunk_cache_max == 1)
       {
-         png_warning(png_ptr, "No space in chunk cache for tEXt");
          png_crc_finish(png_ptr, length);
+         png_chunk_benign_error(png_ptr, "no space in chunk cache");
          return;
       }
    }
 #endif
 
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before tEXt");
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR");
 
-   if (png_ptr->mode & PNG_HAVE_IDAT)
+   if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
       png_ptr->mode |= PNG_AFTER_IDAT;
 
 #ifdef PNG_MAX_MALLOC_64K
-   if (length > (png_uint_32)65535L)
+   if (length > 65535U)
    {
-      png_warning(png_ptr, "tEXt chunk too large to fit in memory");
-      skip = length - (png_uint_32)65535L;
-      length = (png_uint_32)65535L;
+      png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "too large to fit in memory");
+      return;
    }
 #endif
 
-   png_free(png_ptr, png_ptr->chunkdata);
+   buffer = png_read_buffer(png_ptr, length+1, 1/*warn*/);
 
-   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
-
-   if (png_ptr->chunkdata == NULL)
+   if (buffer == NULL)
    {
-     png_warning(png_ptr, "No memory to process text chunk");
+     png_chunk_benign_error(png_ptr, "out of memory");
      return;
    }
 
-   slength = length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
+   png_crc_read(png_ptr, buffer, length);
 
-   if (png_crc_finish(png_ptr, skip))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
+   if (png_crc_finish(png_ptr, skip) != 0)
       return;
-   }
 
-   key = png_ptr->chunkdata;
-
-   key[slength] = 0x00;
+   key = (png_charp)buffer;
+   key[length] = 0;
 
    for (text = key; *text; text++)
       /* Empty loop to find end of key */ ;
 
-   if (text != key + slength)
+   if (text != key + length)
       text++;
 
-   text_ptr = (png_textp)png_malloc_warn(png_ptr,
-       png_sizeof(png_text));
-
-   if (text_ptr == NULL)
-   {
-      png_warning(png_ptr, "Not enough memory to process text chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
-   text_ptr->key = key;
-   text_ptr->lang = NULL;
-   text_ptr->lang_key = NULL;
-   text_ptr->itxt_length = 0;
-   text_ptr->text = text;
-   text_ptr->text_length = png_strlen(text);
+   text_info.compression = PNG_TEXT_COMPRESSION_NONE;
+   text_info.key = key;
+   text_info.lang = NULL;
+   text_info.lang_key = NULL;
+   text_info.itxt_length = 0;
+   text_info.text = text;
+   text_info.text_length = strlen(text);
 
-   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
-
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
-   png_free(png_ptr, text_ptr);
-
-   if (ret != 0)
+   if (png_set_text_2(png_ptr, info_ptr, &text_info, 1) != 0)
       png_warning(png_ptr, "Insufficient memory to process text chunk");
 }
 #endif
@@ -2347,13 +2499,11 @@ png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 #ifdef PNG_READ_zTXt_SUPPORTED
 /* Note: this does not correctly handle chunks that are > 64K under DOS */
 void /* PRIVATE */
-png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
-   png_textp text_ptr;
-   png_charp text;
-   int comp_type;
-   int ret;
-   png_size_t slength, prefix_len, data_len;
+   png_const_charp errmsg = NULL;
+   png_bytep       buffer;
+   png_uint_32     keyword_length;
 
    png_debug(1, "in png_handle_zTXt");
 
@@ -2368,123 +2518,101 @@ png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
       if (--png_ptr->user_chunk_cache_max == 1)
       {
-         png_warning(png_ptr, "No space in chunk cache for zTXt");
          png_crc_finish(png_ptr, length);
+         png_chunk_benign_error(png_ptr, "no space in chunk cache");
          return;
       }
    }
 #endif
 
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before zTXt");
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR");
 
-   if (png_ptr->mode & PNG_HAVE_IDAT)
+   if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
       png_ptr->mode |= PNG_AFTER_IDAT;
 
-#ifdef PNG_MAX_MALLOC_64K
-   /* We will no doubt have problems with chunks even half this size, but
-    * there is no hard and fast rule to tell us where to stop.
-    */
-   if (length > (png_uint_32)65535L)
+   buffer = png_read_buffer(png_ptr, length, 2/*silent*/);
+
+   if (buffer == NULL)
    {
-      png_warning(png_ptr, "zTXt chunk too large to fit in memory");
       png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "out of memory");
       return;
    }
-#endif
 
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   png_crc_read(png_ptr, buffer, length);
 
-   if (png_ptr->chunkdata == NULL)
-   {
-      png_warning(png_ptr, "Out of memory processing zTXt chunk");
+   if (png_crc_finish(png_ptr, 0) != 0)
       return;
-   }
 
-   slength = length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
-
-   if (png_crc_finish(png_ptr, 0))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
+   /* TODO: also check that the keyword contents match the spec! */
+   for (keyword_length = 0;
+      keyword_length < length && buffer[keyword_length] != 0;
+      ++keyword_length)
+      /* Empty loop to find end of name */ ;
 
-   png_ptr->chunkdata[slength] = 0x00;
+   if (keyword_length > 79 || keyword_length < 1)
+      errmsg = "bad keyword";
 
-   for (text = png_ptr->chunkdata; *text; text++)
-      /* Empty loop */ ;
+   /* zTXt must have some LZ data after the keyword, although it may expand to
+    * zero bytes; we need a '\0' at the end of the keyword, the compression type
+    * then the LZ data:
+    */
+   else if (keyword_length + 3 > length)
+      errmsg = "truncated";
 
-   /* zTXt must have some text after the chunkdataword */
-   if (slength < 2U || text >= png_ptr->chunkdata + slength - 2U)
-   {
-      png_warning(png_ptr, "Truncated zTXt chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
+   else if (buffer[keyword_length+1] != PNG_COMPRESSION_TYPE_BASE)
+      errmsg = "unknown compression type";
 
    else
    {
-       comp_type = *(++text);
-
-       if (comp_type != PNG_TEXT_COMPRESSION_zTXt)
-       {
-          png_warning(png_ptr, "Unknown compression type in zTXt chunk");
-          comp_type = PNG_TEXT_COMPRESSION_zTXt;
-       }
-
-       text++;        /* Skip the compression_method byte */
-   }
-
-   prefix_len = text - png_ptr->chunkdata;
+      png_alloc_size_t uncompressed_length = PNG_SIZE_MAX;
 
-   png_decompress_chunk(png_ptr, comp_type,
-       (png_size_t)length, prefix_len, &data_len);
+      /* TODO: at present png_decompress_chunk imposes a single application
+       * level memory limit, this should be split to different values for iCCP
+       * and text chunks.
+       */
+      if (png_decompress_chunk(png_ptr, length, keyword_length+2,
+         &uncompressed_length, 1/*terminate*/) == Z_STREAM_END)
+      {
+         png_text text;
 
-   text_ptr = (png_textp)png_malloc_warn(png_ptr,
-       png_sizeof(png_text));
+         /* It worked; png_ptr->read_buffer now looks like a tEXt chunk except
+          * for the extra compression type byte and the fact that it isn't
+          * necessarily '\0' terminated.
+          */
+         buffer = png_ptr->read_buffer;
+         buffer[uncompressed_length+(keyword_length+2)] = 0;
+
+         text.compression = PNG_TEXT_COMPRESSION_zTXt;
+         text.key = (png_charp)buffer;
+         text.text = (png_charp)(buffer + keyword_length+2);
+         text.text_length = uncompressed_length;
+         text.itxt_length = 0;
+         text.lang = NULL;
+         text.lang_key = NULL;
+
+         if (png_set_text_2(png_ptr, info_ptr, &text, 1) != 0)
+            errmsg = "insufficient memory";
+      }
 
-   if (text_ptr == NULL)
-   {
-      png_warning(png_ptr, "Not enough memory to process zTXt chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
+      else
+         errmsg = png_ptr->zstream.msg;
    }
 
-   text_ptr->compression = comp_type;
-   text_ptr->key = png_ptr->chunkdata;
-   text_ptr->lang = NULL;
-   text_ptr->lang_key = NULL;
-   text_ptr->itxt_length = 0;
-   text_ptr->text = png_ptr->chunkdata + prefix_len;
-   text_ptr->text_length = data_len;
-
-   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
-
-   png_free(png_ptr, text_ptr);
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
-
-   if (ret != 0)
-      png_error(png_ptr, "Insufficient memory to store zTXt chunk");
+   if (errmsg != NULL)
+      png_chunk_benign_error(png_ptr, errmsg);
 }
 #endif
 
 #ifdef PNG_READ_iTXt_SUPPORTED
 /* Note: this does not correctly handle chunks that are > 64K under DOS */
 void /* PRIVATE */
-png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
-   png_textp text_ptr;
-   png_charp key, lang, text, lang_key;
-   int comp_flag;
-   int comp_type;
-   int ret;
-   png_size_t slength, prefix_len, data_len;
+   png_const_charp errmsg = NULL;
+   png_bytep buffer;
+   png_uint_32 prefix_length;
 
    png_debug(1, "in png_handle_iTXt");
 
@@ -2499,292 +2627,393 @@ png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
       if (--png_ptr->user_chunk_cache_max == 1)
       {
-         png_warning(png_ptr, "No space in chunk cache for iTXt");
          png_crc_finish(png_ptr, length);
+         png_chunk_benign_error(png_ptr, "no space in chunk cache");
          return;
       }
    }
 #endif
 
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before iTXt");
+   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR");
 
-   if (png_ptr->mode & PNG_HAVE_IDAT)
+   if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
       png_ptr->mode |= PNG_AFTER_IDAT;
 
-#ifdef PNG_MAX_MALLOC_64K
-   /* We will no doubt have problems with chunks even half this size, but
-    * there is no hard and fast rule to tell us where to stop.
-    */
-   if (length > (png_uint_32)65535L)
-   {
-      png_warning(png_ptr, "iTXt chunk too large to fit in memory");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-#endif
-
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   buffer = png_read_buffer(png_ptr, length+1, 1/*warn*/);
 
-   if (png_ptr->chunkdata == NULL)
+   if (buffer == NULL)
    {
-      png_warning(png_ptr, "No memory to process iTXt chunk");
+      png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "out of memory");
       return;
    }
 
-   slength = length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
+   png_crc_read(png_ptr, buffer, length);
 
-   if (png_crc_finish(png_ptr, 0))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
+   if (png_crc_finish(png_ptr, 0) != 0)
       return;
-   }
-
-   png_ptr->chunkdata[slength] = 0x00;
 
-   for (lang = png_ptr->chunkdata; *lang; lang++)
+   /* First the keyword. */
+   for (prefix_length=0;
+      prefix_length < length && buffer[prefix_length] != 0;
+      ++prefix_length)
       /* Empty loop */ ;
 
-   lang++;        /* Skip NUL separator */
+   /* Perform a basic check on the keyword length here. */
+   if (prefix_length > 79 || prefix_length < 1)
+      errmsg = "bad keyword";
 
-   /* iTXt must have a language tag (possibly empty), two compression bytes,
-    * translated keyword (possibly empty), and possibly some text after the
-    * keyword
+   /* Expect keyword, compression flag, compression type, language, translated
+    * keyword (both may be empty but are 0 terminated) then the text, which may
+    * be empty.
     */
+   else if (prefix_length + 5 > length)
+      errmsg = "truncated";
 
-   if (slength < 3U || lang >= png_ptr->chunkdata + slength - 3U)
+   else if (buffer[prefix_length+1] == 0 ||
+      (buffer[prefix_length+1] == 1 &&
+      buffer[prefix_length+2] == PNG_COMPRESSION_TYPE_BASE))
    {
-      png_warning(png_ptr, "Truncated iTXt chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   comp_flag = *lang++;
-   comp_type = *lang++;
+      int compressed = buffer[prefix_length+1] != 0;
+      png_uint_32 language_offset, translated_keyword_offset;
+      png_alloc_size_t uncompressed_length = 0;
 
-   /* 1.5.14: The spec says "for uncompressed text decoders shall ignore [the
-    * compression type]".  The compression flag shall be 0 (no compression) or
-    * 1 (compressed with method 0 - deflate.)
-    */
-   if (comp_flag/*compressed*/ != 0)
-   {
-     if (comp_flag != 1)
-     {
-        png_warning(png_ptr, "invalid iTXt compression flag");
-        png_free(png_ptr, png_ptr->chunkdata);
-        png_ptr->chunkdata = NULL;
-        return;
-     }
+      /* Now the language tag */
+      prefix_length += 3;
+      language_offset = prefix_length;
 
-     if (comp_type != 0)
-     {
-        png_warning(png_ptr, "unknown iTXt compression type");
-        png_free(png_ptr, png_ptr->chunkdata);
-        png_ptr->chunkdata = NULL;
-        return;
-     }
-   }
+      for (; prefix_length < length && buffer[prefix_length] != 0;
+         ++prefix_length)
+         /* Empty loop */ ;
 
-   for (lang_key = lang; *lang_key; lang_key++)
-      /* Empty loop */ ;
+      /* WARNING: the length may be invalid here, this is checked below. */
+      translated_keyword_offset = ++prefix_length;
 
-   lang_key++;        /* Skip NUL separator */
+      for (; prefix_length < length && buffer[prefix_length] != 0;
+         ++prefix_length)
+         /* Empty loop */ ;
 
-   if (lang_key >= png_ptr->chunkdata + slength)
-   {
-      png_warning(png_ptr, "Truncated iTXt chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
+      /* prefix_length should now be at the trailing '\0' of the translated
+       * keyword, but it may already be over the end.  None of this arithmetic
+       * can overflow because chunks are at most 2^31 bytes long, but on 16-bit
+       * systems the available allocation may overflow.
+       */
+      ++prefix_length;
 
-   for (text = lang_key; *text; text++)
-      /* Empty loop */ ;
+      if (compressed == 0 && prefix_length <= length)
+         uncompressed_length = length - prefix_length;
 
-   text++;        /* Skip NUL separator */
+      else if (compressed != 0 && prefix_length < length)
+      {
+         uncompressed_length = PNG_SIZE_MAX;
 
-   if (text >= png_ptr->chunkdata + slength)
-   {
-      png_warning(png_ptr, "Malformed iTXt chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
+         /* TODO: at present png_decompress_chunk imposes a single application
+          * level memory limit, this should be split to different values for
+          * iCCP and text chunks.
+          */
+         if (png_decompress_chunk(png_ptr, length, prefix_length,
+            &uncompressed_length, 1/*terminate*/) == Z_STREAM_END)
+            buffer = png_ptr->read_buffer;
 
-   prefix_len = text - png_ptr->chunkdata;
+         else
+            errmsg = png_ptr->zstream.msg;
+      }
 
-   key=png_ptr->chunkdata;
+      else
+         errmsg = "truncated";
 
-   if (comp_flag/*compressed*/)
-      png_decompress_chunk(png_ptr, comp_type,
-          (size_t)length, prefix_len, &data_len);
+      if (errmsg == NULL)
+      {
+         png_text text;
 
-   else
-      data_len = png_strlen(png_ptr->chunkdata + prefix_len);
+         buffer[uncompressed_length+prefix_length] = 0;
 
-   text_ptr = (png_textp)png_malloc_warn(png_ptr,
-       png_sizeof(png_text));
+         if (compressed == 0)
+            text.compression = PNG_ITXT_COMPRESSION_NONE;
 
-   if (text_ptr == NULL)
-   {
-      png_warning(png_ptr, "Not enough memory to process iTXt chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
+         else
+            text.compression = PNG_ITXT_COMPRESSION_zTXt;
 
-   text_ptr->compression =
-      (comp_flag ? PNG_ITXT_COMPRESSION_zTXt : PNG_ITXT_COMPRESSION_NONE);
-   text_ptr->lang_key = png_ptr->chunkdata + (lang_key - key);
-   text_ptr->lang = png_ptr->chunkdata + (lang - key);
-   text_ptr->itxt_length = data_len;
-   text_ptr->text_length = 0;
-   text_ptr->key = png_ptr->chunkdata;
-   text_ptr->text = png_ptr->chunkdata + prefix_len;
+         text.key = (png_charp)buffer;
+         text.lang = (png_charp)buffer + language_offset;
+         text.lang_key = (png_charp)buffer + translated_keyword_offset;
+         text.text = (png_charp)buffer + prefix_length;
+         text.text_length = 0;
+         text.itxt_length = uncompressed_length;
 
-   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+         if (png_set_text_2(png_ptr, info_ptr, &text, 1) != 0)
+            errmsg = "insufficient memory";
+      }
+   }
 
-   png_free(png_ptr, text_ptr);
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
+   else
+      errmsg = "bad compression info";
 
-   if (ret != 0)
-      png_error(png_ptr, "Insufficient memory to store iTXt chunk");
+   if (errmsg != NULL)
+      png_chunk_benign_error(png_ptr, errmsg);
 }
 #endif
 
-/* This function is called when we haven't found a handler for a
- * chunk.  If there isn't a problem with the chunk itself (ie bad
- * chunk name, CRC, or a critical chunk), the chunk is silently ignored
- * -- unless the PNG_FLAG_UNKNOWN_CHUNKS_SUPPORTED flag is on in which
- * case it will be saved away to be written out later.
- */
-void /* PRIVATE */
-png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
+/* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */
+static int
+png_cache_unknown_chunk(png_structrp png_ptr, png_uint_32 length)
 {
-   png_uint_32 skip = 0;
+   png_alloc_size_t limit = PNG_SIZE_MAX;
 
-   png_debug(1, "in png_handle_unknown");
+   if (png_ptr->unknown_chunk.data != NULL)
+   {
+      png_free(png_ptr, png_ptr->unknown_chunk.data);
+      png_ptr->unknown_chunk.data = NULL;
+   }
 
-#ifdef PNG_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_cache_max != 0)
+#  ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   if (png_ptr->user_chunk_malloc_max > 0 &&
+       png_ptr->user_chunk_malloc_max < limit)
+      limit = png_ptr->user_chunk_malloc_max;
+
+#  elif PNG_USER_CHUNK_MALLOC_MAX > 0
+   if (PNG_USER_CHUNK_MALLOC_MAX < limit)
+      limit = PNG_USER_CHUNK_MALLOC_MAX;
+#  endif
+
+   if (length <= limit)
    {
-      if (png_ptr->user_chunk_cache_max == 1)
-      {
-         png_crc_finish(png_ptr, length);
-         return;
-      }
+      PNG_CSTRING_FROM_CHUNK(png_ptr->unknown_chunk.name, png_ptr->chunk_name);
+      /* The following is safe because of the PNG_SIZE_MAX init above */
+      png_ptr->unknown_chunk.size = (png_size_t)length/*SAFE*/;
+      /* 'mode' is a flag array, only the bottom four bits matter here */
+      png_ptr->unknown_chunk.location = (png_byte)png_ptr->mode/*SAFE*/;
 
-      if (--png_ptr->user_chunk_cache_max == 1)
+      if (length == 0)
+         png_ptr->unknown_chunk.data = NULL;
+
+      else
       {
-         png_warning(png_ptr, "No space in chunk cache for unknown chunk");
-         png_crc_finish(png_ptr, length);
-         return;
+         /* Do a 'warn' here - it is handled below. */
+         png_ptr->unknown_chunk.data = png_voidcast(png_bytep,
+            png_malloc_warn(png_ptr, length));
       }
    }
-#endif
 
-   if (png_ptr->mode & PNG_HAVE_IDAT)
+   if (png_ptr->unknown_chunk.data == NULL && length > 0)
    {
-      if (png_ptr->chunk_name != png_IDAT)
-         png_ptr->mode |= PNG_AFTER_IDAT;
+      /* This is benign because we clean up correctly */
+      png_crc_finish(png_ptr, length);
+      png_chunk_benign_error(png_ptr, "unknown chunk exceeds memory limits");
+      return 0;
    }
 
-   if (PNG_CHUNK_CRITICAL(png_ptr->chunk_name))
+   else
    {
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-      if (png_chunk_unknown_handling(png_ptr, png_ptr->chunk_name) !=
-          PNG_HANDLE_CHUNK_ALWAYS
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-          && png_ptr->read_user_chunk_fn == NULL
-#endif
-          )
-#endif
-         png_chunk_error(png_ptr, "unknown critical chunk");
+      if (length > 0)
+         png_crc_read(png_ptr, png_ptr->unknown_chunk.data, length);
+      png_crc_finish(png_ptr, 0);
+      return 1;
    }
+}
+#endif /* READ_UNKNOWN_CHUNKS */
 
-#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-   if ((png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-       || (png_ptr->read_user_chunk_fn != NULL)
-#endif
-       )
-   {
-#ifdef PNG_MAX_MALLOC_64K
-      if (length > 65535)
-      {
-         png_warning(png_ptr, "unknown chunk too large to fit in memory");
-         skip = length - 65535;
-         length = 65535;
-      }
-#endif
-
-      /* TODO: this code is very close to the unknown handling in pngpread.c,
-       * maybe it can be put into a common utility routine?
-       * png_struct::unknown_chunk is just used as a temporary variable, along
-       * with the data into which the chunk is read.  These can be eliminated.
-       */
-      PNG_CSTRING_FROM_CHUNK(png_ptr->unknown_chunk.name, png_ptr->chunk_name);
-      png_ptr->unknown_chunk.size = (png_size_t)length;
+/* Handle an unknown, or known but disabled, chunk */
+void /* PRIVATE */
+png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
+   png_uint_32 length, int keep)
+{
+   int handled = 0; /* the chunk was handled */
 
-      if (length == 0)
-         png_ptr->unknown_chunk.data = NULL;
+   png_debug(1, "in png_handle_unknown");
 
-      else
-      {
-         png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
-         png_crc_read(png_ptr, png_ptr->unknown_chunk.data, length);
-      }
+#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
+   /* NOTE: this code is based on the code in libpng-1.4.12 except for fixing
+    * the bug which meant that setting a non-default behavior for a specific
+    * chunk would be ignored (the default was always used unless a user
+    * callback was installed).
+    *
+    * 'keep' is the value from the png_chunk_unknown_handling, the setting for
+    * this specific chunk_name, if PNG_HANDLE_AS_UNKNOWN_SUPPORTED, if not it
+    * will always be PNG_HANDLE_CHUNK_AS_DEFAULT and it needs to be set here.
+    * This is just an optimization to avoid multiple calls to the lookup
+    * function.
+    */
+#  ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+#     ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
+   keep = png_chunk_unknown_handling(png_ptr, png_ptr->chunk_name);
+#     endif
+#  endif
 
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-      if (png_ptr->read_user_chunk_fn != NULL)
+   /* One of the following methods will read the chunk or skip it (at least one
+    * of these is always defined because this is the only way to switch on
+    * PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+    */
+#  ifdef PNG_READ_USER_CHUNKS_SUPPORTED
+   /* The user callback takes precedence over the chunk keep value, but the
+    * keep value is still required to validate a save of a critical chunk.
+    */
+   if (png_ptr->read_user_chunk_fn != NULL)
+   {
+      if (png_cache_unknown_chunk(png_ptr, length) != 0)
       {
          /* Callback to user unknown chunk handler */
-         int ret;
-
-         ret = (*(png_ptr->read_user_chunk_fn))
-             (png_ptr, &png_ptr->unknown_chunk);
-
+         int ret = (*(png_ptr->read_user_chunk_fn))(png_ptr,
+            &png_ptr->unknown_chunk);
+
+         /* ret is:
+          * negative: An error occurred; png_chunk_error will be called.
+          *     zero: The chunk was not handled, the chunk will be discarded
+          *           unless png_set_keep_unknown_chunks has been used to set
+          *           a 'keep' behavior for this particular chunk, in which
+          *           case that will be used.  A critical chunk will cause an
+          *           error at this point unless it is to be saved.
+          * positive: The chunk was handled, libpng will ignore/discard it.
+          */
          if (ret < 0)
             png_chunk_error(png_ptr, "error in user chunk");
 
-         if (ret == 0)
+         else if (ret == 0)
          {
-            if (PNG_CHUNK_CRITICAL(png_ptr->chunk_name))
+            /* If the keep value is 'default' or 'never' override it, but
+             * still error out on critical chunks unless the keep value is
+             * 'always'  While this is weird it is the behavior in 1.4.12.
+             * A possible improvement would be to obey the value set for the
+             * chunk, but this would be an API change that would probably
+             * damage some applications.
+             *
+             * The png_app_warning below catches the case that matters, where
+             * the application has not set specific save or ignore for this
+             * chunk or global save or ignore.
+             */
+            if (keep < PNG_HANDLE_CHUNK_IF_SAFE)
             {
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-               if (png_chunk_unknown_handling(png_ptr, png_ptr->chunk_name) !=
-                   PNG_HANDLE_CHUNK_ALWAYS)
-#endif
-                  png_chunk_error(png_ptr, "unknown critical chunk");
+#              ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
+               if (png_ptr->unknown_default < PNG_HANDLE_CHUNK_IF_SAFE)
+               {
+                  png_chunk_warning(png_ptr, "Saving unknown chunk:");
+                  png_app_warning(png_ptr,
+                     "forcing save of an unhandled chunk;"
+                     " please call png_set_keep_unknown_chunks");
+                     /* with keep = PNG_HANDLE_CHUNK_IF_SAFE */
+               }
+#              endif
+               keep = PNG_HANDLE_CHUNK_IF_SAFE;
             }
+         }
 
-            png_set_unknown_chunks(png_ptr, info_ptr,
-                &png_ptr->unknown_chunk, 1);
+         else /* chunk was handled */
+         {
+            handled = 1;
+            /* Critical chunks can be safely discarded at this point. */
+            keep = PNG_HANDLE_CHUNK_NEVER;
          }
       }
 
       else
-#endif
-         png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
-
-      png_free(png_ptr, png_ptr->unknown_chunk.data);
-      png_ptr->unknown_chunk.data = NULL;
+         keep = PNG_HANDLE_CHUNK_NEVER; /* insufficient memory */
    }
 
    else
-#endif
-      skip = length;
+   /* Use the SAVE_UNKNOWN_CHUNKS code or skip the chunk */
+#  endif /* READ_USER_CHUNKS */
 
-   png_crc_finish(png_ptr, skip);
+#  ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
+   {
+      /* keep is currently just the per-chunk setting, if there was no
+       * setting change it to the global default now (not that this may
+       * still be AS_DEFAULT) then obtain the cache of the chunk if required,
+       * if not simply skip the chunk.
+       */
+      if (keep == PNG_HANDLE_CHUNK_AS_DEFAULT)
+         keep = png_ptr->unknown_default;
 
-#ifndef PNG_READ_USER_CHUNKS_SUPPORTED
-   PNG_UNUSED(info_ptr) /* Quiet compiler warnings about unused info_ptr */
-#endif
+      if (keep == PNG_HANDLE_CHUNK_ALWAYS ||
+         (keep == PNG_HANDLE_CHUNK_IF_SAFE &&
+          PNG_CHUNK_ANCILLARY(png_ptr->chunk_name)))
+      {
+         if (png_cache_unknown_chunk(png_ptr, length) == 0)
+            keep = PNG_HANDLE_CHUNK_NEVER;
+      }
+
+      else
+         png_crc_finish(png_ptr, length);
+   }
+#  else
+#     ifndef PNG_READ_USER_CHUNKS_SUPPORTED
+#        error no method to support READ_UNKNOWN_CHUNKS
+#     endif
+
+   {
+      /* If here there is no read callback pointer set and no support is
+       * compiled in to just save the unknown chunks, so simply skip this
+       * chunk.  If 'keep' is something other than AS_DEFAULT or NEVER then
+       * the app has erroneously asked for unknown chunk saving when there
+       * is no support.
+       */
+      if (keep > PNG_HANDLE_CHUNK_NEVER)
+         png_app_error(png_ptr, "no unknown chunk support available");
+
+      png_crc_finish(png_ptr, length);
+   }
+#  endif
+
+#  ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
+   /* Now store the chunk in the chunk list if appropriate, and if the limits
+    * permit it.
+    */
+   if (keep == PNG_HANDLE_CHUNK_ALWAYS ||
+      (keep == PNG_HANDLE_CHUNK_IF_SAFE &&
+       PNG_CHUNK_ANCILLARY(png_ptr->chunk_name)))
+   {
+#     ifdef PNG_USER_LIMITS_SUPPORTED
+      switch (png_ptr->user_chunk_cache_max)
+      {
+         case 2:
+            png_ptr->user_chunk_cache_max = 1;
+            png_chunk_benign_error(png_ptr, "no space in chunk cache");
+            /* FALL THROUGH */
+         case 1:
+            /* NOTE: prior to 1.6.0 this case resulted in an unknown critical
+             * chunk being skipped, now there will be a hard error below.
+             */
+            break;
+
+         default: /* not at limit */
+            --(png_ptr->user_chunk_cache_max);
+            /* FALL THROUGH */
+         case 0: /* no limit */
+#  endif /* USER_LIMITS */
+            /* Here when the limit isn't reached or when limits are compiled
+             * out; store the chunk.
+             */
+            png_set_unknown_chunks(png_ptr, info_ptr,
+               &png_ptr->unknown_chunk, 1);
+            handled = 1;
+#  ifdef PNG_USER_LIMITS_SUPPORTED
+            break;
+      }
+#  endif
+   }
+#  else /* no store support: the chunk must be handled by the user callback */
+   PNG_UNUSED(info_ptr)
+#  endif
+
+   /* Regardless of the error handling below the cached data (if any) can be
+    * freed now.  Notice that the data is not freed if there is a png_error, but
+    * it will be freed by destroy_read_struct.
+    */
+   if (png_ptr->unknown_chunk.data != NULL)
+      png_free(png_ptr, png_ptr->unknown_chunk.data);
+   png_ptr->unknown_chunk.data = NULL;
+
+#else /* !PNG_READ_UNKNOWN_CHUNKS_SUPPORTED */
+   /* There is no support to read an unknown chunk, so just skip it. */
+   png_crc_finish(png_ptr, length);
+   PNG_UNUSED(info_ptr)
+   PNG_UNUSED(keep)
+#endif /* !READ_UNKNOWN_CHUNKS */
+
+   /* Check for unhandled critical chunks */
+   if (handled == 0 && PNG_CHUNK_CRITICAL(png_ptr->chunk_name))
+      png_chunk_error(png_ptr, "unhandled critical chunk");
 }
 
 /* This function is called to verify that a chunk name is valid.
@@ -2800,7 +3029,7 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
  */
 
 void /* PRIVATE */
-png_check_chunk_name(png_structp png_ptr, png_uint_32 chunk_name)
+png_check_chunk_name(png_structrp png_ptr, png_uint_32 chunk_name)
 {
    int i;
 
@@ -2825,7 +3054,7 @@ png_check_chunk_name(png_structp png_ptr, png_uint_32 chunk_name)
  * 'display' is false only those pixels present in the pass are filled in.
  */
 void /* PRIVATE */
-png_combine_row(png_structp png_ptr, png_bytep dp, int display)
+png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display)
 {
    unsigned int pixel_depth = png_ptr->transformed_pixel_depth;
    png_const_bytep sp = png_ptr->row_buf + 1;
@@ -2866,26 +3095,28 @@ png_combine_row(png_structp png_ptr, png_bytep dp, int display)
       end_ptr = dp + PNG_ROWBYTES(pixel_depth, row_width) - 1;
       end_byte = *end_ptr;
 #     ifdef PNG_READ_PACKSWAP_SUPPORTED
-         if (png_ptr->transformations & PNG_PACKSWAP) /* little-endian byte */
-            end_mask = 0xff << end_mask;
+      if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
+         /* little-endian byte */
+         end_mask = 0xff << end_mask;
 
-         else /* big-endian byte */
+      else /* big-endian byte */
 #     endif
-         end_mask = 0xff >> end_mask;
+      end_mask = 0xff >> end_mask;
       /* end_mask is now the bits to *keep* from the destination row */
    }
 
-   /* For non-interlaced images this reduces to a png_memcpy(). A png_memcpy()
+   /* For non-interlaced images this reduces to a memcpy(). A memcpy()
     * will also happen if interlacing isn't supported or if the application
     * does not call png_set_interlace_handling().  In the latter cases the
     * caller just gets a sequence of the unexpanded rows from each interlace
     * pass.
     */
 #ifdef PNG_READ_INTERLACING_SUPPORTED
-   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE) &&
-      pass < 6 && (display == 0 ||
-      /* The following copies everything for 'display' on passes 0, 2 and 4. */
-      (display == 1 && (pass & 1) != 0)))
+   if (png_ptr->interlaced != 0 &&
+       (png_ptr->transformations & PNG_INTERLACE) != 0 &&
+       pass < 6 && (display == 0 ||
+       /* The following copies everything for 'display' on passes 0, 2 and 4. */
+       (display == 1 && (pass & 1) != 0)))
    {
       /* Narrow images may have no bits in a pass; the caller should handle
        * this, but this test is cheap:
@@ -3017,10 +3248,10 @@ png_combine_row(png_structp png_ptr, png_bytep dp, int display)
           */
 #        define MASK(pass,depth,display,png)\
             ((display)?B_MASK(pass,depth,png):S_MASK(pass,depth,png))
-#endif /* !PNG_USE_COMPILE_TIME_MASKS */
+#endif /* !USE_COMPILE_TIME_MASKS */
 
          /* Use the appropriate mask to copy the required bits.  In some cases
-          * the byte mask will be 0 or 0xff, optimize these cases.  row_width is
+          * the byte mask will be 0 or 0xff; optimize these cases.  row_width is
           * the number of pixels, but the code copies bytes, so it is necessary
           * to special case the end.
           */
@@ -3028,12 +3259,12 @@ png_combine_row(png_structp png_ptr, png_bytep dp, int display)
          png_uint_32 mask;
 
 #        ifdef PNG_READ_PACKSWAP_SUPPORTED
-            if (png_ptr->transformations & PNG_PACKSWAP)
-               mask = MASK(pass, pixel_depth, display, 0);
+         if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
+            mask = MASK(pass, pixel_depth, display, 0);
 
-            else
+         else
 #        endif
-            mask = MASK(pass, pixel_depth, display, 1);
+         mask = MASK(pass, pixel_depth, display, 1);
 
          for (;;)
          {
@@ -3159,7 +3390,7 @@ png_combine_row(png_structp png_ptr, png_bytep dp, int display)
                /* This can only be the RGB case, so each copy is exactly one
                 * pixel and it is not necessary to check for a partial copy.
                 */
-               for(;;)
+               for (;;)
                {
                   dp[0] = sp[0], dp[1] = sp[1], dp[2] = sp[2];
 
@@ -3176,26 +3407,27 @@ png_combine_row(png_structp png_ptr, png_bytep dp, int display)
                /* Check for double byte alignment and, if possible, use a
                 * 16-bit copy.  Don't attempt this for narrow images - ones that
                 * are less than an interlace panel wide.  Don't attempt it for
-                * wide bytes_to_copy either - use the png_memcpy there.
+                * wide bytes_to_copy either - use the memcpy there.
                 */
-               if (bytes_to_copy < 16 /*else use png_memcpy*/ &&
-                  png_isaligned(dp, png_uint_16) &&
-                  png_isaligned(sp, png_uint_16) &&
-                  bytes_to_copy % sizeof (png_uint_16) == 0 &&
-                  bytes_to_jump % sizeof (png_uint_16) == 0)
+               if (bytes_to_copy < 16 /*else use memcpy*/ &&
+                   png_isaligned(dp, png_uint_16) &&
+                   png_isaligned(sp, png_uint_16) &&
+                   bytes_to_copy % (sizeof (png_uint_16)) == 0 &&
+                   bytes_to_jump % (sizeof (png_uint_16)) == 0)
                {
                   /* Everything is aligned for png_uint_16 copies, but try for
                    * png_uint_32 first.
                    */
-                  if (png_isaligned(dp, png_uint_32) &&
-                     png_isaligned(sp, png_uint_32) &&
-                     bytes_to_copy % sizeof (png_uint_32) == 0 &&
-                     bytes_to_jump % sizeof (png_uint_32) == 0)
+                  if (png_isaligned(dp, png_uint_32) != 0 &&
+                      png_isaligned(sp, png_uint_32) != 0 &&
+                      bytes_to_copy % (sizeof (png_uint_32)) == 0 &&
+                      bytes_to_jump % (sizeof (png_uint_32)) == 0)
                   {
-                     png_uint_32p dp32 = (png_uint_32p)dp;
-                     png_const_uint_32p sp32 = (png_const_uint_32p)sp;
+                     png_uint_32p dp32 = png_aligncast(png_uint_32p,dp);
+                     png_const_uint_32p sp32 = png_aligncastconst(
+                         png_const_uint_32p, sp);
                      size_t skip = (bytes_to_jump-bytes_to_copy) /
-                        sizeof (png_uint_32);
+                         (sizeof (png_uint_32));
 
                      do
                      {
@@ -3203,7 +3435,7 @@ png_combine_row(png_structp png_ptr, png_bytep dp, int display)
                         do
                         {
                            *dp32++ = *sp32++;
-                           c -= sizeof (png_uint_32);
+                           c -= (sizeof (png_uint_32));
                         }
                         while (c > 0);
 
@@ -3233,10 +3465,11 @@ png_combine_row(png_structp png_ptr, png_bytep dp, int display)
                    */
                   else
                   {
-                     png_uint_16p dp16 = (png_uint_16p)dp;
-                     png_const_uint_16p sp16 = (png_const_uint_16p)sp;
+                     png_uint_16p dp16 = png_aligncast(png_uint_16p, dp);
+                     png_const_uint_16p sp16 = png_aligncastconst(
+                        png_const_uint_16p, sp);
                      size_t skip = (bytes_to_jump-bytes_to_copy) /
-                        sizeof (png_uint_16);
+                        (sizeof (png_uint_16));
 
                      do
                      {
@@ -3244,7 +3477,7 @@ png_combine_row(png_structp png_ptr, png_bytep dp, int display)
                         do
                         {
                            *dp16++ = *sp16++;
-                           c -= sizeof (png_uint_16);
+                           c -= (sizeof (png_uint_16));
                         }
                         while (c > 0);
 
@@ -3266,12 +3499,12 @@ png_combine_row(png_structp png_ptr, png_bytep dp, int display)
                      return;
                   }
                }
-#endif /* PNG_ALIGN_ code */
+#endif /* ALIGN_TYPE code */
 
-               /* The true default - use a png_memcpy: */
+               /* The true default - use a memcpy: */
                for (;;)
                {
-                  png_memcpy(dp, sp, bytes_to_copy);
+                  memcpy(dp, sp, bytes_to_copy);
 
                   if (row_width <= bytes_to_jump)
                      return;
@@ -3290,13 +3523,13 @@ png_combine_row(png_structp png_ptr, png_bytep dp, int display)
       /* Here if pixel_depth < 8 to check 'end_ptr' below. */
    }
    else
-#endif
+#endif /* READ_INTERLACING */
 
-   /* If here then the switch above wasn't used so just png_memcpy the whole row
+   /* If here then the switch above wasn't used so just memcpy the whole row
     * from the temporary row buffer (notice that this overwrites the end of the
     * destination row if it is a partial byte.)
     */
-   png_memcpy(dp, sp, PNG_ROWBYTES(pixel_depth, row_width));
+   memcpy(dp, sp, PNG_ROWBYTES(pixel_depth, row_width));
 
    /* Restore the overwritten bits from the last byte if necessary. */
    if (end_ptr != NULL)
@@ -3333,7 +3566,7 @@ png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
             int j;
 
 #ifdef PNG_READ_PACKSWAP_SUPPORTED
-            if (transformations & PNG_PACKSWAP)
+            if ((transformations & PNG_PACKSWAP) != 0)
             {
                 sshift = (int)((row_info->width + 7) & 0x07);
                 dshift = (int)((final_width + 7) & 0x07);
@@ -3357,8 +3590,9 @@ png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
                v = (png_byte)((*sp >> sshift) & 0x01);
                for (j = 0; j < jstop; j++)
                {
-                  *dp &= (png_byte)((0x7f7f >> (7 - dshift)) & 0xff);
-                  *dp |= (png_byte)(v << dshift);
+                  unsigned int tmp = *dp & (0x7f7f >> (7 - dshift));
+                  tmp |= v << dshift;
+                  *dp = (png_byte)(tmp & 0xff);
 
                   if (dshift == s_end)
                   {
@@ -3392,7 +3626,7 @@ png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
             png_uint_32 i;
 
 #ifdef PNG_READ_PACKSWAP_SUPPORTED
-            if (transformations & PNG_PACKSWAP)
+            if ((transformations & PNG_PACKSWAP) != 0)
             {
                sshift = (int)(((row_info->width + 3) & 0x03) << 1);
                dshift = (int)(((final_width + 3) & 0x03) << 1);
@@ -3419,8 +3653,9 @@ png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
                v = (png_byte)((*sp >> sshift) & 0x03);
                for (j = 0; j < jstop; j++)
                {
-                  *dp &= (png_byte)((0x3f3f >> (6 - dshift)) & 0xff);
-                  *dp |= (png_byte)(v << dshift);
+                  unsigned int tmp = *dp & (0x3f3f >> (6 - dshift));
+                  tmp |= v << dshift;
+                  *dp = (png_byte)(tmp & 0xff);
 
                   if (dshift == s_end)
                   {
@@ -3454,7 +3689,7 @@ png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
             int jstop = png_pass_inc[pass];
 
 #ifdef PNG_READ_PACKSWAP_SUPPORTED
-            if (transformations & PNG_PACKSWAP)
+            if ((transformations & PNG_PACKSWAP) != 0)
             {
                sshift = (int)(((row_info->width + 1) & 0x01) << 2);
                dshift = (int)(((final_width + 1) & 0x01) << 2);
@@ -3480,8 +3715,9 @@ png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
 
                for (j = 0; j < jstop; j++)
                {
-                  *dp &= (png_byte)((0xf0f >> (4 - dshift)) & 0xff);
-                  *dp |= (png_byte)(v << dshift);
+                  unsigned int tmp = *dp & (0xf0f >> (4 - dshift));
+                  tmp |= v << dshift;
+                  *dp = (png_byte)(tmp & 0xff);
 
                   if (dshift == s_end)
                   {
@@ -3522,11 +3758,11 @@ png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
                png_byte v[8]; /* SAFE; pixel_depth does not exceed 64 */
                int j;
 
-               png_memcpy(v, sp, pixel_bytes);
+               memcpy(v, sp, pixel_bytes);
 
                for (j = 0; j < jstop; j++)
                {
-                  png_memcpy(dp, v, pixel_bytes);
+                  memcpy(dp, v, pixel_bytes);
                   dp -= pixel_bytes;
                }
 
@@ -3543,7 +3779,7 @@ png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
    PNG_UNUSED(transformations)  /* Silence compiler warning */
 #endif
 }
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
+#endif /* READ_INTERLACING */
 
 static void
 png_read_filter_row_sub(png_row_infop row_info, png_bytep row,
@@ -3629,15 +3865,15 @@ png_read_filter_row_paeth_1byte_pixel(png_row_infop row_info, png_bytep row,
       p = b - c;
       pc = a - c;
 
-#     ifdef PNG_USE_ABS
-         pa = abs(p);
-         pb = abs(pc);
-         pc = abs(p + pc);
-#     else
-         pa = p < 0 ? -p : p;
-         pb = pc < 0 ? -pc : pc;
-         pc = (p + pc) < 0 ? -(p + pc) : p + pc;
-#     endif
+#ifdef PNG_USE_ABS
+      pa = abs(p);
+      pb = abs(pc);
+      pc = abs(p + pc);
+#else
+      pa = p < 0 ? -p : p;
+      pb = pc < 0 ? -pc : pc;
+      pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
 
       /* Find the best predictor, the least of pa, pb, pc favoring the earlier
        * ones in the case of a tie.
@@ -3684,27 +3920,35 @@ png_read_filter_row_paeth_multibyte_pixel(png_row_infop row_info, png_bytep row,
       p = b - c;
       pc = a - c;
 
-#     ifdef PNG_USE_ABS
-         pa = abs(p);
-         pb = abs(pc);
-         pc = abs(p + pc);
-#     else
-         pa = p < 0 ? -p : p;
-         pb = pc < 0 ? -pc : pc;
-         pc = (p + pc) < 0 ? -(p + pc) : p + pc;
-#     endif
+#ifdef PNG_USE_ABS
+      pa = abs(p);
+      pb = abs(pc);
+      pc = abs(p + pc);
+#else
+      pa = p < 0 ? -p : p;
+      pb = pc < 0 ? -pc : pc;
+      pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
 
       if (pb < pa) pa = pb, a = b;
       if (pc < pa) a = c;
 
-      c = b;
       a += *row;
       *row++ = (png_byte)a;
    }
 }
 
 static void
-png_init_filter_functions(png_structp pp)
+png_init_filter_functions(png_structrp pp)
+   /* This function is called once for every PNG image (except for PNG images
+    * that only use PNG_FILTER_VALUE_NONE for all rows) to set the
+    * implementations required to reverse the filtering of PNG rows.  Reversing
+    * the filter is the first transformation performed on the row data.  It is
+    * performed in place, therefore an implementation can be selected based on
+    * the image pixel format.  If the implementation depends on image width then
+    * take care to ensure that it works correctly if the image is interlaced -
+    * interlacing causes the actual row width to vary.
+    */
 {
    unsigned int bpp = (pp->pixel_depth + 7) >> 3;
 
@@ -3732,9 +3976,13 @@ png_init_filter_functions(png_structp pp)
 }
 
 void /* PRIVATE */
-png_read_filter_row(png_structp pp, png_row_infop row_info, png_bytep row,
+png_read_filter_row(png_structrp pp, png_row_infop row_info, png_bytep row,
    png_const_bytep prev_row, int filter)
 {
+   /* OPTIMIZATION: DO NOT MODIFY THIS FUNCTION, instead #define
+    * PNG_FILTER_OPTIMIZATIONS to a function that overrides the generic
+    * implementations.  See png_init_filter_functions above.
+    */
    if (filter > PNG_FILTER_VALUE_NONE && filter < PNG_FILTER_VALUE_LAST)
    {
       if (pp->read_filter[0] == NULL)
@@ -3746,9 +3994,185 @@ png_read_filter_row(png_structp pp, png_row_infop row_info, png_bytep row,
 
 #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 void /* PRIVATE */
-png_read_finish_row(png_structp png_ptr)
+png_read_IDAT_data(png_structrp png_ptr, png_bytep output,
+   png_alloc_size_t avail_out)
+{
+   /* Loop reading IDATs and decompressing the result into output[avail_out] */
+   png_ptr->zstream.next_out = output;
+   png_ptr->zstream.avail_out = 0; /* safety: set below */
+
+   if (output == NULL)
+      avail_out = 0;
+
+   do
+   {
+      int ret;
+      png_byte tmpbuf[PNG_INFLATE_BUF_SIZE];
+
+      if (png_ptr->zstream.avail_in == 0)
+      {
+         uInt avail_in;
+         png_bytep buffer;
+
+         while (png_ptr->idat_size == 0)
+         {
+            png_crc_finish(png_ptr, 0);
+
+            png_ptr->idat_size = png_read_chunk_header(png_ptr);
+            /* This is an error even in the 'check' case because the code just
+             * consumed a non-IDAT header.
+             */
+            if (png_ptr->chunk_name != png_IDAT)
+               png_error(png_ptr, "Not enough image data");
+         }
+
+         avail_in = png_ptr->IDAT_read_size;
+
+         if (avail_in > png_ptr->idat_size)
+            avail_in = (uInt)png_ptr->idat_size;
+
+         /* A PNG with a gradually increasing IDAT size will defeat this attempt
+          * to minimize memory usage by causing lots of re-allocs, but
+          * realistically doing IDAT_read_size re-allocs is not likely to be a
+          * big problem.
+          */
+         buffer = png_read_buffer(png_ptr, avail_in, 0/*error*/);
+
+         png_crc_read(png_ptr, buffer, avail_in);
+         png_ptr->idat_size -= avail_in;
+
+         png_ptr->zstream.next_in = buffer;
+         png_ptr->zstream.avail_in = avail_in;
+      }
+
+      /* And set up the output side. */
+      if (output != NULL) /* standard read */
+      {
+         uInt out = ZLIB_IO_MAX;
+
+         if (out > avail_out)
+            out = (uInt)avail_out;
+
+         avail_out -= out;
+         png_ptr->zstream.avail_out = out;
+      }
+
+      else /* after last row, checking for end */
+      {
+         png_ptr->zstream.next_out = tmpbuf;
+         png_ptr->zstream.avail_out = (sizeof tmpbuf);
+      }
+
+      /* Use NO_FLUSH; this gives zlib the maximum opportunity to optimize the
+       * process.  If the LZ stream is truncated the sequential reader will
+       * terminally damage the stream, above, by reading the chunk header of the
+       * following chunk (it then exits with png_error).
+       *
+       * TODO: deal more elegantly with truncated IDAT lists.
+       */
+      ret = PNG_INFLATE(png_ptr, Z_NO_FLUSH);
+
+      /* Take the unconsumed output back. */
+      if (output != NULL)
+         avail_out += png_ptr->zstream.avail_out;
+
+      else /* avail_out counts the extra bytes */
+         avail_out += (sizeof tmpbuf) - png_ptr->zstream.avail_out;
+
+      png_ptr->zstream.avail_out = 0;
+
+      if (ret == Z_STREAM_END)
+      {
+         /* Do this for safety; we won't read any more into this row. */
+         png_ptr->zstream.next_out = NULL;
+
+         png_ptr->mode |= PNG_AFTER_IDAT;
+         png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
+
+         if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0)
+            png_chunk_benign_error(png_ptr, "Extra compressed data");
+         break;
+      }
+
+      if (ret != Z_OK)
+      {
+         png_zstream_error(png_ptr, ret);
+
+         if (output != NULL)
+            png_chunk_error(png_ptr, png_ptr->zstream.msg);
+
+         else /* checking */
+         {
+            png_chunk_benign_error(png_ptr, png_ptr->zstream.msg);
+            return;
+         }
+      }
+   } while (avail_out > 0);
+
+   if (avail_out > 0)
+   {
+      /* The stream ended before the image; this is the same as too few IDATs so
+       * should be handled the same way.
+       */
+      if (output != NULL)
+         png_error(png_ptr, "Not enough image data");
+
+      else /* the deflate stream contained extra data */
+         png_chunk_benign_error(png_ptr, "Too much image data");
+   }
+}
+
+void /* PRIVATE */
+png_read_finish_IDAT(png_structrp png_ptr)
+{
+   /* We don't need any more data and the stream should have ended, however the
+    * LZ end code may actually not have been processed.  In this case we must
+    * read it otherwise stray unread IDAT data or, more likely, an IDAT chunk
+    * may still remain to be consumed.
+    */
+   if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)
+   {
+      /* The NULL causes png_read_IDAT_data to swallow any remaining bytes in
+       * the compressed stream, but the stream may be damaged too, so even after
+       * this call we may need to terminate the zstream ownership.
+       */
+      png_read_IDAT_data(png_ptr, NULL, 0);
+      png_ptr->zstream.next_out = NULL; /* safety */
+
+      /* Now clear everything out for safety; the following may not have been
+       * done.
+       */
+      if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)
+      {
+         png_ptr->mode |= PNG_AFTER_IDAT;
+         png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
+      }
+   }
+
+   /* If the zstream has not been released do it now *and* terminate the reading
+    * of the final IDAT chunk.
+    */
+   if (png_ptr->zowner == png_IDAT)
+   {
+      /* Always do this; the pointers otherwise point into the read buffer. */
+      png_ptr->zstream.next_in = NULL;
+      png_ptr->zstream.avail_in = 0;
+
+      /* Now we no longer own the zstream. */
+      png_ptr->zowner = 0;
+
+      /* The slightly weird semantics of the sequential IDAT reading is that we
+       * are always in or at the end of an IDAT chunk, so we always need to do a
+       * crc_finish here.  If idat_size is non-zero we also need to read the
+       * spurious bytes at the end of the chunk now.
+       */
+      (void)png_crc_finish(png_ptr, png_ptr->idat_size);
+   }
+}
+
+void /* PRIVATE */
+png_read_finish_row(png_structrp png_ptr)
 {
-#ifdef PNG_READ_INTERLACING_SUPPORTED
    /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
 
    /* Start of interlace block */
@@ -3762,22 +4186,20 @@ png_read_finish_row(png_structp png_ptr)
 
    /* Offset to next interlace block in the y direction */
    static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
 
    png_debug(1, "in png_read_finish_row");
    png_ptr->row_number++;
    if (png_ptr->row_number < png_ptr->num_rows)
       return;
 
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   if (png_ptr->interlaced)
+   if (png_ptr->interlaced != 0)
    {
       png_ptr->row_number = 0;
 
       /* TO DO: don't do this if prev_row isn't needed (requires
        * read-ahead of the next row's filter byte.
        */
-      png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
+      memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
 
       do
       {
@@ -3791,7 +4213,7 @@ png_read_finish_row(png_structp png_ptr)
             png_pass_start[png_ptr->pass]) /
             png_pass_inc[png_ptr->pass];
 
-         if (!(png_ptr->transformations & PNG_INTERLACE))
+         if ((png_ptr->transformations & PNG_INTERLACE) == 0)
          {
             png_ptr->num_rows = (png_ptr->height +
                 png_pass_yinc[png_ptr->pass] - 1 -
@@ -3807,80 +4229,15 @@ png_read_finish_row(png_structp png_ptr)
       if (png_ptr->pass < 7)
          return;
    }
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
-
-   if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
-   {
-      char extra;
-      int ret;
-
-      png_ptr->zstream.next_out = (Byte *)&extra;
-      png_ptr->zstream.avail_out = (uInt)1;
-
-      for (;;)
-      {
-         if (!(png_ptr->zstream.avail_in))
-         {
-            while (!png_ptr->idat_size)
-            {
-               png_crc_finish(png_ptr, 0);
-               png_ptr->idat_size = png_read_chunk_header(png_ptr);
-               if (png_ptr->chunk_name != png_IDAT)
-                  png_error(png_ptr, "Not enough image data");
-            }
-
-            png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
-            png_ptr->zstream.next_in = png_ptr->zbuf;
-
-            if (png_ptr->zbuf_size > png_ptr->idat_size)
-               png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
-
-            png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zstream.avail_in);
-            png_ptr->idat_size -= png_ptr->zstream.avail_in;
-         }
-
-         ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
-
-         if (ret == Z_STREAM_END)
-         {
-            if (!(png_ptr->zstream.avail_out) || png_ptr->zstream.avail_in ||
-                png_ptr->idat_size)
-               png_warning(png_ptr, "Extra compressed data");
-
-            png_ptr->mode |= PNG_AFTER_IDAT;
-            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-            break;
-         }
-
-         if (ret != Z_OK)
-            png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
-                "Decompression Error");
-
-         if (!(png_ptr->zstream.avail_out))
-         {
-            png_warning(png_ptr, "Extra compressed data");
-            png_ptr->mode |= PNG_AFTER_IDAT;
-            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-            break;
-         }
-
-      }
-      png_ptr->zstream.avail_out = 0;
-   }
 
-   if (png_ptr->idat_size || png_ptr->zstream.avail_in)
-      png_warning(png_ptr, "Extra compression data");
-
-   inflateReset(&png_ptr->zstream);
-
-   png_ptr->mode |= PNG_AFTER_IDAT;
+   /* Here after at the end of the last row of the last pass. */
+   png_read_finish_IDAT(png_ptr);
 }
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+#endif /* SEQUENTIAL_READ */
 
 void /* PRIVATE */
-png_read_start_row(png_structp png_ptr)
+png_read_start_row(png_structrp png_ptr)
 {
-#ifdef PNG_READ_INTERLACING_SUPPORTED
    /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
 
    /* Start of interlace block */
@@ -3894,20 +4251,18 @@ png_read_start_row(png_structp png_ptr)
 
    /* Offset to next interlace block in the y direction */
    static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-#endif
 
    int max_pixel_depth;
    png_size_t row_bytes;
 
    png_debug(1, "in png_read_start_row");
-   png_ptr->zstream.avail_in = 0;
+
 #ifdef PNG_READ_TRANSFORMS_SUPPORTED
    png_init_read_transformations(png_ptr);
 #endif
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   if (png_ptr->interlaced)
+   if (png_ptr->interlaced != 0)
    {
-      if (!(png_ptr->transformations & PNG_INTERLACE))
+      if ((png_ptr->transformations & PNG_INTERLACE) == 0)
          png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
              png_pass_ystart[0]) / png_pass_yinc[0];
 
@@ -3921,7 +4276,6 @@ png_read_start_row(png_structp png_ptr)
    }
 
    else
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
    {
       png_ptr->num_rows = png_ptr->height;
       png_ptr->iwidth = png_ptr->width;
@@ -3929,7 +4283,7 @@ png_read_start_row(png_structp png_ptr)
 
    max_pixel_depth = png_ptr->pixel_depth;
 
-   /* WARNING: * png_read_transform_info (pngrtran.c) performs a simpliar set of
+   /* WARNING: * png_read_transform_info (pngrtran.c) performs a simpler set of
     * calculations to calculate the final pixel depth, then
     * png_do_read_transforms actually does the transforms.  This means that the
     * code which effectively calculates this value is actually repeated in three
@@ -3940,16 +4294,16 @@ png_read_start_row(png_structp png_ptr)
     * TODO: fix this.
     */
 #ifdef PNG_READ_PACK_SUPPORTED
-   if ((png_ptr->transformations & PNG_PACK) && png_ptr->bit_depth < 8)
+   if ((png_ptr->transformations & PNG_PACK) != 0 && png_ptr->bit_depth < 8)
       max_pixel_depth = 8;
 #endif
 
 #ifdef PNG_READ_EXPAND_SUPPORTED
-   if (png_ptr->transformations & PNG_EXPAND)
+   if ((png_ptr->transformations & PNG_EXPAND) != 0)
    {
       if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
       {
-         if (png_ptr->num_trans)
+         if (png_ptr->num_trans != 0)
             max_pixel_depth = 32;
 
          else
@@ -3961,13 +4315,13 @@ png_read_start_row(png_structp png_ptr)
          if (max_pixel_depth < 8)
             max_pixel_depth = 8;
 
-         if (png_ptr->num_trans)
+         if (png_ptr->num_trans != 0)
             max_pixel_depth *= 2;
       }
 
       else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
       {
-         if (png_ptr->num_trans)
+         if (png_ptr->num_trans != 0)
          {
             max_pixel_depth *= 4;
             max_pixel_depth /= 3;
@@ -3977,25 +4331,25 @@ png_read_start_row(png_structp png_ptr)
 #endif
 
 #ifdef PNG_READ_EXPAND_16_SUPPORTED
-   if (png_ptr->transformations & PNG_EXPAND_16)
+   if ((png_ptr->transformations & PNG_EXPAND_16) != 0)
    {
-#     ifdef PNG_READ_EXPAND_SUPPORTED
-         /* In fact it is an error if it isn't supported, but checking is
-          * the safe way.
-          */
-         if (png_ptr->transformations & PNG_EXPAND)
-         {
-            if (png_ptr->bit_depth < 16)
-               max_pixel_depth *= 2;
-         }
-         else
-#     endif
-         png_ptr->transformations &= ~PNG_EXPAND_16;
+#  ifdef PNG_READ_EXPAND_SUPPORTED
+      /* In fact it is an error if it isn't supported, but checking is
+       * the safe way.
+       */
+      if ((png_ptr->transformations & PNG_EXPAND) != 0)
+      {
+         if (png_ptr->bit_depth < 16)
+            max_pixel_depth *= 2;
+      }
+      else
+#  endif
+      png_ptr->transformations &= ~PNG_EXPAND_16;
    }
 #endif
 
 #ifdef PNG_READ_FILLER_SUPPORTED
-   if (png_ptr->transformations & (PNG_FILLER))
+   if ((png_ptr->transformations & (PNG_FILLER)) != 0)
    {
       if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
       {
@@ -4019,14 +4373,15 @@ png_read_start_row(png_structp png_ptr)
 #endif
 
 #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-   if (png_ptr->transformations & PNG_GRAY_TO_RGB)
+   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0)
    {
       if (
 #ifdef PNG_READ_EXPAND_SUPPORTED
-          (png_ptr->num_trans && (png_ptr->transformations & PNG_EXPAND)) ||
+          (png_ptr->num_trans != 0 &&
+          (png_ptr->transformations & PNG_EXPAND) != 0) ||
 #endif
 #ifdef PNG_READ_FILLER_SUPPORTED
-          (png_ptr->transformations & (PNG_FILLER)) ||
+          (png_ptr->transformations & (PNG_FILLER)) != 0 ||
 #endif
           png_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
       {
@@ -4059,7 +4414,7 @@ png_read_start_row(png_structp png_ptr)
 
 #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) && \
 defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
-   if (png_ptr->transformations & PNG_USER_TRANSFORM)
+   if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)
    {
       int user_pixel_depth = png_ptr->user_transform_depth *
          png_ptr->user_transform_channels;
@@ -4095,7 +4450,7 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
      png_free(png_ptr, png_ptr->big_row_buf);
      png_free(png_ptr, png_ptr->big_prev_row);
 
-     if (png_ptr->interlaced)
+     if (png_ptr->interlaced != 0)
         png_ptr->big_row_buf = (png_bytep)png_calloc(png_ptr,
             row_bytes + 48);
 
@@ -4138,7 +4493,7 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
    if (png_ptr->rowbytes > (PNG_SIZE_MAX - 1))
       png_error(png_ptr, "Row has too many bytes to allocate in memory");
 
-   png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
+   memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
 
    png_debug1(3, "width = %u,", png_ptr->width);
    png_debug1(3, "height = %u,", png_ptr->height);
@@ -4148,6 +4503,27 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
    png_debug1(3, "irowbytes = %lu",
        (unsigned long)PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->iwidth) + 1);
 
+   /* The sequential reader needs a buffer for IDAT, but the progressive reader
+    * does not, so free the read buffer now regardless; the sequential reader
+    * reallocates it on demand.
+    */
+   if (png_ptr->read_buffer != 0)
+   {
+      png_bytep buffer = png_ptr->read_buffer;
+
+      png_ptr->read_buffer_size = 0;
+      png_ptr->read_buffer = NULL;
+      png_free(png_ptr, buffer);
+   }
+
+   /* Finally claim the zstream for the inflate of the IDAT data, use the bits
+    * value from the stream (note that this will result in a fatal error if the
+    * IDAT stream has a bogus deflate header window_bits value, but this should
+    * not be happening any longer!)
+    */
+   if (png_inflate_claim(png_ptr, png_IDAT) != Z_OK)
+      png_error(png_ptr, png_ptr->zstream.msg);
+
    png_ptr->flags |= PNG_FLAG_ROW_INIT;
 }
-#endif /* PNG_READ_SUPPORTED */
+#endif /* READ */
diff --git a/drivers/png/pngset.c b/drivers/png/pngset.c
index 61be6bc62e..43456b729d 100644
--- a/drivers/png/pngset.c
+++ b/drivers/png/pngset.c
@@ -1,8 +1,8 @@
 
 /* pngset.c - storage of image information into info struct
  *
- * Last changed in libpng 1.5.26 [December 17, 2015]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.23 [June 9, 2016]
+ * Copyright (c) 1998-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -20,106 +20,53 @@
 
 #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
 
-#if defined(PNG_TEXT_SUPPORTED) || defined(PNG_pCAL_SUPPORTED) ||\
-    defined(PNG_iCCP_SUPPORTED) || defined(PNG_sPLT_SUPPORTED)
-/* Check that the tEXt or zTXt keyword is valid per PNG 1.0 specification,
- * and if invalid, correct the keyword rather than discarding the entire
- * chunk.  The PNG 1.0 specification requires keywords 1-79 characters in
- * length, forbids leading or trailing whitespace, multiple internal spaces,
- * and the non-break space (0x80) from ISO 8859-1.  Returns keyword length.
- *
- * The 'new_key' buffer must be 80 characters in size (for the keyword plus a
- * trailing '\0').  If this routine returns 0 then there was no keyword, or a
- * valid one could not be generated, and the caller must handle the error by not
- * setting the keyword.
- */
-static png_uint_32
-png_check_keyword(png_const_charp key, png_bytep new_key)
-{
-   png_uint_32 key_len = 0;
-   int space = 1;
-
-   if (key == NULL)
-   {
-      *new_key = 0;
-      return 0;
-   }
-
-   while (*key && key_len < 79)
-   {
-      png_byte ch = (png_byte)*key++;
-
-      if ((ch > 32 && ch <= 126) || (ch >= 161 /*&& ch <= 255*/))
-         *new_key++ = ch, ++key_len, space = 0;
-
-      else if (space == 0)
-      {
-         /* A space or an invalid character when one wasn't seen immediately
-          * before; output just a space.
-          */
-         *new_key++ = 32, ++key_len, space = 1;
-      }
-   }
-
-   if (key_len > 0 && space != 0) /* trailing space */
-      --key_len, --new_key;
-
-   /* Terminate the keyword */
-   *new_key = 0;
-
-   if (key_len == 0)
-      return 0;
-
-   return key_len;
-}
-#endif /* TEXT || pCAL || iCCP || sPLT */
-
 #ifdef PNG_bKGD_SUPPORTED
 void PNGAPI
-png_set_bKGD(png_structp png_ptr, png_infop info_ptr,
+png_set_bKGD(png_const_structrp png_ptr, png_inforp info_ptr,
     png_const_color_16p background)
 {
    png_debug1(1, "in %s storage function", "bKGD");
 
-   if (png_ptr == NULL || info_ptr == NULL)
+   if (png_ptr == NULL || info_ptr == NULL || background == NULL)
       return;
 
-   png_memcpy(&(info_ptr->background), background, png_sizeof(png_color_16));
+   info_ptr->background = *background;
    info_ptr->valid |= PNG_INFO_bKGD;
 }
 #endif
 
 #ifdef PNG_cHRM_SUPPORTED
 void PNGFAPI
-png_set_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,
+png_set_cHRM_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
     png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,
     png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,
     png_fixed_point blue_x, png_fixed_point blue_y)
 {
+   png_xy xy;
+
    png_debug1(1, "in %s storage function", "cHRM fixed");
 
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
-#  ifdef PNG_CHECK_cHRM_SUPPORTED
-   if (png_check_cHRM_fixed(png_ptr,
-       white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y))
-#  endif
-   {
-      info_ptr->x_white = white_x;
-      info_ptr->y_white = white_y;
-      info_ptr->x_red   = red_x;
-      info_ptr->y_red   = red_y;
-      info_ptr->x_green = green_x;
-      info_ptr->y_green = green_y;
-      info_ptr->x_blue  = blue_x;
-      info_ptr->y_blue  = blue_y;
-      info_ptr->valid |= PNG_INFO_cHRM;
-   }
+   xy.redx = red_x;
+   xy.redy = red_y;
+   xy.greenx = green_x;
+   xy.greeny = green_y;
+   xy.bluex = blue_x;
+   xy.bluey = blue_y;
+   xy.whitex = white_x;
+   xy.whitey = white_y;
+
+   if (png_colorspace_set_chromaticities(png_ptr, &info_ptr->colorspace, &xy,
+       2/* override with app values*/) != 0)
+      info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
+
+   png_colorspace_sync_info(png_ptr, info_ptr);
 }
 
 void PNGFAPI
-png_set_cHRM_XYZ_fixed(png_structp png_ptr, png_infop info_ptr,
+png_set_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
     png_fixed_point int_red_X, png_fixed_point int_red_Y,
     png_fixed_point int_red_Z, png_fixed_point int_green_X,
     png_fixed_point int_green_Y, png_fixed_point int_green_Z,
@@ -127,33 +74,32 @@ png_set_cHRM_XYZ_fixed(png_structp png_ptr, png_infop info_ptr,
     png_fixed_point int_blue_Z)
 {
    png_XYZ XYZ;
-   png_xy xy;
 
    png_debug1(1, "in %s storage function", "cHRM XYZ fixed");
 
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
-   XYZ.redX = int_red_X;
-   XYZ.redY = int_red_Y;
-   XYZ.redZ = int_red_Z;
-   XYZ.greenX = int_green_X;
-   XYZ.greenY = int_green_Y;
-   XYZ.greenZ = int_green_Z;
-   XYZ.blueX = int_blue_X;
-   XYZ.blueY = int_blue_Y;
-   XYZ.blueZ = int_blue_Z;
-
-   if (png_xy_from_XYZ(&xy, XYZ))
-      png_error(png_ptr, "XYZ values out of representable range");
-
-   png_set_cHRM_fixed(png_ptr, info_ptr, xy.whitex, xy.whitey, xy.redx, xy.redy,
-      xy.greenx, xy.greeny, xy.bluex, xy.bluey);
+   XYZ.red_X = int_red_X;
+   XYZ.red_Y = int_red_Y;
+   XYZ.red_Z = int_red_Z;
+   XYZ.green_X = int_green_X;
+   XYZ.green_Y = int_green_Y;
+   XYZ.green_Z = int_green_Z;
+   XYZ.blue_X = int_blue_X;
+   XYZ.blue_Y = int_blue_Y;
+   XYZ.blue_Z = int_blue_Z;
+
+   if (png_colorspace_set_endpoints(png_ptr, &info_ptr->colorspace,
+       &XYZ, 2) != 0)
+      info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
+
+   png_colorspace_sync_info(png_ptr, info_ptr);
 }
 
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
 void PNGAPI
-png_set_cHRM(png_structp png_ptr, png_infop info_ptr,
+png_set_cHRM(png_const_structrp png_ptr, png_inforp info_ptr,
     double white_x, double white_y, double red_x, double red_y,
     double green_x, double green_y, double blue_x, double blue_y)
 {
@@ -169,7 +115,7 @@ png_set_cHRM(png_structp png_ptr, png_infop info_ptr,
 }
 
 void PNGAPI
-png_set_cHRM_XYZ(png_structp png_ptr, png_infop info_ptr, double red_X,
+png_set_cHRM_XYZ(png_const_structrp png_ptr, png_inforp info_ptr, double red_X,
     double red_Y, double red_Z, double green_X, double green_Y, double green_Z,
     double blue_X, double blue_Y, double blue_Z)
 {
@@ -184,41 +130,27 @@ png_set_cHRM_XYZ(png_structp png_ptr, png_infop info_ptr, double red_X,
       png_fixed(png_ptr, blue_Y, "cHRM Blue Y"),
       png_fixed(png_ptr, blue_Z, "cHRM Blue Z"));
 }
-#  endif /* PNG_FLOATING_POINT_SUPPORTED */
+#  endif /* FLOATING_POINT */
 
-#endif /* PNG_cHRM_SUPPORTED */
+#endif /* cHRM */
 
 #ifdef PNG_gAMA_SUPPORTED
 void PNGFAPI
-png_set_gAMA_fixed(png_structp png_ptr, png_infop info_ptr, png_fixed_point
-    file_gamma)
+png_set_gAMA_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
+    png_fixed_point file_gamma)
 {
    png_debug1(1, "in %s storage function", "gAMA");
 
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
-   /* Changed in libpng-1.5.4 to limit the values to ensure overflow can't
-    * occur.  Since the fixed point representation is assymetrical it is
-    * possible for 1/gamma to overflow the limit of 21474 and this means the
-    * gamma value must be at least 5/100000 and hence at most 20000.0.  For
-    * safety the limits here are a little narrower.  The values are 0.00016 to
-    * 6250.0, which are truly ridiculous gamma values (and will produce
-    * displays that are all black or all white.)
-    */
-   if (file_gamma < 16 || file_gamma > 625000000)
-      png_warning(png_ptr, "Out of range gamma value ignored");
-
-   else
-   {
-      info_ptr->gamma = file_gamma;
-      info_ptr->valid |= PNG_INFO_gAMA;
-   }
+   png_colorspace_set_gamma(png_ptr, &info_ptr->colorspace, file_gamma);
+   png_colorspace_sync_info(png_ptr, info_ptr);
 }
 
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
 void PNGAPI
-png_set_gAMA(png_structp png_ptr, png_infop info_ptr, double file_gamma)
+png_set_gAMA(png_const_structrp png_ptr, png_inforp info_ptr, double file_gamma)
 {
    png_set_gAMA_fixed(png_ptr, info_ptr, png_fixed(png_ptr, file_gamma,
        "png_set_gAMA"));
@@ -228,7 +160,8 @@ png_set_gAMA(png_structp png_ptr, png_infop info_ptr, double file_gamma)
 
 #ifdef PNG_hIST_SUPPORTED
 void PNGAPI
-png_set_hIST(png_structp png_ptr, png_infop info_ptr, png_const_uint_16p hist)
+png_set_hIST(png_const_structrp png_ptr, png_inforp info_ptr,
+    png_const_uint_16p hist)
 {
    int i;
 
@@ -251,26 +184,27 @@ png_set_hIST(png_structp png_ptr, png_infop info_ptr, png_const_uint_16p hist)
    /* Changed from info->num_palette to PNG_MAX_PALETTE_LENGTH in
     * version 1.2.1
     */
-   png_ptr->hist = (png_uint_16p)png_malloc_warn(png_ptr,
-       PNG_MAX_PALETTE_LENGTH * png_sizeof(png_uint_16));
+   info_ptr->hist = png_voidcast(png_uint_16p, png_malloc_warn(png_ptr,
+       PNG_MAX_PALETTE_LENGTH * (sizeof (png_uint_16))));
 
-   if (png_ptr->hist == NULL)
+   if (info_ptr->hist == NULL)
    {
       png_warning(png_ptr, "Insufficient memory for hIST chunk data");
+
       return;
    }
 
+   info_ptr->free_me |= PNG_FREE_HIST;
+
    for (i = 0; i < info_ptr->num_palette; i++)
-      png_ptr->hist[i] = hist[i];
+      info_ptr->hist[i] = hist[i];
 
-   info_ptr->hist = png_ptr->hist;
    info_ptr->valid |= PNG_INFO_hIST;
-   info_ptr->free_me |= PNG_FREE_HIST;
 }
 #endif
 
 void PNGAPI
-png_set_IHDR(png_structp png_ptr, png_infop info_ptr,
+png_set_IHDR(png_const_structrp png_ptr, png_inforp info_ptr,
     png_uint_32 width, png_uint_32 height, int bit_depth,
     int color_type, int interlace_type, int compression_type,
     int filter_type)
@@ -295,13 +229,13 @@ png_set_IHDR(png_structp png_ptr, png_infop info_ptr,
    if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
       info_ptr->channels = 1;
 
-   else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
+   else if ((info_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
       info_ptr->channels = 3;
 
    else
       info_ptr->channels = 1;
 
-   if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+   if ((info_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)
       info_ptr->channels++;
 
    info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
@@ -311,7 +245,7 @@ png_set_IHDR(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_oFFs_SUPPORTED
 void PNGAPI
-png_set_oFFs(png_structp png_ptr, png_infop info_ptr,
+png_set_oFFs(png_const_structrp png_ptr, png_inforp info_ptr,
     png_int_32 offset_x, png_int_32 offset_y, int unit_type)
 {
    png_debug1(1, "in %s storage function", "oFFs");
@@ -328,28 +262,20 @@ png_set_oFFs(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_pCAL_SUPPORTED
 void PNGAPI
-png_set_pCAL(png_structp png_ptr, png_infop info_ptr,
+png_set_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,
     png_const_charp purpose, png_int_32 X0, png_int_32 X1, int type,
     int nparams, png_const_charp units, png_charpp params)
 {
-   png_byte new_purpose[80];
    png_size_t length;
    int i;
 
    png_debug1(1, "in %s storage function", "pCAL");
 
-   if (png_ptr == NULL || info_ptr == NULL)
+   if (png_ptr == NULL || info_ptr == NULL || purpose == NULL || units == NULL
+       || (nparams > 0 && params == NULL))
       return;
 
-   length = png_check_keyword(purpose, new_purpose);
-
-   if (length == 0)
-   {
-      png_warning(png_ptr, "pCAL: invalid purpose keyword");
-      return;
-   }
-      
-   ++length;
+   length = strlen(purpose) + 1;
    png_debug1(3, "allocating purpose for info (%lu bytes)",
        (unsigned long)length);
 
@@ -359,20 +285,28 @@ png_set_pCAL(png_structp png_ptr, png_infop info_ptr,
    if (type < 0 || type > 3)
       png_error(png_ptr, "Invalid pCAL equation type");
 
+   if (nparams < 0 || nparams > 255)
+      png_error(png_ptr, "Invalid pCAL parameter count");
+
    /* Validate params[nparams] */
    for (i=0; i<nparams; ++i)
-      if (!png_check_fp_string(params[i], png_strlen(params[i])))
+   {
+      if (params[i] == NULL ||
+          !png_check_fp_string(params[i], strlen(params[i])))
          png_error(png_ptr, "Invalid format for pCAL parameter");
+   }
 
-   info_ptr->pcal_purpose = (png_charp)png_malloc_warn(png_ptr, length);
+   info_ptr->pcal_purpose = png_voidcast(png_charp,
+       png_malloc_warn(png_ptr, length));
 
    if (info_ptr->pcal_purpose == NULL)
    {
       png_warning(png_ptr, "Insufficient memory for pCAL purpose");
+
       return;
    }
 
-   png_memcpy(info_ptr->pcal_purpose, new_purpose, length);
+   memcpy(info_ptr->pcal_purpose, purpose, length);
 
    png_debug(3, "storing X0, X1, type, and nparams in info");
    info_ptr->pcal_X0 = X0;
@@ -380,34 +314,37 @@ png_set_pCAL(png_structp png_ptr, png_infop info_ptr,
    info_ptr->pcal_type = (png_byte)type;
    info_ptr->pcal_nparams = (png_byte)nparams;
 
-   length = png_strlen(units) + 1;
+   length = strlen(units) + 1;
    png_debug1(3, "allocating units for info (%lu bytes)",
      (unsigned long)length);
 
-   info_ptr->pcal_units = (png_charp)png_malloc_warn(png_ptr, length);
+   info_ptr->pcal_units = png_voidcast(png_charp,
+      png_malloc_warn(png_ptr, length));
 
    if (info_ptr->pcal_units == NULL)
    {
       png_warning(png_ptr, "Insufficient memory for pCAL units");
+
       return;
    }
 
-   png_memcpy(info_ptr->pcal_units, units, length);
+   memcpy(info_ptr->pcal_units, units, length);
 
-   info_ptr->pcal_params = (png_charpp)png_malloc_warn(png_ptr,
-       (png_size_t)((nparams + 1) * png_sizeof(png_charp)));
+   info_ptr->pcal_params = png_voidcast(png_charpp, png_malloc_warn(png_ptr,
+       (png_size_t)((nparams + 1) * (sizeof (png_charp)))));
 
    if (info_ptr->pcal_params == NULL)
    {
       png_warning(png_ptr, "Insufficient memory for pCAL params");
+
       return;
    }
 
-   png_memset(info_ptr->pcal_params, 0, (nparams + 1) * png_sizeof(png_charp));
+   memset(info_ptr->pcal_params, 0, (nparams + 1) * (sizeof (png_charp)));
 
    for (i = 0; i < nparams; i++)
    {
-      length = png_strlen(params[i]) + 1;
+      length = strlen(params[i]) + 1;
       png_debug2(3, "allocating parameter %d for info (%lu bytes)", i,
           (unsigned long)length);
 
@@ -416,10 +353,11 @@ png_set_pCAL(png_structp png_ptr, png_infop info_ptr,
       if (info_ptr->pcal_params[i] == NULL)
       {
          png_warning(png_ptr, "Insufficient memory for pCAL parameter");
+
          return;
       }
 
-      png_memcpy(info_ptr->pcal_params[i], params[i], length);
+      memcpy(info_ptr->pcal_params[i], params[i], length);
    }
 
    info_ptr->valid |= PNG_INFO_pCAL;
@@ -429,7 +367,7 @@ png_set_pCAL(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_sCAL_SUPPORTED
 void PNGAPI
-png_set_sCAL_s(png_structp png_ptr, png_infop info_ptr,
+png_set_sCAL_s(png_const_structrp png_ptr, png_inforp info_ptr,
     int unit, png_const_charp swidth, png_const_charp sheight)
 {
    png_size_t lengthw = 0, lengthh = 0;
@@ -445,11 +383,11 @@ png_set_sCAL_s(png_structp png_ptr, png_infop info_ptr,
    if (unit != 1 && unit != 2)
       png_error(png_ptr, "Invalid sCAL unit");
 
-   if (swidth == NULL || (lengthw = png_strlen(swidth)) == 0 ||
+   if (swidth == NULL || (lengthw = strlen(swidth)) == 0 ||
        swidth[0] == 45 /* '-' */ || !png_check_fp_string(swidth, lengthw))
       png_error(png_ptr, "Invalid sCAL width");
 
-   if (sheight == NULL || (lengthh = png_strlen(sheight)) == 0 ||
+   if (sheight == NULL || (lengthh = strlen(sheight)) == 0 ||
        sheight[0] == 45 /* '-' */ || !png_check_fp_string(sheight, lengthh))
       png_error(png_ptr, "Invalid sCAL height");
 
@@ -459,21 +397,24 @@ png_set_sCAL_s(png_structp png_ptr, png_infop info_ptr,
 
    png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthw);
 
-   info_ptr->scal_s_width = (png_charp)png_malloc_warn(png_ptr, lengthw);
+   info_ptr->scal_s_width = png_voidcast(png_charp,
+      png_malloc_warn(png_ptr, lengthw));
 
    if (info_ptr->scal_s_width == NULL)
    {
       png_warning(png_ptr, "Memory allocation failed while processing sCAL");
+
       return;
    }
 
-   png_memcpy(info_ptr->scal_s_width, swidth, lengthw);
+   memcpy(info_ptr->scal_s_width, swidth, lengthw);
 
    ++lengthh;
 
    png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthh);
 
-   info_ptr->scal_s_height = (png_charp)png_malloc_warn(png_ptr, lengthh);
+   info_ptr->scal_s_height = png_voidcast(png_charp,
+      png_malloc_warn(png_ptr, lengthh));
 
    if (info_ptr->scal_s_height == NULL)
    {
@@ -481,10 +422,11 @@ png_set_sCAL_s(png_structp png_ptr, png_infop info_ptr,
       info_ptr->scal_s_width = NULL;
 
       png_warning(png_ptr, "Memory allocation failed while processing sCAL");
+
       return;
    }
 
-   png_memcpy(info_ptr->scal_s_height, sheight, lengthh);
+   memcpy(info_ptr->scal_s_height, sheight, lengthh);
 
    info_ptr->valid |= PNG_INFO_sCAL;
    info_ptr->free_me |= PNG_FREE_SCAL;
@@ -492,8 +434,8 @@ png_set_sCAL_s(png_structp png_ptr, png_infop info_ptr,
 
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
 void PNGAPI
-png_set_sCAL(png_structp png_ptr, png_infop info_ptr, int unit, double width,
-    double height)
+png_set_sCAL(png_const_structrp png_ptr, png_inforp info_ptr, int unit,
+    double width, double height)
 {
    png_debug1(1, "in %s storage function", "sCAL");
 
@@ -510,9 +452,9 @@ png_set_sCAL(png_structp png_ptr, png_infop info_ptr, int unit, double width,
       char swidth[PNG_sCAL_MAX_DIGITS+1];
       char sheight[PNG_sCAL_MAX_DIGITS+1];
 
-      png_ascii_from_fp(png_ptr, swidth, sizeof swidth, width,
+      png_ascii_from_fp(png_ptr, swidth, (sizeof swidth), width,
          PNG_sCAL_PRECISION);
-      png_ascii_from_fp(png_ptr, sheight, sizeof sheight, height,
+      png_ascii_from_fp(png_ptr, sheight, (sizeof sheight), height,
          PNG_sCAL_PRECISION);
 
       png_set_sCAL_s(png_ptr, info_ptr, unit, swidth, sheight);
@@ -522,7 +464,7 @@ png_set_sCAL(png_structp png_ptr, png_infop info_ptr, int unit, double width,
 
 #  ifdef PNG_FIXED_POINT_SUPPORTED
 void PNGAPI
-png_set_sCAL_fixed(png_structp png_ptr, png_infop info_ptr, int unit,
+png_set_sCAL_fixed(png_const_structrp png_ptr, png_inforp info_ptr, int unit,
     png_fixed_point width, png_fixed_point height)
 {
    png_debug1(1, "in %s storage function", "sCAL");
@@ -540,8 +482,8 @@ png_set_sCAL_fixed(png_structp png_ptr, png_infop info_ptr, int unit,
       char swidth[PNG_sCAL_MAX_DIGITS+1];
       char sheight[PNG_sCAL_MAX_DIGITS+1];
 
-      png_ascii_from_fixed(png_ptr, swidth, sizeof swidth, width);
-      png_ascii_from_fixed(png_ptr, sheight, sizeof sheight, height);
+      png_ascii_from_fixed(png_ptr, swidth, (sizeof swidth), width);
+      png_ascii_from_fixed(png_ptr, sheight, (sizeof sheight), height);
 
       png_set_sCAL_s(png_ptr, info_ptr, unit, swidth, sheight);
    }
@@ -551,7 +493,7 @@ png_set_sCAL_fixed(png_structp png_ptr, png_infop info_ptr, int unit,
 
 #ifdef PNG_pHYs_SUPPORTED
 void PNGAPI
-png_set_pHYs(png_structp png_ptr, png_infop info_ptr,
+png_set_pHYs(png_const_structrp png_ptr, png_inforp info_ptr,
     png_uint_32 res_x, png_uint_32 res_y, int unit_type)
 {
    png_debug1(1, "in %s storage function", "pHYs");
@@ -567,7 +509,7 @@ png_set_pHYs(png_structp png_ptr, png_infop info_ptr,
 #endif
 
 void PNGAPI
-png_set_PLTE(png_structp png_ptr, png_infop info_ptr,
+png_set_PLTE(png_structrp png_ptr, png_inforp info_ptr,
     png_const_colorp palette, int num_palette)
 {
 
@@ -589,13 +531,27 @@ png_set_PLTE(png_structp png_ptr, png_infop info_ptr,
       else
       {
          png_warning(png_ptr, "Invalid palette length");
+
          return;
       }
    }
 
+   if ((num_palette > 0 && palette == NULL) ||
+      (num_palette == 0
+#        ifdef PNG_MNG_FEATURES_SUPPORTED
+            && (png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) == 0
+#        endif
+      ))
+   {
+      png_error(png_ptr, "Invalid palette");
+   }
+
    /* It may not actually be necessary to set png_ptr->palette here;
     * we do it for backward compatibility with the way the png_handle_tRNS
     * function used to do the allocation.
+    *
+    * 1.6.0: the above statement appears to be incorrect; something has to set
+    * the palette inside png_struct on read.
     */
    png_free_data(png_ptr, info_ptr, PNG_FREE_PLTE, 0);
 
@@ -603,10 +559,11 @@ png_set_PLTE(png_structp png_ptr, png_infop info_ptr,
     * of num_palette entries, in case of an invalid PNG file or incorrect
     * call to png_set_PLTE() with too-large sample values.
     */
-   png_ptr->palette = (png_colorp)png_calloc(png_ptr,
-       PNG_MAX_PALETTE_LENGTH * png_sizeof(png_color));
+   png_ptr->palette = png_voidcast(png_colorp, png_calloc(png_ptr,
+       PNG_MAX_PALETTE_LENGTH * (sizeof (png_color))));
 
-   png_memcpy(png_ptr->palette, palette, num_palette * png_sizeof(png_color));
+   if (num_palette > 0)
+      memcpy(png_ptr->palette, palette, num_palette * (sizeof (png_color)));
    info_ptr->palette = png_ptr->palette;
    info_ptr->num_palette = png_ptr->num_palette = (png_uint_16)num_palette;
 
@@ -617,34 +574,34 @@ png_set_PLTE(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_sBIT_SUPPORTED
 void PNGAPI
-png_set_sBIT(png_structp png_ptr, png_infop info_ptr,
+png_set_sBIT(png_const_structrp png_ptr, png_inforp info_ptr,
     png_const_color_8p sig_bit)
 {
    png_debug1(1, "in %s storage function", "sBIT");
 
-   if (png_ptr == NULL || info_ptr == NULL)
+   if (png_ptr == NULL || info_ptr == NULL || sig_bit == NULL)
       return;
 
-   png_memcpy(&(info_ptr->sig_bit), sig_bit, png_sizeof(png_color_8));
+   info_ptr->sig_bit = *sig_bit;
    info_ptr->valid |= PNG_INFO_sBIT;
 }
 #endif
 
 #ifdef PNG_sRGB_SUPPORTED
 void PNGAPI
-png_set_sRGB(png_structp png_ptr, png_infop info_ptr, int srgb_intent)
+png_set_sRGB(png_const_structrp png_ptr, png_inforp info_ptr, int srgb_intent)
 {
    png_debug1(1, "in %s storage function", "sRGB");
 
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
-   info_ptr->srgb_intent = (png_byte)srgb_intent;
-   info_ptr->valid |= PNG_INFO_sRGB;
+   (void)png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace, srgb_intent);
+   png_colorspace_sync_info(png_ptr, info_ptr);
 }
 
 void PNGAPI
-png_set_sRGB_gAMA_and_cHRM(png_structp png_ptr, png_infop info_ptr,
+png_set_sRGB_gAMA_and_cHRM(png_const_structrp png_ptr, png_inforp info_ptr,
     int srgb_intent)
 {
    png_debug1(1, "in %s storage function", "sRGB_gAMA_and_cHRM");
@@ -652,32 +609,25 @@ png_set_sRGB_gAMA_and_cHRM(png_structp png_ptr, png_infop info_ptr,
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
-   png_set_sRGB(png_ptr, info_ptr, srgb_intent);
-
-#  ifdef PNG_gAMA_SUPPORTED
-   png_set_gAMA_fixed(png_ptr, info_ptr, PNG_GAMMA_sRGB_INVERSE);
-#  endif
+   if (png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace,
+       srgb_intent) != 0)
+   {
+      /* This causes the gAMA and cHRM to be written too */
+      info_ptr->colorspace.flags |=
+         PNG_COLORSPACE_FROM_gAMA|PNG_COLORSPACE_FROM_cHRM;
+   }
 
-#  ifdef PNG_cHRM_SUPPORTED
-   png_set_cHRM_fixed(png_ptr, info_ptr,
-      /* color      x       y */
-      /* white */ 31270, 32900,
-      /* red   */ 64000, 33000,
-      /* green */ 30000, 60000,
-      /* blue  */ 15000,  6000
-   );
-#  endif /* cHRM */
+   png_colorspace_sync_info(png_ptr, info_ptr);
 }
 #endif /* sRGB */
 
 
 #ifdef PNG_iCCP_SUPPORTED
 void PNGAPI
-png_set_iCCP(png_structp png_ptr, png_infop info_ptr,
+png_set_iCCP(png_const_structrp png_ptr, png_inforp info_ptr,
     png_const_charp name, int compression_type,
     png_const_bytep profile, png_uint_32 proflen)
 {
-   png_byte new_name[80];
    png_charp new_iccp_name;
    png_bytep new_iccp_profile;
    png_size_t length;
@@ -687,45 +637,60 @@ png_set_iCCP(png_structp png_ptr, png_infop info_ptr,
    if (png_ptr == NULL || info_ptr == NULL || name == NULL || profile == NULL)
       return;
 
-   length = png_check_keyword(name, new_name);
+   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
+      png_app_error(png_ptr, "Invalid iCCP compression method");
 
-   if (length == 0)
+   /* Set the colorspace first because this validates the profile; do not
+    * override previously set app cHRM or gAMA here (because likely as not the
+    * application knows better than libpng what the correct values are.)  Pass
+    * the info_ptr color_type field to png_colorspace_set_ICC because in the
+    * write case it has not yet been stored in png_ptr.
+    */
    {
-      png_warning(png_ptr, "iCCP: invalid keyword");
-      return;
+      int result = png_colorspace_set_ICC(png_ptr, &info_ptr->colorspace, name,
+         proflen, profile, info_ptr->color_type);
+
+      png_colorspace_sync_info(png_ptr, info_ptr);
+
+      /* Don't do any of the copying if the profile was bad, or inconsistent. */
+      if (result == 0)
+         return;
+
+      /* But do write the gAMA and cHRM chunks from the profile. */
+      info_ptr->colorspace.flags |=
+         PNG_COLORSPACE_FROM_gAMA|PNG_COLORSPACE_FROM_cHRM;
    }
-      
-   ++length;
-   new_iccp_name = (png_charp)png_malloc_warn(png_ptr, length);
+
+   length = strlen(name)+1;
+   new_iccp_name = png_voidcast(png_charp, png_malloc_warn(png_ptr, length));
 
    if (new_iccp_name == NULL)
    {
-        png_warning(png_ptr, "Insufficient memory to process iCCP chunk");
+      png_benign_error(png_ptr, "Insufficient memory to process iCCP chunk");
+
       return;
    }
 
-   png_memcpy(new_iccp_name, new_name, length);
-   new_iccp_profile = (png_bytep)png_malloc_warn(png_ptr, proflen);
+   memcpy(new_iccp_name, name, length);
+   new_iccp_profile = png_voidcast(png_bytep,
+      png_malloc_warn(png_ptr, proflen));
 
    if (new_iccp_profile == NULL)
    {
-      png_free (png_ptr, new_iccp_name);
-      png_warning(png_ptr,
+      png_free(png_ptr, new_iccp_name);
+      png_benign_error(png_ptr,
           "Insufficient memory to process iCCP profile");
+
       return;
    }
 
-   png_memcpy(new_iccp_profile, profile, (png_size_t)proflen);
+   memcpy(new_iccp_profile, profile, proflen);
 
    png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, 0);
 
    info_ptr->iccp_proflen = proflen;
    info_ptr->iccp_name = new_iccp_name;
    info_ptr->iccp_profile = new_iccp_profile;
-   /* Compression is always zero but is here so the API and info structure
-    * does not have to change if we introduce multiple compression types
-    */
-   info_ptr->iccp_compression = (png_byte)compression_type;
    info_ptr->free_me |= PNG_FREE_ICCP;
    info_ptr->valid |= PNG_INFO_iCCP;
 }
@@ -733,8 +698,8 @@ png_set_iCCP(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_TEXT_SUPPORTED
 void PNGAPI
-png_set_text(png_structp png_ptr, png_infop info_ptr, png_const_textp text_ptr,
-    int num_text)
+png_set_text(png_const_structrp png_ptr, png_inforp info_ptr,
+    png_const_textp text_ptr, int num_text)
 {
    int ret;
    ret = png_set_text_2(png_ptr, info_ptr, text_ptr, num_text);
@@ -744,85 +709,71 @@ png_set_text(png_structp png_ptr, png_infop info_ptr, png_const_textp text_ptr,
 }
 
 int /* PRIVATE */
-png_set_text_2(png_structp png_ptr, png_infop info_ptr,
+png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr,
     png_const_textp text_ptr, int num_text)
 {
    int i;
-   size_t element_size;
 
-  png_debug1(1, "in %lx storage function", png_ptr == NULL ? 0xabadca11 :
+   png_debug1(1, "in %lx storage function", png_ptr == NULL ? 0xabadca11U :
       (unsigned long)png_ptr->chunk_name);
 
-   if (png_ptr == NULL || info_ptr == NULL || num_text == 0)
+   if (png_ptr == NULL || info_ptr == NULL || num_text <= 0 || text_ptr == NULL)
       return(0);
 
    /* Make sure we have enough space in the "text" array in info_struct
-    * to hold all of the incoming text_ptr objects.
+    * to hold all of the incoming text_ptr objects.  This compare can't overflow
+    * because max_text >= num_text (anyway, subtract of two positive integers
+    * can't overflow in any case.)
     */
-
-   element_size=png_sizeof(png_text);
-   if (num_text < 0 ||
-       num_text > INT_MAX - info_ptr->num_text - 8 ||
-       (unsigned int)/*SAFE*/(num_text +/*SAFE*/
-       info_ptr->num_text + 8) >=
-       PNG_SIZE_MAX/element_size)
-   {
-      png_warning(png_ptr, "too many text chunks");
-      return(0);
-   }
-
-   if (info_ptr->num_text + num_text > info_ptr->max_text)
+   if (num_text > info_ptr->max_text - info_ptr->num_text)
    {
-      int old_max_text = info_ptr->max_text;
       int old_num_text = info_ptr->num_text;
+      int max_text;
+      png_textp new_text = NULL;
 
-      if (info_ptr->text != NULL)
+      /* Calculate an appropriate max_text, checking for overflow. */
+      max_text = old_num_text;
+      if (num_text <= INT_MAX - max_text)
       {
-         png_textp old_text;
-
-         info_ptr->max_text = info_ptr->num_text + num_text + 8;
-         old_text = info_ptr->text;
+         max_text += num_text;
 
-         info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
-            (png_size_t)(info_ptr->max_text * png_sizeof(png_text)));
+         /* Round up to a multiple of 8 */
+         if (max_text < INT_MAX-8)
+            max_text = (max_text + 8) & ~0x7;
 
-         if (info_ptr->text == NULL)
-         {
-            /* Restore to previous condition */
-            info_ptr->max_text = old_max_text;
-            info_ptr->text = old_text;
-            return(1);
-         }
+         else
+            max_text = INT_MAX;
 
-         png_memcpy(info_ptr->text, old_text, (png_size_t)(old_max_text *
-             png_sizeof(png_text)));
-         png_free(png_ptr, old_text);
+         /* Now allocate a new array and copy the old members in; this does all
+          * the overflow checks.
+          */
+         new_text = png_voidcast(png_textp,png_realloc_array(png_ptr,
+            info_ptr->text, old_num_text, max_text-old_num_text,
+            sizeof *new_text));
       }
 
-      else
+      if (new_text == NULL)
       {
-         info_ptr->max_text = num_text + 8;
-         info_ptr->num_text = 0;
-         info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
-             (png_size_t)(info_ptr->max_text * png_sizeof(png_text)));
-         if (info_ptr->text == NULL)
-         {
-            /* Restore to previous condition */
-            info_ptr->num_text = old_num_text;
-            info_ptr->max_text = old_max_text;
-            return(1);
-         }
-         info_ptr->free_me |= PNG_FREE_TEXT;
+         png_chunk_report(png_ptr, "too many text chunks",
+            PNG_CHUNK_WRITE_ERROR);
+
+         return 1;
       }
 
-      png_debug1(3, "allocated %d entries for info_ptr->text",
-          info_ptr->max_text);
+      png_free(png_ptr, info_ptr->text);
+
+      info_ptr->text = new_text;
+      info_ptr->free_me |= PNG_FREE_TEXT;
+      info_ptr->max_text = max_text;
+      /* num_text is adjusted below as the entries are copied in */
+
+      png_debug1(3, "allocated %d entries for info_ptr->text", max_text);
    }
+
    for (i = 0; i < num_text; i++)
    {
-      png_byte new_key[80], new_lang[80];
-      png_size_t text_length, key_len;
-      png_size_t lang_len, lang_key_len;
+      size_t text_length, key_len;
+      size_t lang_len, lang_key_len;
       png_textp textp = &(info_ptr->text[info_ptr->num_text]);
 
       if (text_ptr[i].key == NULL)
@@ -831,17 +782,12 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr,
       if (text_ptr[i].compression < PNG_TEXT_COMPRESSION_NONE ||
           text_ptr[i].compression >= PNG_TEXT_COMPRESSION_LAST)
       {
-         png_warning(png_ptr, "text compression mode is out of range");
+         png_chunk_report(png_ptr, "text compression mode is out of range",
+            PNG_CHUNK_WRITE_ERROR);
          continue;
       }
 
-      key_len = png_check_keyword(text_ptr[i].key, new_key);
-
-      if (key_len == 0)
-      {
-         png_warning(png_ptr, "invalid text keyword");
-         continue;
-      }
+      key_len = strlen(text_ptr[i].key);
 
       if (text_ptr[i].compression <= 0)
       {
@@ -854,22 +800,22 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr,
       {
          /* Set iTXt data */
 
-        /* Zero length language is OK */
          if (text_ptr[i].lang != NULL)
-            lang_len = png_check_keyword(text_ptr[i].lang, new_lang);
+            lang_len = strlen(text_ptr[i].lang);
 
          else
             lang_len = 0;
 
          if (text_ptr[i].lang_key != NULL)
-            lang_key_len = png_strlen(text_ptr[i].lang_key);
+            lang_key_len = strlen(text_ptr[i].lang_key);
 
          else
             lang_key_len = 0;
       }
-#  else /* PNG_iTXt_SUPPORTED */
+#  else /* iTXt */
       {
-         png_warning(png_ptr, "iTXt chunk not supported");
+         png_chunk_report(png_ptr, "iTXt chunk not supported",
+            PNG_CHUNK_WRITE_ERROR);
          continue;
       }
 #  endif
@@ -888,32 +834,36 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr,
 
       else
       {
-         text_length = png_strlen(text_ptr[i].text);
+         text_length = strlen(text_ptr[i].text);
          textp->compression = text_ptr[i].compression;
       }
 
-      textp->key = (png_charp)png_malloc_warn(png_ptr,
-          (png_size_t)
-          (key_len + text_length + lang_len + lang_key_len + 4));
+      textp->key = png_voidcast(png_charp,png_malloc_base(png_ptr,
+          key_len + text_length + lang_len + lang_key_len + 4));
 
       if (textp->key == NULL)
-         return(1);
+      {
+         png_chunk_report(png_ptr, "text chunk: out of memory",
+               PNG_CHUNK_WRITE_ERROR);
+
+         return 1;
+      }
 
       png_debug2(2, "Allocated %lu bytes at %p in png_set_text",
           (unsigned long)(png_uint_32)
           (key_len + lang_len + lang_key_len + text_length + 4),
           textp->key);
 
-      png_memcpy(textp->key, new_key, (png_size_t)(key_len));
+      memcpy(textp->key, text_ptr[i].key, key_len);
       *(textp->key + key_len) = '\0';
 
       if (text_ptr[i].compression > 0)
       {
          textp->lang = textp->key + key_len + 1;
-         png_memcpy(textp->lang, text_ptr[i].lang, lang_len);
+         memcpy(textp->lang, text_ptr[i].lang, lang_len);
          *(textp->lang + lang_len) = '\0';
          textp->lang_key = textp->lang + lang_len + 1;
-         png_memcpy(textp->lang_key, text_ptr[i].lang_key, lang_key_len);
+         memcpy(textp->lang_key, text_ptr[i].lang_key, lang_key_len);
          *(textp->lang_key + lang_key_len) = '\0';
          textp->text = textp->lang_key + lang_key_len + 1;
       }
@@ -926,8 +876,7 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr,
       }
 
       if (text_length != 0)
-         png_memcpy(textp->text, text_ptr[i].text,
-             (png_size_t)(text_length));
+         memcpy(textp->text, text_ptr[i].text, text_length);
 
       *(textp->text + text_length) = '\0';
 
@@ -948,18 +897,20 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr,
       info_ptr->num_text++;
       png_debug1(3, "transferred text chunk %d", info_ptr->num_text);
    }
+
    return(0);
 }
 #endif
 
 #ifdef PNG_tIME_SUPPORTED
 void PNGAPI
-png_set_tIME(png_structp png_ptr, png_infop info_ptr, png_const_timep mod_time)
+png_set_tIME(png_const_structrp png_ptr, png_inforp info_ptr,
+    png_const_timep mod_time)
 {
    png_debug1(1, "in %s storage function", "tIME");
 
-   if (png_ptr == NULL || info_ptr == NULL ||
-       (png_ptr->mode & PNG_WROTE_tIME))
+   if (png_ptr == NULL || info_ptr == NULL || mod_time == NULL ||
+       (png_ptr->mode & PNG_WROTE_tIME) != 0)
       return;
 
    if (mod_time->month == 0   || mod_time->month > 12  ||
@@ -968,52 +919,55 @@ png_set_tIME(png_structp png_ptr, png_infop info_ptr, png_const_timep mod_time)
        mod_time->second > 60)
    {
       png_warning(png_ptr, "Ignoring invalid time value");
+
       return;
    }
 
-   png_memcpy(&(info_ptr->mod_time), mod_time, png_sizeof(png_time));
+   info_ptr->mod_time = *mod_time;
    info_ptr->valid |= PNG_INFO_tIME;
 }
 #endif
 
 #ifdef PNG_tRNS_SUPPORTED
 void PNGAPI
-png_set_tRNS(png_structp png_ptr, png_infop info_ptr,
+png_set_tRNS(png_structrp png_ptr, png_inforp info_ptr,
     png_const_bytep trans_alpha, int num_trans, png_const_color_16p trans_color)
 {
    png_debug1(1, "in %s storage function", "tRNS");
 
    if (png_ptr == NULL || info_ptr == NULL)
-      return;
 
-   if (num_trans < 0 || num_trans > PNG_MAX_PALETTE_LENGTH)
-      {
-        png_warning(png_ptr, "Ignoring invalid num_trans value");
-        return;
-      }
+      return;
 
    if (trans_alpha != NULL)
    {
        /* It may not actually be necessary to set png_ptr->trans_alpha here;
         * we do it for backward compatibility with the way the png_handle_tRNS
         * function used to do the allocation.
+        *
+        * 1.6.0: The above statement is incorrect; png_handle_tRNS effectively
+        * relies on png_set_tRNS storing the information in png_struct
+        * (otherwise it won't be there for the code in pngrtran.c).
         */
 
        png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);
 
-       /* Changed from num_trans to PNG_MAX_PALETTE_LENGTH in version 1.2.1 */
-       png_ptr->trans_alpha = info_ptr->trans_alpha =
-           (png_bytep)png_malloc(png_ptr, (png_size_t)PNG_MAX_PALETTE_LENGTH);
-
        if (num_trans > 0 && num_trans <= PNG_MAX_PALETTE_LENGTH)
-          png_memcpy(info_ptr->trans_alpha, trans_alpha, (png_size_t)num_trans);
+       {
+         /* Changed from num_trans to PNG_MAX_PALETTE_LENGTH in version 1.2.1 */
+          info_ptr->trans_alpha = png_voidcast(png_bytep,
+             png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH));
+          memcpy(info_ptr->trans_alpha, trans_alpha, (png_size_t)num_trans);
+       }
+       png_ptr->trans_alpha = info_ptr->trans_alpha;
    }
 
    if (trans_color != NULL)
    {
+#ifdef PNG_WARNINGS_SUPPORTED
       if (info_ptr->bit_depth < 16)
       {
-         unsigned int sample_max = (1U << info_ptr->bit_depth) - 1U;
+         int sample_max = (1 << info_ptr->bit_depth) - 1;
 
          if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY &&
              trans_color->gray > sample_max) ||
@@ -1021,12 +975,12 @@ png_set_tRNS(png_structp png_ptr, png_infop info_ptr,
              (trans_color->red > sample_max ||
              trans_color->green > sample_max ||
              trans_color->blue > sample_max)))
-           png_warning(png_ptr,
-              "tRNS chunk has out-of-range samples for bit_depth");
+            png_warning(png_ptr,
+               "tRNS chunk has out-of-range samples for bit_depth");
       }
+#endif
 
-      png_memcpy(&(info_ptr->trans_color), trans_color,
-         png_sizeof(png_color_16));
+      info_ptr->trans_color = *trans_color;
 
       if (num_trans == 0)
          num_trans = 1;
@@ -1044,8 +998,8 @@ png_set_tRNS(png_structp png_ptr, png_infop info_ptr,
 
 #ifdef PNG_sPLT_SUPPORTED
 void PNGAPI
-png_set_sPLT(png_structp png_ptr,
-    png_infop info_ptr, png_const_sPLT_tp entries, int nentries)
+png_set_sPLT(png_const_structrp png_ptr,
+    png_inforp info_ptr, png_const_sPLT_tp entries, int nentries)
 /*
  *  entries        - array of png_sPLT_t structures
  *                   to be added to the list of palettes
@@ -1056,251 +1010,462 @@ png_set_sPLT(png_structp png_ptr,
  */
 {
    png_sPLT_tp np;
-   int i, j;
-   size_t element_size;
 
-   if (png_ptr == NULL || info_ptr == NULL)
+   if (png_ptr == NULL || info_ptr == NULL || nentries <= 0 || entries == NULL)
       return;
 
-   element_size = png_sizeof(png_sPLT_t);
-   if (nentries < 0 ||
-       nentries > INT_MAX-info_ptr->splt_palettes_num ||
-       (unsigned int)/*SAFE*/(nentries +/*SAFE*/
-       info_ptr->splt_palettes_num) >=
-       PNG_SIZE_MAX/element_size)
-      np=NULL;
-
-   else
-
-      np = (png_sPLT_tp)png_malloc_warn(png_ptr,
-          (info_ptr->splt_palettes_num + nentries) *
-          (png_size_t)png_sizeof(png_sPLT_t));
+   /* Use the internal realloc function, which checks for all the possible
+    * overflows.  Notice that the parameters are (int) and (size_t)
+    */
+   np = png_voidcast(png_sPLT_tp,png_realloc_array(png_ptr,
+      info_ptr->splt_palettes, info_ptr->splt_palettes_num, nentries,
+      sizeof *np));
 
    if (np == NULL)
    {
-      png_warning(png_ptr, "No memory for sPLT palettes");
+      /* Out of memory or too many chunks */
+      png_chunk_report(png_ptr, "too many sPLT chunks", PNG_CHUNK_WRITE_ERROR);
+
       return;
    }
 
-   png_memcpy(np, info_ptr->splt_palettes,
-       info_ptr->splt_palettes_num * png_sizeof(png_sPLT_t));
-
    png_free(png_ptr, info_ptr->splt_palettes);
-   info_ptr->splt_palettes=NULL;
+   info_ptr->splt_palettes = np;
+   info_ptr->free_me |= PNG_FREE_SPLT;
+
+   np += info_ptr->splt_palettes_num;
 
-   for (i = j = 0; i < nentries; i++)
+   do
    {
-      png_sPLT_tp to = np + info_ptr->splt_palettes_num + j;
-      png_const_sPLT_tp from = entries + i;
-      png_byte new_name[80];
       png_size_t length;
 
-      length = png_check_keyword(from->name, new_name);
-
-      if (length == 0)
+      /* Skip invalid input entries */
+      if (entries->name == NULL || entries->entries == NULL)
       {
-         png_warning(png_ptr, "sPLT: invalid keyword");
+         /* png_handle_sPLT doesn't do this, so this is an app error */
+         png_app_error(png_ptr, "png_set_sPLT: invalid sPLT");
+         /* Just skip the invalid entry */
          continue;
       }
 
-      ++length; /* for trailing '\0' */
-      to->name = (png_charp)png_malloc_warn(png_ptr, length);
+      np->depth = entries->depth;
 
-      if (to->name == NULL)
-      {
-         png_warning(png_ptr,
-             "Out of memory while processing sPLT chunk");
-         continue;
-      }
+      /* In the event of out-of-memory just return - there's no point keeping
+       * on trying to add sPLT chunks.
+       */
+      length = strlen(entries->name) + 1;
+      np->name = png_voidcast(png_charp, png_malloc_base(png_ptr, length));
 
-      png_memcpy(to->name, new_name, length);
-      to->entries = (png_sPLT_entryp)png_malloc_warn(png_ptr,
-          from->nentries * png_sizeof(png_sPLT_entry));
+      if (np->name == NULL)
+         break;
 
-      if (to->entries == NULL)
+      memcpy(np->name, entries->name, length);
+
+      /* IMPORTANT: we have memory now that won't get freed if something else
+       * goes wrong; this code must free it.  png_malloc_array produces no
+       * warnings; use a png_chunk_report (below) if there is an error.
+       */
+      np->entries = png_voidcast(png_sPLT_entryp, png_malloc_array(png_ptr,
+          entries->nentries, sizeof (png_sPLT_entry)));
+
+      if (np->entries == NULL)
       {
-         png_warning(png_ptr,
-             "Out of memory while processing sPLT chunk");
-         png_free(png_ptr, to->name);
-         to->name = NULL;
-         continue;
+         png_free(png_ptr, np->name);
+         np->name = NULL;
+         break;
       }
 
-      png_memcpy(to->entries, from->entries,
-          from->nentries * png_sizeof(png_sPLT_entry));
+      np->nentries = entries->nentries;
+      /* This multiply can't overflow because png_malloc_array has already
+       * checked it when doing the allocation.
+       */
+      memcpy(np->entries, entries->entries,
+         entries->nentries * sizeof (png_sPLT_entry));
+
+      /* Note that 'continue' skips the advance of the out pointer and out
+       * count, so an invalid entry is not added.
+       */
+      info_ptr->valid |= PNG_INFO_sPLT;
+      ++(info_ptr->splt_palettes_num);
+      ++np;
+   }
+   while (++entries, --nentries);
+
+   if (nentries > 0)
+      png_chunk_report(png_ptr, "sPLT out of memory", PNG_CHUNK_WRITE_ERROR);
+}
+#endif /* sPLT */
+
+#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
+static png_byte
+check_location(png_const_structrp png_ptr, int location)
+{
+   location &= (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT);
 
-      to->nentries = from->nentries;
-      to->depth = from->depth;
-      ++j;
+   /* New in 1.6.0; copy the location and check it.  This is an API
+    * change; previously the app had to use the
+    * png_set_unknown_chunk_location API below for each chunk.
+    */
+   if (location == 0 && (png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
+   {
+      /* Write struct, so unknown chunks come from the app */
+      png_app_warning(png_ptr,
+         "png_set_unknown_chunks now expects a valid location");
+      /* Use the old behavior */
+      location = (png_byte)(png_ptr->mode &
+         (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT));
    }
 
-   info_ptr->splt_palettes = np;
-   info_ptr->splt_palettes_num = j;
-   info_ptr->valid |= PNG_INFO_sPLT;
-   info_ptr->free_me |= PNG_FREE_SPLT;
+   /* This need not be an internal error - if the app calls
+    * png_set_unknown_chunks on a read pointer it must get the location right.
+    */
+   if (location == 0)
+      png_error(png_ptr, "invalid location in png_set_unknown_chunks");
+
+   /* Now reduce the location to the top-most set bit by removing each least
+    * significant bit in turn.
+    */
+   while (location != (location & -location))
+      location &= ~(location & -location);
+
+   /* The cast is safe because 'location' is a bit mask and only the low four
+    * bits are significant.
+    */
+   return (png_byte)location;
 }
-#endif /* PNG_sPLT_SUPPORTED */
 
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
 void PNGAPI
-png_set_unknown_chunks(png_structp png_ptr,
-   png_infop info_ptr, png_const_unknown_chunkp unknowns, int num_unknowns)
+png_set_unknown_chunks(png_const_structrp png_ptr,
+   png_inforp info_ptr, png_const_unknown_chunkp unknowns, int num_unknowns)
 {
    png_unknown_chunkp np;
-   int i;
-   size_t element_size;
 
-   if (png_ptr == NULL || info_ptr == NULL || num_unknowns == 0)
+   if (png_ptr == NULL || info_ptr == NULL || num_unknowns <= 0 ||
+       unknowns == NULL)
       return;
 
-   element_size = png_sizeof(png_unknown_chunk);
-   if (num_unknowns < 0 ||
-       num_unknowns > INT_MAX-info_ptr->unknown_chunks_num ||
-       (unsigned int)/*SAFE*/(num_unknowns +/*SAFE*/
-       info_ptr->unknown_chunks_num) >=
-       PNG_SIZE_MAX/element_size)
-      np=NULL;
+   /* Check for the failure cases where support has been disabled at compile
+    * time.  This code is hardly ever compiled - it's here because
+    * STORE_UNKNOWN_CHUNKS is set by both read and write code (compiling in this
+    * code) but may be meaningless if the read or write handling of unknown
+    * chunks is not compiled in.
+    */
+#  if !defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) && \
+      defined(PNG_READ_SUPPORTED)
+      if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
+      {
+         png_app_error(png_ptr, "no unknown chunk support on read");
+
+         return;
+      }
+#  endif
+#  if !defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED) && \
+      defined(PNG_WRITE_SUPPORTED)
+      if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
+      {
+         png_app_error(png_ptr, "no unknown chunk support on write");
 
-   else
-      np = (png_unknown_chunkp)png_malloc_warn(png_ptr,
-          (png_size_t)(info_ptr->unknown_chunks_num + num_unknowns) *
-          png_sizeof(png_unknown_chunk));
+         return;
+      }
+#  endif
+
+   /* Prior to 1.6.0 this code used png_malloc_warn; however, this meant that
+    * unknown critical chunks could be lost with just a warning resulting in
+    * undefined behavior.  Now png_chunk_report is used to provide behavior
+    * appropriate to read or write.
+    */
+   np = png_voidcast(png_unknown_chunkp, png_realloc_array(png_ptr,
+         info_ptr->unknown_chunks, info_ptr->unknown_chunks_num, num_unknowns,
+         sizeof *np));
 
    if (np == NULL)
    {
-      png_warning(png_ptr,
-          "Out of memory while processing unknown chunk");
+      png_chunk_report(png_ptr, "too many unknown chunks",
+         PNG_CHUNK_WRITE_ERROR);
+
       return;
    }
 
-   png_memcpy(np, info_ptr->unknown_chunks,
-       (png_size_t)info_ptr->unknown_chunks_num *
-       png_sizeof(png_unknown_chunk));
-
    png_free(png_ptr, info_ptr->unknown_chunks);
-   info_ptr->unknown_chunks = NULL;
-
-   for (i = 0; i < num_unknowns; i++)
-   {
-      png_unknown_chunkp to = np + info_ptr->unknown_chunks_num + i;
-      png_const_unknown_chunkp from = unknowns + i;
+   info_ptr->unknown_chunks = np; /* safe because it is initialized */
+   info_ptr->free_me |= PNG_FREE_UNKN;
 
-      png_memcpy(to->name, from->name, png_sizeof(from->name));
-      to->name[png_sizeof(to->name)-1] = '\0';
-      to->size = from->size;
+   np += info_ptr->unknown_chunks_num;
 
-      /* Note our location in the read or write sequence */
-      to->location = (png_byte)(png_ptr->mode & 0xff);
+   /* Increment unknown_chunks_num each time round the loop to protect the
+    * just-allocated chunk data.
+    */
+   for (; num_unknowns > 0; --num_unknowns, ++unknowns)
+   {
+      memcpy(np->name, unknowns->name, (sizeof np->name));
+      np->name[(sizeof np->name)-1] = '\0';
+      np->location = check_location(png_ptr, unknowns->location);
 
-      if (from->size == 0)
-         to->data=NULL;
+      if (unknowns->size == 0)
+      {
+         np->data = NULL;
+         np->size = 0;
+      }
 
       else
       {
-         to->data = (png_bytep)png_malloc_warn(png_ptr,
-             (png_size_t)from->size);
+         np->data = png_voidcast(png_bytep,
+            png_malloc_base(png_ptr, unknowns->size));
 
-         if (to->data == NULL)
+         if (np->data == NULL)
          {
-            png_warning(png_ptr,
-                "Out of memory while processing unknown chunk");
-            to->size = 0;
+            png_chunk_report(png_ptr, "unknown chunk: out of memory",
+               PNG_CHUNK_WRITE_ERROR);
+            /* But just skip storing the unknown chunk */
+            continue;
          }
 
-         else
-            png_memcpy(to->data, from->data, from->size);
+         memcpy(np->data, unknowns->data, unknowns->size);
+         np->size = unknowns->size;
       }
-   }
 
-   info_ptr->unknown_chunks = np;
-   info_ptr->unknown_chunks_num += num_unknowns;
-   info_ptr->free_me |= PNG_FREE_UNKN;
+      /* These increments are skipped on out-of-memory for the data - the
+       * unknown chunk entry gets overwritten if the png_chunk_report returns.
+       * This is correct in the read case (the chunk is just dropped.)
+       */
+      ++np;
+      ++(info_ptr->unknown_chunks_num);
+   }
 }
 
 void PNGAPI
-png_set_unknown_chunk_location(png_structp png_ptr, png_infop info_ptr,
+png_set_unknown_chunk_location(png_const_structrp png_ptr, png_inforp info_ptr,
     int chunk, int location)
 {
-   if (png_ptr != NULL && info_ptr != NULL && chunk >= 0 && chunk <
-       info_ptr->unknown_chunks_num)
-      info_ptr->unknown_chunks[chunk].location = (png_byte)location;
-}
-#endif
+   /* This API is pretty pointless in 1.6.0 because the location can be set
+    * before the call to png_set_unknown_chunks.
+    *
+    * TODO: add a png_app_warning in 1.7
+    */
+   if (png_ptr != NULL && info_ptr != NULL && chunk >= 0 &&
+      chunk < info_ptr->unknown_chunks_num)
+   {
+      if ((location & (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT)) == 0)
+      {
+         png_app_error(png_ptr, "invalid unknown chunk location");
+         /* Fake out the pre 1.6.0 behavior: */
+         if ((location & PNG_HAVE_IDAT) != 0) /* undocumented! */
+            location = PNG_AFTER_IDAT;
+
+         else
+            location = PNG_HAVE_IHDR; /* also undocumented */
+      }
 
+      info_ptr->unknown_chunks[chunk].location =
+         check_location(png_ptr, location);
+   }
+}
+#endif /* STORE_UNKNOWN_CHUNKS */
 
 #ifdef PNG_MNG_FEATURES_SUPPORTED
 png_uint_32 PNGAPI
-png_permit_mng_features (png_structp png_ptr, png_uint_32 mng_features)
+png_permit_mng_features (png_structrp png_ptr, png_uint_32 mng_features)
 {
    png_debug(1, "in png_permit_mng_features");
 
    if (png_ptr == NULL)
-      return (png_uint_32)0;
+      return 0;
 
-   png_ptr->mng_features_permitted =
-       (png_byte)(mng_features & PNG_ALL_MNG_FEATURES);
+   png_ptr->mng_features_permitted = mng_features & PNG_ALL_MNG_FEATURES;
 
-   return (png_uint_32)png_ptr->mng_features_permitted;
+   return png_ptr->mng_features_permitted;
 }
 #endif
 
 #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+static unsigned int
+add_one_chunk(png_bytep list, unsigned int count, png_const_bytep add, int keep)
+{
+   unsigned int i;
+
+   /* Utility function: update the 'keep' state of a chunk if it is already in
+    * the list, otherwise add it to the list.
+    */
+   for (i=0; i<count; ++i, list += 5)
+   {
+      if (memcmp(list, add, 4) == 0)
+      {
+         list[4] = (png_byte)keep;
+
+         return count;
+      }
+   }
+
+   if (keep != PNG_HANDLE_CHUNK_AS_DEFAULT)
+   {
+      ++count;
+      memcpy(list, add, 4);
+      list[4] = (png_byte)keep;
+   }
+
+   return count;
+}
+
 void PNGAPI
-png_set_keep_unknown_chunks(png_structp png_ptr, int keep, png_const_bytep
-    chunk_list, int num_chunks)
+png_set_keep_unknown_chunks(png_structrp png_ptr, int keep,
+    png_const_bytep chunk_list, int num_chunks_in)
 {
-   png_bytep new_list, p;
-   int i, old_num_chunks;
+   png_bytep new_list;
+   unsigned int num_chunks, old_num_chunks;
+
    if (png_ptr == NULL)
       return;
 
-   if (num_chunks == 0)
+   if (keep < 0 || keep >= PNG_HANDLE_CHUNK_LAST)
    {
-      if (keep == PNG_HANDLE_CHUNK_ALWAYS || keep == PNG_HANDLE_CHUNK_IF_SAFE)
-         png_ptr->flags |= PNG_FLAG_KEEP_UNKNOWN_CHUNKS;
+      png_app_error(png_ptr, "png_set_keep_unknown_chunks: invalid keep");
 
-      else
-         png_ptr->flags &= ~PNG_FLAG_KEEP_UNKNOWN_CHUNKS;
+      return;
+   }
 
-      if (keep == PNG_HANDLE_CHUNK_ALWAYS)
-         png_ptr->flags |= PNG_FLAG_KEEP_UNSAFE_CHUNKS;
+   if (num_chunks_in <= 0)
+   {
+      png_ptr->unknown_default = keep;
 
-      else
-         png_ptr->flags &= ~PNG_FLAG_KEEP_UNSAFE_CHUNKS;
+      /* '0' means just set the flags, so stop here */
+      if (num_chunks_in == 0)
+        return;
+   }
 
-      return;
+   if (num_chunks_in < 0)
+   {
+      /* Ignore all unknown chunks and all chunks recognized by
+       * libpng except for IHDR, PLTE, tRNS, IDAT, and IEND
+       */
+      static PNG_CONST png_byte chunks_to_ignore[] = {
+         98,  75,  71,  68, '\0',  /* bKGD */
+         99,  72,  82,  77, '\0',  /* cHRM */
+        103,  65,  77,  65, '\0',  /* gAMA */
+        104,  73,  83,  84, '\0',  /* hIST */
+        105,  67,  67,  80, '\0',  /* iCCP */
+        105,  84,  88, 116, '\0',  /* iTXt */
+        111,  70,  70, 115, '\0',  /* oFFs */
+        112,  67,  65,  76, '\0',  /* pCAL */
+        112,  72,  89, 115, '\0',  /* pHYs */
+        115,  66,  73,  84, '\0',  /* sBIT */
+        115,  67,  65,  76, '\0',  /* sCAL */
+        115,  80,  76,  84, '\0',  /* sPLT */
+        115,  84,  69,  82, '\0',  /* sTER */
+        115,  82,  71,  66, '\0',  /* sRGB */
+        116,  69,  88, 116, '\0',  /* tEXt */
+        116,  73,  77,  69, '\0',  /* tIME */
+        122,  84,  88, 116, '\0'   /* zTXt */
+      };
+
+      chunk_list = chunks_to_ignore;
+      num_chunks = (unsigned int)/*SAFE*/(sizeof chunks_to_ignore)/5U;
    }
 
-   if (chunk_list == NULL)
-      return;
+   else /* num_chunks_in > 0 */
+   {
+      if (chunk_list == NULL)
+      {
+         /* Prior to 1.6.0 this was silently ignored, now it is an app_error
+          * which can be switched off.
+          */
+         png_app_error(png_ptr, "png_set_keep_unknown_chunks: no chunk list");
+
+         return;
+      }
+
+      num_chunks = num_chunks_in;
+   }
 
    old_num_chunks = png_ptr->num_chunk_list;
-   new_list=(png_bytep)png_malloc(png_ptr,
-       (png_size_t)(5*(num_chunks + old_num_chunks)));
+   if (png_ptr->chunk_list == NULL)
+      old_num_chunks = 0;
 
-   if (png_ptr->chunk_list != NULL)
+   /* Since num_chunks is always restricted to UINT_MAX/5 this can't overflow.
+    */
+   if (num_chunks + old_num_chunks > UINT_MAX/5)
    {
-      png_memcpy(new_list, png_ptr->chunk_list,
-          (png_size_t)(5*old_num_chunks));
-      png_free(png_ptr, png_ptr->chunk_list);
-      png_ptr->chunk_list=NULL;
+      png_app_error(png_ptr, "png_set_keep_unknown_chunks: too many chunks");
+
+      return;
    }
 
-   png_memcpy(new_list + 5*old_num_chunks, chunk_list,
-       (png_size_t)(5*num_chunks));
+   /* If these chunks are being reset to the default then no more memory is
+    * required because add_one_chunk above doesn't extend the list if the 'keep'
+    * parameter is the default.
+    */
+   if (keep != 0)
+   {
+      new_list = png_voidcast(png_bytep, png_malloc(png_ptr,
+          5 * (num_chunks + old_num_chunks)));
+
+      if (old_num_chunks > 0)
+         memcpy(new_list, png_ptr->chunk_list, 5*old_num_chunks);
+   }
 
-   for (p = new_list + 5*old_num_chunks + 4, i = 0; i<num_chunks; i++, p += 5)
-      *p=(png_byte)keep;
+   else if (old_num_chunks > 0)
+      new_list = png_ptr->chunk_list;
+
+   else
+      new_list = NULL;
 
-   png_ptr->num_chunk_list = old_num_chunks + num_chunks;
-   png_ptr->chunk_list = new_list;
-   png_ptr->free_me |= PNG_FREE_LIST;
+   /* Add the new chunks together with each one's handling code.  If the chunk
+    * already exists the code is updated, otherwise the chunk is added to the
+    * end.  (In libpng 1.6.0 order no longer matters because this code enforces
+    * the earlier convention that the last setting is the one that is used.)
+    */
+   if (new_list != NULL)
+   {
+      png_const_bytep inlist;
+      png_bytep outlist;
+      unsigned int i;
+
+      for (i=0; i<num_chunks; ++i)
+      {
+         old_num_chunks = add_one_chunk(new_list, old_num_chunks,
+            chunk_list+5*i, keep);
+      }
+
+      /* Now remove any spurious 'default' entries. */
+      num_chunks = 0;
+      for (i=0, inlist=outlist=new_list; i<old_num_chunks; ++i, inlist += 5)
+      {
+         if (inlist[4])
+         {
+            if (outlist != inlist)
+               memcpy(outlist, inlist, 5);
+            outlist += 5;
+            ++num_chunks;
+         }
+      }
+
+      /* This means the application has removed all the specialized handling. */
+      if (num_chunks == 0)
+      {
+         if (png_ptr->chunk_list != new_list)
+            png_free(png_ptr, new_list);
+
+         new_list = NULL;
+      }
+   }
+
+   else
+      num_chunks = 0;
+
+   png_ptr->num_chunk_list = num_chunks;
+
+   if (png_ptr->chunk_list != new_list)
+   {
+      if (png_ptr->chunk_list != NULL)
+         png_free(png_ptr, png_ptr->chunk_list);
+
+      png_ptr->chunk_list = new_list;
+   }
 }
 #endif
 
 #ifdef PNG_READ_USER_CHUNKS_SUPPORTED
 void PNGAPI
-png_set_read_user_chunk_fn(png_structp png_ptr, png_voidp user_chunk_ptr,
+png_set_read_user_chunk_fn(png_structrp png_ptr, png_voidp user_chunk_ptr,
     png_user_chunk_ptr read_user_chunk_fn)
 {
    png_debug(1, "in png_set_read_user_chunk_fn");
@@ -1315,14 +1480,16 @@ png_set_read_user_chunk_fn(png_structp png_ptr, png_voidp user_chunk_ptr,
 
 #ifdef PNG_INFO_IMAGE_SUPPORTED
 void PNGAPI
-png_set_rows(png_structp png_ptr, png_infop info_ptr, png_bytepp row_pointers)
+png_set_rows(png_const_structrp png_ptr, png_inforp info_ptr,
+    png_bytepp row_pointers)
 {
    png_debug1(1, "in %s storage function", "rows");
 
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
-   if (info_ptr->row_pointers && (info_ptr->row_pointers != row_pointers))
+   if (info_ptr->row_pointers != NULL &&
+       (info_ptr->row_pointers != row_pointers))
       png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);
 
    info_ptr->row_pointers = row_pointers;
@@ -1332,54 +1499,83 @@ png_set_rows(png_structp png_ptr, png_infop info_ptr, png_bytepp row_pointers)
 }
 #endif
 
-#ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
 void PNGAPI
-png_set_compression_buffer_size(png_structp png_ptr, png_size_t size)
+png_set_compression_buffer_size(png_structrp png_ptr, png_size_t size)
 {
     if (png_ptr == NULL)
        return;
 
-    png_free(png_ptr, png_ptr->zbuf);
+    if (size == 0 || size > PNG_UINT_31_MAX)
+       png_error(png_ptr, "invalid compression buffer size");
 
-    if (size > ZLIB_IO_MAX)
-    {
-       png_warning(png_ptr, "Attempt to set buffer size beyond max ignored");
-       png_ptr->zbuf_size = ZLIB_IO_MAX;
-       size = ZLIB_IO_MAX; /* must fit */
-    }
+#  ifdef PNG_SEQUENTIAL_READ_SUPPORTED
+      if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
+      {
+         png_ptr->IDAT_read_size = (png_uint_32)size; /* checked above */
+         return;
+      }
+#  endif
 
-    else
-       png_ptr->zbuf_size = (uInt)size;
+#  ifdef PNG_WRITE_SUPPORTED
+      if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
+      {
+         if (png_ptr->zowner != 0)
+         {
+            png_warning(png_ptr,
+              "Compression buffer size cannot be changed because it is in use");
 
-    png_ptr->zbuf = (png_bytep)png_malloc(png_ptr, size);
+            return;
+         }
 
-    /* The following ensures a relatively safe failure if this gets called while
-     * the buffer is actually in use.
-     */
-    png_ptr->zstream.next_out = png_ptr->zbuf;
-    png_ptr->zstream.avail_out = 0;
-    png_ptr->zstream.avail_in = 0;
+#ifndef __COVERITY__
+         /* Some compilers complain that this is always false.  However, it
+          * can be true when integer overflow happens.
+          */
+         if (size > ZLIB_IO_MAX)
+         {
+            png_warning(png_ptr,
+               "Compression buffer size limited to system maximum");
+            size = ZLIB_IO_MAX; /* must fit */
+         }
+#endif
+
+         if (size < 6)
+         {
+            /* Deflate will potentially go into an infinite loop on a SYNC_FLUSH
+             * if this is permitted.
+             */
+            png_warning(png_ptr,
+               "Compression buffer size cannot be reduced below 6");
+
+            return;
+         }
+
+         if (png_ptr->zbuffer_size != size)
+         {
+            png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list);
+            png_ptr->zbuffer_size = (uInt)size;
+         }
+      }
+#  endif
 }
-#endif /* WRITE_CUSTOMIZE_COMPRESSION */
 
 void PNGAPI
-png_set_invalid(png_structp png_ptr, png_infop info_ptr, int mask)
+png_set_invalid(png_const_structrp png_ptr, png_inforp info_ptr, int mask)
 {
-   if (png_ptr && info_ptr)
+   if (png_ptr != NULL && info_ptr != NULL)
       info_ptr->valid &= ~mask;
 }
 
 
-
 #ifdef PNG_SET_USER_LIMITS_SUPPORTED
 /* This function was added to libpng 1.2.6 */
 void PNGAPI
-png_set_user_limits (png_structp png_ptr, png_uint_32 user_width_max,
+png_set_user_limits (png_structrp png_ptr, png_uint_32 user_width_max,
     png_uint_32 user_height_max)
 {
    /* Images with dimensions larger than these limits will be
     * rejected by png_set_IHDR().  To accept any PNG datastream
-    * regardless of dimensions, set both limits to 0x7fffffffL.
+    * regardless of dimensions, set both limits to 0x7fffffff.
     */
    if (png_ptr == NULL)
       return;
@@ -1390,52 +1586,148 @@ png_set_user_limits (png_structp png_ptr, png_uint_32 user_width_max,
 
 /* This function was added to libpng 1.4.0 */
 void PNGAPI
-png_set_chunk_cache_max (png_structp png_ptr,
-   png_uint_32 user_chunk_cache_max)
+png_set_chunk_cache_max (png_structrp png_ptr, png_uint_32 user_chunk_cache_max)
 {
-    if (png_ptr != NULL)
-       png_ptr->user_chunk_cache_max = user_chunk_cache_max;
+   if (png_ptr != NULL)
+      png_ptr->user_chunk_cache_max = user_chunk_cache_max;
 }
 
 /* This function was added to libpng 1.4.1 */
 void PNGAPI
-png_set_chunk_malloc_max (png_structp png_ptr,
+png_set_chunk_malloc_max (png_structrp png_ptr,
     png_alloc_size_t user_chunk_malloc_max)
 {
    if (png_ptr != NULL)
       png_ptr->user_chunk_malloc_max = user_chunk_malloc_max;
 }
-#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
+#endif /* ?SET_USER_LIMITS */
 
 
 #ifdef PNG_BENIGN_ERRORS_SUPPORTED
 void PNGAPI
-png_set_benign_errors(png_structp png_ptr, int allowed)
+png_set_benign_errors(png_structrp png_ptr, int allowed)
 {
    png_debug(1, "in png_set_benign_errors");
 
+   /* If allowed is 1, png_benign_error() is treated as a warning.
+    *
+    * If allowed is 0, png_benign_error() is treated as an error (which
+    * is the default behavior if png_set_benign_errors() is not called).
+    */
+
    if (allowed != 0)
-      png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN;
+      png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN |
+         PNG_FLAG_APP_WARNINGS_WARN | PNG_FLAG_APP_ERRORS_WARN;
 
    else
-      png_ptr->flags &= ~PNG_FLAG_BENIGN_ERRORS_WARN;
+      png_ptr->flags &= ~(PNG_FLAG_BENIGN_ERRORS_WARN |
+         PNG_FLAG_APP_WARNINGS_WARN | PNG_FLAG_APP_ERRORS_WARN);
 }
-#endif /* PNG_BENIGN_ERRORS_SUPPORTED */
+#endif /* BENIGN_ERRORS */
 
 #ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-/* Whether to report invalid palette index; added at libng-1.5.10
- *   allowed  - one of 0: disable; 1: enable
- */
+   /* Whether to report invalid palette index; added at libng-1.5.10.
+    * It is possible for an indexed (color-type==3) PNG file to contain
+    * pixels with invalid (out-of-range) indexes if the PLTE chunk has
+    * fewer entries than the image's bit-depth would allow. We recover
+    * from this gracefully by filling any incomplete palette with zeros
+    * (opaque black).  By default, when this occurs libpng will issue
+    * a benign error.  This API can be used to override that behavior.
+    */
 void PNGAPI
-png_set_check_for_invalid_index(png_structp png_ptr, int allowed)
+png_set_check_for_invalid_index(png_structrp png_ptr, int allowed)
 {
    png_debug(1, "in png_set_check_for_invalid_index");
 
-   if (allowed != 0)
+   if (allowed > 0)
       png_ptr->num_palette_max = 0;
 
    else
       png_ptr->num_palette_max = -1;
 }
 #endif
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+
+#if defined(PNG_TEXT_SUPPORTED) || defined(PNG_pCAL_SUPPORTED) || \
+    defined(PNG_iCCP_SUPPORTED) || defined(PNG_sPLT_SUPPORTED)
+/* Check that the tEXt or zTXt keyword is valid per PNG 1.0 specification,
+ * and if invalid, correct the keyword rather than discarding the entire
+ * chunk.  The PNG 1.0 specification requires keywords 1-79 characters in
+ * length, forbids leading or trailing whitespace, multiple internal spaces,
+ * and the non-break space (0x80) from ISO 8859-1.  Returns keyword length.
+ *
+ * The 'new_key' buffer must be 80 characters in size (for the keyword plus a
+ * trailing '\0').  If this routine returns 0 then there was no keyword, or a
+ * valid one could not be generated, and the caller must png_error.
+ */
+png_uint_32 /* PRIVATE */
+png_check_keyword(png_structrp png_ptr, png_const_charp key, png_bytep new_key)
+{
+   png_const_charp orig_key = key;
+   png_uint_32 key_len = 0;
+   int bad_character = 0;
+   int space = 1;
+
+   png_debug(1, "in png_check_keyword");
+
+   if (key == NULL)
+   {
+      *new_key = 0;
+      return 0;
+   }
+
+   while (*key && key_len < 79)
+   {
+      png_byte ch = (png_byte)*key++;
+
+      if ((ch > 32 && ch <= 126) || (ch >= 161 /*&& ch <= 255*/))
+         *new_key++ = ch, ++key_len, space = 0;
+
+      else if (space == 0)
+      {
+         /* A space or an invalid character when one wasn't seen immediately
+          * before; output just a space.
+          */
+         *new_key++ = 32, ++key_len, space = 1;
+
+         /* If the character was not a space then it is invalid. */
+         if (ch != 32)
+            bad_character = ch;
+      }
+
+      else if (bad_character == 0)
+         bad_character = ch; /* just skip it, record the first error */
+   }
+
+   if (key_len > 0 && space != 0) /* trailing space */
+   {
+      --key_len, --new_key;
+      if (bad_character == 0)
+         bad_character = 32;
+   }
+
+   /* Terminate the keyword */
+   *new_key = 0;
+
+   if (key_len == 0)
+      return 0;
+
+#ifdef PNG_WARNINGS_SUPPORTED
+   /* Try to only output one warning per keyword: */
+   if (*key != 0) /* keyword too long */
+      png_warning(png_ptr, "keyword truncated");
+
+   else if (bad_character != 0)
+   {
+      PNG_WARNING_PARAMETERS(p)
+
+      png_warning_parameter(p, 1, orig_key);
+      png_warning_parameter_signed(p, 2, PNG_NUMBER_FORMAT_02x, bad_character);
+
+      png_formatted_warning(png_ptr, p, "keyword \"@1\": bad character '0x@2'");
+   }
+#endif /* WARNINGS */
+
+   return key_len;
+}
+#endif /* TEXT || pCAL || iCCP || sPLT */
+#endif /* READ || WRITE */
diff --git a/drivers/png/pngstruct.h b/drivers/png/pngstruct.h
index 52eef80e69..c1f35edef5 100644
--- a/drivers/png/pngstruct.h
+++ b/drivers/png/pngstruct.h
@@ -1,7 +1,7 @@
 
 /* pngstruct.h - header file for PNG reference library
  *
- * Last changed in libpng 1.5.23 [July 23, 2015]
+ * Last changed in libpng 1.6.18 [July 23, 2015]
  * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -23,13 +23,130 @@
  * in this structure and is required for decompressing the LZ compressed
  * data in PNG files.
  */
+#ifndef ZLIB_CONST
+   /* We must ensure that zlib uses 'const' in declarations. */
+#  define ZLIB_CONST
+#endif
 #include "zlib.h"
+#ifdef const
+   /* zlib.h sometimes #defines const to nothing, undo this. */
+#  undef const
+#endif
+
+/* zlib.h has mediocre z_const use before 1.2.6, this stuff is for compatibility
+ * with older builds.
+ */
+#if ZLIB_VERNUM < 0x1260
+#  define PNGZ_MSG_CAST(s) png_constcast(char*,s)
+#  define PNGZ_INPUT_CAST(b) png_constcast(png_bytep,b)
+#else
+#  define PNGZ_MSG_CAST(s) (s)
+#  define PNGZ_INPUT_CAST(b) (b)
+#endif
+
+/* zlib.h declares a magic type 'uInt' that limits the amount of data that zlib
+ * can handle at once.  This type need be no larger than 16 bits (so maximum of
+ * 65535), this define allows us to discover how big it is, but limited by the
+ * maximuum for png_size_t.  The value can be overriden in a library build
+ * (pngusr.h, or set it in CPPFLAGS) and it works to set it to a considerably
+ * lower value (e.g. 255 works).  A lower value may help memory usage (slightly)
+ * and may even improve performance on some systems (and degrade it on others.)
+ */
+#ifndef ZLIB_IO_MAX
+#  define ZLIB_IO_MAX ((uInt)-1)
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+/* The type of a compression buffer list used by the write code. */
+typedef struct png_compression_buffer
+{
+   struct png_compression_buffer *next;
+   png_byte                       output[1]; /* actually zbuf_size */
+} png_compression_buffer, *png_compression_bufferp;
+
+#define PNG_COMPRESSION_BUFFER_SIZE(pp)\
+   (offsetof(png_compression_buffer, output) + (pp)->zbuffer_size)
+#endif
+
+/* Colorspace support; structures used in png_struct, png_info and in internal
+ * functions to hold and communicate information about the color space.
+ *
+ * PNG_COLORSPACE_SUPPORTED is only required if the application will perform
+ * colorspace corrections, otherwise all the colorspace information can be
+ * skipped and the size of libpng can be reduced (significantly) by compiling
+ * out the colorspace support.
+ */
+#ifdef PNG_COLORSPACE_SUPPORTED
+/* The chromaticities of the red, green and blue colorants and the chromaticity
+ * of the corresponding white point (i.e. of rgb(1.0,1.0,1.0)).
+ */
+typedef struct png_xy
+{
+   png_fixed_point redx, redy;
+   png_fixed_point greenx, greeny;
+   png_fixed_point bluex, bluey;
+   png_fixed_point whitex, whitey;
+} png_xy;
+
+/* The same data as above but encoded as CIE XYZ values.  When this data comes
+ * from chromaticities the sum of the Y values is assumed to be 1.0
+ */
+typedef struct png_XYZ
+{
+   png_fixed_point red_X, red_Y, red_Z;
+   png_fixed_point green_X, green_Y, green_Z;
+   png_fixed_point blue_X, blue_Y, blue_Z;
+} png_XYZ;
+#endif /* COLORSPACE */
+
+#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)
+/* A colorspace is all the above plus, potentially, profile information;
+ * however at present libpng does not use the profile internally so it is only
+ * stored in the png_info struct (if iCCP is supported.)  The rendering intent
+ * is retained here and is checked.
+ *
+ * The file gamma encoding information is also stored here and gamma correction
+ * is done by libpng, whereas color correction must currently be done by the
+ * application.
+ */
+typedef struct png_colorspace
+{
+#ifdef PNG_GAMMA_SUPPORTED
+   png_fixed_point gamma;        /* File gamma */
+#endif
+
+#ifdef PNG_COLORSPACE_SUPPORTED
+   png_xy      end_points_xy;    /* End points as chromaticities */
+   png_XYZ     end_points_XYZ;   /* End points as CIE XYZ colorant values */
+   png_uint_16 rendering_intent; /* Rendering intent of a profile */
+#endif
+
+   /* Flags are always defined to simplify the code. */
+   png_uint_16 flags;            /* As defined below */
+} png_colorspace, * PNG_RESTRICT png_colorspacerp;
+
+typedef const png_colorspace * PNG_RESTRICT png_const_colorspacerp;
+
+/* General flags for the 'flags' field */
+#define PNG_COLORSPACE_HAVE_GAMMA           0x0001
+#define PNG_COLORSPACE_HAVE_ENDPOINTS       0x0002
+#define PNG_COLORSPACE_HAVE_INTENT          0x0004
+#define PNG_COLORSPACE_FROM_gAMA            0x0008
+#define PNG_COLORSPACE_FROM_cHRM            0x0010
+#define PNG_COLORSPACE_FROM_sRGB            0x0020
+#define PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB 0x0040
+#define PNG_COLORSPACE_MATCHES_sRGB         0x0080 /* exact match on profile */
+#define PNG_COLORSPACE_INVALID              0x8000
+#define PNG_COLORSPACE_CANCEL(flags)        (0xffff ^ (flags))
+#endif /* COLORSPACE || GAMMA */
 
 struct png_struct_def
 {
 #ifdef PNG_SETJMP_SUPPORTED
-   jmp_buf longjmp_buffer;    /* used in png_error */
+   jmp_buf jmp_buf_local;     /* New name in 1.6.0 for jmp_buf in png_struct */
    png_longjmp_ptr longjmp_fn;/* setjmp non-local goto function. */
+   jmp_buf *jmp_buf_ptr;      /* passed to longjmp_fn */
+   size_t jmp_buf_size;       /* size of the above, if allocated */
 #endif
    png_error_ptr error_fn;    /* function for printing errors and aborting */
 #ifdef PNG_WARNINGS_SUPPORTED
@@ -62,22 +179,12 @@ struct png_struct_def
    png_uint_32 flags;         /* flags indicating various things to libpng */
    png_uint_32 transformations; /* which transformations to perform */
 
-   z_stream zstream;          /* pointer to decompression structure (below) */
-   png_bytep zbuf;            /* buffer for zlib */
-   uInt zbuf_size;            /* size of zbuf (typically 65536) */
-#ifdef PNG_WRITE_SUPPORTED
-
-/* Added in 1.5.4: state to keep track of whether the zstream has been
- * initialized and if so whether it is for IDAT or some other chunk.
- */
-#define PNG_ZLIB_UNINITIALIZED 0
-#define PNG_ZLIB_FOR_IDAT      1
-#define PNG_ZLIB_FOR_TEXT      2 /* anything other than IDAT */
-#define PNG_ZLIB_USE_MASK      3 /* bottom two bits */
-#define PNG_ZLIB_IN_USE        4 /* a flag value */
+   png_uint_32 zowner;        /* ID (chunk type) of zstream owner, 0 if none */
+   z_stream    zstream;       /* decompression structure */
 
-   png_uint_32 zlib_state;       /* State of zlib initialization */
-/* End of material added at libpng 1.5.4 */
+#ifdef PNG_WRITE_SUPPORTED
+   png_compression_bufferp zbuffer_list; /* Created on demand during write */
+   uInt                    zbuffer_size; /* size of the actual buffer */
 
    int zlib_level;            /* holds zlib compression level */
    int zlib_method;           /* holds zlib compression method */
@@ -86,8 +193,7 @@ struct png_struct_def
    int zlib_strategy;         /* holds zlib compression strategy */
 #endif
 /* Added at libpng 1.5.4 */
-#if defined(PNG_WRITE_COMPRESSED_TEXT_SUPPORTED) || \
-    defined(PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED)
+#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
    int zlib_text_level;            /* holds zlib compression level */
    int zlib_text_method;           /* holds zlib compression method */
    int zlib_text_window_bits;      /* holds zlib compression window bits */
@@ -95,6 +201,14 @@ struct png_struct_def
    int zlib_text_strategy;         /* holds zlib compression strategy */
 #endif
 /* End of material added at libpng 1.5.4 */
+/* Added at libpng 1.6.0 */
+#ifdef PNG_WRITE_SUPPORTED
+   int zlib_set_level;        /* Actual values set into the zstream on write */
+   int zlib_set_method;
+   int zlib_set_window_bits;
+   int zlib_set_mem_level;
+   int zlib_set_strategy;
+#endif
 
    png_uint_32 width;         /* width of image in pixels */
    png_uint_32 height;        /* height of image in pixels */
@@ -105,15 +219,19 @@ struct png_struct_def
    png_uint_32 row_number;    /* current row in interlace pass */
    png_uint_32 chunk_name;    /* PNG_CHUNK() id of current chunk */
    png_bytep prev_row;        /* buffer to save previous (unfiltered) row.
-                               * This is a pointer into big_prev_row
+                               * While reading this is a pointer into
+                               * big_prev_row; while writing it is separately
+                               * allocated if needed.
                                */
    png_bytep row_buf;         /* buffer to save current (unfiltered) row.
-                               * This is a pointer into big_row_buf
+                               * While reading, this is a pointer into
+                               * big_row_buf; while writing it is separately
+                               * allocated.
                                */
-   png_bytep sub_row;         /* buffer to save "sub" row when filtering */
-   png_bytep up_row;          /* buffer to save "up" row when filtering */
-   png_bytep avg_row;         /* buffer to save "avg" row when filtering */
-   png_bytep paeth_row;       /* buffer to save "Paeth" row when filtering */
+#ifdef PNG_WRITE_FILTER_SUPPORTED
+   png_bytep try_row;    /* buffer to save trial row when filtering */
+   png_bytep tst_row;    /* buffer to save best trial row when filtering */
+#endif
    png_size_t info_rowbytes;  /* Added in 1.5.4: cache of updated row bytes */
 
    png_uint_32 idat_size;     /* current IDAT size for read */
@@ -137,15 +255,17 @@ struct png_struct_def
    png_byte usr_bit_depth;    /* bit depth of users row: write only */
    png_byte pixel_depth;      /* number of bits per pixel */
    png_byte channels;         /* number of channels in file */
+#ifdef PNG_WRITE_SUPPORTED
    png_byte usr_channels;     /* channels at start of write: write only */
+#endif
    png_byte sig_bytes;        /* magic bytes read/written from start of file */
    png_byte maximum_pixel_depth;
                               /* pixel depth used for the row buffers */
    png_byte transformed_pixel_depth;
                               /* pixel depth after read/write transforms */
-   png_byte io_chunk_string[5];
-                              /* string name of chunk */
-
+#if PNG_ZLIB_VERNUM >= 0x1240
+   png_byte zstream_start;    /* at start of an input zlib stream */
+#endif /* Zlib >= 1.2.4 */
 #if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
    png_uint_16 filler;           /* filler bytes for pixel expansion */
 #endif
@@ -158,7 +278,7 @@ struct png_struct_def
 #ifdef PNG_READ_GAMMA_SUPPORTED
    png_color_16 background_1; /* background normalized to gamma 1.0 */
 #endif
-#endif /* PNG_bKGD_SUPPORTED */
+#endif /* bKGD */
 
 #ifdef PNG_WRITE_FLUSH_SUPPORTED
    png_flush_ptr output_flush_fn; /* Function for flushing output */
@@ -168,7 +288,6 @@ struct png_struct_def
 
 #ifdef PNG_READ_GAMMA_SUPPORTED
    int gamma_shift;      /* number of "insignificant" bits in 16-bit gamma */
-   png_fixed_point gamma;        /* file gamma value */
    png_fixed_point screen_gamma; /* screen gamma value (display_exponent) */
 
    png_bytep gamma_table;     /* gamma table for 8-bit depth files */
@@ -216,7 +335,7 @@ struct png_struct_def
    int process_mode;                 /* what push library is currently doing */
    int cur_palette;                  /* current push library palette index */
 
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+#endif /* PROGRESSIVE_READ */
 
 #if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
 /* For the Borland special 64K segment handler */
@@ -232,14 +351,17 @@ struct png_struct_def
    png_bytep quantize_index; /* index translation for palette files */
 #endif
 
-#if defined(PNG_READ_QUANTIZE_SUPPORTED) || defined(PNG_hIST_SUPPORTED)
-   png_uint_16p hist;                /* histogram */
+/* Options */
+#ifdef PNG_SET_OPTION_SUPPORTED
+   png_byte options;           /* On/off state (up to 4 options) */
 #endif
 
+#if PNG_LIBPNG_VER < 10700
+/* To do: remove this from libpng-1.7 */
 #ifdef PNG_TIME_RFC1123_SUPPORTED
-   /* This is going to be unused in libpng16 and removed from libpng17 */
    char time_buffer[29]; /* String to hold RFC 1123 time text */
 #endif
+#endif
 
 /* New members added in libpng-1.0.6 */
 
@@ -247,17 +369,16 @@ struct png_struct_def
 
 #ifdef PNG_USER_CHUNKS_SUPPORTED
    png_voidp user_chunk_ptr;
+#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
    png_user_chunk_ptr read_user_chunk_fn; /* user read chunk handler */
 #endif
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-   int num_chunk_list;
-   png_bytep chunk_list;
 #endif
 
-#ifdef PNG_READ_sRGB_SUPPORTED
-   /* Added in 1.5.5 to record an sRGB chunk in the png. */
-   png_byte is_sRGB;
+#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
+   int          unknown_default; /* As PNG_HANDLE_* */
+   unsigned int num_chunk_list;  /* Number of entries in the list */
+   png_bytep    chunk_list;      /* List of png_byte[5]; the textual chunk name
+                                  * followed by a PNG_HANDLE_* byte */
 #endif
 
 /* New members added in libpng-1.0.3 */
@@ -322,16 +443,24 @@ struct png_struct_def
 #endif
 
 /* New member added in libpng-1.0.25 and 1.2.17 */
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-   /* Storage for unknown chunk that the library doesn't recognize. */
+#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
+   /* Temporary storage for unknown chunk that the library doesn't recognize,
+    * used while reading the chunk.
+    */
    png_unknown_chunk unknown_chunk;
 #endif
 
 /* New member added in libpng-1.2.26 */
   png_size_t old_big_row_buf_size;
 
+#ifdef PNG_READ_SUPPORTED
 /* New member added in libpng-1.2.30 */
-  png_charp chunkdata;  /* buffer for reading chunk data */
+  png_bytep        read_buffer;      /* buffer for reading chunk data */
+  png_alloc_size_t read_buffer_size; /* current size of the buffer */
+#endif
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
+  uInt             IDAT_read_size;   /* limit on read buffer size for IDAT */
+#endif
 
 #ifdef PNG_IO_STATE_SUPPORTED
 /* New member added in libpng-1.4.0 */
@@ -345,9 +474,10 @@ struct png_struct_def
    void (*read_filter[PNG_FILTER_VALUE_LAST-1])(png_row_infop row_info,
       png_bytep row, png_const_bytep prev_row);
 
-   /* Options */
-#ifdef PNG_SET_OPTION_SUPPORTED
-   png_byte options;           /* On/off state (up to 4 options) */
+#ifdef PNG_READ_SUPPORTED
+#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)
+   png_colorspace   colorspace;
+#endif
 #endif
 };
 #endif /* PNGSTRUCT_H */
diff --git a/drivers/png/pngtrans.c b/drivers/png/pngtrans.c
index a5df5afe00..7f8cc455d3 100644
--- a/drivers/png/pngtrans.c
+++ b/drivers/png/pngtrans.c
@@ -1,8 +1,8 @@
 
 /* pngtrans.c - transforms the data in a row (used by both readers and writers)
  *
- * Last changed in libpng 1.5.19 [August 21, 2014]
- * Copyright (c) 1998-2002,2004,2006-2014 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.18 [July 23, 2015]
+ * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -18,7 +18,7 @@
 #if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
 /* Turn on BGR-to-RGB mapping */
 void PNGAPI
-png_set_bgr(png_structp png_ptr)
+png_set_bgr(png_structrp png_ptr)
 {
    png_debug(1, "in png_set_bgr");
 
@@ -30,9 +30,9 @@ png_set_bgr(png_structp png_ptr)
 #endif
 
 #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-/* Turn on 16 bit byte swapping */
+/* Turn on 16-bit byte swapping */
 void PNGAPI
-png_set_swap(png_structp png_ptr)
+png_set_swap(png_structrp png_ptr)
 {
    png_debug(1, "in png_set_swap");
 
@@ -47,7 +47,7 @@ png_set_swap(png_structp png_ptr)
 #if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
 /* Turn on pixel packing */
 void PNGAPI
-png_set_packing(png_structp png_ptr)
+png_set_packing(png_structrp png_ptr)
 {
    png_debug(1, "in png_set_packing");
 
@@ -57,7 +57,9 @@ png_set_packing(png_structp png_ptr)
    if (png_ptr->bit_depth < 8)
    {
       png_ptr->transformations |= PNG_PACK;
-      png_ptr->usr_bit_depth = 8;
+#     ifdef PNG_WRITE_SUPPORTED
+         png_ptr->usr_bit_depth = 8;
+#     endif
    }
 }
 #endif
@@ -65,7 +67,7 @@ png_set_packing(png_structp png_ptr)
 #if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
 /* Turn on packed pixel swapping */
 void PNGAPI
-png_set_packswap(png_structp png_ptr)
+png_set_packswap(png_structrp png_ptr)
 {
    png_debug(1, "in png_set_packswap");
 
@@ -79,7 +81,7 @@ png_set_packswap(png_structp png_ptr)
 
 #if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
 void PNGAPI
-png_set_shift(png_structp png_ptr, png_const_color_8p true_bits)
+png_set_shift(png_structrp png_ptr, png_const_color_8p true_bits)
 {
    png_debug(1, "in png_set_shift");
 
@@ -94,11 +96,11 @@ png_set_shift(png_structp png_ptr, png_const_color_8p true_bits)
 #if defined(PNG_READ_INTERLACING_SUPPORTED) || \
     defined(PNG_WRITE_INTERLACING_SUPPORTED)
 int PNGAPI
-png_set_interlace_handling(png_structp png_ptr)
+png_set_interlace_handling(png_structrp png_ptr)
 {
    png_debug(1, "in png_set_interlace handling");
 
-   if (png_ptr && png_ptr->interlaced)
+   if (png_ptr != 0 && png_ptr->interlaced != 0)
    {
       png_ptr->transformations |= PNG_INTERLACE;
       return (7);
@@ -115,44 +117,91 @@ png_set_interlace_handling(png_structp png_ptr)
  * that don't like bytes as parameters.
  */
 void PNGAPI
-png_set_filler(png_structp png_ptr, png_uint_32 filler, int filler_loc)
+png_set_filler(png_structrp png_ptr, png_uint_32 filler, int filler_loc)
 {
    png_debug(1, "in png_set_filler");
 
    if (png_ptr == NULL)
       return;
 
+   /* In libpng 1.6 it is possible to determine whether this is a read or write
+    * operation and therefore to do more checking here for a valid call.
+    */
+   if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
+   {
+#     ifdef PNG_READ_FILLER_SUPPORTED
+         /* On read png_set_filler is always valid, regardless of the base PNG
+          * format, because other transformations can give a format where the
+          * filler code can execute (basically an 8 or 16-bit component RGB or G
+          * format.)
+          *
+          * NOTE: usr_channels is not used by the read code!  (This has led to
+          * confusion in the past.)  The filler is only used in the read code.
+          */
+         png_ptr->filler = (png_uint_16)filler;
+#     else
+         png_app_error(png_ptr, "png_set_filler not supported on read");
+         PNG_UNUSED(filler) /* not used in the write case */
+         return;
+#     endif
+   }
+
+   else /* write */
+   {
+#     ifdef PNG_WRITE_FILLER_SUPPORTED
+         /* On write the usr_channels parameter must be set correctly at the
+          * start to record the number of channels in the app-supplied data.
+          */
+         switch (png_ptr->color_type)
+         {
+            case PNG_COLOR_TYPE_RGB:
+               png_ptr->usr_channels = 4;
+               break;
+
+            case PNG_COLOR_TYPE_GRAY:
+               if (png_ptr->bit_depth >= 8)
+               {
+                  png_ptr->usr_channels = 2;
+                  break;
+               }
+
+               else
+               {
+                  /* There simply isn't any code in libpng to strip out bits
+                   * from bytes when the components are less than a byte in
+                   * size!
+                   */
+                  png_app_error(png_ptr,
+                     "png_set_filler is invalid for low bit depth gray output");
+                  return;
+               }
+
+            default:
+               png_app_error(png_ptr,
+                  "png_set_filler: inappropriate color type");
+               return;
+         }
+#     else
+         png_app_error(png_ptr, "png_set_filler not supported on write");
+         return;
+#     endif
+   }
+
+   /* Here on success - libpng supports the operation, set the transformation
+    * and the flag to say where the filler channel is.
+    */
    png_ptr->transformations |= PNG_FILLER;
-   png_ptr->filler = (png_uint_16)filler;
 
    if (filler_loc == PNG_FILLER_AFTER)
       png_ptr->flags |= PNG_FLAG_FILLER_AFTER;
 
    else
       png_ptr->flags &= ~PNG_FLAG_FILLER_AFTER;
-
-   /* This should probably go in the "do_read_filler" routine.
-    * I attempted to do that in libpng-1.0.1a but that caused problems
-    * so I restored it in libpng-1.0.2a
-   */
-
-   if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
-   {
-      png_ptr->usr_channels = 4;
-   }
-
-   /* Also I added this in libpng-1.0.2a (what happens when we expand
-    * a less-than-8-bit grayscale to GA?) */
-
-   if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY && png_ptr->bit_depth >= 8)
-   {
-      png_ptr->usr_channels = 2;
-   }
 }
 
 /* Added to libpng-1.2.7 */
 void PNGAPI
-png_set_add_alpha(png_structp png_ptr, png_uint_32 filler, int filler_loc)
+png_set_add_alpha(png_structrp png_ptr, png_uint_32 filler, int filler_loc)
 {
    png_debug(1, "in png_set_add_alpha");
 
@@ -160,7 +209,9 @@ png_set_add_alpha(png_structp png_ptr, png_uint_32 filler, int filler_loc)
       return;
 
    png_set_filler(png_ptr, filler, filler_loc);
-   png_ptr->transformations |= PNG_ADD_ALPHA;
+   /* The above may fail to do anything. */
+   if ((png_ptr->transformations & PNG_FILLER) != 0)
+      png_ptr->transformations |= PNG_ADD_ALPHA;
 }
 
 #endif
@@ -168,7 +219,7 @@ png_set_add_alpha(png_structp png_ptr, png_uint_32 filler, int filler_loc)
 #if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
     defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
 void PNGAPI
-png_set_swap_alpha(png_structp png_ptr)
+png_set_swap_alpha(png_structrp png_ptr)
 {
    png_debug(1, "in png_set_swap_alpha");
 
@@ -182,7 +233,7 @@ png_set_swap_alpha(png_structp png_ptr)
 #if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
     defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
 void PNGAPI
-png_set_invert_alpha(png_structp png_ptr)
+png_set_invert_alpha(png_structrp png_ptr)
 {
    png_debug(1, "in png_set_invert_alpha");
 
@@ -195,7 +246,7 @@ png_set_invert_alpha(png_structp png_ptr)
 
 #if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
 void PNGAPI
-png_set_invert_mono(png_structp png_ptr)
+png_set_invert_mono(png_structrp png_ptr)
 {
    png_debug(1, "in png_set_invert_mono");
 
@@ -262,7 +313,7 @@ png_do_invert(png_row_infop row_info, png_bytep row)
 
 #ifdef PNG_16BIT_SUPPORTED
 #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-/* Swaps byte order on 16 bit depth images */
+/* Swaps byte order on 16-bit depth images */
 void /* PRIVATE */
 png_do_swap(png_row_infop row_info, png_bytep row)
 {
@@ -276,9 +327,16 @@ png_do_swap(png_row_infop row_info, png_bytep row)
 
       for (i = 0; i < istop; i++, rp += 2)
       {
+#ifdef PNG_BUILTIN_BSWAP16_SUPPORTED
+         /* Feature added to libpng-1.6.11 for testing purposes, not
+          * enabled by default.
+          */
+         *(png_uint_16*)rp = __builtin_bswap16(*(png_uint_16*)rp);
+#else
          png_byte t = *rp;
          *rp = *(rp + 1);
          *(rp + 1) = t;
+#endif
       }
    }
 }
@@ -420,7 +478,7 @@ png_do_packswap(png_row_infop row_info, png_bytep row)
          *rp = table[*rp];
    }
 }
-#endif /* PNG_READ_PACKSWAP_SUPPORTED or PNG_WRITE_PACKSWAP_SUPPORTED */
+#endif /* PACKSWAP || WRITE_PACKSWAP */
 
 #if defined(PNG_WRITE_FILLER_SUPPORTED) || \
     defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
@@ -547,7 +605,7 @@ png_do_bgr(png_row_infop row_info, png_bytep row)
 {
    png_debug(1, "in png_do_bgr");
 
-   if ((row_info->color_type & PNG_COLOR_MASK_COLOR))
+   if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
    {
       png_uint_32 row_width = row_info->width;
       if (row_info->bit_depth == 8)
@@ -617,13 +675,13 @@ png_do_bgr(png_row_infop row_info, png_bytep row)
 #endif
    }
 }
-#endif /* PNG_READ_BGR_SUPPORTED or PNG_WRITE_BGR_SUPPORTED */
+#endif /* READ_BGR || WRITE_BGR */
 
 #if defined(PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED) || \
     defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED)
 /* Added at libpng-1.5.10 */
 void /* PRIVATE */
-png_do_check_palette_indexes(png_structp png_ptr, png_row_infop row_info)
+png_do_check_palette_indexes(png_structrp png_ptr, png_row_infop row_info)
 {
    if (png_ptr->num_palette < (1 << row_info->bit_depth) &&
       png_ptr->num_palette > 0) /* num_palette can be 0 in MNG files */
@@ -646,7 +704,7 @@ png_do_check_palette_indexes(png_structp png_ptr, png_row_infop row_info)
              */
             for (; rp > png_ptr->row_buf; rp--)
             {
-              if (*rp >> padding != 0)
+              if ((*rp >> padding) != 0)
                  png_ptr->num_palette_max = 1;
               padding = 0;
             }
@@ -720,19 +778,30 @@ png_do_check_palette_indexes(png_structp png_ptr, png_row_infop row_info)
       }
    }
 }
-#endif /* PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED */
+#endif /* CHECK_FOR_INVALID_INDEX */
 
 #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
     defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
 #ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
 void PNGAPI
-png_set_user_transform_info(png_structp png_ptr, png_voidp
+png_set_user_transform_info(png_structrp png_ptr, png_voidp
    user_transform_ptr, int user_transform_depth, int user_transform_channels)
 {
    png_debug(1, "in png_set_user_transform_info");
 
    if (png_ptr == NULL)
       return;
+
+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
+   if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
+      (png_ptr->flags & PNG_FLAG_ROW_INIT) != 0)
+   {
+      png_app_error(png_ptr,
+            "info change after png_start_read_image or png_read_update_info");
+      return;
+   }
+#endif
+
    png_ptr->user_transform_ptr = user_transform_ptr;
    png_ptr->user_transform_depth = (png_byte)user_transform_depth;
    png_ptr->user_transform_channels = (png_byte)user_transform_channels;
@@ -746,20 +815,20 @@ png_set_user_transform_info(png_structp png_ptr, png_voidp
  */
 #ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
 png_voidp PNGAPI
-png_get_user_transform_ptr(png_const_structp png_ptr)
+png_get_user_transform_ptr(png_const_structrp png_ptr)
 {
    if (png_ptr == NULL)
       return (NULL);
 
-   return ((png_voidp)png_ptr->user_transform_ptr);
+   return png_ptr->user_transform_ptr;
 }
 #endif
 
 #ifdef PNG_USER_TRANSFORM_INFO_SUPPORTED
 png_uint_32 PNGAPI
-png_get_current_row_number(png_const_structp png_ptr)
+png_get_current_row_number(png_const_structrp png_ptr)
 {
-   /* See the comments in png.h - this is the sub-image row when reading and
+   /* See the comments in png.h - this is the sub-image row when reading an
     * interlaced image.
     */
    if (png_ptr != NULL)
@@ -769,13 +838,12 @@ png_get_current_row_number(png_const_structp png_ptr)
 }
 
 png_byte PNGAPI
-png_get_current_pass_number(png_const_structp png_ptr)
+png_get_current_pass_number(png_const_structrp png_ptr)
 {
    if (png_ptr != NULL)
       return png_ptr->pass;
    return 8; /* invalid */
 }
-#endif /* PNG_USER_TRANSFORM_INFO_SUPPORTED */
-#endif /* PNG_READ_USER_TRANSFORM_SUPPORTED ||
-          PNG_WRITE_USER_TRANSFORM_SUPPORTED */
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+#endif /* USER_TRANSFORM_INFO */
+#endif /* READ_USER_TRANSFORM || WRITE_USER_TRANSFORM */
+#endif /* READ || WRITE */
diff --git a/drivers/png/pngwio.c b/drivers/png/pngwio.c
index cc55521452..586c03b721 100644
--- a/drivers/png/pngwio.c
+++ b/drivers/png/pngwio.c
@@ -1,7 +1,7 @@
 
 /* pngwio.c - functions for data output
  *
- * Last changed in libpng 1.5.18 [February 6, 2014]
+ * Last changed in libpng 1.6.15 [November 20, 2014]
  * Copyright (c) 1998-2002,2004,2006-2014 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -26,15 +26,16 @@
  * writes to a file pointer.  Note that this routine sometimes gets called
  * with very small lengths, so you should implement some kind of simple
  * buffering if you are using unbuffered writes.  This should never be asked
- * to write more than 64K on a 16 bit machine.
+ * to write more than 64K on a 16-bit machine.
  */
 
 void /* PRIVATE */
-png_write_data(png_structp png_ptr, png_const_bytep data, png_size_t length)
+png_write_data(png_structrp png_ptr, png_const_bytep data, png_size_t length)
 {
    /* NOTE: write_data_fn must not change the buffer! */
    if (png_ptr->write_data_fn != NULL )
-      (*(png_ptr->write_data_fn))(png_ptr, (png_bytep)data, length);
+      (*(png_ptr->write_data_fn))(png_ptr, png_constcast(png_bytep,data),
+         length);
 
    else
       png_error(png_ptr, "Call to NULL write function");
@@ -46,7 +47,6 @@ png_write_data(png_structp png_ptr, png_const_bytep data, png_size_t length)
  * write_data function and use it at run time with png_set_write_fn(), rather
  * than changing the library.
  */
-#ifndef USE_FAR_KEYWORD
 void PNGCBAPI
 png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
 {
@@ -60,64 +60,6 @@ png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
    if (check != length)
       png_error(png_ptr, "Write Error");
 }
-#else
-/* This is the model-independent version. Since the standard I/O library
- * can't handle far buffers in the medium and small models, we have to copy
- * the data.
- */
-
-#define NEAR_BUF_SIZE 1024
-#define MIN(a,b) (a <= b ? a : b)
-
-void PNGCBAPI
-png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
-{
-   png_uint_32 check;
-   png_byte *near_data;  /* Needs to be "png_byte *" instead of "png_bytep" */
-   png_FILE_p io_ptr;
-
-   if (png_ptr == NULL)
-      return;
-
-   /* Check if data really is near. If so, use usual code. */
-   near_data = (png_byte *)CVT_PTR_NOCHECK(data);
-   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
-
-   if ((png_bytep)near_data == data)
-   {
-      check = fwrite(near_data, 1, length, io_ptr);
-   }
-
-   else
-   {
-      png_byte buf[NEAR_BUF_SIZE];
-      png_size_t written, remaining, err;
-      check = 0;
-      remaining = length;
-
-      do
-      {
-         written = MIN(NEAR_BUF_SIZE, remaining);
-         png_memcpy(buf, data, written); /* Copy far buffer to near buffer */
-         err = fwrite(buf, 1, written, io_ptr);
-
-         if (err != written)
-            break;
-
-         else
-            check += err;
-
-         data += written;
-         remaining -= written;
-      }
-      while (remaining != 0);
-   }
-
-   if (check != length)
-      png_error(png_ptr, "Write Error");
-}
-
-#endif
 #endif
 
 /* This function is called to output any data pending writing (normally
@@ -126,7 +68,7 @@ png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
  */
 #ifdef PNG_WRITE_FLUSH_SUPPORTED
 void /* PRIVATE */
-png_flush(png_structp png_ptr)
+png_flush(png_structrp png_ptr)
 {
    if (png_ptr->output_flush_fn != NULL)
       (*(png_ptr->output_flush_fn))(png_ptr);
@@ -141,7 +83,7 @@ png_default_flush(png_structp png_ptr)
    if (png_ptr == NULL)
       return;
 
-   io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
+   io_ptr = png_voidcast(png_FILE_p, (png_ptr->io_ptr));
    fflush(io_ptr);
 }
 #  endif
@@ -177,7 +119,7 @@ png_default_flush(png_structp png_ptr)
  *                 *FILE structure.
  */
 void PNGAPI
-png_set_write_fn(png_structp png_ptr, png_voidp io_ptr,
+png_set_write_fn(png_structrp png_ptr, png_voidp io_ptr,
     png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn)
 {
    if (png_ptr == NULL)
@@ -209,8 +151,9 @@ png_set_write_fn(png_structp png_ptr, png_voidp io_ptr,
 #  endif
 #else
    PNG_UNUSED(output_flush_fn)
-#endif /* PNG_WRITE_FLUSH_SUPPORTED */
+#endif /* WRITE_FLUSH */
 
+#ifdef PNG_READ_SUPPORTED
    /* It is an error to read while writing a png file */
    if (png_ptr->read_data_fn != NULL)
    {
@@ -220,37 +163,6 @@ png_set_write_fn(png_structp png_ptr, png_voidp io_ptr,
           "Can't set both read_data_fn and write_data_fn in the"
           " same structure");
    }
-}
-
-#ifdef USE_FAR_KEYWORD
-#  ifdef _MSC_VER
-void *png_far_to_near(png_structp png_ptr, png_voidp ptr, int check)
-{
-   void *near_ptr;
-   void FAR *far_ptr;
-   FP_OFF(near_ptr) = FP_OFF(ptr);
-   far_ptr = (void FAR *)near_ptr;
-
-   if (check != 0)
-      if (FP_SEG(ptr) != FP_SEG(far_ptr))
-         png_error(png_ptr, "segment lost in conversion");
-
-   return(near_ptr);
-}
-#  else
-void *png_far_to_near(png_structp png_ptr, png_voidp ptr, int check)
-{
-   void *near_ptr;
-   void FAR *far_ptr;
-   near_ptr = (void FAR *)ptr;
-   far_ptr = (void FAR *)near_ptr;
-
-   if (check != 0)
-      if (far_ptr != ptr)
-         png_error(png_ptr, "segment lost in conversion");
-
-   return(near_ptr);
-}
-#  endif
 #endif
-#endif /* PNG_WRITE_SUPPORTED */
+}
+#endif /* WRITE */
diff --git a/drivers/png/pngwrite.c b/drivers/png/pngwrite.c
index 776c23603a..181a899438 100644
--- a/drivers/png/pngwrite.c
+++ b/drivers/png/pngwrite.c
@@ -1,7 +1,7 @@
 
 /* pngwrite.c - general routines to write a PNG file
  *
- * Last changed in libpng 1.5.23 [July 23, 2015]
+ * Last changed in libpng 1.6.19 [November 12, 2015]
  * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -12,9 +12,65 @@
  */
 
 #include "pngpriv.h"
+#ifdef PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
+#  include <errno.h>
+#endif /* SIMPLIFIED_WRITE_STDIO */
 
 #ifdef PNG_WRITE_SUPPORTED
 
+#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
+/* Write out all the unknown chunks for the current given location */
+static void
+write_unknown_chunks(png_structrp png_ptr, png_const_inforp info_ptr,
+   unsigned int where)
+{
+   if (info_ptr->unknown_chunks_num != 0)
+   {
+      png_const_unknown_chunkp up;
+
+      png_debug(5, "writing extra chunks");
+
+      for (up = info_ptr->unknown_chunks;
+           up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
+           ++up)
+         if ((up->location & where) != 0)
+      {
+         /* If per-chunk unknown chunk handling is enabled use it, otherwise
+          * just write the chunks the application has set.
+          */
+#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
+         int keep = png_handle_as_unknown(png_ptr, up->name);
+
+         /* NOTE: this code is radically different from the read side in the
+          * matter of handling an ancillary unknown chunk.  In the read side
+          * the default behavior is to discard it, in the code below the default
+          * behavior is to write it.  Critical chunks are, however, only
+          * written if explicitly listed or if the default is set to write all
+          * unknown chunks.
+          *
+          * The default handling is also slightly weird - it is not possible to
+          * stop the writing of all unsafe-to-copy chunks!
+          *
+          * TODO: REVIEW: this would seem to be a bug.
+          */
+         if (keep != PNG_HANDLE_CHUNK_NEVER &&
+             ((up->name[3] & 0x20) /* safe-to-copy overrides everything */ ||
+              keep == PNG_HANDLE_CHUNK_ALWAYS ||
+              (keep == PNG_HANDLE_CHUNK_AS_DEFAULT &&
+               png_ptr->unknown_default == PNG_HANDLE_CHUNK_ALWAYS)))
+#endif
+         {
+            /* TODO: review, what is wrong with a zero length unknown chunk? */
+            if (up->size == 0)
+               png_warning(png_ptr, "Writing zero-length unknown chunk");
+
+            png_write_chunk(png_ptr, up->name, up->data, up->size);
+         }
+      }
+   }
+}
+#endif /* WRITE_UNKNOWN_CHUNKS */
+
 /* Writes all the PNG information.  This is the suggested way to use the
  * library.  If you have a new chunk to add, make a function to write it,
  * and put it in the correct location here.  If you want the chunk written
@@ -25,21 +81,21 @@
  * them in png_write_end(), and compressing them.
  */
 void PNGAPI
-png_write_info_before_PLTE(png_structp png_ptr, png_infop info_ptr)
+png_write_info_before_PLTE(png_structrp png_ptr, png_const_inforp info_ptr)
 {
    png_debug(1, "in png_write_info_before_PLTE");
 
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
-   if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE))
+   if ((png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE) == 0)
    {
       /* Write PNG signature */
       png_write_sig(png_ptr);
 
 #ifdef PNG_MNG_FEATURES_SUPPORTED
-      if ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) && \
-          (png_ptr->mng_features_permitted))
+      if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0 && \
+          png_ptr->mng_features_permitted != 0)
       {
          png_warning(png_ptr,
              "MNG features are not allowed in a PNG datastream");
@@ -49,79 +105,91 @@ png_write_info_before_PLTE(png_structp png_ptr, png_infop info_ptr)
 
       /* Write IHDR information. */
       png_write_IHDR(png_ptr, info_ptr->width, info_ptr->height,
-          info_ptr->bit_depth, info_ptr->color_type,
-          info_ptr->compression_type, info_ptr->filter_type,
+          info_ptr->bit_depth, info_ptr->color_type, info_ptr->compression_type,
+          info_ptr->filter_type,
 #ifdef PNG_WRITE_INTERLACING_SUPPORTED
           info_ptr->interlace_type
 #else
           0
 #endif
-          );
+         );
+
       /* The rest of these check to see if the valid field has the appropriate
        * flag set, and if it does, writes the chunk.
+       *
+       * 1.6.0: COLORSPACE support controls the writing of these chunks too, and
+       * the chunks will be written if the WRITE routine is there and
+       * information * is available in the COLORSPACE. (See
+       * png_colorspace_sync_info in png.c for where the valid flags get set.)
+       *
+       * Under certain circumstances the colorspace can be invalidated without
+       * syncing the info_struct 'valid' flags; this happens if libpng detects
+       * an error and calls png_error while the color space is being set, yet
+       * the application continues writing the PNG.  So check the 'invalid'
+       * flag here too.
        */
-#ifdef PNG_WRITE_gAMA_SUPPORTED
-      if (info_ptr->valid & PNG_INFO_gAMA)
-         png_write_gAMA_fixed(png_ptr, info_ptr->gamma);
-#endif
-#ifdef PNG_WRITE_sRGB_SUPPORTED
-      if (info_ptr->valid & PNG_INFO_sRGB)
-         png_write_sRGB(png_ptr, (int)info_ptr->srgb_intent);
+#ifdef PNG_GAMMA_SUPPORTED
+#  ifdef PNG_WRITE_gAMA_SUPPORTED
+      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
+          (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_gAMA) != 0 &&
+          (info_ptr->valid & PNG_INFO_gAMA) != 0)
+         png_write_gAMA_fixed(png_ptr, info_ptr->colorspace.gamma);
+#  endif
 #endif
 
-#ifdef PNG_WRITE_iCCP_SUPPORTED
-      if (info_ptr->valid & PNG_INFO_iCCP)
-         png_write_iCCP(png_ptr, info_ptr->iccp_name, PNG_COMPRESSION_TYPE_BASE,
-             (png_charp)info_ptr->iccp_profile, (int)info_ptr->iccp_proflen);
-#endif
+#ifdef PNG_COLORSPACE_SUPPORTED
+      /* Write only one of sRGB or an ICC profile.  If a profile was supplied
+       * and it matches one of the known sRGB ones issue a warning.
+       */
+#  ifdef PNG_WRITE_iCCP_SUPPORTED
+         if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
+             (info_ptr->valid & PNG_INFO_iCCP) != 0)
+         {
+#    ifdef PNG_WRITE_sRGB_SUPPORTED
+               if ((info_ptr->valid & PNG_INFO_sRGB) != 0)
+                  png_app_warning(png_ptr,
+                     "profile matches sRGB but writing iCCP instead");
+#     endif
+
+            png_write_iCCP(png_ptr, info_ptr->iccp_name,
+               info_ptr->iccp_profile);
+         }
+#     ifdef PNG_WRITE_sRGB_SUPPORTED
+         else
+#     endif
+#  endif
+
+#  ifdef PNG_WRITE_sRGB_SUPPORTED
+         if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
+             (info_ptr->valid & PNG_INFO_sRGB) != 0)
+            png_write_sRGB(png_ptr, info_ptr->colorspace.rendering_intent);
+#  endif /* WRITE_sRGB */
+#endif /* COLORSPACE */
+
 #ifdef PNG_WRITE_sBIT_SUPPORTED
-      if (info_ptr->valid & PNG_INFO_sBIT)
-         png_write_sBIT(png_ptr, &(info_ptr->sig_bit), info_ptr->color_type);
+         if ((info_ptr->valid & PNG_INFO_sBIT) != 0)
+            png_write_sBIT(png_ptr, &(info_ptr->sig_bit), info_ptr->color_type);
 #endif
-#ifdef PNG_WRITE_cHRM_SUPPORTED
-      if (info_ptr->valid & PNG_INFO_cHRM)
-         png_write_cHRM_fixed(png_ptr,
-             info_ptr->x_white, info_ptr->y_white,
-             info_ptr->x_red, info_ptr->y_red,
-             info_ptr->x_green, info_ptr->y_green,
-             info_ptr->x_blue, info_ptr->y_blue);
+
+#ifdef PNG_COLORSPACE_SUPPORTED
+#  ifdef PNG_WRITE_cHRM_SUPPORTED
+         if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
+             (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM) != 0 &&
+             (info_ptr->valid & PNG_INFO_cHRM) != 0)
+            png_write_cHRM_fixed(png_ptr, &info_ptr->colorspace.end_points_xy);
+#  endif
 #endif
 
 #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-      if (info_ptr->unknown_chunks_num)
-      {
-         png_unknown_chunk *up;
-
-         png_debug(5, "writing extra chunks");
-
-         for (up = info_ptr->unknown_chunks;
-              up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
-              up++)
-         {
-            int keep = png_handle_as_unknown(png_ptr, up->name);
-
-            if (keep != PNG_HANDLE_CHUNK_NEVER &&
-                up->location &&
-                !(up->location & PNG_HAVE_PLTE) &&
-                !(up->location & PNG_HAVE_IDAT) &&
-                !(up->location & PNG_AFTER_IDAT) &&
-                ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
-                (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
-            {
-               if (up->size == 0)
-                  png_warning(png_ptr, "Writing zero-length unknown chunk");
-
-               png_write_chunk(png_ptr, up->name, up->data, up->size);
-            }
-         }
-      }
+         write_unknown_chunks(png_ptr, info_ptr, PNG_HAVE_IHDR);
 #endif
+
       png_ptr->mode |= PNG_WROTE_INFO_BEFORE_PLTE;
    }
 }
 
 void PNGAPI
-png_write_info(png_structp png_ptr, png_infop info_ptr)
+png_write_info(png_structrp png_ptr, png_const_inforp info_ptr)
 {
 #if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
    int i;
@@ -134,7 +202,7 @@ png_write_info(png_structp png_ptr, png_infop info_ptr)
 
    png_write_info_before_PLTE(png_ptr, info_ptr);
 
-   if (info_ptr->valid & PNG_INFO_PLTE)
+   if ((info_ptr->valid & PNG_INFO_PLTE) != 0)
       png_write_PLTE(png_ptr, info_ptr->palette,
           (png_uint_32)info_ptr->num_palette);
 
@@ -142,15 +210,20 @@ png_write_info(png_structp png_ptr, png_infop info_ptr)
       png_error(png_ptr, "Valid palette required for paletted images");
 
 #ifdef PNG_WRITE_tRNS_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_tRNS)
+   if ((info_ptr->valid & PNG_INFO_tRNS) !=0)
    {
 #ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
       /* Invert the alpha channel (in tRNS) */
-      if ((png_ptr->transformations & PNG_INVERT_ALPHA) &&
+      if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0 &&
           info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
       {
-         int j;
-         for (j = 0; j<(int)info_ptr->num_trans; j++)
+         int j, jend;
+
+         jend = info_ptr->num_trans;
+         if (jend > PNG_MAX_PALETTE_LENGTH)
+            jend = PNG_MAX_PALETTE_LENGTH;
+
+         for (j = 0; j<jend; ++j)
             info_ptr->trans_alpha[j] =
                (png_byte)(255 - info_ptr->trans_alpha[j]);
       }
@@ -160,42 +233,42 @@ png_write_info(png_structp png_ptr, png_infop info_ptr)
    }
 #endif
 #ifdef PNG_WRITE_bKGD_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_bKGD)
+   if ((info_ptr->valid & PNG_INFO_bKGD) != 0)
       png_write_bKGD(png_ptr, &(info_ptr->background), info_ptr->color_type);
 #endif
 
 #ifdef PNG_WRITE_hIST_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_hIST)
+   if ((info_ptr->valid & PNG_INFO_hIST) != 0)
       png_write_hIST(png_ptr, info_ptr->hist, info_ptr->num_palette);
 #endif
 
 #ifdef PNG_WRITE_oFFs_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_oFFs)
+   if ((info_ptr->valid & PNG_INFO_oFFs) != 0)
       png_write_oFFs(png_ptr, info_ptr->x_offset, info_ptr->y_offset,
           info_ptr->offset_unit_type);
 #endif
 
 #ifdef PNG_WRITE_pCAL_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_pCAL)
+   if ((info_ptr->valid & PNG_INFO_pCAL) != 0)
       png_write_pCAL(png_ptr, info_ptr->pcal_purpose, info_ptr->pcal_X0,
           info_ptr->pcal_X1, info_ptr->pcal_type, info_ptr->pcal_nparams,
           info_ptr->pcal_units, info_ptr->pcal_params);
 #endif
 
 #ifdef PNG_WRITE_sCAL_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_sCAL)
+   if ((info_ptr->valid & PNG_INFO_sCAL) != 0)
       png_write_sCAL_s(png_ptr, (int)info_ptr->scal_unit,
           info_ptr->scal_s_width, info_ptr->scal_s_height);
 #endif /* sCAL */
 
 #ifdef PNG_WRITE_pHYs_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_pHYs)
+   if ((info_ptr->valid & PNG_INFO_pHYs) != 0)
       png_write_pHYs(png_ptr, info_ptr->x_pixels_per_unit,
           info_ptr->y_pixels_per_unit, info_ptr->phys_unit_type);
 #endif /* pHYs */
 
 #ifdef PNG_WRITE_tIME_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_tIME)
+   if ((info_ptr->valid & PNG_INFO_tIME) != 0)
    {
       png_write_tIME(png_ptr, &(info_ptr->mod_time));
       png_ptr->mode |= PNG_WROTE_tIME;
@@ -203,7 +276,7 @@ png_write_info(png_structp png_ptr, png_infop info_ptr)
 #endif /* tIME */
 
 #ifdef PNG_WRITE_sPLT_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_sPLT)
+   if ((info_ptr->valid & PNG_INFO_sPLT) != 0)
       for (i = 0; i < (int)info_ptr->splt_palettes_num; i++)
          png_write_sPLT(png_ptr, info_ptr->splt_palettes + i);
 #endif /* sPLT */
@@ -241,8 +314,7 @@ png_write_info(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_WRITE_zTXt_SUPPORTED
          /* Write compressed chunk */
          png_write_zTXt(png_ptr, info_ptr->text[i].key,
-             info_ptr->text[i].text, 0,
-             info_ptr->text[i].compression);
+             info_ptr->text[i].text, info_ptr->text[i].compression);
          /* Mark this chunk as written */
          info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
 #else
@@ -268,29 +340,7 @@ png_write_info(png_structp png_ptr, png_infop info_ptr)
 #endif /* tEXt */
 
 #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-   if (info_ptr->unknown_chunks_num)
-   {
-      png_unknown_chunk *up;
-
-      png_debug(5, "writing extra chunks");
-
-      for (up = info_ptr->unknown_chunks;
-           up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
-           up++)
-      {
-         int keep = png_handle_as_unknown(png_ptr, up->name);
-         if (keep != PNG_HANDLE_CHUNK_NEVER &&
-             up->location &&
-             (up->location & PNG_HAVE_PLTE) &&
-             !(up->location & PNG_HAVE_IDAT) &&
-             !(up->location & PNG_AFTER_IDAT) &&
-             ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
-             (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
-         {
-            png_write_chunk(png_ptr, up->name, up->data, up->size);
-         }
-      }
-   }
+   write_unknown_chunks(png_ptr, info_ptr, PNG_HAVE_PLTE);
 #endif
 }
 
@@ -300,14 +350,14 @@ png_write_info(png_structp png_ptr, png_infop info_ptr)
  * comments, I suggest writing them here, and compressing them.
  */
 void PNGAPI
-png_write_end(png_structp png_ptr, png_infop info_ptr)
+png_write_end(png_structrp png_ptr, png_inforp info_ptr)
 {
    png_debug(1, "in png_write_end");
 
    if (png_ptr == NULL)
       return;
 
-   if (!(png_ptr->mode & PNG_HAVE_IDAT))
+   if ((png_ptr->mode & PNG_HAVE_IDAT) == 0)
       png_error(png_ptr, "No IDATs written into file");
 
 #ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
@@ -323,8 +373,8 @@ png_write_end(png_structp png_ptr, png_infop info_ptr)
 #endif
 #ifdef PNG_WRITE_tIME_SUPPORTED
       /* Check to see if user has supplied a time chunk */
-      if ((info_ptr->valid & PNG_INFO_tIME) &&
-          !(png_ptr->mode & PNG_WROTE_tIME))
+      if ((info_ptr->valid & PNG_INFO_tIME) != 0 &&
+          (png_ptr->mode & PNG_WROTE_tIME) == 0)
          png_write_tIME(png_ptr, &(info_ptr->mod_time));
 
 #endif
@@ -346,7 +396,10 @@ png_write_end(png_structp png_ptr, png_infop info_ptr)
                 info_ptr->text[i].lang_key,
                 info_ptr->text[i].text);
             /* Mark this chunk as written */
-            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+            if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
+               info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+            else
+               info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
 #else
             png_warning(png_ptr, "Unable to write international text");
 #endif
@@ -357,8 +410,7 @@ png_write_end(png_structp png_ptr, png_infop info_ptr)
 #ifdef PNG_WRITE_zTXt_SUPPORTED
             /* Write compressed chunk */
             png_write_zTXt(png_ptr, info_ptr->text[i].key,
-                info_ptr->text[i].text, 0,
-                info_ptr->text[i].compression);
+                info_ptr->text[i].text, info_ptr->text[i].compression);
             /* Mark this chunk as written */
             info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
 #else
@@ -381,27 +433,7 @@ png_write_end(png_structp png_ptr, png_infop info_ptr)
       }
 #endif
 #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-   if (info_ptr->unknown_chunks_num)
-   {
-      png_unknown_chunk *up;
-
-      png_debug(5, "writing extra chunks");
-
-      for (up = info_ptr->unknown_chunks;
-           up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
-           up++)
-      {
-         int keep = png_handle_as_unknown(png_ptr, up->name);
-         if (keep != PNG_HANDLE_CHUNK_NEVER &&
-             up->location &&
-             (up->location & PNG_AFTER_IDAT) &&
-             ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
-             (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
-         {
-            png_write_chunk(png_ptr, up->name, up->data, up->size);
-         }
-      }
-   }
+      write_unknown_chunks(png_ptr, info_ptr, PNG_AFTER_IDAT);
 #endif
    }
 
@@ -409,6 +441,7 @@ png_write_end(png_structp png_ptr, png_infop info_ptr)
 
    /* Write end of PNG file */
    png_write_IEND(png_ptr);
+
    /* This flush, added in libpng-1.0.8, removed from libpng-1.0.9beta03,
     * and restored again in libpng-1.2.30, may cause some applications that
     * do not set png_ptr->output_flush_fn to crash.  If your application
@@ -425,7 +458,7 @@ png_write_end(png_structp png_ptr, png_infop info_ptr)
 
 #ifdef PNG_CONVERT_tIME_SUPPORTED
 void PNGAPI
-png_convert_from_struct_tm(png_timep ptime, PNG_CONST struct tm FAR * ttime)
+png_convert_from_struct_tm(png_timep ptime, PNG_CONST struct tm * ttime)
 {
    png_debug(1, "in png_convert_from_struct_tm");
 
@@ -454,96 +487,75 @@ PNG_FUNCTION(png_structp,PNGAPI
 png_create_write_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
     png_error_ptr error_fn, png_error_ptr warn_fn),PNG_ALLOCATED)
 {
-#ifdef PNG_USER_MEM_SUPPORTED
-   return (png_create_write_struct_2(user_png_ver, error_ptr, error_fn,
-       warn_fn, NULL, NULL, NULL));
+#ifndef PNG_USER_MEM_SUPPORTED
+   png_structrp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
+       error_fn, warn_fn, NULL, NULL, NULL);
+#else
+   return png_create_write_struct_2(user_png_ver, error_ptr, error_fn,
+       warn_fn, NULL, NULL, NULL);
 }
 
+/* Alternate initialize png_ptr structure, and allocate any memory needed */
 PNG_FUNCTION(png_structp,PNGAPI
 png_create_write_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,
     png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
     png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)
 {
-#endif /* PNG_USER_MEM_SUPPORTED */
-   volatile int png_cleanup_needed = 0;
-#ifdef PNG_SETJMP_SUPPORTED
-   volatile
-#endif
-   png_structp png_ptr;
-#ifdef PNG_SETJMP_SUPPORTED
-#ifdef USE_FAR_KEYWORD
-   jmp_buf tmp_jmpbuf;
-#endif
-#endif
-
-   png_debug(1, "in png_create_write_struct");
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,
-       (png_malloc_ptr)malloc_fn, (png_voidp)mem_ptr);
-#else
-   png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
-#endif /* PNG_USER_MEM_SUPPORTED */
-   if (png_ptr == NULL)
-      return (NULL);
+   png_structrp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
+       error_fn, warn_fn, mem_ptr, malloc_fn, free_fn);
+#endif /* USER_MEM */
+   if (png_ptr != NULL)
+   {
+      /* Set the zlib control values to defaults; they can be overridden by the
+       * application after the struct has been created.
+       */
+      png_ptr->zbuffer_size = PNG_ZBUF_SIZE;
 
-   /* Added at libpng-1.2.6 */
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-   png_ptr->user_width_max = PNG_USER_WIDTH_MAX;
-   png_ptr->user_height_max = PNG_USER_HEIGHT_MAX;
+      /* The 'zlib_strategy' setting is irrelevant because png_default_claim in
+       * pngwutil.c defaults it according to whether or not filters will be
+       * used, and ignores this setting.
+       */
+      png_ptr->zlib_strategy = PNG_Z_DEFAULT_STRATEGY;
+      png_ptr->zlib_level = PNG_Z_DEFAULT_COMPRESSION;
+      png_ptr->zlib_mem_level = 8;
+      png_ptr->zlib_window_bits = 15;
+      png_ptr->zlib_method = 8;
+
+#ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
+      png_ptr->zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY;
+      png_ptr->zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION;
+      png_ptr->zlib_text_mem_level = 8;
+      png_ptr->zlib_text_window_bits = 15;
+      png_ptr->zlib_text_method = 8;
+#endif /* WRITE_COMPRESSED_TEXT */
+
+      /* This is a highly dubious configuration option; by default it is off,
+       * but it may be appropriate for private builds that are testing
+       * extensions not conformant to the current specification, or of
+       * applications that must not fail to write at all costs!
+       */
+#ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED
+      /* In stable builds only warn if an application error can be completely
+       * handled.
+       */
+      png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN;
 #endif
 
-#ifdef PNG_SETJMP_SUPPORTED
-/* Applications that neglect to set up their own setjmp() and then
- * encounter a png_error() will longjmp here.  Since the jmpbuf is
- * then meaningless we abort instead of returning.
- */
-#ifdef USE_FAR_KEYWORD
-   if (setjmp(tmp_jmpbuf))
-      png_memcpy(png_jmpbuf(png_ptr), tmp_jmpbuf, png_sizeof(jmp_buf));
-   PNG_ABORT();
-#else
-   if (setjmp(png_jmpbuf(png_ptr))) /* sets longjmp to match setjmp */
-      PNG_ABORT();
-#endif
+      /* App warnings are warnings in release (or release candidate) builds but
+       * are errors during development.
+       */
+#if PNG_RELEASE_BUILD
+      png_ptr->flags |= PNG_FLAG_APP_WARNINGS_WARN;
 #endif
 
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
-#endif /* PNG_USER_MEM_SUPPORTED */
-   png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
-
-   if (!png_user_version_check(png_ptr, user_png_ver))
-      png_cleanup_needed = 1;
-
-   /* Initialize zbuf - compression buffer */
-   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
-
-   if (png_cleanup_needed == 0)
-   {
-      png_ptr->zbuf = (png_bytep)png_malloc_warn(png_ptr,
-          png_ptr->zbuf_size);
-      if (png_ptr->zbuf == NULL)
-         png_cleanup_needed = 1;
-   }
-
-   if (png_cleanup_needed != 0)
-   {
-       /* Clean up PNG structure and deallocate any memory. */
-       png_free(png_ptr, png_ptr->zbuf);
-       png_ptr->zbuf = NULL;
-#ifdef PNG_USER_MEM_SUPPORTED
-       png_destroy_struct_2((png_voidp)png_ptr,
-           (png_free_ptr)free_fn, (png_voidp)mem_ptr);
-#else
-       png_destroy_struct((png_voidp)png_ptr);
-#endif
-       return (NULL);
+      /* TODO: delay this, it can be done in png_init_io() (if the app doesn't
+       * do it itself) avoiding setting the default function if it is not
+       * required.
+       */
+      png_set_write_fn(png_ptr, NULL, NULL, NULL);
    }
 
-   png_set_write_fn(png_ptr, NULL, NULL, NULL);
-
-   return (png_ptr);
+   return png_ptr;
 }
 
 
@@ -553,7 +565,7 @@ png_create_write_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,
  * "write" the image seven times.
  */
 void PNGAPI
-png_write_rows(png_structp png_ptr, png_bytepp row,
+png_write_rows(png_structrp png_ptr, png_bytepp row,
     png_uint_32 num_rows)
 {
    png_uint_32 i; /* row counter */
@@ -575,7 +587,7 @@ png_write_rows(png_structp png_ptr, png_bytepp row,
  * if you are writing an interlaced image.
  */
 void PNGAPI
-png_write_image(png_structp png_ptr, png_bytepp image)
+png_write_image(png_structrp png_ptr, png_bytepp image)
 {
    png_uint_32 i; /* row index */
    int pass, num_pass; /* pass variables */
@@ -605,9 +617,74 @@ png_write_image(png_structp png_ptr, png_bytepp image)
    }
 }
 
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+/* Performs intrapixel differencing  */
+static void
+png_do_write_intrapixel(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_write_intrapixel");
+
+   if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
+   {
+      int bytes_per_pixel;
+      png_uint_32 row_width = row_info->width;
+      if (row_info->bit_depth == 8)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 3;
+
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 4;
+
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            *(rp)     = (png_byte)(*rp       - *(rp + 1));
+            *(rp + 2) = (png_byte)(*(rp + 2) - *(rp + 1));
+         }
+      }
+
+#ifdef PNG_WRITE_16BIT_SUPPORTED
+      else if (row_info->bit_depth == 16)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 6;
+
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 8;
+
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            png_uint_32 s0   = (*(rp    ) << 8) | *(rp + 1);
+            png_uint_32 s1   = (*(rp + 2) << 8) | *(rp + 3);
+            png_uint_32 s2   = (*(rp + 4) << 8) | *(rp + 5);
+            png_uint_32 red  = (png_uint_32)((s0 - s1) & 0xffffL);
+            png_uint_32 blue = (png_uint_32)((s2 - s1) & 0xffffL);
+            *(rp    ) = (png_byte)(red >> 8);
+            *(rp + 1) = (png_byte)red;
+            *(rp + 4) = (png_byte)(blue >> 8);
+            *(rp + 5) = (png_byte)blue;
+         }
+      }
+#endif /* WRITE_16BIT */
+   }
+}
+#endif /* MNG_FEATURES */
+
 /* Called by user to write a row of image data */
 void PNGAPI
-png_write_row(png_structp png_ptr, png_const_bytep row)
+png_write_row(png_structrp png_ptr, png_const_bytep row)
 {
    /* 1.5.6: moved from png_struct to be a local structure: */
    png_row_info row_info;
@@ -622,44 +699,44 @@ png_write_row(png_structp png_ptr, png_const_bytep row)
    if (png_ptr->row_number == 0 && png_ptr->pass == 0)
    {
       /* Make sure we wrote the header info */
-      if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE))
+      if ((png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE) == 0)
          png_error(png_ptr,
              "png_write_info was never called before png_write_row");
 
       /* Check for transforms that have been set but were defined out */
 #if !defined(PNG_WRITE_INVERT_SUPPORTED) && defined(PNG_READ_INVERT_SUPPORTED)
-      if (png_ptr->transformations & PNG_INVERT_MONO)
+      if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)
          png_warning(png_ptr, "PNG_WRITE_INVERT_SUPPORTED is not defined");
 #endif
 
 #if !defined(PNG_WRITE_FILLER_SUPPORTED) && defined(PNG_READ_FILLER_SUPPORTED)
-      if (png_ptr->transformations & PNG_FILLER)
+      if ((png_ptr->transformations & PNG_FILLER) != 0)
          png_warning(png_ptr, "PNG_WRITE_FILLER_SUPPORTED is not defined");
 #endif
 #if !defined(PNG_WRITE_PACKSWAP_SUPPORTED) && \
     defined(PNG_READ_PACKSWAP_SUPPORTED)
-      if (png_ptr->transformations & PNG_PACKSWAP)
+      if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
          png_warning(png_ptr,
              "PNG_WRITE_PACKSWAP_SUPPORTED is not defined");
 #endif
 
 #if !defined(PNG_WRITE_PACK_SUPPORTED) && defined(PNG_READ_PACK_SUPPORTED)
-      if (png_ptr->transformations & PNG_PACK)
+      if ((png_ptr->transformations & PNG_PACK) != 0)
          png_warning(png_ptr, "PNG_WRITE_PACK_SUPPORTED is not defined");
 #endif
 
 #if !defined(PNG_WRITE_SHIFT_SUPPORTED) && defined(PNG_READ_SHIFT_SUPPORTED)
-      if (png_ptr->transformations & PNG_SHIFT)
+      if ((png_ptr->transformations & PNG_SHIFT) != 0)
          png_warning(png_ptr, "PNG_WRITE_SHIFT_SUPPORTED is not defined");
 #endif
 
 #if !defined(PNG_WRITE_BGR_SUPPORTED) && defined(PNG_READ_BGR_SUPPORTED)
-      if (png_ptr->transformations & PNG_BGR)
+      if ((png_ptr->transformations & PNG_BGR) != 0)
          png_warning(png_ptr, "PNG_WRITE_BGR_SUPPORTED is not defined");
 #endif
 
 #if !defined(PNG_WRITE_SWAP_SUPPORTED) && defined(PNG_READ_SWAP_SUPPORTED)
-      if (png_ptr->transformations & PNG_SWAP_BYTES)
+      if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)
          png_warning(png_ptr, "PNG_WRITE_SWAP_SUPPORTED is not defined");
 #endif
 
@@ -668,12 +745,13 @@ png_write_row(png_structp png_ptr, png_const_bytep row)
 
 #ifdef PNG_WRITE_INTERLACING_SUPPORTED
    /* If interlaced and not interested in row, return */
-   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+   if (png_ptr->interlaced != 0 &&
+       (png_ptr->transformations & PNG_INTERLACE) != 0)
    {
       switch (png_ptr->pass)
       {
          case 0:
-            if (png_ptr->row_number & 0x07)
+            if ((png_ptr->row_number & 0x07) != 0)
             {
                png_write_finish_row(png_ptr);
                return;
@@ -681,7 +759,7 @@ png_write_row(png_structp png_ptr, png_const_bytep row)
             break;
 
          case 1:
-            if ((png_ptr->row_number & 0x07) || png_ptr->width < 5)
+            if ((png_ptr->row_number & 0x07) != 0 || png_ptr->width < 5)
             {
                png_write_finish_row(png_ptr);
                return;
@@ -697,7 +775,7 @@ png_write_row(png_structp png_ptr, png_const_bytep row)
             break;
 
          case 3:
-            if ((png_ptr->row_number & 0x03) || png_ptr->width < 3)
+            if ((png_ptr->row_number & 0x03) != 0 || png_ptr->width < 3)
             {
                png_write_finish_row(png_ptr);
                return;
@@ -713,7 +791,7 @@ png_write_row(png_structp png_ptr, png_const_bytep row)
             break;
 
          case 5:
-            if ((png_ptr->row_number & 0x01) || png_ptr->width < 2)
+            if ((png_ptr->row_number & 0x01) != 0 || png_ptr->width < 2)
             {
                png_write_finish_row(png_ptr);
                return;
@@ -721,7 +799,7 @@ png_write_row(png_structp png_ptr, png_const_bytep row)
             break;
 
          case 6:
-            if (!(png_ptr->row_number & 0x01))
+            if ((png_ptr->row_number & 0x01) == 0)
             {
                png_write_finish_row(png_ptr);
                return;
@@ -750,12 +828,12 @@ png_write_row(png_structp png_ptr, png_const_bytep row)
    png_debug1(3, "row_info->rowbytes = %lu", (unsigned long)row_info.rowbytes);
 
    /* Copy user's row into buffer, leaving room for filter byte. */
-   png_memcpy(png_ptr->row_buf + 1, row, row_info.rowbytes);
+   memcpy(png_ptr->row_buf + 1, row, row_info.rowbytes);
 
 #ifdef PNG_WRITE_INTERLACING_SUPPORTED
    /* Handle interlacing */
    if (png_ptr->interlaced && png_ptr->pass < 6 &&
-       (png_ptr->transformations & PNG_INTERLACE))
+       (png_ptr->transformations & PNG_INTERLACE) != 0)
    {
       png_do_write_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass);
       /* This should always get caught above, but still ... */
@@ -769,7 +847,7 @@ png_write_row(png_structp png_ptr, png_const_bytep row)
 
 #ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
    /* Handle other transformations */
-   if (png_ptr->transformations)
+   if (png_ptr->transformations != 0)
       png_do_write_transformations(png_ptr, &row_info);
 #endif
 
@@ -777,7 +855,7 @@ png_write_row(png_structp png_ptr, png_const_bytep row)
     * which is also the output depth.
     */
    if (row_info.pixel_depth != png_ptr->pixel_depth ||
-      row_info.pixel_depth != png_ptr->transformed_pixel_depth)
+       row_info.pixel_depth != png_ptr->transformed_pixel_depth)
       png_error(png_ptr, "internal write transform logic error");
 
 #ifdef PNG_MNG_FEATURES_SUPPORTED
@@ -790,7 +868,7 @@ png_write_row(png_structp png_ptr, png_const_bytep row)
     * 4. The filter_method is 64 and
     * 5. The color_type is RGB or RGBA
     */
-   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
        (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
    {
       /* Intrapixel differencing */
@@ -816,7 +894,7 @@ png_write_row(png_structp png_ptr, png_const_bytep row)
 #ifdef PNG_WRITE_FLUSH_SUPPORTED
 /* Set the automatic flush interval or 0 to turn flushing off */
 void PNGAPI
-png_set_flush(png_structp png_ptr, int nrows)
+png_set_flush(png_structrp png_ptr, int nrows)
 {
    png_debug(1, "in png_set_flush");
 
@@ -828,10 +906,8 @@ png_set_flush(png_structp png_ptr, int nrows)
 
 /* Flush the current output buffers now */
 void PNGAPI
-png_write_flush(png_structp png_ptr)
+png_write_flush(png_structrp png_ptr)
 {
-   int wrote_IDAT;
-
    png_debug(1, "in png_write_flush");
 
    if (png_ptr == NULL)
@@ -841,175 +917,76 @@ png_write_flush(png_structp png_ptr)
    if (png_ptr->row_number >= png_ptr->num_rows)
       return;
 
-   do
-   {
-      int ret;
-
-      /* Compress the data */
-      ret = deflate(&png_ptr->zstream, Z_SYNC_FLUSH);
-      wrote_IDAT = 0;
-
-      /* Check for compression errors */
-      if (ret != Z_OK)
-      {
-         if (png_ptr->zstream.msg != NULL)
-            png_error(png_ptr, png_ptr->zstream.msg);
-
-         else
-            png_error(png_ptr, "zlib error");
-      }
-
-      if ((png_ptr->zstream.avail_out) == 0)
-      {
-         /* Write the IDAT and reset the zlib output buffer */
-         png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
-         wrote_IDAT = 1;
-      }
-   } while (wrote_IDAT == 1);
-
-   /* If there is any data left to be output, write it into a new IDAT */
-   if (png_ptr->zbuf_size != png_ptr->zstream.avail_out)
-   {
-      /* Write the IDAT and reset the zlib output buffer */
-      png_write_IDAT(png_ptr, png_ptr->zbuf,
-          png_ptr->zbuf_size - png_ptr->zstream.avail_out);
-   }
+   png_compress_IDAT(png_ptr, NULL, 0, Z_SYNC_FLUSH);
    png_ptr->flush_rows = 0;
    png_flush(png_ptr);
 }
-#endif /* PNG_WRITE_FLUSH_SUPPORTED */
+#endif /* WRITE_FLUSH */
 
-/* Free all memory used by the write */
-void PNGAPI
-png_destroy_write_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)
+/* Free any memory used in png_ptr struct without freeing the struct itself. */
+static void
+png_write_destroy(png_structrp png_ptr)
 {
-   png_structp png_ptr = NULL;
-   png_infop info_ptr = NULL;
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_free_ptr free_fn = NULL;
-   png_voidp mem_ptr = NULL;
-#endif
-
-   png_debug(1, "in png_destroy_write_struct");
-
-   if (png_ptr_ptr != NULL)
-      png_ptr = *png_ptr_ptr;
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   if (png_ptr != NULL)
-   {
-      free_fn = png_ptr->free_fn;
-      mem_ptr = png_ptr->mem_ptr;
-   }
-#endif
-
-   if (info_ptr_ptr != NULL)
-      info_ptr = *info_ptr_ptr;
-
-   if (info_ptr != NULL)
-   {
-      if (png_ptr != NULL)
-      {
-         png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-         if (png_ptr->num_chunk_list)
-         {
-            png_free(png_ptr, png_ptr->chunk_list);
-            png_ptr->num_chunk_list = 0;
-         }
-#endif
-      }
-
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)info_ptr, (png_free_ptr)free_fn,
-          (png_voidp)mem_ptr);
-#else
-      png_destroy_struct((png_voidp)info_ptr);
-#endif
-      *info_ptr_ptr = NULL;
-   }
-
-   if (png_ptr != NULL)
-   {
-      png_write_destroy(png_ptr);
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)png_ptr, (png_free_ptr)free_fn,
-          (png_voidp)mem_ptr);
-#else
-      png_destroy_struct((png_voidp)png_ptr);
-#endif
-      *png_ptr_ptr = NULL;
-   }
-}
-
-
-/* Free any memory used in png_ptr struct (old method) */
-void /* PRIVATE */
-png_write_destroy(png_structp png_ptr)
-{
-#ifdef PNG_SETJMP_SUPPORTED
-   jmp_buf tmp_jmp; /* Save jump buffer */
-#endif
-   png_error_ptr error_fn;
-#ifdef PNG_WARNINGS_SUPPORTED
-   png_error_ptr warning_fn;
-#endif
-   png_voidp error_ptr;
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_free_ptr free_fn;
-#endif
-
    png_debug(1, "in png_write_destroy");
 
    /* Free any memory zlib uses */
-   if (png_ptr->zlib_state != PNG_ZLIB_UNINITIALIZED)
+   if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0)
       deflateEnd(&png_ptr->zstream);
 
    /* Free our memory.  png_free checks NULL for us. */
-   png_free(png_ptr, png_ptr->zbuf);
+   png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list);
    png_free(png_ptr, png_ptr->row_buf);
+   png_ptr->row_buf = NULL;
 #ifdef PNG_WRITE_FILTER_SUPPORTED
    png_free(png_ptr, png_ptr->prev_row);
-   png_free(png_ptr, png_ptr->sub_row);
-   png_free(png_ptr, png_ptr->up_row);
-   png_free(png_ptr, png_ptr->avg_row);
-   png_free(png_ptr, png_ptr->paeth_row);
+   png_free(png_ptr, png_ptr->try_row);
+   png_free(png_ptr, png_ptr->tst_row);
+   png_ptr->prev_row = NULL;
+   png_ptr->try_row = NULL;
+   png_ptr->tst_row = NULL;
 #endif
 
-#ifdef PNG_SETJMP_SUPPORTED
-   /* Reset structure */
-   png_memcpy(tmp_jmp, png_ptr->longjmp_buffer, png_sizeof(jmp_buf));
+#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
+   png_free(png_ptr, png_ptr->chunk_list);
+   png_ptr->chunk_list = NULL;
 #endif
 
-   error_fn = png_ptr->error_fn;
-#ifdef PNG_WARNINGS_SUPPORTED
-   warning_fn = png_ptr->warning_fn;
-#endif
-   error_ptr = png_ptr->error_ptr;
-#ifdef PNG_USER_MEM_SUPPORTED
-   free_fn = png_ptr->free_fn;
-#endif
+   /* The error handling and memory handling information is left intact at this
+    * point: the jmp_buf may still have to be freed.  See png_destroy_png_struct
+    * for how this happens.
+    */
+}
 
-   png_memset(png_ptr, 0, png_sizeof(png_struct));
+/* Free all memory used by the write.
+ * In libpng 1.6.0 this API changed quietly to no longer accept a NULL value for
+ * *png_ptr_ptr.  Prior to 1.6.0 it would accept such a value and it would free
+ * the passed in info_structs but it would quietly fail to free any of the data
+ * inside them.  In 1.6.0 it quietly does nothing (it has to be quiet because it
+ * has no png_ptr.)
+ */
+void PNGAPI
+png_destroy_write_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)
+{
+   png_debug(1, "in png_destroy_write_struct");
 
-   png_ptr->error_fn = error_fn;
-#ifdef PNG_WARNINGS_SUPPORTED
-   png_ptr->warning_fn = warning_fn;
-#endif
-   png_ptr->error_ptr = error_ptr;
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_ptr->free_fn = free_fn;
-#endif
+   if (png_ptr_ptr != NULL)
+   {
+      png_structrp png_ptr = *png_ptr_ptr;
 
-#ifdef PNG_SETJMP_SUPPORTED
-   png_memcpy(png_ptr->longjmp_buffer, tmp_jmp, png_sizeof(jmp_buf));
-#endif
+      if (png_ptr != NULL) /* added in libpng 1.6.0 */
+      {
+         png_destroy_info_struct(png_ptr, info_ptr_ptr);
+
+         *png_ptr_ptr = NULL;
+         png_write_destroy(png_ptr);
+         png_destroy_png_struct(png_ptr);
+      }
+   }
 }
 
 /* Allow the application to select one or more row filters to use. */
 void PNGAPI
-png_set_filter(png_structp png_ptr, int method, int filters)
+png_set_filter(png_structrp png_ptr, int method, int filters)
 {
    png_debug(1, "in png_set_filter");
 
@@ -1017,7 +994,7 @@ png_set_filter(png_structp png_ptr, int method, int filters)
       return;
 
 #ifdef PNG_MNG_FEATURES_SUPPORTED
-   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
        (method == PNG_INTRAPIXEL_DIFFERENCING))
       method = PNG_FILTER_TYPE_BASE;
 
@@ -1029,9 +1006,9 @@ png_set_filter(png_structp png_ptr, int method, int filters)
 #ifdef PNG_WRITE_FILTER_SUPPORTED
          case 5:
          case 6:
-         case 7: png_warning(png_ptr, "Unknown row filter for method 0");
-             /* FALL THROUGH */
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
+         case 7: png_app_error(png_ptr, "Unknown row filter for method 0");
+            /* FALL THROUGH */
+#endif /* WRITE_FILTER */
          case PNG_FILTER_VALUE_NONE:
             png_ptr->do_filter = PNG_FILTER_NONE; break;
 
@@ -1052,102 +1029,93 @@ png_set_filter(png_structp png_ptr, int method, int filters)
             png_ptr->do_filter = (png_byte)filters; break;
 #else
          default:
-            png_warning(png_ptr, "Unknown row filter for method 0");
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
+            png_app_error(png_ptr, "Unknown row filter for method 0");
+#endif /* WRITE_FILTER */
       }
 
+#ifdef PNG_WRITE_FILTER_SUPPORTED
       /* If we have allocated the row_buf, this means we have already started
        * with the image and we should have allocated all of the filter buffers
        * that have been selected.  If prev_row isn't already allocated, then
        * it is too late to start using the filters that need it, since we
        * will be missing the data in the previous row.  If an application
        * wants to start and stop using particular filters during compression,
-       * it should start out with all of the filters, and then add and
-       * remove them after the start of compression.
+       * it should start out with all of the filters, and then remove them
+       * or add them back after the start of compression.
+       *
+       * NOTE: this is a nasty constraint on the code, because it means that the
+       * prev_row buffer must be maintained even if there are currently no
+       * 'prev_row' requiring filters active.
        */
       if (png_ptr->row_buf != NULL)
       {
-         png_ptr->do_filter = PNG_FILTER_NONE;
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-         if ((png_ptr->do_filter & PNG_FILTER_SUB) && png_ptr->sub_row == NULL)
+         int num_filters;
+         png_alloc_size_t buf_size;
+
+         /* Repeat the checks in png_write_start_row; 1 pixel high or wide
+          * images cannot benefit from certain filters.  If this isn't done here
+          * the check below will fire on 1 pixel high images.
+          */
+         if (png_ptr->height == 1)
+            filters &= ~(PNG_FILTER_UP|PNG_FILTER_AVG|PNG_FILTER_PAETH);
+
+         if (png_ptr->width == 1)
+            filters &= ~(PNG_FILTER_SUB|PNG_FILTER_AVG|PNG_FILTER_PAETH);
+
+         if ((filters & (PNG_FILTER_UP|PNG_FILTER_AVG|PNG_FILTER_PAETH)) != 0
+            && png_ptr->prev_row == NULL)
          {
-            png_ptr->sub_row = (png_bytep)png_malloc(png_ptr,
-                (png_ptr->rowbytes + 1));
-            png_ptr->sub_row[0] = PNG_FILTER_VALUE_SUB;
+            /* This is the error case, however it is benign - the previous row
+             * is not available so the filter can't be used.  Just warn here.
+             */
+            png_app_warning(png_ptr,
+               "png_set_filter: UP/AVG/PAETH cannot be added after start");
+            filters &= ~(PNG_FILTER_UP|PNG_FILTER_AVG|PNG_FILTER_PAETH);
          }
 
-         if ((png_ptr->do_filter & PNG_FILTER_UP) && png_ptr->up_row == NULL)
-         {
-            if (png_ptr->prev_row == NULL)
-            {
-               png_warning(png_ptr, "Can't add Up filter after starting");
-               png_ptr->do_filter = (png_byte)(png_ptr->do_filter &
-                   ~PNG_FILTER_UP);
-            }
+         num_filters = 0;
 
-            else
-            {
-               png_ptr->up_row = (png_bytep)png_malloc(png_ptr,
-                   (png_ptr->rowbytes + 1));
-               png_ptr->up_row[0] = PNG_FILTER_VALUE_UP;
-            }
-         }
+         if (filters & PNG_FILTER_SUB)
+            num_filters++;
 
-         if ((png_ptr->do_filter & PNG_FILTER_AVG) && png_ptr->avg_row == NULL)
-         {
-            if (png_ptr->prev_row == NULL)
-            {
-               png_warning(png_ptr, "Can't add Average filter after starting");
-               png_ptr->do_filter = (png_byte)(png_ptr->do_filter &
-                   ~PNG_FILTER_AVG);
-            }
+         if (filters & PNG_FILTER_UP)
+            num_filters++;
 
-            else
-            {
-               png_ptr->avg_row = (png_bytep)png_malloc(png_ptr,
-                   (png_ptr->rowbytes + 1));
-               png_ptr->avg_row[0] = PNG_FILTER_VALUE_AVG;
-            }
-         }
+         if (filters & PNG_FILTER_AVG)
+            num_filters++;
 
-         if ((png_ptr->do_filter & PNG_FILTER_PAETH) &&
-             png_ptr->paeth_row == NULL)
-         {
-            if (png_ptr->prev_row == NULL)
-            {
-               png_warning(png_ptr, "Can't add Paeth filter after starting");
-               png_ptr->do_filter &= (png_byte)(~PNG_FILTER_PAETH);
-            }
+         if (filters & PNG_FILTER_PAETH)
+            num_filters++;
 
-            else
-            {
-               png_ptr->paeth_row = (png_bytep)png_malloc(png_ptr,
-                   (png_ptr->rowbytes + 1));
-               png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH;
-            }
-         }
+         /* Allocate needed row buffers if they have not already been
+          * allocated.
+          */
+         buf_size = PNG_ROWBYTES(png_ptr->usr_channels * png_ptr->usr_bit_depth,
+             png_ptr->width) + 1;
+
+         if (png_ptr->try_row == NULL)
+            png_ptr->try_row = png_voidcast(png_bytep,
+               png_malloc(png_ptr, buf_size));
 
-         if (png_ptr->do_filter == PNG_NO_FILTERS)
-            png_ptr->do_filter = PNG_FILTER_NONE;
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
+         if (num_filters > 1)
+         {
+            if (png_ptr->tst_row == NULL)
+               png_ptr->tst_row = png_voidcast(png_bytep,
+                  png_malloc(png_ptr, buf_size));
+         }
       }
+      png_ptr->do_filter = (png_byte)filters;
+#endif
    }
    else
       png_error(png_ptr, "Unknown custom filter method");
 }
 
-/* This allows us to influence the way in which libpng chooses the "best"
- * filter for the current scanline.  While the "minimum-sum-of-absolute-
- * differences metric is relatively fast and effective, there is some
- * question as to whether it can be improved upon by trying to keep the
- * filtered data going to zlib more consistent, hopefully resulting in
- * better compression.
- */
 #ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED /* DEPRECATED */
 /* Provide floating and fixed point APIs */
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 void PNGAPI
-png_set_filter_heuristics(png_structp png_ptr, int heuristic_method,
+png_set_filter_heuristics(png_structrp png_ptr, int heuristic_method,
     int num_weights, png_const_doublep filter_weights,
     png_const_doublep filter_costs)
 {
@@ -1161,7 +1129,7 @@ png_set_filter_heuristics(png_structp png_ptr, int heuristic_method,
 
 #ifdef PNG_FIXED_POINT_SUPPORTED
 void PNGAPI
-png_set_filter_heuristics_fixed(png_structp png_ptr, int heuristic_method,
+png_set_filter_heuristics_fixed(png_structrp png_ptr, int heuristic_method,
     int num_weights, png_const_fixed_point_p filter_weights,
     png_const_fixed_point_p filter_costs)
 {
@@ -1176,37 +1144,37 @@ png_set_filter_heuristics_fixed(png_structp png_ptr, int heuristic_method,
 
 #ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
 void PNGAPI
-png_set_compression_level(png_structp png_ptr, int level)
+png_set_compression_level(png_structrp png_ptr, int level)
 {
    png_debug(1, "in png_set_compression_level");
 
    if (png_ptr == NULL)
       return;
 
-   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_LEVEL;
    png_ptr->zlib_level = level;
 }
 
 void PNGAPI
-png_set_compression_mem_level(png_structp png_ptr, int mem_level)
+png_set_compression_mem_level(png_structrp png_ptr, int mem_level)
 {
    png_debug(1, "in png_set_compression_mem_level");
 
    if (png_ptr == NULL)
       return;
 
-   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL;
    png_ptr->zlib_mem_level = mem_level;
 }
 
 void PNGAPI
-png_set_compression_strategy(png_structp png_ptr, int strategy)
+png_set_compression_strategy(png_structrp png_ptr, int strategy)
 {
    png_debug(1, "in png_set_compression_strategy");
 
    if (png_ptr == NULL)
       return;
 
+   /* The flag setting here prevents the libpng dynamic selection of strategy.
+    */
    png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_STRATEGY;
    png_ptr->zlib_strategy = strategy;
 }
@@ -1215,42 +1183,46 @@ png_set_compression_strategy(png_structp png_ptr, int strategy)
  * smaller value of window_bits if it can do so safely.
  */
 void PNGAPI
-png_set_compression_window_bits(png_structp png_ptr, int window_bits)
+png_set_compression_window_bits(png_structrp png_ptr, int window_bits)
 {
    if (png_ptr == NULL)
       return;
 
+   /* Prior to 1.6.0 this would warn but then set the window_bits value. This
+    * meant that negative window bits values could be selected that would cause
+    * libpng to write a non-standard PNG file with raw deflate or gzip
+    * compressed IDAT or ancillary chunks.  Such files can be read and there is
+    * no warning on read, so this seems like a very bad idea.
+    */
    if (window_bits > 15)
+   {
       png_warning(png_ptr, "Only compression windows <= 32k supported by PNG");
+      window_bits = 15;
+   }
 
    else if (window_bits < 8)
+   {
       png_warning(png_ptr, "Only compression windows >= 256 supported by PNG");
+      window_bits = 8;
+   }
 
-#ifndef WBITS_8_OK
-   /* Avoid libpng bug with 256-byte windows */
-   if (window_bits == 8)
-      {
-        png_warning(png_ptr, "Compression window is being reset to 512");
-        window_bits = 9;
-      }
-
-#endif
-   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS;
    png_ptr->zlib_window_bits = window_bits;
 }
 
 void PNGAPI
-png_set_compression_method(png_structp png_ptr, int method)
+png_set_compression_method(png_structrp png_ptr, int method)
 {
    png_debug(1, "in png_set_compression_method");
 
    if (png_ptr == NULL)
       return;
 
+   /* This would produce an invalid PNG file if it worked, but it doesn't and
+    * deflate will fault it, so it is harmless to just warn here.
+    */
    if (method != 8)
       png_warning(png_ptr, "Only compression method 8 is supported by PNG");
 
-   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_METHOD;
    png_ptr->zlib_method = method;
 }
 #endif /* WRITE_CUSTOMIZE_COMPRESSION */
@@ -1258,38 +1230,35 @@ png_set_compression_method(png_structp png_ptr, int method)
 /* The following were added to libpng-1.5.4 */
 #ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
 void PNGAPI
-png_set_text_compression_level(png_structp png_ptr, int level)
+png_set_text_compression_level(png_structrp png_ptr, int level)
 {
    png_debug(1, "in png_set_text_compression_level");
 
    if (png_ptr == NULL)
       return;
 
-   png_ptr->flags |= PNG_FLAG_ZTXT_CUSTOM_LEVEL;
    png_ptr->zlib_text_level = level;
 }
 
 void PNGAPI
-png_set_text_compression_mem_level(png_structp png_ptr, int mem_level)
+png_set_text_compression_mem_level(png_structrp png_ptr, int mem_level)
 {
    png_debug(1, "in png_set_text_compression_mem_level");
 
    if (png_ptr == NULL)
       return;
 
-   png_ptr->flags |= PNG_FLAG_ZTXT_CUSTOM_MEM_LEVEL;
    png_ptr->zlib_text_mem_level = mem_level;
 }
 
 void PNGAPI
-png_set_text_compression_strategy(png_structp png_ptr, int strategy)
+png_set_text_compression_strategy(png_structrp png_ptr, int strategy)
 {
    png_debug(1, "in png_set_text_compression_strategy");
 
    if (png_ptr == NULL)
       return;
 
-   png_ptr->flags |= PNG_FLAG_ZTXT_CUSTOM_STRATEGY;
    png_ptr->zlib_text_strategy = strategy;
 }
 
@@ -1297,32 +1266,28 @@ png_set_text_compression_strategy(png_structp png_ptr, int strategy)
  * smaller value of window_bits if it can do so safely.
  */
 void PNGAPI
-png_set_text_compression_window_bits(png_structp png_ptr, int window_bits)
+png_set_text_compression_window_bits(png_structrp png_ptr, int window_bits)
 {
    if (png_ptr == NULL)
       return;
 
    if (window_bits > 15)
+   {
       png_warning(png_ptr, "Only compression windows <= 32k supported by PNG");
+      window_bits = 15;
+   }
 
    else if (window_bits < 8)
-      png_warning(png_ptr, "Only compression windows >= 256 supported by PNG");
-
-#ifndef WBITS_8_OK
-   /* Avoid libpng bug with 256-byte windows */
-   if (window_bits == 8)
    {
-      png_warning(png_ptr, "Text compression window is being reset to 512");
-      window_bits = 9;
+      png_warning(png_ptr, "Only compression windows >= 256 supported by PNG");
+      window_bits = 8;
    }
 
-#endif
-   png_ptr->flags |= PNG_FLAG_ZTXT_CUSTOM_WINDOW_BITS;
    png_ptr->zlib_text_window_bits = window_bits;
 }
 
 void PNGAPI
-png_set_text_compression_method(png_structp png_ptr, int method)
+png_set_text_compression_method(png_structrp png_ptr, int method)
 {
    png_debug(1, "in png_set_text_compression_method");
 
@@ -1332,14 +1297,13 @@ png_set_text_compression_method(png_structp png_ptr, int method)
    if (method != 8)
       png_warning(png_ptr, "Only compression method 8 is supported by PNG");
 
-   png_ptr->flags |= PNG_FLAG_ZTXT_CUSTOM_METHOD;
    png_ptr->zlib_text_method = method;
 }
-#endif /* PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED */
+#endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */
 /* end of API added to libpng-1.5.4 */
 
 void PNGAPI
-png_set_write_status_fn(png_structp png_ptr, png_write_status_ptr write_row_fn)
+png_set_write_status_fn(png_structrp png_ptr, png_write_status_ptr write_row_fn)
 {
    if (png_ptr == NULL)
       return;
@@ -1349,7 +1313,7 @@ png_set_write_status_fn(png_structp png_ptr, png_write_status_ptr write_row_fn)
 
 #ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
 void PNGAPI
-png_set_write_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
+png_set_write_user_transform_fn(png_structrp png_ptr, png_user_transform_ptr
     write_user_transform_fn)
 {
    png_debug(1, "in png_set_write_user_transform_fn");
@@ -1365,88 +1329,1055 @@ png_set_write_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
 
 #ifdef PNG_INFO_IMAGE_SUPPORTED
 void PNGAPI
-png_write_png(png_structp png_ptr, png_infop info_ptr,
+png_write_png(png_structrp png_ptr, png_inforp info_ptr,
     int transforms, voidp params)
 {
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
+   if ((info_ptr->valid & PNG_INFO_IDAT) == 0)
+   {
+      png_app_error(png_ptr, "no rows for png_write_image to write");
+      return;
+   }
+
    /* Write the file header information. */
    png_write_info(png_ptr, info_ptr);
 
    /* ------ these transformations don't touch the info structure ------- */
 
-#ifdef PNG_WRITE_INVERT_SUPPORTED
    /* Invert monochrome pixels */
-   if (transforms & PNG_TRANSFORM_INVERT_MONO)
+   if ((transforms & PNG_TRANSFORM_INVERT_MONO) != 0)
+#ifdef PNG_WRITE_INVERT_SUPPORTED
       png_set_invert_mono(png_ptr);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_MONO not supported");
 #endif
 
-#ifdef PNG_WRITE_SHIFT_SUPPORTED
    /* Shift the pixels up to a legal bit depth and fill in
     * as appropriate to correctly scale the image.
     */
-   if ((transforms & PNG_TRANSFORM_SHIFT)
-       && (info_ptr->valid & PNG_INFO_sBIT))
-      png_set_shift(png_ptr, &info_ptr->sig_bit);
+   if ((transforms & PNG_TRANSFORM_SHIFT) != 0)
+#ifdef PNG_WRITE_SHIFT_SUPPORTED
+      if ((info_ptr->valid & PNG_INFO_sBIT) != 0)
+         png_set_shift(png_ptr, &info_ptr->sig_bit);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_SHIFT not supported");
 #endif
 
-#ifdef PNG_WRITE_PACK_SUPPORTED
    /* Pack pixels into bytes */
-   if (transforms & PNG_TRANSFORM_PACKING)
-       png_set_packing(png_ptr);
+   if ((transforms & PNG_TRANSFORM_PACKING) != 0)
+#ifdef PNG_WRITE_PACK_SUPPORTED
+      png_set_packing(png_ptr);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_PACKING not supported");
 #endif
 
-#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
    /* Swap location of alpha bytes from ARGB to RGBA */
-   if (transforms & PNG_TRANSFORM_SWAP_ALPHA)
+   if ((transforms & PNG_TRANSFORM_SWAP_ALPHA) != 0)
+#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
       png_set_swap_alpha(png_ptr);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ALPHA not supported");
 #endif
 
+   /* Remove a filler (X) from XRGB/RGBX/AG/GA into to convert it into
+    * RGB, note that the code expects the input color type to be G or RGB; no
+    * alpha channel.
+    */
+   if ((transforms & (PNG_TRANSFORM_STRIP_FILLER_AFTER|
+       PNG_TRANSFORM_STRIP_FILLER_BEFORE)) != 0)
+   {
 #ifdef PNG_WRITE_FILLER_SUPPORTED
-   /* Pack XRGB/RGBX/ARGB/RGBA into RGB (4 channels -> 3 channels) */
-   if (transforms & PNG_TRANSFORM_STRIP_FILLER_AFTER)
-      png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
+      if ((transforms & PNG_TRANSFORM_STRIP_FILLER_AFTER) != 0)
+      {
+         if ((transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE) != 0)
+            png_app_error(png_ptr,
+                "PNG_TRANSFORM_STRIP_FILLER: BEFORE+AFTER not supported");
 
-   else if (transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE)
-      png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
+         /* Continue if ignored - this is the pre-1.6.10 behavior */
+         png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
+      }
+
+      else if ((transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE) != 0)
+         png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_STRIP_FILLER not supported");
 #endif
+   }
 
-#ifdef PNG_WRITE_BGR_SUPPORTED
    /* Flip BGR pixels to RGB */
-   if (transforms & PNG_TRANSFORM_BGR)
+   if ((transforms & PNG_TRANSFORM_BGR) != 0)
+#ifdef PNG_WRITE_BGR_SUPPORTED
       png_set_bgr(png_ptr);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_BGR not supported");
 #endif
 
-#ifdef PNG_WRITE_SWAP_SUPPORTED
    /* Swap bytes of 16-bit files to most significant byte first */
-   if (transforms & PNG_TRANSFORM_SWAP_ENDIAN)
+   if ((transforms & PNG_TRANSFORM_SWAP_ENDIAN) != 0)
+#ifdef PNG_WRITE_SWAP_SUPPORTED
       png_set_swap(png_ptr);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ENDIAN not supported");
 #endif
 
+   /* Swap bits of 1-bit, 2-bit, 4-bit packed pixel formats */
+   if ((transforms & PNG_TRANSFORM_PACKSWAP) != 0)
 #ifdef PNG_WRITE_PACKSWAP_SUPPORTED
-   /* Swap bits of 1, 2, 4 bit packed pixel formats */
-   if (transforms & PNG_TRANSFORM_PACKSWAP)
       png_set_packswap(png_ptr);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_PACKSWAP not supported");
 #endif
 
-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
    /* Invert the alpha channel from opacity to transparency */
-   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
+   if ((transforms & PNG_TRANSFORM_INVERT_ALPHA) != 0)
+#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
       png_set_invert_alpha(png_ptr);
+#else
+      png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_ALPHA not supported");
 #endif
 
    /* ----------------------- end of transformations ------------------- */
 
    /* Write the bits */
-   if (info_ptr->valid & PNG_INFO_IDAT)
-       png_write_image(png_ptr, info_ptr->row_pointers);
+   png_write_image(png_ptr, info_ptr->row_pointers);
 
    /* It is REQUIRED to call this to finish writing the rest of the file */
    png_write_end(png_ptr, info_ptr);
 
-   PNG_UNUSED(transforms)   /* Quiet compiler warnings */
    PNG_UNUSED(params)
 }
 #endif
-#endif /* PNG_WRITE_SUPPORTED */
+
+
+#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
+/* Initialize the write structure - general purpose utility. */
+static int
+png_image_write_init(png_imagep image)
+{
+   png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, image,
+       png_safe_error, png_safe_warning);
+
+   if (png_ptr != NULL)
+   {
+      png_infop info_ptr = png_create_info_struct(png_ptr);
+
+      if (info_ptr != NULL)
+      {
+         png_controlp control = png_voidcast(png_controlp,
+             png_malloc_warn(png_ptr, (sizeof *control)));
+
+         if (control != NULL)
+         {
+            memset(control, 0, (sizeof *control));
+
+            control->png_ptr = png_ptr;
+            control->info_ptr = info_ptr;
+            control->for_write = 1;
+
+            image->opaque = control;
+            return 1;
+         }
+
+         /* Error clean up */
+         png_destroy_info_struct(png_ptr, &info_ptr);
+      }
+
+      png_destroy_write_struct(&png_ptr, NULL);
+   }
+
+   return png_image_error(image, "png_image_write_: out of memory");
+}
+
+/* Arguments to png_image_write_main: */
+typedef struct
+{
+   /* Arguments: */
+   png_imagep      image;
+   png_const_voidp buffer;
+   png_int_32      row_stride;
+   png_const_voidp colormap;
+   int             convert_to_8bit;
+   /* Local variables: */
+   png_const_voidp first_row;
+   ptrdiff_t       row_bytes;
+   png_voidp       local_row;
+   /* Byte count for memory writing */
+   png_bytep        memory;
+   png_alloc_size_t memory_bytes; /* not used for STDIO */
+   png_alloc_size_t output_bytes; /* running total */
+} png_image_write_control;
+
+/* Write png_uint_16 input to a 16-bit PNG; the png_ptr has already been set to
+ * do any necessary byte swapping.  The component order is defined by the
+ * png_image format value.
+ */
+static int
+png_write_image_16bit(png_voidp argument)
+{
+   png_image_write_control *display = png_voidcast(png_image_write_control*,
+       argument);
+   png_imagep image = display->image;
+   png_structrp png_ptr = image->opaque->png_ptr;
+
+   png_const_uint_16p input_row = png_voidcast(png_const_uint_16p,
+       display->first_row);
+   png_uint_16p output_row = png_voidcast(png_uint_16p, display->local_row);
+   png_uint_16p row_end;
+   const int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1;
+   int aindex = 0;
+   png_uint_32 y = image->height;
+
+   if ((image->format & PNG_FORMAT_FLAG_ALPHA) != 0)
+   {
+#   ifdef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
+      if ((image->format & PNG_FORMAT_FLAG_AFIRST) != 0)
+      {
+         aindex = -1;
+         ++input_row; /* To point to the first component */
+         ++output_row;
+      }
+         else
+            aindex = channels;
+#     else
+         aindex = channels;
+#     endif
+   }
+
+   else
+      png_error(png_ptr, "png_write_image: internal call error");
+
+   /* Work out the output row end and count over this, note that the increment
+    * above to 'row' means that row_end can actually be beyond the end of the
+    * row; this is correct.
+    */
+   row_end = output_row + image->width * (channels+1);
+
+   while (y-- > 0)
+   {
+      png_const_uint_16p in_ptr = input_row;
+      png_uint_16p out_ptr = output_row;
+
+      while (out_ptr < row_end)
+      {
+         const png_uint_16 alpha = in_ptr[aindex];
+         png_uint_32 reciprocal = 0;
+         int c;
+
+         out_ptr[aindex] = alpha;
+
+         /* Calculate a reciprocal.  The correct calculation is simply
+          * component/alpha*65535 << 15. (I.e. 15 bits of precision); this
+          * allows correct rounding by adding .5 before the shift.  'reciprocal'
+          * is only initialized when required.
+          */
+         if (alpha > 0 && alpha < 65535)
+            reciprocal = ((0xffff<<15)+(alpha>>1))/alpha;
+
+         c = channels;
+         do /* always at least one channel */
+         {
+            png_uint_16 component = *in_ptr++;
+
+            /* The following gives 65535 for an alpha of 0, which is fine,
+             * otherwise if 0/0 is represented as some other value there is more
+             * likely to be a discontinuity which will probably damage
+             * compression when moving from a fully transparent area to a
+             * nearly transparent one.  (The assumption here is that opaque
+             * areas tend not to be 0 intensity.)
+             */
+            if (component >= alpha)
+               component = 65535;
+
+            /* component<alpha, so component/alpha is less than one and
+             * component*reciprocal is less than 2^31.
+             */
+            else if (component > 0 && alpha < 65535)
+            {
+               png_uint_32 calc = component * reciprocal;
+               calc += 16384; /* round to nearest */
+               component = (png_uint_16)(calc >> 15);
+            }
+
+            *out_ptr++ = component;
+         }
+         while (--c > 0);
+
+         /* Skip to next component (skip the intervening alpha channel) */
+         ++in_ptr;
+         ++out_ptr;
+      }
+
+      png_write_row(png_ptr, png_voidcast(png_const_bytep, display->local_row));
+      input_row += display->row_bytes/(sizeof (png_uint_16));
+   }
+
+   return 1;
+}
+
+/* Given 16-bit input (1 to 4 channels) write 8-bit output.  If an alpha channel
+ * is present it must be removed from the components, the components are then
+ * written in sRGB encoding.  No components are added or removed.
+ *
+ * Calculate an alpha reciprocal to reverse pre-multiplication.  As above the
+ * calculation can be done to 15 bits of accuracy; however, the output needs to
+ * be scaled in the range 0..255*65535, so include that scaling here.
+ */
+#   define UNP_RECIPROCAL(alpha) ((((0xffff*0xff)<<7)+(alpha>>1))/alpha)
+
+static png_byte
+png_unpremultiply(png_uint_32 component, png_uint_32 alpha,
+   png_uint_32 reciprocal/*from the above macro*/)
+{
+   /* The following gives 1.0 for an alpha of 0, which is fine, otherwise if 0/0
+    * is represented as some other value there is more likely to be a
+    * discontinuity which will probably damage compression when moving from a
+    * fully transparent area to a nearly transparent one.  (The assumption here
+    * is that opaque areas tend not to be 0 intensity.)
+    *
+    * There is a rounding problem here; if alpha is less than 128 it will end up
+    * as 0 when scaled to 8 bits.  To avoid introducing spurious colors into the
+    * output change for this too.
+    */
+   if (component >= alpha || alpha < 128)
+      return 255;
+
+   /* component<alpha, so component/alpha is less than one and
+    * component*reciprocal is less than 2^31.
+    */
+   else if (component > 0)
+   {
+      /* The test is that alpha/257 (rounded) is less than 255, the first value
+       * that becomes 255 is 65407.
+       * NOTE: this must agree with the PNG_DIV257 macro (which must, therefore,
+       * be exact!)  [Could also test reciprocal != 0]
+       */
+      if (alpha < 65407)
+      {
+         component *= reciprocal;
+         component += 64; /* round to nearest */
+         component >>= 7;
+      }
+
+      else
+         component *= 255;
+
+      /* Convert the component to sRGB. */
+      return (png_byte)PNG_sRGB_FROM_LINEAR(component);
+   }
+
+   else
+      return 0;
+}
+
+static int
+png_write_image_8bit(png_voidp argument)
+{
+   png_image_write_control *display = png_voidcast(png_image_write_control*,
+       argument);
+   png_imagep image = display->image;
+   png_structrp png_ptr = image->opaque->png_ptr;
+
+   png_const_uint_16p input_row = png_voidcast(png_const_uint_16p,
+       display->first_row);
+   png_bytep output_row = png_voidcast(png_bytep, display->local_row);
+   png_uint_32 y = image->height;
+   const int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1;
+
+   if ((image->format & PNG_FORMAT_FLAG_ALPHA) != 0)
+   {
+      png_bytep row_end;
+      int aindex;
+
+#   ifdef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
+      if ((image->format & PNG_FORMAT_FLAG_AFIRST) != 0)
+      {
+         aindex = -1;
+         ++input_row; /* To point to the first component */
+         ++output_row;
+      }
+
+      else
+#   endif
+      aindex = channels;
+
+      /* Use row_end in place of a loop counter: */
+      row_end = output_row + image->width * (channels+1);
+
+      while (y-- > 0)
+      {
+         png_const_uint_16p in_ptr = input_row;
+         png_bytep out_ptr = output_row;
+
+         while (out_ptr < row_end)
+         {
+            png_uint_16 alpha = in_ptr[aindex];
+            png_byte alphabyte = (png_byte)PNG_DIV257(alpha);
+            png_uint_32 reciprocal = 0;
+            int c;
+
+            /* Scale and write the alpha channel. */
+            out_ptr[aindex] = alphabyte;
+
+            if (alphabyte > 0 && alphabyte < 255)
+               reciprocal = UNP_RECIPROCAL(alpha);
+
+            c = channels;
+            do /* always at least one channel */
+               *out_ptr++ = png_unpremultiply(*in_ptr++, alpha, reciprocal);
+            while (--c > 0);
+
+            /* Skip to next component (skip the intervening alpha channel) */
+            ++in_ptr;
+            ++out_ptr;
+         } /* while out_ptr < row_end */
+
+         png_write_row(png_ptr, png_voidcast(png_const_bytep,
+             display->local_row));
+         input_row += display->row_bytes/(sizeof (png_uint_16));
+      } /* while y */
+   }
+
+   else
+   {
+      /* No alpha channel, so the row_end really is the end of the row and it
+       * is sufficient to loop over the components one by one.
+       */
+      png_bytep row_end = output_row + image->width * channels;
+
+      while (y-- > 0)
+      {
+         png_const_uint_16p in_ptr = input_row;
+         png_bytep out_ptr = output_row;
+
+         while (out_ptr < row_end)
+         {
+            png_uint_32 component = *in_ptr++;
+
+            component *= 255;
+            *out_ptr++ = (png_byte)PNG_sRGB_FROM_LINEAR(component);
+         }
+
+         png_write_row(png_ptr, output_row);
+         input_row += display->row_bytes/(sizeof (png_uint_16));
+      }
+   }
+
+   return 1;
+}
+
+static void
+png_image_set_PLTE(png_image_write_control *display)
+{
+   const png_imagep image = display->image;
+   const void *cmap = display->colormap;
+   const int entries = image->colormap_entries > 256 ? 256 :
+       (int)image->colormap_entries;
+
+   /* NOTE: the caller must check for cmap != NULL and entries != 0 */
+   const png_uint_32 format = image->format;
+   const int channels = PNG_IMAGE_SAMPLE_CHANNELS(format);
+
+#   if defined(PNG_FORMAT_BGR_SUPPORTED) &&\
+      defined(PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED)
+      const int afirst = (format & PNG_FORMAT_FLAG_AFIRST) != 0 &&
+          (format & PNG_FORMAT_FLAG_ALPHA) != 0;
+#   else
+#     define afirst 0
+#   endif
+
+#   ifdef PNG_FORMAT_BGR_SUPPORTED
+      const int bgr = (format & PNG_FORMAT_FLAG_BGR) != 0 ? 2 : 0;
+#   else
+#     define bgr 0
+#   endif
+
+   int i, num_trans;
+   png_color palette[256];
+   png_byte tRNS[256];
+
+   memset(tRNS, 255, (sizeof tRNS));
+   memset(palette, 0, (sizeof palette));
+
+   for (i=num_trans=0; i<entries; ++i)
+   {
+      /* This gets automatically converted to sRGB with reversal of the
+       * pre-multiplication if the color-map has an alpha channel.
+       */
+      if ((format & PNG_FORMAT_FLAG_LINEAR) != 0)
+      {
+         png_const_uint_16p entry = png_voidcast(png_const_uint_16p, cmap);
+
+         entry += i * channels;
+
+         if ((channels & 1) != 0) /* no alpha */
+         {
+            if (channels >= 3) /* RGB */
+            {
+               palette[i].blue = (png_byte)PNG_sRGB_FROM_LINEAR(255 *
+                   entry[(2 ^ bgr)]);
+               palette[i].green = (png_byte)PNG_sRGB_FROM_LINEAR(255 *
+                   entry[1]);
+               palette[i].red = (png_byte)PNG_sRGB_FROM_LINEAR(255 *
+                   entry[bgr]);
+            }
+
+            else /* Gray */
+               palette[i].blue = palette[i].red = palette[i].green =
+                  (png_byte)PNG_sRGB_FROM_LINEAR(255 * *entry);
+         }
+
+         else /* alpha */
+         {
+            png_uint_16 alpha = entry[afirst ? 0 : channels-1];
+            png_byte alphabyte = (png_byte)PNG_DIV257(alpha);
+            png_uint_32 reciprocal = 0;
+
+            /* Calculate a reciprocal, as in the png_write_image_8bit code above
+             * this is designed to produce a value scaled to 255*65535 when
+             * divided by 128 (i.e. asr 7).
+             */
+            if (alphabyte > 0 && alphabyte < 255)
+               reciprocal = (((0xffff*0xff)<<7)+(alpha>>1))/alpha;
+
+            tRNS[i] = alphabyte;
+            if (alphabyte < 255)
+               num_trans = i+1;
+
+            if (channels >= 3) /* RGB */
+            {
+               palette[i].blue = png_unpremultiply(entry[afirst + (2 ^ bgr)],
+                  alpha, reciprocal);
+               palette[i].green = png_unpremultiply(entry[afirst + 1], alpha,
+                  reciprocal);
+               palette[i].red = png_unpremultiply(entry[afirst + bgr], alpha,
+                  reciprocal);
+            }
+
+            else /* gray */
+               palette[i].blue = palette[i].red = palette[i].green =
+                  png_unpremultiply(entry[afirst], alpha, reciprocal);
+         }
+      }
+
+      else /* Color-map has sRGB values */
+      {
+         png_const_bytep entry = png_voidcast(png_const_bytep, cmap);
+
+         entry += i * channels;
+
+         switch (channels)
+         {
+            case 4:
+               tRNS[i] = entry[afirst ? 0 : 3];
+               if (tRNS[i] < 255)
+                  num_trans = i+1;
+               /* FALL THROUGH */
+            case 3:
+               palette[i].blue = entry[afirst + (2 ^ bgr)];
+               palette[i].green = entry[afirst + 1];
+               palette[i].red = entry[afirst + bgr];
+               break;
+
+            case 2:
+               tRNS[i] = entry[1 ^ afirst];
+               if (tRNS[i] < 255)
+                  num_trans = i+1;
+               /* FALL THROUGH */
+            case 1:
+               palette[i].blue = palette[i].red = palette[i].green =
+                  entry[afirst];
+               break;
+
+            default:
+               break;
+         }
+      }
+   }
+
+#   ifdef afirst
+#     undef afirst
+#   endif
+#   ifdef bgr
+#     undef bgr
+#   endif
+
+   png_set_PLTE(image->opaque->png_ptr, image->opaque->info_ptr, palette,
+      entries);
+
+   if (num_trans > 0)
+      png_set_tRNS(image->opaque->png_ptr, image->opaque->info_ptr, tRNS,
+         num_trans, NULL);
+
+   image->colormap_entries = entries;
+}
+
+static int
+png_image_write_main(png_voidp argument)
+{
+   png_image_write_control *display = png_voidcast(png_image_write_control*,
+      argument);
+   png_imagep image = display->image;
+   png_structrp png_ptr = image->opaque->png_ptr;
+   png_inforp info_ptr = image->opaque->info_ptr;
+   png_uint_32 format = image->format;
+
+   /* The following four ints are actually booleans */
+   int colormap = (format & PNG_FORMAT_FLAG_COLORMAP);
+   int linear = !colormap && (format & PNG_FORMAT_FLAG_LINEAR); /* input */
+   int alpha = !colormap && (format & PNG_FORMAT_FLAG_ALPHA);
+   int write_16bit = linear && !colormap && (display->convert_to_8bit == 0);
+
+#   ifdef PNG_BENIGN_ERRORS_SUPPORTED
+      /* Make sure we error out on any bad situation */
+      png_set_benign_errors(png_ptr, 0/*error*/);
+#   endif
+
+   /* Default the 'row_stride' parameter if required, also check the row stride
+    * and total image size to ensure that they are within the system limits.
+    */
+   {
+      const unsigned int channels = PNG_IMAGE_PIXEL_CHANNELS(image->format);
+
+      if (image->width <= 0x7FFFFFFFU/channels) /* no overflow */
+      {
+         png_uint_32 check;
+         const png_uint_32 png_row_stride = image->width * channels;
+
+         if (display->row_stride == 0)
+            display->row_stride = (png_int_32)/*SAFE*/png_row_stride;
+
+         if (display->row_stride < 0)
+            check = -display->row_stride;
+
+         else
+            check = display->row_stride;
+
+         if (check >= png_row_stride)
+         {
+            /* Now check for overflow of the image buffer calculation; this
+             * limits the whole image size to 32 bits for API compatibility with
+             * the current, 32-bit, PNG_IMAGE_BUFFER_SIZE macro.
+             */
+            if (image->height > 0xFFFFFFFF/png_row_stride)
+               png_error(image->opaque->png_ptr, "memory image too large");
+         }
+
+         else
+            png_error(image->opaque->png_ptr, "supplied row stride too small");
+      }
+
+      else
+         png_error(image->opaque->png_ptr, "image row stride too large");
+   }
+
+   /* Set the required transforms then write the rows in the correct order. */
+   if ((format & PNG_FORMAT_FLAG_COLORMAP) != 0)
+   {
+      if (display->colormap != NULL && image->colormap_entries > 0)
+      {
+         png_uint_32 entries = image->colormap_entries;
+
+         png_set_IHDR(png_ptr, info_ptr, image->width, image->height,
+            entries > 16 ? 8 : (entries > 4 ? 4 : (entries > 2 ? 2 : 1)),
+            PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE,
+            PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+
+         png_image_set_PLTE(display);
+      }
+
+      else
+         png_error(image->opaque->png_ptr,
+            "no color-map for color-mapped image");
+   }
+
+   else
+      png_set_IHDR(png_ptr, info_ptr, image->width, image->height,
+         write_16bit ? 16 : 8,
+         ((format & PNG_FORMAT_FLAG_COLOR) ? PNG_COLOR_MASK_COLOR : 0) +
+         ((format & PNG_FORMAT_FLAG_ALPHA) ? PNG_COLOR_MASK_ALPHA : 0),
+         PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+
+   /* Counter-intuitively the data transformations must be called *after*
+    * png_write_info, not before as in the read code, but the 'set' functions
+    * must still be called before.  Just set the color space information, never
+    * write an interlaced image.
+    */
+
+   if (write_16bit != 0)
+   {
+      /* The gamma here is 1.0 (linear) and the cHRM chunk matches sRGB. */
+      png_set_gAMA_fixed(png_ptr, info_ptr, PNG_GAMMA_LINEAR);
+
+      if ((image->flags & PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB) == 0)
+         png_set_cHRM_fixed(png_ptr, info_ptr,
+            /* color      x       y */
+            /* white */ 31270, 32900,
+            /* red   */ 64000, 33000,
+            /* green */ 30000, 60000,
+            /* blue  */ 15000,  6000
+         );
+   }
+
+   else if ((image->flags & PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB) == 0)
+      png_set_sRGB(png_ptr, info_ptr, PNG_sRGB_INTENT_PERCEPTUAL);
+
+   /* Else writing an 8-bit file and the *colors* aren't sRGB, but the 8-bit
+    * space must still be gamma encoded.
+    */
+   else
+      png_set_gAMA_fixed(png_ptr, info_ptr, PNG_GAMMA_sRGB_INVERSE);
+
+   /* Write the file header. */
+   png_write_info(png_ptr, info_ptr);
+
+   /* Now set up the data transformations (*after* the header is written),
+    * remove the handled transformations from the 'format' flags for checking.
+    *
+    * First check for a little endian system if writing 16-bit files.
+    */
+   if (write_16bit != 0)
+   {
+      PNG_CONST png_uint_16 le = 0x0001;
+
+      if ((*(png_const_bytep) & le) != 0)
+         png_set_swap(png_ptr);
+   }
+
+#   ifdef PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
+      if ((format & PNG_FORMAT_FLAG_BGR) != 0)
+      {
+         if (colormap == 0 && (format & PNG_FORMAT_FLAG_COLOR) != 0)
+            png_set_bgr(png_ptr);
+         format &= ~PNG_FORMAT_FLAG_BGR;
+      }
+#   endif
+
+#   ifdef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
+      if ((format & PNG_FORMAT_FLAG_AFIRST) != 0)
+      {
+         if (colormap == 0 && (format & PNG_FORMAT_FLAG_ALPHA) != 0)
+            png_set_swap_alpha(png_ptr);
+         format &= ~PNG_FORMAT_FLAG_AFIRST;
+      }
+#   endif
+
+   /* If there are 16 or fewer color-map entries we wrote a lower bit depth
+    * above, but the application data is still byte packed.
+    */
+   if (colormap != 0 && image->colormap_entries <= 16)
+      png_set_packing(png_ptr);
+
+   /* That should have handled all (both) the transforms. */
+   if ((format & ~(png_uint_32)(PNG_FORMAT_FLAG_COLOR | PNG_FORMAT_FLAG_LINEAR |
+         PNG_FORMAT_FLAG_ALPHA | PNG_FORMAT_FLAG_COLORMAP)) != 0)
+      png_error(png_ptr, "png_write_image: unsupported transformation");
+
+   {
+      png_const_bytep row = png_voidcast(png_const_bytep, display->buffer);
+      ptrdiff_t row_bytes = display->row_stride;
+
+      if (linear != 0)
+         row_bytes *= (sizeof (png_uint_16));
+
+      if (row_bytes < 0)
+         row += (image->height-1) * (-row_bytes);
+
+      display->first_row = row;
+      display->row_bytes = row_bytes;
+   }
+
+   /* Apply 'fast' options if the flag is set. */
+   if ((image->flags & PNG_IMAGE_FLAG_FAST) != 0)
+   {
+      png_set_filter(png_ptr, PNG_FILTER_TYPE_BASE, PNG_NO_FILTERS);
+      /* NOTE: determined by experiment using pngstest, this reflects some
+       * balance between the time to write the image once and the time to read
+       * it about 50 times.  The speed-up in pngstest was about 10-20% of the
+       * total (user) time on a heavily loaded system.
+       */
+#   ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
+      png_set_compression_level(png_ptr, 3);
+#   endif
+   }
+
+   /* Check for the cases that currently require a pre-transform on the row
+    * before it is written.  This only applies when the input is 16-bit and
+    * either there is an alpha channel or it is converted to 8-bit.
+    */
+   if ((linear != 0 && alpha != 0 ) ||
+       (colormap == 0 && display->convert_to_8bit != 0))
+   {
+      png_bytep row = png_voidcast(png_bytep, png_malloc(png_ptr,
+         png_get_rowbytes(png_ptr, info_ptr)));
+      int result;
+
+      display->local_row = row;
+      if (write_16bit != 0)
+         result = png_safe_execute(image, png_write_image_16bit, display);
+      else
+         result = png_safe_execute(image, png_write_image_8bit, display);
+      display->local_row = NULL;
+
+      png_free(png_ptr, row);
+
+      /* Skip the 'write_end' on error: */
+      if (result == 0)
+         return 0;
+   }
+
+   /* Otherwise this is the case where the input is in a format currently
+    * supported by the rest of the libpng write code; call it directly.
+    */
+   else
+   {
+      png_const_bytep row = png_voidcast(png_const_bytep, display->first_row);
+      ptrdiff_t row_bytes = display->row_bytes;
+      png_uint_32 y = image->height;
+
+      while (y-- > 0)
+      {
+         png_write_row(png_ptr, row);
+         row += row_bytes;
+      }
+   }
+
+   png_write_end(png_ptr, info_ptr);
+   return 1;
+}
+
+
+static void (PNGCBAPI
+image_memory_write)(png_structp png_ptr, png_bytep/*const*/ data,
+   png_size_t size)
+{
+   png_image_write_control *display = png_voidcast(png_image_write_control*,
+      png_ptr->io_ptr/*backdoor: png_get_io_ptr(png_ptr)*/);
+   const png_alloc_size_t ob = display->output_bytes;
+
+   /* Check for overflow; this should never happen: */
+   if (size <= ((png_alloc_size_t)-1) - ob)
+   {
+      /* I don't think libpng ever does this, but just in case: */
+      if (size > 0)
+      {
+         if (display->memory_bytes >= ob+size) /* writing */
+            memcpy(display->memory+ob, data, size);
+
+         /* Always update the size: */
+         display->output_bytes = ob+size;
+      }
+   }
+
+   else
+      png_error(png_ptr, "png_image_write_to_memory: PNG too big");
+}
+
+static void (PNGCBAPI
+image_memory_flush)(png_structp png_ptr)
+{
+   PNG_UNUSED(png_ptr)
+}
+
+static int
+png_image_write_memory(png_voidp argument)
+{
+   png_image_write_control *display = png_voidcast(png_image_write_control*,
+      argument);
+
+   /* The rest of the memory-specific init and write_main in an error protected
+    * environment.  This case needs to use callbacks for the write operations
+    * since libpng has no built in support for writing to memory.
+    */
+   png_set_write_fn(display->image->opaque->png_ptr, display/*io_ptr*/,
+         image_memory_write, image_memory_flush);
+
+   return png_image_write_main(display);
+}
+
+int PNGAPI
+png_image_write_to_memory(png_imagep image, void *memory,
+   png_alloc_size_t * PNG_RESTRICT memory_bytes, int convert_to_8bit,
+   const void *buffer, png_int_32 row_stride, const void *colormap)
+{
+   /* Write the image to the given buffer, or count the bytes if it is NULL */
+   if (image != NULL && image->version == PNG_IMAGE_VERSION)
+   {
+      if (memory_bytes != NULL && buffer != NULL)
+      {
+         /* This is to give the caller an easier error detection in the NULL
+          * case and guard against uninitialized variable problems:
+          */
+         if (memory == NULL)
+            *memory_bytes = 0;
+
+         if (png_image_write_init(image) != 0)
+         {
+            png_image_write_control display;
+            int result;
+
+            memset(&display, 0, (sizeof display));
+            display.image = image;
+            display.buffer = buffer;
+            display.row_stride = row_stride;
+            display.colormap = colormap;
+            display.convert_to_8bit = convert_to_8bit;
+            display.memory = png_voidcast(png_bytep, memory);
+            display.memory_bytes = *memory_bytes;
+            display.output_bytes = 0;
+
+            result = png_safe_execute(image, png_image_write_memory, &display);
+            png_image_free(image);
+
+            /* write_memory returns true even if we ran out of buffer. */
+            if (result)
+            {
+               /* On out-of-buffer this function returns '0' but still updates
+                * memory_bytes:
+                */
+               if (memory != NULL && display.output_bytes > *memory_bytes)
+                  result = 0;
+
+               *memory_bytes = display.output_bytes;
+            }
+
+            return result;
+         }
+
+         else
+            return 0;
+      }
+
+      else
+         return png_image_error(image,
+            "png_image_write_to_memory: invalid argument");
+   }
+
+   else if (image != NULL)
+      return png_image_error(image,
+         "png_image_write_to_memory: incorrect PNG_IMAGE_VERSION");
+
+   else
+      return 0;
+}
+
+#ifdef PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
+int PNGAPI
+png_image_write_to_stdio(png_imagep image, FILE *file, int convert_to_8bit,
+   const void *buffer, png_int_32 row_stride, const void *colormap)
+{
+   /* Write the image to the given (FILE*). */
+   if (image != NULL && image->version == PNG_IMAGE_VERSION)
+   {
+      if (file != NULL && buffer != NULL)
+      {
+         if (png_image_write_init(image) != 0)
+         {
+            png_image_write_control display;
+            int result;
+
+            /* This is slightly evil, but png_init_io doesn't do anything other
+             * than this and we haven't changed the standard IO functions so
+             * this saves a 'safe' function.
+             */
+            image->opaque->png_ptr->io_ptr = file;
+
+            memset(&display, 0, (sizeof display));
+            display.image = image;
+            display.buffer = buffer;
+            display.row_stride = row_stride;
+            display.colormap = colormap;
+            display.convert_to_8bit = convert_to_8bit;
+
+            result = png_safe_execute(image, png_image_write_main, &display);
+            png_image_free(image);
+            return result;
+         }
+
+         else
+            return 0;
+      }
+
+      else
+         return png_image_error(image,
+            "png_image_write_to_stdio: invalid argument");
+   }
+
+   else if (image != NULL)
+      return png_image_error(image,
+         "png_image_write_to_stdio: incorrect PNG_IMAGE_VERSION");
+
+   else
+      return 0;
+}
+
+int PNGAPI
+png_image_write_to_file(png_imagep image, const char *file_name,
+   int convert_to_8bit, const void *buffer, png_int_32 row_stride,
+   const void *colormap)
+{
+   /* Write the image to the named file. */
+   if (image != NULL && image->version == PNG_IMAGE_VERSION)
+   {
+      if (file_name != NULL && buffer != NULL)
+      {
+         FILE *fp = fopen(file_name, "wb");
+
+         if (fp != NULL)
+         {
+            if (png_image_write_to_stdio(image, fp, convert_to_8bit, buffer,
+               row_stride, colormap) != 0)
+            {
+               int error; /* from fflush/fclose */
+
+               /* Make sure the file is flushed correctly. */
+               if (fflush(fp) == 0 && ferror(fp) == 0)
+               {
+                  if (fclose(fp) == 0)
+                     return 1;
+
+                  error = errno; /* from fclose */
+               }
+
+               else
+               {
+                  error = errno; /* from fflush or ferror */
+                  (void)fclose(fp);
+               }
+
+               (void)remove(file_name);
+               /* The image has already been cleaned up; this is just used to
+                * set the error (because the original write succeeded).
+                */
+               return png_image_error(image, strerror(error));
+            }
+
+            else
+            {
+               /* Clean up: just the opened file. */
+               (void)fclose(fp);
+               (void)remove(file_name);
+               return 0;
+            }
+         }
+
+         else
+            return png_image_error(image, strerror(errno));
+      }
+
+      else
+         return png_image_error(image,
+            "png_image_write_to_file: invalid argument");
+   }
+
+   else if (image != NULL)
+      return png_image_error(image,
+         "png_image_write_to_file: incorrect PNG_IMAGE_VERSION");
+
+   else
+      return 0;
+}
+#endif /* SIMPLIFIED_WRITE_STDIO */
+#endif /* SIMPLIFIED_WRITE */
+#endif /* WRITE */
diff --git a/drivers/png/pngwtran.c b/drivers/png/pngwtran.c
index 24c436ffe4..038a2ef5dc 100644
--- a/drivers/png/pngwtran.c
+++ b/drivers/png/pngwtran.c
@@ -1,8 +1,8 @@
 
 /* pngwtran.c - transforms the data in a row for PNG writers
  *
- * Copyright (c) 1998-2002,2004,2006-2012 Glenn Randers-Pehrson
- * Copyright (c) 1998-2012 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.18 [July 23, 2015]
+ * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -14,102 +14,14 @@
 #include "pngpriv.h"
 
 #ifdef PNG_WRITE_SUPPORTED
-
 #ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
-/* Transform the data according to the user's wishes.  The order of
- * transformations is significant.
- */
-void /* PRIVATE */
-png_do_write_transformations(png_structp png_ptr, png_row_infop row_info)
-{
-   png_debug(1, "in png_do_write_transformations");
-
-   if (png_ptr == NULL)
-      return;
-
-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-   if (png_ptr->transformations & PNG_USER_TRANSFORM)
-      if (png_ptr->write_user_transform_fn != NULL)
-         (*(png_ptr->write_user_transform_fn)) /* User write transform
-                                                 function */
-             (png_ptr,  /* png_ptr */
-             row_info,  /* row_info: */
-                /*  png_uint_32 width;       width of row */
-                /*  png_size_t rowbytes;     number of bytes in row */
-                /*  png_byte color_type;     color type of pixels */
-                /*  png_byte bit_depth;      bit depth of samples */
-                /*  png_byte channels;       number of channels (1-4) */
-                /*  png_byte pixel_depth;    bits per pixel (depth*channels) */
-             png_ptr->row_buf + 1);      /* start of pixel data for row */
-#endif
-
-#ifdef PNG_WRITE_FILLER_SUPPORTED
-   if (png_ptr->transformations & PNG_FILLER)
-   {
-      if (png_ptr->color_type & (PNG_COLOR_MASK_ALPHA|PNG_COLOR_MASK_PALETTE))
-      {
-         /* GA, RGBA or palette; in any of these cases libpng will not do the
-          * the correct thing (whatever that might be).
-          */
-         png_warning(png_ptr, "incorrect png_set_filler call ignored");
-         png_ptr->transformations &= ~PNG_FILLER;
-      }
-
-      else
-         png_do_strip_channel(row_info, png_ptr->row_buf + 1,
-            !(png_ptr->flags & PNG_FLAG_FILLER_AFTER));
-   }
-#endif
-
-#ifdef PNG_WRITE_PACKSWAP_SUPPORTED
-   if (png_ptr->transformations & PNG_PACKSWAP)
-      png_do_packswap(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_WRITE_PACK_SUPPORTED
-   if (png_ptr->transformations & PNG_PACK)
-      png_do_pack(row_info, png_ptr->row_buf + 1,
-          (png_uint_32)png_ptr->bit_depth);
-#endif
-
-#ifdef PNG_WRITE_SWAP_SUPPORTED
-   if (png_ptr->transformations & PNG_SWAP_BYTES)
-      png_do_swap(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_WRITE_SHIFT_SUPPORTED
-   if (png_ptr->transformations & PNG_SHIFT)
-      png_do_shift(row_info, png_ptr->row_buf + 1,
-          &(png_ptr->shift));
-#endif
-
-#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
-   if (png_ptr->transformations & PNG_SWAP_ALPHA)
-      png_do_write_swap_alpha(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
-   if (png_ptr->transformations & PNG_INVERT_ALPHA)
-      png_do_write_invert_alpha(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_WRITE_BGR_SUPPORTED
-   if (png_ptr->transformations & PNG_BGR)
-      png_do_bgr(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_WRITE_INVERT_SUPPORTED
-   if (png_ptr->transformations & PNG_INVERT_MONO)
-      png_do_invert(row_info, png_ptr->row_buf + 1);
-#endif
-}
 
 #ifdef PNG_WRITE_PACK_SUPPORTED
 /* Pack pixels into bytes.  Pass the true bit depth in bit_depth.  The
  * row_info bit depth should be 8 (one pixel per byte).  The channels
  * should be 1 (this only happens on grayscale and paletted images).
  */
-void /* PRIVATE */
+static void
 png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)
 {
    png_debug(1, "in png_do_pack");
@@ -159,7 +71,8 @@ png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)
          case 2:
          {
             png_bytep sp, dp;
-            int shift, v;
+            unsigned int shift;
+            int v;
             png_uint_32 i;
             png_uint_32 row_width = row_info->width;
 
@@ -198,7 +111,8 @@ png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)
          case 4:
          {
             png_bytep sp, dp;
-            int shift, v;
+            unsigned int shift;
+            int v;
             png_uint_32 i;
             png_uint_32 row_width = row_info->width;
 
@@ -254,7 +168,7 @@ png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)
  * would pass 3 as bit_depth, and this routine would translate the
  * data to 0 to 15.
  */
-void /* PRIVATE */
+static void
 png_do_shift(png_row_infop row_info, png_bytep row,
     png_const_color_8p bit_depth)
 {
@@ -265,7 +179,7 @@ png_do_shift(png_row_infop row_info, png_bytep row,
       int shift_start[4], shift_dec[4];
       int channels = 0;
 
-      if (row_info->color_type & PNG_COLOR_MASK_COLOR)
+      if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
       {
          shift_start[channels] = row_info->bit_depth - bit_depth->red;
          shift_dec[channels] = bit_depth->red;
@@ -287,7 +201,7 @@ png_do_shift(png_row_infop row_info, png_bytep row,
          channels++;
       }
 
-      if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
+      if ((row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0)
       {
          shift_start[channels] = row_info->bit_depth - bit_depth->alpha;
          shift_dec[channels] = bit_depth->alpha;
@@ -299,7 +213,7 @@ png_do_shift(png_row_infop row_info, png_bytep row,
       {
          png_bytep bp = row;
          png_size_t i;
-         png_byte mask;
+         unsigned int mask;
          png_size_t row_bytes = row_info->rowbytes;
 
          if (bit_depth->gray == 1 && row_info->bit_depth == 2)
@@ -313,20 +227,22 @@ png_do_shift(png_row_infop row_info, png_bytep row,
 
          for (i = 0; i < row_bytes; i++, bp++)
          {
-            png_uint_16 v;
             int j;
+            unsigned int v, out;
 
             v = *bp;
-            *bp = 0;
+            out = 0;
 
             for (j = shift_start[0]; j > -shift_dec[0]; j -= shift_dec[0])
             {
                if (j > 0)
-                  *bp |= (png_byte)((v << j) & 0xff);
+                  out |= v << j;
 
                else
-                  *bp |= (png_byte)((v >> (-j)) & mask);
+                  out |= (v >> (-j)) & mask;
             }
+
+            *bp = (png_byte)(out & 0xff);
          }
       }
 
@@ -339,21 +255,23 @@ png_do_shift(png_row_infop row_info, png_bytep row,
          for (i = 0; i < istop; i++, bp++)
          {
 
-            png_uint_16 v;
+            const unsigned int c = i%channels;
             int j;
-            int c = (int)(i%channels);
+            unsigned int v, out;
 
             v = *bp;
-            *bp = 0;
+            out = 0;
 
             for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
             {
                if (j > 0)
-                  *bp |= (png_byte)((v << j) & 0xff);
+                  out |= v << j;
 
                else
-                  *bp |= (png_byte)((v >> (-j)) & 0xff);
+                  out |= v >> (-j);
             }
+
+            *bp = (png_byte)(out & 0xff);
          }
       }
 
@@ -365,22 +283,22 @@ png_do_shift(png_row_infop row_info, png_bytep row,
 
          for (bp = row, i = 0; i < istop; i++)
          {
-            int c = (int)(i%channels);
-            png_uint_16 value, v;
+            const unsigned int c = i%channels;
             int j;
+            unsigned int value, v;
 
-            v = (png_uint_16)(((png_uint_16)(*bp) << 8) + *(bp + 1));
+            v = png_get_uint_16(bp);
             value = 0;
 
             for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
             {
                if (j > 0)
-                  value |= (png_uint_16)((v << j) & (png_uint_16)0xffff);
+                  value |= v << j;
 
                else
-                  value |= (png_uint_16)((v >> (-j)) & (png_uint_16)0xffff);
+                  value |= v >> (-j);
             }
-            *bp++ = (png_byte)(value >> 8);
+            *bp++ = (png_byte)((value >> 8) & 0xff);
             *bp++ = (png_byte)(value & 0xff);
          }
       }
@@ -389,7 +307,7 @@ png_do_shift(png_row_infop row_info, png_bytep row,
 #endif
 
 #ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
-void /* PRIVATE */
+static void
 png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)
 {
    png_debug(1, "in png_do_write_swap_alpha");
@@ -437,7 +355,7 @@ png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)
                *(dp++) = save[1];
             }
          }
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
+#endif /* WRITE_16BIT */
       }
 
       else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
@@ -476,14 +394,14 @@ png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)
                *(dp++) = save[1];
             }
          }
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
+#endif /* WRITE_16BIT */
       }
    }
 }
 #endif
 
 #ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
-void /* PRIVATE */
+static void
 png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)
 {
    png_debug(1, "in png_do_write_invert_alpha");
@@ -506,7 +424,7 @@ png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)
                *(dp++) = *(sp++);
                */
                sp+=3; dp = sp;
-               *(dp++) = (png_byte)(255 - *(sp++));
+               *dp = (png_byte)(255 - *(sp++));
             }
          }
 
@@ -530,10 +448,10 @@ png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)
                */
                sp+=6; dp = sp;
                *(dp++) = (png_byte)(255 - *(sp++));
-               *(dp++) = (png_byte)(255 - *(sp++));
+               *dp     = (png_byte)(255 - *(sp++));
             }
          }
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
+#endif /* WRITE_16BIT */
       }
 
       else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
@@ -568,78 +486,91 @@ png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)
                */
                sp+=2; dp = sp;
                *(dp++) = (png_byte)(255 - *(sp++));
-               *(dp++) = (png_byte)(255 - *(sp++));
+               *dp     = (png_byte)(255 - *(sp++));
             }
          }
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
+#endif /* WRITE_16BIT */
       }
    }
 }
 #endif
-#endif /* PNG_WRITE_TRANSFORMS_SUPPORTED */
 
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-/* Undoes intrapixel differencing  */
+/* Transform the data according to the user's wishes.  The order of
+ * transformations is significant.
+ */
 void /* PRIVATE */
-png_do_write_intrapixel(png_row_infop row_info, png_bytep row)
+png_do_write_transformations(png_structrp png_ptr, png_row_infop row_info)
 {
-   png_debug(1, "in png_do_write_intrapixel");
+   png_debug(1, "in png_do_write_transformations");
 
-   if ((row_info->color_type & PNG_COLOR_MASK_COLOR))
-   {
-      int bytes_per_pixel;
-      png_uint_32 row_width = row_info->width;
-      if (row_info->bit_depth == 8)
-      {
-         png_bytep rp;
-         png_uint_32 i;
+   if (png_ptr == NULL)
+      return;
 
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-            bytes_per_pixel = 3;
+#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
+   if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)
+      if (png_ptr->write_user_transform_fn != NULL)
+         (*(png_ptr->write_user_transform_fn)) /* User write transform
+                                                 function */
+             (png_ptr,  /* png_ptr */
+             row_info,  /* row_info: */
+                /*  png_uint_32 width;       width of row */
+                /*  png_size_t rowbytes;     number of bytes in row */
+                /*  png_byte color_type;     color type of pixels */
+                /*  png_byte bit_depth;      bit depth of samples */
+                /*  png_byte channels;       number of channels (1-4) */
+                /*  png_byte pixel_depth;    bits per pixel (depth*channels) */
+             png_ptr->row_buf + 1);      /* start of pixel data for row */
+#endif
 
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-            bytes_per_pixel = 4;
+#ifdef PNG_WRITE_FILLER_SUPPORTED
+   if ((png_ptr->transformations & PNG_FILLER) != 0)
+      png_do_strip_channel(row_info, png_ptr->row_buf + 1,
+         !(png_ptr->flags & PNG_FLAG_FILLER_AFTER));
+#endif
 
-         else
-            return;
+#ifdef PNG_WRITE_PACKSWAP_SUPPORTED
+   if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
+      png_do_packswap(row_info, png_ptr->row_buf + 1);
+#endif
 
-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-         {
-            *(rp)     = (png_byte)((*rp       - *(rp + 1)) & 0xff);
-            *(rp + 2) = (png_byte)((*(rp + 2) - *(rp + 1)) & 0xff);
-         }
-      }
+#ifdef PNG_WRITE_PACK_SUPPORTED
+   if ((png_ptr->transformations & PNG_PACK) != 0)
+      png_do_pack(row_info, png_ptr->row_buf + 1,
+          (png_uint_32)png_ptr->bit_depth);
+#endif
 
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-      else if (row_info->bit_depth == 16)
-      {
-         png_bytep rp;
-         png_uint_32 i;
+#ifdef PNG_WRITE_SWAP_SUPPORTED
+#  ifdef PNG_16BIT_SUPPORTED
+   if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)
+      png_do_swap(row_info, png_ptr->row_buf + 1);
+#  endif
+#endif
 
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-            bytes_per_pixel = 6;
+#ifdef PNG_WRITE_SHIFT_SUPPORTED
+   if ((png_ptr->transformations & PNG_SHIFT) != 0)
+      png_do_shift(row_info, png_ptr->row_buf + 1,
+          &(png_ptr->shift));
+#endif
 
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-            bytes_per_pixel = 8;
+#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
+   if ((png_ptr->transformations & PNG_SWAP_ALPHA) != 0)
+      png_do_write_swap_alpha(row_info, png_ptr->row_buf + 1);
+#endif
 
-         else
-            return;
+#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
+   if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0)
+      png_do_write_invert_alpha(row_info, png_ptr->row_buf + 1);
+#endif
 
-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-         {
-            png_uint_32 s0   = (*(rp    ) << 8) | *(rp + 1);
-            png_uint_32 s1   = (*(rp + 2) << 8) | *(rp + 3);
-            png_uint_32 s2   = (*(rp + 4) << 8) | *(rp + 5);
-            png_uint_32 red  = (png_uint_32)((s0 - s1) & 0xffffL);
-            png_uint_32 blue = (png_uint_32)((s2 - s1) & 0xffffL);
-            *(rp    ) = (png_byte)((red >> 8) & 0xff);
-            *(rp + 1) = (png_byte)(red & 0xff);
-            *(rp + 4) = (png_byte)((blue >> 8) & 0xff);
-            *(rp + 5) = (png_byte)(blue & 0xff);
-         }
-      }
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
-   }
+#ifdef PNG_WRITE_BGR_SUPPORTED
+   if ((png_ptr->transformations & PNG_BGR) != 0)
+      png_do_bgr(row_info, png_ptr->row_buf + 1);
+#endif
+
+#ifdef PNG_WRITE_INVERT_SUPPORTED
+   if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)
+      png_do_invert(row_info, png_ptr->row_buf + 1);
+#endif
 }
-#endif /* PNG_MNG_FEATURES_SUPPORTED */
-#endif /* PNG_WRITE_SUPPORTED */
+#endif /* WRITE_TRANSFORMS */
+#endif /* WRITE */
diff --git a/drivers/png/pngwutil.c b/drivers/png/pngwutil.c
index d5f097fb97..b47f119d22 100644
--- a/drivers/png/pngwutil.c
+++ b/drivers/png/pngwutil.c
@@ -1,8 +1,8 @@
 
 /* pngwutil.c - utilities to write a PNG file
  *
- * Last changed in libpng 1.5.26 [December 17, 2015]
- * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.22 [May 26, 2016]
+ * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
@@ -23,30 +23,12 @@
 void PNGAPI
 png_save_uint_32(png_bytep buf, png_uint_32 i)
 {
-   buf[0] = (png_byte)((i >> 24) & 0xff);
-   buf[1] = (png_byte)((i >> 16) & 0xff);
-   buf[2] = (png_byte)((i >> 8) & 0xff);
-   buf[3] = (png_byte)(i & 0xff);
+   buf[0] = (png_byte)((i >> 24) & 0xffU);
+   buf[1] = (png_byte)((i >> 16) & 0xffU);
+   buf[2] = (png_byte)((i >>  8) & 0xffU);
+   buf[3] = (png_byte)( i        & 0xffU);
 }
 
-#ifdef PNG_SAVE_INT_32_SUPPORTED
-/* PNG signed integers are saved in 32-bit 2's complement format.  ANSI C-90
- * defines a cast of a signed integer to an unsigned integer either to preserve
- * the value, if it is positive, or to calculate:
- *
- *     (UNSIGNED_MAX+1) + integer
- *
- * Where UNSIGNED_MAX is the appropriate maximum unsigned value, so when the
- * negative integral value is added the result will be an unsigned value
- * correspnding to the 2's complement representation.
- */
-void PNGAPI
-png_save_int_32(png_bytep buf, png_int_32 i)
-{
-   png_save_uint_32(buf, i);
-}
-#endif
-
 /* Place a 16-bit number into a buffer in PNG byte order.
  * The parameter is declared unsigned int, not png_uint_16,
  * just to avoid potential problems on pre-ANSI C compilers.
@@ -54,8 +36,8 @@ png_save_int_32(png_bytep buf, png_int_32 i)
 void PNGAPI
 png_save_uint_16(png_bytep buf, unsigned int i)
 {
-   buf[0] = (png_byte)((i >> 8) & 0xff);
-   buf[1] = (png_byte)(i & 0xff);
+   buf[0] = (png_byte)((i >> 8) & 0xffU);
+   buf[1] = (png_byte)( i       & 0xffU);
 }
 #endif
 
@@ -66,7 +48,7 @@ png_save_uint_16(png_bytep buf, unsigned int i)
  * bytes have already been written.
  */
 void PNGAPI
-png_write_sig(png_structp png_ptr)
+png_write_sig(png_structrp png_ptr)
 {
    png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
 
@@ -88,7 +70,7 @@ png_write_sig(png_structp png_ptr)
  * passing in png_write_chunk_data().
  */
 static void
-png_write_chunk_header(png_structp png_ptr, png_uint_32 chunk_name,
+png_write_chunk_header(png_structrp png_ptr, png_uint_32 chunk_name,
     png_uint_32 length)
 {
    png_byte buf[8];
@@ -130,7 +112,7 @@ png_write_chunk_header(png_structp png_ptr, png_uint_32 chunk_name,
 }
 
 void PNGAPI
-png_write_chunk_start(png_structp png_ptr, png_const_bytep chunk_string,
+png_write_chunk_start(png_structrp png_ptr, png_const_bytep chunk_string,
     png_uint_32 length)
 {
    png_write_chunk_header(png_ptr, PNG_CHUNK_FROM_STRING(chunk_string), length);
@@ -142,7 +124,7 @@ png_write_chunk_start(png_structp png_ptr, png_const_bytep chunk_string,
  * given to png_write_chunk_header().
  */
 void PNGAPI
-png_write_chunk_data(png_structp png_ptr, png_const_bytep data,
+png_write_chunk_data(png_structrp png_ptr, png_const_bytep data,
     png_size_t length)
 {
    /* Write the data, and run the CRC over it */
@@ -154,7 +136,7 @@ png_write_chunk_data(png_structp png_ptr, png_const_bytep data,
       png_write_data(png_ptr, data, length);
 
       /* Update the CRC after writing the data,
-       * in case that the user I/O routine alters it.
+       * in case the user I/O routine alters it.
        */
       png_calculate_crc(png_ptr, data, length);
    }
@@ -162,7 +144,7 @@ png_write_chunk_data(png_structp png_ptr, png_const_bytep data,
 
 /* Finish a chunk started with png_write_chunk_header(). */
 void PNGAPI
-png_write_chunk_end(png_structp png_ptr)
+png_write_chunk_end(png_structrp png_ptr)
 {
    png_byte buf[4];
 
@@ -191,15 +173,15 @@ png_write_chunk_end(png_structp png_ptr)
  * functions instead.
  */
 static void
-png_write_complete_chunk(png_structp png_ptr, png_uint_32 chunk_name,
+png_write_complete_chunk(png_structrp png_ptr, png_uint_32 chunk_name,
    png_const_bytep data, png_size_t length)
 {
    if (png_ptr == NULL)
       return;
 
-   /* On 64 bit architectures 'length' may not fit in a png_uint_32. */
-   if (length > PNG_UINT_32_MAX)
-      png_error(png_ptr, "length exceeds PNG maxima");
+   /* On 64-bit architectures 'length' may not fit in a png_uint_32. */
+   if (length > PNG_UINT_31_MAX)
+      png_error(png_ptr, "length exceeds PNG maximum");
 
    png_write_chunk_header(png_ptr, chunk_name, (png_uint_32)length);
    png_write_chunk_data(png_ptr, data, length);
@@ -208,473 +190,487 @@ png_write_complete_chunk(png_structp png_ptr, png_uint_32 chunk_name,
 
 /* This is the API that calls the internal function above. */
 void PNGAPI
-png_write_chunk(png_structp png_ptr, png_const_bytep chunk_string,
+png_write_chunk(png_structrp png_ptr, png_const_bytep chunk_string,
    png_const_bytep data, png_size_t length)
 {
    png_write_complete_chunk(png_ptr, PNG_CHUNK_FROM_STRING(chunk_string), data,
       length);
 }
 
-/* Initialize the compressor for the appropriate type of compression. */
-static void
-png_zlib_claim(png_structp png_ptr, png_uint_32 state)
+/* This is used below to find the size of an image to pass to png_deflate_claim,
+ * so it only needs to be accurate if the size is less than 16384 bytes (the
+ * point at which a lower LZ window size can be used.)
+ */
+static png_alloc_size_t
+png_image_size(png_structrp png_ptr)
 {
-   if (!(png_ptr->zlib_state & PNG_ZLIB_IN_USE))
+   /* Only return sizes up to the maximum of a png_uint_32; do this by limiting
+    * the width and height used to 15 bits.
+    */
+   png_uint_32 h = png_ptr->height;
+
+   if (png_ptr->rowbytes < 32768 && h < 32768)
    {
-      /* If already initialized for 'state' do not re-init. */
-      if (png_ptr->zlib_state != state)
+      if (png_ptr->interlaced != 0)
       {
-         int ret = Z_OK;
-         png_const_charp who = "-";
-
-         /* If actually initialized for another state do a deflateEnd. */
-         if (png_ptr->zlib_state != PNG_ZLIB_UNINITIALIZED)
-         {
-            ret = deflateEnd(&png_ptr->zstream);
-            who = "end";
-            png_ptr->zlib_state = PNG_ZLIB_UNINITIALIZED;
-         }
+         /* Interlacing makes the image larger because of the replication of
+          * both the filter byte and the padding to a byte boundary.
+          */
+         png_uint_32 w = png_ptr->width;
+         unsigned int pd = png_ptr->pixel_depth;
+         png_alloc_size_t cb_base;
+         int pass;
 
-         /* zlib itself detects an incomplete state on deflateEnd */
-         if (ret == Z_OK) switch (state)
+         for (cb_base=0, pass=0; pass<=6; ++pass)
          {
-#           ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-               case PNG_ZLIB_FOR_TEXT:
-                  ret = deflateInit2(&png_ptr->zstream,
-                     png_ptr->zlib_text_level, png_ptr->zlib_text_method,
-                     png_ptr->zlib_text_window_bits,
-                     png_ptr->zlib_text_mem_level, png_ptr->zlib_text_strategy);
-                  who = "text";
-                  break;
-#           endif
+            png_uint_32 pw = PNG_PASS_COLS(w, pass);
 
-            case PNG_ZLIB_FOR_IDAT:
-               ret = deflateInit2(&png_ptr->zstream, png_ptr->zlib_level,
-                   png_ptr->zlib_method, png_ptr->zlib_window_bits,
-                   png_ptr->zlib_mem_level, png_ptr->zlib_strategy);
-               who = "IDAT";
-               break;
-
-            default:
-               png_error(png_ptr, "invalid zlib state");
+            if (pw > 0)
+               cb_base += (PNG_ROWBYTES(pd, pw)+1) * PNG_PASS_ROWS(h, pass);
          }
 
-         if (ret == Z_OK)
-            png_ptr->zlib_state = state;
-
-         else /* an error in deflateEnd or deflateInit2 */
-         {
-            size_t pos = 0;
-            char msg[64];
-
-            pos = png_safecat(msg, sizeof msg, pos,
-               "zlib failed to initialize compressor (");
-            pos = png_safecat(msg, sizeof msg, pos, who);
-
-            switch (ret)
-            {
-               case Z_VERSION_ERROR:
-                  pos = png_safecat(msg, sizeof msg, pos, ") version error");
-                  break;
-
-               case Z_STREAM_ERROR:
-                  pos = png_safecat(msg, sizeof msg, pos, ") stream error");
-                  break;
-
-               case Z_MEM_ERROR:
-                  pos = png_safecat(msg, sizeof msg, pos, ") memory error");
-                  break;
-
-               default:
-                  pos = png_safecat(msg, sizeof msg, pos, ") unknown error");
-                  break;
-            }
-
-            png_error(png_ptr, msg);
-         }
+         return cb_base;
       }
 
-      /* Here on success, claim the zstream: */
-      png_ptr->zlib_state |= PNG_ZLIB_IN_USE;
+      else
+         return (png_ptr->rowbytes+1) * h;
    }
 
    else
-      png_error(png_ptr, "zstream already in use (internal error)");
+      return 0xffffffffU;
 }
 
-/* The opposite: release the stream.  It is also reset, this API will warn on
- * error but will not fail.
- */
+#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
+   /* This is the code to hack the first two bytes of the deflate stream (the
+    * deflate header) to correct the windowBits value to match the actual data
+    * size.  Note that the second argument is the *uncompressed* size but the
+    * first argument is the *compressed* data (and it must be deflate
+    * compressed.)
+    */
 static void
-png_zlib_release(png_structp png_ptr)
+optimize_cmf(png_bytep data, png_alloc_size_t data_size)
 {
-   if (png_ptr->zlib_state & PNG_ZLIB_IN_USE)
+   /* Optimize the CMF field in the zlib stream.  The resultant zlib stream is
+    * still compliant to the stream specification.
+    */
+   if (data_size <= 16384) /* else windowBits must be 15 */
    {
-      int ret = deflateReset(&png_ptr->zstream);
-
-      png_ptr->zlib_state &= ~PNG_ZLIB_IN_USE;
+      unsigned int z_cmf = data[0];  /* zlib compression method and flags */
 
-      if (ret != Z_OK)
+      if ((z_cmf & 0x0f) == 8 && (z_cmf & 0xf0) <= 0x70)
       {
-#ifdef PNG_WARNINGS_SUPPORTED
-         png_const_charp err;
-         PNG_WARNING_PARAMETERS(p)
+         unsigned int z_cinfo;
+         unsigned int half_z_window_size;
 
-         switch (ret)
+         z_cinfo = z_cmf >> 4;
+         half_z_window_size = 1U << (z_cinfo + 7);
+
+         if (data_size <= half_z_window_size) /* else no change */
          {
-            case Z_VERSION_ERROR:
-               err = "version";
-               break;
+            unsigned int tmp;
 
-            case Z_STREAM_ERROR:
-               err = "stream";
-               break;
+            do
+            {
+               half_z_window_size >>= 1;
+               --z_cinfo;
+            }
+            while (z_cinfo > 0 && data_size <= half_z_window_size);
 
-            case Z_MEM_ERROR:
-               err = "memory";
-               break;
+            z_cmf = (z_cmf & 0x0f) | (z_cinfo << 4);
 
-            default:
-               err = "unknown";
-               break;
+            data[0] = (png_byte)z_cmf;
+            tmp = data[1] & 0xe0;
+            tmp += 0x1f - ((z_cmf << 8) + tmp) % 0x1f;
+            data[1] = (png_byte)tmp;
          }
-
-         png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_d, ret);
-         png_warning_parameter(p, 2, err);
-
-         if (png_ptr->zstream.msg)
-            err = png_ptr->zstream.msg;
-         else
-            err = "[no zlib message]";
-
-         png_warning_parameter(p, 3, err);
-
-         png_formatted_warning(png_ptr, p,
-            "zlib failed to reset compressor: @1(@2): @3");
-#endif
       }
    }
-
-   else
-      png_warning(png_ptr, "zstream not in use (internal error)");
 }
+#endif /* WRITE_OPTIMIZE_CMF */
 
-#ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-/* This pair of functions encapsulates the operation of (a) compressing a
- * text string, and (b) issuing it later as a series of chunk data writes.
- * The compression_state structure is shared context for these functions
- * set up by the caller in order to make the whole mess thread-safe.
- */
-
-typedef struct
-{
-   png_const_bytep input;   /* The uncompressed input data */
-   png_size_t input_len;    /* Its length */
-   int num_output_ptr;      /* Number of output pointers used */
-   int max_output_ptr;      /* Size of output_ptr */
-   png_bytep *output_ptr;   /* Array of pointers to output */
-} compression_state;
-
-/* Compress given text into storage in the png_ptr structure */
-static int /* PRIVATE */
-png_text_compress(png_structp png_ptr,
-    png_const_charp text, png_size_t text_len, int compression,
-    compression_state *comp)
+/* Initialize the compressor for the appropriate type of compression. */
+static int
+png_deflate_claim(png_structrp png_ptr, png_uint_32 owner,
+   png_alloc_size_t data_size)
 {
-   int ret;
+   if (png_ptr->zowner != 0)
+   {
+#if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_ERROR_TEXT_SUPPORTED)
+      char msg[64];
+
+      PNG_STRING_FROM_CHUNK(msg, owner);
+      msg[4] = ':';
+      msg[5] = ' ';
+      PNG_STRING_FROM_CHUNK(msg+6, png_ptr->zowner);
+      /* So the message that results is "<chunk> using zstream"; this is an
+       * internal error, but is very useful for debugging.  i18n requirements
+       * are minimal.
+       */
+      (void)png_safecat(msg, (sizeof msg), 10, " using zstream");
+#endif
+#if PNG_RELEASE_BUILD
+         png_warning(png_ptr, msg);
 
-   comp->num_output_ptr = 0;
-   comp->max_output_ptr = 0;
-   comp->output_ptr = NULL;
-   comp->input = NULL;
-   comp->input_len = text_len;
+         /* Attempt sane error recovery */
+         if (png_ptr->zowner == png_IDAT) /* don't steal from IDAT */
+         {
+            png_ptr->zstream.msg = PNGZ_MSG_CAST("in use by IDAT");
+            return Z_STREAM_ERROR;
+         }
 
-   /* We may just want to pass the text right through */
-   if (compression == PNG_TEXT_COMPRESSION_NONE)
-   {
-      comp->input = (png_const_bytep)text;
-      return((int)text_len);
+         png_ptr->zowner = 0;
+#else
+         png_error(png_ptr, msg);
+#endif
    }
 
-   if (compression >= PNG_TEXT_COMPRESSION_LAST)
    {
-      PNG_WARNING_PARAMETERS(p)
-
-      png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_d,
-         compression);
-      png_formatted_warning(png_ptr, p, "Unknown compression type @1");
-   }
+      int level = png_ptr->zlib_level;
+      int method = png_ptr->zlib_method;
+      int windowBits = png_ptr->zlib_window_bits;
+      int memLevel = png_ptr->zlib_mem_level;
+      int strategy; /* set below */
+      int ret; /* zlib return code */
 
-   /* We can't write the chunk until we find out how much data we have,
-    * which means we need to run the compressor first and save the
-    * output.  This shouldn't be a problem, as the vast majority of
-    * comments should be reasonable, but we will set up an array of
-    * malloc'd pointers to be sure.
-    *
-    * If we knew the application was well behaved, we could simplify this
-    * greatly by assuming we can always malloc an output buffer large
-    * enough to hold the compressed text ((1001 * text_len / 1000) + 12)
-    * and malloc this directly.  The only time this would be a bad idea is
-    * if we can't malloc more than 64K and we have 64K of random input
-    * data, or if the input string is incredibly large (although this
-    * wouldn't cause a failure, just a slowdown due to swapping).
-    */
-   png_zlib_claim(png_ptr, PNG_ZLIB_FOR_TEXT);
+      if (owner == png_IDAT)
+      {
+         if ((png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_STRATEGY) != 0)
+            strategy = png_ptr->zlib_strategy;
 
-   /* Set up the compression buffers */
-   /* TODO: the following cast hides a potential overflow problem. */
-   png_ptr->zstream.avail_in = (uInt)text_len;
+         else if (png_ptr->do_filter != PNG_FILTER_NONE)
+            strategy = PNG_Z_DEFAULT_STRATEGY;
 
-   /* NOTE: assume zlib doesn't overwrite the input */
-   png_ptr->zstream.next_in = (Bytef *)text;
-   png_ptr->zstream.avail_out = png_ptr->zbuf_size;
-   png_ptr->zstream.next_out = png_ptr->zbuf;
+         else
+            strategy = PNG_Z_DEFAULT_NOFILTER_STRATEGY;
+      }
 
-   /* This is the same compression loop as in png_write_row() */
-   do
-   {
-      /* Compress the data */
-      ret = deflate(&png_ptr->zstream, Z_NO_FLUSH);
+      else
+      {
+#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
+            level = png_ptr->zlib_text_level;
+            method = png_ptr->zlib_text_method;
+            windowBits = png_ptr->zlib_text_window_bits;
+            memLevel = png_ptr->zlib_text_mem_level;
+            strategy = png_ptr->zlib_text_strategy;
+#else
+            /* If customization is not supported the values all come from the
+             * IDAT values except for the strategy, which is fixed to the
+             * default.  (This is the pre-1.6.0 behavior too, although it was
+             * implemented in a very different way.)
+             */
+            strategy = Z_DEFAULT_STRATEGY;
+#endif
+      }
 
-      if (ret != Z_OK)
+      /* Adjust 'windowBits' down if larger than 'data_size'; to stop this
+       * happening just pass 32768 as the data_size parameter.  Notice that zlib
+       * requires an extra 262 bytes in the window in addition to the data to be
+       * able to see the whole of the data, so if data_size+262 takes us to the
+       * next windowBits size we need to fix up the value later.  (Because even
+       * though deflate needs the extra window, inflate does not!)
+       */
+      if (data_size <= 16384)
       {
-         /* Error */
-         if (png_ptr->zstream.msg != NULL)
-            png_error(png_ptr, png_ptr->zstream.msg);
+         /* IMPLEMENTATION NOTE: this 'half_window_size' stuff is only here to
+          * work round a Microsoft Visual C misbehavior which, contrary to C-90,
+          * widens the result of the following shift to 64-bits if (and,
+          * apparently, only if) it is used in a test.
+          */
+         unsigned int half_window_size = 1U << (windowBits-1);
 
-         else
-            png_error(png_ptr, "zlib error");
+         while (data_size + 262 <= half_window_size)
+         {
+            half_window_size >>= 1;
+            --windowBits;
+         }
       }
 
-      /* Check to see if we need more room */
-      if (!(png_ptr->zstream.avail_out))
+      /* Check against the previous initialized values, if any. */
+      if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0 &&
+         (png_ptr->zlib_set_level != level ||
+         png_ptr->zlib_set_method != method ||
+         png_ptr->zlib_set_window_bits != windowBits ||
+         png_ptr->zlib_set_mem_level != memLevel ||
+         png_ptr->zlib_set_strategy != strategy))
       {
-         /* Make sure the output array has room */
-         if (comp->num_output_ptr >= comp->max_output_ptr)
-         {
-            int old_max;
+         if (deflateEnd(&png_ptr->zstream) != Z_OK)
+            png_warning(png_ptr, "deflateEnd failed (ignored)");
 
-            old_max = comp->max_output_ptr;
-            comp->max_output_ptr = comp->num_output_ptr + 4;
-            if (comp->output_ptr != NULL)
-            {
-               png_bytepp old_ptr;
+         png_ptr->flags &= ~PNG_FLAG_ZSTREAM_INITIALIZED;
+      }
 
-               old_ptr = comp->output_ptr;
+      /* For safety clear out the input and output pointers (currently zlib
+       * doesn't use them on Init, but it might in the future).
+       */
+      png_ptr->zstream.next_in = NULL;
+      png_ptr->zstream.avail_in = 0;
+      png_ptr->zstream.next_out = NULL;
+      png_ptr->zstream.avail_out = 0;
 
-               comp->output_ptr = (png_bytepp)png_malloc(png_ptr,
-                   (comp->max_output_ptr * png_sizeof(png_bytep)));
+      /* Now initialize if required, setting the new parameters, otherwise just
+       * to a simple reset to the previous parameters.
+       */
+      if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0)
+         ret = deflateReset(&png_ptr->zstream);
 
-               png_memcpy(comp->output_ptr, old_ptr, old_max
-                   * png_sizeof(png_bytep));
+      else
+      {
+         ret = deflateInit2(&png_ptr->zstream, level, method, windowBits,
+            memLevel, strategy);
 
-               png_free(png_ptr, old_ptr);
-            }
-            else
-               comp->output_ptr = (png_bytepp)png_malloc(png_ptr,
-                   (comp->max_output_ptr * png_sizeof(png_bytep)));
-         }
+         if (ret == Z_OK)
+            png_ptr->flags |= PNG_FLAG_ZSTREAM_INITIALIZED;
+      }
 
-         /* Save the data */
-         comp->output_ptr[comp->num_output_ptr] =
-             (png_bytep)png_malloc(png_ptr, png_ptr->zbuf_size);
+      /* The return code is from either deflateReset or deflateInit2; they have
+       * pretty much the same set of error codes.
+       */
+      if (ret == Z_OK)
+         png_ptr->zowner = owner;
 
-         png_memcpy(comp->output_ptr[comp->num_output_ptr], png_ptr->zbuf,
-             png_ptr->zbuf_size);
+      else
+         png_zstream_error(png_ptr, ret);
 
-         comp->num_output_ptr++;
+      return ret;
+   }
+}
 
-         /* and reset the buffer */
-         png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-         png_ptr->zstream.next_out = png_ptr->zbuf;
-      }
-   /* Continue until we don't have any more to compress */
-   } while (png_ptr->zstream.avail_in);
+/* Clean up (or trim) a linked list of compression buffers. */
+void /* PRIVATE */
+png_free_buffer_list(png_structrp png_ptr, png_compression_bufferp *listp)
+{
+   png_compression_bufferp list = *listp;
 
-   /* Finish the compression */
-   do
+   if (list != NULL)
    {
-      /* Tell zlib we are finished */
-      ret = deflate(&png_ptr->zstream, Z_FINISH);
+      *listp = NULL;
 
-      if (ret == Z_OK)
+      do
       {
-         /* Check to see if we need more room */
-         if (!(png_ptr->zstream.avail_out))
-         {
-            /* Check to make sure our output array has room */
-            if (comp->num_output_ptr >= comp->max_output_ptr)
-            {
-               int old_max;
+         png_compression_bufferp next = list->next;
 
-               old_max = comp->max_output_ptr;
-               comp->max_output_ptr = comp->num_output_ptr + 4;
-               if (comp->output_ptr != NULL)
-               {
-                  png_bytepp old_ptr;
+         png_free(png_ptr, list);
+         list = next;
+      }
+      while (list != NULL);
+   }
+}
 
-                  old_ptr = comp->output_ptr;
+#ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
+/* This pair of functions encapsulates the operation of (a) compressing a
+ * text string, and (b) issuing it later as a series of chunk data writes.
+ * The compression_state structure is shared context for these functions
+ * set up by the caller to allow access to the relevant local variables.
+ *
+ * compression_buffer (new in 1.6.0) is just a linked list of zbuffer_size
+ * temporary buffers.  From 1.6.0 it is retained in png_struct so that it will
+ * be correctly freed in the event of a write error (previous implementations
+ * just leaked memory.)
+ */
+typedef struct
+{
+   png_const_bytep      input;        /* The uncompressed input data */
+   png_alloc_size_t     input_len;    /* Its length */
+   png_uint_32          output_len;   /* Final compressed length */
+   png_byte             output[1024]; /* First block of output */
+} compression_state;
 
-                  /* This could be optimized to realloc() */
-                  comp->output_ptr = (png_bytepp)png_malloc(png_ptr,
-                      (png_alloc_size_t)(comp->max_output_ptr *
-                      png_sizeof(png_charp)));
+static void
+png_text_compress_init(compression_state *comp, png_const_bytep input,
+   png_alloc_size_t input_len)
+{
+   comp->input = input;
+   comp->input_len = input_len;
+   comp->output_len = 0;
+}
 
-                  png_memcpy(comp->output_ptr, old_ptr,
-                      old_max * png_sizeof(png_charp));
+/* Compress the data in the compression state input */
+static int
+png_text_compress(png_structrp png_ptr, png_uint_32 chunk_name,
+   compression_state *comp, png_uint_32 prefix_len)
+{
+   int ret;
 
-                  png_free(png_ptr, old_ptr);
-               }
+   /* To find the length of the output it is necessary to first compress the
+    * input. The result is buffered rather than using the two-pass algorithm
+    * that is used on the inflate side; deflate is assumed to be slower and a
+    * PNG writer is assumed to have more memory available than a PNG reader.
+    *
+    * IMPLEMENTATION NOTE: the zlib API deflateBound() can be used to find an
+    * upper limit on the output size, but it is always bigger than the input
+    * size so it is likely to be more efficient to use this linked-list
+    * approach.
+    */
+   ret = png_deflate_claim(png_ptr, chunk_name, comp->input_len);
 
-               else
-                  comp->output_ptr = (png_bytepp)png_malloc(png_ptr,
-                      (png_alloc_size_t)(comp->max_output_ptr *
-                      png_sizeof(png_charp)));
-            }
+   if (ret != Z_OK)
+      return ret;
 
-            /* Save the data */
-            comp->output_ptr[comp->num_output_ptr] =
-                (png_bytep)png_malloc(png_ptr,
-                (png_alloc_size_t)png_ptr->zbuf_size);
+   /* Set up the compression buffers, we need a loop here to avoid overflowing a
+    * uInt.  Use ZLIB_IO_MAX to limit the input.  The output is always limited
+    * by the output buffer size, so there is no need to check that.  Since this
+    * is ANSI-C we know that an 'int', hence a uInt, is always at least 16 bits
+    * in size.
+    */
+   {
+      png_compression_bufferp *end = &png_ptr->zbuffer_list;
+      png_alloc_size_t input_len = comp->input_len; /* may be zero! */
+      png_uint_32 output_len;
 
-            png_memcpy(comp->output_ptr[comp->num_output_ptr], png_ptr->zbuf,
-                png_ptr->zbuf_size);
+      /* zlib updates these for us: */
+      png_ptr->zstream.next_in = PNGZ_INPUT_CAST(comp->input);
+      png_ptr->zstream.avail_in = 0; /* Set below */
+      png_ptr->zstream.next_out = comp->output;
+      png_ptr->zstream.avail_out = (sizeof comp->output);
 
-            comp->num_output_ptr++;
+      output_len = png_ptr->zstream.avail_out;
 
-            /* and reset the buffer pointers */
-            png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-            png_ptr->zstream.next_out = png_ptr->zbuf;
-         }
-      }
-      else if (ret != Z_STREAM_END)
+      do
       {
-         /* We got an error */
-         if (png_ptr->zstream.msg != NULL)
-            png_error(png_ptr, png_ptr->zstream.msg);
+         uInt avail_in = ZLIB_IO_MAX;
 
-         else
-            png_error(png_ptr, "zlib error");
-      }
-   } while (ret != Z_STREAM_END);
+         if (avail_in > input_len)
+            avail_in = (uInt)input_len;
 
-   /* Text length is number of buffers plus last buffer */
-   text_len = png_ptr->zbuf_size * comp->num_output_ptr;
+         input_len -= avail_in;
 
-   if (png_ptr->zstream.avail_out < png_ptr->zbuf_size)
-      text_len += png_ptr->zbuf_size - (png_size_t)png_ptr->zstream.avail_out;
+         png_ptr->zstream.avail_in = avail_in;
 
-   return((int)text_len);
-}
-
-/* Ship the compressed text out via chunk writes */
-static void /* PRIVATE */
-png_write_compressed_data_out(png_structp png_ptr, compression_state *comp,
-   png_size_t data_len)
-{
-   int i;
+         if (png_ptr->zstream.avail_out == 0)
+         {
+            png_compression_buffer *next;
 
-   /* Handle the no-compression case */
-   if (comp->input)
-   {
-      png_write_chunk_data(png_ptr, comp->input, data_len);
+            /* Chunk data is limited to 2^31 bytes in length, so the prefix
+             * length must be counted here.
+             */
+            if (output_len + prefix_len > PNG_UINT_31_MAX)
+            {
+               ret = Z_MEM_ERROR;
+               break;
+            }
 
-      return;
-   }
+            /* Need a new (malloc'ed) buffer, but there may be one present
+             * already.
+             */
+            next = *end;
+            if (next == NULL)
+            {
+               next = png_voidcast(png_compression_bufferp, png_malloc_base
+                  (png_ptr, PNG_COMPRESSION_BUFFER_SIZE(png_ptr)));
 
-#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-   /* The zbuf_size test is because the code below doesn't work if zbuf_size is
-    * '1'; simply skip it to avoid memory overwrite.
-    */
-   if (data_len >= 2 && comp->input_len < 16384 && png_ptr->zbuf_size > 1)
-   {
-      unsigned int z_cmf;  /* zlib compression method and flags */
+               if (next == NULL)
+               {
+                  ret = Z_MEM_ERROR;
+                  break;
+               }
 
-      /* Optimize the CMF field in the zlib stream.  This hack of the zlib
-       * stream is compliant to the stream specification.
-       */
+               /* Link in this buffer (so that it will be freed later) */
+               next->next = NULL;
+               *end = next;
+            }
 
-      if (comp->num_output_ptr)
-        z_cmf = comp->output_ptr[0][0];
-      else
-        z_cmf = png_ptr->zbuf[0];
+            png_ptr->zstream.next_out = next->output;
+            png_ptr->zstream.avail_out = png_ptr->zbuffer_size;
+            output_len += png_ptr->zstream.avail_out;
 
-      if ((z_cmf & 0x0f) == 8 && (z_cmf & 0xf0) <= 0x70)
-      {
-         unsigned int z_cinfo;
-         unsigned int half_z_window_size;
-         png_size_t uncompressed_text_size = comp->input_len;
+            /* Move 'end' to the next buffer pointer. */
+            end = &next->next;
+         }
 
-         z_cinfo = z_cmf >> 4;
-         half_z_window_size = 1 << (z_cinfo + 7);
+         /* Compress the data */
+         ret = deflate(&png_ptr->zstream,
+            input_len > 0 ? Z_NO_FLUSH : Z_FINISH);
 
-         while (uncompressed_text_size <= half_z_window_size &&
-             half_z_window_size >= 256)
-         {
-            z_cinfo--;
-            half_z_window_size >>= 1;
-         }
+         /* Claw back input data that was not consumed (because avail_in is
+          * reset above every time round the loop).
+          */
+         input_len += png_ptr->zstream.avail_in;
+         png_ptr->zstream.avail_in = 0; /* safety */
+      }
+      while (ret == Z_OK);
 
-         z_cmf = (z_cmf & 0x0f) | (z_cinfo << 4);
+      /* There may be some space left in the last output buffer. This needs to
+       * be subtracted from output_len.
+       */
+      output_len -= png_ptr->zstream.avail_out;
+      png_ptr->zstream.avail_out = 0; /* safety */
+      comp->output_len = output_len;
 
-         if (comp->num_output_ptr)
-         {
+      /* Now double check the output length, put in a custom message if it is
+       * too long.  Otherwise ensure the z_stream::msg pointer is set to
+       * something.
+       */
+      if (output_len + prefix_len >= PNG_UINT_31_MAX)
+      {
+         png_ptr->zstream.msg = PNGZ_MSG_CAST("compressed data too long");
+         ret = Z_MEM_ERROR;
+      }
 
-           if (comp->output_ptr[0][0] != z_cmf)
-           {
-              int tmp;
+      else
+         png_zstream_error(png_ptr, ret);
 
-              comp->output_ptr[0][0] = (png_byte)z_cmf;
-              tmp = comp->output_ptr[0][1] & 0xe0;
-              tmp += 0x1f - ((z_cmf << 8) + tmp) % 0x1f;
-              comp->output_ptr[0][1] = (png_byte)tmp;
-           }
-         }
-         else
-         {
-            int tmp;
+      /* Reset zlib for another zTXt/iTXt or image data */
+      png_ptr->zowner = 0;
 
-            png_ptr->zbuf[0] = (png_byte)z_cmf;
-            tmp = png_ptr->zbuf[1] & 0xe0;
-            tmp += 0x1f - ((z_cmf << 8) + tmp) % 0x1f;
-            png_ptr->zbuf[1] = (png_byte)tmp;
-         }
+      /* The only success case is Z_STREAM_END, input_len must be 0; if not this
+       * is an internal error.
+       */
+      if (ret == Z_STREAM_END && input_len == 0)
+      {
+#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
+         /* Fix up the deflate header, if required */
+         optimize_cmf(comp->output, comp->input_len);
+#endif
+         /* But Z_OK is returned, not Z_STREAM_END; this allows the claim
+          * function above to return Z_STREAM_END on an error (though it never
+          * does in the current versions of zlib.)
+          */
+         return Z_OK;
       }
 
       else
-         png_error(png_ptr,
-             "Invalid zlib compression method or flags in non-IDAT chunk");
+         return ret;
    }
-#endif /* PNG_WRITE_OPTIMIZE_CMF_SUPPORTED */
+}
+
+/* Ship the compressed text out via chunk writes */
+static void
+png_write_compressed_data_out(png_structrp png_ptr, compression_state *comp)
+{
+   png_uint_32 output_len = comp->output_len;
+   png_const_bytep output = comp->output;
+   png_uint_32 avail = (sizeof comp->output);
+   png_compression_buffer *next = png_ptr->zbuffer_list;
 
-   /* Write saved output buffers, if any */
-   for (i = 0; i < comp->num_output_ptr; i++)
+   for (;;)
    {
-      png_write_chunk_data(png_ptr, comp->output_ptr[i],
-          (png_size_t)png_ptr->zbuf_size);
+      if (avail > output_len)
+         avail = output_len;
 
-      png_free(png_ptr, comp->output_ptr[i]);
-   }
+      png_write_chunk_data(png_ptr, output, avail);
 
-   if (comp->max_output_ptr != 0)
-      png_free(png_ptr, comp->output_ptr);
+      output_len -= avail;
 
-   /* Write anything left in zbuf */
-   if (png_ptr->zstream.avail_out < (png_uint_32)png_ptr->zbuf_size)
-      png_write_chunk_data(png_ptr, png_ptr->zbuf,
-          (png_size_t)(png_ptr->zbuf_size - png_ptr->zstream.avail_out));
+      if (output_len == 0 || next == NULL)
+         break;
+
+      avail = png_ptr->zbuffer_size;
+      output = next->output;
+      next = next->next;
+   }
 
-   /* Reset zlib for another zTXt/iTXt or image data */
-   png_zlib_release(png_ptr);
+   /* This is an internal error; 'next' must have been NULL! */
+   if (output_len > 0)
+      png_error(png_ptr, "error writing ancillary chunked compressed data");
 }
-#endif /* PNG_WRITE_COMPRESSED_TEXT_SUPPORTED */
+#endif /* WRITE_COMPRESSED_TEXT */
 
 /* Write the IHDR chunk, and update the png_struct with the necessary
  * information.  Note that the rest of this code depends upon this
  * information being correct.
  */
 void /* PRIVATE */
-png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
+png_write_IHDR(png_structrp png_ptr, png_uint_32 width, png_uint_32 height,
     int bit_depth, int color_type, int compression_type, int filter_type,
     int interlace_type)
 {
@@ -768,8 +764,8 @@ png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
     */
    if (
 #ifdef PNG_MNG_FEATURES_SUPPORTED
-       !((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
-       ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) == 0) &&
+       !((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
+       ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) == 0) &&
        (color_type == PNG_COLOR_TYPE_RGB ||
         color_type == PNG_COLOR_TYPE_RGB_ALPHA) &&
        (filter_type == PNG_INTRAPIXEL_DIFFERENCING)) &&
@@ -791,7 +787,7 @@ png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
    interlace_type=PNG_INTERLACE_NONE;
 #endif
 
-   /* Save the relevent information */
+   /* Save the relevant information */
    png_ptr->bit_depth = (png_byte)bit_depth;
    png_ptr->color_type = (png_byte)color_type;
    png_ptr->interlaced = (png_byte)interlace_type;
@@ -821,11 +817,6 @@ png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
    /* Write the chunk */
    png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);
 
-   /* Initialize zlib with PNG info */
-   png_ptr->zstream.zalloc = png_zalloc;
-   png_ptr->zstream.zfree = png_zfree;
-   png_ptr->zstream.opaque = (voidpf)png_ptr;
-
    if ((png_ptr->do_filter) == PNG_NO_FILTERS)
    {
       if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
@@ -836,55 +827,6 @@ png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
          png_ptr->do_filter = PNG_ALL_FILTERS;
    }
 
-   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_STRATEGY))
-   {
-      if (png_ptr->do_filter != PNG_FILTER_NONE)
-         png_ptr->zlib_strategy = Z_FILTERED;
-
-      else
-         png_ptr->zlib_strategy = Z_DEFAULT_STRATEGY;
-   }
-
-   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_LEVEL))
-      png_ptr->zlib_level = Z_DEFAULT_COMPRESSION;
-
-   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL))
-      png_ptr->zlib_mem_level = 8;
-
-   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS))
-      png_ptr->zlib_window_bits = 15;
-
-   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_METHOD))
-      png_ptr->zlib_method = 8;
-
-#ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-   if (!(png_ptr->flags & PNG_FLAG_ZTXT_CUSTOM_STRATEGY))
-      png_ptr->zlib_text_strategy = Z_DEFAULT_STRATEGY;
-
-   if (!(png_ptr->flags & PNG_FLAG_ZTXT_CUSTOM_LEVEL))
-      png_ptr->zlib_text_level = png_ptr->zlib_level;
-
-   if (!(png_ptr->flags & PNG_FLAG_ZTXT_CUSTOM_MEM_LEVEL))
-      png_ptr->zlib_text_mem_level = png_ptr->zlib_mem_level;
-
-   if (!(png_ptr->flags & PNG_FLAG_ZTXT_CUSTOM_WINDOW_BITS))
-      png_ptr->zlib_text_window_bits = png_ptr->zlib_window_bits;
-
-   if (!(png_ptr->flags & PNG_FLAG_ZTXT_CUSTOM_METHOD))
-      png_ptr->zlib_text_method = png_ptr->zlib_method;
-#else
-   png_ptr->zlib_text_strategy = Z_DEFAULT_STRATEGY;
-   png_ptr->zlib_text_level = png_ptr->zlib_level;
-   png_ptr->zlib_text_mem_level = png_ptr->zlib_mem_level;
-   png_ptr->zlib_text_window_bits = png_ptr->zlib_window_bits;
-   png_ptr->zlib_text_method = png_ptr->zlib_method;
-#endif /* PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED */
-#endif /* PNG_WRITE_COMPRESSED_TEXT_SUPPORTED */
-
-   /* Record that the compressor has not yet been initialized. */
-   png_ptr->zlib_state = PNG_ZLIB_UNINITIALIZED;
-
    png_ptr->mode = PNG_HAVE_IHDR; /* not READY_FOR_ZTXT */
 }
 
@@ -893,7 +835,7 @@ png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
  * structure.
  */
 void /* PRIVATE */
-png_write_PLTE(png_structp png_ptr, png_const_colorp palette,
+png_write_PLTE(png_structrp png_ptr, png_const_colorp palette,
     png_uint_32 num_pal)
 {
    png_uint_32 max_palette_length, i;
@@ -907,7 +849,7 @@ png_write_PLTE(png_structp png_ptr, png_const_colorp palette,
 
    if ((
 #ifdef PNG_MNG_FEATURES_SUPPORTED
-       !(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) &&
+       (png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) == 0 &&
 #endif
        num_pal == 0) || num_pal > max_palette_length)
    {
@@ -923,7 +865,7 @@ png_write_PLTE(png_structp png_ptr, png_const_colorp palette,
       }
    }
 
-   if (!(png_ptr->color_type&PNG_COLOR_MASK_COLOR))
+   if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
    {
       png_warning(png_ptr,
           "Ignoring request to write a PLTE chunk in grayscale PNG");
@@ -964,94 +906,165 @@ png_write_PLTE(png_structp png_ptr, png_const_colorp palette,
    png_ptr->mode |= PNG_HAVE_PLTE;
 }
 
-/* Write an IDAT chunk */
+/* This is similar to png_text_compress, above, except that it does not require
+ * all of the data at once and, instead of buffering the compressed result,
+ * writes it as IDAT chunks.  Unlike png_text_compress it *can* png_error out
+ * because it calls the write interface.  As a result it does its own error
+ * reporting and does not return an error code.  In the event of error it will
+ * just call png_error.  The input data length may exceed 32-bits.  The 'flush'
+ * parameter is exactly the same as that to deflate, with the following
+ * meanings:
+ *
+ * Z_NO_FLUSH: normal incremental output of compressed data
+ * Z_SYNC_FLUSH: do a SYNC_FLUSH, used by png_write_flush
+ * Z_FINISH: this is the end of the input, do a Z_FINISH and clean up
+ *
+ * The routine manages the acquire and release of the png_ptr->zstream by
+ * checking and (at the end) clearing png_ptr->zowner; it does some sanity
+ * checks on the 'mode' flags while doing this.
+ */
 void /* PRIVATE */
-png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length)
+png_compress_IDAT(png_structrp png_ptr, png_const_bytep input,
+   png_alloc_size_t input_len, int flush)
 {
-   png_debug(1, "in png_write_IDAT");
+   if (png_ptr->zowner != png_IDAT)
+   {
+      /* First time.   Ensure we have a temporary buffer for compression and
+       * trim the buffer list if it has more than one entry to free memory.
+       * If 'WRITE_COMPRESSED_TEXT' is not set the list will never have been
+       * created at this point, but the check here is quick and safe.
+       */
+      if (png_ptr->zbuffer_list == NULL)
+      {
+         png_ptr->zbuffer_list = png_voidcast(png_compression_bufferp,
+            png_malloc(png_ptr, PNG_COMPRESSION_BUFFER_SIZE(png_ptr)));
+         png_ptr->zbuffer_list->next = NULL;
+      }
 
-#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-   if (!(png_ptr->mode & PNG_HAVE_IDAT) &&
-       png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)
+      else
+         png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list->next);
+
+      /* It is a terminal error if we can't claim the zstream. */
+      if (png_deflate_claim(png_ptr, png_IDAT, png_image_size(png_ptr)) != Z_OK)
+         png_error(png_ptr, png_ptr->zstream.msg);
+
+      /* The output state is maintained in png_ptr->zstream, so it must be
+       * initialized here after the claim.
+       */
+      png_ptr->zstream.next_out = png_ptr->zbuffer_list->output;
+      png_ptr->zstream.avail_out = png_ptr->zbuffer_size;
+   }
+
+   /* Now loop reading and writing until all the input is consumed or an error
+    * terminates the operation.  The _out values are maintained across calls to
+    * this function, but the input must be reset each time.
+    */
+   png_ptr->zstream.next_in = PNGZ_INPUT_CAST(input);
+   png_ptr->zstream.avail_in = 0; /* set below */
+   for (;;)
    {
-      /* Optimize the CMF field in the zlib stream.  This hack of the zlib
-       * stream is compliant to the stream specification.
+      int ret;
+
+      /* INPUT: from the row data */
+      uInt avail = ZLIB_IO_MAX;
+
+      if (avail > input_len)
+         avail = (uInt)input_len; /* safe because of the check */
+
+      png_ptr->zstream.avail_in = avail;
+      input_len -= avail;
+
+      ret = deflate(&png_ptr->zstream, input_len > 0 ? Z_NO_FLUSH : flush);
+
+      /* Include as-yet unconsumed input */
+      input_len += png_ptr->zstream.avail_in;
+      png_ptr->zstream.avail_in = 0;
+
+      /* OUTPUT: write complete IDAT chunks when avail_out drops to zero. Note
+       * that these two zstream fields are preserved across the calls, therefore
+       * there is no need to set these up on entry to the loop.
        */
-      unsigned int z_cmf = data[0];  /* zlib compression method and flags */
+      if (png_ptr->zstream.avail_out == 0)
+      {
+         png_bytep data = png_ptr->zbuffer_list->output;
+         uInt size = png_ptr->zbuffer_size;
 
-      if ((z_cmf & 0x0f) == 8 && (z_cmf & 0xf0) <= 0x70)
+         /* Write an IDAT containing the data then reset the buffer.  The
+          * first IDAT may need deflate header optimization.
+          */
+#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
+            if ((png_ptr->mode & PNG_HAVE_IDAT) == 0 &&
+                png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)
+               optimize_cmf(data, png_image_size(png_ptr));
+#endif
+
+         png_write_complete_chunk(png_ptr, png_IDAT, data, size);
+         png_ptr->mode |= PNG_HAVE_IDAT;
+
+         png_ptr->zstream.next_out = data;
+         png_ptr->zstream.avail_out = size;
+
+         /* For SYNC_FLUSH or FINISH it is essential to keep calling zlib with
+          * the same flush parameter until it has finished output, for NO_FLUSH
+          * it doesn't matter.
+          */
+         if (ret == Z_OK && flush != Z_NO_FLUSH)
+            continue;
+      }
+
+      /* The order of these checks doesn't matter much; it just affects which
+       * possible error might be detected if multiple things go wrong at once.
+       */
+      if (ret == Z_OK) /* most likely return code! */
       {
-         /* Avoid memory underflows and multiplication overflows.
-          *
-          * The conditions below are practically always satisfied;
-          * however, they still must be checked.
+         /* If all the input has been consumed then just return.  If Z_FINISH
+          * was used as the flush parameter something has gone wrong if we get
+          * here.
           */
-         if (length >= 2 &&
-             png_ptr->height < 16384 && png_ptr->width < 16384)
+         if (input_len == 0)
          {
-            /* Compute the maximum possible length of the datastream */
+            if (flush == Z_FINISH)
+               png_error(png_ptr, "Z_OK on Z_FINISH with output space");
 
-            /* Number of pixels, plus for each row a filter byte
-             * and possibly a padding byte, so increase the maximum
-             * size to account for these.
-             */
-            unsigned int z_cinfo;
-            unsigned int half_z_window_size;
-            png_uint_32 uncompressed_idat_size = png_ptr->height *
-                ((png_ptr->width *
-                png_ptr->channels * png_ptr->bit_depth + 15) >> 3);
-
-            /* If it's interlaced, each block of 8 rows is sent as up to
-             * 14 rows, i.e., 6 additional rows, each with a filter byte
-             * and possibly a padding byte
-             */
-            if (png_ptr->interlaced)
-               uncompressed_idat_size += ((png_ptr->height + 7)/8) *
-                   (png_ptr->bit_depth < 8 ? 12 : 6);
+            return;
+         }
+      }
 
-            z_cinfo = z_cmf >> 4;
-            half_z_window_size = 1 << (z_cinfo + 7);
+      else if (ret == Z_STREAM_END && flush == Z_FINISH)
+      {
+         /* This is the end of the IDAT data; any pending output must be
+          * flushed.  For small PNG files we may still be at the beginning.
+          */
+         png_bytep data = png_ptr->zbuffer_list->output;
+         uInt size = png_ptr->zbuffer_size - png_ptr->zstream.avail_out;
 
-            while (uncompressed_idat_size <= half_z_window_size &&
-                half_z_window_size >= 256)
-            {
-               z_cinfo--;
-               half_z_window_size >>= 1;
-            }
+#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
+         if ((png_ptr->mode & PNG_HAVE_IDAT) == 0 &&
+             png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)
+            optimize_cmf(data, png_image_size(png_ptr));
+#endif
 
-            z_cmf = (z_cmf & 0x0f) | (z_cinfo << 4);
+         png_write_complete_chunk(png_ptr, png_IDAT, data, size);
+         png_ptr->zstream.avail_out = 0;
+         png_ptr->zstream.next_out = NULL;
+         png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT;
 
-            if (data[0] != z_cmf)
-            {
-               int tmp;
-               data[0] = (png_byte)z_cmf;
-               tmp = data[1] & 0xe0;
-               tmp += 0x1f - ((z_cmf << 8) + tmp) % 0x1f;
-               data[1] = (png_byte)tmp;
-            }
-         }
+         png_ptr->zowner = 0; /* Release the stream */
+         return;
       }
 
       else
-         png_error(png_ptr,
-             "Invalid zlib compression method or flags in IDAT");
+      {
+         /* This is an error condition. */
+         png_zstream_error(png_ptr, ret);
+         png_error(png_ptr, png_ptr->zstream.msg);
+      }
    }
-#endif /* PNG_WRITE_OPTIMIZE_CMF_SUPPORTED */
-
-   png_write_complete_chunk(png_ptr, png_IDAT, data, length);
-   png_ptr->mode |= PNG_HAVE_IDAT;
-
-   /* Prior to 1.5.4 this code was replicated in every caller (except at the
-    * end, where it isn't technically necessary).  Since this function has
-    * flushed the data we can safely reset the zlib output buffer here.
-    */
-   png_ptr->zstream.next_out = png_ptr->zbuf;
-   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
 }
 
 /* Write an IEND chunk */
 void /* PRIVATE */
-png_write_IEND(png_structp png_ptr)
+png_write_IEND(png_structrp png_ptr)
 {
    png_debug(1, "in png_write_IEND");
 
@@ -1062,7 +1075,7 @@ png_write_IEND(png_structp png_ptr)
 #ifdef PNG_WRITE_gAMA_SUPPORTED
 /* Write a gAMA chunk */
 void /* PRIVATE */
-png_write_gAMA_fixed(png_structp png_ptr, png_fixed_point file_gamma)
+png_write_gAMA_fixed(png_structrp png_ptr, png_fixed_point file_gamma)
 {
    png_byte buf[4];
 
@@ -1077,7 +1090,7 @@ png_write_gAMA_fixed(png_structp png_ptr, png_fixed_point file_gamma)
 #ifdef PNG_WRITE_sRGB_SUPPORTED
 /* Write a sRGB chunk */
 void /* PRIVATE */
-png_write_sRGB(png_structp png_ptr, int srgb_intent)
+png_write_sRGB(png_structrp png_ptr, int srgb_intent)
 {
    png_byte buf[1];
 
@@ -1095,79 +1108,60 @@ png_write_sRGB(png_structp png_ptr, int srgb_intent)
 #ifdef PNG_WRITE_iCCP_SUPPORTED
 /* Write an iCCP chunk */
 void /* PRIVATE */
-png_write_iCCP(png_structp png_ptr, png_const_charp name, int compression_type,
-    png_const_charp profile, int profile_len)
+png_write_iCCP(png_structrp png_ptr, png_const_charp name,
+    png_const_bytep profile)
 {
-   png_size_t name_len;
+   png_uint_32 name_len;
+   png_uint_32 profile_len;
+   png_byte new_name[81]; /* 1 byte for the compression byte */
    compression_state comp;
-   int embedded_profile_len = 0;
+   png_uint_32 temp;
 
    png_debug(1, "in png_write_iCCP");
 
-   comp.num_output_ptr = 0;
-   comp.max_output_ptr = 0;
-   comp.output_ptr = NULL;
-   comp.input = NULL;
-   comp.input_len = 0;
-
-   name_len = png_strlen(name);
+   /* These are all internal problems: the profile should have been checked
+    * before when it was stored.
+    */
+   if (profile == NULL)
+      png_error(png_ptr, "No profile for iCCP chunk"); /* internal error */
 
-   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
-      png_warning(png_ptr, "Unknown compression type in iCCP chunk");
+   profile_len = png_get_uint_32(profile);
 
-   if (profile == NULL)
-      profile_len = 0;
+   if (profile_len < 132)
+      png_error(png_ptr, "ICC profile too short");
 
-   if (profile_len > 3)
-      embedded_profile_len =
-          ((*( (png_const_bytep)profile    ))<<24) |
-          ((*( (png_const_bytep)profile + 1))<<16) |
-          ((*( (png_const_bytep)profile + 2))<< 8) |
-          ((*( (png_const_bytep)profile + 3))    );
+   temp = (png_uint_32) (*(profile+8));
+   if (temp > 3 && (profile_len & 0x03))
+      png_error(png_ptr, "ICC profile length invalid (not a multiple of 4)");
 
-   if (embedded_profile_len < 0)
    {
-      png_warning(png_ptr,
-          "Embedded profile length in iCCP chunk is negative");
-      return;
-   }
+      png_uint_32 embedded_profile_len = png_get_uint_32(profile);
 
-   if (profile_len < embedded_profile_len)
-   {
-      png_warning(png_ptr,
-          "Embedded profile length too large in iCCP chunk");
-      return;
+      if (profile_len != embedded_profile_len)
+         png_error(png_ptr, "Profile length does not match profile");
    }
 
-   if (profile_len > embedded_profile_len)
-   {
-      png_warning(png_ptr,
-          "Truncating profile to actual length in iCCP chunk");
+   name_len = png_check_keyword(png_ptr, name, new_name);
 
-      profile_len = embedded_profile_len;
-   }
+   if (name_len == 0)
+      png_error(png_ptr, "iCCP: invalid keyword");
 
-   if (profile_len != 0)
-      profile_len = png_text_compress(png_ptr, profile,
-          (png_size_t)profile_len, PNG_COMPRESSION_TYPE_BASE, &comp);
+   new_name[++name_len] = PNG_COMPRESSION_TYPE_BASE;
 
    /* Make sure we include the NULL after the name and the compression type */
-   png_write_chunk_header(png_ptr, png_iCCP,
-       (png_uint_32)(name_len + profile_len + 2));
+   ++name_len;
 
-   png_write_chunk_data(png_ptr, (png_bytep)name, name_len);
+   png_text_compress_init(&comp, profile, profile_len);
 
-   {
-      png_byte buffer[2];
-      buffer[0] = 0; /* terminate name */
-      buffer[1] = 0xFFU & compression_type;
-      png_write_chunk_data(png_ptr, buffer, 2);
-   }
+   /* Allow for keyword terminator and compression byte */
+   if (png_text_compress(png_ptr, png_iCCP, &comp, name_len) != Z_OK)
+      png_error(png_ptr, png_ptr->zstream.msg);
 
-   if (profile_len != 0)
-   {
-      png_write_compressed_data_out(png_ptr, &comp, profile_len);
-   }
+   png_write_chunk_header(png_ptr, png_iCCP, name_len + comp.output_len);
+
+   png_write_chunk_data(png_ptr, new_name, name_len);
+
+   png_write_compressed_data_out(png_ptr, &comp);
 
    png_write_chunk_end(png_ptr);
 }
@@ -1176,9 +1170,10 @@ png_write_iCCP(png_structp png_ptr, png_const_charp name, int compression_type,
 #ifdef PNG_WRITE_sPLT_SUPPORTED
 /* Write a sPLT chunk */
 void /* PRIVATE */
-png_write_sPLT(png_structp png_ptr, png_const_sPLT_tp spalette)
+png_write_sPLT(png_structrp png_ptr, png_const_sPLT_tp spalette)
 {
-   png_size_t name_len;
+   png_uint_32 name_len;
+   png_byte new_name[80];
    png_byte entrybuf[10];
    png_size_t entry_size = (spalette->depth == 8 ? 6 : 10);
    png_size_t palette_size = entry_size * spalette->nentries;
@@ -1189,13 +1184,16 @@ png_write_sPLT(png_structp png_ptr, png_const_sPLT_tp spalette)
 
    png_debug(1, "in png_write_sPLT");
 
-   name_len = png_strlen(spalette->name);
+   name_len = png_check_keyword(png_ptr, spalette->name, new_name);
+
+   if (name_len == 0)
+      png_error(png_ptr, "sPLT: invalid keyword");
 
    /* Make sure we include the NULL after the name */
    png_write_chunk_header(png_ptr, png_sPLT,
        (png_uint_32)(name_len + 2 + palette_size));
 
-   png_write_chunk_data(png_ptr, (png_bytep)spalette->name,
+   png_write_chunk_data(png_ptr, (png_bytep)new_name,
        (png_size_t)(name_len + 1));
 
    png_write_chunk_data(png_ptr, &spalette->depth, (png_size_t)1);
@@ -1222,7 +1220,7 @@ png_write_sPLT(png_structp png_ptr, png_const_sPLT_tp spalette)
          png_save_uint_16(entrybuf + 8, ep->frequency);
       }
 
-      png_write_chunk_data(png_ptr, entrybuf, (png_size_t)entry_size);
+      png_write_chunk_data(png_ptr, entrybuf, entry_size);
    }
 #else
    ep=spalette->entries;
@@ -1246,7 +1244,7 @@ png_write_sPLT(png_structp png_ptr, png_const_sPLT_tp spalette)
          png_save_uint_16(entrybuf + 8, ep[i].frequency);
       }
 
-      png_write_chunk_data(png_ptr, entrybuf, (png_size_t)entry_size);
+      png_write_chunk_data(png_ptr, entrybuf, entry_size);
    }
 #endif
 
@@ -1257,7 +1255,7 @@ png_write_sPLT(png_structp png_ptr, png_const_sPLT_tp spalette)
 #ifdef PNG_WRITE_sBIT_SUPPORTED
 /* Write the sBIT chunk */
 void /* PRIVATE */
-png_write_sBIT(png_structp png_ptr, png_const_color_8p sbit, int color_type)
+png_write_sBIT(png_structrp png_ptr, png_const_color_8p sbit, int color_type)
 {
    png_byte buf[4];
    png_size_t size;
@@ -1265,7 +1263,7 @@ png_write_sBIT(png_structp png_ptr, png_const_color_8p sbit, int color_type)
    png_debug(1, "in png_write_sBIT");
 
    /* Make sure we don't depend upon the order of PNG_COLOR_8 */
-   if (color_type & PNG_COLOR_MASK_COLOR)
+   if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
    {
       png_byte maxbits;
 
@@ -1298,7 +1296,7 @@ png_write_sBIT(png_structp png_ptr, png_const_color_8p sbit, int color_type)
       size = 1;
    }
 
-   if (color_type & PNG_COLOR_MASK_ALPHA)
+   if ((color_type & PNG_COLOR_MASK_ALPHA) != 0)
    {
       if (sbit->alpha == 0 || sbit->alpha > png_ptr->usr_bit_depth)
       {
@@ -1316,42 +1314,33 @@ png_write_sBIT(png_structp png_ptr, png_const_color_8p sbit, int color_type)
 #ifdef PNG_WRITE_cHRM_SUPPORTED
 /* Write the cHRM chunk */
 void /* PRIVATE */
-png_write_cHRM_fixed(png_structp png_ptr, png_fixed_point white_x,
-    png_fixed_point white_y, png_fixed_point red_x, png_fixed_point red_y,
-    png_fixed_point green_x, png_fixed_point green_y, png_fixed_point blue_x,
-    png_fixed_point blue_y)
+png_write_cHRM_fixed(png_structrp png_ptr, const png_xy *xy)
 {
    png_byte buf[32];
 
    png_debug(1, "in png_write_cHRM");
 
    /* Each value is saved in 1/100,000ths */
-#ifdef PNG_CHECK_cHRM_SUPPORTED
-   if (png_check_cHRM_fixed(png_ptr, white_x, white_y, red_x, red_y,
-       green_x, green_y, blue_x, blue_y))
-#endif
-   {
-      png_save_uint_32(buf, (png_uint_32)white_x);
-      png_save_uint_32(buf + 4, (png_uint_32)white_y);
+   png_save_int_32(buf,      xy->whitex);
+   png_save_int_32(buf +  4, xy->whitey);
 
-      png_save_uint_32(buf + 8, (png_uint_32)red_x);
-      png_save_uint_32(buf + 12, (png_uint_32)red_y);
+   png_save_int_32(buf +  8, xy->redx);
+   png_save_int_32(buf + 12, xy->redy);
 
-      png_save_uint_32(buf + 16, (png_uint_32)green_x);
-      png_save_uint_32(buf + 20, (png_uint_32)green_y);
+   png_save_int_32(buf + 16, xy->greenx);
+   png_save_int_32(buf + 20, xy->greeny);
 
-      png_save_uint_32(buf + 24, (png_uint_32)blue_x);
-      png_save_uint_32(buf + 28, (png_uint_32)blue_y);
+   png_save_int_32(buf + 24, xy->bluex);
+   png_save_int_32(buf + 28, xy->bluey);
 
-      png_write_complete_chunk(png_ptr, png_cHRM, buf, (png_size_t)32);
-   }
+   png_write_complete_chunk(png_ptr, png_cHRM, buf, 32);
 }
 #endif
 
 #ifdef PNG_WRITE_tRNS_SUPPORTED
 /* Write the tRNS chunk */
 void /* PRIVATE */
-png_write_tRNS(png_structp png_ptr, png_const_bytep trans_alpha,
+png_write_tRNS(png_structrp png_ptr, png_const_bytep trans_alpha,
     png_const_color_16p tran, int num_trans, int color_type)
 {
    png_byte buf[6];
@@ -1362,7 +1351,8 @@ png_write_tRNS(png_structp png_ptr, png_const_bytep trans_alpha,
    {
       if (num_trans <= 0 || num_trans > (int)png_ptr->num_palette)
       {
-         png_warning(png_ptr, "Invalid number of transparent colors specified");
+         png_app_warning(png_ptr,
+             "Invalid number of transparent colors specified");
          return;
       }
 
@@ -1373,10 +1363,10 @@ png_write_tRNS(png_structp png_ptr, png_const_bytep trans_alpha,
 
    else if (color_type == PNG_COLOR_TYPE_GRAY)
    {
-      /* One 16 bit value */
+      /* One 16-bit value */
       if (tran->gray >= (1 << png_ptr->bit_depth))
       {
-         png_warning(png_ptr,
+         png_app_warning(png_ptr,
              "Ignoring attempt to write tRNS chunk out-of-range for bit_depth");
 
          return;
@@ -1388,17 +1378,17 @@ png_write_tRNS(png_structp png_ptr, png_const_bytep trans_alpha,
 
    else if (color_type == PNG_COLOR_TYPE_RGB)
    {
-      /* Three 16 bit values */
+      /* Three 16-bit values */
       png_save_uint_16(buf, tran->red);
       png_save_uint_16(buf + 2, tran->green);
       png_save_uint_16(buf + 4, tran->blue);
 #ifdef PNG_WRITE_16BIT_SUPPORTED
-      if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]))
+      if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]) != 0)
 #else
-      if (buf[0] | buf[2] | buf[4])
+      if ((buf[0] | buf[2] | buf[4]) != 0)
 #endif
       {
-         png_warning(png_ptr,
+         png_app_warning(png_ptr,
            "Ignoring attempt to write 16-bit tRNS chunk when bit_depth is 8");
          return;
       }
@@ -1408,7 +1398,7 @@ png_write_tRNS(png_structp png_ptr, png_const_bytep trans_alpha,
 
    else
    {
-      png_warning(png_ptr, "Can't write tRNS with an alpha channel");
+      png_app_warning(png_ptr, "Can't write tRNS with an alpha channel");
    }
 }
 #endif
@@ -1416,7 +1406,7 @@ png_write_tRNS(png_structp png_ptr, png_const_bytep trans_alpha,
 #ifdef PNG_WRITE_bKGD_SUPPORTED
 /* Write the background chunk */
 void /* PRIVATE */
-png_write_bKGD(png_structp png_ptr, png_const_color_16p back, int color_type)
+png_write_bKGD(png_structrp png_ptr, png_const_color_16p back, int color_type)
 {
    png_byte buf[6];
 
@@ -1426,8 +1416,8 @@ png_write_bKGD(png_structp png_ptr, png_const_color_16p back, int color_type)
    {
       if (
 #ifdef PNG_MNG_FEATURES_SUPPORTED
-          (png_ptr->num_palette ||
-          (!(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE))) &&
+          (png_ptr->num_palette != 0 ||
+          (png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) == 0) &&
 #endif
          back->index >= png_ptr->num_palette)
       {
@@ -1439,15 +1429,15 @@ png_write_bKGD(png_structp png_ptr, png_const_color_16p back, int color_type)
       png_write_complete_chunk(png_ptr, png_bKGD, buf, (png_size_t)1);
    }
 
-   else if (color_type & PNG_COLOR_MASK_COLOR)
+   else if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
    {
       png_save_uint_16(buf, back->red);
       png_save_uint_16(buf + 2, back->green);
       png_save_uint_16(buf + 4, back->blue);
 #ifdef PNG_WRITE_16BIT_SUPPORTED
-      if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]))
+      if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]) != 0)
 #else
-      if (buf[0] | buf[2] | buf[4])
+      if ((buf[0] | buf[2] | buf[4]) != 0)
 #endif
       {
          png_warning(png_ptr,
@@ -1478,7 +1468,7 @@ png_write_bKGD(png_structp png_ptr, png_const_color_16p back, int color_type)
 #ifdef PNG_WRITE_hIST_SUPPORTED
 /* Write the histogram */
 void /* PRIVATE */
-png_write_hIST(png_structp png_ptr, png_const_uint_16p hist, int num_hist)
+png_write_hIST(png_structrp png_ptr, png_const_uint_16p hist, int num_hist)
 {
    int i;
    png_byte buf[3];
@@ -1509,36 +1499,41 @@ png_write_hIST(png_structp png_ptr, png_const_uint_16p hist, int num_hist)
 #ifdef PNG_WRITE_tEXt_SUPPORTED
 /* Write a tEXt chunk */
 void /* PRIVATE */
-png_write_tEXt(png_structp png_ptr, png_const_charp key, png_const_charp text,
+png_write_tEXt(png_structrp png_ptr, png_const_charp key, png_const_charp text,
     png_size_t text_len)
 {
-   png_size_t key_len;
+   png_uint_32 key_len;
+   png_byte new_key[80];
 
    png_debug(1, "in png_write_tEXt");
 
-   key_len = strlen(key);
+   key_len = png_check_keyword(png_ptr, key, new_key);
+
+   if (key_len == 0)
+      png_error(png_ptr, "tEXt: invalid keyword");
 
    if (text == NULL || *text == '\0')
       text_len = 0;
 
    else
-      text_len = png_strlen(text);
+      text_len = strlen(text);
+
+   if (text_len > PNG_UINT_31_MAX - (key_len+1))
+      png_error(png_ptr, "tEXt: text too long");
 
    /* Make sure we include the 0 after the key */
    png_write_chunk_header(png_ptr, png_tEXt,
-       (png_uint_32)(key_len + text_len + 1));
+       (png_uint_32)/*checked above*/(key_len + text_len + 1));
    /*
     * We leave it to the application to meet PNG-1.0 requirements on the
     * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of
     * any non-Latin-1 characters except for NEWLINE.  ISO PNG will forbid them.
     * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.
     */
-   png_write_chunk_data(png_ptr, (png_bytep)key,
-       (png_size_t)(key_len + 1));
+   png_write_chunk_data(png_ptr, new_key, key_len + 1);
 
    if (text_len != 0)
-      png_write_chunk_data(png_ptr, (png_const_bytep)text,
-          (png_size_t)text_len);
+      png_write_chunk_data(png_ptr, (png_const_bytep)text, text_len);
 
    png_write_chunk_end(png_ptr);
 }
@@ -1547,50 +1542,48 @@ png_write_tEXt(png_structp png_ptr, png_const_charp key, png_const_charp text,
 #ifdef PNG_WRITE_zTXt_SUPPORTED
 /* Write a compressed text chunk */
 void /* PRIVATE */
-png_write_zTXt(png_structp png_ptr, png_const_charp key, png_const_charp text,
-    png_size_t text_len, int compression)
+png_write_zTXt(png_structrp png_ptr, png_const_charp key, png_const_charp text,
+    int compression)
 {
-   png_size_t key_len;
-   png_byte buf;
+   png_uint_32 key_len;
+   png_byte new_key[81];
    compression_state comp;
 
    png_debug(1, "in png_write_zTXt");
 
-   comp.num_output_ptr = 0;
-   comp.max_output_ptr = 0;
-   comp.output_ptr = NULL;
-   comp.input = NULL;
-   comp.input_len = 0;
-
-   key_len = strlen(key);
-
-   if (text == NULL || *text == '\0' || compression==PNG_TEXT_COMPRESSION_NONE)
+   if (compression == PNG_TEXT_COMPRESSION_NONE)
    {
-      png_write_tEXt(png_ptr, key, text, (png_size_t)0);
+      png_write_tEXt(png_ptr, key, text, 0);
       return;
    }
 
-   text_len = png_strlen(text);
+   if (compression != PNG_TEXT_COMPRESSION_zTXt)
+      png_error(png_ptr, "zTXt: invalid compression type");
+
+   key_len = png_check_keyword(png_ptr, key, new_key);
+
+   if (key_len == 0)
+      png_error(png_ptr, "zTXt: invalid keyword");
+
+   /* Add the compression method and 1 for the keyword separator. */
+   new_key[++key_len] = PNG_COMPRESSION_TYPE_BASE;
+   ++key_len;
 
    /* Compute the compressed data; do it now for the length */
-   text_len = png_text_compress(png_ptr, text, text_len, compression,
-       &comp);
+   png_text_compress_init(&comp, (png_const_bytep)text,
+      text == NULL ? 0 : strlen(text));
+
+   if (png_text_compress(png_ptr, png_zTXt, &comp, key_len) != Z_OK)
+      png_error(png_ptr, png_ptr->zstream.msg);
 
    /* Write start of chunk */
-   png_write_chunk_header(png_ptr, png_zTXt,
-       (png_uint_32)(key_len+text_len + 2));
+   png_write_chunk_header(png_ptr, png_zTXt, key_len + comp.output_len);
 
    /* Write key */
-   png_write_chunk_data(png_ptr, (png_bytep)key,
-       (png_size_t)(key_len + 1));
-
-   buf = (png_byte)compression;
-
-   /* Write compression */
-   png_write_chunk_data(png_ptr, &buf, (png_size_t)1);
+   png_write_chunk_data(png_ptr, new_key, key_len);
 
    /* Write the compressed data */
-   png_write_compressed_data_out(png_ptr, &comp, text_len);
+   png_write_compressed_data_out(png_ptr, &comp);
 
    /* Close the chunk */
    png_write_chunk_end(png_ptr);
@@ -1600,84 +1593,98 @@ png_write_zTXt(png_structp png_ptr, png_const_charp key, png_const_charp text,
 #ifdef PNG_WRITE_iTXt_SUPPORTED
 /* Write an iTXt chunk */
 void /* PRIVATE */
-png_write_iTXt(png_structp png_ptr, int compression, png_const_charp key,
+png_write_iTXt(png_structrp png_ptr, int compression, png_const_charp key,
     png_const_charp lang, png_const_charp lang_key, png_const_charp text)
 {
-   png_size_t lang_len, key_len, lang_key_len, text_len;
-   png_byte cbuf[2];
+   png_uint_32 key_len, prefix_len;
+   png_size_t lang_len, lang_key_len;
+   png_byte new_key[82];
    compression_state comp;
 
    png_debug(1, "in png_write_iTXt");
 
-   comp.num_output_ptr = 0;
-   comp.max_output_ptr = 0;
-   comp.output_ptr = NULL;
-   comp.input = NULL;
-
-   key_len = png_strlen(key);
+   key_len = png_check_keyword(png_ptr, key, new_key);
 
-   if (lang == NULL)
-      lang_len = 0;
+   if (key_len == 0)
+      png_error(png_ptr, "iTXt: invalid keyword");
 
-   else
-      lang_len = png_strlen(lang);
+   /* Set the compression flag */
+   switch (compression)
+   {
+      case PNG_ITXT_COMPRESSION_NONE:
+      case PNG_TEXT_COMPRESSION_NONE:
+         compression = new_key[++key_len] = 0; /* no compression */
+         break;
 
-   if (lang_key == NULL)
-      lang_key_len = 0;
+      case PNG_TEXT_COMPRESSION_zTXt:
+      case PNG_ITXT_COMPRESSION_zTXt:
+         compression = new_key[++key_len] = 1; /* compressed */
+         break;
 
-   else
-      lang_key_len = png_strlen(lang_key);
+      default:
+         png_error(png_ptr, "iTXt: invalid compression");
+   }
 
-   if (text == NULL)
-      text_len = 0;
+   new_key[++key_len] = PNG_COMPRESSION_TYPE_BASE;
+   ++key_len; /* for the keywod separator */
 
+   /* We leave it to the application to meet PNG-1.0 requirements on the
+    * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of
+    * any non-Latin-1 characters except for NEWLINE.  ISO PNG, however,
+    * specifies that the text is UTF-8 and this really doesn't require any
+    * checking.
+    *
+    * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.
+    *
+    * TODO: validate the language tag correctly (see the spec.)
+    */
+   if (lang == NULL) lang = ""; /* empty language is valid */
+   lang_len = strlen(lang)+1;
+   if (lang_key == NULL) lang_key = ""; /* may be empty */
+   lang_key_len = strlen(lang_key)+1;
+   if (text == NULL) text = ""; /* may be empty */
+
+   prefix_len = key_len;
+   if (lang_len > PNG_UINT_31_MAX-prefix_len)
+      prefix_len = PNG_UINT_31_MAX;
    else
-      text_len = png_strlen(text);
-
-   /* Compute the compressed data; do it now for the length */
-   text_len = png_text_compress(png_ptr, text, text_len, compression - 2,
-       &comp);
+      prefix_len = (png_uint_32)(prefix_len + lang_len);
 
+   if (lang_key_len > PNG_UINT_31_MAX-prefix_len)
+      prefix_len = PNG_UINT_31_MAX;
+   else
+      prefix_len = (png_uint_32)(prefix_len + lang_key_len);
 
-   /* Make sure we include the compression flag, the compression byte,
-    * and the NULs after the key, lang, and lang_key parts
-    */
+   png_text_compress_init(&comp, (png_const_bytep)text, strlen(text));
 
-   png_write_chunk_header(png_ptr, png_iTXt, (png_uint_32)(
-        5 /* comp byte, comp flag, terminators for key, lang and lang_key */
-        + key_len
-        + lang_len
-        + lang_key_len
-        + text_len));
+   if (compression != 0)
+   {
+      if (png_text_compress(png_ptr, png_iTXt, &comp, prefix_len) != Z_OK)
+         png_error(png_ptr, png_ptr->zstream.msg);
+   }
 
-   /* We leave it to the application to meet PNG-1.0 requirements on the
-    * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of
-    * any non-Latin-1 characters except for NEWLINE.  ISO PNG will forbid them.
-    * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.
-    */
-   png_write_chunk_data(png_ptr, (png_bytep)key, (png_size_t)(key_len + 1));
+   else
+   {
+      if (comp.input_len > PNG_UINT_31_MAX-prefix_len)
+         png_error(png_ptr, "iTXt: uncompressed text too long");
 
-   /* Set the compression flag */
-   if (compression == PNG_ITXT_COMPRESSION_NONE ||
-       compression == PNG_TEXT_COMPRESSION_NONE)
-      cbuf[0] = 0;
+      /* So the string will fit in a chunk: */
+      comp.output_len = (png_uint_32)/*SAFE*/comp.input_len;
+   }
 
-   else /* compression == PNG_ITXT_COMPRESSION_zTXt */
-      cbuf[0] = 1;
+   png_write_chunk_header(png_ptr, png_iTXt, comp.output_len + prefix_len);
 
-   /* Set the compression method */
-   cbuf[1] = 0;
+   png_write_chunk_data(png_ptr, new_key, key_len);
 
-   png_write_chunk_data(png_ptr, cbuf, (png_size_t)2);
+   png_write_chunk_data(png_ptr, (png_const_bytep)lang, lang_len);
 
-   cbuf[0] = 0;
-   png_write_chunk_data(png_ptr, (lang ? (png_const_bytep)lang : cbuf),
-       (png_size_t)(lang_len + 1));
+   png_write_chunk_data(png_ptr, (png_const_bytep)lang_key, lang_key_len);
 
-   png_write_chunk_data(png_ptr, (lang_key ? (png_const_bytep)lang_key : cbuf),
-       (png_size_t)(lang_key_len + 1));
+   if (compression != 0)
+      png_write_compressed_data_out(png_ptr, &comp);
 
-   png_write_compressed_data_out(png_ptr, &comp, text_len);
+   else
+      png_write_chunk_data(png_ptr, (png_const_bytep)text, comp.output_len);
 
    png_write_chunk_end(png_ptr);
 }
@@ -1686,7 +1693,7 @@ png_write_iTXt(png_structp png_ptr, int compression, png_const_charp key,
 #ifdef PNG_WRITE_oFFs_SUPPORTED
 /* Write the oFFs chunk */
 void /* PRIVATE */
-png_write_oFFs(png_structp png_ptr, png_int_32 x_offset, png_int_32 y_offset,
+png_write_oFFs(png_structrp png_ptr, png_int_32 x_offset, png_int_32 y_offset,
     int unit_type)
 {
    png_byte buf[9];
@@ -1706,35 +1713,43 @@ png_write_oFFs(png_structp png_ptr, png_int_32 x_offset, png_int_32 y_offset,
 #ifdef PNG_WRITE_pCAL_SUPPORTED
 /* Write the pCAL chunk (described in the PNG extensions document) */
 void /* PRIVATE */
-png_write_pCAL(png_structp png_ptr, png_charp purpose, png_int_32 X0,
+png_write_pCAL(png_structrp png_ptr, png_charp purpose, png_int_32 X0,
     png_int_32 X1, int type, int nparams, png_const_charp units,
     png_charpp params)
 {
-   png_size_t purpose_len, units_len, total_len;
+   png_uint_32 purpose_len;
+   png_size_t units_len, total_len;
    png_size_tp params_len;
    png_byte buf[10];
+   png_byte new_purpose[80];
    int i;
 
    png_debug1(1, "in png_write_pCAL (%d parameters)", nparams);
 
    if (type >= PNG_EQUATION_LAST)
-      png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
+      png_error(png_ptr, "Unrecognized equation type for pCAL chunk");
+
+   purpose_len = png_check_keyword(png_ptr, purpose, new_purpose);
+
+   if (purpose_len == 0)
+      png_error(png_ptr, "pCAL: invalid keyword");
+
+   ++purpose_len; /* terminator */
 
-   purpose_len = strlen(purpose) + 1;
    png_debug1(3, "pCAL purpose length = %d", (int)purpose_len);
-   units_len = png_strlen(units) + (nparams == 0 ? 0 : 1);
+   units_len = strlen(units) + (nparams == 0 ? 0 : 1);
    png_debug1(3, "pCAL units length = %d", (int)units_len);
    total_len = purpose_len + units_len + 10;
 
    params_len = (png_size_tp)png_malloc(png_ptr,
-       (png_alloc_size_t)(nparams * png_sizeof(png_size_t)));
+       (png_alloc_size_t)(nparams * (sizeof (png_size_t))));
 
    /* Find the length of each parameter, making sure we don't count the
     * null terminator for the last parameter.
     */
    for (i = 0; i < nparams; i++)
    {
-      params_len[i] = png_strlen(params[i]) + (i == nparams - 1 ? 0 : 1);
+      params_len[i] = strlen(params[i]) + (i == nparams - 1 ? 0 : 1);
       png_debug2(3, "pCAL parameter %d length = %lu", i,
           (unsigned long)params_len[i]);
       total_len += params_len[i];
@@ -1742,7 +1757,7 @@ png_write_pCAL(png_structp png_ptr, png_charp purpose, png_int_32 X0,
 
    png_debug1(3, "pCAL total length = %d", (int)total_len);
    png_write_chunk_header(png_ptr, png_pCAL, (png_uint_32)total_len);
-   png_write_chunk_data(png_ptr, (png_const_bytep)purpose, purpose_len);
+   png_write_chunk_data(png_ptr, new_purpose, purpose_len);
    png_save_int_32(buf, X0);
    png_save_int_32(buf + 4, X1);
    buf[8] = (png_byte)type;
@@ -1763,7 +1778,7 @@ png_write_pCAL(png_structp png_ptr, png_charp purpose, png_int_32 X0,
 #ifdef PNG_WRITE_sCAL_SUPPORTED
 /* Write the sCAL chunk */
 void /* PRIVATE */
-png_write_sCAL_s(png_structp png_ptr, int unit, png_const_charp width,
+png_write_sCAL_s(png_structrp png_ptr, int unit, png_const_charp width,
     png_const_charp height)
 {
    png_byte buf[64];
@@ -1771,8 +1786,8 @@ png_write_sCAL_s(png_structp png_ptr, int unit, png_const_charp width,
 
    png_debug(1, "in png_write_sCAL_s");
 
-   wlen = png_strlen(width);
-   hlen = png_strlen(height);
+   wlen = strlen(width);
+   hlen = strlen(height);
    total_len = wlen + hlen + 2;
 
    if (total_len > 64)
@@ -1782,8 +1797,8 @@ png_write_sCAL_s(png_structp png_ptr, int unit, png_const_charp width,
    }
 
    buf[0] = (png_byte)unit;
-   png_memcpy(buf + 1, width, wlen + 1);      /* Append the '\0' here */
-   png_memcpy(buf + wlen + 2, height, hlen);  /* Do NOT append the '\0' here */
+   memcpy(buf + 1, width, wlen + 1);      /* Append the '\0' here */
+   memcpy(buf + wlen + 2, height, hlen);  /* Do NOT append the '\0' here */
 
    png_debug1(3, "sCAL total length = %u", (unsigned int)total_len);
    png_write_complete_chunk(png_ptr, png_sCAL, buf, total_len);
@@ -1793,7 +1808,7 @@ png_write_sCAL_s(png_structp png_ptr, int unit, png_const_charp width,
 #ifdef PNG_WRITE_pHYs_SUPPORTED
 /* Write the pHYs chunk */
 void /* PRIVATE */
-png_write_pHYs(png_structp png_ptr, png_uint_32 x_pixels_per_unit,
+png_write_pHYs(png_structrp png_ptr, png_uint_32 x_pixels_per_unit,
     png_uint_32 y_pixels_per_unit,
     int unit_type)
 {
@@ -1817,7 +1832,7 @@ png_write_pHYs(png_structp png_ptr, png_uint_32 x_pixels_per_unit,
  * or png_convert_from_time_t(), or fill in the structure yourself.
  */
 void /* PRIVATE */
-png_write_tIME(png_structp png_ptr, png_const_timep mod_time)
+png_write_tIME(png_structrp png_ptr, png_const_timep mod_time)
 {
    png_byte buf[7];
 
@@ -1844,7 +1859,7 @@ png_write_tIME(png_structp png_ptr, png_const_timep mod_time)
 
 /* Initializes the row writing capability of libpng */
 void /* PRIVATE */
-png_write_start_row(png_structp png_ptr)
+png_write_start_row(png_structrp png_ptr)
 {
 #ifdef PNG_WRITE_INTERLACING_SUPPORTED
    /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
@@ -1865,6 +1880,10 @@ png_write_start_row(png_structp png_ptr)
    png_alloc_size_t buf_size;
    int usr_pixel_depth;
 
+#ifdef PNG_WRITE_FILTER_SUPPORTED
+   png_byte filters;
+#endif
+
    png_debug(1, "in png_write_start_row");
 
    usr_pixel_depth = png_ptr->usr_channels * png_ptr->usr_bit_depth;
@@ -1875,56 +1894,61 @@ png_write_start_row(png_structp png_ptr)
    png_ptr->maximum_pixel_depth = (png_byte)usr_pixel_depth;
 
    /* Set up row buffer */
-   png_ptr->row_buf = (png_bytep)png_malloc(png_ptr, buf_size);
+   png_ptr->row_buf = png_voidcast(png_bytep, png_malloc(png_ptr, buf_size));
 
    png_ptr->row_buf[0] = PNG_FILTER_VALUE_NONE;
 
 #ifdef PNG_WRITE_FILTER_SUPPORTED
-   /* Set up filtering buffer, if using this filter */
-   if (png_ptr->do_filter & PNG_FILTER_SUB)
-   {
-      png_ptr->sub_row = (png_bytep)png_malloc(png_ptr, png_ptr->rowbytes + 1);
+   filters = png_ptr->do_filter;
 
-      png_ptr->sub_row[0] = PNG_FILTER_VALUE_SUB;
-   }
+   if (png_ptr->height == 1)
+      filters &= 0xff & ~(PNG_FILTER_UP|PNG_FILTER_AVG|PNG_FILTER_PAETH);
 
-   /* We only need to keep the previous row if we are using one of these. */
-   if (png_ptr->do_filter & (PNG_FILTER_AVG | PNG_FILTER_UP | PNG_FILTER_PAETH))
+   if (png_ptr->width == 1)
+      filters &= 0xff & ~(PNG_FILTER_SUB|PNG_FILTER_AVG|PNG_FILTER_PAETH);
+
+   if (filters == 0)
+      filters = PNG_FILTER_NONE;
+
+   png_ptr->do_filter = filters;
+
+   if (((filters & (PNG_FILTER_SUB | PNG_FILTER_UP | PNG_FILTER_AVG |
+       PNG_FILTER_PAETH)) != 0) && png_ptr->try_row == NULL)
    {
-      /* Set up previous row buffer */
-      png_ptr->prev_row = (png_bytep)png_calloc(png_ptr, buf_size);
+      int num_filters = 0;
 
-      if (png_ptr->do_filter & PNG_FILTER_UP)
-      {
-         png_ptr->up_row = (png_bytep)png_malloc(png_ptr,
-            png_ptr->rowbytes + 1);
+      png_ptr->try_row = png_voidcast(png_bytep, png_malloc(png_ptr, buf_size));
 
-         png_ptr->up_row[0] = PNG_FILTER_VALUE_UP;
-      }
+      if (filters & PNG_FILTER_SUB)
+         num_filters++;
 
-      if (png_ptr->do_filter & PNG_FILTER_AVG)
-      {
-         png_ptr->avg_row = (png_bytep)png_malloc(png_ptr,
-             png_ptr->rowbytes + 1);
+      if (filters & PNG_FILTER_UP)
+         num_filters++;
 
-         png_ptr->avg_row[0] = PNG_FILTER_VALUE_AVG;
-      }
+      if (filters & PNG_FILTER_AVG)
+         num_filters++;
 
-      if (png_ptr->do_filter & PNG_FILTER_PAETH)
-      {
-         png_ptr->paeth_row = (png_bytep)png_malloc(png_ptr,
-             png_ptr->rowbytes + 1);
+      if (filters & PNG_FILTER_PAETH)
+         num_filters++;
 
-         png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH;
-      }
+      if (num_filters > 1)
+         png_ptr->tst_row = png_voidcast(png_bytep, png_malloc(png_ptr,
+             buf_size));
    }
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
+
+   /* We only need to keep the previous row if we are using one of the following
+    * filters.
+    */
+   if ((filters & (PNG_FILTER_AVG | PNG_FILTER_UP | PNG_FILTER_PAETH)) != 0)
+      png_ptr->prev_row = png_voidcast(png_bytep,
+         png_calloc(png_ptr, buf_size));
+#endif /* WRITE_FILTER */
 
 #ifdef PNG_WRITE_INTERLACING_SUPPORTED
    /* If interlaced, we need to set up width and height of pass */
-   if (png_ptr->interlaced)
+   if (png_ptr->interlaced != 0)
    {
-      if (!(png_ptr->transformations & PNG_INTERLACE))
+      if ((png_ptr->transformations & PNG_INTERLACE) == 0)
       {
          png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
              png_pass_ystart[0]) / png_pass_yinc[0];
@@ -1946,15 +1970,11 @@ png_write_start_row(png_structp png_ptr)
       png_ptr->num_rows = png_ptr->height;
       png_ptr->usr_width = png_ptr->width;
    }
-
-   png_zlib_claim(png_ptr, PNG_ZLIB_FOR_IDAT);
-   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-   png_ptr->zstream.next_out = png_ptr->zbuf;
 }
 
 /* Internal use only.  Called when finished processing a row of data. */
 void /* PRIVATE */
-png_write_finish_row(png_structp png_ptr)
+png_write_finish_row(png_structrp png_ptr)
 {
 #ifdef PNG_WRITE_INTERLACING_SUPPORTED
    /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
@@ -1972,8 +1992,6 @@ png_write_finish_row(png_structp png_ptr)
    static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
 #endif
 
-   int ret;
-
    png_debug(1, "in png_write_finish_row");
 
    /* Next row */
@@ -1985,10 +2003,10 @@ png_write_finish_row(png_structp png_ptr)
 
 #ifdef PNG_WRITE_INTERLACING_SUPPORTED
    /* If interlaced, go to next pass */
-   if (png_ptr->interlaced)
+   if (png_ptr->interlaced != 0)
    {
       png_ptr->row_number = 0;
-      if (png_ptr->transformations & PNG_INTERLACE)
+      if ((png_ptr->transformations & PNG_INTERLACE) != 0)
       {
          png_ptr->pass++;
       }
@@ -2013,7 +2031,7 @@ png_write_finish_row(png_structp png_ptr)
                 png_pass_ystart[png_ptr->pass]) /
                 png_pass_yinc[png_ptr->pass];
 
-            if (png_ptr->transformations & PNG_INTERLACE)
+            if ((png_ptr->transformations & PNG_INTERLACE) != 0)
                break;
 
          } while (png_ptr->usr_width == 0 || png_ptr->num_rows == 0);
@@ -2024,7 +2042,7 @@ png_write_finish_row(png_structp png_ptr)
       if (png_ptr->pass < 7)
       {
          if (png_ptr->prev_row != NULL)
-            png_memset(png_ptr->prev_row, 0,
+            memset(png_ptr->prev_row, 0,
                 (png_size_t)(PNG_ROWBYTES(png_ptr->usr_channels*
                 png_ptr->usr_bit_depth, png_ptr->width)) + 1);
 
@@ -2035,42 +2053,7 @@ png_write_finish_row(png_structp png_ptr)
 
    /* If we get here, we've just written the last row, so we need
       to flush the compressor */
-   do
-   {
-      /* Tell the compressor we are done */
-      ret = deflate(&png_ptr->zstream, Z_FINISH);
-
-      /* Check for an error */
-      if (ret == Z_OK)
-      {
-         /* Check to see if we need more room */
-         if (!(png_ptr->zstream.avail_out))
-         {
-            png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
-            png_ptr->zstream.next_out = png_ptr->zbuf;
-            png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-         }
-      }
-
-      else if (ret != Z_STREAM_END)
-      {
-         if (png_ptr->zstream.msg != NULL)
-            png_error(png_ptr, png_ptr->zstream.msg);
-
-         else
-            png_error(png_ptr, "zlib error");
-      }
-   } while (ret != Z_STREAM_END);
-
-   /* Write any extra space */
-   if (png_ptr->zstream.avail_out < png_ptr->zbuf_size)
-   {
-      png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size -
-          png_ptr->zstream.avail_out);
-   }
-
-   png_zlib_release(png_ptr);
-   png_ptr->zstream.data_type = Z_BINARY;
+   png_compress_IDAT(png_ptr, NULL, 0, Z_FINISH);
 }
 
 #ifdef PNG_WRITE_INTERLACING_SUPPORTED
@@ -2104,7 +2087,7 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)
          {
             png_bytep sp;
             png_bytep dp;
-            int shift;
+            unsigned int shift;
             int d;
             int value;
             png_uint_32 i;
@@ -2142,7 +2125,7 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)
          {
             png_bytep sp;
             png_bytep dp;
-            int shift;
+            unsigned int shift;
             int d;
             int value;
             png_uint_32 i;
@@ -2179,7 +2162,7 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)
          {
             png_bytep sp;
             png_bytep dp;
-            int shift;
+            unsigned int shift;
             int d;
             int value;
             png_uint_32 i;
@@ -2234,7 +2217,7 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)
 
                /* Move the pixel */
                if (dp != sp)
-                  png_memcpy(dp, sp, pixel_bytes);
+                  memcpy(dp, sp, pixel_bytes);
 
                /* Next pixel */
                dp += pixel_bytes;
@@ -2254,25 +2237,171 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)
 }
 #endif
 
+
 /* This filters the row, chooses which filter to use, if it has not already
  * been specified by the application, and then writes the row out with the
  * chosen filter.
  */
-static void png_write_filtered_row(png_structp png_ptr, png_bytep filtered_row,
+static void /* PRIVATE */
+png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row,
    png_size_t row_bytes);
 
-#define PNG_MAXSUM (((png_uint_32)(-1)) >> 1)
-#define PNG_HISHIFT 10
-#define PNG_LOMASK ((png_uint_32)0xffffL)
-#define PNG_HIMASK ((png_uint_32)(~PNG_LOMASK >> PNG_HISHIFT))
+#ifdef PNG_WRITE_FILTER_SUPPORTED
+static png_size_t /* PRIVATE */
+png_setup_sub_row(png_structrp png_ptr, const png_uint_32 bpp,
+    const png_size_t row_bytes, const png_size_t lmins)
+{
+   png_bytep rp, dp, lp;
+   png_size_t i;
+   png_size_t sum = 0;
+   int v;
+
+   png_ptr->try_row[0] = PNG_FILTER_VALUE_SUB;
+
+   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1; i < bpp;
+        i++, rp++, dp++)
+   {
+      v = *dp = *rp;
+      sum += (v < 128) ? v : 256 - v;
+   }
+
+   for (lp = png_ptr->row_buf + 1; i < row_bytes;
+      i++, rp++, lp++, dp++)
+   {
+      v = *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
+      sum += (v < 128) ? v : 256 - v;
+
+      if (sum > lmins)  /* We are already worse, don't continue. */
+        break;
+   }
+
+   return (sum);
+}
+
+static png_size_t /* PRIVATE */
+png_setup_up_row(png_structrp png_ptr, const png_size_t row_bytes,
+    const png_size_t lmins)
+{
+   png_bytep rp, dp, pp;
+   png_size_t i;
+   png_size_t sum = 0;
+   int v;
+
+   png_ptr->try_row[0] = PNG_FILTER_VALUE_UP;
+
+   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1,
+       pp = png_ptr->prev_row + 1; i < row_bytes;
+       i++, rp++, pp++, dp++)
+   {
+      v = *dp = (png_byte)(((int)*rp - (int)*pp) & 0xff);
+      sum += (v < 128) ? v : 256 - v;
+
+      if (sum > lmins)  /* We are already worse, don't continue. */
+        break;
+   }
+
+   return (sum);
+}
+
+static png_size_t /* PRIVATE */
+png_setup_avg_row(png_structrp png_ptr, const png_uint_32 bpp,
+      const png_size_t row_bytes, const png_size_t lmins)
+{
+   png_bytep rp, dp, pp, lp;
+   png_uint_32 i;
+   png_size_t sum = 0;
+   int v;
+
+   png_ptr->try_row[0] = PNG_FILTER_VALUE_AVG;
+
+   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1,
+        pp = png_ptr->prev_row + 1; i < bpp; i++)
+   {
+      v = *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
+
+      sum += (v < 128) ? v : 256 - v;
+   }
+
+   for (lp = png_ptr->row_buf + 1; i < row_bytes; i++)
+   {
+      v = *dp++ = (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2))
+          & 0xff);
+
+      sum += (v < 128) ? v : 256 - v;
+
+      if (sum > lmins)  /* We are already worse, don't continue. */
+        break;
+   }
+
+   return (sum);
+}
+
+static png_size_t /* PRIVATE */
+png_setup_paeth_row(png_structrp png_ptr, const png_uint_32 bpp,
+    const png_size_t row_bytes, const png_size_t lmins)
+{
+   png_bytep rp, dp, pp, cp, lp;
+   png_size_t i;
+   png_size_t sum = 0;
+   int v;
+
+   png_ptr->try_row[0] = PNG_FILTER_VALUE_PAETH;
+
+   for (i = 0, rp = png_ptr->row_buf + 1, dp = png_ptr->try_row + 1,
+       pp = png_ptr->prev_row + 1; i < bpp; i++)
+   {
+      v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
+
+      sum += (v < 128) ? v : 256 - v;
+   }
+
+   for (lp = png_ptr->row_buf + 1, cp = png_ptr->prev_row + 1; i < row_bytes;
+        i++)
+   {
+      int a, b, c, pa, pb, pc, p;
+
+      b = *pp++;
+      c = *cp++;
+      a = *lp++;
+
+      p = b - c;
+      pc = a - c;
+
+#ifdef PNG_USE_ABS
+      pa = abs(p);
+      pb = abs(pc);
+      pc = abs(p + pc);
+#else
+      pa = p < 0 ? -p : p;
+      pb = pc < 0 ? -pc : pc;
+      pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
+
+      p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
+
+      v = *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
+
+      sum += (v < 128) ? v : 256 - v;
+
+      if (sum > lmins)  /* We are already worse, don't continue. */
+        break;
+   }
+
+   return (sum);
+}
+#endif /* WRITE_FILTER */
+
 void /* PRIVATE */
-png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
+png_write_find_filter(png_structrp png_ptr, png_row_infop row_info)
 {
-   png_bytep best_row;
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-   png_bytep prev_row, row_buf;
-   png_uint_32 mins, bpp;
+#ifndef PNG_WRITE_FILTER_SUPPORTED
+   png_write_filtered_row(png_ptr, png_ptr->row_buf, row_info->rowbytes+1);
+#else
    png_byte filter_to_do = png_ptr->do_filter;
+   png_bytep row_buf;
+   png_bytep best_row;
+   png_uint_32 bpp;
+   png_size_t mins;
    png_size_t row_bytes = row_info->rowbytes;
 
    png_debug(1, "in png_write_find_filter");
@@ -2280,12 +2409,9 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
    /* Find out how many bytes offset each pixel is */
    bpp = (row_info->pixel_depth + 7) >> 3;
 
-   prev_row = png_ptr->prev_row;
-#endif
-   best_row = png_ptr->row_buf;
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-   row_buf = best_row;
-   mins = PNG_MAXSUM;
+   row_buf = png_ptr->row_buf;
+   mins = PNG_SIZE_MAX - 256/* so we can detect potential overflow of the
+                               running sum */;
 
    /* The prediction method we use is to find which method provides the
     * smallest value when summing the absolute values of the distances
@@ -2315,17 +2441,35 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
    /* We don't need to test the 'no filter' case if this is the only filter
     * that has been chosen, as it doesn't actually do anything to the data.
     */
-   if ((filter_to_do & PNG_FILTER_NONE) && filter_to_do != PNG_FILTER_NONE)
+   best_row = png_ptr->row_buf;
+
+
+   if ((filter_to_do & PNG_FILTER_NONE) != 0 && filter_to_do != PNG_FILTER_NONE)
    {
       png_bytep rp;
-      png_uint_32 sum = 0;
+      png_size_t sum = 0;
       png_size_t i;
       int v;
 
-      for (i = 0, rp = row_buf + 1; i < row_bytes; i++, rp++)
+      if (PNG_SIZE_MAX/128 <= row_bytes)
+      {
+         for (i = 0, rp = row_buf + 1; i < row_bytes; i++, rp++)
+         {
+            /* Check for overflow */
+            if (sum > PNG_SIZE_MAX/128 - 256)
+               break;
+
+            v = *rp;
+            sum += (v < 128) ? v : 256 - v;
+         }
+      }
+      else /* Overflow is not possible */
       {
-         v = *rp;
-         sum += (v < 128) ? v : 256 - v;
+         for (i = 0, rp = row_buf + 1; i < row_bytes; i++, rp++)
+         {
+            v = *rp;
+            sum += (v < 128) ? v : 256 - v;
+         }
       }
 
       mins = sum;
@@ -2335,325 +2479,125 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
    if (filter_to_do == PNG_FILTER_SUB)
    /* It's the only filter so no testing is needed */
    {
-      png_bytep rp, lp, dp;
-      png_size_t i;
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->sub_row + 1; i < bpp;
-           i++, rp++, dp++)
-      {
-         *dp = *rp;
-      }
-
-      for (lp = row_buf + 1; i < row_bytes;
-         i++, rp++, lp++, dp++)
-      {
-         *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
-      }
-
-      best_row = png_ptr->sub_row;
+      (void) png_setup_sub_row(png_ptr, bpp, row_bytes, mins);
+      best_row = png_ptr->try_row;
    }
 
-   else if (filter_to_do & PNG_FILTER_SUB)
+   else if ((filter_to_do & PNG_FILTER_SUB) != 0)
    {
-      png_bytep rp, dp, lp;
-      png_uint_32 sum = 0, lmins = mins;
-      png_size_t i;
-      int v;
+      png_size_t sum;
+      png_size_t lmins = mins;
 
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->sub_row + 1; i < bpp;
-           i++, rp++, dp++)
-      {
-         v = *dp = *rp;
-
-         sum += (v < 128) ? v : 256 - v;
-      }
-
-      for (lp = row_buf + 1; i < row_bytes;
-         i++, rp++, lp++, dp++)
-      {
-         v = *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
-
-         sum += (v < 128) ? v : 256 - v;
-
-         if (sum > lmins)  /* We are already worse, don't continue. */
-            break;
-      }
+      sum = png_setup_sub_row(png_ptr, bpp, row_bytes, lmins);
 
       if (sum < mins)
       {
          mins = sum;
-         best_row = png_ptr->sub_row;
+         best_row = png_ptr->try_row;
+         if (png_ptr->tst_row != NULL)
+         {
+            png_ptr->try_row = png_ptr->tst_row;
+            png_ptr->tst_row = best_row;
+         }
       }
    }
 
    /* Up filter */
    if (filter_to_do == PNG_FILTER_UP)
    {
-      png_bytep rp, dp, pp;
-      png_size_t i;
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->up_row + 1,
-          pp = prev_row + 1; i < row_bytes;
-          i++, rp++, pp++, dp++)
-      {
-         *dp = (png_byte)(((int)*rp - (int)*pp) & 0xff);
-      }
-
-      best_row = png_ptr->up_row;
+      (void) png_setup_up_row(png_ptr, row_bytes, mins);
+      best_row = png_ptr->try_row;
    }
 
-   else if (filter_to_do & PNG_FILTER_UP)
+   else if ((filter_to_do & PNG_FILTER_UP) != 0)
    {
-      png_bytep rp, dp, pp;
-      png_uint_32 sum = 0, lmins = mins;
-      png_size_t i;
-      int v;
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->up_row + 1,
-          pp = prev_row + 1; i < row_bytes; i++)
-      {
-         v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
-
-         sum += (v < 128) ? v : 256 - v;
+      png_size_t sum;
+      png_size_t lmins = mins;
 
-         if (sum > lmins)  /* We are already worse, don't continue. */
-            break;
-      }
+      sum = png_setup_up_row(png_ptr, row_bytes, lmins);
 
       if (sum < mins)
       {
          mins = sum;
-         best_row = png_ptr->up_row;
+         best_row = png_ptr->try_row;
+         if (png_ptr->tst_row != NULL)
+         {
+            png_ptr->try_row = png_ptr->tst_row;
+            png_ptr->tst_row = best_row;
+         }
       }
    }
 
    /* Avg filter */
    if (filter_to_do == PNG_FILTER_AVG)
    {
-      png_bytep rp, dp, pp, lp;
-      png_uint_32 i;
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->avg_row + 1,
-           pp = prev_row + 1; i < bpp; i++)
-      {
-         *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
-      }
-
-      for (lp = row_buf + 1; i < row_bytes; i++)
-      {
-         *dp++ = (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2))
-                 & 0xff);
-      }
-      best_row = png_ptr->avg_row;
+      (void) png_setup_avg_row(png_ptr, bpp, row_bytes, mins);
+      best_row = png_ptr->try_row;
    }
 
-   else if (filter_to_do & PNG_FILTER_AVG)
+   else if ((filter_to_do & PNG_FILTER_AVG) != 0)
    {
-      png_bytep rp, dp, pp, lp;
-      png_uint_32 sum = 0, lmins = mins;
-      png_size_t i;
-      int v;
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->avg_row + 1,
-           pp = prev_row + 1; i < bpp; i++)
-      {
-         v = *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
+      png_size_t sum;
+      png_size_t lmins = mins;
 
-         sum += (v < 128) ? v : 256 - v;
-      }
-
-      for (lp = row_buf + 1; i < row_bytes; i++)
-      {
-         v = *dp++ =
-             (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2)) & 0xff);
-
-         sum += (v < 128) ? v : 256 - v;
-
-         if (sum > lmins)  /* We are already worse, don't continue. */
-            break;
-      }
+      sum= png_setup_avg_row(png_ptr, bpp, row_bytes, lmins);
 
       if (sum < mins)
       {
          mins = sum;
-         best_row = png_ptr->avg_row;
+         best_row = png_ptr->try_row;
+         if (png_ptr->tst_row != NULL)
+         {
+            png_ptr->try_row = png_ptr->tst_row;
+            png_ptr->tst_row = best_row;
+         }
       }
    }
 
    /* Paeth filter */
-   if (filter_to_do == PNG_FILTER_PAETH)
+   if ((filter_to_do == PNG_FILTER_PAETH) != 0)
    {
-      png_bytep rp, dp, pp, cp, lp;
-      png_size_t i;
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->paeth_row + 1,
-          pp = prev_row + 1; i < bpp; i++)
-      {
-         *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
-      }
-
-      for (lp = row_buf + 1, cp = prev_row + 1; i < row_bytes; i++)
-      {
-         int a, b, c, pa, pb, pc, p;
-
-         b = *pp++;
-         c = *cp++;
-         a = *lp++;
-
-         p = b - c;
-         pc = a - c;
-
-#ifdef PNG_USE_ABS
-         pa = abs(p);
-         pb = abs(pc);
-         pc = abs(p + pc);
-#else
-         pa = p < 0 ? -p : p;
-         pb = pc < 0 ? -pc : pc;
-         pc = (p + pc) < 0 ? -(p + pc) : p + pc;
-#endif
-
-         p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
-
-         *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
-      }
-      best_row = png_ptr->paeth_row;
+      (void) png_setup_paeth_row(png_ptr, bpp, row_bytes, mins);
+      best_row = png_ptr->try_row;
    }
 
-   else if (filter_to_do & PNG_FILTER_PAETH)
+   else if ((filter_to_do & PNG_FILTER_PAETH) != 0)
    {
-      png_bytep rp, dp, pp, cp, lp;
-      png_uint_32 sum = 0, lmins = mins;
-      png_size_t i;
-      int v;
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->paeth_row + 1,
-          pp = prev_row + 1; i < bpp; i++)
-      {
-         v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
-
-         sum += (v < 128) ? v : 256 - v;
-      }
-
-      for (lp = row_buf + 1, cp = prev_row + 1; i < row_bytes; i++)
-      {
-         int a, b, c, pa, pb, pc, p;
+      png_size_t sum;
+      png_size_t lmins = mins;
 
-         b = *pp++;
-         c = *cp++;
-         a = *lp++;
-
-#ifndef PNG_SLOW_PAETH
-         p = b - c;
-         pc = a - c;
-#ifdef PNG_USE_ABS
-         pa = abs(p);
-         pb = abs(pc);
-         pc = abs(p + pc);
-#else
-         pa = p < 0 ? -p : p;
-         pb = pc < 0 ? -pc : pc;
-         pc = (p + pc) < 0 ? -(p + pc) : p + pc;
-#endif
-         p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
-#else /* PNG_SLOW_PAETH */
-         p = a + b - c;
-         pa = abs(p - a);
-         pb = abs(p - b);
-         pc = abs(p - c);
-
-         if (pa <= pb && pa <= pc)
-            p = a;
-
-         else if (pb <= pc)
-            p = b;
-
-         else
-            p = c;
-#endif /* PNG_SLOW_PAETH */
-
-         v = *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
-
-         sum += (v < 128) ? v : 256 - v;
-
-         if (sum > lmins)  /* We are already worse, don't continue. */
-            break;
-      }
+      sum = png_setup_paeth_row(png_ptr, bpp, row_bytes, lmins);
 
       if (sum < mins)
       {
-         best_row = png_ptr->paeth_row;
+         best_row = png_ptr->try_row;
+         if (png_ptr->tst_row != NULL)
+         {
+            png_ptr->try_row = png_ptr->tst_row;
+            png_ptr->tst_row = best_row;
+         }
       }
    }
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
 
    /* Do the actual writing of the filtered row data from the chosen filter. */
    png_write_filtered_row(png_ptr, best_row, row_info->rowbytes+1);
+
+#endif /* WRITE_FILTER */
 }
 
+
 /* Do the actual writing of a previously filtered row. */
 static void
-png_write_filtered_row(png_structp png_ptr, png_bytep filtered_row,
-   png_size_t avail/*includes filter byte*/)
+png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row,
+   png_size_t full_row_length/*includes filter byte*/)
 {
    png_debug(1, "in png_write_filtered_row");
 
    png_debug1(2, "filter = %d", filtered_row[0]);
-   /* Set up the zlib input buffer */
-
-   png_ptr->zstream.next_in = filtered_row;
-   png_ptr->zstream.avail_in = 0;
-   /* Repeat until we have compressed all the data */
-   do
-   {
-      int ret; /* Return of zlib */
-
-      /* Record the number of bytes available - zlib supports at least 65535
-       * bytes at one step, depending on the size of the zlib type 'uInt', the
-       * maximum size zlib can write at once is ZLIB_IO_MAX (from pngpriv.h).
-       * Use this because on 16 bit systems 'rowbytes' can be up to 65536 (i.e.
-       * one more than 16 bits) and, in this case 'rowbytes+1' can overflow a
-       * uInt.  ZLIB_IO_MAX can be safely reduced to cause zlib to be called
-       * with smaller chunks of data.
-       */
-      if (png_ptr->zstream.avail_in == 0)
-      {
-         if (avail > ZLIB_IO_MAX)
-         {
-            png_ptr->zstream.avail_in  = ZLIB_IO_MAX;
-            avail -= ZLIB_IO_MAX;
-         }
-
-         else
-         {
-            /* So this will fit in the available uInt space: */
-            png_ptr->zstream.avail_in = (uInt)avail;
-            avail = 0;
-         }
-      }
-
-      /* Compress the data */
-      ret = deflate(&png_ptr->zstream, Z_NO_FLUSH);
 
-      /* Check for compression errors */
-      if (ret != Z_OK)
-      {
-         if (png_ptr->zstream.msg != NULL)
-            png_error(png_ptr, png_ptr->zstream.msg);
-
-         else
-            png_error(png_ptr, "zlib error");
-      }
-
-      /* See if it is time to write another IDAT */
-      if (!(png_ptr->zstream.avail_out))
-      {
-         /* Write the IDAT and reset the zlib output buffer */
-         png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
-      }
-   /* Repeat until all data has been compressed */
-   } while (avail > 0 || png_ptr->zstream.avail_in > 0);
+   png_compress_IDAT(png_ptr, filtered_row, full_row_length, Z_NO_FLUSH);
 
+#ifdef PNG_WRITE_FILTER_SUPPORTED
    /* Swap the current and previous rows */
    if (png_ptr->prev_row != NULL)
    {
@@ -2663,6 +2607,7 @@ png_write_filtered_row(png_structp png_ptr, png_bytep filtered_row,
       png_ptr->prev_row = png_ptr->row_buf;
       png_ptr->row_buf = tptr;
    }
+#endif /* WRITE_FILTER */
 
    /* Finish row - updates counters and flushes zlib if last row */
    png_write_finish_row(png_ptr);
@@ -2675,6 +2620,6 @@ png_write_filtered_row(png_structp png_ptr, png_bytep filtered_row,
    {
       png_write_flush(png_ptr);
    }
-#endif
+#endif /* WRITE_FLUSH */
 }
-#endif /* PNG_WRITE_SUPPORTED */
+#endif /* WRITE */
diff --git a/drivers/png/resource_saver_png.cpp b/drivers/png/resource_saver_png.cpp
index b91329c8da..2578fe9eb6 100644
--- a/drivers/png/resource_saver_png.cpp
+++ b/drivers/png/resource_saver_png.cpp
@@ -133,7 +133,6 @@ Error ResourceSaverPNG::save_image(const String &p_path, Image &p_img) {
 	}
 
 	int pngf=0;
-	int pngb=8;
 	int cs=0;
 
 
diff --git a/drivers/speex/Makefile.am b/drivers/speex/Makefile.am
deleted file mode 100644
index 3d4e03f9a6..0000000000
--- a/drivers/speex/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-# Disable automatic dependency tracking if using other tools than gcc and gmake
-#AUTOMAKE_OPTIONS = no-dependencies
-
-
-EXTRA_DIST=echo_diagnostic.m
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
-
-lib_LTLIBRARIES = libspeex.la libspeexdsp.la
-
-# Sources for compilation in the library
-libspeex_la_SOURCES = 	cb_search.c 	exc_10_32_table.c 	exc_8_128_table.c \
-		filters.c 	gain_table.c 	hexc_table.c 	high_lsp_tables.c 	lsp.c \
-		ltp.c 	speex.c 	stereo.c 	vbr.c 	vq.c bits.c exc_10_16_table.c \
-	exc_20_32_table.c exc_5_256_table.c exc_5_64_table.c gain_table_lbr.c hexc_10_32_table.c \
-	lpc.c lsp_tables_nb.c modes.c modes_wb.c nb_celp.c quant_lsp.c sb_celp.c \
-	speex_callbacks.c speex_header.c window.c
-
-if BUILD_KISS_FFT
-  FFTSRC=kiss_fft.c _kiss_fft_guts.h kiss_fft.h kiss_fftr.c kiss_fftr.h 
-else
-if BUILD_SMALLFT
-  FFTSRC=smallft.c
-else
-  FFTSRC=
-endif
-endif
-
-libspeexdsp_la_SOURCES = preprocess.c jitter.c mdf.c fftwrap.c filterbank.c resample.c buffer.c scal.c $(FFTSRC)
-
-noinst_HEADERS = 	arch.h 	cb_search_arm4.h 	cb_search_bfin.h 	cb_search_sse.h \
-		filters.h 	filters_arm4.h 	filters_bfin.h 	filters_sse.h 	fixed_arm4.h \
-		fixed_arm5e.h 	fixed_bfin.h 	fixed_debug.h 	lpc.h 	lpc_bfin.h 	ltp.h 	ltp_arm4.h \
-		ltp_sse.h 	math_approx.h 		misc_bfin.h 	nb_celp.h 	quant_lsp.h 	sb_celp.h \
-		stack_alloc.h 	vbr.h 	vq.h 	vq_arm4.h 	vq_bfin.h 	vq_sse.h cb_search.h fftwrap.h \
-	filterbank.h fixed_generic.h lsp.h lsp_bfin.h ltp_bfin.h modes.h os_support.h \
-	pseudofloat.h quant_lsp_bfin.h smallft.h vorbis_psy.h resample_sse.h
-
-
-libspeex_la_LDFLAGS = -no-undefined -version-info @SPEEX_LT_CURRENT@:@SPEEX_LT_REVISION@:@SPEEX_LT_AGE@
-libspeexdsp_la_LDFLAGS = -no-undefined -version-info @SPEEX_LT_CURRENT@:@SPEEX_LT_REVISION@:@SPEEX_LT_AGE@
-
-noinst_PROGRAMS = testenc testenc_wb testenc_uwb testdenoise testecho testjitter
-testenc_SOURCES = testenc.c
-testenc_LDADD = libspeex.la
-testenc_wb_SOURCES = testenc_wb.c
-testenc_wb_LDADD = libspeex.la 
-testenc_uwb_SOURCES = testenc_uwb.c
-testenc_uwb_LDADD = libspeex.la
-testdenoise_SOURCES = testdenoise.c
-testdenoise_LDADD = libspeexdsp.la @FFT_LIBS@
-testecho_SOURCES = testecho.c
-testecho_LDADD = libspeexdsp.la @FFT_LIBS@
-testjitter_SOURCES = testjitter.c
-testjitter_LDADD = libspeexdsp.la @FFT_LIBS@
diff --git a/drivers/speex/Makefile.in b/drivers/speex/Makefile.in
deleted file mode 100644
index a1044a58d8..0000000000
--- a/drivers/speex/Makefile.in
+++ /dev/null
@@ -1,667 +0,0 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Disable automatic dependency tracking if using other tools than gcc and gmake
-#AUTOMAKE_OPTIONS = no-dependencies
-
-
-
-SOURCES = $(libspeex_la_SOURCES) $(libspeexdsp_la_SOURCES) $(testdenoise_SOURCES) $(testecho_SOURCES) $(testenc_SOURCES) $(testenc_uwb_SOURCES) $(testenc_wb_SOURCES) $(testjitter_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_triplet = @host@
-noinst_PROGRAMS = testenc$(EXEEXT) testenc_wb$(EXEEXT) \
-	testenc_uwb$(EXEEXT) testdenoise$(EXEEXT) testecho$(EXEEXT) \
-	testjitter$(EXEEXT)
-subdir = libspeex
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(mkdir_p)
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(libdir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libspeex_la_LIBADD =
-am_libspeex_la_OBJECTS = cb_search.lo exc_10_32_table.lo \
-	exc_8_128_table.lo filters.lo gain_table.lo hexc_table.lo \
-	high_lsp_tables.lo lsp.lo ltp.lo speex.lo stereo.lo vbr.lo \
-	vq.lo bits.lo exc_10_16_table.lo exc_20_32_table.lo \
-	exc_5_256_table.lo exc_5_64_table.lo gain_table_lbr.lo \
-	hexc_10_32_table.lo lpc.lo lsp_tables_nb.lo modes.lo \
-	modes_wb.lo nb_celp.lo quant_lsp.lo sb_celp.lo \
-	speex_callbacks.lo speex_header.lo window.lo
-libspeex_la_OBJECTS = $(am_libspeex_la_OBJECTS)
-libspeexdsp_la_LIBADD =
-am__libspeexdsp_la_SOURCES_DIST = preprocess.c jitter.c mdf.c \
-	fftwrap.c filterbank.c resample.c buffer.c scal.c smallft.c \
-	kiss_fft.c _kiss_fft_guts.h kiss_fft.h kiss_fftr.c kiss_fftr.h
-@BUILD_KISS_FFT_FALSE@@BUILD_SMALLFT_TRUE@am__objects_1 = smallft.lo
-@BUILD_KISS_FFT_TRUE@am__objects_1 = kiss_fft.lo kiss_fftr.lo
-am_libspeexdsp_la_OBJECTS = preprocess.lo jitter.lo mdf.lo fftwrap.lo \
-	filterbank.lo resample.lo buffer.lo scal.lo $(am__objects_1)
-libspeexdsp_la_OBJECTS = $(am_libspeexdsp_la_OBJECTS)
-PROGRAMS = $(noinst_PROGRAMS)
-am_testdenoise_OBJECTS = testdenoise.$(OBJEXT)
-testdenoise_OBJECTS = $(am_testdenoise_OBJECTS)
-testdenoise_DEPENDENCIES = libspeexdsp.la
-am_testecho_OBJECTS = testecho.$(OBJEXT)
-testecho_OBJECTS = $(am_testecho_OBJECTS)
-testecho_DEPENDENCIES = libspeexdsp.la
-am_testenc_OBJECTS = testenc.$(OBJEXT)
-testenc_OBJECTS = $(am_testenc_OBJECTS)
-testenc_DEPENDENCIES = libspeex.la
-am_testenc_uwb_OBJECTS = testenc_uwb.$(OBJEXT)
-testenc_uwb_OBJECTS = $(am_testenc_uwb_OBJECTS)
-testenc_uwb_DEPENDENCIES = libspeex.la
-am_testenc_wb_OBJECTS = testenc_wb.$(OBJEXT)
-testenc_wb_OBJECTS = $(am_testenc_wb_OBJECTS)
-testenc_wb_DEPENDENCIES = libspeex.la
-am_testjitter_OBJECTS = testjitter.$(OBJEXT)
-testjitter_OBJECTS = $(am_testjitter_OBJECTS)
-testjitter_DEPENDENCIES = libspeexdsp.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bits.Plo ./$(DEPDIR)/buffer.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/cb_search.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/exc_10_16_table.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/exc_10_32_table.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/exc_20_32_table.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/exc_5_256_table.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/exc_5_64_table.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/exc_8_128_table.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/fftwrap.Plo ./$(DEPDIR)/filterbank.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/filters.Plo ./$(DEPDIR)/gain_table.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/gain_table_lbr.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/hexc_10_32_table.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/hexc_table.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/high_lsp_tables.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/jitter.Plo ./$(DEPDIR)/kiss_fft.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/kiss_fftr.Plo ./$(DEPDIR)/lpc.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/lsp.Plo ./$(DEPDIR)/lsp_tables_nb.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/ltp.Plo ./$(DEPDIR)/mdf.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/modes.Plo ./$(DEPDIR)/modes_wb.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/nb_celp.Plo ./$(DEPDIR)/preprocess.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/quant_lsp.Plo ./$(DEPDIR)/resample.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/sb_celp.Plo ./$(DEPDIR)/scal.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/smallft.Plo ./$(DEPDIR)/speex.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/speex_callbacks.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/speex_header.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/stereo.Plo ./$(DEPDIR)/testdenoise.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/testecho.Po ./$(DEPDIR)/testenc.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/testenc_uwb.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/testenc_wb.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/testjitter.Po ./$(DEPDIR)/vbr.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/vq.Plo ./$(DEPDIR)/window.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libspeex_la_SOURCES) $(libspeexdsp_la_SOURCES) \
-	$(testdenoise_SOURCES) $(testecho_SOURCES) $(testenc_SOURCES) \
-	$(testenc_uwb_SOURCES) $(testenc_wb_SOURCES) \
-	$(testjitter_SOURCES)
-DIST_SOURCES = $(libspeex_la_SOURCES) \
-	$(am__libspeexdsp_la_SOURCES_DIST) $(testdenoise_SOURCES) \
-	$(testecho_SOURCES) $(testenc_SOURCES) $(testenc_uwb_SOURCES) \
-	$(testenc_wb_SOURCES) $(testjitter_SOURCES)
-HEADERS = $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_KISS_FFT_FALSE = @BUILD_KISS_FFT_FALSE@
-BUILD_KISS_FFT_TRUE = @BUILD_KISS_FFT_TRUE@
-BUILD_SMALLFT_FALSE = @BUILD_SMALLFT_FALSE@
-BUILD_SMALLFT_TRUE = @BUILD_SMALLFT_TRUE@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FFT_CFLAGS = @FFT_CFLAGS@
-FFT_LIBS = @FFT_LIBS@
-FFT_PKGCONFIG = @FFT_PKGCONFIG@
-GREP = @GREP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OGG_CFLAGS = @OGG_CFLAGS@
-OGG_LIBS = @OGG_LIBS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SIZE16 = @SIZE16@
-SIZE32 = @SIZE32@
-SPEEX_LT_AGE = @SPEEX_LT_AGE@
-SPEEX_LT_CURRENT = @SPEEX_LT_CURRENT@
-SPEEX_LT_REVISION = @SPEEX_LT_REVISION@
-SPEEX_VERSION = @SPEEX_VERSION@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-src = @src@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-EXTRA_DIST = echo_diagnostic.m
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
-lib_LTLIBRARIES = libspeex.la libspeexdsp.la
-
-# Sources for compilation in the library
-libspeex_la_SOURCES = cb_search.c 	exc_10_32_table.c 	exc_8_128_table.c \
-		filters.c 	gain_table.c 	hexc_table.c 	high_lsp_tables.c 	lsp.c \
-		ltp.c 	speex.c 	stereo.c 	vbr.c 	vq.c bits.c exc_10_16_table.c \
-	exc_20_32_table.c exc_5_256_table.c exc_5_64_table.c gain_table_lbr.c hexc_10_32_table.c \
-	lpc.c lsp_tables_nb.c modes.c modes_wb.c nb_celp.c quant_lsp.c sb_celp.c \
-	speex_callbacks.c speex_header.c window.c
-
-@BUILD_KISS_FFT_FALSE@@BUILD_SMALLFT_FALSE@FFTSRC = 
-@BUILD_KISS_FFT_FALSE@@BUILD_SMALLFT_TRUE@FFTSRC = smallft.c
-@BUILD_KISS_FFT_TRUE@FFTSRC = kiss_fft.c _kiss_fft_guts.h kiss_fft.h kiss_fftr.c kiss_fftr.h 
-libspeexdsp_la_SOURCES = preprocess.c jitter.c mdf.c fftwrap.c filterbank.c resample.c buffer.c scal.c $(FFTSRC)
-noinst_HEADERS = arch.h 	cb_search_arm4.h 	cb_search_bfin.h 	cb_search_sse.h \
-		filters.h 	filters_arm4.h 	filters_bfin.h 	filters_sse.h 	fixed_arm4.h \
-		fixed_arm5e.h 	fixed_bfin.h 	fixed_debug.h 	lpc.h 	lpc_bfin.h 	ltp.h 	ltp_arm4.h \
-		ltp_sse.h 	math_approx.h 		misc_bfin.h 	nb_celp.h 	quant_lsp.h 	sb_celp.h \
-		stack_alloc.h 	vbr.h 	vq.h 	vq_arm4.h 	vq_bfin.h 	vq_sse.h cb_search.h fftwrap.h \
-	filterbank.h fixed_generic.h lsp.h lsp_bfin.h ltp_bfin.h modes.h os_support.h \
-	pseudofloat.h quant_lsp_bfin.h smallft.h vorbis_psy.h resample_sse.h
-
-libspeex_la_LDFLAGS = -no-undefined -version-info @SPEEX_LT_CURRENT@:@SPEEX_LT_REVISION@:@SPEEX_LT_AGE@
-libspeexdsp_la_LDFLAGS = -no-undefined -version-info @SPEEX_LT_CURRENT@:@SPEEX_LT_REVISION@:@SPEEX_LT_AGE@
-testenc_SOURCES = testenc.c
-testenc_LDADD = libspeex.la
-testenc_wb_SOURCES = testenc_wb.c
-testenc_wb_LDADD = libspeex.la 
-testenc_uwb_SOURCES = testenc_uwb.c
-testenc_uwb_LDADD = libspeex.la
-testdenoise_SOURCES = testdenoise.c
-testdenoise_LDADD = libspeexdsp.la @FFT_LIBS@
-testecho_SOURCES = testecho.c
-testecho_LDADD = libspeexdsp.la @FFT_LIBS@
-testjitter_SOURCES = testjitter.c
-testjitter_LDADD = libspeexdsp.la @FFT_LIBS@
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libspeex/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libspeex/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libspeex.la: $(libspeex_la_OBJECTS) $(libspeex_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libspeex_la_LDFLAGS) $(libspeex_la_OBJECTS) $(libspeex_la_LIBADD) $(LIBS)
-libspeexdsp.la: $(libspeexdsp_la_OBJECTS) $(libspeexdsp_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libspeexdsp_la_LDFLAGS) $(libspeexdsp_la_OBJECTS) $(libspeexdsp_la_LIBADD) $(LIBS)
-
-clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-testdenoise$(EXEEXT): $(testdenoise_OBJECTS) $(testdenoise_DEPENDENCIES) 
-	@rm -f testdenoise$(EXEEXT)
-	$(LINK) $(testdenoise_LDFLAGS) $(testdenoise_OBJECTS) $(testdenoise_LDADD) $(LIBS)
-testecho$(EXEEXT): $(testecho_OBJECTS) $(testecho_DEPENDENCIES) 
-	@rm -f testecho$(EXEEXT)
-	$(LINK) $(testecho_LDFLAGS) $(testecho_OBJECTS) $(testecho_LDADD) $(LIBS)
-testenc$(EXEEXT): $(testenc_OBJECTS) $(testenc_DEPENDENCIES) 
-	@rm -f testenc$(EXEEXT)
-	$(LINK) $(testenc_LDFLAGS) $(testenc_OBJECTS) $(testenc_LDADD) $(LIBS)
-testenc_uwb$(EXEEXT): $(testenc_uwb_OBJECTS) $(testenc_uwb_DEPENDENCIES) 
-	@rm -f testenc_uwb$(EXEEXT)
-	$(LINK) $(testenc_uwb_LDFLAGS) $(testenc_uwb_OBJECTS) $(testenc_uwb_LDADD) $(LIBS)
-testenc_wb$(EXEEXT): $(testenc_wb_OBJECTS) $(testenc_wb_DEPENDENCIES) 
-	@rm -f testenc_wb$(EXEEXT)
-	$(LINK) $(testenc_wb_LDFLAGS) $(testenc_wb_OBJECTS) $(testenc_wb_LDADD) $(LIBS)
-testjitter$(EXEEXT): $(testjitter_OBJECTS) $(testjitter_DEPENDENCIES) 
-	@rm -f testjitter$(EXEEXT)
-	$(LINK) $(testjitter_LDFLAGS) $(testjitter_OBJECTS) $(testjitter_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bits.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cb_search.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exc_10_16_table.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exc_10_32_table.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exc_20_32_table.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exc_5_256_table.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exc_5_64_table.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exc_8_128_table.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fftwrap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filterbank.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filters.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gain_table.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gain_table_lbr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hexc_10_32_table.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hexc_table.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/high_lsp_tables.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jitter.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kiss_fft.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kiss_fftr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lpc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lsp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lsp_tables_nb.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ltp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mdf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modes.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modes_wb.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nb_celp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preprocess.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quant_lsp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resample.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sb_celp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scal.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smallft.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/speex.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/speex_callbacks.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/speex_header.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stereo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testdenoise.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testecho.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testenc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testenc_uwb.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testenc_wb.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testjitter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vbr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vq.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	clean-noinstPROGRAMS mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am: install-libLTLIBRARIES
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS ctags \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-libLTLIBRARIES install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-libLTLIBRARIES
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/drivers/speex/audio_stream_speex.cpp b/drivers/speex/audio_stream_speex.cpp
index 79f3e58ac0..3aa80fd0b9 100644
--- a/drivers/speex/audio_stream_speex.cpp
+++ b/drivers/speex/audio_stream_speex.cpp
@@ -69,8 +69,7 @@ int AudioStreamPlaybackSpeex::mix(int16_t* p_buffer,int p_frames) {
 		return 0;
 	};
 
-	int eos = 0;	
-	bool reloaded=false;
+	int eos = 0;
 
 	while (todo > page_size) {
 
@@ -100,7 +99,6 @@ int AudioStreamPlaybackSpeex::mix(int16_t* p_buffer,int p_frames) {
 				packets_available=true;
 			}
 			/*Extract all available packets*/
-			//int packet_no=0;
 			while (todo > page_size && !eos) {
 
 				if (ogg_stream_packetout(&os, &op)!=1) {
@@ -157,7 +155,6 @@ int AudioStreamPlaybackSpeex::mix(int16_t* p_buffer,int p_frames) {
 
 					{
 
-						int frame_offset = 0;
 						int new_frame_size = frame_size;
 
 						/*printf ("packet %d %d\n", packet_no, skip_samples);*/
@@ -165,7 +162,6 @@ int AudioStreamPlaybackSpeex::mix(int16_t* p_buffer,int p_frames) {
 						{
 							/*printf ("chopping first packet\n");*/
 							new_frame_size -= skip_samples;
-							frame_offset = skip_samples;
 						}
 						if (packet_no == page_nb_packets && skip_samples < 0)
 						{
@@ -241,10 +237,8 @@ void AudioStreamPlaybackSpeex::unload() {
 
 void *AudioStreamPlaybackSpeex::process_header(ogg_packet *op, int *frame_size, int *rate, int *nframes, int *channels, int *extra_headers) {
 
-	void *st;
 	SpeexHeader *header;
 	int modeID;
-	SpeexCallback callback;
 
 	header = speex_packet_to_header((char*)op->packet, op->bytes);
 	if (!header)
@@ -353,7 +347,6 @@ void AudioStreamPlaybackSpeex::reload() {
 		/*Loop for all complete pages we got (most likely only one)*/
 		while (ogg_sync_pageout(&oy, &og)==1) {
 
-			int packet_no;
 			if (stream_init == 0) {
 				ogg_stream_init(&os, ogg_page_serialno(&og));
 				stream_init = 1;
@@ -377,7 +370,6 @@ void AudioStreamPlaybackSpeex::reload() {
 
 			last_granule = page_granule;
 			/*Extract all available packets*/
-			packet_no=0;
 			while (!eos && ogg_stream_packetout(&os, &op)==1)
 			{
 				/*If first packet, process as Speex header*/
diff --git a/drivers/theora/video_stream_theora.cpp b/drivers/theora/video_stream_theora.cpp
index fa2a79dc7b..1f3832ec16 100644
--- a/drivers/theora/video_stream_theora.cpp
+++ b/drivers/theora/video_stream_theora.cpp
@@ -81,12 +81,12 @@ int VideoStreamPlaybackTheora::queue_page(ogg_page *page){
 
 void VideoStreamPlaybackTheora::video_write(void){
 	th_ycbcr_buffer yuv;
-	int y_offset, uv_offset;
 	th_decode_ycbcr_out(td,yuv);
 
+	/*
+	int y_offset, uv_offset;
 	y_offset=(ti.pic_x&~1)+yuv[0].stride*(ti.pic_y&~1);
 
-	/*
 	{
 		int pixels = size.x * size.y;
 		frame_data.resize(pixels * 4);
@@ -117,7 +117,7 @@ void VideoStreamPlaybackTheora::video_write(void){
 		DVector<uint8_t>::Write w = frame_data.write();
 		char* dst = (char*)w.ptr();
 
-		uv_offset=(ti.pic_x/2)+(yuv[1].stride)*(ti.pic_y/2);
+		//uv_offset=(ti.pic_x/2)+(yuv[1].stride)*(ti.pic_y/2);
 
 		if (px_fmt == TH_PF_444) {
 
@@ -543,16 +543,10 @@ void VideoStreamPlaybackTheora::update(float p_delta) {
 	bool frame_done=false;
 	bool audio_done=!vorbis_p;
 
-	bool theora_done=false;
-
 	while (!frame_done || (!audio_done && !vorbis_eos)) {
 		//a frame needs to be produced
 
 		ogg_packet op;
-		bool audio_pending = false;
-
-
-		bool no_vorbis=false;
 		bool no_theora=false;
 
 
@@ -604,8 +598,6 @@ void VideoStreamPlaybackTheora::update(float p_delta) {
 
 				int tr = vorbis_synthesis_read(&vd, ret-to_read);
 
-				audio_pending=true;
-
 
 				if (vd.granulepos>=0) {
 				//	print_line("wrote: "+itos(audio_frames_wrote)+" gpos: "+itos(vd.granulepos));
@@ -627,7 +619,6 @@ void VideoStreamPlaybackTheora::update(float p_delta) {
 					}
 				} else {  /* we need more data; break out to suck in another page */
 					//printf("need moar data\n");
-					no_vorbis=true;
 					break;
 				};
 			}
diff --git a/drivers/unix/dir_access_unix.cpp b/drivers/unix/dir_access_unix.cpp
index f0e4511b1d..b3bea8ac27 100644
--- a/drivers/unix/dir_access_unix.cpp
+++ b/drivers/unix/dir_access_unix.cpp
@@ -67,8 +67,8 @@ bool DirAccessUnix::file_exists(String p_file) {
 
 	if (p_file.is_rel_path())
 		p_file=current_dir.plus_file(p_file);
-	else
-		p_file=fix_path(p_file);
+
+	p_file=fix_path(p_file);
 
 	struct stat flags;
 	bool success = 	(stat(p_file.utf8().get_data(),&flags)==0);
@@ -88,8 +88,8 @@ bool DirAccessUnix::dir_exists(String p_dir) {
 
 	if (p_dir.is_rel_path())
 		p_dir=get_current_dir().plus_file(p_dir);
-	else
-		p_dir=fix_path(p_dir);
+
+	p_dir=fix_path(p_dir);
 
 	struct stat flags;
 	bool success = 	(stat(p_dir.utf8().get_data(),&flags)==0);
@@ -105,8 +105,8 @@ uint64_t DirAccessUnix::get_modified_time(String p_file) {
 
 	if (p_file.is_rel_path())
 		p_file=current_dir.plus_file(p_file);
-	else
-		p_file=fix_path(p_file);
+
+	p_file=fix_path(p_file);
 
 	struct stat flags;
 	bool success = 	(stat(p_file.utf8().get_data(),&flags)==0);
@@ -201,8 +201,11 @@ Error DirAccessUnix::make_dir(String p_dir) {
 
 	if (p_dir.is_rel_path())
 		p_dir=get_current_dir().plus_file(p_dir);
-	else
-		p_dir=fix_path(p_dir);
+
+
+	p_dir=fix_path(p_dir);
+
+
 #if 1
 
 
@@ -245,7 +248,7 @@ Error DirAccessUnix::change_dir(String p_dir) {
 
 	chdir(current_dir.utf8().get_data()); //ascii since this may be unicode or wathever the host os wants
 	bool worked=(chdir(p_dir.utf8().get_data())==0); // we can only give this utf8
-#ifndef IPHONE_ENABLED
+
 	String base = _get_root_path();
 	if (base!="") {
 
@@ -255,7 +258,7 @@ Error DirAccessUnix::change_dir(String p_dir) {
 		if (!new_dir.begins_with(base))
 			worked=false;
 	}
-#endif
+
 	if (worked) {
 
 		getcwd(real_current_dir_name,2048);
@@ -287,13 +290,13 @@ Error DirAccessUnix::rename(String p_path,String p_new_path) {
 
 	if (p_path.is_rel_path())
 		p_path=get_current_dir().plus_file(p_path);
-	else
-		p_path=fix_path(p_path);
+
+	p_path=fix_path(p_path);
 
 	if (p_new_path.is_rel_path())
 		p_new_path=get_current_dir().plus_file(p_new_path);
-	else
-		p_new_path=fix_path(p_new_path);
+
+	p_new_path=fix_path(p_new_path);
 
 	return ::rename(p_path.utf8().get_data(),p_new_path.utf8().get_data())==0?OK:FAILED;
 }
@@ -301,8 +304,8 @@ Error DirAccessUnix::remove(String p_path)  {
 
 	if (p_path.is_rel_path())
 		p_path=get_current_dir().plus_file(p_path);
-	else
-		p_path=fix_path(p_path);
+
+	p_path=fix_path(p_path);
 
 	struct stat flags;
 	if ((stat(p_path.utf8().get_data(),&flags)!=0))
diff --git a/drivers/unix/thread_posix.cpp b/drivers/unix/thread_posix.cpp
index 6ace64a923..c71e09685b 100644
--- a/drivers/unix/thread_posix.cpp
+++ b/drivers/unix/thread_posix.cpp
@@ -27,6 +27,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "thread_posix.h"
+#include "script_language.h"
 
 #if defined(UNIX_ENABLED) || defined(PTHREAD_ENABLED)
 
@@ -50,7 +51,13 @@ void *ThreadPosix::thread_callback(void *userdata) {
 
 	ThreadPosix *t=reinterpret_cast<ThreadPosix*>(userdata);
 	t->id=(ID)pthread_self();
+
+	ScriptServer::thread_enter(); //scripts may need to attach a stack
+
 	t->callback(t->user);
+
+	ScriptServer::thread_exit();
+
 	return NULL;
 }
 
diff --git a/drivers/windows/dir_access_windows.cpp b/drivers/windows/dir_access_windows.cpp
index fa18f7c1f5..90e43d2518 100644
--- a/drivers/windows/dir_access_windows.cpp
+++ b/drivers/windows/dir_access_windows.cpp
@@ -193,8 +193,8 @@ Error DirAccessWindows::make_dir(String p_dir) {
 
 	if (p_dir.is_rel_path())
 		p_dir=get_current_dir().plus_file(p_dir);
-	else
-		p_dir=fix_path(p_dir);
+
+	p_dir=fix_path(p_dir);
 	p_dir = p_dir.replace("/","\\");
 
 	bool success;
@@ -268,8 +268,8 @@ bool DirAccessWindows::dir_exists(String p_dir) {
 
 	if (p_dir.is_rel_path())
 		p_dir=get_current_dir().plus_file(p_dir);
-	else
-		p_dir=fix_path(p_dir);
+
+	p_dir=fix_path(p_dir);
 
 	//p_dir.replace("/","\\");
 
@@ -289,13 +289,13 @@ Error DirAccessWindows::rename(String p_path,String p_new_path) {
 
 	if (p_path.is_rel_path())
 		p_path=get_current_dir().plus_file(p_path);
-	else
-		p_path=fix_path(p_path);
+
+	p_path=fix_path(p_path);
 
 	if (p_new_path.is_rel_path())
 		p_new_path=get_current_dir().plus_file(p_new_path);
-	else
-		p_new_path=fix_path(p_new_path);
+
+	p_new_path=fix_path(p_new_path);
 
 	if (file_exists(p_new_path)) {
 		if (remove(p_new_path) != OK) {
@@ -310,8 +310,8 @@ Error DirAccessWindows::remove(String p_path)  {
 
 	if (p_path.is_rel_path())
 		p_path=get_current_dir().plus_file(p_path);
-	else
-		p_path=fix_path(p_path);
+
+	p_path=fix_path(p_path);
 
 
 	printf("erasing %s\n",p_path.utf8().get_data());
diff --git a/drivers/windows/thread_windows.cpp b/drivers/windows/thread_windows.cpp
index d5e489aab4..884575e81e 100644
--- a/drivers/windows/thread_windows.cpp
+++ b/drivers/windows/thread_windows.cpp
@@ -32,6 +32,7 @@
 
 #include "os/memory.h"
 
+
 Thread::ID ThreadWindows::get_ID() const {
 
 	return id;	
@@ -45,8 +46,14 @@ Thread* ThreadWindows::create_thread_windows() {
 DWORD ThreadWindows::thread_callback( LPVOID userdata ) {
 
 	ThreadWindows *t=reinterpret_cast<ThreadWindows*>(userdata);
-	t->callback(t->user);
+
+	ScriptServer::thread_enter(); //scripts may need to attach a stack
+
 	t->id=(ID)GetCurrentThreadId(); // must implement
+	t->callback(t->user);
+
+	ScriptServer::thread_exit();
+
 	return 0;
 }
 
diff --git a/drivers/windows/thread_windows.h b/drivers/windows/thread_windows.h
index b051bfe370..1c90504dde 100644
--- a/drivers/windows/thread_windows.h
+++ b/drivers/windows/thread_windows.h
@@ -36,6 +36,7 @@
 #ifdef WINDOWS_ENABLED
 
 #include "os/thread.h"
+#include "script_language.h"
 #include <windows.h>
 
 class ThreadWindows : public Thread {
diff --git a/icon.png b/icon.png
index e334f5fa78..7abb58ca7b 100644
--- a/icon.png
+++ b/icon.png
diff --git a/logo.png b/logo.png
index affc21cf84..d6cab7f11b 100644
--- a/logo.png
+++ b/logo.png
diff --git a/main/input_default.cpp b/main/input_default.cpp
index 4fcb450bce..e975d4141f 100644
--- a/main/input_default.cpp
+++ b/main/input_default.cpp
@@ -30,6 +30,7 @@
 #include "servers/visual_server.h"
 #include "os/os.h"
 #include "input_map.h"
+#include "scene/resources/texture.h"
 
 void InputDefault::SpeedTrack::update(const Vector2& p_delta_p) {
 
@@ -463,9 +464,11 @@ void InputDefault::set_custom_mouse_cursor(const RES& p_cursor,const Vector2& p_
 		set_mouse_mode(MOUSE_MODE_VISIBLE);
 		VisualServer::get_singleton()->cursor_set_visible(false);
 	} else {
+		Ref<AtlasTexture> atex = custom_cursor;
+		Rect2 region = atex.is_valid() ? atex->get_region() : Rect2();
 		set_mouse_mode(MOUSE_MODE_HIDDEN);
 		VisualServer::get_singleton()->cursor_set_visible(true);
-		VisualServer::get_singleton()->cursor_set_texture(custom_cursor->get_rid(),p_hotspot);
+		VisualServer::get_singleton()->cursor_set_texture(custom_cursor->get_rid(),p_hotspot, 0, region);
 		VisualServer::get_singleton()->cursor_set_pos(get_mouse_pos());
 	}
 }
diff --git a/main/main.cpp b/main/main.cpp
index de212deefd..adaebab1d4 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -101,7 +101,7 @@ static bool init_fullscreen=false;
 static bool init_use_custom_pos=false;
 static bool debug_collisions=false;
 static bool debug_navigation=false;
-static bool allow_hidpi=true;
+static int frame_delay=0;
 static Vector2 init_custom_pos;
 static int video_driver_idx=-1;
 static int audio_driver_idx=-1;
@@ -262,7 +262,6 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
 	Vector<String> breakpoints;
 	bool use_custom_res=true;
 	bool force_res=false;
-	bool profile=false;
 
 	I=args.front();
 
@@ -490,7 +489,7 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
 
 			if (I->next()) {
 
-				OS::get_singleton()->set_frame_delay(I->next()->get().to_int());
+				frame_delay=I->next()->get().to_int();
 				N=I->next()->next();
 			} else {
 				goto error;
@@ -807,12 +806,19 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
 			OS::get_singleton()->set_screen_orientation(OS::SCREEN_LANDSCAPE);
 	}
 
+
 	OS::get_singleton()->set_iterations_per_second(GLOBAL_DEF("physics/fixed_fps",60));
-	OS::get_singleton()->set_target_fps(GLOBAL_DEF("application/target_fps",0));
+	OS::get_singleton()->set_target_fps(GLOBAL_DEF("debug/force_fps",0));
 
 	if (!OS::get_singleton()->_verbose_stdout) //overrided
 		OS::get_singleton()->_verbose_stdout=GLOBAL_DEF("debug/verbose_stdout",false);
 
+	if (frame_delay==0) {
+		frame_delay=GLOBAL_DEF("application/frame_delay_msec",0);
+	}
+
+	OS::get_singleton()->set_frame_delay(frame_delay);
+
 	message_queue = memnew( MessageQueue );
 
 	Globals::get_singleton()->register_global_defaults();
@@ -916,6 +922,8 @@ Error Main::setup2() {
 		if (boot_logo_path!=String() /*&& FileAccess::exists(boot_logo_path)*/) {
 			print_line("Boot splash path: "+boot_logo_path);
 			Error err = boot_logo.load(boot_logo_path);
+			if (err)
+				ERR_PRINTS("Non-existing or invalid boot splash at: " + boot_logo_path + ". Loading default splash.");
 		}
 
 		if (!boot_logo.empty()) {
@@ -1040,7 +1048,6 @@ bool Main::start() {
 	String _import_script;
 	String dumpstrings;
 	bool noquit=false;
-	bool convert_old=false;
 	bool export_debug=false;
 	bool project_manager_request = false;
 	List<String> args = OS::get_singleton()->get_cmdline_args();
@@ -1050,8 +1057,6 @@ bool Main::start() {
 			doc_base=false;
 		} else if (args[i]=="-noquit") {
 			noquit=true;
-		} else if (args[i]=="-convert_old") {
-			convert_old=true;
 		} else if (args[i]=="-editor" || args[i]=="-e") {
 			editor=true;
 		} else if (args[i] == "-pm" || args[i] == "-project_manager") {
diff --git a/main/splash.h b/main/splash.h
index 832f504288..b96aff8754 100644
--- a/main/splash.h
+++ b/main/splash.h
@@ -29,12 +29,1394 @@
 #ifndef BOOT_SPLASH_H
 #define BOOT_SPLASH_H
 
-static const unsigned char boot_splash_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xef,0x0,0x0,0x1,0x3,0x8,0x6,0x0,0x0,0x0,0xdd,0x81,0x53,0xf4,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0x32,0xdf,0x0,0x0,0x32,0xdf,0x1,0x17,0xbe,0xe4,0xb,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x1,0x19,0x13,0x8,0x19,0x46,0x43,0xd9,0xbb,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x20,0x0,0x49,0x44,0x41,0x54,0x78,0xda,0xed,0x9d,0x79,0x78,0x54,0xd5,0xf9,0xc7,0x3f,0xef,0x9d,0x49,0xc2,0xe,0xb2,0xb9,0xaf,0xb8,0x2f,0x3f,0xb5,0xa8,0xb4,0xa2,0x66,0x66,0x2,0x4,0xea,0x5a,0xad,0x5a,0x6d,0xb5,0x2e,0xad,0x56,0x24,0x1b,0x4,0xb5,0x5a,0x2b,0xb6,0x6a,0x55,0x2,0x9,0x9,0xae,0x5d,0xd4,0x5a,0x6b,0x15,0xad,0x15,0x15,0x48,0x48,0x66,0x26,0x50,0x10,0x17,0xa,0x2a,0x56,0x51,0x11,0xd7,0x8a,0xec,0x90,0x0,0x59,0x66,0xee,0xfb,0xfb,0x63,0x82,0x4,0x32,0x9,0x99,0x9b,0x99,0x64,0x92,0x9c,0xcf,0xf3,0xcc,0x43,0xb8,0x33,0xf7,0xdc,0x73,0xde,0x73,0xbe,0xe7,0xbc,0xe7,0xdc,0xb3,0x80,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x86,0x16,0x19,0x53,0xe0,0xdf,0xaf,0xbd,0x9e,0x95,0x71,0x5f,0x79,0x2f,0x63,0xf1,0xce,0x87,0x18,0x13,0x24,0x81,0x50,0xa7,0x96,0xa,0x92,0x76,0xb4,0xc0,0x39,0xa0,0xe7,0x0,0xe7,0x0,0x43,0x4a,0xf3,0xbd,0x9,0x17,0x55,0x66,0x81,0xdf,0x7,0x52,0xe,0x2c,0x5,0x16,0x0,0xb,0xdc,0x96,0x1d,0x7c,0x6d,0x62,0xc6,0x16,0x93,0x33,0x46,0xbc,0x86,0x28,0x8c,0x9b,0x56,0xe9,0xb2,0x35,0xec,0x1,0xb9,0x0,0x38,0xf,0x38,0xa2,0x69,0xee,0xc8,0x43,0xa5,0x93,0x3c,0x13,0x12,0x2b,0xde,0x40,0x15,0xd0,0x27,0xca,0x57,0xb,0x15,0x5e,0x1,0x99,0x5d,0x96,0xef,0x59,0x69,0x72,0xcc,0x88,0xb7,0x5b,0xf3,0xc3,0x82,0xa,0xcb,0xc6,0xf2,0x2a,0xfc,0x1c,0xb8,0x8,0xe8,0xbb,0x97,0x5b,0xea,0x43,0x75,0xe1,0xfe,0x15,0xb7,0x8f,0xda,0x91,0x10,0xe1,0x4e,0xd,0xdc,0x88,0xf0,0x68,0x2b,0x7e,0xfa,0x11,0xf0,0xac,0xad,0xfa,0xd4,0xfc,0xc9,0xbe,0xd5,0x26,0x27,0x8d,0x78,0xbb,0xd,0x63,0xb,0x2,0x47,0x2a,0x5c,0xb,0x5c,0x5,0x1c,0x1c,0xe3,0xed,0xf3,0x4b,0xf3,0xbd,0x63,0x12,0xd4,0xea,0xd6,0x3,0xee,0x18,0x6f,0x5b,0x8,0x3c,0x95,0x52,0x5f,0xfb,0xb7,0x57,0x7f,0x3d,0xb6,0xd6,0xe4,0xae,0x11,0x6f,0x97,0xe3,0xfc,0x29,0xaf,0x48,0x5d,0xdf,0x3e,0x67,0xa1,0xe4,0x3,0x17,0xb4,0x21,0xa8,0xb0,0x25,0x1c,0x32,0x77,0x92,0xf7,0x7f,0x71,0x16,0x6e,0x9,0xd0,0x16,0x97,0x7c,0x1b,0x50,0x62,0xa1,0xd3,0xe7,0xe6,0xfb,0xd6,0x99,0x1c,0x37,0xe2,0xed,0x12,0x8c,0x29,0x8,0x64,0xa,0xdc,0xd,0x8c,0x88,0x53,0x90,0x1f,0x96,0xe6,0x7b,0x8f,0x8b,0x5b,0x7f,0xbb,0x78,0x4e,0x9a,0x5d,0xd7,0x73,0x3b,0x60,0xc5,0x21,0x38,0x1b,0xf8,0x6b,0x8a,0x86,0xb2,0x5e,0x9d,0x3c,0xba,0xda,0xe4,0x7e,0xfb,0x61,0x19,0x13,0x24,0xa4,0x46,0x1c,0x1f,0x47,0xe1,0x2,0x1c,0x93,0x39,0x3d,0x70,0x54,0xbc,0x2,0xb3,0xeb,0x7a,0x3e,0x17,0xc7,0xbc,0xb7,0x80,0x6b,0xea,0xc5,0x3d,0xc0,0xe4,0xbc,0x11,0x6f,0x57,0x60,0x6d,0xdc,0xeb,0x3,0x9b,0x57,0xe3,0xd4,0xea,0xba,0x80,0xf3,0x13,0x90,0xe6,0xb0,0xc9,0x76,0x23,0x5e,0x23,0xde,0xe8,0x1c,0x39,0x66,0xaa,0xff,0x80,0x38,0xb4,0xba,0x7f,0x4a,0x50,0xbe,0x1b,0xf1,0x1a,0xf1,0x1a,0xf1,0x36,0x97,0x57,0x22,0xf2,0x4a,0x1c,0xc2,0xb9,0x3a,0x41,0x9d,0x5,0x23,0x5e,0x23,0xde,0x2e,0x80,0x26,0x44,0xbc,0x0,0xa7,0x8c,0x2a,0x2c,0x77,0xdc,0xb7,0xcc,0x2c,0x8,0x4c,0x4b,0x54,0x9e,0x4b,0x64,0xe0,0xca,0xd0,0x8e,0xb8,0x8d,0x9,0x12,0x52,0x92,0x13,0x25,0x5e,0xcb,0x15,0x76,0xbd,0x4,0x78,0x77,0x5e,0x18,0x53,0x10,0x18,0xec,0xb2,0xb4,0x4f,0xd8,0x96,0x5e,0x88,0xf4,0x6,0x3b,0x84,0x6d,0x6d,0x3,0x7b,0x5b,0x38,0xc5,0xde,0x52,0x91,0x3b,0xaa,0xf1,0x8,0x70,0x6e,0xe2,0xea,0x2b,0x35,0x2d,0xaf,0x11,0x6f,0x57,0x68,0x78,0x59,0x9b,0xc0,0x77,0x70,0xe7,0x64,0x16,0x4,0xca,0x80,0x43,0x81,0x43,0x80,0x1e,0xb6,0x2d,0x91,0x77,0x7e,0xaa,0x91,0x36,0x50,0x22,0xff,0xba,0x43,0x2e,0x32,0xb,0x2,0x1b,0x80,0xcf,0x81,0x4d,0x9,0xf6,0xb4,0x8c,0x78,0x8d,0x78,0xbb,0x42,0xc3,0x4b,0x55,0x82,0xbb,0x3a,0xa3,0x63,0xf8,0xfd,0xa0,0x86,0x4f,0xa2,0xab,0xac,0x7a,0x93,0xf3,0xa6,0xcf,0xdb,0xf9,0xc5,0x2b,0x52,0xd3,0xcd,0x92,0x1c,0xaa,0x75,0x89,0x11,0xaf,0x11,0x6f,0x17,0x70,0x9b,0x95,0xee,0x36,0xe7,0xf7,0x83,0x60,0x9e,0x57,0x4d,0xce,0x1b,0xf1,0x76,0x5,0xf5,0x76,0x37,0xf1,0xbe,0x63,0x32,0xdd,0x88,0xb7,0x4b,0x60,0x63,0xd5,0x18,0xf1,0x1a,0x8c,0x78,0x3b,0x21,0xf3,0x27,0xa7,0xdb,0x44,0x46,0x78,0xbb,0x49,0x27,0x5f,0x97,0x9b,0x5c,0x37,0xe2,0xed,0x4a,0xac,0xe8,0x36,0xda,0xb5,0xd5,0xec,0xb4,0xd1,0x11,0x76,0x37,0x26,0x88,0x2f,0x63,0xa7,0xf9,0x53,0x54,0xe5,0x76,0xe0,0x4e,0xc0,0xd5,0x4d,0x92,0xbd,0x5a,0x85,0x5f,0x95,0x4d,0xf2,0x96,0x99,0x12,0x60,0xc4,0xdb,0x29,0xc9,0x2c,0x8,0x8c,0x6,0x1e,0x1,0x86,0x75,0x53,0x13,0x3c,0x6f,0x5b,0xf6,0xcd,0xf3,0x27,0x66,0xac,0x37,0xa5,0xc1,0x88,0x37,0x21,0x8c,0x7b,0x20,0xe0,0xb2,0x5d,0x72,0xbf,0xaa,0xce,0x2e,0x9b,0xec,0x5d,0xd8,0xd6,0xf0,0x46,0x15,0x2f,0xe8,0xe9,0xaa,0xf,0x17,0xa3,0xfc,0xc2,0x14,0x29,0x6a,0x54,0xf9,0xa5,0x1d,0xe,0x3d,0x53,0x7e,0xdb,0xe8,0x36,0xbd,0x3e,0x1a,0xfe,0xd8,0xdb,0xd6,0xe0,0xad,0x55,0x13,0x10,0xde,0x2f,0xcd,0xf7,0x56,0x18,0xd3,0x1a,0xf1,0x92,0x59,0x10,0xb8,0x1b,0xf8,0x2d,0xa0,0xc0,0x6c,0x41,0x7f,0x3d,0x2f,0xdf,0xf7,0x81,0xa3,0xb0,0xa6,0xfa,0x47,0x22,0xf2,0x2c,0xb1,0xef,0x4d,0xd5,0xd5,0x79,0xc1,0x25,0xae,0xeb,0xe7,0x4c,0x3a,0x67,0xab,0xb3,0x3c,0xa,0x5e,0xe,0xfa,0x0,0x91,0x69,0xa0,0x21,0x41,0x4f,0x99,0x97,0xef,0x7b,0xdf,0x98,0xb5,0x1b,0x8b,0x37,0xb3,0x20,0x70,0x25,0xf0,0xcc,0x1e,0x97,0x43,0xc0,0x13,0x2,0x77,0xce,0xcb,0xf7,0x7e,0xdb,0x9a,0x70,0xc6,0x14,0x4,0x5c,0x12,0xe9,0xd7,0xde,0x65,0x8a,0x51,0xb3,0x6c,0x14,0xe4,0xfc,0x79,0xf9,0x9e,0xc5,0xad,0xbd,0x61,0xcc,0xb4,0x80,0x4f,0x94,0x7,0x81,0xe1,0x7b,0x7c,0xb5,0x49,0x2c,0xfb,0xb8,0x79,0x13,0x33,0xbe,0x35,0x66,0xed,0x86,0xe2,0xcd,0x2c,0xf0,0xff,0x0,0x64,0x51,0xb,0xe9,0xde,0x1,0x4c,0x4d,0xad,0xae,0xfe,0xfd,0x2b,0x53,0xce,0xf,0x35,0x17,0xce,0xe8,0xe9,0xc1,0xfe,0x96,0xad,0xcf,0x1,0x99,0xa6,0x8,0xb5,0x8a,0x5b,0xc2,0xa1,0xd0,0xb4,0xf2,0xdb,0x46,0xdb,0x2d,0x78,0x30,0xc3,0x10,0x29,0x6,0xc6,0xb5,0x90,0x3f,0x1f,0x28,0x32,0xa2,0x2c,0xdf,0x53,0x65,0x4c,0xda,0x8d,0xc4,0x3b,0xf6,0x41,0xff,0xe1,0x6a,0xc9,0x7b,0x40,0xef,0x56,0xfc,0xfc,0x33,0x81,0x5f,0xcd,0xcb,0xf7,0x96,0x36,0x9,0xa7,0x20,0x78,0x82,0xa2,0x15,0xc0,0xbe,0xa6,0xf8,0xc4,0xc4,0x4b,0x82,0x5e,0x39,0x2f,0xdf,0x57,0xb3,0x67,0xbf,0x76,0x50,0x55,0xd5,0x6f,0x4,0xee,0x0,0x52,0x5b,0x11,0xce,0x5c,0x4b,0xac,0x8b,0xe6,0x4e,0x4a,0xaf,0x33,0xe2,0xed,0x6,0x8c,0x9b,0xea,0x1f,0x68,0x8b,0x2c,0x23,0xb2,0x84,0xae,0xb5,0x28,0xf0,0xf,0x45,0xb3,0xcb,0xf2,0x7d,0xeb,0x1b,0x5c,0xee,0x4c,0xe0,0x15,0x20,0xc5,0x68,0xd1,0x11,0xff,0xc1,0xd2,0x8c,0xd2,0x89,0xbe,0xcd,0xd,0xfd,0xda,0xc,0xd0,0xc7,0x89,0x76,0x5a,0x44,0xcb,0x14,0xd7,0xf6,0x24,0x37,0x78,0x73,0xf7,0x9e,0x4f,0xdd,0xe5,0xc5,0x9b,0x39,0x35,0xd0,0x13,0x61,0x3e,0x30,0xd2,0x61,0x10,0xd5,0xa,0xb7,0xa2,0x84,0xa5,0x75,0xa7,0xb,0x18,0x5a,0xe6,0x7f,0xaa,0x7a,0xae,0x88,0x4c,0x4,0x7e,0x8a,0xc3,0x89,0x42,0x2,0x37,0xcf,0xcb,0xf7,0x3e,0x6c,0xc4,0xdb,0x45,0x19,0x33,0xb5,0x54,0x44,0x52,0x9f,0x24,0x61,0xfb,0x36,0x19,0x3a,0xb8,0xf0,0x7a,0xe7,0xe5,0x7b,0x83,0xdd,0x35,0xfd,0x5d,0x7a,0x7a,0xa4,0x48,0xea,0xe5,0x46,0xb8,0x5d,0x17,0x85,0x57,0x32,0xb,0x82,0x43,0x4d,0xcb,0xdb,0xf5,0xdc,0xe5,0xc3,0x11,0x56,0x9a,0xfe,0x69,0x97,0xa7,0x52,0x61,0x74,0x59,0xbe,0xb7,0xdb,0x6d,0x6,0xd0,0x25,0x5b,0xde,0xb1,0xd3,0xfc,0x3d,0x11,0x66,0x1b,0xe1,0x76,0xb,0xd2,0x45,0xc8,0x32,0x6e,0x73,0x57,0x71,0xa7,0x54,0xee,0x4,0x4e,0x34,0xe5,0xba,0xdb,0xf8,0xcf,0xd3,0x32,0xa7,0x6,0x4e,0x30,0x6e,0x73,0x67,0x77,0x97,0xb,0xfc,0x27,0x81,0xbc,0x6b,0x4a,0x74,0xb7,0xe3,0x43,0x81,0x53,0xe7,0xe5,0x7b,0xbb,0xcd,0x46,0x8,0x5d,0xaa,0xe5,0x1d,0x53,0xe0,0x4f,0x3,0xf9,0x87,0x29,0xc7,0xdd,0x92,0x63,0x51,0x7e,0x69,0xdc,0xe6,0xce,0xea,0x46,0xa8,0xdc,0x0,0x1c,0x6f,0xca,0x71,0x37,0xf5,0x9e,0x85,0xa2,0x31,0x85,0xc1,0x43,0x8d,0x78,0x3b,0x9b,0xbb,0x3c,0xbd,0xb2,0x7,0xc2,0xfd,0xa6,0x8,0x77,0x6b,0x2c,0x9,0xeb,0x8d,0x46,0xbc,0x9d,0x8c,0xd2,0x89,0xe9,0x35,0xc0,0x4d,0xa6,0xfc,0x76,0x6b,0x6a,0x41,0x4b,0x8c,0x78,0x3b,0x21,0x29,0x96,0xfd,0x77,0x60,0xa1,0x29,0xc3,0xdd,0x96,0x6b,0x4b,0xf3,0x7d,0xdf,0x18,0xf1,0x76,0x42,0x5e,0x9d,0x98,0x11,0x2,0xae,0x22,0xb2,0x3e,0xd7,0xd0,0xbd,0xa8,0xb4,0xc2,0xcc,0xea,0x56,0x7d,0x84,0xae,0x96,0xa0,0xd2,0x7c,0xef,0xe7,0xc0,0x4,0x53,0x96,0xbb,0x15,0x21,0xb5,0xf8,0xd9,0xdc,0x5b,0xbd,0x21,0x23,0xde,0x4e,0x8e,0xc2,0x13,0xc0,0x52,0x53,0xa6,0xbb,0x9,0xca,0x8d,0x65,0x13,0xbd,0x5f,0x75,0xb7,0x64,0x77,0x49,0xf1,0x96,0xe5,0x7b,0xeb,0x54,0xb9,0xcc,0xb8,0xcf,0xdd,0x82,0x85,0x61,0xb7,0xf5,0x74,0x77,0x4c,0x78,0x97,0x5d,0x55,0x54,0x36,0xd9,0xfb,0xa9,0x98,0x15,0x45,0x5d,0x9d,0x6a,0x55,0x7e,0x5c,0x9e,0x97,0x5e,0x6f,0xc4,0xdb,0xc5,0xb0,0xb5,0xee,0x1f,0x34,0xdd,0x6c,0xce,0xd0,0x45,0x10,0x95,0xb,0xca,0x26,0x7b,0xd7,0x76,0xdb,0xf4,0x77,0xf5,0x4,0x8e,0x29,0x8,0xf6,0x13,0x74,0x5,0x66,0x6b,0xd6,0xae,0xc6,0x83,0xa5,0xf9,0xde,0x5b,0xbb,0xb3,0x1,0xba,0xfc,0x59,0x45,0x65,0xf9,0x9e,0xad,0xaa,0x7a,0x2e,0x91,0x3d,0xa9,0xc,0x5d,0x83,0x77,0xb1,0xcc,0x96,0xbb,0xdd,0xe2,0xa0,0xb1,0xb2,0xc9,0xbe,0xf7,0x80,0x9b,0x4d,0x99,0xef,0x12,0xd4,0xdb,0x22,0xe7,0x96,0x4e,0xf4,0xd6,0x18,0xf1,0x76,0x1f,0xca,0x4d,0xb9,0xef,0x12,0x6c,0x98,0x3f,0xc9,0xf3,0x95,0x31,0x83,0x39,0xe2,0xd3,0x60,0xe8,0xb4,0xb8,0x8d,0x9,0xda,0x8e,0x0,0x47,0xc,0xed,0xc3,0xf,0x8e,0x1c,0xcc,0x89,0x7,0xf6,0x67,0x50,0x9f,0x34,0x6,0xf6,0x4e,0x65,0x7b,0x5d,0x98,0xd,0xd5,0xb5,0x7c,0xb5,0x69,0x7,0x4b,0x3e,0x59,0xcf,0x5b,0xab,0x37,0x50,0x1b,0xb2,0x3b,0x7f,0x7a,0x5,0x4e,0x39,0x64,0x1f,0x7e,0x30,0x6c,0x30,0xc3,0x86,0xf6,0x61,0x50,0x9f,0x34,0xfa,0xf7,0x4a,0x61,0xf3,0xb6,0x3a,0xd6,0x57,0xd7,0xf2,0xc9,0xb7,0xd5,0xbc,0xbe,0x6a,0x3d,0x2b,0xbe,0xda,0x82,0xad,0x66,0xa8,0xc1,0x88,0x37,0x49,0x45,0x7b,0xea,0x61,0xfb,0x70,0xfd,0xd9,0xc3,0x18,0x36,0xb4,0x4f,0x93,0xef,0x7b,0xa7,0xb9,0x19,0xd2,0x37,0x8d,0x63,0xf7,0xef,0xc7,0xa8,0xe3,0xf7,0x25,0x14,0xb6,0x99,0xf5,0xd6,0x97,0xfc,0xfd,0x8d,0xcf,0xa9,0xef,0xa4,0x22,0x3e,0xef,0xe4,0x3,0xf8,0xf9,0x59,0x47,0xd0,0xb7,0x47,0xd3,0xa2,0xd3,0x73,0x40,0x4f,0xf6,0x1f,0xd0,0x93,0x93,0xe,0x1a,0xc0,0x8f,0x86,0x1f,0xc4,0x86,0xea,0x3a,0x9e,0xfa,0xf7,0xa7,0x94,0xff,0xf7,0x5b,0x23,0xe2,0x4,0x95,0xbf,0x6e,0x41,0x66,0x41,0xe0,0x28,0xe0,0xa3,0x78,0x85,0x97,0xe6,0xb6,0xb8,0xf5,0xdc,0xe3,0x38,0xf3,0xc8,0x21,0x31,0xdf,0x5b,0x5d,0x1b,0xe2,0x77,0x2f,0xaf,0xe0,0xdd,0x2f,0x37,0x77,0x1a,0xfb,0xd,0xe9,0x9b,0xc6,0x3,0x97,0x9d,0xc2,0x1,0x3,0x7a,0xc6,0x7c,0xef,0xaa,0xb5,0xd5,0xdc,0xf1,0xe2,0xbb,0x6c,0xde,0x1e,0x97,0x13,0x4a,0xd6,0x94,0xe6,0x7b,0xf7,0x37,0xd2,0x35,0x7d,0x5e,0x47,0xf4,0xef,0x95,0x4a,0xc9,0xcf,0x4e,0x73,0x24,0x5c,0x80,0x3e,0x69,0x6e,0xfe,0xf0,0xe3,0x93,0x39,0xff,0x94,0x3,0x3a,0x45,0x7a,0xff,0xef,0xe0,0x1,0xfc,0xf9,0xba,0x11,0x8e,0x84,0xb,0x30,0x6c,0x68,0x1f,0xfe,0x7c,0xfd,0x19,0x51,0xbd,0x13,0x83,0x11,0x6f,0xbb,0xd1,0x23,0xc5,0x45,0xd1,0x15,0xa7,0x72,0xc8,0xa0,0x5e,0x6d,0xa,0xc7,0x65,0x9,0x37,0xf9,0x8e,0xe2,0xfb,0xc3,0x6,0x25,0x75,0x7a,0x87,0xf6,0xeb,0xc1,0x7d,0x97,0x9c,0x4c,0xaa,0xbb,0x6d,0x45,0xa5,0x77,0xaa,0x9b,0xa2,0x2b,0xbf,0xc7,0xa0,0x3e,0x69,0xa6,0x10,0x99,0x3e,0x6f,0x7,0xd4,0x74,0x22,0xfc,0xfa,0xbc,0xe3,0xd9,0xbf,0x85,0x16,0x68,0xe5,0xca,0x95,0x94,0x97,0x57,0xf0,0xce,0x3b,0xef,0xb0,0x61,0xfd,0x6,0x5c,0x2e,0x17,0x43,0x86,0xc,0x61,0xf8,0xf0,0xef,0x31,0x6a,0xf4,0x28,0xe,0x39,0xe4,0x90,0xdd,0xc2,0xbb,0xe3,0xfc,0x13,0xb8,0xe6,0x4f,0x6f,0xb0,0xa1,0xba,0x36,0x29,0xd3,0xfc,0xd0,0x55,0xc3,0x71,0xbb,0x76,0xef,0x5d,0x55,0x55,0x55,0x31,0xe7,0xb5,0x39,0x2c,0x59,0xb2,0x84,0x35,0x6b,0xbe,0x65,0xc7,0x8e,0x1d,0xc,0x1a,0x34,0x90,0xe3,0x8e,0x3b,0x8e,0xb3,0xcf,0x3e,0x9b,0x33,0x46,0x9c,0x81,0x48,0xd3,0x1e,0x59,0x8a,0xcb,0xa2,0xf0,0x8a,0x53,0xf9,0xe5,0x13,0x6f,0x76,0x89,0x81,0x3b,0xd3,0xe7,0xed,0x44,0x7d,0xde,0x63,0xf7,0xef,0x47,0xd1,0x95,0xdf,0x8b,0xfa,0x5d,0x4d,0x4d,0xd,0xf,0xdc,0xff,0x20,0x95,0x95,0x95,0xcd,0x8b,0xdf,0xb2,0x38,0xff,0xfc,0xf3,0xc8,0xc9,0xcd,0xd9,0xed,0xfa,0xea,0x75,0xd5,0xdc,0xf4,0xd7,0xb7,0x93,0xce,0x66,0x37,0x67,0x1c,0xc5,0xf9,0xa7,0x1c,0xb8,0xdb,0xb5,0x67,0x9f,0xfd,0x7,0x4f,0x3e,0xf1,0x24,0xf5,0xf5,0xcd,0xaf,0x5,0x38,0xf1,0xc4,0x13,0xb9,0xf3,0xb7,0xbf,0x61,0xc8,0x90,0xe8,0xdd,0x8a,0x87,0xfd,0x1f,0x33,0x7b,0xd9,0xd7,0xa6,0xcf,0x6b,0xdc,0xe6,0x76,0x72,0x51,0x2c,0xe1,0xf6,0xf3,0xa2,0x6f,0x4c,0xb9,0x65,0xcb,0x16,0xae,0xbb,0xf6,0xfa,0x16,0x85,0xb,0x60,0xdb,0x36,0x2f,0xbf,0x3c,0x9b,0x1b,0x6f,0xf8,0x15,0xb6,0xbd,0xab,0xe5,0x39,0x6c,0x70,0x1f,0xe,0x1f,0xd2,0xbb,0x4d,0xf1,0x73,0x59,0x42,0xfa,0x31,0x43,0xb9,0xe6,0xac,0xc3,0x19,0x7d,0xc2,0x7e,0x51,0x47,0x83,0x63,0x4d,0xef,0xb8,0xff,0xdb,0xbd,0x4f,0x7e,0xef,0x3d,0xf7,0xf2,0xc7,0xc7,0xff,0xd8,0xa2,0x70,0x1,0x56,0xac,0x58,0xc1,0xd5,0x57,0xfd,0x9c,0xcf,0x56,0x7f,0x16,0xf5,0xfb,0x5f,0x79,0x8f,0xa4,0x4f,0x9a,0x71,0xfa,0x8c,0x78,0xdb,0x89,0x21,0xfd,0x7a,0x30,0xb4,0x5f,0x8f,0x26,0xd7,0x6b,0x6b,0x6b,0xc9,0xce,0xca,0x61,0xcd,0x9a,0x35,0xad,0xe,0xeb,0xe3,0x8f,0x3f,0x66,0x72,0xfe,0xe4,0x5d,0xee,0x8f,0x40,0xce,0xe8,0x63,0x1c,0xc7,0xed,0xc8,0xa1,0x7d,0x78,0xf6,0x57,0x67,0xf2,0xeb,0xf3,0x8e,0xe7,0x27,0x23,0xe,0x65,0xd2,0xd8,0x63,0xf9,0xc7,0x4d,0x23,0x19,0x7b,0x92,0xf3,0x6,0xea,0x82,0xef,0x1d,0x84,0xdb,0xda,0xe5,0x98,0x3d,0xf6,0xe8,0x63,0x54,0x54,0xf8,0x5b,0x7d,0x7f,0x6d,0x6d,0x2d,0xe3,0xc7,0xdf,0x4c,0x55,0x55,0x55,0xd4,0xee,0xc7,0xf1,0x7,0xf4,0x37,0x85,0xca,0x88,0xb7,0x7d,0x38,0xfb,0xe8,0xe8,0x2e,0x60,0x69,0x69,0x29,0x5f,0x7e,0xf9,0x65,0xcc,0xe1,0x2d,0x5f,0xfe,0xe,0xff,0xf9,0xcf,0xb2,0x46,0xad,0xaf,0xb3,0x96,0xd7,0x65,0x9,0x45,0x3f,0x1d,0x4e,0xbf,0x9e,0x29,0x4d,0xae,0xe7,0x8e,0x39,0x86,0x81,0xbd,0x53,0x1d,0x85,0x7b,0xe9,0x69,0x7,0x37,0xea,0xe3,0x56,0xf3,0xc2,0xb,0x2f,0xc6,0x1c,0x46,0x4d,0x4d,0xd,0xf,0x3e,0x30,0x35,0xea,0x77,0x3f,0x3b,0xf3,0x30,0x53,0xa8,0x8c,0x78,0xdb,0xa9,0xcf,0x7c,0xe2,0xfe,0x51,0x5b,0x97,0x92,0xe2,0x99,0x8e,0xc2,0x53,0x55,0xee,0xbb,0xf7,0xbe,0xef,0xfe,0x9f,0x96,0xe2,0xc2,0x65,0xc5,0x3e,0x4,0x71,0xf8,0xe0,0x3e,0xbb,0xb5,0x90,0x7b,0xf2,0x93,0x11,0xce,0xf6,0x20,0xef,0xd3,0xc8,0xed,0xbe,0xe7,0x9e,0x7b,0x8,0x87,0xc3,0x8e,0xc2,0x59,0xb4,0x68,0x11,0x9b,0x37,0x37,0x7d,0x9f,0x7d,0xf4,0x7e,0x7d,0x49,0x73,0x9b,0xe2,0x67,0xc4,0x9b,0x68,0x23,0x9,0xec,0x3f,0xa0,0xa9,0xcb,0xbc,0x61,0xfd,0x6,0xc7,0x85,0x1a,0x60,0xeb,0xd6,0xad,0xbb,0x5c,0x67,0xe0,0xe0,0x81,0xb1,0xbf,0x7e,0x3a,0xed,0xf0,0x81,0x2d,0x7e,0x3f,0xc2,0xe1,0xab,0x28,0xab,0xd1,0x68,0xf1,0x7b,0xef,0xbe,0xd7,0x26,0xfb,0xad,0x58,0xb1,0x22,0xea,0xf5,0x54,0xb7,0xcb,0x14,0x2e,0x23,0xde,0xc4,0x92,0xea,0x76,0xed,0x56,0x98,0x77,0xf2,0x85,0x3,0x77,0xb9,0x31,0xa1,0x50,0x88,0xf5,0xeb,0xd7,0xef,0x72,0x9d,0x7,0xf5,0x76,0x54,0xb1,0xb4,0x84,0xd3,0xd7,0x9,0x8d,0xbd,0x80,0x50,0xa8,0x6d,0x5b,0x81,0xbd,0xf5,0x56,0xf4,0x91,0xf4,0x14,0xb7,0x98,0xc2,0x65,0xc4,0x9b,0x58,0x42,0x76,0xf4,0x77,0x92,0x6b,0xbf,0x6d,0xfb,0xe,0x2c,0xdf,0x7c,0xb3,0x6b,0xa0,0x6b,0xc3,0xb6,0xba,0xa4,0x49,0x73,0xe3,0xb9,0xc8,0xb6,0xdd,0xb6,0x77,0xb2,0xdf,0xae,0xf9,0x36,0xea,0xf5,0xb0,0x6d,0xe6,0x3b,0x1b,0xf1,0x26,0x5a,0xbc,0x61,0xa5,0x6a,0x47,0xd3,0xd7,0x23,0x7,0x1c,0xd8,0xf6,0xd7,0x8d,0x7,0x1d,0xb4,0xeb,0x3d,0xea,0xa7,0xeb,0xaa,0x93,0x48,0xbc,0x8d,0xa,0x89,0xd5,0xb6,0x62,0x72,0xe0,0x81,0xd1,0xa7,0x81,0xd6,0x99,0x89,0x1a,0x46,0xbc,0xed,0xc1,0xf2,0x28,0x8b,0x8,0xe,0x3c,0xf0,0xc0,0x36,0x85,0x99,0x92,0x92,0xc2,0x3e,0xfb,0xec,0xf3,0x5d,0x5,0xb1,0xad,0x36,0x79,0x76,0xaa,0xd,0x85,0xed,0xdd,0xe2,0xd9,0x16,0xce,0x18,0x71,0x46,0x93,0x6b,0xdb,0x6a,0x43,0xd4,0xd6,0x1b,0xf1,0x1a,0xf1,0xb6,0x3,0x2f,0x2d,0x6d,0xba,0x79,0xc3,0xe0,0xc1,0x83,0x49,0x4d,0x4d,0x75,0x1c,0xe6,0x4e,0xe1,0x2,0x54,0xd5,0x24,0xd7,0xee,0xa5,0xcb,0x3e,0xdf,0xf4,0xdd,0xdf,0xa7,0x9f,0x7e,0x7a,0x9b,0xc2,0x3a,0xee,0xd8,0xe3,0x9a,0x5c,0xfb,0xe7,0xd2,0x2f,0xcd,0x32,0x41,0x23,0xde,0xf6,0xe1,0x8b,0xd,0xdb,0xa2,0xb6,0x9c,0xb7,0xdc,0x32,0xd9,0x51,0x78,0x22,0xc2,0xdd,0xbf,0x9b,0xf2,0xdd,0xff,0x5f,0x78,0xfb,0xcb,0xa4,0x4a,0xef,0xe3,0xc1,0x4f,0xbe,0xdb,0xb1,0xef,0xd7,0xb7,0xdf,0x86,0xdb,0xed,0x6c,0x46,0xd4,0xd8,0x71,0x63,0xe9,0xd7,0xbf,0x5f,0x93,0xeb,0xe5,0xef,0x7f,0x6b,0xa,0x95,0x11,0x6f,0xfb,0x50,0x5d,0x1b,0xe2,0xc9,0x7f,0xaf,0x6e,0x72,0xfd,0xec,0x73,0xce,0xe6,0xb8,0xe3,0x8e,0x8b,0x39,0xbc,0xb3,0xcf,0x3e,0x9b,0x63,0x8e,0x89,0xcc,0xaa,0xaa,0xa9,0xf,0xf3,0x62,0x92,0x89,0xf7,0x9b,0x2d,0x35,0xac,0xd9,0xbc,0x3,0x80,0xb4,0xb4,0x34,0xae,0xbf,0xfe,0xba,0xa8,0x8b,0xd,0x5a,0xa2,0x7f,0xff,0xfe,0x64,0x65,0x35,0x3d,0x36,0x6a,0xc5,0x57,0x9b,0x59,0x5b,0x55,0x63,0xa,0x95,0x11,0x6f,0xfb,0x31,0x7b,0xd9,0x57,0x4d,0xfa,0x69,0x29,0x29,0x29,0x4c,0x2d,0x78,0x90,0x61,0xc3,0x86,0xb5,0x3a,0x9c,0xe1,0xc3,0x87,0x33,0xe5,0xee,0x5d,0x3b,0x97,0x3e,0xe2,0xff,0x24,0x29,0xd3,0xfb,0xeb,0x17,0xde,0xf9,0xce,0xb5,0xbd,0xfc,0x27,0x97,0x73,0xd1,0x8f,0x2e,0x6a,0xb5,0x80,0xfb,0xf5,0xeb,0xc7,0xa3,0x8f,0x3d,0x42,0xcf,0x9e,0x4d,0x57,0x60,0x3d,0x38,0xf7,0x43,0x8c,0xc7,0x6c,0xc4,0xdb,0xae,0x6c,0xaf,0xb,0x73,0xcb,0xf3,0xcb,0x9a,0x5c,0xef,0xd5,0xab,0x17,0xf,0x3d,0x3c,0x93,0xb,0x2e,0xbc,0xa0,0xc5,0xfb,0x53,0x52,0x52,0xb8,0xfa,0xea,0xab,0x98,0x5a,0xf0,0xe0,0x77,0xd7,0xde,0xfc,0x74,0x3,0xa5,0x2b,0x92,0xf3,0x48,0xd9,0x35,0x5b,0x6a,0x78,0x7a,0xf1,0x67,0xdf,0xfd,0x3f,0x2b,0x6b,0x2,0x93,0xf2,0x27,0xd1,0xb7,0x6f,0xdf,0x16,0xef,0x3b,0xeb,0xac,0x91,0x3c,0xfd,0xb7,0xbf,0xb2,0xef,0xbe,0xfb,0x36,0xf9,0x6e,0xc6,0xfc,0x95,0xac,0xdd,0x6a,0x5a,0xdd,0x78,0x60,0x96,0x76,0xc4,0xc8,0xca,0x35,0x55,0x14,0xcc,0xfd,0x90,0xfc,0x71,0xc7,0xee,0x76,0x3d,0x35,0x35,0x95,0xdc,0xdc,0x1c,0xae,0xb8,0xe2,0xa,0x2a,0xca,0xcb,0x59,0xb6,0x7c,0x79,0xa3,0xf5,0xbc,0x83,0x39,0xed,0xf4,0xd3,0xc9,0xc8,0xf0,0xd1,0xbf,0xff,0xae,0x9,0xf9,0xab,0xd7,0x55,0xf3,0xdb,0x97,0xde,0x4b,0xea,0xf4,0x3e,0xbb,0xe4,0x73,0xe,0x1d,0xd4,0xb,0xcf,0xb1,0x11,0x21,0xfe,0xf0,0x87,0xe3,0x18,0x33,0x66,0x34,0xfe,0xa,0x3f,0x8b,0x17,0x2f,0xde,0x6d,0x3d,0xef,0xf1,0xc7,0x1f,0xcf,0x39,0xe9,0xe7,0x70,0xf4,0xd1,0x47,0x47,0xd,0xeb,0x95,0x65,0x5f,0x33,0xef,0xbd,0x6f,0x4c,0x21,0x32,0xe2,0xed,0x38,0xca,0xff,0xbb,0x86,0xaa,0x9a,0x7a,0xee,0xbc,0xf0,0x4,0xdc,0x7b,0xbc,0x3,0xdd,0x77,0xdf,0xa1,0x5c,0xf9,0xd3,0x2b,0xb9,0xf2,0xa7,0x57,0xb6,0x18,0xc6,0x82,0x95,0x6b,0xf9,0xc3,0x6b,0xff,0x6d,0x73,0x5c,0xf6,0x36,0xcf,0x21,0x1e,0xee,0xe9,0xfd,0xaf,0x7d,0xc0,0xd7,0x9b,0x76,0x70,0xe5,0xf7,0xf,0x43,0x4,0xdc,0x6e,0x37,0x63,0x32,0xc7,0x30,0x26,0x73,0x4c,0xab,0xc3,0xf8,0x53,0xe5,0x2a,0x5e,0x5c,0xfa,0xa5,0x71,0x97,0x8d,0xdb,0xdc,0xf1,0xbc,0xf1,0xe9,0x6,0x7e,0xf1,0x97,0x37,0x59,0xb2,0x6a,0x7d,0x4c,0xf7,0x6d,0xd9,0x51,0x4f,0x51,0xd9,0x4a,0xee,0x7b,0xf5,0xbf,0x71,0x29,0xc8,0x6f,0xad,0xde,0xd8,0xe2,0xf7,0x4b,0x3e,0xdd,0x10,0x97,0xf4,0x3e,0xbd,0xf8,0x33,0x7e,0xfb,0xd2,0xbb,0x7c,0x1e,0x65,0xd4,0xbd,0x25,0x3e,0x5a,0x53,0xc5,0xe4,0xe7,0x96,0xf3,0xc2,0xdb,0x46,0xb8,0xa6,0xe5,0x4d,0xb2,0x3e,0xe1,0x94,0x7f,0xad,0xe0,0x84,0x3,0xfb,0x33,0xfa,0x84,0xfd,0xf8,0xfe,0xb0,0x41,0xc,0xe8,0x95,0x1a,0xa5,0x75,0x54,0x56,0x7c,0xb5,0x85,0x45,0x9f,0xac,0xe7,0xd5,0xe5,0x5f,0xc7,0x75,0x5a,0xe0,0x67,0xeb,0xab,0x9,0xd9,0xda,0xec,0xca,0xa2,0xe7,0xde,0xf8,0x3c,0x6e,0xcf,0x7a,0x6b,0xf5,0x46,0xde,0x5a,0xbd,0x11,0xdf,0x71,0xfb,0x72,0xf6,0xd1,0x43,0x38,0xfd,0xf0,0x81,0xb8,0x5d,0x4d,0xeb,0xff,0xda,0x50,0x98,0xb7,0x3e,0xdd,0x48,0xe5,0xca,0xb5,0xfc,0xfb,0xe3,0x75,0x46,0xb4,0x46,0xbc,0xc9,0xcb,0xfb,0x5f,0x6f,0xe1,0xfd,0xaf,0xb7,0x20,0x22,0x1c,0xb4,0x4f,0x4f,0x6,0xf7,0x49,0x63,0x60,0x9f,0x5d,0x9b,0xae,0xff,0x6f,0xd3,0xe,0xaa,0x13,0x34,0x7b,0x2a,0x6c,0x2b,0xb9,0xcf,0x2c,0xe5,0xbe,0x1f,0x9f,0xbc,0xdb,0x9a,0xde,0xb0,0xad,0x94,0x94,0x7f,0xc4,0xc6,0x4,0xcc,0x97,0xf6,0x7f,0xf0,0x2d,0xfe,0xf,0xbe,0xc5,0xed,0x12,0xe,0x19,0xd8,0x9b,0x41,0x7d,0xd2,0x18,0xd0,0x2b,0x85,0x4d,0xdb,0xeb,0xd8,0x50,0x5d,0xcb,0x17,0x1b,0xb6,0x9b,0x79,0xcb,0x46,0xbc,0x9d,0xb,0x55,0xe5,0xcb,0x8d,0xdb,0xf9,0x72,0xe3,0xf6,0x76,0x7d,0xee,0x27,0x6b,0xab,0xb9,0xe2,0xd1,0xc5,0x8c,0x3c,0x6a,0x8,0x87,0xe,0xea,0xc5,0x37,0x5b,0x6a,0x78,0x63,0xd5,0x7a,0xaa,0x6a,0x12,0x3b,0xdd,0x32,0x14,0x56,0x3e,0x5d,0x57,0x9d,0x54,0x73,0xb2,0x8d,0x78,0xd,0x9d,0x8e,0xb0,0xad,0x2c,0x58,0xb9,0xd6,0x18,0xa2,0x1b,0xd1,0x9d,0x6,0xac,0xc2,0x26,0xbb,0xd,0x46,0xbc,0x9d,0x90,0xd2,0x7c,0xef,0xa7,0x88,0x1e,0x2,0x92,0xf,0xbc,0x69,0xb2,0xbe,0x53,0xb2,0x4,0xf8,0x9d,0x31,0x43,0x84,0x2e,0xb9,0x95,0xc1,0x98,0x82,0xc0,0x71,0x67,0x56,0x57,0x7e,0x38,0x65,0xca,0x94,0x66,0x47,0x4d,0x32,0xa7,0xf9,0xf,0x43,0xe5,0x77,0xc0,0x55,0xa6,0x18,0x24,0x3d,0x4f,0x22,0x3a,0xa5,0x74,0x92,0xef,0x73,0x63,0x8a,0x2e,0x2c,0xde,0xe1,0x8f,0xbd,0x2d,0x83,0xab,0xaa,0xd6,0x3,0x75,0xc0,0xf3,0x82,0xce,0x9a,0x97,0xef,0xfb,0x77,0xb4,0xdf,0xfe,0xb0,0xa0,0x22,0x2d,0x8c,0xb5,0x9,0xe8,0x69,0x8a,0x42,0xd2,0xb2,0xdd,0x85,0xbd,0xcf,0x9c,0xfc,0x8c,0xa8,0xc3,0xe6,0x63,0xb,0xfc,0x67,0x2b,0x72,0x19,0xb0,0xb0,0x34,0xdf,0xfb,0xbc,0x11,0x6f,0x27,0x66,0x6c,0x41,0x60,0x90,0xc2,0x9e,0x33,0x27,0xbe,0x6,0x66,0x21,0x3c,0x5f,0x3a,0xc9,0xfb,0xfa,0x6e,0x2d,0x70,0x41,0xe0,0x7d,0xe0,0xf8,0xbd,0x4,0xbb,0xe,0xf8,0x17,0x70,0x0,0x70,0x6a,0xc3,0xbf,0x6,0x67,0x7c,0xd,0x2c,0x3,0xbe,0x1,0x2e,0x6,0xf6,0xb6,0x43,0xde,0x8a,0xd2,0x7c,0xef,0x49,0xbb,0x7b,0x4d,0x81,0x33,0x51,0x2e,0x3,0x2e,0x3,0x76,0x6e,0x67,0x32,0xa3,0x34,0xdf,0x9b,0xdb,0x9d,0xc,0xd9,0xf5,0x46,0x9b,0x95,0x81,0x51,0xaa,0xa4,0x3,0x81,0x5c,0x94,0xdc,0xcc,0x82,0xc0,0x82,0xd2,0x7c,0x6f,0x7a,0x2c,0x35,0x3f,0xb6,0x7d,0x7c,0xe9,0x2d,0x19,0xeb,0x1b,0x15,0x9e,0xa1,0xa8,0x9c,0xa,0x7a,0x2a,0x70,0x72,0x83,0xa0,0x8f,0x31,0xba,0x6c,0xc2,0xca,0x6,0xa1,0x2e,0x7,0x59,0x86,0xe8,0xf2,0xd2,0x49,0xde,0xb5,0xbb,0x2a,0xda,0xe0,0x6f,0x14,0xfd,0x1c,0xe8,0xd1,0xda,0x0,0x33,0xb,0x2,0x8b,0x51,0x7e,0x10,0xe5,0xab,0xe3,0xba,0x9b,0x71,0xbb,0x9c,0x78,0x55,0xf6,0x5a,0x10,0xf6,0x89,0x31,0xc8,0xf5,0x8d,0x85,0xb,0xd0,0x50,0x0,0x4b,0x1b,0x3e,0x0,0x9c,0xfb,0xc0,0x82,0x5e,0xf5,0x2e,0xfb,0x14,0x89,0x8,0xfa,0x94,0x6,0x41,0x9f,0x4,0xa4,0x76,0x83,0x72,0x54,0x7,0xbc,0x1b,0x11,0x29,0xcb,0x14,0x59,0x9e,0x12,0xb6,0x96,0xbf,0x76,0xeb,0x39,0x2d,0xbe,0xf0,0x9e,0x97,0xef,0x59,0x9b,0x59,0x10,0xd8,0x18,0xa3,0x27,0x33,0xa0,0x99,0xeb,0x46,0xbc,0x5d,0x80,0x78,0x8b,0xa5,0x55,0x53,0x85,0x1a,0xa,0xea,0xe2,0x86,0xf,0x0,0x23,0xff,0xf8,0xa6,0xab,0xef,0xd6,0xed,0x27,0xa8,0xad,0xa7,0x21,0xdc,0xe,0xc,0xeb,0x42,0x76,0xfe,0x4,0xe5,0x5e,0xb1,0x64,0xe9,0xe6,0x81,0x7d,0xde,0x5f,0x72,0xed,0x69,0x76,0x22,0xed,0xdb,0xa,0xe,0x3a,0x7f,0xca,0x6c,0x79,0x65,0xca,0x5,0x6a,0xc4,0xdb,0x79,0xdb,0xde,0xed,0x89,0xec,0xca,0x67,0x16,0x4,0xc6,0x3,0x35,0x8,0xcb,0xd4,0xae,0x5b,0x51,0x36,0x39,0xb3,0xd9,0xcd,0xa7,0x16,0xfd,0xf2,0x8c,0x70,0x43,0x8b,0xf4,0x6e,0x66,0x41,0xe0,0x65,0x9a,0xf6,0xc5,0x5b,0x5b,0xb8,0x3f,0x4,0xb6,0x37,0x8c,0x51,0x48,0xa3,0xf1,0x8a,0x3d,0xff,0x96,0x3d,0x4,0xa1,0x7b,0xf9,0xbb,0x57,0x1b,0x5a,0xac,0xd3,0x4a,0x27,0x7b,0xb7,0xb4,0xe6,0x87,0x63,0xa6,0x96,0xa6,0x88,0x95,0x7a,0x12,0xca,0x29,0x40,0x5a,0x69,0xbe,0xf7,0x91,0x4,0x64,0xcd,0x86,0xee,0x24,0xdc,0x2e,0xda,0xe7,0x95,0xaa,0x84,0xe,0xc3,0x9,0x3f,0x46,0xf1,0xa2,0x20,0x92,0x1a,0xca,0x2c,0x8,0xac,0x68,0xdc,0xaf,0x73,0x11,0x5e,0x3e,0x27,0x3f,0xa3,0xc9,0xe9,0x5a,0x6a,0x6b,0x95,0xc4,0x7e,0x9c,0x89,0xa2,0x7a,0x59,0xe9,0x64,0xdf,0xb,0x89,0xab,0x8c,0x82,0x57,0x80,0x3e,0x43,0x8c,0x35,0x9e,0xda,0x1a,0xd5,0x25,0xfe,0x61,0x41,0x45,0xbf,0x30,0xae,0x93,0x1b,0xc6,0x3,0x76,0x7e,0x4e,0x40,0x1b,0xca,0x9a,0x50,0x1,0x24,0x42,0xbc,0x9f,0x19,0xb7,0xb9,0xb3,0x23,0x5a,0xdd,0x8e,0x83,0xe8,0xee,0x86,0xfe,0xed,0x29,0x3b,0xb5,0x16,0xc6,0xd2,0xcc,0x82,0xc0,0xaa,0x6,0x41,0xcf,0x29,0xcd,0xf7,0x3e,0x19,0xf9,0x46,0x9c,0xc4,0xaa,0x36,0x91,0xc2,0x5,0x28,0xcd,0xf7,0x3c,0x9b,0x59,0x10,0x78,0xa,0x48,0x89,0xad,0x56,0x91,0xc6,0xde,0xc8,0x75,0xc0,0x38,0xe0,0xd4,0x30,0x1c,0x1,0xda,0x11,0x6f,0x31,0x56,0x1b,0xf1,0x76,0x72,0xc2,0xa1,0xf0,0x56,0x97,0x3b,0x65,0x3,0x68,0x6b,0xf,0xe9,0x29,0x7,0xe,0x6b,0x70,0x21,0xe3,0xd3,0x36,0xc3,0x91,0xd,0x9f,0xfd,0x80,0x27,0x13,0xdd,0xdf,0x4e,0x2,0x6e,0x0,0x46,0x24,0x20,0xdc,0x6d,0xd,0xf9,0xd3,0x1a,0x8f,0xeb,0xd,0x23,0xde,0x4e,0x4e,0xf9,0x6d,0xa3,0xed,0xcc,0x82,0xc0,0xdf,0x80,0x9c,0xd6,0xb5,0x3c,0xde,0x9c,0xd1,0x33,0x17,0xde,0xe2,0xda,0x11,0x1a,0xab,0xc2,0xc5,0xc0,0x5,0x34,0x3f,0xa2,0xd9,0xa1,0x64,0x16,0x4,0xb2,0x81,0xf3,0x1a,0xf5,0x59,0x9b,0xfb,0x58,0x2d,0xf4,0x89,0x5,0x98,0x5d,0x9a,0xef,0x9d,0x99,0xa4,0x59,0xb8,0x19,0x78,0x59,0x94,0x7f,0x86,0x7a,0xb9,0xe7,0x95,0xdf,0x7c,0x76,0x5d,0x94,0xca,0x31,0x9a,0xc7,0x55,0x6e,0xc4,0xdb,0x25,0xfa,0xbd,0xbc,0x84,0x34,0x2b,0xde,0x3,0x2f,0x9d,0xbe,0xd8,0x35,0x6b,0xe2,0x99,0xdf,0x2d,0x54,0x98,0x3f,0xe1,0xec,0x5a,0xe0,0x65,0xe0,0xe5,0x71,0x5,0xe5,0x6e,0x5b,0xdc,0x19,0xa8,0x5e,0x2,0x5c,0x98,0x64,0x29,0x3b,0x16,0x18,0x1d,0x87,0x70,0x56,0x26,0x59,0xba,0xd6,0x2,0x2f,0x21,0xf2,0x4f,0x4b,0x43,0xfe,0xb9,0xf9,0xa3,0xa2,0xae,0x65,0xbc,0x74,0xfa,0x62,0xf7,0x56,0xbb,0x76,0xdf,0x66,0xfc,0x9d,0x4f,0x8d,0x78,0xbb,0x42,0xb7,0xd7,0xe2,0xc3,0x16,0x76,0x6f,0x18,0xb8,0xd5,0xae,0x7d,0x27,0xb3,0x20,0x70,0x57,0xc8,0x1d,0x9e,0x53,0x91,0x3b,0x6a,0x47,0xe3,0x2f,0x1b,0xa,0x4e,0x29,0x50,0x3a,0x66,0x5a,0xe5,0x4d,0xa2,0xf6,0x29,0x18,0x12,0xc9,0x85,0x2a,0xd6,0xf2,0xb2,0x49,0xe9,0xcd,0xae,0xfa,0xca,0x2c,0x5c,0xd0,0x8b,0x70,0xf8,0xdc,0xad,0x76,0xed,0xef,0x88,0xfe,0x9e,0x3e,0x50,0x3a,0xc9,0x5b,0x65,0xc4,0xdb,0x5,0x98,0x37,0xc9,0xfb,0xed,0x98,0xa9,0x81,0x7f,0x88,0xf0,0x93,0x66,0x7e,0x72,0x2,0xf0,0x82,0x3b,0xe4,0xaa,0xc9,0x2c,0x8,0xcc,0x5,0xfe,0x69,0xdb,0xd6,0xec,0xf9,0xb7,0xa4,0x6f,0x6d,0xfc,0xa3,0x86,0x2,0xb5,0xd4,0xe8,0x2b,0x71,0x94,0xe6,0x7b,0xa3,0xda,0x77,0xec,0x3,0xfe,0x1,0xea,0x92,0xb,0x80,0x8b,0x9,0x87,0xc7,0x2,0x69,0xcd,0xd7,0xd6,0x72,0x57,0x77,0xb4,0x5d,0xd7,0x5d,0x8c,0x6f,0x71,0x2f,0xda,0xac,0x78,0x77,0xd2,0x3,0xf8,0x11,0xf0,0x23,0xcb,0xb2,0xeb,0x33,0xb,0x2,0x15,0xc0,0x3f,0x71,0xd9,0xff,0x2a,0xcd,0xcb,0x58,0xd7,0x8c,0x4b,0x6e,0x4e,0x84,0x6e,0x5b,0x97,0xa6,0xd9,0x32,0x37,0x66,0xaa,0x7f,0x5f,0x11,0xb9,0x10,0xb8,0x44,0xc1,0xd7,0xca,0xf2,0xf9,0xd,0xe1,0xf0,0x1b,0x46,0xbc,0x5d,0x88,0xba,0x2a,0xde,0x4f,0xeb,0xcd,0x9b,0x8,0x67,0xb4,0xf2,0x96,0x14,0x60,0x2c,0x30,0x96,0xb0,0xf5,0x48,0x66,0x41,0x60,0xa1,0x20,0xff,0xc,0xdb,0xe1,0x7f,0xcd,0xbf,0x25,0xe3,0x4b,0x80,0x31,0xd3,0x2,0xbd,0x51,0x67,0xa3,0xaa,0x16,0xe1,0x30,0xb8,0x4a,0x80,0x23,0x88,0xcc,0xb4,0x1a,0x46,0x8c,0xaf,0x67,0x3a,0xda,0xa4,0xc0,0xa7,0xc0,0x2a,0x60,0x55,0x24,0x3d,0x8e,0x18,0x31,0x66,0x5a,0xa0,0x67,0xd9,0x24,0xef,0xe,0x80,0xb1,0x5,0xfe,0x43,0xc0,0xba,0x48,0xd1,0x4b,0x80,0x91,0x10,0x73,0xe5,0x98,0x53,0x7a,0x4b,0x46,0x9d,0x11,0x6f,0x17,0x22,0x38,0xc5,0xab,0x63,0xb,0x2,0x13,0xd4,0xd9,0xc2,0x7b,0x17,0xe0,0x51,0xd4,0x63,0x59,0x56,0x51,0x66,0x41,0xe0,0x2d,0xe0,0x6d,0x94,0x73,0x5a,0x74,0xdf,0x5a,0x72,0xf,0x6f,0x19,0x15,0x6,0xb2,0x77,0xb5,0x32,0xa5,0x62,0x91,0x76,0x30,0xe8,0x91,0x2a,0xdf,0x89,0x79,0xa7,0xb0,0x8f,0x4,0xfa,0x75,0x80,0xd9,0xb6,0xec,0x14,0xe7,0xce,0x8f,0x28,0xab,0x40,0x56,0xd9,0xd4,0x7e,0x59,0x36,0x39,0x33,0x1e,0xaf,0xae,0x7a,0x88,0xf2,0x7a,0x66,0x41,0xe0,0xdf,0xc0,0xe9,0xa,0xa7,0xb7,0xe1,0xbd,0xf0,0xd7,0x22,0xcc,0xe9,0xae,0x4e,0x4c,0x97,0xde,0xc3,0x6a,0x5e,0xbe,0xf7,0xad,0xcc,0x82,0xc0,0x43,0xc0,0xcd,0x6d,0x72,0xc0,0x23,0xef,0x30,0x9d,0xb4,0xb8,0x87,0x35,0xf7,0x45,0x83,0x10,0xbe,0x68,0xf8,0xf8,0xf7,0xfc,0x7e,0xdc,0xb4,0x8a,0xc1,0xb6,0x6d,0x1d,0xde,0x4e,0xae,0xec,0x48,0x97,0x15,0x5e,0x3d,0x67,0xd2,0xa8,0xf5,0xe,0x43,0x38,0x34,0xc6,0xdf,0x9f,0xdc,0xf0,0x69,0x13,0x2,0x3f,0x9a,0x37,0xc9,0xbb,0xcd,0x88,0xb7,0xab,0x22,0xfa,0x1b,0x54,0x2e,0x7,0x6,0x77,0xc0,0xd3,0xf,0xcc,0x2c,0x8,0x3c,0x24,0xe8,0x5f,0xc4,0xd6,0x55,0x73,0x6f,0xc9,0xd8,0xdc,0xda,0x1b,0xe7,0x4e,0xca,0x58,0x8f,0xb3,0xb9,0xd0,0xb1,0x7b,0x5,0x93,0xbd,0x6f,0xc5,0x7a,0xcf,0xb8,0x7,0x2b,0x6,0xa8,0x25,0xc3,0x14,0xf9,0x25,0x30,0xb4,0xdd,0xb3,0x15,0x1e,0x9a,0x97,0x1f,0x7b,0xbc,0x8d,0x78,0x3b,0x11,0xa5,0x93,0x7c,0x9b,0xc7,0x16,0x4,0x2f,0x51,0xb4,0xb2,0x3,0x1e,0x6f,0x1,0xe3,0x15,0x19,0xaf,0x96,0x90,0x59,0x10,0xd8,0xb0,0xbb,0x5b,0x2a,0x9f,0xaa,0xe8,0x2a,0xcb,0x96,0x55,0xf3,0x26,0x7b,0xbe,0x6e,0x45,0x78,0x7,0xc5,0x29,0x5e,0x7,0xb7,0xe6,0x47,0x63,0xa7,0x6,0xf,0xb4,0x2d,0x1d,0x26,0x2a,0xc3,0x40,0x77,0x73,0xed,0xed,0xbd,0x2f,0xa2,0x4f,0x24,0x5f,0x28,0x7a,0x3b,0xdd,0x1c,0xe9,0x2e,0x9,0xcd,0x2c,0x8,0x4c,0x0,0x4a,0x92,0x38,0x8a,0x35,0x7b,0xf4,0x37,0x3f,0x5,0x56,0x89,0xe8,0x2a,0xf7,0xb6,0x1d,0x9f,0xd5,0xf7,0xea,0x95,0x9,0xcc,0x8e,0xe3,0xf3,0xce,0x4d,0xd9,0xb6,0xad,0x3c,0xd4,0xa7,0xd7,0x61,0xaa,0xb2,0x53,0x98,0x7b,0xf6,0xbd,0x7b,0x24,0xa1,0x9d,0xb6,0xab,0x70,0x7c,0xd9,0x24,0x6f,0xb7,0xdf,0xcf,0xaa,0xdb,0xec,0xdb,0xac,0x5a,0xf7,0x90,0x48,0xea,0xb1,0x6d,0xec,0xff,0x26,0x92,0x1e,0x44,0xde,0x3f,0x9f,0xb0,0x7b,0xbc,0x85,0xfa,0x5e,0xbd,0x12,0xf1,0xbc,0xd7,0xea,0x7b,0xf7,0xee,0x3c,0xb3,0xa7,0x77,0x91,0x61,0x84,0xbb,0xcb,0xad,0xeb,0x16,0x94,0x4d,0xce,0x54,0x4b,0xac,0x89,0xc0,0xab,0x26,0xdb,0x3b,0x6d,0x15,0x7c,0x65,0x69,0xbe,0x77,0x89,0xb1,0x43,0x37,0x13,0x2f,0xc0,0xdc,0x49,0xe9,0x75,0xaa,0xfa,0x63,0xe0,0x19,0x93,0xf5,0x9d,0x4b,0xb5,0xa2,0x72,0x69,0x69,0xbe,0xef,0x59,0x63,0x8a,0x6e,0xd8,0xe7,0x6d,0xcc,0xd8,0xc2,0x80,0x5b,0xc3,0x14,0x2,0x13,0x4c,0x11,0x48,0x7a,0xea,0x5,0xcd,0x9c,0x97,0xef,0xb,0x18,0x53,0x74,0xe3,0x96,0x77,0x27,0xf3,0xf2,0xbc,0xa1,0x70,0x28,0x94,0x83,0x70,0xa7,0x29,0x2,0x49,0xcd,0x7a,0x90,0x11,0x46,0xb8,0xa6,0xe5,0x8d,0x4a,0x66,0x41,0xc0,0xb,0xcc,0xa2,0x63,0x5f,0x7d,0x18,0x9a,0x52,0x66,0x69,0xf8,0x27,0x73,0x27,0x8f,0xda,0x64,0x4c,0x61,0x5a,0xde,0xa8,0x94,0xe6,0x7b,0x3,0x60,0x1f,0xb,0x54,0x98,0xe2,0x90,0x34,0xfc,0xd6,0xb2,0xed,0x1f,0x1a,0xe1,0x9a,0x96,0xb7,0x75,0x2d,0xf0,0xf4,0x80,0x1b,0x25,0x7,0xe5,0x5e,0x1c,0xce,0x5f,0x36,0xb4,0x99,0xf7,0x11,0xb9,0xa1,0x74,0x92,0x67,0xb1,0x31,0x85,0x11,0x6f,0xcc,0x8c,0x79,0xb0,0x62,0x3f,0xb1,0xac,0x87,0x89,0x2c,0x15,0x34,0xb4,0xf,0xf5,0xc0,0x9d,0xaa,0x3a,0xbd,0x6c,0xb2,0xaf,0xde,0x98,0xc3,0x88,0xd7,0x31,0xc3,0x1f,0x7b,0x5b,0x6,0x55,0x55,0x9d,0x2b,0x50,0x44,0xd7,0xda,0x28,0x3d,0x19,0xf9,0x97,0x4b,0xf4,0xe6,0x39,0x93,0x7c,0xff,0x33,0xa6,0x30,0xe2,0x8d,0x5f,0x2b,0x3c,0x35,0xe0,0x16,0xf8,0x39,0xc2,0x6f,0x68,0x61,0x85,0x90,0xc1,0x11,0x73,0x10,0xbd,0xab,0x74,0x92,0xef,0x6d,0x63,0xa,0x23,0xde,0xc4,0xf5,0x87,0x1f,0xac,0x48,0xc1,0xb2,0xae,0x5,0x7e,0x43,0x2b,0x27,0xf5,0x1b,0x9a,0xa5,0x14,0xd5,0xbb,0x4a,0x27,0xfb,0xde,0x30,0xa6,0x30,0xe2,0x6d,0x37,0x7e,0x38,0xbd,0xd2,0x1d,0xb6,0xed,0x1f,0x1,0xe3,0x1,0x8f,0xb1,0x48,0xab,0xa9,0x5,0x9e,0x12,0xe1,0xe1,0x79,0x93,0xbc,0xef,0x18,0x73,0x18,0xf1,0x76,0x6c,0x6b,0x5c,0x10,0x3c,0x1e,0x74,0x3c,0x70,0x2d,0xf1,0xdb,0xb0,0xbd,0xab,0xf1,0x1,0x22,0x8f,0xa6,0xaa,0xfc,0xf9,0x95,0xfc,0xf4,0x6d,0xc6,0x1c,0x46,0xbc,0x49,0xc5,0xa8,0xfb,0x2b,0xd2,0xac,0x14,0xeb,0x2,0x89,0x1c,0xf6,0x7c,0x3e,0xe6,0x35,0xd3,0x17,0xc0,0x2c,0x54,0x9e,0xaf,0x75,0xeb,0x5b,0xc1,0x3c,0xaf,0x9a,0x52,0x62,0xc4,0x9b,0xf4,0x9c,0xfb,0x40,0x69,0x8f,0x90,0x2b,0xe5,0x42,0x90,0xcb,0x80,0x31,0x40,0x9f,0x6e,0x92,0xf4,0x55,0xc0,0x6c,0x11,0x66,0xa5,0x28,0x4b,0x5e,0xc9,0x37,0x82,0x35,0xe2,0xed,0xc4,0x8c,0x29,0x8,0xb8,0x40,0xbe,0x2f,0xe8,0x28,0x22,0xa7,0x1c,0x9c,0xd9,0x85,0xec,0xbd,0x99,0xc8,0x8c,0xb4,0xf9,0x8a,0x5d,0x5e,0x96,0x9f,0xb1,0xca,0xe4,0xb8,0x11,0x6f,0xd7,0x15,0xf3,0x3,0x15,0x7d,0x2c,0x97,0x9c,0xa3,0x30,0x1c,0xe4,0x34,0xe0,0x34,0x62,0x3b,0x11,0xbe,0xa3,0x50,0x60,0x5,0xb0,0x54,0xe1,0x6d,0xd0,0x37,0x51,0xd7,0xd2,0xb2,0xc9,0xe9,0xb6,0xc9,0x55,0x23,0xde,0x6e,0xcb,0xb8,0x69,0x95,0xfb,0x87,0x55,0x4f,0x13,0xf4,0x24,0x22,0xdb,0xbd,0x1e,0xdd,0xf0,0xef,0xbe,0x1d,0x10,0x1d,0x9b,0xc8,0xd6,0x3b,0x1f,0x3,0x1f,0xa3,0x7c,0xac,0x22,0xff,0x9,0xa5,0xda,0xff,0xf1,0x67,0xfb,0x6a,0x4c,0x6e,0x19,0xf1,0x1a,0x5a,0x41,0xe6,0xf4,0xca,0x7e,0x12,0xb6,0x8f,0x52,0xe4,0x10,0x2c,0x86,0xa2,0x3a,0x14,0x18,0x42,0x64,0x97,0xc6,0xa1,0x44,0x56,0x40,0xf5,0x88,0xf2,0x49,0x6d,0x68,0x29,0x6b,0xa2,0x7c,0xb6,0x1,0xeb,0x88,0x1c,0xea,0xb5,0x16,0x64,0x1d,0xe8,0x5a,0x15,0x59,0x6b,0x61,0xaf,0xaa,0xdb,0x6e,0xad,0xf2,0xdf,0xe9,0x9,0x1b,0xeb,0x1b,0xc,0x1d,0xc0,0x8f,0x9f,0x9f,0x65,0x19,0x2b,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x43,0xdb,0xe9,0x90,0x9d,0x34,0x32,0x32,0x32,0xd2,0x34,0xac,0x67,0xa8,0x70,0x0,0x36,0x43,0x91,0xef,0x76,0x89,0xe8,0xd,0x54,0x3,0x55,0x91,0x8f,0x6c,0x11,0xf4,0x23,0x1b,0x79,0x3f,0x18,0xac,0xf8,0xb2,0x3d,0xe3,0xe8,0xf5,0x78,0xf,0x4,0x4e,0x7,0x6b,0x28,0xe8,0xce,0xf8,0xd,0x24,0xb2,0xf9,0xda,0x5a,0x60,0x1d,0xe8,0x5a,0x84,0x77,0x3,0x81,0xc0,0x27,0x89,0x8a,0x87,0xc7,0xe3,0x11,0xa0,0x7f,0xc,0xb7,0xd4,0x4,0x83,0xc1,0xa4,0xde,0xb6,0xc6,0xe3,0xf1,0xec,0x23,0xc8,0xf,0xc0,0xda,0xf,0xbe,0xdb,0x25,0x64,0x8,0x91,0xdd,0x3e,0x1a,0xdb,0x76,0xa5,0xcb,0xe5,0x7a,0xaf,0xbc,0xbc,0x3c,0x2e,0xfb,0x65,0xa5,0xa7,0xa7,0xf7,0x17,0x91,0x76,0x2b,0xf3,0x22,0x12,0xa,0x4,0x2,0xd5,0x9d,0x5e,0xbc,0xe9,0xe9,0x19,0x47,0x59,0x62,0x8f,0x5,0xc9,0x4,0xbc,0xc4,0xbe,0x51,0xf9,0x56,0x60,0x39,0xf0,0x32,0xa2,0x2f,0x4,0x2,0x81,0x2f,0xe2,0x19,0xbf,0x73,0xce,0x19,0xe3,0x72,0x5b,0x21,0xaf,0x42,0x26,0x30,0x16,0x38,0x31,0x86,0xdb,0x57,0x1,0x65,0x8,0xa5,0x5b,0xb7,0x6e,0x79,0x65,0xe9,0xd2,0xa5,0x6d,0x2e,0x6c,0x5e,0xaf,0xd7,0x85,0xca,0x3,0xc0,0xd,0x40,0xdf,0x18,0x6f,0xdf,0x1,0x6c,0x6a,0xf4,0xf9,0x0,0x58,0x8c,0xe8,0xa2,0x40,0x20,0xf0,0x71,0x47,0x8,0xd6,0xe7,0xf1,0x9d,0xae,0x30,0xae,0xc1,0xb6,0x23,0x68,0xfd,0xd9,0xd0,0xdf,0x2,0xf3,0x11,0xca,0x6c,0x3b,0xfc,0x52,0x65,0x65,0xa5,0x23,0x31,0x78,0x3d,0xbe,0xd7,0x80,0x1f,0xb6,0x73,0xb2,0x15,0xc8,0x9,0x4,0xfd,0x25,0x9d,0x52,0xbc,0x5e,0x4f,0xc6,0xb1,0xa0,0x7f,0x0,0x2e,0x8a,0x63,0xb0,0x36,0xb0,0x48,0x21,0x2b,0x18,0xf4,0xb7,0xe9,0xf8,0x8c,0xb3,0xce,0x3a,0xcb,0x4a,0x49,0x49,0xbb,0x8,0xd5,0xbb,0x63,0x14,0x6c,0x73,0xfc,0xf,0xb8,0x2b,0x10,0xf4,0xff,0xa9,0x6d,0xe2,0xcd,0xb8,0x1c,0xd5,0x7f,0x24,0x20,0x4b,0xd6,0x1,0x73,0x14,0x99,0x1e,0xc,0x56,0xbc,0x9b,0xf0,0xfc,0xf7,0x66,0x8c,0x44,0xf5,0xf7,0x44,0x8e,0x87,0x69,0x6b,0x79,0xab,0x2,0x1e,0xb4,0x35,0x3c,0xbd,0xb2,0xb2,0x72,0x7b,0x6b,0x6f,0x1a,0x35,0x6a,0x54,0xef,0x70,0xc8,0xde,0x48,0x64,0x8f,0xaf,0xf6,0xe6,0xb3,0x40,0xd0,0x7f,0x78,0xa7,0x12,0xaf,0xcf,0xeb,0x3b,0x40,0x95,0xbb,0x81,0xeb,0x62,0xa8,0x65,0x63,0xa5,0x6,0xc8,0xb,0x4,0xfd,0x8f,0x3a,0x73,0xdf,0x32,0x3c,0x82,0x4e,0x25,0xb2,0xd,0x6b,0xbc,0x59,0xad,0x70,0x5b,0x30,0xe8,0x7f,0xde,0x61,0x4b,0xb1,0x5,0xe8,0x97,0xe0,0x82,0x35,0x1f,0x91,0x69,0x81,0x40,0x45,0x69,0xfc,0x5d,0xe3,0x8c,0x63,0x5,0x9d,0x46,0xa4,0xb5,0x8d,0x77,0x39,0xdb,0xa8,0x70,0x4f,0x38,0x5c,0x5f,0xbc,0x70,0xe1,0xc2,0x70,0x2b,0x6c,0x79,0x1d,0xf0,0xe7,0x8e,0xea,0x26,0x28,0x7a,0x54,0x30,0x18,0xff,0xae,0x55,0x42,0x44,0xe5,0xf3,0x64,0x9c,0xae,0xca,0x3b,0xc0,0x2f,0x12,0x28,0x5c,0x88,0xec,0x98,0xf8,0xe3,0x58,0x6f,0x1a,0x39,0x72,0xa4,0xe5,0xf5,0xf8,0x26,0x9,0x1a,0x48,0x90,0x70,0x1,0xe,0x17,0x78,0xd6,0xeb,0xf1,0xdd,0x13,0x7b,0x6b,0x35,0xca,0xdd,0xe,0xc2,0x5,0x18,0x8d,0xea,0x3c,0xaf,0xc7,0xf7,0xd7,0x11,0x23,0xbe,0xef,0x8a,0x63,0x6b,0x7b,0x91,0xa0,0xcb,0x1a,0xdc,0xd4,0x44,0x34,0x10,0x3,0x5,0xa6,0xbb,0x5d,0x29,0x7f,0xf7,0xa5,0xfb,0x5a,0xd3,0xfd,0x3a,0xbb,0x43,0x7,0x96,0x54,0x12,0xd2,0xf2,0x5a,0xf1,0x17,0xae,0xef,0x3c,0x45,0x2b,0x81,0xc1,0xed,0x64,0x1b,0x57,0x6c,0x5,0xcb,0xdb,0x23,0x35,0x25,0xed,0xcf,0x40,0x41,0x3b,0xc4,0xcd,0x2,0xee,0xf0,0x7a,0x7c,0x2f,0xc,0x1f,0x3e,0xbc,0xd5,0xb6,0x56,0x6d,0xf7,0x81,0xc4,0xab,0x7a,0xf5,0xec,0xb5,0xd2,0xeb,0xf5,0x1e,0xd6,0xf6,0x6e,0x92,0xef,0x76,0x54,0x5f,0x68,0xa8,0x58,0x13,0xcd,0x65,0x2a,0x2c,0xf0,0xf9,0x32,0x86,0xee,0xe5,0x77,0xfb,0xd2,0xa1,0xea,0x4d,0x4c,0x45,0x1c,0x57,0xf1,0x7a,0x3d,0xbe,0x6b,0x15,0x5e,0x6,0x7a,0xb6,0xa3,0x69,0xbe,0x89,0x41,0xb8,0xbd,0x50,0x29,0x3,0xae,0x69,0xe7,0xec,0xbb,0xa4,0x5f,0xdf,0xfe,0xc9,0x7e,0x88,0xf4,0x30,0x54,0x56,0xf9,0x7c,0x19,0x87,0x3a,0xce,0xff,0x74,0xdf,0x13,0xc0,0xbd,0xb1,0x56,0xa8,0x6d,0x64,0xb8,0xda,0xfa,0xae,0x37,0xdd,0xd7,0x92,0x40,0x3b,0xfa,0xcc,0xa8,0xbe,0x49,0x2d,0x5e,0xaf,0xc7,0x77,0x6,0xf0,0xc7,0x4,0xbb,0xc9,0xd1,0x8,0xb6,0xca,0x23,0xf0,0xf9,0xdc,0xa8,0x3c,0xd1,0x81,0x2e,0xd4,0xa9,0x5e,0x8f,0xef,0xe5,0x24,0x17,0xb0,0xa5,0xb6,0x2e,0x1f,0x37,0x6e,0x5c,0x9a,0x83,0xfc,0x9f,0x82,0xf0,0xf3,0xe,0x8a,0xf7,0xbe,0x8,0xf3,0xbd,0x5e,0x6f,0x73,0x22,0xed,0xe8,0xa3,0x59,0xc2,0x49,0x2b,0x5e,0xaf,0xd7,0xbb,0xf,0xf0,0x7c,0x3b,0xd7,0xb8,0x0,0xb5,0x62,0xf1,0x4c,0x6b,0x7e,0x68,0xdb,0xfc,0x1c,0xb8,0xac,0x83,0x33,0xf1,0x7c,0xaf,0xc7,0x77,0x75,0x92,0xb,0x78,0x40,0xcd,0x8e,0xda,0xa,0xaf,0xd7,0xdb,0xea,0xb2,0x91,0x9e,0xee,0xfb,0x1e,0x70,0x7,0x1d,0x7b,0x2,0xc7,0x49,0xa8,0x34,0x37,0xbe,0x50,0xd5,0xc1,0x36,0xad,0x4a,0x5a,0xf1,0xa2,0xf2,0x8,0x70,0x68,0x7,0x18,0xe5,0x3d,0xbf,0xdf,0xbf,0xd7,0x43,0x9b,0xbd,0x1e,0xdf,0xc1,0x2,0x8f,0x25,0x81,0x30,0x4,0x78,0x64,0xdc,0xb8,0x71,0xae,0x24,0x17,0xf0,0x48,0x51,0x69,0xf5,0x40,0xa0,0x25,0x94,0x2,0xee,0x24,0x88,0x77,0x8e,0xcf,0x9b,0x71,0x72,0xd3,0xf2,0xc9,0xff,0x3a,0x38,0xd3,0xb7,0x26,0xa5,0x78,0xbd,0x5e,0xef,0x58,0xe0,0xf2,0x8e,0x30,0x8a,0xb6,0x7e,0xd0,0x69,0x72,0x7,0x78,0x5,0xcd,0xd1,0xab,0x66,0x47,0xed,0x1f,0x92,0x5c,0xbc,0x28,0x3c,0x99,0x9e,0xee,0xdb,0xab,0x20,0xbd,0x1e,0xdf,0x35,0xb4,0xdf,0xe0,0xe4,0xde,0xe3,0xad,0xfa,0x60,0x13,0xf1,0x8,0x73,0x3a,0x34,0x4e,0x22,0x1f,0x24,0x67,0xcb,0xab,0x72,0x5b,0x7,0xd9,0xe4,0xb3,0x60,0xd0,0xff,0x5c,0x2b,0xfa,0xba,0xfb,0x2,0x13,0x92,0x4c,0x1b,0x37,0x92,0xfc,0xf4,0x14,0xd1,0x53,0x5b,0xf1,0xbb,0x82,0x24,0x8b,0xf7,0x18,0xaf,0xc7,0x77,0x44,0xe3,0xb,0xbd,0xfb,0xf6,0x7e,0xd,0xd8,0xde,0x41,0xf1,0x79,0x27,0x10,0xa8,0xf8,0x26,0xe9,0xc4,0xeb,0xf5,0x64,0x9c,0xe,0xa4,0xc7,0x31,0x3e,0xdb,0x81,0xaf,0x5b,0x61,0x68,0x5b,0x91,0x89,0xad,0xab,0x89,0xf9,0x69,0x1c,0xfb,0x62,0xf1,0x2a,0x0,0xfd,0xbc,0x1e,0xef,0x65,0xc9,0xae,0x5e,0x41,0x5e,0xf4,0x78,0x3c,0x56,0xf3,0x5e,0x57,0xc6,0x59,0x44,0xe6,0x7b,0x27,0x93,0x6d,0x41,0xb8,0xa9,0xf1,0x7f,0x5f,0x79,0xe5,0x95,0x10,0xf0,0x10,0xf0,0x19,0xf0,0x79,0xb,0x1f,0x75,0xf0,0xb4,0x2f,0x5a,0x8,0xef,0x13,0xe0,0xce,0x44,0xf6,0xc1,0xda,0x20,0x5e,0xdf,0xb3,0xc0,0x4f,0xda,0xe6,0x9d,0x31,0x1b,0x78,0xc6,0x85,0xe5,0x2f,0xf,0x96,0x6f,0x68,0xe4,0x8e,0xf,0x5,0x19,0x89,0x72,0x71,0x83,0x5b,0x9e,0xd2,0xe8,0xbe,0x47,0x3,0x41,0xff,0x4d,0x7b,0xb,0xdc,0xe3,0xf1,0xf4,0x11,0xac,0x6f,0x89,0x7d,0x1e,0x75,0xe3,0xf8,0xbd,0x2a,0xf0,0x90,0xe5,0xb6,0x16,0x95,0x97,0x97,0x57,0xa7,0x9f,0x33,0x7a,0xb0,0x25,0xf6,0x68,0x44,0xb3,0x81,0xef,0xb7,0x21,0xed,0x6b,0x2,0x41,0xff,0xfe,0xd1,0xe3,0x3d,0x2a,0x45,0xb0,0xeb,0x62,0xc,0xaf,0x16,0x98,0x48,0x64,0x72,0xc7,0x60,0x22,0xf3,0x87,0xcf,0x8a,0x83,0xff,0xdc,0x27,0x50,0x19,0x7d,0x5c,0xc1,0xeb,0xf1,0x7d,0xa,0xb4,0x65,0x2,0xc2,0x1b,0x2,0x45,0xe2,0xb2,0xca,0x2a,0x2a,0xca,0x37,0x7a,0x3c,0x9e,0xbe,0x82,0x8c,0x4,0xf9,0x15,0x70,0x41,0x1b,0xca,0x67,0x58,0x60,0xb0,0x3f,0xe8,0xdf,0x1c,0x63,0x79,0xae,0x1,0xd2,0x62,0x33,0x8f,0xdd,0x2b,0x18,0xc,0xee,0xe8,0x88,0xca,0xd5,0xf1,0x20,0x83,0xc7,0xe3,0xe9,0x7,0x5c,0xda,0x86,0x67,0x7f,0x81,0xf0,0x93,0x40,0xc0,0xff,0x7a,0xb4,0x2f,0x3,0x81,0xc0,0x5a,0xe0,0x25,0xe0,0x25,0x5f,0xba,0x6f,0xa2,0xa,0x37,0x12,0x79,0x3f,0xfb,0x62,0x20,0xe8,0xbf,0xb5,0x75,0x35,0x93,0x6b,0x18,0xa8,0x53,0xe1,0xd6,0x1,0x37,0x6,0x82,0xfe,0x27,0x1b,0x5f,0xac,0x5c,0x30,0x7f,0x3d,0xf0,0xac,0xcf,0xe7,0x9b,0xa5,0x36,0x77,0x3,0xb7,0x3b,0xc,0x7f,0x9f,0x38,0xe7,0x65,0x7d,0x20,0xe8,0x7f,0xb8,0xf1,0x85,0x8c,0x8c,0x8c,0x21,0x76,0x48,0x6f,0x45,0x98,0xd4,0x6,0xdf,0xec,0x10,0x22,0xb,0x1b,0xa2,0xb1,0x7f,0x1b,0xe2,0x7b,0x2f,0xa2,0x53,0xfc,0x81,0x40,0x68,0xe7,0x85,0x60,0x30,0x58,0x5,0xcc,0x3,0xe6,0xf9,0xbc,0xbe,0xab,0x55,0xf9,0x23,0xce,0xe6,0x23,0xbb,0x80,0x23,0x80,0xff,0xd0,0x85,0x71,0xec,0x36,0xb,0xd6,0xe9,0x6d,0x18,0x4,0xfa,0x40,0x2c,0x4e,0x6b,0x4e,0xb8,0x7b,0xe2,0xaf,0xf4,0xaf,0xb,0x4,0xfd,0xf7,0x4,0x82,0xfe,0x23,0x5b,0x2b,0xdc,0x86,0x7a,0xd1,0xe9,0xd4,0x47,0x5b,0x84,0xac,0x3d,0x85,0xbb,0x5b,0x9c,0xfc,0xfe,0x90,0x62,0xdf,0x9,0x14,0x3a,0x7c,0x46,0x9a,0xd7,0xeb,0x3d,0x3e,0x91,0x99,0x5b,0x51,0x51,0xb1,0x2e,0x50,0xe9,0xcf,0x47,0x9d,0xf,0x28,0x8a,0x72,0x43,0x33,0x63,0x9,0x47,0xe3,0x70,0x16,0x95,0x40,0xb1,0x62,0xff,0x36,0xd0,0x48,0xb8,0x4d,0xec,0x1b,0xf0,0xff,0x15,0xe5,0x26,0x1c,0xbe,0xa3,0x55,0x18,0x4e,0x17,0xa7,0x2d,0x7d,0xde,0x91,0xe,0xef,0xab,0x16,0xb8,0xc4,0xef,0xf7,0xaf,0x6b,0x87,0xf4,0x39,0x2d,0xb4,0x8b,0xfc,0x1,0xff,0xe3,0x7b,0xfb,0x51,0x30,0x18,0xb4,0x2d,0xe4,0x76,0x22,0x2b,0x75,0x9c,0x94,0xb0,0x5f,0xb6,0x47,0x26,0x7,0x2a,0xfd,0xcf,0x3,0x6f,0x3b,0x14,0xc1,0x35,0x19,0x19,0x19,0x4d,0xdc,0x57,0xb5,0xd5,0xe9,0x20,0xe0,0x7a,0x11,0xb9,0x35,0x18,0xc,0xda,0xad,0x88,0xf7,0x5f,0x80,0x5,0xe,0x9f,0x73,0x89,0x11,0x6f,0xf3,0x8c,0x71,0x78,0xdf,0x53,0xfe,0xa0,0xff,0x83,0x44,0x27,0xcc,0xe3,0xf1,0xf4,0x0,0x7c,0x4e,0xdc,0x65,0xc5,0x6a,0xf5,0x60,0x52,0x45,0xb0,0xa2,0x6,0x7,0x8b,0x23,0x1a,0xda,0xa0,0x8b,0xdb,0x2b,0xa3,0x15,0xf9,0xa9,0xc3,0x5b,0x7,0xd8,0x21,0x8d,0xe2,0xba,0xca,0x25,0x4e,0xd3,0x5c,0x11,0xa8,0xa8,0x69,0x7d,0xbc,0xed,0xcb,0x80,0x7a,0x7,0xf,0xf2,0x65,0x64,0x64,0xa4,0x1a,0xf1,0xee,0x41,0x46,0x46,0x46,0x4a,0xc3,0x80,0x48,0xcc,0xfd,0x32,0xb1,0x68,0xa7,0x77,0x9c,0xd6,0x81,0xe,0xdd,0xfa,0x55,0xc1,0x60,0xf9,0x9a,0x18,0xa5,0xb1,0x14,0x67,0x23,0x95,0x3,0xda,0x2b,0xa3,0x83,0xc1,0x8a,0x8f,0x1c,0xbb,0xa0,0x12,0xd5,0x8e,0xfd,0x1c,0x5,0x25,0xba,0x34,0xb6,0x78,0x7,0xd7,0xa1,0xac,0x72,0xf0,0xac,0x14,0xdb,0x6e,0x53,0x9f,0xbc,0x6b,0x8a,0x57,0xc3,0x3a,0x0,0x67,0x83,0x5d,0x1f,0xf8,0xfd,0xfe,0xaf,0xdb,0x23,0x61,0x82,0x38,0x9d,0x8c,0xfe,0x5c,0xac,0x37,0x4,0x82,0x81,0x6d,0x40,0x99,0x83,0x67,0xb5,0xf7,0xac,0x24,0x75,0x66,0xcb,0xa8,0xe2,0x75,0x12,0xf7,0x97,0xfd,0x1,0xff,0x76,0x7,0x11,0x70,0x36,0x27,0x5c,0xb5,0xb7,0x11,0x6f,0xfc,0x5a,0x8c,0xff,0xb6,0x57,0xc2,0x4,0x75,0xb6,0xb2,0x49,0xe4,0x55,0x87,0xf,0xfc,0xa7,0x83,0xbb,0xda,0x7b,0xd6,0xd7,0x57,0xe,0xc5,0x6b,0xc5,0x25,0xee,0x22,0x2f,0x39,0xb3,0xad,0xbe,0xe2,0x30,0xbd,0x3d,0x8c,0x78,0x9b,0x54,0x68,0x8e,0xc5,0xfb,0x51,0x3b,0x36,0x31,0x4e,0xc4,0x1b,0x1a,0x3c,0x78,0xe0,0x7f,0x9c,0x95,0x2f,0x58,0x74,0x8b,0x17,0x0,0x0,0x13,0xdf,0x49,0x44,0x41,0x54,0x59,0x98,0xf4,0x2d,0xaf,0xf2,0x99,0x43,0x5b,0xc6,0xa5,0xe5,0x15,0x78,0xdd,0x91,0x2,0x7b,0xf4,0x58,0xe2,0xc8,0xe5,0xd7,0x76,0x5d,0x9a,0xda,0xee,0x38,0x2d,0x3c,0xe,0xc5,0xab,0x1b,0xf6,0xf6,0xb,0x8f,0xc7,0xe3,0xb2,0xb0,0xe,0xb5,0x91,0xa1,0x16,0xba,0x8f,0x2a,0x3,0x44,0xd8,0x47,0x23,0xcf,0xc,0xa3,0x6c,0x41,0x74,0xa3,0xa8,0x7c,0x64,0xa5,0x58,0x1f,0x95,0x97,0x97,0x37,0xe7,0x86,0x39,0x79,0x8f,0x5a,0x33,0x6b,0xd6,0x2c,0x75,0x56,0xc0,0xb5,0xd6,0x49,0xcb,0x7b,0xe9,0xa5,0x97,0xba,0x66,0xcd,0x9a,0x15,0x6e,0x8f,0xcc,0x16,0x61,0x9d,0x3a,0xcb,0xb7,0x7e,0xc0,0xc6,0x9d,0xff,0xf3,0xf9,0x7c,0x3,0xd4,0x8e,0x7d,0x2,0x85,0xda,0x8e,0x6c,0xc4,0xdc,0xb9,0x73,0xc3,0x5e,0x8f,0xaf,0x2e,0xd6,0x96,0x54,0x2c,0xe9,0x65,0xc4,0xdb,0xb4,0x10,0xf4,0x70,0x56,0x8,0xd8,0xd4,0xd2,0x97,0x5e,0x8f,0xef,0xaf,0xc0,0xe5,0xa,0xa9,0x82,0x46,0x3a,0x68,0xb2,0x47,0x47,0x4d,0x1a,0x9c,0x62,0x81,0x70,0xc8,0xae,0xf3,0x7a,0x7c,0xaf,0x20,0x3a,0xb1,0xc9,0x6e,0x92,0xc2,0x7e,0xe,0x7a,0x78,0x75,0x4e,0xd,0xa9,0x10,0x72,0x32,0x1d,0x68,0xc3,0x86,0xd,0xfb,0x3b,0x75,0x67,0x1d,0x78,0x4c,0x9b,0x9c,0xcd,0x59,0x92,0x3d,0x67,0x10,0x1d,0xec,0xb0,0xf6,0x8,0xb5,0x21,0xfa,0xf5,0xb1,0x8a,0x57,0x55,0x87,0x1a,0xf1,0xee,0x81,0xd,0x5b,0xc5,0x51,0x1,0xdf,0xdb,0x20,0x92,0x1e,0x0,0x12,0xcb,0xf0,0x7e,0x2a,0x70,0x9,0x2a,0x5b,0x80,0xeb,0xe3,0x25,0x44,0x67,0xfd,0x42,0x11,0x27,0xe3,0x41,0xed,0xb8,0x8d,0x30,0x88,0xf4,0x73,0x38,0x66,0x55,0x17,0x1f,0xdb,0xda,0xd2,0x26,0x13,0x1b,0xda,0xde,0xe7,0x15,0xc4,0xd1,0xfa,0x44,0x51,0x6,0x25,0xa8,0x2f,0x27,0x51,0xae,0xad,0x71,0x10,0x92,0xf3,0xf7,0x82,0xaa,0x4e,0x2a,0x42,0xdd,0xbc,0x79,0x73,0x3b,0xae,0x35,0xb5,0x9d,0xda,0xdf,0xde,0xa3,0xc2,0x71,0xb6,0x67,0xb6,0x4a,0x5b,0xfa,0xf8,0x31,0xe7,0x8d,0x88,0xac,0x35,0xe2,0x6d,0x22,0x42,0xdd,0xe2,0xb0,0xee,0x3c,0x24,0x41,0xcd,0x5e,0xb4,0x97,0xf8,0x4e,0x76,0x2f,0xe8,0x71,0xe9,0xa5,0x97,0x3a,0x1b,0x81,0x17,0x75,0xd2,0xc7,0xe,0xc7,0x63,0x83,0xf6,0x18,0x22,0x79,0xb0,0x33,0xf3,0xee,0x2e,0xde,0x8a,0x8a,0x8a,0x1d,0x38,0x18,0x40,0x12,0x4b,0x1c,0xd,0x20,0x79,0x3c,0x9e,0xbe,0xec,0xbe,0x30,0xa5,0xb5,0x7d,0xec,0xed,0x46,0xbc,0x4d,0x9c,0x1f,0xdb,0xe9,0xce,0x0,0x27,0x26,0x28,0x1d,0xa1,0x28,0x2d,0xaf,0x93,0x8c,0x73,0xaf,0x5f,0xbf,0xfe,0x74,0x87,0x71,0x18,0xe7,0x44,0xbc,0xed,0x9c,0xdf,0xc3,0x1c,0x3a,0x36,0xe1,0x56,0xd9,0x7c,0xef,0x7d,0xd0,0x73,0x1c,0x7a,0x7a,0x19,0x8e,0xdc,0x66,0x61,0x87,0x11,0xef,0x9e,0x37,0x59,0xd6,0x16,0x9c,0x75,0x9e,0x4e,0xc8,0xc8,0xc8,0x48,0x8b,0x7b,0x2a,0xb4,0x69,0xcb,0x2b,0x4e,0x33,0x4e,0x2d,0x87,0x27,0x3b,0x88,0x93,0xf5,0xb9,0xa1,0xce,0x90,0xdf,0x88,0x86,0xe3,0x54,0xf1,0x38,0x9d,0x52,0xf9,0x23,0x87,0xe9,0xad,0x31,0xe2,0xdd,0x3,0xbf,0xdf,0x5f,0xf,0x7c,0xe8,0xe0,0xd6,0x7e,0x76,0x48,0xe3,0xbf,0x8b,0x44,0x14,0xb7,0xd9,0x76,0xbc,0x6f,0x90,0xc6,0x3c,0xdf,0xd8,0xeb,0xf1,0xd,0x74,0xe8,0x55,0xb4,0x9b,0x78,0x1b,0xe6,0x7a,0x3b,0x19,0xf4,0xd9,0xa6,0x1a,0x75,0x6d,0xb1,0x93,0xf9,0xc6,0x63,0x3c,0x9e,0xc,0x27,0xdb,0xa0,0x7a,0x9d,0x95,0xb,0xd9,0x66,0xc4,0x1b,0x9d,0xa0,0x43,0xa1,0x4d,0xc8,0xcc,0xcc,0x4c,0x6d,0xa6,0x4f,0x74,0xb1,0x62,0xf,0xd9,0xf9,0x21,0xb2,0x9e,0xd7,0x91,0x8,0xc2,0xe1,0xfa,0xaf,0x89,0x9c,0x38,0x18,0x2b,0x87,0xfb,0xd2,0x7d,0x87,0xc5,0x56,0x46,0xb8,0xd0,0xa1,0xd,0xd7,0xb7,0x5b,0x6f,0x57,0xac,0x89,0x8e,0xc4,0xab,0xbc,0x14,0xc,0x6,0xa3,0x79,0x59,0x6b,0x1c,0x15,0x38,0xd5,0x98,0xb6,0xde,0xcd,0xf0,0x66,0x8c,0x0,0xe,0x74,0xf0,0xa8,0xda,0x50,0x48,0xbf,0x31,0xe2,0x8d,0x9e,0xa9,0x8b,0x1d,0xde,0x79,0x54,0x5d,0x6d,0x7d,0x71,0x33,0x2d,0xfa,0xd6,0x60,0x30,0xb8,0x7e,0xe7,0x7,0x55,0x6d,0x65,0x5c,0x9a,0xb4,0x2,0xb,0x17,0x2e,0xc,0xb,0x38,0x99,0x56,0x97,0xa2,0x42,0xab,0xcf,0x17,0xf2,0x79,0x7d,0x3,0x54,0x79,0xdc,0xa1,0xa4,0x9e,0x69,0xb7,0x9c,0x56,0xa6,0x38,0x2b,0x21,0xfa,0xb7,0xe8,0x75,0x30,0x4f,0x3a,0x8a,0x86,0xf0,0x9c,0xcf,0xe3,0x6b,0xf5,0x9c,0x63,0x5b,0xf5,0x19,0x67,0xe5,0x54,0xca,0x16,0x2e,0xf4,0xd7,0x19,0xf1,0x46,0xbf,0xb3,0x2d,0xbb,0x14,0xdc,0xe0,0xf5,0xf8,0xf6,0xba,0x3,0x85,0x48,0xeb,0x5e,0x2d,0x88,0x44,0x77,0x3f,0x15,0x79,0xd1,0x61,0xfc,0x4e,0xf3,0x7a,0x7c,0xbf,0xdf,0xab,0x70,0xd3,0x7d,0x3d,0x54,0x79,0xd,0xa7,0x93,0x5d,0x2c,0xfd,0x63,0xfb,0xb8,0xcc,0xbe,0xbb,0x71,0x30,0x5a,0xdb,0xa0,0xb6,0x25,0xd1,0x2f,0xa7,0xfc,0xc9,0xe1,0xb8,0x47,0x1f,0x85,0xbf,0x79,0xbd,0xde,0xd6,0xec,0x4c,0xf9,0x17,0x1c,0xe,0xb2,0x21,0xbc,0x40,0x17,0xc7,0xb1,0x78,0x55,0xed,0x95,0x44,0xe,0x9a,0x76,0x66,0x5a,0xb8,0xd7,0xeb,0xf1,0x3d,0xe1,0xf3,0xf9,0xa2,0x6e,0x60,0x36,0x7c,0xf8,0x70,0x51,0x38,0xa6,0x75,0x8d,0x8a,0x34,0xd3,0xff,0xb2,0xff,0xdb,0x86,0xf8,0xdd,0xee,0xf5,0xf8,0x8a,0x7e,0xf0,0x83,0x1f,0x44,0x2d,0x64,0x19,0xbe,0x51,0x7,0x6a,0x64,0xbf,0xe2,0x33,0x1d,0x3e,0x63,0x87,0xdf,0xef,0x8f,0xe7,0xcc,0xaa,0xb4,0x66,0x3c,0x83,0x6b,0x4,0x7e,0xdb,0x6,0x7f,0x3b,0xea,0xc0,0x5f,0x20,0x50,0xba,0xe,0x1c,0x8f,0xe6,0x5e,0x84,0xca,0xb,0xe9,0xe9,0x9e,0xa8,0xd3,0x6c,0x47,0x8f,0x1e,0xdd,0xcb,0xeb,0xf1,0x3d,0x4d,0x5b,0x8e,0xa5,0x51,0x96,0x77,0x75,0xf1,0x3a,0x7e,0x69,0x1e,0xc,0x6,0xc3,0x5e,0x8f,0xef,0x51,0xa0,0x2d,0x5b,0xbf,0x5e,0xa3,0x36,0x17,0x79,0x3d,0xbe,0xbf,0x23,0xcc,0x51,0x8d,0x4c,0x13,0x14,0xd5,0x83,0x10,0xb9,0x92,0x56,0x8a,0x17,0xd1,0xa8,0xe2,0xd,0xdb,0xae,0x55,0x2e,0xcb,0xfe,0x6,0x67,0x7b,0x2d,0x59,0x40,0x4e,0x8f,0xb4,0x9e,0x57,0x78,0x3d,0xbe,0xbf,0xa3,0x2c,0x53,0x61,0xbd,0x20,0x7,0x83,0x7a,0x6d,0xdb,0xbe,0xd8,0x71,0x6b,0x16,0x21,0xde,0x93,0x33,0xac,0x5d,0x2d,0xad,0xc7,0x2d,0xea,0x1a,0x8d,0xe8,0x8d,0xaa,0x8e,0xfb,0xe3,0x80,0xfc,0x25,0x10,0xa8,0x68,0xc9,0xf5,0x5c,0x1,0x9c,0xe1,0x30,0xf0,0xb,0x2d,0xb1,0xbe,0xf2,0x7a,0x7c,0xcf,0xa3,0x2c,0x52,0xe1,0x7f,0x82,0xec,0x7,0x3a,0x22,0x54,0x1f,0xbe,0x92,0xb6,0x9d,0xef,0x53,0xa3,0xf0,0xa9,0x11,0x6f,0xcb,0xcd,0xef,0xe3,0x88,0xdc,0x42,0xdb,0x6,0xbe,0x6,0x0,0xe3,0x51,0xc6,0x4b,0x23,0x3f,0x38,0xa6,0x22,0xa6,0xd1,0x47,0x3e,0x17,0x2c,0x28,0xaf,0xf3,0xa4,0xfb,0x26,0x89,0xf0,0xf7,0x36,0xc4,0x6f,0x28,0x90,0x8b,0xec,0x1c,0xed,0xd1,0x78,0xd8,0x5d,0x41,0xaf,0x8d,0x73,0x5e,0xba,0xbc,0x1e,0xdf,0x56,0x22,0xaf,0x47,0x86,0x20,0x6d,0x8f,0xa7,0xad,0xe1,0x5b,0x5b,0xfe,0x9e,0x9f,0x58,0xc2,0x27,0x6d,0xc8,0xff,0xde,0xc0,0xb5,0x8,0xd7,0xc6,0xd1,0xb6,0x0,0x53,0x82,0xc1,0x8a,0xea,0xae,0x2e,0xde,0x36,0xed,0xdb,0x1c,0xa8,0xc,0xac,0x6,0x5e,0xec,0xe8,0x44,0x68,0x4b,0xaf,0x2d,0x84,0xd7,0x48,0xbe,0xf7,0x7d,0x1b,0x3,0xc1,0xc0,0xc2,0x4,0x84,0xdb,0x17,0x18,0x12,0xa7,0xb0,0x36,0x58,0x96,0x6c,0x6c,0xe9,0x7,0x95,0x95,0xfe,0xd5,0xc0,0x97,0x49,0x57,0xaa,0x85,0xbf,0xd2,0xd,0x88,0xc7,0x59,0x45,0x33,0x92,0x20,0xb3,0x42,0xcd,0xbb,0xf7,0xfe,0xad,0xa,0x77,0x27,0x57,0xd9,0x4a,0xdc,0x46,0xdc,0x71,0x8b,0xa3,0xc8,0xd5,0x81,0x40,0x60,0xaf,0x53,0x20,0x15,0xbd,0x2e,0xc9,0xa2,0xfe,0xc7,0x40,0xc0,0xff,0x8d,0x11,0x6f,0x6b,0x5a,0xdf,0xa0,0x7f,0x11,0xb4,0xfe,0xd5,0x4a,0x82,0x9a,0xde,0xfa,0x96,0xdd,0x6a,0x7d,0x1c,0xf8,0x36,0x49,0x6c,0xbe,0xd9,0x1f,0xf4,0x3f,0x92,0xe4,0xe5,0xe2,0x4d,0x5b,0x65,0x5e,0xeb,0xc6,0x3e,0x2,0x7e,0xe0,0x9d,0x24,0x89,0xb7,0x2a,0xfc,0x81,0x6e,0x42,0x7c,0x4e,0x9,0xb4,0x35,0x1b,0xd8,0xd0,0x51,0x89,0x90,0xbd,0xcc,0xf6,0x9,0x54,0x6,0x36,0x22,0x8e,0xe6,0x1e,0xc7,0x9b,0xb0,0xa2,0xe7,0x27,0x79,0x99,0x50,0xdb,0xe,0x67,0x4,0x83,0xe5,0xad,0x5e,0x78,0x20,0x16,0x67,0xe1,0x6c,0x42,0x4c,0xbc,0xc9,0x9,0x6,0xfd,0xab,0x8d,0x78,0x63,0x69,0x7d,0x17,0x4,0xbe,0x15,0xb8,0x10,0x67,0x53,0xe6,0xda,0x5e,0xda,0x5a,0xb1,0xc8,0x3b,0x10,0xf0,0x2f,0x93,0x8e,0x3f,0x70,0xac,0x20,0x18,0xc,0xfc,0x3b,0xb9,0xa5,0xab,0x97,0x55,0x2e,0xa8,0x8c,0x49,0x88,0x7e,0xbf,0xbf,0x5a,0x22,0xb,0x33,0x42,0x1d,0x18,0xf3,0x97,0xc3,0xb6,0xf5,0x28,0xdd,0x88,0xb8,0x9d,0x62,0xef,0xf,0xfa,0x17,0x21,0x5c,0x49,0x3b,0x2f,0x82,0x6f,0x28,0x70,0xad,0xaa,0x34,0xea,0xc3,0xf5,0x8f,0xa2,0x3c,0xdd,0x41,0xb6,0x7e,0x3a,0x10,0xf4,0xdf,0x96,0xe4,0xe5,0x21,0xd7,0x72,0x5b,0x2f,0x3a,0xcc,0xff,0x7f,0xa3,0xdc,0x45,0xc7,0x9c,0x42,0xbf,0x58,0x91,0x9f,0x2e,0x58,0x50,0x5e,0x6f,0xc4,0xeb,0xb4,0x5,0xe,0xf8,0x5f,0x0,0xf1,0xd0,0x8e,0x73,0x76,0x63,0x11,0xef,0xc2,0x85,0xb,0xc3,0x2a,0xf6,0x35,0x88,0xc3,0xa9,0x82,0xe,0x5d,0x65,0xe0,0x8e,0x40,0xd0,0x7f,0x75,0x72,0xb7,0xb8,0x5c,0x11,0x8,0xfa,0x67,0x54,0x54,0x54,0x38,0x7e,0x5f,0x13,0xa8,0xf4,0xdf,0x27,0xc2,0x55,0xed,0x5c,0x81,0x3f,0x81,0x68,0x46,0x30,0x58,0xb1,0x8d,0x6e,0x86,0x15,0xef,0x0,0x3,0xc1,0x8a,0xd7,0x11,0xce,0xa0,0x1d,0xb7,0x79,0xc5,0x6a,0xfd,0xde,0x48,0xc1,0x60,0xd0,0xe,0x4,0xfc,0x77,0x6b,0xe4,0x74,0xc3,0x44,0xaf,0xa7,0xdd,0x1,0x72,0x51,0x20,0xe8,0xbf,0x2f,0xc6,0x3e,0x7c,0x7b,0xf2,0x99,0x82,0x2f,0x50,0xe9,0xff,0x47,0x5c,0x3c,0xb0,0x80,0xff,0xef,0xa,0x67,0x3,0x5b,0xda,0x21,0xee,0xb9,0x29,0xa9,0xee,0xeb,0x3,0x81,0x40,0xd,0xdd,0x10,0x2b,0x11,0x81,0x6,0x2,0xfe,0xd5,0x96,0xca,0x8,0x22,0xd3,0xf2,0xaa,0x12,0x9c,0x6,0x55,0x8d,0x7d,0xf9,0x5f,0x30,0xe8,0x7f,0x4e,0x84,0x13,0x71,0xb6,0x78,0x61,0x6f,0xd8,0xc0,0x73,0x88,0x1e,0x1f,0x8,0x56,0xc4,0xbc,0xf,0x74,0xd8,0xb6,0x42,0xed,0xd0,0x7a,0x6d,0x4,0xc6,0x5b,0x2a,0x47,0x4,0x83,0xfe,0x40,0x3c,0x3,0xe,0x6,0xfd,0x6f,0x5a,0x2e,0x39,0x12,0x78,0x3c,0x41,0x15,0x64,0x25,0xe8,0xf7,0x3,0x41,0xff,0x8c,0xb2,0xb2,0x32,0xa5,0x9b,0x92,0xf0,0x4a,0xde,0xe7,0x1b,0x35,0x58,0x6d,0xfb,0xe,0x60,0x3c,0x6d,0xd9,0x23,0xaa,0x29,0x5b,0x81,0xd9,0xa,0xd3,0x83,0x41,0xff,0xb2,0xb6,0x4,0xe4,0xf1,0x64,0x8c,0x14,0xf4,0xf,0x44,0x5a,0x8c,0xb6,0x8a,0xf6,0x25,0x81,0xbb,0xfd,0x41,0xff,0x7b,0x6d,0x9,0xc8,0x9b,0xee,0xcb,0x46,0xe2,0xfe,0xe,0xbd,0x1a,0x28,0x7,0xe6,0x2b,0xf6,0x63,0xc1,0x60,0x30,0xe1,0x3b,0x79,0x78,0x3c,0x19,0x47,0xb,0x7a,0xf,0x91,0x85,0xf8,0x6d,0x6d,0x2c,0x16,0x83,0xde,0x35,0x78,0xc8,0xe0,0xa,0xa7,0x5b,0xf4,0xb6,0x68,0x73,0x8f,0x6f,0x3b,0xb1,0xed,0xf7,0x6d,0x37,0x9c,0xcf,0x5b,0xdb,0x25,0xc5,0xbb,0x93,0x8c,0x8c,0x8c,0xfe,0xe1,0xb0,0x8e,0x16,0x18,0x4b,0xe4,0x73,0x60,0x8c,0xa2,0xf8,0x1c,0x58,0x9,0xbc,0x89,0x48,0x69,0x8f,0x1e,0xa9,0x4b,0xe6,0xce,0x9d,0x1b,0xb7,0xc1,0x91,0x71,0xe3,0xc6,0x49,0xed,0xf6,0xda,0xe3,0x10,0xc6,0x69,0x24,0x7e,0xe9,0xb4,0x6e,0xee,0x72,0x15,0x30,0x1f,0xa5,0x4c,0x45,0xca,0x82,0xc1,0x8a,0xb8,0xbc,0xaa,0xc8,0x48,0xcf,0xb0,0x6c,0xf4,0x46,0x84,0x4b,0x80,0x43,0x62,0x28,0xf8,0x4a,0x64,0xc1,0xc8,0x7a,0x22,0xaf,0xef,0xd6,0x3,0x6b,0x11,0x9,0x4,0x2,0x15,0xaf,0xd3,0x41,0x64,0xa4,0x67,0x1c,0xa2,0xa2,0x63,0x15,0x32,0x89,0x1c,0x52,0xd7,0x9a,0xe3,0x68,0xea,0x80,0x4a,0x81,0x32,0x15,0x2d,0xab,0xa9,0xa9,0x79,0xef,0xf5,0xd7,0x5f,0x4f,0x58,0x4b,0xeb,0xf5,0xf8,0xae,0x5,0xae,0x6,0xe,0x22,0xb2,0xef,0xf7,0x0,0x76,0xdf,0x70,0x3e,0xd4,0x60,0xdb,0x4d,0xd,0xe5,0xf1,0xf1,0x40,0xd0,0x3f,0xab,0xcb,0xb6,0xbc,0xd1,0x18,0x3e,0x7c,0xb8,0xf4,0xed,0xbb,0xcf,0x30,0xb,0x7b,0x3f,0x15,0x86,0x60,0x33,0x4,0x61,0x8,0x8a,0x85,0x50,0xd,0xb2,0xd,0xa8,0x46,0xa9,0x12,0xf4,0x73,0x57,0xaa,0xeb,0xe3,0xf9,0xf3,0xe7,0xb7,0xeb,0x7e,0x44,0xe9,0x67,0xa5,0xf7,0x10,0xb7,0xfb,0x58,0xd0,0xa1,0xc0,0x10,0x41,0x87,0x82,0xf4,0x3,0x36,0x28,0xac,0xb3,0x60,0x9d,0x8a,0xae,0x1d,0x3c,0x78,0xf0,0xfb,0x89,0x68,0x5,0xba,0x32,0xc3,0x87,0xf,0xb7,0xfa,0xf6,0x1d,0x70,0x1c,0xe8,0xbe,0x8d,0x6c,0x3b,0x10,0xd8,0xd2,0xc8,0xb6,0xeb,0x52,0xac,0x94,0xff,0x96,0x55,0x94,0xd5,0x76,0x54,0x3c,0x2f,0xbd,0xf4,0x52,0x59,0xbf,0x7e,0x7d,0x3f,0x94,0x3e,0x2e,0xb7,0xab,0x6a,0xd3,0xa6,0x4d,0x55,0x4b,0x97,0x2e,0x35,0x79,0x6d,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0x30,0x18,0xc,0x6,0x83,0xc1,0x60,0xe8,0x68,0x5c,0xc6,0x4,0x86,0xf6,0x60,0x42,0x6e,0xee,0x61,0xc3,0x87,0x8f,0xb4,0xdf,0x7e,0xeb,0xf5,0x5a,0x63,0x8d,0xf8,0x60,0x19,0x13,0x18,0xda,0x3,0xb1,0x65,0x55,0x8a,0xcb,0xbe,0xde,0x58,0x22,0x7e,0xb8,0xbb,0x42,0x22,0xc6,0x8f,0x1f,0x6f,0xb9,0x5c,0x69,0x17,0x21,0x5c,0xb,0x9c,0x6,0xf4,0x3,0x3e,0x3,0x3e,0x2,0xfe,0x52,0x52,0x5c,0xf8,0x8a,0xc9,0x6a,0x83,0x69,0x79,0x93,0x8c,0x9c,0x9c,0x49,0x3d,0x5d,0xee,0xb4,0x7f,0x20,0xbc,0x48,0xe4,0xb0,0xaf,0x32,0xe0,0x7e,0xe0,0xdf,0xc0,0x11,0xc0,0xec,0xac,0xec,0xbc,0x97,0x4c,0x56,0x77,0x30,0x2a,0xc3,0x6d,0xdb,0xfa,0x9b,0x31,0x44,0x1c,0xbd,0x99,0xce,0x9e,0x80,0xac,0xec,0xbc,0x62,0x22,0xdb,0xdb,0x94,0xd4,0xd6,0x6c,0x9b,0xf4,0xf8,0xe3,0x8f,0x87,0x76,0x9,0x3b,0xc7,0x6d,0xab,0x35,0x11,0x78,0x0,0xb8,0xaf,0xa4,0xb8,0xf0,0xe,0x93,0xe5,0x6,0x23,0xde,0xe4,0x10,0xee,0x91,0xc0,0xc7,0xc0,0xe2,0x92,0xe2,0xc2,0x91,0x51,0x7f,0x93,0x95,0x65,0x21,0xee,0x57,0x81,0x33,0x4b,0x8a,0xb,0x7,0x98,0x2c,0x37,0x18,0xb7,0x39,0x39,0x6a,0x9e,0xb3,0x0,0x6c,0x25,0xab,0xb9,0xdf,0x94,0x94,0x94,0xd8,0xc0,0x54,0xa0,0x7f,0x76,0x76,0xde,0xe1,0x26,0xcb,0xd,0x5d,0x85,0x4e,0x3d,0x60,0xa5,0x30,0x1c,0xa8,0x7a,0xa8,0xa4,0x70,0x2f,0x27,0x16,0xca,0x47,0xa0,0x4f,0x1,0xfb,0x1,0xab,0x9b,0xb6,0xe0,0x13,0x8f,0x1,0xbd,0x1d,0x38,0xa1,0xc1,0x26,0xef,0xa1,0x94,0x94,0x94,0x14,0xbe,0x19,0xa5,0xb5,0xbf,0xb,0xe8,0x59,0x52,0x5c,0x78,0x5b,0x56,0xf6,0x44,0xf,0xe8,0x2d,0xc0,0x91,0xc0,0x1a,0x84,0xc7,0x4a,0x66,0x14,0x3e,0x3,0x30,0x61,0x42,0x6e,0x8a,0x58,0x92,0x43,0x64,0x11,0x7a,0x1f,0x60,0x91,0xcb,0xd2,0xdb,0x8b,0x8a,0x8a,0xa2,0x9e,0x42,0x30,0x7e,0xe2,0x44,0xb1,0x42,0x7a,0x83,0xc0,0x68,0xe0,0x64,0xe0,0x3d,0x60,0x41,0x49,0x71,0x61,0x51,0xcc,0x1e,0x49,0xce,0xc4,0x4b,0x50,0xbd,0x8,0xf8,0x7e,0x83,0x67,0xf2,0xb6,0xa,0x77,0xcd,0x9c,0x51,0xa8,0x7b,0xa4,0xe5,0xf,0xc0,0xfe,0x25,0xc5,0x85,0xd7,0x64,0x65,0xe5,0x9e,0x8c,0xc8,0x94,0x6,0x1b,0x7c,0x1,0x1a,0xb0,0x2d,0xfe,0xf0,0x50,0x51,0x51,0xd4,0x35,0xd3,0x13,0xb2,0x27,0xa6,0xb,0x3a,0x19,0x38,0xe,0xd8,0xa4,0xf0,0x12,0x22,0xf,0x12,0x96,0x11,0x62,0xd9,0xbf,0x50,0xdb,0xfa,0xd5,0xcc,0x99,0xd3,0x6a,0x1a,0x3d,0xeb,0x2f,0x28,0xcf,0x95,0x94,0x14,0x96,0xee,0x8a,0x67,0xde,0x9d,0x28,0x47,0x94,0x14,0x17,0x5e,0x9b,0x95,0x93,0x77,0x22,0xca,0x6f,0x80,0x53,0x88,0x9c,0xe3,0xe4,0x77,0x59,0x7a,0x7f,0x51,0x51,0x51,0xd4,0x2d,0x8e,0x72,0x73,0x73,0x7,0x84,0x6d,0xb9,0x85,0x48,0x5,0xde,0x1b,0xf8,0x8f,0xa,0x33,0x67,0xce,0x28,0x7c,0xa7,0xbb,0x88,0xb7,0xb3,0xf,0x58,0x9d,0x46,0x2b,0xf6,0x8b,0x2e,0x29,0x9e,0xfe,0x75,0x49,0x71,0xe1,0x35,0xc5,0xc5,0x85,0xaf,0x37,0x15,0x63,0xee,0x15,0xa0,0xff,0x25,0xb2,0x48,0x7c,0x45,0x83,0x68,0x46,0x21,0x2c,0x9a,0x90,0x9d,0x97,0x1d,0x25,0xb8,0xf3,0x80,0xcb,0xb2,0xb2,0xf3,0x2e,0x6,0x9d,0x43,0x64,0x77,0x8a,0xa5,0xc0,0x49,0x28,0x4f,0x67,0x65,0xe7,0xdd,0x9c,0x9d,0x3d,0xd1,0x2d,0x96,0xcc,0x2,0x26,0x3,0xab,0x80,0xaf,0x80,0x1b,0xc3,0xb6,0x7c,0x38,0x61,0x42,0x7e,0xff,0xa6,0xae,0xfd,0x44,0xb7,0x2b,0xa4,0x4f,0xa,0x3c,0x42,0x64,0x93,0x82,0x52,0x22,0x87,0xa3,0x15,0x66,0x65,0xe7,0xc5,0xb4,0x9b,0x63,0x56,0x76,0xde,0x3d,0xa8,0xbe,0x0,0x9c,0xd4,0x10,0x4e,0xf,0xe0,0x4e,0x51,0x96,0x5e,0x77,0xfd,0x2f,0xf6,0x7c,0xaf,0x7f,0x31,0xf0,0xf3,0x9,0xd9,0x79,0x23,0x10,0x59,0x4a,0x64,0x17,0x89,0xca,0x48,0x1c,0xe4,0x1e,0xcb,0x96,0xe7,0x73,0x73,0x73,0x25,0xca,0x33,0x2e,0x15,0xb4,0x2,0xc8,0x20,0x32,0xa2,0xff,0x5f,0x81,0x5c,0x51,0xd,0x88,0xa5,0x63,0x81,0x9f,0x8b,0xe8,0x9e,0xd,0xc3,0xcf,0x45,0x38,0x7e,0x8f,0x6b,0xe7,0x2,0xd7,0x64,0x65,0xe5,0x7d,0x1f,0xe5,0xd,0x60,0x30,0x91,0x81,0xc6,0xfd,0x80,0xdf,0x87,0x6d,0x79,0x71,0xfc,0xc4,0x89,0x4d,0xe6,0x22,0x64,0x67,0xe7,0x9e,0x14,0xb6,0xe5,0xfd,0x86,0xb1,0x8e,0xd,0xc0,0x7,0xc0,0x5,0xa2,0x2c,0x9d,0x90,0x9d,0x77,0x85,0x69,0x79,0x3b,0x7,0x87,0x3,0x6b,0x9d,0xde,0x3c,0x21,0x3b,0xef,0x10,0xe0,0x6f,0xc0,0x12,0xb7,0xb,0x5f,0x61,0x61,0x61,0x6d,0x64,0xa0,0x2b,0xaf,0xaf,0xad,0x2c,0x16,0xb8,0x27,0x37,0x37,0xf7,0x89,0xa2,0xa2,0xa2,0x3d,0xf7,0xe1,0x1a,0x2,0x14,0x5b,0x62,0x1f,0x3e,0x63,0xc6,0x8c,0x6f,0x23,0x2d,0x6d,0xce,0xfe,0x62,0x59,0x1f,0x3,0xf7,0x80,0xae,0x2,0x4e,0xac,0xaf,0x73,0x1d,0xfe,0xe8,0xa3,0x5,0xdb,0x1b,0x4,0x3a,0xe,0xd1,0x39,0x62,0x85,0x67,0x2,0x57,0xed,0x5e,0x85,0xea,0xaf,0x51,0x7e,0x6,0x72,0x73,0x49,0xf1,0xf4,0x47,0x22,0x71,0xc8,0x11,0x1b,0x6b,0x22,0x4a,0xc1,0x84,0x9c,0xbc,0xab,0x66,0xce,0x28,0xdc,0xeb,0x96,0xb5,0x59,0x59,0xb9,0x63,0x80,0x3b,0x80,0xa9,0x25,0xc5,0x85,0xb7,0x7c,0x97,0xce,0xac,0xbc,0x8b,0x45,0x78,0xa1,0x77,0xef,0xbe,0x7f,0x4,0xae,0x8b,0xd2,0xfd,0xf0,0x23,0x72,0x56,0xc9,0x8c,0xe9,0x4b,0x1a,0x9,0xb4,0x3c,0xe2,0x35,0xb8,0x6,0xd1,0x74,0x37,0xd0,0x27,0x80,0x1d,0xb6,0x25,0xc7,0x3c,0x54,0x34,0xfd,0x7f,0x0,0xf9,0xf9,0xf9,0x29,0xb5,0x75,0xe1,0x72,0xd0,0xd8,0xdf,0xe5,0xa,0x2f,0xab,0x70,0xfe,0xcc,0x19,0x85,0xfe,0x46,0xcf,0x9f,0xd,0x5c,0x60,0xd5,0x73,0x74,0x83,0x38,0x1b,0x79,0x5c,0x32,0x7,0xb0,0x55,0xe5,0xc4,0x99,0x25,0xd3,0xbf,0x68,0x68,0x89,0xfb,0x84,0x6d,0xa9,0x14,0x78,0x3a,0x2b,0x2b,0xaf,0xbc,0xa4,0xa4,0x70,0x9d,0x69,0x79,0xbb,0xf0,0x80,0x9b,0x8,0x67,0x3,0x8a,0xca,0x5,0x3b,0x85,0xb,0x30,0x63,0x46,0x61,0x15,0x2a,0xd7,0x2,0x7d,0xc3,0xb6,0x5c,0x10,0xe5,0xd6,0xde,0x2,0x97,0xef,0x14,0x2e,0xc0,0xcc,0x99,0x33,0xbe,0x1,0xfd,0x35,0x30,0x40,0xe1,0x39,0x4b,0xb8,0x60,0xa7,0x70,0x1,0xdc,0x6e,0x2d,0x6d,0x70,0x7,0x77,0x3b,0x31,0xe1,0xa6,0x9b,0xb3,0xfa,0xa2,0xfc,0xe,0x58,0xb4,0x53,0xb8,0x91,0x38,0xcc,0x50,0x6c,0x2d,0x2,0xd6,0x8a,0xf2,0xc8,0xde,0x85,0x9b,0x67,0x21,0xf2,0xa,0xb0,0xbe,0xb1,0x70,0x1,0x66,0x96,0x14,0xfe,0x13,0x58,0x4,0x5c,0x9b,0x95,0x9d,0x17,0x6d,0x56,0xdd,0x84,0xc6,0xc2,0x5,0x8,0xbb,0xb8,0x14,0xb0,0x43,0xb6,0xbd,0xdb,0x21,0xe8,0xd9,0x39,0xb9,0x57,0x37,0xa4,0x7f,0xcc,0x4e,0xe1,0x2,0x14,0x14,0x14,0xd4,0xf,0x1a,0xd8,0xdf,0x47,0xeb,0xb6,0xb7,0xd9,0x23,0x13,0xe5,0xf7,0x8d,0x85,0xb,0xe0,0xb2,0xf4,0x5a,0xa0,0x4e,0x44,0xb3,0xf7,0x68,0xf5,0x27,0x3,0x7,0x81,0x5e,0xbc,0x53,0xb8,0x0,0x45,0x45,0x45,0xd5,0x2,0x97,0x47,0x7a,0x53,0x72,0x8d,0x71,0x9b,0xbb,0x38,0xaa,0xf2,0x25,0x68,0x4e,0x49,0xc9,0xf4,0xd,0x4d,0x85,0xad,0x5f,0x37,0xfc,0x95,0x1e,0xe5,0xd6,0x4d,0xc5,0xc5,0x85,0x8b,0xa2,0x14,0xc3,0x7f,0x35,0xfc,0xb1,0x63,0xc6,0x8c,0xc2,0xdd,0xb6,0xbe,0x2d,0x2c,0x2c,0xb4,0x89,0xb8,0xc5,0xbd,0x1a,0x5f,0x4f,0x71,0xb9,0x7d,0x80,0x6d,0x89,0x7d,0x49,0xd3,0xc1,0xb6,0xa2,0x30,0xca,0x7d,0xd,0xae,0x6f,0xcb,0x2,0xb0,0xb4,0x1f,0x90,0xaa,0xc8,0xc5,0x51,0x33,0x5a,0xec,0x5f,0x0,0xa4,0xb8,0x5d,0x3d,0xa3,0x18,0xe2,0x99,0x3d,0x2f,0x3d,0x5c,0x58,0xb8,0x9,0xa8,0xdd,0x39,0x28,0xd8,0xc8,0x66,0xf,0x44,0x5a,0x3f,0x6d,0xb2,0xe9,0xdf,0x94,0x29,0x53,0xc2,0xc0,0x27,0xe,0x72,0xa2,0xc9,0x59,0x57,0x45,0x45,0x45,0x1b,0x1a,0x5c,0xe2,0xef,0xed,0xf1,0xd5,0xf5,0xc0,0x1a,0xb7,0x4b,0x9a,0x8c,0x73,0x14,0x17,0x17,0x7e,0x2,0x7c,0x8e,0xe8,0x85,0xdd,0xa1,0xfc,0xba,0xbb,0x62,0xa2,0xb2,0xb2,0x26,0x1e,0x81,0xe8,0x83,0x51,0x46,0xb8,0x5e,0x2b,0x29,0x29,0x7c,0xe2,0xbb,0x16,0xa9,0x78,0xfa,0x2,0x60,0x41,0x33,0xc2,0xae,0x8f,0x9c,0x71,0xab,0x7,0x44,0xf9,0x3a,0xd4,0x4c,0x13,0x52,0xdb,0x70,0xc4,0xec,0x9a,0x66,0xdc,0x84,0x8f,0x14,0xdc,0xe3,0xc7,0x8f,0x4f,0x79,0xf8,0xe1,0x87,0xeb,0x23,0xcf,0x61,0x14,0x42,0xdd,0x8c,0x19,0x33,0xa2,0xbb,0x79,0x2e,0x16,0x60,0xe3,0xca,0xca,0xca,0xea,0x55,0x52,0x52,0xb2,0xbd,0xd9,0xe2,0x6f,0x93,0x81,0xa0,0x33,0x8b,0xa7,0x47,0x3d,0x3a,0x74,0xc6,0x8c,0x19,0x2b,0xb3,0xb2,0xf3,0xa8,0xaf,0xf,0x9f,0xe,0xec,0xb1,0xd5,0xab,0xd5,0xdc,0x46,0x7e,0x61,0x22,0x13,0x5f,0x1a,0xd3,0x3,0xd8,0x56,0x52,0x5c,0x54,0xd3,0xc2,0x3d,0xb1,0xd2,0xdc,0x7c,0xe7,0x1a,0xe0,0xe8,0x3d,0xae,0xed,0x3,0x4,0xb,0xb,0xb,0x9b,0x7b,0xce,0x16,0xe0,0x94,0x29,0x53,0xa6,0xc8,0x94,0x29,0x53,0xd4,0x88,0xb7,0xf3,0x39,0xd3,0xee,0x86,0xc1,0x8f,0xc6,0x5,0x6e,0x4,0xc2,0x57,0xcd,0xdd,0x32,0x7e,0xfc,0xc4,0xfe,0x6e,0xb7,0x1e,0x9,0x1c,0xaa,0xaa,0x16,0xd8,0x7d,0x63,0xf5,0xca,0x55,0xa9,0x6f,0xb8,0x23,0xea,0x89,0x84,0x8a,0x7c,0xe,0x2a,0xae,0xd4,0xd4,0xc3,0x88,0x8c,0x2,0x43,0xc4,0x75,0x77,0x65,0x65,0xe7,0xfd,0x29,0x6a,0xa0,0x36,0xbd,0x1,0x5c,0x2e,0xd7,0x11,0xd,0x3,0x6a,0xcd,0xf9,0x50,0x19,0x28,0x34,0x1b,0xce,0x2e,0xdb,0x1c,0xd7,0x54,0xbc,0xcd,0x62,0x3,0x7d,0x26,0x4c,0x98,0x68,0xcd,0x9c,0x39,0x7d,0xa7,0xc0,0x53,0x1a,0x6,0xf5,0xda,0x83,0x7a,0x60,0xc0,0xd,0x37,0xdc,0x6a,0x3d,0xfe,0xf8,0x3,0x3b,0x9f,0x3f,0x0,0x38,0xaa,0x85,0x74,0x1e,0xc,0xf4,0xde,0xbc,0x79,0x73,0x1a,0xc9,0x77,0x2e,0xb3,0x11,0xef,0xde,0x28,0x29,0x9e,0xfe,0x11,0xe0,0xf9,0xae,0x25,0xce,0xc9,0x1b,0x86,0x46,0x77,0xe7,0xb2,0xb2,0x73,0xf,0x1,0xb9,0x1f,0xf4,0x8a,0x86,0x6a,0x7a,0x2b,0x22,0xea,0xa4,0x3f,0x2d,0x2a,0xb4,0x74,0x22,0xbd,0xda,0x12,0x12,0x4b,0x71,0xed,0xbe,0x7f,0x75,0x9f,0x86,0xee,0xcb,0xb1,0x2d,0x4,0xbd,0x8,0xd8,0xb1,0x97,0x2e,0x40,0x1f,0x89,0xc4,0x79,0x2f,0xe1,0xe8,0x9a,0x58,0xd3,0x65,0xdb,0xae,0xdd,0x7d,0x1,0xd5,0x76,0x3d,0x2e,0xb5,0xae,0xae,0xe7,0xee,0xcf,0x8f,0xb4,0xbe,0xcd,0xa5,0xf3,0x23,0xe0,0x23,0xdb,0x76,0xd9,0x74,0x71,0x3a,0xbb,0x78,0xab,0x89,0x6d,0x93,0xec,0x3d,0x84,0x3b,0x71,0x10,0xe8,0xf2,0x6,0xf1,0xfc,0x42,0x8,0xbf,0x54,0x5c,0x5c,0xbc,0xb1,0xc1,0xf5,0x1e,0x8c,0x68,0x7b,0x8d,0x58,0x56,0x97,0x14,0x17,0x9e,0x15,0x87,0x70,0xec,0x38,0x85,0x93,0xdc,0x63,0x15,0xa2,0x8f,0xcd,0x9c,0x51,0x74,0x3f,0xdd,0x9c,0xce,0x2e,0xde,0x2f,0x88,0x4c,0x68,0x70,0x5a,0xc,0xee,0x7,0xfa,0xa0,0xe2,0x2d,0x29,0x99,0xbe,0xa8,0x83,0xd2,0xf0,0x29,0x91,0xf7,0x9a,0x6d,0xc2,0x82,0x8f,0xb5,0x7d,0xa6,0xbb,0x86,0x11,0xd9,0xbf,0x3,0xf3,0x7c,0x87,0x68,0x87,0x3e,0x3f,0x69,0xe8,0xec,0xa3,0xcd,0x7e,0x60,0xc0,0x84,0x9,0xb9,0x43,0x62,0xbd,0xf1,0x86,0x1b,0x6e,0x10,0x22,0xb3,0x9f,0x3e,0xeb,0x40,0xe1,0x2,0x32,0x9f,0x38,0x1c,0x3,0x23,0x22,0xaf,0x1,0x72,0xf3,0xcd,0x37,0xf7,0x4c,0x70,0x84,0xeb,0x81,0xff,0xeb,0xc0,0x3c,0xdf,0x8,0xfa,0x3d,0x23,0xdd,0x4e,0x2e,0x5e,0x55,0x9d,0x3,0x88,0x58,0xf2,0xf0,0x5e,0xfa,0x83,0x4d,0x5a,0xa4,0xb4,0xbe,0x7d,0xdd,0xd,0x83,0x1f,0xcd,0x1d,0xd,0x79,0x50,0xbb,0xa4,0xc1,0xb6,0xe7,0x2,0x29,0x59,0xd9,0x79,0xbf,0x68,0x93,0xbf,0xac,0xfa,0x2e,0x80,0xe5,0x4a,0x7d,0x2c,0xc1,0x51,0xfe,0x16,0xe8,0x91,0x95,0x95,0xd7,0xdc,0xfb,0xdc,0xbe,0x89,0xf7,0xb6,0xe4,0xcc,0xac,0xac,0xbc,0xc1,0x46,0xbc,0x9d,0x98,0x1e,0x69,0xee,0x65,0x40,0x5,0x70,0xc1,0x84,0xec,0xbc,0xb,0xa2,0xb7,0xb0,0xb7,0x5a,0x82,0xde,0x4,0x20,0xe8,0xdb,0x3b,0xaf,0x97,0x4c,0x9b,0x56,0x4f,0xe4,0xec,0xa3,0x83,0xae,0xb9,0x66,0xca,0x6e,0x23,0x32,0x39,0x39,0x13,0x7,0x22,0xfa,0x42,0xa4,0x49,0xdb,0xfb,0x3b,0xd6,0x36,0x89,0xd7,0x65,0x7d,0xd8,0xe0,0xfe,0x4f,0xcf,0xc9,0xc9,0xe9,0xbd,0xe7,0xf7,0x39,0x39,0xb9,0x43,0xb3,0x9b,0x49,0x5b,0x63,0x4a,0x8a,0xb,0x43,0xd,0xb6,0xf8,0x59,0x76,0xf6,0xa4,0x26,0x6e,0x65,0x7e,0x7e,0x7e,0x4a,0x56,0xf6,0xc4,0xfc,0x36,0xb7,0xf0,0xe8,0x15,0x80,0x22,0xe4,0xe6,0xe7,0xe7,0xef,0x56,0x29,0x66,0x67,0xe7,0x9d,0x45,0x64,0xd,0x75,0xc2,0xb0,0xe1,0x5a,0x20,0x84,0x70,0xdb,0xd,0x37,0xdc,0x6a,0x35,0x1d,0xc7,0xc8,0xfb,0x59,0x76,0xf6,0xc4,0x81,0xa6,0xcf,0x9b,0xe4,0x14,0x14,0x14,0xd8,0x59,0x59,0xb9,0x57,0x22,0xb2,0x40,0xe0,0xa5,0xac,0xec,0xbc,0x3f,0x82,0xcc,0x42,0x59,0x1,0xea,0xc6,0xe2,0x4,0xb4,0x6e,0x2,0x91,0x59,0x4d,0x7f,0x2e,0x2e,0x2e,0xda,0x73,0x31,0xf8,0x6d,0xc0,0xbf,0xfa,0xf6,0xdb,0x32,0x77,0x42,0x4e,0xde,0x9d,0x62,0xb3,0x5d,0x84,0x33,0x6d,0xd5,0x3b,0x14,0x9e,0x12,0xf8,0xd,0x4a,0x42,0xb,0xc2,0x43,0x33,0xa6,0x87,0x26,0xe4,0xe4,0x8e,0x11,0x95,0x15,0xb6,0x5a,0x1f,0x67,0xe5,0xe4,0xde,0xe8,0x12,0x96,0x84,0x6c,0x39,0x58,0xe0,0xc,0x5b,0x99,0xe,0x7c,0xd,0xcc,0xde,0x5b,0x58,0x29,0x6e,0xeb,0xbc,0xfa,0x90,0xbd,0x56,0xb1,0x57,0x67,0x67,0xe7,0x5d,0xad,0xca,0x22,0xb5,0xa4,0xbf,0xa0,0xa7,0xd5,0xd6,0x85,0x1f,0x0,0x6,0x4c,0xc8,0xc9,0x9b,0x3e,0x73,0x46,0xa1,0xe3,0x91,0xd8,0xe2,0xe2,0xa2,0x65,0x59,0xd9,0x79,0x2b,0x80,0xdf,0xd7,0xd6,0x85,0x7b,0x66,0x67,0xe7,0xbe,0xa,0xb2,0x45,0x61,0x9c,0xc2,0xbd,0x44,0xa6,0x52,0xee,0x97,0x30,0x7b,0x15,0x17,0x7e,0xd2,0xf0,0x9a,0x68,0x52,0x5a,0xcf,0xba,0xfe,0xd9,0xd9,0x79,0x7f,0xb2,0x2d,0xfd,0x4c,0xc2,0x72,0xa,0xc2,0x45,0xc0,0xd,0x36,0xf6,0xb9,0xc0,0x3c,0xd3,0xf2,0x26,0x39,0x25,0x25,0x45,0x6b,0x11,0x19,0x1,0x3c,0x4,0x5c,0xd,0x5a,0x8e,0xe8,0x1a,0x84,0xaf,0x50,0x4a,0x81,0xa3,0x80,0xeb,0x4a,0x8a,0xb,0x9b,0xb8,0xa5,0x76,0x58,0x5e,0x3,0xa,0x80,0xd1,0xa2,0x2c,0x41,0x78,0x57,0xe1,0x41,0x85,0x3f,0x84,0xea,0xec,0x29,0x44,0x26,0x63,0xf4,0x4f,0x74,0x1a,0x66,0xce,0x28,0x5a,0xa9,0xa2,0x47,0x3,0x55,0xa8,0xcc,0xe,0xdb,0xb2,0x56,0x22,0x8b,0x1d,0x1e,0x6,0x5e,0x45,0x43,0xad,0x1a,0x94,0x9b,0x3e,0x7d,0x5a,0x4d,0x7d,0x9d,0xeb,0x0,0xe0,0x6d,0x85,0xe7,0x10,0xbe,0x12,0xd5,0xf7,0x51,0x9e,0x2,0x3e,0x42,0x65,0x58,0x5b,0x84,0xbb,0xcb,0x5d,0x8,0x9d,0xa,0xcc,0x5,0x6e,0x57,0x64,0xb1,0xc2,0xfb,0x44,0x2a,0xba,0x4b,0x1a,0x2a,0x9a,0xc4,0xe6,0x79,0x71,0xe1,0xcd,0xc0,0xcd,0x28,0x57,0x2a,0x2c,0x11,0x5b,0xd6,0x20,0xcc,0x23,0x32,0x3d,0x32,0xc7,0xe,0xd5,0x95,0x99,0x96,0xb7,0xb3,0x8,0x78,0xc6,0xf4,0x2d,0x40,0x76,0x56,0xd6,0xc4,0xc9,0x58,0x7a,0x86,0x28,0xfb,0x2,0x55,0xaa,0xfa,0x79,0x49,0x49,0xd1,0x87,0xcd,0xd6,0xe2,0xf,0x4d,0xf,0x1,0x93,0xb3,0xb3,0x73,0x66,0x28,0xd6,0xff,0x9,0xd4,0x86,0x42,0xee,0xc5,0xf,0x3f,0x3c,0x75,0x47,0xc4,0xd,0xcc,0x1e,0x24,0xe2,0xda,0x43,0xf0,0x2e,0x5f,0x4a,0x4a,0xa8,0x99,0x4a,0xaf,0x7e,0xb3,0xcb,0x72,0xed,0x23,0x22,0x51,0x67,0x60,0xd5,0xd6,0x6e,0x5d,0xde,0xbb,0x77,0xef,0x7d,0x6,0xc,0x18,0x50,0x15,0x45,0xc0,0xab,0x81,0x63,0x26,0x4c,0xc8,0x3b,0x8,0x8b,0xd3,0x44,0x74,0xbb,0xa8,0xbd,0xac,0xb8,0xb8,0x38,0xa6,0xd7,0x55,0x8f,0x3e,0x5a,0x50,0xd,0x9c,0x95,0x9b,0x9b,0x3b,0x24,0x6c,0x5b,0xa7,0x3,0x58,0x12,0x7e,0x7f,0xc6,0x8c,0x19,0x9f,0x47,0x11,0xe1,0xe9,0x2e,0x97,0xcb,0x2a,0x2a,0x2a,0x8c,0x1a,0x5f,0x97,0xa5,0x87,0x0,0x52,0xf2,0xf0,0x54,0x7b,0xf7,0xa,0xb3,0x24,0xc,0xfc,0x70,0xc2,0x84,0xbc,0xfd,0xc4,0x92,0x11,0x2,0xd5,0xd5,0xd5,0xd5,0x95,0x7f,0xf9,0xcb,0xe3,0xa1,0xac,0xec,0xbc,0x22,0x0,0x15,0x3b,0xbc,0x47,0x58,0x83,0x5c,0x2e,0xd7,0x8e,0xdd,0x5b,0xe,0x7b,0x94,0x58,0xe2,0x76,0xbb,0xdd,0x51,0xf,0x47,0xb7,0x84,0xd3,0x45,0xd4,0x7a,0xf2,0xc9,0x29,0x76,0x14,0x1,0x3f,0x7c,0xcd,0x35,0x53,0x1e,0xeb,0xd3,0x6f,0xcb,0xff,0x89,0xc8,0x11,0xa2,0xf6,0x37,0x21,0x97,0xbc,0xf5,0x70,0x61,0x61,0x7d,0x77,0xe9,0xf3,0xa,0x6,0x43,0x1c,0xc9,0xca,0xce,0xfb,0x1f,0x30,0x30,0x54,0x9f,0xd6,0xf3,0x91,0x47,0xee,0x37,0xc7,0x61,0x1a,0xb7,0xd9,0xd0,0x19,0xb8,0xe9,0xa6,0xdb,0x7a,0x10,0x99,0xfd,0xe4,0x37,0xc2,0x35,0xe2,0x35,0x24,0x21,0x37,0xe7,0xe5,0xd,0xce,0xc9,0xc9,0xdd,0x6d,0x20,0x6f,0xca,0x94,0x29,0xe2,0x4e,0xa9,0x7d,0xe,0xe8,0x21,0xc2,0x4d,0xc6,0x4a,0xa6,0xcf,0x6b,0x48,0xc6,0x1a,0xdf,0xe6,0x5e,0x5b,0xe5,0xfa,0xac,0xec,0xbc,0xb9,0x44,0x16,0x58,0xf4,0xdd,0xb0,0x71,0x4b,0x3a,0x70,0x14,0x22,0xc5,0xa1,0xfa,0x9a,0x2f,0x8c,0x95,0x8c,0x78,0xd,0x49,0x88,0x86,0xf5,0x5e,0xb1,0x64,0xd,0x30,0x8e,0xc8,0x7a,0xdf,0xed,0xc0,0xbb,0x82,0xe4,0x17,0xcf,0x98,0x3e,0xdb,0x58,0xa8,0x7d,0xf8,0x7f,0x49,0xf1,0x1a,0x6f,0x4b,0xd5,0x18,0xc6,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+static const unsigned char boot_splash_png[] = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
+	0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0xef, 0x00, 0x00, 0x01, 0x03,
+	0x08, 0x06, 0x00, 0x00, 0x00, 0xdd, 0x81, 0x53, 0xf4, 0x00, 0x00, 0x00,
+	0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x32, 0xdf, 0x00, 0x00, 0x32,
+	0xdf, 0x01, 0x17, 0xbe, 0xe4, 0x0b, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49,
+	0x4d, 0x45, 0x07, 0xde, 0x01, 0x19, 0x13, 0x08, 0x19, 0x46, 0x43, 0xd9,
+	0xbb, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f, 0x6d,
+	0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64,
+	0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57, 0x81,
+	0x0e, 0x17, 0x00, 0x00, 0x20, 0x00, 0x49, 0x44, 0x41, 0x54, 0x78, 0xda,
+	0xed, 0x9d, 0x79, 0x78, 0x54, 0xd5, 0xf9, 0xc7, 0x3f, 0xef, 0x9d, 0x49,
+	0xc2, 0x0e, 0xb2, 0xb9, 0xaf, 0xb8, 0x2f, 0x3f, 0xb5, 0xa8, 0xb4, 0xa2,
+	0x66, 0x66, 0x02, 0x04, 0xea, 0x5a, 0xad, 0x5a, 0x6d, 0xb5, 0x2e, 0xad,
+	0x56, 0x24, 0x1b, 0x04, 0xb5, 0x5a, 0x2b, 0xb6, 0x6a, 0x55, 0x02, 0x09,
+	0x09, 0xae, 0x5d, 0xd4, 0x5a, 0x6b, 0x15, 0xad, 0x15, 0x15, 0x48, 0x48,
+	0x66, 0x26, 0x50, 0x10, 0x17, 0x0a, 0x2a, 0x56, 0x51, 0x11, 0xd7, 0x8a,
+	0xec, 0x90, 0x00, 0x59, 0x66, 0xee, 0xfb, 0xfb, 0x63, 0x82, 0x04, 0x32,
+	0x09, 0x99, 0x9b, 0x99, 0x64, 0x92, 0x9c, 0xcf, 0xf3, 0xcc, 0x43, 0xb8,
+	0x33, 0xf7, 0xdc, 0x73, 0xde, 0x73, 0xbe, 0xe7, 0xbc, 0xe7, 0xdc, 0xb3,
+	0x80, 0xc1, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x83, 0xc1, 0x60, 0x30, 0x18,
+	0x0c, 0x06, 0x83, 0xc1, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x83, 0xc1, 0x60,
+	0x30, 0x18, 0x0c, 0x06, 0x83, 0xc1, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x83,
+	0xc1, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x83, 0xc1, 0x60, 0x30, 0x18, 0x0c,
+	0x06, 0x83, 0xc1, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x83, 0xc1, 0x60, 0x30,
+	0x18, 0x0c, 0x06, 0x83, 0xc1, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x83, 0xc1,
+	0x60, 0x30, 0x18, 0x0c, 0x06, 0x83, 0xc1, 0x60, 0x30, 0x18, 0x0c, 0x06,
+	0x83, 0xc1, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x83, 0xc1, 0x60, 0x30, 0x18,
+	0x0c, 0x06, 0x83, 0xc1, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x83, 0xc1, 0x60,
+	0x30, 0x18, 0x0c, 0x06, 0x83, 0xc1, 0x60, 0x30, 0x18, 0x0c, 0x86, 0x16,
+	0x19, 0x53, 0xe0, 0xdf, 0xaf, 0xbd, 0x9e, 0x95, 0x71, 0x5f, 0x79, 0x2f,
+	0x63, 0xf1, 0xce, 0x87, 0x18, 0x13, 0x24, 0x81, 0x50, 0xa7, 0x96, 0x0a,
+	0x92, 0x76, 0xb4, 0xc0, 0x39, 0xa0, 0xe7, 0x00, 0xe7, 0x00, 0x43, 0x4a,
+	0xf3, 0xbd, 0x09, 0x17, 0x55, 0x66, 0x81, 0xdf, 0x07, 0x52, 0x0e, 0x2c,
+	0x05, 0x16, 0x00, 0x0b, 0xdc, 0x96, 0x1d, 0x7c, 0x6d, 0x62, 0xc6, 0x16,
+	0x93, 0x33, 0x46, 0xbc, 0x86, 0x28, 0x8c, 0x9b, 0x56, 0xe9, 0xb2, 0x35,
+	0xec, 0x01, 0xb9, 0x00, 0x38, 0x0f, 0x38, 0xa2, 0x69, 0xee, 0xc8, 0x43,
+	0xa5, 0x93, 0x3c, 0x13, 0x12, 0x2b, 0xde, 0x40, 0x15, 0xd0, 0x27, 0xca,
+	0x57, 0x0b, 0x15, 0x5e, 0x01, 0x99, 0x5d, 0x96, 0xef, 0x59, 0x69, 0x72,
+	0xcc, 0x88, 0xb7, 0x5b, 0xf3, 0xc3, 0x82, 0x0a, 0xcb, 0xc6, 0xf2, 0x2a,
+	0xfc, 0x1c, 0xb8, 0x08, 0xe8, 0xbb, 0x97, 0x5b, 0xea, 0x43, 0x75, 0xe1,
+	0xfe, 0x15, 0xb7, 0x8f, 0xda, 0x91, 0x10, 0xe1, 0x4e, 0x0d, 0xdc, 0x88,
+	0xf0, 0x68, 0x2b, 0x7e, 0xfa, 0x11, 0xf0, 0xac, 0xad, 0xfa, 0xd4, 0xfc,
+	0xc9, 0xbe, 0xd5, 0x26, 0x27, 0x8d, 0x78, 0xbb, 0x0d, 0x63, 0x0b, 0x02,
+	0x47, 0x2a, 0x5c, 0x0b, 0x5c, 0x05, 0x1c, 0x1c, 0xe3, 0xed, 0xf3, 0x4b,
+	0xf3, 0xbd, 0x63, 0x12, 0xd4, 0xea, 0xd6, 0x03, 0xee, 0x18, 0x6f, 0x5b,
+	0x08, 0x3c, 0x95, 0x52, 0x5f, 0xfb, 0xb7, 0x57, 0x7f, 0x3d, 0xb6, 0xd6,
+	0xe4, 0xae, 0x11, 0x6f, 0x97, 0xe3, 0xfc, 0x29, 0xaf, 0x48, 0x5d, 0xdf,
+	0x3e, 0x67, 0xa1, 0xe4, 0x03, 0x17, 0xb4, 0x21, 0xa8, 0xb0, 0x25, 0x1c,
+	0x32, 0x77, 0x92, 0xf7, 0x7f, 0x71, 0x16, 0x6e, 0x09, 0xd0, 0x16, 0x97,
+	0x7c, 0x1b, 0x50, 0x62, 0xa1, 0xd3, 0xe7, 0xe6, 0xfb, 0xd6, 0x99, 0x1c,
+	0x37, 0xe2, 0xed, 0x12, 0x8c, 0x29, 0x08, 0x64, 0x0a, 0xdc, 0x0d, 0x8c,
+	0x88, 0x53, 0x90, 0x1f, 0x96, 0xe6, 0x7b, 0x8f, 0x8b, 0x5b, 0x7f, 0xbb,
+	0x78, 0x4e, 0x9a, 0x5d, 0xd7, 0x73, 0x3b, 0x60, 0xc5, 0x21, 0x38, 0x1b,
+	0xf8, 0x6b, 0x8a, 0x86, 0xb2, 0x5e, 0x9d, 0x3c, 0xba, 0xda, 0xe4, 0x7e,
+	0xfb, 0x61, 0x19, 0x13, 0x24, 0xa4, 0x46, 0x1c, 0x1f, 0x47, 0xe1, 0x02,
+	0x1c, 0x93, 0x39, 0x3d, 0x70, 0x54, 0xbc, 0x02, 0xb3, 0xeb, 0x7a, 0x3e,
+	0x17, 0xc7, 0xbc, 0xb7, 0x80, 0x6b, 0xea, 0xc5, 0x3d, 0xc0, 0xe4, 0xbc,
+	0x11, 0x6f, 0x57, 0x60, 0x6d, 0xdc, 0xeb, 0x03, 0x9b, 0x57, 0xe3, 0xd4,
+	0xea, 0xba, 0x80, 0xf3, 0x13, 0x90, 0xe6, 0xb0, 0xc9, 0x76, 0x23, 0x5e,
+	0x23, 0xde, 0xe8, 0x1c, 0x39, 0x66, 0xaa, 0xff, 0x80, 0x38, 0xb4, 0xba,
+	0x7f, 0x4a, 0x50, 0xbe, 0x1b, 0xf1, 0x1a, 0xf1, 0x1a, 0xf1, 0x36, 0x97,
+	0x57, 0x22, 0xf2, 0x4a, 0x1c, 0xc2, 0xb9, 0x3a, 0x41, 0x9d, 0x05, 0x23,
+	0x5e, 0x23, 0xde, 0x2e, 0x80, 0x26, 0x44, 0xbc, 0x00, 0xa7, 0x8c, 0x2a,
+	0x2c, 0x77, 0xdc, 0xb7, 0xcc, 0x2c, 0x08, 0x4c, 0x4b, 0x54, 0x9e, 0x4b,
+	0x64, 0xe0, 0xca, 0xd0, 0x8e, 0xb8, 0x8d, 0x09, 0x12, 0x52, 0x92, 0x13,
+	0x25, 0x5e, 0xcb, 0x15, 0x76, 0xbd, 0x04, 0x78, 0x77, 0x5e, 0x18, 0x53,
+	0x10, 0x18, 0xec, 0xb2, 0xb4, 0x4f, 0xd8, 0x96, 0x5e, 0x88, 0xf4, 0x06,
+	0x3b, 0x84, 0x6d, 0x6d, 0x03, 0x7b, 0x5b, 0x38, 0xc5, 0xde, 0x52, 0x91,
+	0x3b, 0xaa, 0xf1, 0x08, 0x70, 0x6e, 0xe2, 0xea, 0x2b, 0x35, 0x2d, 0xaf,
+	0x11, 0x6f, 0x57, 0x68, 0x78, 0x59, 0x9b, 0xc0, 0x77, 0x70, 0xe7, 0x64,
+	0x16, 0x04, 0xca, 0x80, 0x43, 0x81, 0x43, 0x80, 0x1e, 0xb6, 0x2d, 0x91,
+	0x77, 0x7e, 0xaa, 0x91, 0x36, 0x50, 0x22, 0xff, 0xba, 0x43, 0x2e, 0x32,
+	0x0b, 0x02, 0x1b, 0x80, 0xcf, 0x81, 0x4d, 0x09, 0xf6, 0xb4, 0x8c, 0x78,
+	0x8d, 0x78, 0xbb, 0x42, 0xc3, 0x4b, 0x55, 0x82, 0xbb, 0x3a, 0xa3, 0x63,
+	0xf8, 0xfd, 0xa0, 0x86, 0x4f, 0xa2, 0xab, 0xac, 0x7a, 0x93, 0xf3, 0xa6,
+	0xcf, 0xdb, 0xf9, 0xc5, 0x2b, 0x52, 0xd3, 0xcd, 0x92, 0x1c, 0xaa, 0x75,
+	0x89, 0x11, 0xaf, 0x11, 0x6f, 0x17, 0x70, 0x9b, 0x95, 0xee, 0x36, 0xe7,
+	0xf7, 0x83, 0x60, 0x9e, 0x57, 0x4d, 0xce, 0x1b, 0xf1, 0x76, 0x05, 0xf5,
+	0x76, 0x37, 0xf1, 0xbe, 0x63, 0x32, 0xdd, 0x88, 0xb7, 0x4b, 0x60, 0x63,
+	0xd5, 0x18, 0xf1, 0x1a, 0x8c, 0x78, 0x3b, 0x21, 0xf3, 0x27, 0xa7, 0xdb,
+	0x44, 0x46, 0x78, 0xbb, 0x49, 0x27, 0x5f, 0x97, 0x9b, 0x5c, 0x37, 0xe2,
+	0xed, 0x4a, 0xac, 0xe8, 0x36, 0xda, 0xb5, 0xd5, 0xec, 0xb4, 0xd1, 0x11,
+	0x76, 0x37, 0x26, 0x88, 0x2f, 0x63, 0xa7, 0xf9, 0x53, 0x54, 0xe5, 0x76,
+	0xe0, 0x4e, 0xc0, 0xd5, 0x4d, 0x92, 0xbd, 0x5a, 0x85, 0x5f, 0x95, 0x4d,
+	0xf2, 0x96, 0x99, 0x12, 0x60, 0xc4, 0xdb, 0x29, 0xc9, 0x2c, 0x08, 0x8c,
+	0x06, 0x1e, 0x01, 0x86, 0x75, 0x53, 0x13, 0x3c, 0x6f, 0x5b, 0xf6, 0xcd,
+	0xf3, 0x27, 0x66, 0xac, 0x37, 0xa5, 0xc1, 0x88, 0x37, 0x21, 0x8c, 0x7b,
+	0x20, 0xe0, 0xb2, 0x5d, 0x72, 0xbf, 0xaa, 0xce, 0x2e, 0x9b, 0xec, 0x5d,
+	0xd8, 0xd6, 0xf0, 0x46, 0x15, 0x2f, 0xe8, 0xe9, 0xaa, 0x0f, 0x17, 0xa3,
+	0xfc, 0xc2, 0x14, 0x29, 0x6a, 0x54, 0xf9, 0xa5, 0x1d, 0x0e, 0x3d, 0x53,
+	0x7e, 0xdb, 0xe8, 0x36, 0xbd, 0x3e, 0x1a, 0xfe, 0xd8, 0xdb, 0xd6, 0xe0,
+	0xad, 0x55, 0x13, 0x10, 0xde, 0x2f, 0xcd, 0xf7, 0x56, 0x18, 0xd3, 0x1a,
+	0xf1, 0x92, 0x59, 0x10, 0xb8, 0x1b, 0xf8, 0x2d, 0xa0, 0xc0, 0x6c, 0x41,
+	0x7f, 0x3d, 0x2f, 0xdf, 0xf7, 0x81, 0xa3, 0xb0, 0xa6, 0xfa, 0x47, 0x22,
+	0xf2, 0x2c, 0xb1, 0xef, 0x4d, 0xd5, 0xd5, 0x79, 0xc1, 0x25, 0xae, 0xeb,
+	0xe7, 0x4c, 0x3a, 0x67, 0xab, 0xb3, 0x3c, 0x0a, 0x5e, 0x0e, 0xfa, 0x00,
+	0x91, 0x69, 0xa0, 0x21, 0x41, 0x4f, 0x99, 0x97, 0xef, 0x7b, 0xdf, 0x98,
+	0xb5, 0x1b, 0x8b, 0x37, 0xb3, 0x20, 0x70, 0x25, 0xf0, 0xcc, 0x1e, 0x97,
+	0x43, 0xc0, 0x13, 0x02, 0x77, 0xce, 0xcb, 0xf7, 0x7e, 0xdb, 0x9a, 0x70,
+	0xc6, 0x14, 0x04, 0x5c, 0x12, 0xe9, 0xd7, 0xde, 0x65, 0x8a, 0x51, 0xb3,
+	0x6c, 0x14, 0xe4, 0xfc, 0x79, 0xf9, 0x9e, 0xc5, 0xad, 0xbd, 0x61, 0xcc,
+	0xb4, 0x80, 0x4f, 0x94, 0x07, 0x81, 0xe1, 0x7b, 0x7c, 0xb5, 0x49, 0x2c,
+	0xfb, 0xb8, 0x79, 0x13, 0x33, 0xbe, 0x35, 0x66, 0xed, 0x86, 0xe2, 0xcd,
+	0x2c, 0xf0, 0xff, 0x00, 0x64, 0x51, 0x0b, 0xe9, 0xde, 0x01, 0x4c, 0x4d,
+	0xad, 0xae, 0xfe, 0xfd, 0x2b, 0x53, 0xce, 0x0f, 0x35, 0x17, 0xce, 0xe8,
+	0xe9, 0xc1, 0xfe, 0x96, 0xad, 0xcf, 0x01, 0x99, 0xa6, 0x08, 0xb5, 0x8a,
+	0x5b, 0xc2, 0xa1, 0xd0, 0xb4, 0xf2, 0xdb, 0x46, 0xdb, 0x2d, 0x78, 0x30,
+	0xc3, 0x10, 0x29, 0x06, 0xc6, 0xb5, 0x90, 0x3f, 0x1f, 0x28, 0x32, 0xa2,
+	0x2c, 0xdf, 0x53, 0x65, 0x4c, 0xda, 0x8d, 0xc4, 0x3b, 0xf6, 0x41, 0xff,
+	0xe1, 0x6a, 0xc9, 0x7b, 0x40, 0xef, 0x56, 0xfc, 0xfc, 0x33, 0x81, 0x5f,
+	0xcd, 0xcb, 0xf7, 0x96, 0x36, 0x09, 0xa7, 0x20, 0x78, 0x82, 0xa2, 0x15,
+	0xc0, 0xbe, 0xa6, 0xf8, 0xc4, 0xc4, 0x4b, 0x82, 0x5e, 0x39, 0x2f, 0xdf,
+	0x57, 0xb3, 0x67, 0xbf, 0x76, 0x50, 0x55, 0xd5, 0x6f, 0x04, 0xee, 0x00,
+	0x52, 0x5b, 0x11, 0xce, 0x5c, 0x4b, 0xac, 0x8b, 0xe6, 0x4e, 0x4a, 0xaf,
+	0x33, 0xe2, 0xed, 0x06, 0x8c, 0x9b, 0xea, 0x1f, 0x68, 0x8b, 0x2c, 0x23,
+	0xb2, 0x84, 0xae, 0xb5, 0x28, 0xf0, 0x0f, 0x45, 0xb3, 0xcb, 0xf2, 0x7d,
+	0xeb, 0x1b, 0x5c, 0xee, 0x4c, 0xe0, 0x15, 0x20, 0xc5, 0x68, 0xd1, 0x11,
+	0xff, 0xc1, 0xd2, 0x8c, 0xd2, 0x89, 0xbe, 0xcd, 0x0d, 0xfd, 0xda, 0x0c,
+	0xd0, 0xc7, 0x89, 0x76, 0x5a, 0x44, 0xcb, 0x14, 0xd7, 0xf6, 0x24, 0x37,
+	0x78, 0x73, 0xf7, 0x9e, 0x4f, 0xdd, 0xe5, 0xc5, 0x9b, 0x39, 0x35, 0xd0,
+	0x13, 0x61, 0x3e, 0x30, 0xd2, 0x61, 0x10, 0xd5, 0x0a, 0xb7, 0xa2, 0x84,
+	0xa5, 0x75, 0xa7, 0x0b, 0x18, 0x5a, 0xe6, 0x7f, 0xaa, 0x7a, 0xae, 0x88,
+	0x4c, 0x04, 0x7e, 0x8a, 0xc3, 0x89, 0x42, 0x02, 0x37, 0xcf, 0xcb, 0xf7,
+	0x3e, 0x6c, 0xc4, 0xdb, 0x45, 0x19, 0x33, 0xb5, 0x54, 0x44, 0x52, 0x9f,
+	0x24, 0x61, 0xfb, 0x36, 0x19, 0x3a, 0xb8, 0xf0, 0x7a, 0xe7, 0xe5, 0x7b,
+	0x83, 0xdd, 0x35, 0xfd, 0x5d, 0x7a, 0x7a, 0xa4, 0x48, 0xea, 0xe5, 0x46,
+	0xb8, 0x5d, 0x17, 0x85, 0x57, 0x32, 0x0b, 0x82, 0x43, 0x4d, 0xcb, 0xdb,
+	0xf5, 0xdc, 0xe5, 0xc3, 0x11, 0x56, 0x9a, 0xfe, 0x69, 0x97, 0xa7, 0x52,
+	0x61, 0x74, 0x59, 0xbe, 0xb7, 0xdb, 0x6d, 0x06, 0xd0, 0x25, 0x5b, 0xde,
+	0xb1, 0xd3, 0xfc, 0x3d, 0x11, 0x66, 0x1b, 0xe1, 0x76, 0x0b, 0xd2, 0x45,
+	0xc8, 0x32, 0x6e, 0x73, 0x57, 0x71, 0xa7, 0x54, 0xee, 0x04, 0x4e, 0x34,
+	0xe5, 0xba, 0xdb, 0xf8, 0xcf, 0xd3, 0x32, 0xa7, 0x06, 0x4e, 0x30, 0x6e,
+	0x73, 0x67, 0x77, 0x97, 0x0b, 0xfc, 0x27, 0x81, 0xbc, 0x6b, 0x4a, 0x74,
+	0xb7, 0xe3, 0x43, 0x81, 0x53, 0xe7, 0xe5, 0x7b, 0xbb, 0xcd, 0x46, 0x08,
+	0x5d, 0xaa, 0xe5, 0x1d, 0x53, 0xe0, 0x4f, 0x03, 0xf9, 0x87, 0x29, 0xc7,
+	0xdd, 0x92, 0x63, 0x51, 0x7e, 0x69, 0xdc, 0xe6, 0xce, 0xea, 0x46, 0xa8,
+	0xdc, 0x00, 0x1c, 0x6f, 0xca, 0x71, 0x37, 0xf5, 0x9e, 0x85, 0xa2, 0x31,
+	0x85, 0xc1, 0x43, 0x8d, 0x78, 0x3b, 0x9b, 0xbb, 0x3c, 0xbd, 0xb2, 0x07,
+	0xc2, 0xfd, 0xa6, 0x08, 0x77, 0x6b, 0x2c, 0x09, 0xeb, 0x8d, 0x46, 0xbc,
+	0x9d, 0x8c, 0xd2, 0x89, 0xe9, 0x35, 0xc0, 0x4d, 0xa6, 0xfc, 0x76, 0x6b,
+	0x6a, 0x41, 0x4b, 0x8c, 0x78, 0x3b, 0x21, 0x29, 0x96, 0xfd, 0x77, 0x60,
+	0xa1, 0x29, 0xc3, 0xdd, 0x96, 0x6b, 0x4b, 0xf3, 0x7d, 0xdf, 0x18, 0xf1,
+	0x76, 0x42, 0x5e, 0x9d, 0x98, 0x11, 0x02, 0xae, 0x22, 0xb2, 0x3e, 0xd7,
+	0xd0, 0xbd, 0xa8, 0xb4, 0xc2, 0xcc, 0xea, 0x56, 0x7d, 0x84, 0xae, 0x96,
+	0xa0, 0xd2, 0x7c, 0xef, 0xe7, 0xc0, 0x04, 0x53, 0x96, 0xbb, 0x15, 0x21,
+	0xb5, 0xf8, 0xd9, 0xdc, 0x5b, 0xbd, 0x21, 0x23, 0xde, 0x4e, 0x8e, 0xc2,
+	0x13, 0xc0, 0x52, 0x53, 0xa6, 0xbb, 0x09, 0xca, 0x8d, 0x65, 0x13, 0xbd,
+	0x5f, 0x75, 0xb7, 0x64, 0x77, 0x49, 0xf1, 0x96, 0xe5, 0x7b, 0xeb, 0x54,
+	0xb9, 0xcc, 0xb8, 0xcf, 0xdd, 0x82, 0x85, 0x61, 0xb7, 0xf5, 0x74, 0x77,
+	0x4c, 0x78, 0x97, 0x5d, 0x55, 0x54, 0x36, 0xd9, 0xfb, 0xa9, 0x98, 0x15,
+	0x45, 0x5d, 0x9d, 0x6a, 0x55, 0x7e, 0x5c, 0x9e, 0x97, 0x5e, 0x6f, 0xc4,
+	0xdb, 0xc5, 0xb0, 0xb5, 0xee, 0x1f, 0x34, 0xdd, 0x6c, 0xce, 0xd0, 0x45,
+	0x10, 0x95, 0x0b, 0xca, 0x26, 0x7b, 0xd7, 0x76, 0xdb, 0xf4, 0x77, 0xf5,
+	0x04, 0x8e, 0x29, 0x08, 0xf6, 0x13, 0x74, 0x05, 0x66, 0x6b, 0xd6, 0xae,
+	0xc6, 0x83, 0xa5, 0xf9, 0xde, 0x5b, 0xbb, 0xb3, 0x01, 0xba, 0xfc, 0x59,
+	0x45, 0x65, 0xf9, 0x9e, 0xad, 0xaa, 0x7a, 0x2e, 0x91, 0x3d, 0xa9, 0x0c,
+	0x5d, 0x83, 0x77, 0xb1, 0xcc, 0x96, 0xbb, 0xdd, 0xe2, 0xa0, 0xb1, 0xb2,
+	0xc9, 0xbe, 0xf7, 0x80, 0x9b, 0x4d, 0x99, 0xef, 0x12, 0xd4, 0xdb, 0x22,
+	0xe7, 0x96, 0x4e, 0xf4, 0xd6, 0x18, 0xf1, 0x76, 0x1f, 0xca, 0x4d, 0xb9,
+	0xef, 0x12, 0x6c, 0x98, 0x3f, 0xc9, 0xf3, 0x95, 0x31, 0x83, 0x39, 0xe2,
+	0xd3, 0x60, 0xe8, 0xb4, 0xb8, 0x8d, 0x09, 0xda, 0x8e, 0x00, 0x47, 0x0c,
+	0xed, 0xc3, 0x0f, 0x8e, 0x1c, 0xcc, 0x89, 0x07, 0xf6, 0x67, 0x50, 0x9f,
+	0x34, 0x06, 0xf6, 0x4e, 0x65, 0x7b, 0x5d, 0x98, 0x0d, 0xd5, 0xb5, 0x7c,
+	0xb5, 0x69, 0x07, 0x4b, 0x3e, 0x59, 0xcf, 0x5b, 0xab, 0x37, 0x50, 0x1b,
+	0xb2, 0x3b, 0x7f, 0x7a, 0x05, 0x4e, 0x39, 0x64, 0x1f, 0x7e, 0x30, 0x6c,
+	0x30, 0xc3, 0x86, 0xf6, 0x61, 0x50, 0x9f, 0x34, 0xfa, 0xf7, 0x4a, 0x61,
+	0xf3, 0xb6, 0x3a, 0xd6, 0x57, 0xd7, 0xf2, 0xc9, 0xb7, 0xd5, 0xbc, 0xbe,
+	0x6a, 0x3d, 0x2b, 0xbe, 0xda, 0x82, 0xad, 0x66, 0xa8, 0xc1, 0x88, 0x37,
+	0x49, 0x45, 0x7b, 0xea, 0x61, 0xfb, 0x70, 0xfd, 0xd9, 0xc3, 0x18, 0x36,
+	0xb4, 0x4f, 0x93, 0xef, 0x7b, 0xa7, 0xb9, 0x19, 0xd2, 0x37, 0x8d, 0x63,
+	0xf7, 0xef, 0xc7, 0xa8, 0xe3, 0xf7, 0x25, 0x14, 0xb6, 0x99, 0xf5, 0xd6,
+	0x97, 0xfc, 0xfd, 0x8d, 0xcf, 0xa9, 0xef, 0xa4, 0x22, 0x3e, 0xef, 0xe4,
+	0x03, 0xf8, 0xf9, 0x59, 0x47, 0xd0, 0xb7, 0x47, 0xd3, 0xa2, 0xd3, 0x73,
+	0x40, 0x4f, 0xf6, 0x1f, 0xd0, 0x93, 0x93, 0x0e, 0x1a, 0xc0, 0x8f, 0x86,
+	0x1f, 0xc4, 0x86, 0xea, 0x3a, 0x9e, 0xfa, 0xf7, 0xa7, 0x94, 0xff, 0xf7,
+	0x5b, 0x23, 0xe2, 0x04, 0x95, 0xbf, 0x6e, 0x41, 0x66, 0x41, 0xe0, 0x28,
+	0xe0, 0xa3, 0x78, 0x85, 0x97, 0xe6, 0xb6, 0xb8, 0xf5, 0xdc, 0xe3, 0x38,
+	0xf3, 0xc8, 0x21, 0x31, 0xdf, 0x5b, 0x5d, 0x1b, 0xe2, 0x77, 0x2f, 0xaf,
+	0xe0, 0xdd, 0x2f, 0x37, 0x77, 0x1a, 0xfb, 0x0d, 0xe9, 0x9b, 0xc6, 0x03,
+	0x97, 0x9d, 0xc2, 0x01, 0x03, 0x7a, 0xc6, 0x7c, 0xef, 0xaa, 0xb5, 0xd5,
+	0xdc, 0xf1, 0xe2, 0xbb, 0x6c, 0xde, 0x1e, 0x97, 0x13, 0x4a, 0xd6, 0x94,
+	0xe6, 0x7b, 0xf7, 0x37, 0xd2, 0x35, 0x7d, 0x5e, 0x47, 0xf4, 0xef, 0x95,
+	0x4a, 0xc9, 0xcf, 0x4e, 0x73, 0x24, 0x5c, 0x80, 0x3e, 0x69, 0x6e, 0xfe,
+	0xf0, 0xe3, 0x93, 0x39, 0xff, 0x94, 0x03, 0x3a, 0x45, 0x7a, 0xff, 0xef,
+	0xe0, 0x01, 0xfc, 0xf9, 0xba, 0x11, 0x8e, 0x84, 0x0b, 0x30, 0x6c, 0x68,
+	0x1f, 0xfe, 0x7c, 0xfd, 0x19, 0x51, 0xbd, 0x13, 0x83, 0x11, 0x6f, 0xbb,
+	0xd1, 0x23, 0xc5, 0x45, 0xd1, 0x15, 0xa7, 0x72, 0xc8, 0xa0, 0x5e, 0x6d,
+	0x0a, 0xc7, 0x65, 0x09, 0x37, 0xf9, 0x8e, 0xe2, 0xfb, 0xc3, 0x06, 0x25,
+	0x75, 0x7a, 0x87, 0xf6, 0xeb, 0xc1, 0x7d, 0x97, 0x9c, 0x4c, 0xaa, 0xbb,
+	0x6d, 0x45, 0xa5, 0x77, 0xaa, 0x9b, 0xa2, 0x2b, 0xbf, 0xc7, 0xa0, 0x3e,
+	0x69, 0xa6, 0x10, 0x99, 0x3e, 0x6f, 0x07, 0xd4, 0x74, 0x22, 0xfc, 0xfa,
+	0xbc, 0xe3, 0xd9, 0xbf, 0x85, 0x16, 0x68, 0xe5, 0xca, 0x95, 0x94, 0x97,
+	0x57, 0xf0, 0xce, 0x3b, 0xef, 0xb0, 0x61, 0xfd, 0x06, 0x5c, 0x2e, 0x17,
+	0x43, 0x86, 0x0c, 0x61, 0xf8, 0xf0, 0xef, 0x31, 0x6a, 0xf4, 0x28, 0x0e,
+	0x39, 0xe4, 0x90, 0xdd, 0xc2, 0xbb, 0xe3, 0xfc, 0x13, 0xb8, 0xe6, 0x4f,
+	0x6f, 0xb0, 0xa1, 0xba, 0x36, 0x29, 0xd3, 0xfc, 0xd0, 0x55, 0xc3, 0x71,
+	0xbb, 0x76, 0xef, 0x5d, 0x55, 0x55, 0x55, 0x31, 0xe7, 0xb5, 0x39, 0x2c,
+	0x59, 0xb2, 0x84, 0x35, 0x6b, 0xbe, 0x65, 0xc7, 0x8e, 0x1d, 0x0c, 0x1a,
+	0x34, 0x90, 0xe3, 0x8e, 0x3b, 0x8e, 0xb3, 0xcf, 0x3e, 0x9b, 0x33, 0x46,
+	0x9c, 0x81, 0x48, 0xd3, 0x1e, 0x59, 0x8a, 0xcb, 0xa2, 0xf0, 0x8a, 0x53,
+	0xf9, 0xe5, 0x13, 0x6f, 0x76, 0x89, 0x81, 0x3b, 0xd3, 0xe7, 0xed, 0x44,
+	0x7d, 0xde, 0x63, 0xf7, 0xef, 0x47, 0xd1, 0x95, 0xdf, 0x8b, 0xfa, 0x5d,
+	0x4d, 0x4d, 0x0d, 0x0f, 0xdc, 0xff, 0x20, 0x95, 0x95, 0x95, 0xcd, 0x8b,
+	0xdf, 0xb2, 0x38, 0xff, 0xfc, 0xf3, 0xc8, 0xc9, 0xcd, 0xd9, 0xed, 0xfa,
+	0xea, 0x75, 0xd5, 0xdc, 0xf4, 0xd7, 0xb7, 0x93, 0xce, 0x66, 0x37, 0x67,
+	0x1c, 0xc5, 0xf9, 0xa7, 0x1c, 0xb8, 0xdb, 0xb5, 0x67, 0x9f, 0xfd, 0x07,
+	0x4f, 0x3e, 0xf1, 0x24, 0xf5, 0xf5, 0xcd, 0xaf, 0x05, 0x38, 0xf1, 0xc4,
+	0x13, 0xb9, 0xf3, 0xb7, 0xbf, 0x61, 0xc8, 0x90, 0xe8, 0xdd, 0x8a, 0x87,
+	0xfd, 0x1f, 0x33, 0x7b, 0xd9, 0xd7, 0xa6, 0xcf, 0x6b, 0xdc, 0xe6, 0x76,
+	0x72, 0x51, 0x2c, 0xe1, 0xf6, 0xf3, 0xa2, 0x6f, 0x4c, 0xb9, 0x65, 0xcb,
+	0x16, 0xae, 0xbb, 0xf6, 0xfa, 0x16, 0x85, 0x0b, 0x60, 0xdb, 0x36, 0x2f,
+	0xbf, 0x3c, 0x9b, 0x1b, 0x6f, 0xf8, 0x15, 0xb6, 0xbd, 0xab, 0xe5, 0x39,
+	0x6c, 0x70, 0x1f, 0x0e, 0x1f, 0xd2, 0xbb, 0x4d, 0xf1, 0x73, 0x59, 0x42,
+	0xfa, 0x31, 0x43, 0xb9, 0xe6, 0xac, 0xc3, 0x19, 0x7d, 0xc2, 0x7e, 0x51,
+	0x47, 0x83, 0x63, 0x4d, 0xef, 0xb8, 0xff, 0xdb, 0xbd, 0x4f, 0x7e, 0xef,
+	0x3d, 0xf7, 0xf2, 0xc7, 0xc7, 0xff, 0xd8, 0xa2, 0x70, 0x01, 0x56, 0xac,
+	0x58, 0xc1, 0xd5, 0x57, 0xfd, 0x9c, 0xcf, 0x56, 0x7f, 0x16, 0xf5, 0xfb,
+	0x5f, 0x79, 0x8f, 0xa4, 0x4f, 0x9a, 0x71, 0xfa, 0x8c, 0x78, 0xdb, 0x89,
+	0x21, 0xfd, 0x7a, 0x30, 0xb4, 0x5f, 0x8f, 0x26, 0xd7, 0x6b, 0x6b, 0x6b,
+	0xc9, 0xce, 0xca, 0x61, 0xcd, 0x9a, 0x35, 0xad, 0x0e, 0xeb, 0xe3, 0x8f,
+	0x3f, 0x66, 0x72, 0xfe, 0xe4, 0x5d, 0xee, 0x8f, 0x40, 0xce, 0xe8, 0x63,
+	0x1c, 0xc7, 0xed, 0xc8, 0xa1, 0x7d, 0x78, 0xf6, 0x57, 0x67, 0xf2, 0xeb,
+	0xf3, 0x8e, 0xe7, 0x27, 0x23, 0x0e, 0x65, 0xd2, 0xd8, 0x63, 0xf9, 0xc7,
+	0x4d, 0x23, 0x19, 0x7b, 0x92, 0xf3, 0x06, 0xea, 0x82, 0xef, 0x1d, 0x84,
+	0xdb, 0xda, 0xe5, 0x98, 0x3d, 0xf6, 0xe8, 0x63, 0x54, 0x54, 0xf8, 0x5b,
+	0x7d, 0x7f, 0x6d, 0x6d, 0x2d, 0xe3, 0xc7, 0xdf, 0x4c, 0x55, 0x55, 0x55,
+	0xd4, 0xee, 0xc7, 0xf1, 0x07, 0xf4, 0x37, 0x85, 0xca, 0x88, 0xb7, 0x7d,
+	0x38, 0xfb, 0xe8, 0xe8, 0x2e, 0x60, 0x69, 0x69, 0x29, 0x5f, 0x7e, 0xf9,
+	0x65, 0xcc, 0xe1, 0x2d, 0x5f, 0xfe, 0x0e, 0xff, 0xf9, 0xcf, 0xb2, 0x46,
+	0xad, 0xaf, 0xb3, 0x96, 0xd7, 0x65, 0x09, 0x45, 0x3f, 0x1d, 0x4e, 0xbf,
+	0x9e, 0x29, 0x4d, 0xae, 0xe7, 0x8e, 0x39, 0x86, 0x81, 0xbd, 0x53, 0x1d,
+	0x85, 0x7b, 0xe9, 0x69, 0x07, 0x37, 0xea, 0xe3, 0x56, 0xf3, 0xc2, 0x0b,
+	0x2f, 0xc6, 0x1c, 0x46, 0x4d, 0x4d, 0x0d, 0x0f, 0x3e, 0x30, 0x35, 0xea,
+	0x77, 0x3f, 0x3b, 0xf3, 0x30, 0x53, 0xa8, 0x8c, 0x78, 0xdb, 0xa9, 0xcf,
+	0x7c, 0xe2, 0xfe, 0x51, 0x5b, 0x97, 0x92, 0xe2, 0x99, 0x8e, 0xc2, 0x53,
+	0x55, 0xee, 0xbb, 0xf7, 0xbe, 0xef, 0xfe, 0x9f, 0x96, 0xe2, 0xc2, 0x65,
+	0xc5, 0x3e, 0x04, 0x71, 0xf8, 0xe0, 0x3e, 0xbb, 0xb5, 0x90, 0x7b, 0xf2,
+	0x93, 0x11, 0xce, 0xf6, 0x20, 0xef, 0xd3, 0xc8, 0xed, 0xbe, 0xe7, 0x9e,
+	0x7b, 0x08, 0x87, 0xc3, 0x8e, 0xc2, 0x59, 0xb4, 0x68, 0x11, 0x9b, 0x37,
+	0x37, 0x7d, 0x9f, 0x7d, 0xf4, 0x7e, 0x7d, 0x49, 0x73, 0x9b, 0xe2, 0x67,
+	0xc4, 0x9b, 0x68, 0x23, 0x09, 0xec, 0x3f, 0xa0, 0xa9, 0xcb, 0xbc, 0x61,
+	0xfd, 0x06, 0xc7, 0x85, 0x1a, 0x60, 0xeb, 0xd6, 0xad, 0xbb, 0x5c, 0x67,
+	0xe0, 0xe0, 0x81, 0xb1, 0xbf, 0x7e, 0x3a, 0xed, 0xf0, 0x81, 0x2d, 0x7e,
+	0x3f, 0xc2, 0xe1, 0xab, 0x28, 0xab, 0xd1, 0x68, 0xf1, 0x7b, 0xef, 0xbe,
+	0xd7, 0x26, 0xfb, 0xad, 0x58, 0xb1, 0x22, 0xea, 0xf5, 0x54, 0xb7, 0xcb,
+	0x14, 0x2e, 0x23, 0xde, 0xc4, 0x92, 0xea, 0x76, 0xed, 0x56, 0x98, 0x77,
+	0xf2, 0x85, 0x03, 0x77, 0xb9, 0x31, 0xa1, 0x50, 0x88, 0xf5, 0xeb, 0xd7,
+	0xef, 0x72, 0x9d, 0x07, 0xf5, 0x76, 0x54, 0xb1, 0xb4, 0x84, 0xd3, 0xd7,
+	0x09, 0x8d, 0xbd, 0x80, 0x50, 0xa8, 0x6d, 0x5b, 0x81, 0xbd, 0xf5, 0x56,
+	0xf4, 0x91, 0xf4, 0x14, 0xb7, 0x98, 0xc2, 0x65, 0xc4, 0x9b, 0x58, 0x42,
+	0x76, 0xf4, 0x77, 0x92, 0x6b, 0xbf, 0x6d, 0xfb, 0x0e, 0x2c, 0xdf, 0x7c,
+	0xb3, 0x6b, 0xa0, 0x6b, 0xc3, 0xb6, 0xba, 0xa4, 0x49, 0x73, 0xe3, 0xb9,
+	0xc8, 0xb6, 0xdd, 0xb6, 0x77, 0xb2, 0xdf, 0xae, 0xf9, 0x36, 0xea, 0xf5,
+	0xb0, 0x6d, 0xe6, 0x3b, 0x1b, 0xf1, 0x26, 0x5a, 0xbc, 0x61, 0xa5, 0x6a,
+	0x47, 0xd3, 0xd7, 0x23, 0x07, 0x1c, 0xd8, 0xf6, 0xd7, 0x8d, 0x07, 0x1d,
+	0xb4, 0xeb, 0x3d, 0xea, 0xa7, 0xeb, 0xaa, 0x93, 0x48, 0xbc, 0x8d, 0x0a,
+	0x89, 0xd5, 0xb6, 0x62, 0x72, 0xe0, 0x81, 0xd1, 0xa7, 0x81, 0xd6, 0x99,
+	0x89, 0x1a, 0x46, 0xbc, 0xed, 0xc1, 0xf2, 0x28, 0x8b, 0x08, 0x0e, 0x3c,
+	0xf0, 0xc0, 0x36, 0x85, 0x99, 0x92, 0x92, 0xc2, 0x3e, 0xfb, 0xec, 0xf3,
+	0x5d, 0x05, 0xb1, 0xad, 0x36, 0x79, 0x76, 0xaa, 0x0d, 0x85, 0xed, 0xdd,
+	0xe2, 0xd9, 0x16, 0xce, 0x18, 0x71, 0x46, 0x93, 0x6b, 0xdb, 0x6a, 0x43,
+	0xd4, 0xd6, 0x1b, 0xf1, 0x1a, 0xf1, 0xb6, 0x03, 0x2f, 0x2d, 0x6d, 0xba,
+	0x79, 0xc3, 0xe0, 0xc1, 0x83, 0x49, 0x4d, 0x4d, 0x75, 0x1c, 0xe6, 0x4e,
+	0xe1, 0x02, 0x54, 0xd5, 0x24, 0xd7, 0xee, 0xa5, 0xcb, 0x3e, 0xdf, 0xf4,
+	0xdd, 0xdf, 0xa7, 0x9f, 0x7e, 0x7a, 0x9b, 0xc2, 0x3a, 0xee, 0xd8, 0xe3,
+	0x9a, 0x5c, 0xfb, 0xe7, 0xd2, 0x2f, 0xcd, 0x32, 0x41, 0x23, 0xde, 0xf6,
+	0xe1, 0x8b, 0x0d, 0xdb, 0xa2, 0xb6, 0x9c, 0xb7, 0xdc, 0x32, 0xd9, 0x51,
+	0x78, 0x22, 0xc2, 0xdd, 0xbf, 0x9b, 0xf2, 0xdd, 0xff, 0x5f, 0x78, 0xfb,
+	0xcb, 0xa4, 0x4a, 0xef, 0xe3, 0xc1, 0x4f, 0xbe, 0xdb, 0xb1, 0xef, 0xd7,
+	0xb7, 0xdf, 0x86, 0xdb, 0xed, 0x6c, 0x46, 0xd4, 0xd8, 0x71, 0x63, 0xe9,
+	0xd7, 0xbf, 0x5f, 0x93, 0xeb, 0xe5, 0xef, 0x7f, 0x6b, 0x0a, 0x95, 0x11,
+	0x6f, 0xfb, 0x50, 0x5d, 0x1b, 0xe2, 0xc9, 0x7f, 0xaf, 0x6e, 0x72, 0xfd,
+	0xec, 0x73, 0xce, 0xe6, 0xb8, 0xe3, 0x8e, 0x8b, 0x39, 0xbc, 0xb3, 0xcf,
+	0x3e, 0x9b, 0x63, 0x8e, 0x89, 0xcc, 0xaa, 0xaa, 0xa9, 0x0f, 0xf3, 0x62,
+	0x92, 0x89, 0xf7, 0x9b, 0x2d, 0x35, 0xac, 0xd9, 0xbc, 0x03, 0x80, 0xb4,
+	0xb4, 0x34, 0xae, 0xbf, 0xfe, 0xba, 0xa8, 0x8b, 0x0d, 0x5a, 0xa2, 0x7f,
+	0xff, 0xfe, 0x64, 0x65, 0x35, 0x3d, 0x36, 0x6a, 0xc5, 0x57, 0x9b, 0x59,
+	0x5b, 0x55, 0x63, 0x0a, 0x95, 0x11, 0x6f, 0xfb, 0x31, 0x7b, 0xd9, 0x57,
+	0x4d, 0xfa, 0x69, 0x29, 0x29, 0x29, 0x4c, 0x2d, 0x78, 0x90, 0x61, 0xc3,
+	0x86, 0xb5, 0x3a, 0x9c, 0xe1, 0xc3, 0x87, 0x33, 0xe5, 0xee, 0x5d, 0x3b,
+	0x97, 0x3e, 0xe2, 0xff, 0x24, 0x29, 0xd3, 0xfb, 0xeb, 0x17, 0xde, 0xf9,
+	0xce, 0xb5, 0xbd, 0xfc, 0x27, 0x97, 0x73, 0xd1, 0x8f, 0x2e, 0x6a, 0xb5,
+	0x80, 0xfb, 0xf5, 0xeb, 0xc7, 0xa3, 0x8f, 0x3d, 0x42, 0xcf, 0x9e, 0x4d,
+	0x57, 0x60, 0x3d, 0x38, 0xf7, 0x43, 0x8c, 0xc7, 0x6c, 0xc4, 0xdb, 0xae,
+	0x6c, 0xaf, 0x0b, 0x73, 0xcb, 0xf3, 0xcb, 0x9a, 0x5c, 0xef, 0xd5, 0xab,
+	0x17, 0x0f, 0x3d, 0x3c, 0x93, 0x0b, 0x2e, 0xbc, 0xa0, 0xc5, 0xfb, 0x53,
+	0x52, 0x52, 0xb8, 0xfa, 0xea, 0xab, 0x98, 0x5a, 0xf0, 0xe0, 0x77, 0xd7,
+	0xde, 0xfc, 0x74, 0x03, 0xa5, 0x2b, 0x92, 0xf3, 0x48, 0xd9, 0x35, 0x5b,
+	0x6a, 0x78, 0x7a, 0xf1, 0x67, 0xdf, 0xfd, 0x3f, 0x2b, 0x6b, 0x02, 0x93,
+	0xf2, 0x27, 0xd1, 0xb7, 0x6f, 0xdf, 0x16, 0xef, 0x3b, 0xeb, 0xac, 0x91,
+	0x3c, 0xfd, 0xb7, 0xbf, 0xb2, 0xef, 0xbe, 0xfb, 0x36, 0xf9, 0x6e, 0xc6,
+	0xfc, 0x95, 0xac, 0xdd, 0x6a, 0x5a, 0xdd, 0x78, 0x60, 0x96, 0x76, 0xc4,
+	0xc8, 0xca, 0x35, 0x55, 0x14, 0xcc, 0xfd, 0x90, 0xfc, 0x71, 0xc7, 0xee,
+	0x76, 0x3d, 0x35, 0x35, 0x95, 0xdc, 0xdc, 0x1c, 0xae, 0xb8, 0xe2, 0x0a,
+	0x2a, 0xca, 0xcb, 0x59, 0xb6, 0x7c, 0x79, 0xa3, 0xf5, 0xbc, 0x83, 0x39,
+	0xed, 0xf4, 0xd3, 0xc9, 0xc8, 0xf0, 0xd1, 0xbf, 0xff, 0xae, 0x09, 0xf9,
+	0xab, 0xd7, 0x55, 0xf3, 0xdb, 0x97, 0xde, 0x4b, 0xea, 0xf4, 0x3e, 0xbb,
+	0xe4, 0x73, 0x0e, 0x1d, 0xd4, 0x0b, 0xcf, 0xb1, 0x11, 0x21, 0xfe, 0xf0,
+	0x87, 0xe3, 0x18, 0x33, 0x66, 0x34, 0xfe, 0x0a, 0x3f, 0x8b, 0x17, 0x2f,
+	0xde, 0x6d, 0x3d, 0xef, 0xf1, 0xc7, 0x1f, 0xcf, 0x39, 0xe9, 0xe7, 0x70,
+	0xf4, 0xd1, 0x47, 0x47, 0x0d, 0xeb, 0x95, 0x65, 0x5f, 0x33, 0xef, 0xbd,
+	0x6f, 0x4c, 0x21, 0x32, 0xe2, 0xed, 0x38, 0xca, 0xff, 0xbb, 0x86, 0xaa,
+	0x9a, 0x7a, 0xee, 0xbc, 0xf0, 0x04, 0xdc, 0x7b, 0xbc, 0x03, 0xdd, 0x77,
+	0xdf, 0xa1, 0x5c, 0xf9, 0xd3, 0x2b, 0xb9, 0xf2, 0xa7, 0x57, 0xb6, 0x18,
+	0xc6, 0x82, 0x95, 0x6b, 0xf9, 0xc3, 0x6b, 0xff, 0x6d, 0x73, 0x5c, 0xf6,
+	0x36, 0xcf, 0x21, 0x1e, 0xee, 0xe9, 0xfd, 0xaf, 0x7d, 0xc0, 0xd7, 0x9b,
+	0x76, 0x70, 0xe5, 0xf7, 0x0f, 0x43, 0x04, 0xdc, 0x6e, 0x37, 0x63, 0x32,
+	0xc7, 0x30, 0x26, 0x73, 0x4c, 0xab, 0xc3, 0xf8, 0x53, 0xe5, 0x2a, 0x5e,
+	0x5c, 0xfa, 0xa5, 0x71, 0x97, 0x8d, 0xdb, 0xdc, 0xf1, 0xbc, 0xf1, 0xe9,
+	0x06, 0x7e, 0xf1, 0x97, 0x37, 0x59, 0xb2, 0x6a, 0x7d, 0x4c, 0xf7, 0x6d,
+	0xd9, 0x51, 0x4f, 0x51, 0xd9, 0x4a, 0xee, 0x7b, 0xf5, 0xbf, 0x71, 0x29,
+	0xc8, 0x6f, 0xad, 0xde, 0xd8, 0xe2, 0xf7, 0x4b, 0x3e, 0xdd, 0x10, 0x97,
+	0xf4, 0x3e, 0xbd, 0xf8, 0x33, 0x7e, 0xfb, 0xd2, 0xbb, 0x7c, 0x1e, 0x65,
+	0xd4, 0xbd, 0x25, 0x3e, 0x5a, 0x53, 0xc5, 0xe4, 0xe7, 0x96, 0xf3, 0xc2,
+	0xdb, 0x46, 0xb8, 0xa6, 0xe5, 0x4d, 0xb2, 0x3e, 0xe1, 0x94, 0x7f, 0xad,
+	0xe0, 0x84, 0x03, 0xfb, 0x33, 0xfa, 0x84, 0xfd, 0xf8, 0xfe, 0xb0, 0x41,
+	0x0c, 0xe8, 0x95, 0x1a, 0xa5, 0x75, 0x54, 0x56, 0x7c, 0xb5, 0x85, 0x45,
+	0x9f, 0xac, 0xe7, 0xd5, 0xe5, 0x5f, 0xc7, 0x75, 0x5a, 0xe0, 0x67, 0xeb,
+	0xab, 0x09, 0xd9, 0xda, 0xec, 0xca, 0xa2, 0xe7, 0xde, 0xf8, 0x3c, 0x6e,
+	0xcf, 0x7a, 0x6b, 0xf5, 0x46, 0xde, 0x5a, 0xbd, 0x11, 0xdf, 0x71, 0xfb,
+	0x72, 0xf6, 0xd1, 0x43, 0x38, 0xfd, 0xf0, 0x81, 0xb8, 0x5d, 0x4d, 0xeb,
+	0xff, 0xda, 0x50, 0x98, 0xb7, 0x3e, 0xdd, 0x48, 0xe5, 0xca, 0xb5, 0xfc,
+	0xfb, 0xe3, 0x75, 0x46, 0xb4, 0x46, 0xbc, 0xc9, 0xcb, 0xfb, 0x5f, 0x6f,
+	0xe1, 0xfd, 0xaf, 0xb7, 0x20, 0x22, 0x1c, 0xb4, 0x4f, 0x4f, 0x06, 0xf7,
+	0x49, 0x63, 0x60, 0x9f, 0x5d, 0x9b, 0xae, 0xff, 0x6f, 0xd3, 0x0e, 0xaa,
+	0x13, 0x34, 0x7b, 0x2a, 0x6c, 0x2b, 0xb9, 0xcf, 0x2c, 0xe5, 0xbe, 0x1f,
+	0x9f, 0xbc, 0xdb, 0x9a, 0xde, 0xb0, 0xad, 0x94, 0x94, 0x7f, 0xc4, 0xc6,
+	0x04, 0xcc, 0x97, 0xf6, 0x7f, 0xf0, 0x2d, 0xfe, 0x0f, 0xbe, 0xc5, 0xed,
+	0x12, 0x0e, 0x19, 0xd8, 0x9b, 0x41, 0x7d, 0xd2, 0x18, 0xd0, 0x2b, 0x85,
+	0x4d, 0xdb, 0xeb, 0xd8, 0x50, 0x5d, 0xcb, 0x17, 0x1b, 0xb6, 0x9b, 0x79,
+	0xcb, 0x46, 0xbc, 0x9d, 0x0b, 0x55, 0xe5, 0xcb, 0x8d, 0xdb, 0xf9, 0x72,
+	0xe3, 0xf6, 0x76, 0x7d, 0xee, 0x27, 0x6b, 0xab, 0xb9, 0xe2, 0xd1, 0xc5,
+	0x8c, 0x3c, 0x6a, 0x08, 0x87, 0x0e, 0xea, 0xc5, 0x37, 0x5b, 0x6a, 0x78,
+	0x63, 0xd5, 0x7a, 0xaa, 0x6a, 0x12, 0x3b, 0xdd, 0x32, 0x14, 0x56, 0x3e,
+	0x5d, 0x57, 0x9d, 0x54, 0x73, 0xb2, 0x8d, 0x78, 0x0d, 0x9d, 0x8e, 0xb0,
+	0xad, 0x2c, 0x58, 0xb9, 0xd6, 0x18, 0xa2, 0x1b, 0xd1, 0x9d, 0x06, 0xac,
+	0xc2, 0x26, 0xbb, 0x0d, 0x46, 0xbc, 0x9d, 0x90, 0xd2, 0x7c, 0xef, 0xa7,
+	0x88, 0x1e, 0x02, 0x92, 0x0f, 0xbc, 0x69, 0xb2, 0xbe, 0x53, 0xb2, 0x04,
+	0xf8, 0x9d, 0x31, 0x43, 0x84, 0x2e, 0xb9, 0x95, 0xc1, 0x98, 0x82, 0xc0,
+	0x71, 0x67, 0x56, 0x57, 0x7e, 0x38, 0x65, 0xca, 0x94, 0x66, 0x47, 0x4d,
+	0x32, 0xa7, 0xf9, 0x0f, 0x43, 0xe5, 0x77, 0xc0, 0x55, 0xa6, 0x18, 0x24,
+	0x3d, 0x4f, 0x22, 0x3a, 0xa5, 0x74, 0x92, 0xef, 0x73, 0x63, 0x8a, 0x2e,
+	0x2c, 0xde, 0xe1, 0x8f, 0xbd, 0x2d, 0x83, 0xab, 0xaa, 0xd6, 0x03, 0x75,
+	0xc0, 0xf3, 0x82, 0xce, 0x9a, 0x97, 0xef, 0xfb, 0x77, 0xb4, 0xdf, 0xfe,
+	0xb0, 0xa0, 0x22, 0x2d, 0x8c, 0xb5, 0x09, 0xe8, 0x69, 0x8a, 0x42, 0xd2,
+	0xb2, 0xdd, 0x85, 0xbd, 0xcf, 0x9c, 0xfc, 0x8c, 0xa8, 0xc3, 0xe6, 0x63,
+	0x0b, 0xfc, 0x67, 0x2b, 0x72, 0x19, 0xb0, 0xb0, 0x34, 0xdf, 0xfb, 0xbc,
+	0x11, 0x6f, 0x27, 0x66, 0x6c, 0x41, 0x60, 0x90, 0xc2, 0x9e, 0x33, 0x27,
+	0xbe, 0x06, 0x66, 0x21, 0x3c, 0x5f, 0x3a, 0xc9, 0xfb, 0xfa, 0x6e, 0x2d,
+	0x70, 0x41, 0xe0, 0x7d, 0xe0, 0xf8, 0xbd, 0x04, 0xbb, 0x0e, 0xf8, 0x17,
+	0x70, 0x00, 0x70, 0x6a, 0xc3, 0xbf, 0x06, 0x67, 0x7c, 0x0d, 0x2c, 0x03,
+	0xbe, 0x01, 0x2e, 0x06, 0xf6, 0xb6, 0x43, 0xde, 0x8a, 0xd2, 0x7c, 0xef,
+	0x49, 0xbb, 0x7b, 0x4d, 0x81, 0x33, 0x51, 0x2e, 0x03, 0x2e, 0x03, 0x76,
+	0x6e, 0x67, 0x32, 0xa3, 0x34, 0xdf, 0x9b, 0xdb, 0x9d, 0x0c, 0xd9, 0xf5,
+	0x46, 0x9b, 0x95, 0x81, 0x51, 0xaa, 0xa4, 0x03, 0x81, 0x5c, 0x94, 0xdc,
+	0xcc, 0x82, 0xc0, 0x82, 0xd2, 0x7c, 0x6f, 0x7a, 0x2c, 0x35, 0x3f, 0xb6,
+	0x7d, 0x7c, 0xe9, 0x2d, 0x19, 0xeb, 0x1b, 0x15, 0x9e, 0xa1, 0xa8, 0x9c,
+	0x0a, 0x7a, 0x2a, 0x70, 0x72, 0x83, 0xa0, 0x8f, 0x31, 0xba, 0x6c, 0xc2,
+	0xca, 0x06, 0xa1, 0x2e, 0x07, 0x59, 0x86, 0xe8, 0xf2, 0xd2, 0x49, 0xde,
+	0xb5, 0xbb, 0x2a, 0xda, 0xe0, 0x6f, 0x14, 0xfd, 0x1c, 0xe8, 0xd1, 0xda,
+	0x00, 0x33, 0x0b, 0x02, 0x8b, 0x51, 0x7e, 0x10, 0xe5, 0xab, 0xe3, 0xba,
+	0x9b, 0x71, 0xbb, 0x9c, 0x78, 0x55, 0xf6, 0x5a, 0x10, 0xf6, 0x89, 0x31,
+	0xc8, 0xf5, 0x8d, 0x85, 0x0b, 0xd0, 0x50, 0x00, 0x4b, 0x1b, 0x3e, 0x00,
+	0x9c, 0xfb, 0xc0, 0x82, 0x5e, 0xf5, 0x2e, 0xfb, 0x14, 0x89, 0x08, 0xfa,
+	0x94, 0x06, 0x41, 0x9f, 0x04, 0xa4, 0x76, 0x83, 0x72, 0x54, 0x07, 0xbc,
+	0x1b, 0x11, 0x29, 0xcb, 0x14, 0x59, 0x9e, 0x12, 0xb6, 0x96, 0xbf, 0x76,
+	0xeb, 0x39, 0x2d, 0xbe, 0xf0, 0x9e, 0x97, 0xef, 0x59, 0x9b, 0x59, 0x10,
+	0xd8, 0x18, 0xa3, 0x27, 0x33, 0xa0, 0x99, 0xeb, 0x46, 0xbc, 0x5d, 0x80,
+	0x78, 0x8b, 0xa5, 0x55, 0x53, 0x85, 0x1a, 0x0a, 0xea, 0xe2, 0x86, 0x0f,
+	0x00, 0x23, 0xff, 0xf8, 0xa6, 0xab, 0xef, 0xd6, 0xed, 0x27, 0xa8, 0xad,
+	0xa7, 0x21, 0xdc, 0x0e, 0x0c, 0xeb, 0x42, 0x76, 0xfe, 0x04, 0xe5, 0x5e,
+	0xb1, 0x64, 0xe9, 0xe6, 0x81, 0x7d, 0xde, 0x5f, 0x72, 0xed, 0x69, 0x76,
+	0x22, 0xed, 0xdb, 0x0a, 0x0e, 0x3a, 0x7f, 0xca, 0x6c, 0x79, 0x65, 0xca,
+	0x05, 0x6a, 0xc4, 0xdb, 0x79, 0xdb, 0xde, 0xed, 0x89, 0xec, 0xca, 0x67,
+	0x16, 0x04, 0xc6, 0x03, 0x35, 0x08, 0xcb, 0xd4, 0xae, 0x5b, 0x51, 0x36,
+	0x39, 0xb3, 0xd9, 0xcd, 0xa7, 0x16, 0xfd, 0xf2, 0x8c, 0x70, 0x43, 0x8b,
+	0xf4, 0x6e, 0x66, 0x41, 0xe0, 0x65, 0x9a, 0xf6, 0xc5, 0x5b, 0x5b, 0xb8,
+	0x3f, 0x04, 0xb6, 0x37, 0x8c, 0x51, 0x48, 0xa3, 0xf1, 0x8a, 0x3d, 0xff,
+	0x96, 0x3d, 0x04, 0xa1, 0x7b, 0xf9, 0xbb, 0x57, 0x1b, 0x5a, 0xac, 0xd3,
+	0x4a, 0x27, 0x7b, 0xb7, 0xb4, 0xe6, 0x87, 0x63, 0xa6, 0x96, 0xa6, 0x88,
+	0x95, 0x7a, 0x12, 0xca, 0x29, 0x40, 0x5a, 0x69, 0xbe, 0xf7, 0x91, 0x04,
+	0x64, 0xcd, 0x86, 0xee, 0x24, 0xdc, 0x2e, 0xda, 0xe7, 0x95, 0xaa, 0x84,
+	0x0e, 0xc3, 0x09, 0x3f, 0x46, 0xf1, 0xa2, 0x20, 0x92, 0x1a, 0xca, 0x2c,
+	0x08, 0xac, 0x68, 0xdc, 0xaf, 0x73, 0x11, 0x5e, 0x3e, 0x27, 0x3f, 0xa3,
+	0xc9, 0xe9, 0x5a, 0x6a, 0x6b, 0x95, 0xc4, 0x7e, 0x9c, 0x89, 0xa2, 0x7a,
+	0x59, 0xe9, 0x64, 0xdf, 0x0b, 0x89, 0xab, 0x8c, 0x82, 0x57, 0x80, 0x3e,
+	0x43, 0x8c, 0x35, 0x9e, 0xda, 0x1a, 0xd5, 0x25, 0xfe, 0x61, 0x41, 0x45,
+	0xbf, 0x30, 0xae, 0x93, 0x1b, 0xc6, 0x03, 0x76, 0x7e, 0x4e, 0x40, 0x1b,
+	0xca, 0x9a, 0x50, 0x01, 0x24, 0x42, 0xbc, 0x9f, 0x19, 0xb7, 0xb9, 0xb3,
+	0x23, 0x5a, 0xdd, 0x8e, 0x83, 0xe8, 0xee, 0x86, 0xfe, 0xed, 0x29, 0x3b,
+	0xb5, 0x16, 0xc6, 0xd2, 0xcc, 0x82, 0xc0, 0xaa, 0x06, 0x41, 0xcf, 0x29,
+	0xcd, 0xf7, 0x3e, 0x19, 0xf9, 0x46, 0x9c, 0xc4, 0xaa, 0x36, 0x91, 0xc2,
+	0x05, 0x28, 0xcd, 0xf7, 0x3c, 0x9b, 0x59, 0x10, 0x78, 0x0a, 0x48, 0x89,
+	0xad, 0x56, 0x91, 0xc6, 0xde, 0xc8, 0x75, 0xc0, 0x38, 0xe0, 0xd4, 0x30,
+	0x1c, 0x01, 0xda, 0x11, 0x6f, 0x31, 0x56, 0x1b, 0xf1, 0x76, 0x72, 0xc2,
+	0xa1, 0xf0, 0x56, 0x97, 0x3b, 0x65, 0x03, 0x68, 0x6b, 0x0f, 0xe9, 0x29,
+	0x07, 0x0e, 0x6b, 0x70, 0x21, 0xe3, 0xd3, 0x36, 0xc3, 0x91, 0x0d, 0x9f,
+	0xfd, 0x80, 0x27, 0x13, 0xdd, 0xdf, 0x4e, 0x02, 0x6e, 0x00, 0x46, 0x24,
+	0x20, 0xdc, 0x6d, 0x0d, 0xf9, 0xd3, 0x1a, 0x8f, 0xeb, 0x0d, 0x23, 0xde,
+	0x4e, 0x4e, 0xf9, 0x6d, 0xa3, 0xed, 0xcc, 0x82, 0xc0, 0xdf, 0x80, 0x9c,
+	0xd6, 0xb5, 0x3c, 0xde, 0x9c, 0xd1, 0x33, 0x17, 0xde, 0xe2, 0xda, 0x11,
+	0x1a, 0xab, 0xc2, 0xc5, 0xc0, 0x05, 0x34, 0x3f, 0xa2, 0xd9, 0xa1, 0x64,
+	0x16, 0x04, 0xb2, 0x81, 0xf3, 0x1a, 0xf5, 0x59, 0x9b, 0xfb, 0x58, 0x2d,
+	0xf4, 0x89, 0x05, 0x98, 0x5d, 0x9a, 0xef, 0x9d, 0x99, 0xa4, 0x59, 0xb8,
+	0x19, 0x78, 0x59, 0x94, 0x7f, 0x86, 0x7a, 0xb9, 0xe7, 0x95, 0xdf, 0x7c,
+	0x76, 0x5d, 0x94, 0xca, 0x31, 0x9a, 0xc7, 0x55, 0x6e, 0xc4, 0xdb, 0x25,
+	0xfa, 0xbd, 0xbc, 0x84, 0x34, 0x2b, 0xde, 0x03, 0x2f, 0x9d, 0xbe, 0xd8,
+	0x35, 0x6b, 0xe2, 0x99, 0xdf, 0x2d, 0x54, 0x98, 0x3f, 0xe1, 0xec, 0x5a,
+	0xe0, 0x65, 0xe0, 0xe5, 0x71, 0x05, 0xe5, 0x6e, 0x5b, 0xdc, 0x19, 0xa8,
+	0x5e, 0x02, 0x5c, 0x98, 0x64, 0x29, 0x3b, 0x16, 0x18, 0x1d, 0x87, 0x70,
+	0x56, 0x26, 0x59, 0xba, 0xd6, 0x02, 0x2f, 0x21, 0xf2, 0x4f, 0x4b, 0x43,
+	0xfe, 0xb9, 0xf9, 0xa3, 0xa2, 0xae, 0x65, 0xbc, 0x74, 0xfa, 0x62, 0xf7,
+	0x56, 0xbb, 0x76, 0xdf, 0x66, 0xfc, 0x9d, 0x4f, 0x8d, 0x78, 0xbb, 0x42,
+	0xb7, 0xd7, 0xe2, 0xc3, 0x16, 0x76, 0x6f, 0x18, 0xb8, 0xd5, 0xae, 0x7d,
+	0x27, 0xb3, 0x20, 0x70, 0x57, 0xc8, 0x1d, 0x9e, 0x53, 0x91, 0x3b, 0x6a,
+	0x47, 0xe3, 0x2f, 0x1b, 0x0a, 0x4e, 0x29, 0x50, 0x3a, 0x66, 0x5a, 0xe5,
+	0x4d, 0xa2, 0xf6, 0x29, 0x18, 0x12, 0xc9, 0x85, 0x2a, 0xd6, 0xf2, 0xb2,
+	0x49, 0xe9, 0xcd, 0xae, 0xfa, 0xca, 0x2c, 0x5c, 0xd0, 0x8b, 0x70, 0xf8,
+	0xdc, 0xad, 0x76, 0xed, 0xef, 0x88, 0xfe, 0x9e, 0x3e, 0x50, 0x3a, 0xc9,
+	0x5b, 0x65, 0xc4, 0xdb, 0x05, 0x98, 0x37, 0xc9, 0xfb, 0xed, 0x98, 0xa9,
+	0x81, 0x7f, 0x88, 0xf0, 0x93, 0x66, 0x7e, 0x72, 0x02, 0xf0, 0x82, 0x3b,
+	0xe4, 0xaa, 0xc9, 0x2c, 0x08, 0xcc, 0x05, 0xfe, 0x69, 0xdb, 0xd6, 0xec,
+	0xf9, 0xb7, 0xa4, 0x6f, 0x6d, 0xfc, 0xa3, 0x86, 0x02, 0xb5, 0xd4, 0xe8,
+	0x2b, 0x71, 0x94, 0xe6, 0x7b, 0xa3, 0xda, 0x77, 0xec, 0x03, 0xfe, 0x01,
+	0xea, 0x92, 0x0b, 0x80, 0x8b, 0x09, 0x87, 0xc7, 0x02, 0x69, 0xcd, 0xd7,
+	0xd6, 0x72, 0x57, 0x77, 0xb4, 0x5d, 0xd7, 0x5d, 0x8c, 0x6f, 0x71, 0x2f,
+	0xda, 0xac, 0x78, 0x77, 0xd2, 0x03, 0xf8, 0x11, 0xf0, 0x23, 0xcb, 0xb2,
+	0xeb, 0x33, 0x0b, 0x02, 0x15, 0xc0, 0x3f, 0x71, 0xd9, 0xff, 0x2a, 0xcd,
+	0xcb, 0x58, 0xd7, 0x8c, 0x4b, 0x6e, 0x4e, 0x84, 0x6e, 0x5b, 0x97, 0xa6,
+	0xd9, 0x32, 0x37, 0x66, 0xaa, 0x7f, 0x5f, 0x11, 0xb9, 0x10, 0xb8, 0x44,
+	0xc1, 0xd7, 0xca, 0xf2, 0xf9, 0x0d, 0xe1, 0xf0, 0x1b, 0x46, 0xbc, 0x5d,
+	0x88, 0xba, 0x2a, 0xde, 0x4f, 0xeb, 0xcd, 0x9b, 0x08, 0x67, 0xb4, 0xf2,
+	0x96, 0x14, 0x60, 0x2c, 0x30, 0x96, 0xb0, 0xf5, 0x48, 0x66, 0x41, 0x60,
+	0xa1, 0x20, 0xff, 0x0c, 0xdb, 0xe1, 0x7f, 0xcd, 0xbf, 0x25, 0xe3, 0x4b,
+	0x80, 0x31, 0xd3, 0x02, 0xbd, 0x51, 0x67, 0xa3, 0xaa, 0x16, 0xe1, 0x30,
+	0xb8, 0x4a, 0x80, 0x23, 0x88, 0xcc, 0xb4, 0x1a, 0x46, 0x8c, 0xaf, 0x67,
+	0x3a, 0xda, 0xa4, 0xc0, 0xa7, 0xc0, 0x2a, 0x60, 0x55, 0x24, 0x3d, 0x8e,
+	0x18, 0x31, 0x66, 0x5a, 0xa0, 0x67, 0xd9, 0x24, 0xef, 0x0e, 0x80, 0xb1,
+	0x05, 0xfe, 0x43, 0xc0, 0xba, 0x48, 0xd1, 0x4b, 0x80, 0x91, 0x10, 0x73,
+	0xe5, 0x98, 0x53, 0x7a, 0x4b, 0x46, 0x9d, 0x11, 0x6f, 0x17, 0x22, 0x38,
+	0xc5, 0xab, 0x63, 0x0b, 0x02, 0x13, 0xd4, 0xd9, 0xc2, 0x7b, 0x17, 0xe0,
+	0x51, 0xd4, 0x63, 0x59, 0x56, 0x51, 0x66, 0x41, 0xe0, 0x2d, 0xe0, 0x6d,
+	0x94, 0x73, 0x5a, 0x74, 0xdf, 0x5a, 0x72, 0x0f, 0x6f, 0x19, 0x15, 0x06,
+	0xb2, 0x77, 0xb5, 0x32, 0xa5, 0x62, 0x91, 0x76, 0x30, 0xe8, 0x91, 0x2a,
+	0xdf, 0x89, 0x79, 0xa7, 0xb0, 0x8f, 0x04, 0xfa, 0x75, 0x80, 0xd9, 0xb6,
+	0xec, 0x14, 0xe7, 0xce, 0x8f, 0x28, 0xab, 0x40, 0x56, 0xd9, 0xd4, 0x7e,
+	0x59, 0x36, 0x39, 0x33, 0x1e, 0xaf, 0xae, 0x7a, 0x88, 0xf2, 0x7a, 0x66,
+	0x41, 0xe0, 0xdf, 0xc0, 0xe9, 0x0a, 0xa7, 0xb7, 0xe1, 0xbd, 0xf0, 0xd7,
+	0x22, 0xcc, 0xe9, 0xae, 0x4e, 0x4c, 0x97, 0xde, 0xc3, 0x6a, 0x5e, 0xbe,
+	0xf7, 0xad, 0xcc, 0x82, 0xc0, 0x43, 0xc0, 0xcd, 0x6d, 0x72, 0xc0, 0x23,
+	0xef, 0x30, 0x9d, 0xb4, 0xb8, 0x87, 0x35, 0xf7, 0x45, 0x83, 0x10, 0xbe,
+	0x68, 0xf8, 0xf8, 0xf7, 0xfc, 0x7e, 0xdc, 0xb4, 0x8a, 0xc1, 0xb6, 0x6d,
+	0x1d, 0xde, 0x4e, 0xae, 0xec, 0x48, 0x97, 0x15, 0x5e, 0x3d, 0x67, 0xd2,
+	0xa8, 0xf5, 0x0e, 0x43, 0x38, 0x34, 0xc6, 0xdf, 0x9f, 0xdc, 0xf0, 0x69,
+	0x13, 0x02, 0x3f, 0x9a, 0x37, 0xc9, 0xbb, 0xcd, 0x88, 0xb7, 0xab, 0x22,
+	0xfa, 0x1b, 0x54, 0x2e, 0x07, 0x06, 0x77, 0xc0, 0xd3, 0x0f, 0xcc, 0x2c,
+	0x08, 0x3c, 0x24, 0xe8, 0x5f, 0xc4, 0xd6, 0x55, 0x73, 0x6f, 0xc9, 0xd8,
+	0xdc, 0xda, 0x1b, 0xe7, 0x4e, 0xca, 0x58, 0x8f, 0xb3, 0xb9, 0xd0, 0xb1,
+	0x7b, 0x05, 0x93, 0xbd, 0x6f, 0xc5, 0x7a, 0xcf, 0xb8, 0x07, 0x2b, 0x06,
+	0xa8, 0x25, 0xc3, 0x14, 0xf9, 0x25, 0x30, 0xb4, 0xdd, 0xb3, 0x15, 0x1e,
+	0x9a, 0x97, 0x1f, 0x7b, 0xbc, 0x8d, 0x78, 0x3b, 0x11, 0xa5, 0x93, 0x7c,
+	0x9b, 0xc7, 0x16, 0x04, 0x2f, 0x51, 0xb4, 0xb2, 0x03, 0x1e, 0x6f, 0x01,
+	0xe3, 0x15, 0x19, 0xaf, 0x96, 0x90, 0x59, 0x10, 0xd8, 0xb0, 0xbb, 0x5b,
+	0x2a, 0x9f, 0xaa, 0xe8, 0x2a, 0xcb, 0x96, 0x55, 0xf3, 0x26, 0x7b, 0xbe,
+	0x6e, 0x45, 0x78, 0x07, 0xc5, 0x29, 0x5e, 0x07, 0xb7, 0xe6, 0x47, 0x63,
+	0xa7, 0x06, 0x0f, 0xb4, 0x2d, 0x1d, 0x26, 0x2a, 0xc3, 0x40, 0x77, 0x73,
+	0xed, 0xed, 0xbd, 0x2f, 0xa2, 0x4f, 0x24, 0x5f, 0x28, 0x7a, 0x3b, 0xdd,
+	0x1c, 0xe9, 0x2e, 0x09, 0xcd, 0x2c, 0x08, 0x4c, 0x00, 0x4a, 0x92, 0x38,
+	0x8a, 0x35, 0x7b, 0xf4, 0x37, 0x3f, 0x05, 0x56, 0x89, 0xe8, 0x2a, 0xf7,
+	0xb6, 0x1d, 0x9f, 0xd5, 0xf7, 0xea, 0x95, 0x09, 0xcc, 0x8e, 0xe3, 0xf3,
+	0xce, 0x4d, 0xd9, 0xb6, 0xad, 0x3c, 0xd4, 0xa7, 0xd7, 0x61, 0xaa, 0xb2,
+	0x53, 0x98, 0x7b, 0xf6, 0xbd, 0x7b, 0x24, 0xa1, 0x9d, 0xb6, 0xab, 0x70,
+	0x7c, 0xd9, 0x24, 0x6f, 0xb7, 0xdf, 0xcf, 0xaa, 0xdb, 0xec, 0xdb, 0xac,
+	0x5a, 0xf7, 0x90, 0x48, 0xea, 0xb1, 0x6d, 0xec, 0xff, 0x26, 0x92, 0x1e,
+	0x44, 0xde, 0x3f, 0x9f, 0xb0, 0x7b, 0xbc, 0x85, 0xfa, 0x5e, 0xbd, 0x12,
+	0xf1, 0xbc, 0xd7, 0xea, 0x7b, 0xf7, 0xee, 0x3c, 0xb3, 0xa7, 0x77, 0x91,
+	0x61, 0x84, 0xbb, 0xcb, 0xad, 0xeb, 0x16, 0x94, 0x4d, 0xce, 0x54, 0x4b,
+	0xac, 0x89, 0xc0, 0xab, 0x26, 0xdb, 0x3b, 0x6d, 0x15, 0x7c, 0x65, 0x69,
+	0xbe, 0x77, 0x89, 0xb1, 0x43, 0x37, 0x13, 0x2f, 0xc0, 0xdc, 0x49, 0xe9,
+	0x75, 0xaa, 0xfa, 0x63, 0xe0, 0x19, 0x93, 0xf5, 0x9d, 0x4b, 0xb5, 0xa2,
+	0x72, 0x69, 0x69, 0xbe, 0xef, 0x59, 0x63, 0x8a, 0x6e, 0xd8, 0xe7, 0x6d,
+	0xcc, 0xd8, 0xc2, 0x80, 0x5b, 0xc3, 0x14, 0x02, 0x13, 0x4c, 0x11, 0x48,
+	0x7a, 0xea, 0x05, 0xcd, 0x9c, 0x97, 0xef, 0x0b, 0x18, 0x53, 0x74, 0xe3,
+	0x96, 0x77, 0x27, 0xf3, 0xf2, 0xbc, 0xa1, 0x70, 0x28, 0x94, 0x83, 0x70,
+	0xa7, 0x29, 0x02, 0x49, 0xcd, 0x7a, 0x90, 0x11, 0x46, 0xb8, 0xa6, 0xe5,
+	0x8d, 0x4a, 0x66, 0x41, 0xc0, 0x0b, 0xcc, 0xa2, 0x63, 0x5f, 0x7d, 0x18,
+	0x9a, 0x52, 0x66, 0x69, 0xf8, 0x27, 0x73, 0x27, 0x8f, 0xda, 0x64, 0x4c,
+	0x61, 0x5a, 0xde, 0xa8, 0x94, 0xe6, 0x7b, 0x03, 0x60, 0x1f, 0x0b, 0x54,
+	0x98, 0xe2, 0x90, 0x34, 0xfc, 0xd6, 0xb2, 0xed, 0x1f, 0x1a, 0xe1, 0x9a,
+	0x96, 0xb7, 0x75, 0x2d, 0xf0, 0xf4, 0x80, 0x1b, 0x25, 0x07, 0xe5, 0x5e,
+	0x1c, 0xce, 0x5f, 0x36, 0xb4, 0x99, 0xf7, 0x11, 0xb9, 0xa1, 0x74, 0x92,
+	0x67, 0xb1, 0x31, 0x85, 0x11, 0x6f, 0xcc, 0x8c, 0x79, 0xb0, 0x62, 0x3f,
+	0xb1, 0xac, 0x87, 0x89, 0x2c, 0x15, 0x34, 0xb4, 0x0f, 0xf5, 0xc0, 0x9d,
+	0xaa, 0x3a, 0xbd, 0x6c, 0xb2, 0xaf, 0xde, 0x98, 0xc3, 0x88, 0xd7, 0x31,
+	0xc3, 0x1f, 0x7b, 0x5b, 0x06, 0x55, 0x55, 0x9d, 0x2b, 0x50, 0x44, 0xd7,
+	0xda, 0x28, 0x3d, 0x19, 0xf9, 0x97, 0x4b, 0xf4, 0xe6, 0x39, 0x93, 0x7c,
+	0xff, 0x33, 0xa6, 0x30, 0xe2, 0x8d, 0x5f, 0x2b, 0x3c, 0x35, 0xe0, 0x16,
+	0xf8, 0x39, 0xc2, 0x6f, 0x68, 0x61, 0x85, 0x90, 0xc1, 0x11, 0x73, 0x10,
+	0xbd, 0xab, 0x74, 0x92, 0xef, 0x6d, 0x63, 0x0a, 0x23, 0xde, 0xc4, 0xf5,
+	0x87, 0x1f, 0xac, 0x48, 0xc1, 0xb2, 0xae, 0x05, 0x7e, 0x43, 0x2b, 0x27,
+	0xf5, 0x1b, 0x9a, 0xa5, 0x14, 0xd5, 0xbb, 0x4a, 0x27, 0xfb, 0xde, 0x30,
+	0xa6, 0x30, 0xe2, 0x6d, 0x37, 0x7e, 0x38, 0xbd, 0xd2, 0x1d, 0xb6, 0xed,
+	0x1f, 0x01, 0xe3, 0x01, 0x8f, 0xb1, 0x48, 0xab, 0xa9, 0x05, 0x9e, 0x12,
+	0xe1, 0xe1, 0x79, 0x93, 0xbc, 0xef, 0x18, 0x73, 0x18, 0xf1, 0x76, 0x6c,
+	0x6b, 0x5c, 0x10, 0x3c, 0x1e, 0x74, 0x3c, 0x70, 0x2d, 0xf1, 0xdb, 0xb0,
+	0xbd, 0xab, 0xf1, 0x01, 0x22, 0x8f, 0xa6, 0xaa, 0xfc, 0xf9, 0x95, 0xfc,
+	0xf4, 0x6d, 0xc6, 0x1c, 0x46, 0xbc, 0x49, 0xc5, 0xa8, 0xfb, 0x2b, 0xd2,
+	0xac, 0x14, 0xeb, 0x02, 0x89, 0x1c, 0xf6, 0x7c, 0x3e, 0xe6, 0x35, 0xd3,
+	0x17, 0xc0, 0x2c, 0x54, 0x9e, 0xaf, 0x75, 0xeb, 0x5b, 0xc1, 0x3c, 0xaf,
+	0x9a, 0x52, 0x62, 0xc4, 0x9b, 0xf4, 0x9c, 0xfb, 0x40, 0x69, 0x8f, 0x90,
+	0x2b, 0xe5, 0x42, 0x90, 0xcb, 0x80, 0x31, 0x40, 0x9f, 0x6e, 0x92, 0xf4,
+	0x55, 0xc0, 0x6c, 0x11, 0x66, 0xa5, 0x28, 0x4b, 0x5e, 0xc9, 0x37, 0x82,
+	0x35, 0xe2, 0xed, 0xc4, 0x8c, 0x29, 0x08, 0xb8, 0x40, 0xbe, 0x2f, 0xe8,
+	0x28, 0x22, 0xa7, 0x1c, 0x9c, 0xd9, 0x85, 0xec, 0xbd, 0x99, 0xc8, 0x8c,
+	0xb4, 0xf9, 0x8a, 0x5d, 0x5e, 0x96, 0x9f, 0xb1, 0xca, 0xe4, 0xb8, 0x11,
+	0x6f, 0xd7, 0x15, 0xf3, 0x03, 0x15, 0x7d, 0x2c, 0x97, 0x9c, 0xa3, 0x30,
+	0x1c, 0xe4, 0x34, 0xe0, 0x34, 0x62, 0x3b, 0x11, 0xbe, 0xa3, 0x50, 0x60,
+	0x05, 0xb0, 0x54, 0xe1, 0x6d, 0xd0, 0x37, 0x51, 0xd7, 0xd2, 0xb2, 0xc9,
+	0xe9, 0xb6, 0xc9, 0x55, 0x23, 0xde, 0x6e, 0xcb, 0xb8, 0x69, 0x95, 0xfb,
+	0x87, 0x55, 0x4f, 0x13, 0xf4, 0x24, 0x22, 0xdb, 0xbd, 0x1e, 0xdd, 0xf0,
+	0xef, 0xbe, 0x1d, 0x10, 0x1d, 0x9b, 0xc8, 0xd6, 0x3b, 0x1f, 0x03, 0x1f,
+	0xa3, 0x7c, 0xac, 0x22, 0xff, 0x09, 0xa5, 0xda, 0xff, 0xf1, 0x67, 0xfb,
+	0x6a, 0x4c, 0x6e, 0x19, 0xf1, 0x1a, 0x5a, 0x41, 0xe6, 0xf4, 0xca, 0x7e,
+	0x12, 0xb6, 0x8f, 0x52, 0xe4, 0x10, 0x2c, 0x86, 0xa2, 0x3a, 0x14, 0x18,
+	0x42, 0x64, 0x97, 0xc6, 0xa1, 0x44, 0x56, 0x40, 0xf5, 0x88, 0xf2, 0x49,
+	0x6d, 0x68, 0x29, 0x6b, 0xa2, 0x7c, 0xb6, 0x01, 0xeb, 0x88, 0x1c, 0xea,
+	0xb5, 0x16, 0x64, 0x1d, 0xe8, 0x5a, 0x15, 0x59, 0x6b, 0x61, 0xaf, 0xaa,
+	0xdb, 0x6e, 0xad, 0xf2, 0xdf, 0xe9, 0x09, 0x1b, 0xeb, 0x1b, 0x0c, 0x1d,
+	0xc0, 0x8f, 0x9f, 0x9f, 0x65, 0x19, 0x2b, 0x18, 0x0c, 0x06, 0x83, 0xc1,
+	0x60, 0x30, 0x18, 0x0c, 0x06, 0x83, 0xc1, 0x60, 0x30, 0x18, 0x0c, 0x06,
+	0x83, 0xc1, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x83, 0xc1, 0x60, 0x30, 0x18,
+	0x0c, 0x06, 0x83, 0xc1, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x83, 0xc1, 0x60,
+	0x30, 0x18, 0x0c, 0x06, 0x83, 0xc1, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x43,
+	0xdb, 0xe9, 0x90, 0x9d, 0x34, 0x32, 0x32, 0x32, 0xd2, 0x34, 0xac, 0x67,
+	0xa8, 0x70, 0x00, 0x36, 0x43, 0x91, 0xef, 0x76, 0x89, 0xe8, 0x0d, 0x54,
+	0x03, 0x55, 0x91, 0x8f, 0x6c, 0x11, 0xf4, 0x23, 0x1b, 0x79, 0x3f, 0x18,
+	0xac, 0xf8, 0xb2, 0x3d, 0xe3, 0xe8, 0xf5, 0x78, 0x0f, 0x04, 0x4e, 0x07,
+	0x6b, 0x28, 0xe8, 0xce, 0xf8, 0x0d, 0x24, 0xb2, 0xf9, 0xda, 0x5a, 0x60,
+	0x1d, 0xe8, 0x5a, 0x84, 0x77, 0x03, 0x81, 0xc0, 0x27, 0x89, 0x8a, 0x87,
+	0xc7, 0xe3, 0x11, 0xa0, 0x7f, 0x0c, 0xb7, 0xd4, 0x04, 0x83, 0xc1, 0xa4,
+	0xde, 0xb6, 0xc6, 0xe3, 0xf1, 0xec, 0x23, 0xc8, 0x0f, 0xc0, 0xda, 0x0f,
+	0xbe, 0xdb, 0x25, 0x64, 0x08, 0x91, 0xdd, 0x3e, 0x1a, 0xdb, 0x76, 0xa5,
+	0xcb, 0xe5, 0x7a, 0xaf, 0xbc, 0xbc, 0x3c, 0x2e, 0xfb, 0x65, 0xa5, 0xa7,
+	0xa7, 0xf7, 0x17, 0x91, 0x76, 0x2b, 0xf3, 0x22, 0x12, 0x0a, 0x04, 0x02,
+	0xd5, 0x9d, 0x5e, 0xbc, 0xe9, 0xe9, 0x19, 0x47, 0x59, 0x62, 0x8f, 0x05,
+	0xc9, 0x04, 0xbc, 0xc4, 0xbe, 0x51, 0xf9, 0x56, 0x60, 0x39, 0xf0, 0x32,
+	0xa2, 0x2f, 0x04, 0x02, 0x81, 0x2f, 0xe2, 0x19, 0xbf, 0x73, 0xce, 0x19,
+	0xe3, 0x72, 0x5b, 0x21, 0xaf, 0x42, 0x26, 0x30, 0x16, 0x38, 0x31, 0x86,
+	0xdb, 0x57, 0x01, 0x65, 0x08, 0xa5, 0x5b, 0xb7, 0x6e, 0x79, 0x65, 0xe9,
+	0xd2, 0xa5, 0x6d, 0x2e, 0x6c, 0x5e, 0xaf, 0xd7, 0x85, 0xca, 0x03, 0xc0,
+	0x0d, 0x40, 0xdf, 0x18, 0x6f, 0xdf, 0x01, 0x6c, 0x6a, 0xf4, 0xf9, 0x00,
+	0x58, 0x8c, 0xe8, 0xa2, 0x40, 0x20, 0xf0, 0x71, 0x47, 0x08, 0xd6, 0xe7,
+	0xf1, 0x9d, 0xae, 0x30, 0xae, 0xc1, 0xb6, 0x23, 0x68, 0xfd, 0xd9, 0xd0,
+	0xdf, 0x02, 0xf3, 0x11, 0xca, 0x6c, 0x3b, 0xfc, 0x52, 0x65, 0x65, 0xa5,
+	0x23, 0x31, 0x78, 0x3d, 0xbe, 0xd7, 0x80, 0x1f, 0xb6, 0x73, 0xb2, 0x15,
+	0xc8, 0x09, 0x04, 0xfd, 0x25, 0x9d, 0x52, 0xbc, 0x5e, 0x4f, 0xc6, 0xb1,
+	0xa0, 0x7f, 0x00, 0x2e, 0x8a, 0x63, 0xb0, 0x36, 0xb0, 0x48, 0x21, 0x2b,
+	0x18, 0xf4, 0xb7, 0xe9, 0xf8, 0x8c, 0xb3, 0xce, 0x3a, 0xcb, 0x4a, 0x49,
+	0x49, 0xbb, 0x08, 0xd5, 0xbb, 0x63, 0x14, 0x6c, 0x73, 0xfc, 0x0f, 0xb8,
+	0x2b, 0x10, 0xf4, 0xff, 0xa9, 0x6d, 0xe2, 0xcd, 0xb8, 0x1c, 0xd5, 0x7f,
+	0x24, 0x20, 0x4b, 0xd6, 0x01, 0x73, 0x14, 0x99, 0x1e, 0x0c, 0x56, 0xbc,
+	0x9b, 0xf0, 0xfc, 0xf7, 0x66, 0x8c, 0x44, 0xf5, 0xf7, 0x44, 0x8e, 0x87,
+	0x69, 0x6b, 0x79, 0xab, 0x02, 0x1e, 0xb4, 0x35, 0x3c, 0xbd, 0xb2, 0xb2,
+	0x72, 0x7b, 0x6b, 0x6f, 0x1a, 0x35, 0x6a, 0x54, 0xef, 0x70, 0xc8, 0xde,
+	0x48, 0x64, 0x8f, 0xaf, 0xf6, 0xe6, 0xb3, 0x40, 0xd0, 0x7f, 0x78, 0xa7,
+	0x12, 0xaf, 0xcf, 0xeb, 0x3b, 0x40, 0x95, 0xbb, 0x81, 0xeb, 0x62, 0xa8,
+	0x65, 0x63, 0xa5, 0x06, 0xc8, 0x0b, 0x04, 0xfd, 0x8f, 0x3a, 0x73, 0xdf,
+	0x32, 0x3c, 0x82, 0x4e, 0x25, 0xb2, 0x0d, 0x6b, 0xbc, 0x59, 0xad, 0x70,
+	0x5b, 0x30, 0xe8, 0x7f, 0xde, 0x61, 0x4b, 0xb1, 0x05, 0xe8, 0x97, 0xe0,
+	0x82, 0x35, 0x1f, 0x91, 0x69, 0x81, 0x40, 0x45, 0x69, 0xfc, 0x5d, 0xe3,
+	0x8c, 0x63, 0x05, 0x9d, 0x46, 0xa4, 0xb5, 0x8d, 0x77, 0x39, 0xdb, 0xa8,
+	0x70, 0x4f, 0x38, 0x5c, 0x5f, 0xbc, 0x70, 0xe1, 0xc2, 0x70, 0x2b, 0x6c,
+	0x79, 0x1d, 0xf0, 0xe7, 0x8e, 0xea, 0x26, 0x28, 0x7a, 0x54, 0x30, 0x18,
+	0xff, 0xae, 0x55, 0x42, 0x44, 0xe5, 0xf3, 0x64, 0x9c, 0xae, 0xca, 0x3b,
+	0xc0, 0x2f, 0x12, 0x28, 0x5c, 0x88, 0xec, 0x98, 0xf8, 0xe3, 0x58, 0x6f,
+	0x1a, 0x39, 0x72, 0xa4, 0xe5, 0xf5, 0xf8, 0x26, 0x09, 0x1a, 0x48, 0x90,
+	0x70, 0x01, 0x0e, 0x17, 0x78, 0xd6, 0xeb, 0xf1, 0xdd, 0x13, 0x7b, 0x6b,
+	0x35, 0xca, 0xdd, 0x0e, 0xc2, 0x05, 0x18, 0x8d, 0xea, 0x3c, 0xaf, 0xc7,
+	0xf7, 0xd7, 0x11, 0x23, 0xbe, 0xef, 0x8a, 0x63, 0x6b, 0x7b, 0x91, 0xa0,
+	0xcb, 0x1a, 0xdc, 0xd4, 0x44, 0x34, 0x10, 0x03, 0x05, 0xa6, 0xbb, 0x5d,
+	0x29, 0x7f, 0xf7, 0xa5, 0xfb, 0x5a, 0xd3, 0xfd, 0x3a, 0xbb, 0x43, 0x07,
+	0x96, 0x54, 0x12, 0xd2, 0xf2, 0x5a, 0xf1, 0x17, 0xae, 0xef, 0x3c, 0x45,
+	0x2b, 0x81, 0xc1, 0xed, 0x64, 0x1b, 0x57, 0x6c, 0x05, 0xcb, 0xdb, 0x23,
+	0x35, 0x25, 0xed, 0xcf, 0x40, 0x41, 0x3b, 0xc4, 0xcd, 0x02, 0xee, 0xf0,
+	0x7a, 0x7c, 0x2f, 0x0c, 0x1f, 0x3e, 0xbc, 0xd5, 0xb6, 0x56, 0x6d, 0xf7,
+	0x81, 0xc4, 0xab, 0x7a, 0xf5, 0xec, 0xb5, 0xd2, 0xeb, 0xf5, 0x1e, 0xd6,
+	0xf6, 0x6e, 0x92, 0xef, 0x76, 0x54, 0x5f, 0x68, 0xa8, 0x58, 0x13, 0xcd,
+	0x65, 0x2a, 0x2c, 0xf0, 0xf9, 0x32, 0x86, 0xee, 0xe5, 0x77, 0xfb, 0xd2,
+	0xa1, 0xea, 0x4d, 0x4c, 0x45, 0x1c, 0x57, 0xf1, 0x7a, 0x3d, 0xbe, 0x6b,
+	0x15, 0x5e, 0x06, 0x7a, 0xb6, 0xa3, 0x69, 0xbe, 0x89, 0x41, 0xb8, 0xbd,
+	0x50, 0x29, 0x03, 0xae, 0x69, 0xe7, 0xec, 0xbb, 0xa4, 0x5f, 0xdf, 0xfe,
+	0xc9, 0x7e, 0x88, 0xf4, 0x30, 0x54, 0x56, 0xf9, 0x7c, 0x19, 0x87, 0x3a,
+	0xce, 0xff, 0x74, 0xdf, 0x13, 0xc0, 0xbd, 0xb1, 0x56, 0xa8, 0x6d, 0x64,
+	0xb8, 0xda, 0xfa, 0xae, 0x37, 0xdd, 0xd7, 0x92, 0x40, 0x3b, 0xfa, 0xcc,
+	0xa8, 0xbe, 0x49, 0x2d, 0x5e, 0xaf, 0xc7, 0x77, 0x06, 0xf0, 0xc7, 0x04,
+	0xbb, 0xc9, 0xd1, 0x08, 0xb6, 0xca, 0x23, 0xf0, 0xf9, 0xdc, 0xa8, 0x3c,
+	0xd1, 0x81, 0x2e, 0xd4, 0xa9, 0x5e, 0x8f, 0xef, 0xe5, 0x24, 0x17, 0xb0,
+	0xa5, 0xb6, 0x2e, 0x1f, 0x37, 0x6e, 0x5c, 0x9a, 0x83, 0xfc, 0x9f, 0x82,
+	0xf0, 0xf3, 0x0e, 0x8a, 0xf7, 0xbe, 0x08, 0xf3, 0xbd, 0x5e, 0x6f, 0x73,
+	0x22, 0xed, 0xe8, 0xa3, 0x59, 0xc2, 0x49, 0x2b, 0x5e, 0xaf, 0xd7, 0xbb,
+	0x0f, 0xf0, 0x7c, 0x3b, 0xd7, 0xb8, 0x00, 0xb5, 0x62, 0xf1, 0x4c, 0x6b,
+	0x7e, 0x68, 0xdb, 0xfc, 0x1c, 0xb8, 0xac, 0x83, 0x33, 0xf1, 0x7c, 0xaf,
+	0xc7, 0x77, 0x75, 0x92, 0x0b, 0x78, 0x40, 0xcd, 0x8e, 0xda, 0x0a, 0xaf,
+	0xd7, 0xdb, 0xea, 0xb2, 0x91, 0x9e, 0xee, 0xfb, 0x1e, 0x70, 0x07, 0x1d,
+	0x7b, 0x02, 0xc7, 0x49, 0xa8, 0x34, 0x37, 0xbe, 0x50, 0xd5, 0xc1, 0x36,
+	0xad, 0x4a, 0x5a, 0xf1, 0xa2, 0xf2, 0x08, 0x70, 0x68, 0x07, 0x18, 0xe5,
+	0x3d, 0xbf, 0xdf, 0xbf, 0xd7, 0x43, 0x9b, 0xbd, 0x1e, 0xdf, 0xc1, 0x02,
+	0x8f, 0x25, 0x81, 0x30, 0x04, 0x78, 0x64, 0xdc, 0xb8, 0x71, 0xae, 0x24,
+	0x17, 0xf0, 0x48, 0x51, 0x69, 0xf5, 0x40, 0xa0, 0x25, 0x94, 0x02, 0xee,
+	0x24, 0x88, 0x77, 0x8e, 0xcf, 0x9b, 0x71, 0x72, 0xd3, 0xf2, 0xc9, 0xff,
+	0x3a, 0x38, 0xd3, 0xb7, 0x26, 0xa5, 0x78, 0xbd, 0x5e, 0xef, 0x58, 0xe0,
+	0xf2, 0x8e, 0x30, 0x8a, 0xb6, 0x7e, 0xd0, 0x69, 0x72, 0x07, 0x78, 0x05,
+	0xcd, 0xd1, 0xab, 0x66, 0x47, 0xed, 0x1f, 0x92, 0x5c, 0xbc, 0x28, 0x3c,
+	0x99, 0x9e, 0xee, 0xdb, 0xab, 0x20, 0xbd, 0x1e, 0xdf, 0x35, 0xb4, 0xdf,
+	0xe0, 0xe4, 0xde, 0xe3, 0xad, 0xfa, 0x60, 0x13, 0xf1, 0x08, 0x73, 0x3a,
+	0x34, 0x4e, 0x22, 0x1f, 0x24, 0x67, 0xcb, 0xab, 0x72, 0x5b, 0x07, 0xd9,
+	0xe4, 0xb3, 0x60, 0xd0, 0xff, 0x5c, 0x2b, 0xfa, 0xba, 0xfb, 0x02, 0x13,
+	0x92, 0x4c, 0x1b, 0x37, 0x92, 0xfc, 0xf4, 0x14, 0xd1, 0x53, 0x5b, 0xf1,
+	0xbb, 0x82, 0x24, 0x8b, 0xf7, 0x18, 0xaf, 0xc7, 0x77, 0x44, 0xe3, 0x0b,
+	0xbd, 0xfb, 0xf6, 0x7e, 0x0d, 0xd8, 0xde, 0x41, 0xf1, 0x79, 0x27, 0x10,
+	0xa8, 0xf8, 0x26, 0xe9, 0xc4, 0xeb, 0xf5, 0x64, 0x9c, 0x0e, 0xa4, 0xc7,
+	0x31, 0x3e, 0xdb, 0x81, 0xaf, 0x5b, 0x61, 0x68, 0x5b, 0x91, 0x89, 0xad,
+	0xab, 0x89, 0xf9, 0x69, 0x1c, 0xfb, 0x62, 0xf1, 0x2a, 0x00, 0xfd, 0xbc,
+	0x1e, 0xef, 0x65, 0xc9, 0xae, 0x5e, 0x41, 0x5e, 0xf4, 0x78, 0x3c, 0x56,
+	0xf3, 0x5e, 0x57, 0xc6, 0x59, 0x44, 0xe6, 0x7b, 0x27, 0x93, 0x6d, 0x41,
+	0xb8, 0xa9, 0xf1, 0x7f, 0x5f, 0x79, 0xe5, 0x95, 0x10, 0xf0, 0x10, 0xf0,
+	0x19, 0xf0, 0x79, 0x0b, 0x1f, 0x75, 0xf0, 0xb4, 0x2f, 0x5a, 0x08, 0xef,
+	0x13, 0xe0, 0xce, 0x44, 0xf6, 0xc1, 0xda, 0x20, 0x5e, 0xdf, 0xb3, 0xc0,
+	0x4f, 0xda, 0xe6, 0x9d, 0x31, 0x1b, 0x78, 0xc6, 0x85, 0xe5, 0x2f, 0x0f,
+	0x96, 0x6f, 0x68, 0xe4, 0x8e, 0x0f, 0x05, 0x19, 0x89, 0x72, 0x71, 0x83,
+	0x5b, 0x9e, 0xd2, 0xe8, 0xbe, 0x47, 0x03, 0x41, 0xff, 0x4d, 0x7b, 0x0b,
+	0xdc, 0xe3, 0xf1, 0xf4, 0x11, 0xac, 0x6f, 0x89, 0x7d, 0x1e, 0x75, 0xe3,
+	0xf8, 0xbd, 0x2a, 0xf0, 0x90, 0xe5, 0xb6, 0x16, 0x95, 0x97, 0x97, 0x57,
+	0xa7, 0x9f, 0x33, 0x7a, 0xb0, 0x25, 0xf6, 0x68, 0x44, 0xb3, 0x81, 0xef,
+	0xb7, 0x21, 0xed, 0x6b, 0x02, 0x41, 0xff, 0xfe, 0xd1, 0xe3, 0x3d, 0x2a,
+	0x45, 0xb0, 0xeb, 0x62, 0x0c, 0xaf, 0x16, 0x98, 0x48, 0x64, 0x72, 0xc7,
+	0x60, 0x22, 0xf3, 0x87, 0xcf, 0x8a, 0x83, 0xff, 0xdc, 0x27, 0x50, 0x19,
+	0x7d, 0x5c, 0xc1, 0xeb, 0xf1, 0x7d, 0x0a, 0xb4, 0x65, 0x02, 0xc2, 0x1b,
+	0x02, 0x45, 0xe2, 0xb2, 0xca, 0x2a, 0x2a, 0xca, 0x37, 0x7a, 0x3c, 0x9e,
+	0xbe, 0x82, 0x8c, 0x04, 0xf9, 0x15, 0x70, 0x41, 0x1b, 0xca, 0x67, 0x58,
+	0x60, 0xb0, 0x3f, 0xe8, 0xdf, 0x1c, 0x63, 0x79, 0xae, 0x01, 0xd2, 0x62,
+	0x33, 0x8f, 0xdd, 0x2b, 0x18, 0x0c, 0xee, 0xe8, 0x88, 0xca, 0xd5, 0xf1,
+	0x20, 0x83, 0xc7, 0xe3, 0xe9, 0x07, 0x5c, 0xda, 0x86, 0x67, 0x7f, 0x81,
+	0xf0, 0x93, 0x40, 0xc0, 0xff, 0x7a, 0xb4, 0x2f, 0x03, 0x81, 0xc0, 0x5a,
+	0xe0, 0x25, 0xe0, 0x25, 0x5f, 0xba, 0x6f, 0xa2, 0x0a, 0x37, 0x12, 0x79,
+	0x3f, 0xfb, 0x62, 0x20, 0xe8, 0xbf, 0xb5, 0x75, 0x35, 0x93, 0x6b, 0x18,
+	0xa8, 0x53, 0xe1, 0xd6, 0x01, 0x37, 0x06, 0x82, 0xfe, 0x27, 0x1b, 0x5f,
+	0xac, 0x5c, 0x30, 0x7f, 0x3d, 0xf0, 0xac, 0xcf, 0xe7, 0x9b, 0xa5, 0x36,
+	0x77, 0x03, 0xb7, 0x3b, 0x0c, 0x7f, 0x9f, 0x38, 0xe7, 0x65, 0x7d, 0x20,
+	0xe8, 0x7f, 0xb8, 0xf1, 0x85, 0x8c, 0x8c, 0x8c, 0x21, 0x76, 0x48, 0x6f,
+	0x45, 0x98, 0xd4, 0x06, 0xdf, 0xec, 0x10, 0x22, 0x0b, 0x1b, 0xa2, 0xb1,
+	0x7f, 0x1b, 0xe2, 0x7b, 0x2f, 0xa2, 0x53, 0xfc, 0x81, 0x40, 0x68, 0xe7,
+	0x85, 0x60, 0x30, 0x58, 0x05, 0xcc, 0x03, 0xe6, 0xf9, 0xbc, 0xbe, 0xab,
+	0x55, 0xf9, 0x23, 0xce, 0xe6, 0x23, 0xbb, 0x80, 0x23, 0x80, 0xff, 0xd0,
+	0x85, 0x71, 0xec, 0x36, 0x0b, 0xd6, 0xe9, 0x6d, 0x18, 0x04, 0xfa, 0x40,
+	0x2c, 0x4e, 0x6b, 0x4e, 0xb8, 0x7b, 0xe2, 0xaf, 0xf4, 0xaf, 0x0b, 0x04,
+	0xfd, 0xf7, 0x04, 0x82, 0xfe, 0x23, 0x5b, 0x2b, 0xdc, 0x86, 0x7a, 0xd1,
+	0xe9, 0xd4, 0x47, 0x5b, 0x84, 0xac, 0x3d, 0x85, 0xbb, 0x5b, 0x9c, 0xfc,
+	0xfe, 0x90, 0x62, 0xdf, 0x09, 0x14, 0x3a, 0x7c, 0x46, 0x9a, 0xd7, 0xeb,
+	0x3d, 0x3e, 0x91, 0x99, 0x5b, 0x51, 0x51, 0xb1, 0x2e, 0x50, 0xe9, 0xcf,
+	0x47, 0x9d, 0x0f, 0x28, 0x8a, 0x72, 0x43, 0x33, 0x63, 0x09, 0x47, 0xe3,
+	0x70, 0x16, 0x95, 0x40, 0xb1, 0x62, 0xff, 0x36, 0xd0, 0x48, 0xb8, 0x4d,
+	0xec, 0x1b, 0xf0, 0xff, 0x15, 0xe5, 0x26, 0x1c, 0xbe, 0xa3, 0x55, 0x18,
+	0x4e, 0x17, 0xa7, 0x2d, 0x7d, 0xde, 0x91, 0x0e, 0xef, 0xab, 0x16, 0xb8,
+	0xc4, 0xef, 0xf7, 0xaf, 0x6b, 0x87, 0xf4, 0x39, 0x2d, 0xb4, 0x8b, 0xfc,
+	0x01, 0xff, 0xe3, 0x7b, 0xfb, 0x51, 0x30, 0x18, 0xb4, 0x2d, 0xe4, 0x76,
+	0x22, 0x2b, 0x75, 0x9c, 0x94, 0xb0, 0x5f, 0xb6, 0x47, 0x26, 0x07, 0x2a,
+	0xfd, 0xcf, 0x03, 0x6f, 0x3b, 0x14, 0xc1, 0x35, 0x19, 0x19, 0x19, 0x4d,
+	0xdc, 0x57, 0xb5, 0xd5, 0xe9, 0x20, 0xe0, 0x7a, 0x11, 0xb9, 0x35, 0x18,
+	0x0c, 0xda, 0xad, 0x88, 0xf7, 0x5f, 0x80, 0x05, 0x0e, 0x9f, 0x73, 0x89,
+	0x11, 0x6f, 0xf3, 0x8c, 0x71, 0x78, 0xdf, 0x53, 0xfe, 0xa0, 0xff, 0x83,
+	0x44, 0x27, 0xcc, 0xe3, 0xf1, 0xf4, 0x00, 0x7c, 0x4e, 0xdc, 0x65, 0xc5,
+	0x6a, 0xf5, 0x60, 0x52, 0x45, 0xb0, 0xa2, 0x06, 0x07, 0x8b, 0x23, 0x1a,
+	0xda, 0xa0, 0x8b, 0xdb, 0x2b, 0xa3, 0x15, 0xf9, 0xa9, 0xc3, 0x5b, 0x07,
+	0xd8, 0x21, 0x8d, 0xe2, 0xba, 0xca, 0x25, 0x4e, 0xd3, 0x5c, 0x11, 0xa8,
+	0xa8, 0x69, 0x7d, 0xbc, 0xed, 0xcb, 0x80, 0x7a, 0x07, 0x0f, 0xf2, 0x65,
+	0x64, 0x64, 0xa4, 0x1a, 0xf1, 0xee, 0x41, 0x46, 0x46, 0x46, 0x4a, 0xc3,
+	0x80, 0x48, 0xcc, 0xfd, 0x32, 0xb1, 0x68, 0xa7, 0x77, 0x9c, 0xd6, 0x81,
+	0x0e, 0xdd, 0xfa, 0x55, 0xc1, 0x60, 0xf9, 0x9a, 0x18, 0xa5, 0xb1, 0x14,
+	0x67, 0x23, 0x95, 0x03, 0xda, 0x2b, 0xa3, 0x83, 0xc1, 0x8a, 0x8f, 0x1c,
+	0xbb, 0xa0, 0x12, 0xd5, 0x8e, 0xfd, 0x1c, 0x05, 0x25, 0xba, 0x34, 0xb6,
+	0x78, 0x07, 0xd7, 0xa1, 0xac, 0x72, 0xf0, 0xac, 0x14, 0xdb, 0x6e, 0x53,
+	0x9f, 0xbc, 0x6b, 0x8a, 0x57, 0xc3, 0x3a, 0x00, 0x67, 0x83, 0x5d, 0x1f,
+	0xf8, 0xfd, 0xfe, 0xaf, 0xdb, 0x23, 0x61, 0x82, 0x38, 0x9d, 0x8c, 0xfe,
+	0x5c, 0xac, 0x37, 0x04, 0x82, 0x81, 0x6d, 0x40, 0x99, 0x83, 0x67, 0xb5,
+	0xf7, 0xac, 0x24, 0x75, 0x66, 0xcb, 0xa8, 0xe2, 0x75, 0x12, 0xf7, 0x97,
+	0xfd, 0x01, 0xff, 0x76, 0x07, 0x11, 0x70, 0x36, 0x27, 0x5c, 0xb5, 0xb7,
+	0x11, 0x6f, 0xfc, 0x5a, 0x8c, 0xff, 0xb6, 0x57, 0xc2, 0x04, 0x75, 0xb6,
+	0xb2, 0x49, 0xe4, 0x55, 0x87, 0x0f, 0xfc, 0xa7, 0x83, 0xbb, 0xda, 0x7b,
+	0xd6, 0xd7, 0x57, 0x0e, 0xc5, 0x6b, 0xc5, 0x25, 0xee, 0x22, 0x2f, 0x39,
+	0xb3, 0xad, 0xbe, 0xe2, 0x30, 0xbd, 0x3d, 0x8c, 0x78, 0x9b, 0x54, 0x68,
+	0x8e, 0xc5, 0xfb, 0x51, 0x3b, 0x36, 0x31, 0x4e, 0xc4, 0x1b, 0x1a, 0x3c,
+	0x78, 0xe0, 0x7f, 0x9c, 0x95, 0x2f, 0x58, 0x74, 0x8b, 0x17, 0x00, 0x00,
+	0x13, 0xdf, 0x49, 0x44, 0x41, 0x54, 0x59, 0x98, 0xf4, 0x2d, 0xaf, 0xf2,
+	0x99, 0x43, 0x5b, 0xc6, 0xa5, 0xe5, 0x15, 0x78, 0xdd, 0x91, 0x02, 0x7b,
+	0xf4, 0x58, 0xe2, 0xc8, 0xe5, 0xd7, 0x76, 0x5d, 0x9a, 0xda, 0xee, 0x38,
+	0x2d, 0x3c, 0x0e, 0xc5, 0xab, 0x1b, 0xf6, 0xf6, 0x0b, 0x8f, 0xc7, 0xe3,
+	0xb2, 0xb0, 0x0e, 0xb5, 0x91, 0xa1, 0x16, 0xba, 0x8f, 0x2a, 0x03, 0x44,
+	0xd8, 0x47, 0x23, 0xcf, 0x0c, 0xa3, 0x6c, 0x41, 0x74, 0xa3, 0xa8, 0x7c,
+	0x64, 0xa5, 0x58, 0x1f, 0x95, 0x97, 0x97, 0x37, 0xe7, 0x86, 0x39, 0x79,
+	0x8f, 0x5a, 0x33, 0x6b, 0xd6, 0x2c, 0x75, 0x56, 0xc0, 0xb5, 0xd6, 0x49,
+	0xcb, 0x7b, 0xe9, 0xa5, 0x97, 0xba, 0x66, 0xcd, 0x9a, 0x15, 0x6e, 0x8f,
+	0xcc, 0x16, 0x61, 0x9d, 0x3a, 0xcb, 0xb7, 0x7e, 0xc0, 0xc6, 0x9d, 0xff,
+	0xf3, 0xf9, 0x7c, 0x03, 0xd4, 0x8e, 0x7d, 0x02, 0x85, 0xda, 0x8e, 0x6c,
+	0xc4, 0xdc, 0xb9, 0x73, 0xc3, 0x5e, 0x8f, 0xaf, 0x2e, 0xd6, 0x96, 0x54,
+	0x2c, 0xe9, 0x65, 0xc4, 0xdb, 0xb4, 0x10, 0xf4, 0x70, 0x56, 0x08, 0xd8,
+	0xd4, 0xd2, 0x97, 0x5e, 0x8f, 0xef, 0xaf, 0xc0, 0xe5, 0x0a, 0xa9, 0x82,
+	0x46, 0x3a, 0x68, 0xb2, 0x47, 0x47, 0x4d, 0x1a, 0x9c, 0x62, 0x81, 0x70,
+	0xc8, 0xae, 0xf3, 0x7a, 0x7c, 0xaf, 0x20, 0x3a, 0xb1, 0xc9, 0x6e, 0x92,
+	0xc2, 0x7e, 0x0e, 0x7a, 0x78, 0x75, 0x4e, 0x0d, 0xa9, 0x10, 0x72, 0x32,
+	0x1d, 0x68, 0xc3, 0x86, 0x0d, 0xfb, 0x3b, 0x75, 0x67, 0x1d, 0x78, 0x4c,
+	0x9b, 0x9c, 0xcd, 0x59, 0x92, 0x3d, 0x67, 0x10, 0x1d, 0xec, 0xb0, 0xf6,
+	0x08, 0xb5, 0x21, 0xfa, 0xf5, 0xb1, 0x8a, 0x57, 0x55, 0x87, 0x1a, 0xf1,
+	0xee, 0x81, 0x0d, 0x5b, 0xc5, 0x51, 0x01, 0xdf, 0xdb, 0x20, 0x92, 0x1e,
+	0x00, 0x12, 0xcb, 0xf0, 0x7e, 0x2a, 0x70, 0x09, 0x2a, 0x5b, 0x80, 0xeb,
+	0xe3, 0x25, 0x44, 0x67, 0xfd, 0x42, 0x11, 0x27, 0xe3, 0x41, 0xed, 0xb8,
+	0x8d, 0x30, 0x88, 0xf4, 0x73, 0x38, 0x66, 0x55, 0x17, 0x1f, 0xdb, 0xda,
+	0xd2, 0x26, 0x13, 0x1b, 0xda, 0xde, 0xe7, 0x15, 0xc4, 0xd1, 0xfa, 0x44,
+	0x51, 0x06, 0x25, 0xa8, 0x2f, 0x27, 0x51, 0xae, 0xad, 0x71, 0x10, 0x92,
+	0xf3, 0xf7, 0x82, 0xaa, 0x4e, 0x2a, 0x42, 0xdd, 0xbc, 0x79, 0x73, 0x3b,
+	0xae, 0x35, 0xb5, 0x9d, 0xda, 0xdf, 0xde, 0xa3, 0xc2, 0x71, 0xb6, 0x67,
+	0xb6, 0x4a, 0x5b, 0xfa, 0xf8, 0x31, 0xe7, 0x8d, 0x88, 0xac, 0x35, 0xe2,
+	0x6d, 0x22, 0x42, 0xdd, 0xe2, 0xb0, 0xee, 0x3c, 0x24, 0x41, 0xcd, 0x5e,
+	0xb4, 0x97, 0xf8, 0x4e, 0x76, 0x2f, 0xe8, 0x71, 0xe9, 0xa5, 0x97, 0x3a,
+	0x1b, 0x81, 0x17, 0x75, 0xd2, 0xc7, 0x0e, 0xc7, 0x63, 0x83, 0xf6, 0x18,
+	0x22, 0x79, 0xb0, 0x33, 0xf3, 0xee, 0x2e, 0xde, 0x8a, 0x8a, 0x8a, 0x1d,
+	0x38, 0x18, 0x40, 0x12, 0x4b, 0x1c, 0x0d, 0x20, 0x79, 0x3c, 0x9e, 0xbe,
+	0xec, 0xbe, 0x30, 0xa5, 0xb5, 0x7d, 0xec, 0xed, 0x46, 0xbc, 0x4d, 0x9c,
+	0x1f, 0xdb, 0xe9, 0xce, 0x00, 0x27, 0x26, 0x28, 0x1d, 0xa1, 0x28, 0x2d,
+	0xaf, 0x93, 0x8c, 0x73, 0xaf, 0x5f, 0xbf, 0xfe, 0x74, 0x87, 0x71, 0x18,
+	0xe7, 0x44, 0xbc, 0xed, 0x9c, 0xdf, 0xc3, 0x1c, 0x3a, 0x36, 0xe1, 0x56,
+	0xd9, 0x7c, 0xef, 0x7d, 0xd0, 0x73, 0x1c, 0x7a, 0x7a, 0x19, 0x8e, 0xdc,
+	0x66, 0x61, 0x87, 0x11, 0xef, 0x9e, 0x37, 0x59, 0xd6, 0x16, 0x9c, 0x75,
+	0x9e, 0x4e, 0xc8, 0xc8, 0xc8, 0x48, 0x8b, 0x7b, 0x2a, 0xb4, 0x69, 0xcb,
+	0x2b, 0x4e, 0x33, 0x4e, 0x2d, 0x87, 0x27, 0x3b, 0x88, 0x93, 0xf5, 0xb9,
+	0xa1, 0xce, 0x90, 0xdf, 0x88, 0x86, 0xe3, 0x54, 0xf1, 0x38, 0x9d, 0x52,
+	0xf9, 0x23, 0x87, 0xe9, 0xad, 0x31, 0xe2, 0xdd, 0x03, 0xbf, 0xdf, 0x5f,
+	0x0f, 0x7c, 0xe8, 0xe0, 0xd6, 0x7e, 0x76, 0x48, 0xe3, 0xbf, 0x8b, 0x44,
+	0x14, 0xb7, 0xd9, 0x76, 0xbc, 0x6f, 0x90, 0xc6, 0x3c, 0xdf, 0xd8, 0xeb,
+	0xf1, 0x0d, 0x74, 0xe8, 0x55, 0xb4, 0x9b, 0x78, 0x1b, 0xe6, 0x7a, 0x3b,
+	0x19, 0xf4, 0xd9, 0xa6, 0x1a, 0x75, 0x6d, 0xb1, 0x93, 0xf9, 0xc6, 0x63,
+	0x3c, 0x9e, 0x0c, 0x27, 0xdb, 0xa0, 0x7a, 0x9d, 0x95, 0x0b, 0xd9, 0x66,
+	0xc4, 0x1b, 0x9d, 0xa0, 0x43, 0xa1, 0x4d, 0xc8, 0xcc, 0xcc, 0x4c, 0x6d,
+	0xa6, 0x4f, 0x74, 0xb1, 0x62, 0x0f, 0xd9, 0xf9, 0x21, 0xb2, 0x9e, 0xd7,
+	0x91, 0x08, 0xc2, 0xe1, 0xfa, 0xaf, 0x89, 0x9c, 0x38, 0x18, 0x2b, 0x87,
+	0xfb, 0xd2, 0x7d, 0x87, 0xc5, 0x56, 0x46, 0xb8, 0xd0, 0xa1, 0x0d, 0xd7,
+	0xb7, 0x5b, 0x6f, 0x57, 0xac, 0x89, 0x8e, 0xc4, 0xab, 0xbc, 0x14, 0x0c,
+	0x06, 0xa3, 0x79, 0x59, 0x6b, 0x1c, 0x15, 0x38, 0xd5, 0x98, 0xb6, 0xde,
+	0xcd, 0xf0, 0x66, 0x8c, 0x00, 0x0e, 0x74, 0xf0, 0xa8, 0xda, 0x50, 0x48,
+	0xbf, 0x31, 0xe2, 0x8d, 0x9e, 0xa9, 0x8b, 0x1d, 0xde, 0x79, 0x54, 0x5d,
+	0x6d, 0x7d, 0x71, 0x33, 0x2d, 0xfa, 0xd6, 0x60, 0x30, 0xb8, 0x7e, 0xe7,
+	0x07, 0x55, 0x6d, 0x65, 0x5c, 0x9a, 0xb4, 0x02, 0x0b, 0x17, 0x2e, 0x0c,
+	0x0b, 0x38, 0x99, 0x56, 0x97, 0xa2, 0x42, 0xab, 0xcf, 0x17, 0xf2, 0x79,
+	0x7d, 0x03, 0x54, 0x79, 0xdc, 0xa1, 0xa4, 0x9e, 0x69, 0xb7, 0x9c, 0x56,
+	0xa6, 0x38, 0x2b, 0x21, 0xfa, 0xb7, 0xe8, 0x75, 0x30, 0x4f, 0x3a, 0x8a,
+	0x86, 0xf0, 0x9c, 0xcf, 0xe3, 0x6b, 0xf5, 0x9c, 0x63, 0x5b, 0xf5, 0x19,
+	0x67, 0xe5, 0x54, 0xca, 0x16, 0x2e, 0xf4, 0xd7, 0x19, 0xf1, 0x46, 0xbf,
+	0xb3, 0x2d, 0xbb, 0x14, 0xdc, 0xe0, 0xf5, 0xf8, 0xf6, 0xba, 0x03, 0x85,
+	0x48, 0xeb, 0x5e, 0x2d, 0x88, 0x44, 0x77, 0x3f, 0x15, 0x79, 0xd1, 0x61,
+	0xfc, 0x4e, 0xf3, 0x7a, 0x7c, 0xbf, 0xdf, 0xab, 0x70, 0xd3, 0x7d, 0x3d,
+	0x54, 0x79, 0x0d, 0xa7, 0x93, 0x5d, 0x2c, 0xfd, 0x63, 0xfb, 0xb8, 0xcc,
+	0xbe, 0xbb, 0x71, 0x30, 0x5a, 0xdb, 0xa0, 0xb6, 0x25, 0xd1, 0x2f, 0xa7,
+	0xfc, 0xc9, 0xe1, 0xb8, 0x47, 0x1f, 0x85, 0xbf, 0x79, 0xbd, 0xde, 0xd6,
+	0xec, 0x4c, 0xf9, 0x17, 0x1c, 0x0e, 0xb2, 0x21, 0xbc, 0x40, 0x17, 0xc7,
+	0xb1, 0x78, 0x55, 0xed, 0x95, 0x44, 0x0e, 0x9a, 0x76, 0x66, 0x5a, 0xb8,
+	0xd7, 0xeb, 0xf1, 0x3d, 0xe1, 0xf3, 0xf9, 0xa2, 0x6e, 0x60, 0x36, 0x7c,
+	0xf8, 0x70, 0x51, 0x38, 0xa6, 0x75, 0x8d, 0x8a, 0x34, 0xd3, 0xff, 0xb2,
+	0xff, 0xdb, 0x86, 0xf8, 0xdd, 0xee, 0xf5, 0xf8, 0x8a, 0x7e, 0xf0, 0x83,
+	0x1f, 0x44, 0x2d, 0x64, 0x19, 0xbe, 0x51, 0x07, 0x6a, 0x64, 0xbf, 0xe2,
+	0x33, 0x1d, 0x3e, 0x63, 0x87, 0xdf, 0xef, 0x8f, 0xe7, 0xcc, 0xaa, 0xb4,
+	0x66, 0x3c, 0x83, 0x6b, 0x04, 0x7e, 0xdb, 0x06, 0x7f, 0x3b, 0xea, 0xc0,
+	0x5f, 0x20, 0x50, 0xba, 0x0e, 0x1c, 0x8f, 0xe6, 0x5e, 0x84, 0xca, 0x0b,
+	0xe9, 0xe9, 0x9e, 0xa8, 0xd3, 0x6c, 0x47, 0x8f, 0x1e, 0xdd, 0xcb, 0xeb,
+	0xf1, 0x3d, 0x4d, 0x5b, 0x8e, 0xa5, 0x51, 0x96, 0x77, 0x75, 0xf1, 0x3a,
+	0x7e, 0x69, 0x1e, 0x0c, 0x06, 0xc3, 0x5e, 0x8f, 0xef, 0x51, 0xa0, 0x2d,
+	0x5b, 0xbf, 0x5e, 0xa3, 0x36, 0x17, 0x79, 0x3d, 0xbe, 0xbf, 0x23, 0xcc,
+	0x51, 0x8d, 0x4c, 0x13, 0x14, 0xd5, 0x83, 0x10, 0xb9, 0x92, 0x56, 0x8a,
+	0x17, 0xd1, 0xa8, 0xe2, 0x0d, 0xdb, 0xae, 0x55, 0x2e, 0xcb, 0xfe, 0x06,
+	0x67, 0x7b, 0x2d, 0x59, 0x40, 0x4e, 0x8f, 0xb4, 0x9e, 0x57, 0x78, 0x3d,
+	0xbe, 0xbf, 0xa3, 0x2c, 0x53, 0x61, 0xbd, 0x20, 0x07, 0x83, 0x7a, 0x6d,
+	0xdb, 0xbe, 0xd8, 0x71, 0x6b, 0x16, 0x21, 0xde, 0x93, 0x33, 0xac, 0x5d,
+	0x2d, 0xad, 0xc7, 0x2d, 0xea, 0x1a, 0x8d, 0xe8, 0x8d, 0xaa, 0x8e, 0xfb,
+	0xe3, 0x80, 0xfc, 0x25, 0x10, 0xa8, 0x68, 0xc9, 0xf5, 0x5c, 0x01, 0x9c,
+	0xe1, 0x30, 0xf0, 0x0b, 0x2d, 0xb1, 0xbe, 0xf2, 0x7a, 0x7c, 0xcf, 0xa3,
+	0x2c, 0x52, 0xe1, 0x7f, 0x82, 0xec, 0x07, 0x3a, 0x22, 0x54, 0x1f, 0xbe,
+	0x92, 0xb6, 0x9d, 0xef, 0x53, 0xa3, 0xf0, 0xa9, 0x11, 0x6f, 0xcb, 0xcd,
+	0xef, 0xe3, 0x88, 0xdc, 0x42, 0xdb, 0x06, 0xbe, 0x06, 0x00, 0xe3, 0x51,
+	0xc6, 0x4b, 0x23, 0x3f, 0x38, 0xa6, 0x22, 0xa6, 0xd1, 0x47, 0x3e, 0x17,
+	0x2c, 0x28, 0xaf, 0xf3, 0xa4, 0xfb, 0x26, 0x89, 0xf0, 0xf7, 0x36, 0xc4,
+	0x6f, 0x28, 0x90, 0x8b, 0xec, 0x1c, 0xed, 0xd1, 0x78, 0xd8, 0x5d, 0x41,
+	0xaf, 0x8d, 0x73, 0x5e, 0xba, 0xbc, 0x1e, 0xdf, 0x56, 0x22, 0xaf, 0x47,
+	0x86, 0x20, 0x6d, 0x8f, 0xa7, 0xad, 0xe1, 0x5b, 0x5b, 0xfe, 0x9e, 0x9f,
+	0x58, 0xc2, 0x27, 0x6d, 0xc8, 0xff, 0xde, 0xc0, 0xb5, 0x08, 0xd7, 0xc6,
+	0xd1, 0xb6, 0x00, 0x53, 0x82, 0xc1, 0x8a, 0xea, 0xae, 0x2e, 0xde, 0x36,
+	0xed, 0xdb, 0x1c, 0xa8, 0x0c, 0xac, 0x06, 0x5e, 0xec, 0xe8, 0x44, 0x68,
+	0x4b, 0xaf, 0x2d, 0x84, 0xd7, 0x48, 0xbe, 0xf7, 0x7d, 0x1b, 0x03, 0xc1,
+	0xc0, 0xc2, 0x04, 0x84, 0xdb, 0x17, 0x18, 0x12, 0xa7, 0xb0, 0x36, 0x58,
+	0x96, 0x6c, 0x6c, 0xe9, 0x07, 0x95, 0x95, 0xfe, 0xd5, 0xc0, 0x97, 0x49,
+	0x57, 0xaa, 0x85, 0xbf, 0xd2, 0x0d, 0x88, 0xc7, 0x59, 0x45, 0x33, 0x92,
+	0x20, 0xb3, 0x42, 0xcd, 0xbb, 0xf7, 0xfe, 0xad, 0x0a, 0x77, 0x27, 0x57,
+	0xd9, 0x4a, 0xdc, 0x46, 0xdc, 0x71, 0x8b, 0xa3, 0xc8, 0xd5, 0x81, 0x40,
+	0x60, 0xaf, 0x53, 0x20, 0x15, 0xbd, 0x2e, 0xc9, 0xa2, 0xfe, 0xc7, 0x40,
+	0xc0, 0xff, 0x8d, 0x11, 0x6f, 0x6b, 0x5a, 0xdf, 0xa0, 0x7f, 0x11, 0xb4,
+	0xfe, 0xd5, 0x4a, 0x82, 0x9a, 0xde, 0xfa, 0x96, 0xdd, 0x6a, 0x7d, 0x1c,
+	0xf8, 0x36, 0x49, 0x6c, 0xbe, 0xd9, 0x1f, 0xf4, 0x3f, 0x92, 0xe4, 0xe5,
+	0xe2, 0x4d, 0x5b, 0x65, 0x5e, 0xeb, 0xc6, 0x3e, 0x02, 0x7e, 0xe0, 0x9d,
+	0x24, 0x89, 0xb7, 0x2a, 0xfc, 0x81, 0x6e, 0x42, 0x7c, 0x4e, 0x09, 0xb4,
+	0x35, 0x1b, 0xd8, 0xd0, 0x51, 0x89, 0x90, 0xbd, 0xcc, 0xf6, 0x09, 0x54,
+	0x06, 0x36, 0x22, 0x8e, 0xe6, 0x1e, 0xc7, 0x9b, 0xb0, 0xa2, 0xe7, 0x27,
+	0x79, 0x99, 0x50, 0xdb, 0x0e, 0x67, 0x04, 0x83, 0xe5, 0xad, 0x5e, 0x78,
+	0x20, 0x16, 0x67, 0xe1, 0x6c, 0x42, 0x4c, 0xbc, 0xc9, 0x09, 0x06, 0xfd,
+	0xab, 0x8d, 0x78, 0x63, 0x69, 0x7d, 0x17, 0x04, 0xbe, 0x15, 0xb8, 0x10,
+	0x67, 0x53, 0xe6, 0xda, 0x5e, 0xda, 0x5a, 0xb1, 0xc8, 0x3b, 0x10, 0xf0,
+	0x2f, 0x93, 0x8e, 0x3f, 0x70, 0xac, 0x20, 0x18, 0x0c, 0xfc, 0x3b, 0xb9,
+	0xa5, 0xab, 0x97, 0x55, 0x2e, 0xa8, 0x8c, 0x49, 0x88, 0x7e, 0xbf, 0xbf,
+	0x5a, 0x22, 0x0b, 0x33, 0x42, 0x1d, 0x18, 0xf3, 0x97, 0xc3, 0xb6, 0xf5,
+	0x28, 0xdd, 0x88, 0xb8, 0x9d, 0x62, 0xef, 0x0f, 0xfa, 0x17, 0x21, 0x5c,
+	0x49, 0x3b, 0x2f, 0x82, 0x6f, 0x28, 0x70, 0xad, 0xaa, 0x34, 0xea, 0xc3,
+	0xf5, 0x8f, 0xa2, 0x3c, 0xdd, 0x41, 0xb6, 0x7e, 0x3a, 0x10, 0xf4, 0xdf,
+	0x96, 0xe4, 0xe5, 0x21, 0xd7, 0x72, 0x5b, 0x2f, 0x3a, 0xcc, 0xff, 0x7f,
+	0xa3, 0xdc, 0x45, 0xc7, 0x9c, 0x42, 0xbf, 0x58, 0x91, 0x9f, 0x2e, 0x58,
+	0x50, 0x5e, 0x6f, 0xc4, 0xeb, 0xb4, 0x05, 0x0e, 0xf8, 0x5f, 0x00, 0xf1,
+	0xd0, 0x8e, 0x73, 0x76, 0x63, 0x11, 0xef, 0xc2, 0x85, 0x0b, 0xc3, 0x2a,
+	0xf6, 0x35, 0x88, 0xc3, 0xa9, 0x82, 0x0e, 0x5d, 0x65, 0xe0, 0x8e, 0x40,
+	0xd0, 0x7f, 0x75, 0x72, 0xb7, 0xb8, 0x5c, 0x11, 0x08, 0xfa, 0x67, 0x54,
+	0x54, 0x54, 0x38, 0x7e, 0x5f, 0x13, 0xa8, 0xf4, 0xdf, 0x27, 0xc2, 0x55,
+	0xed, 0x5c, 0x81, 0x3f, 0x81, 0x68, 0x46, 0x30, 0x58, 0xb1, 0x8d, 0x6e,
+	0x86, 0x15, 0xef, 0x00, 0x03, 0xc1, 0x8a, 0xd7, 0x11, 0xce, 0xa0, 0x1d,
+	0xb7, 0x79, 0xc5, 0x6a, 0xfd, 0xde, 0x48, 0xc1, 0x60, 0xd0, 0x0e, 0x04,
+	0xfc, 0x77, 0x6b, 0xe4, 0x74, 0xc3, 0x44, 0xaf, 0xa7, 0xdd, 0x01, 0x72,
+	0x51, 0x20, 0xe8, 0xbf, 0x2f, 0xc6, 0x3e, 0x7c, 0x7b, 0xf2, 0x99, 0x82,
+	0x2f, 0x50, 0xe9, 0xff, 0x47, 0x5c, 0x3c, 0xb0, 0x80, 0xff, 0xef, 0x0a,
+	0x67, 0x03, 0x5b, 0xda, 0x21, 0xee, 0xb9, 0x29, 0xa9, 0xee, 0xeb, 0x03,
+	0x81, 0x40, 0x0d, 0xdd, 0x10, 0x2b, 0x11, 0x81, 0x06, 0x02, 0xfe, 0xd5,
+	0x96, 0xca, 0x08, 0x22, 0xd3, 0xf2, 0xaa, 0x12, 0x9c, 0x06, 0x55, 0x8d,
+	0x7d, 0xf9, 0x5f, 0x30, 0xe8, 0x7f, 0x4e, 0x84, 0x13, 0x71, 0xb6, 0x78,
+	0x61, 0x6f, 0xd8, 0xc0, 0x73, 0x88, 0x1e, 0x1f, 0x08, 0x56, 0xc4, 0xbc,
+	0x0f, 0x74, 0xd8, 0xb6, 0x42, 0xed, 0xd0, 0x7a, 0x6d, 0x04, 0xc6, 0x5b,
+	0x2a, 0x47, 0x04, 0x83, 0xfe, 0x40, 0x3c, 0x03, 0x0e, 0x06, 0xfd, 0x6f,
+	0x5a, 0x2e, 0x39, 0x12, 0x78, 0x3c, 0x41, 0x15, 0x64, 0x25, 0xe8, 0xf7,
+	0x03, 0x41, 0xff, 0x8c, 0xb2, 0xb2, 0x32, 0xa5, 0x9b, 0x92, 0xf0, 0x4a,
+	0xde, 0xe7, 0x1b, 0x35, 0x58, 0x6d, 0xfb, 0x0e, 0x60, 0x3c, 0x6d, 0xd9,
+	0x23, 0xaa, 0x29, 0x5b, 0x81, 0xd9, 0x0a, 0xd3, 0x83, 0x41, 0xff, 0xb2,
+	0xb6, 0x04, 0xe4, 0xf1, 0x64, 0x8c, 0x14, 0xf4, 0x0f, 0x44, 0x5a, 0x8c,
+	0xb6, 0x8a, 0xf6, 0x25, 0x81, 0xbb, 0xfd, 0x41, 0xff, 0x7b, 0x6d, 0x09,
+	0xc8, 0x9b, 0xee, 0xcb, 0x46, 0xe2, 0xfe, 0x0e, 0xbd, 0x1a, 0x28, 0x07,
+	0xe6, 0x2b, 0xf6, 0x63, 0xc1, 0x60, 0x30, 0xe1, 0x3b, 0x79, 0x78, 0x3c,
+	0x19, 0x47, 0x0b, 0x7a, 0x0f, 0x91, 0x85, 0xf8, 0x6d, 0x6d, 0x2c, 0x16,
+	0x83, 0xde, 0x35, 0x78, 0xc8, 0xe0, 0x0a, 0xa7, 0x5b, 0xf4, 0xb6, 0x68,
+	0x73, 0x8f, 0x6f, 0x3b, 0xb1, 0xed, 0xf7, 0x6d, 0x37, 0x9c, 0xcf, 0x5b,
+	0xdb, 0x25, 0xc5, 0xbb, 0x93, 0x8c, 0x8c, 0x8c, 0xfe, 0xe1, 0xb0, 0x8e,
+	0x16, 0x18, 0x4b, 0xe4, 0x73, 0x60, 0x8c, 0xa2, 0xf8, 0x1c, 0x58, 0x09,
+	0xbc, 0x89, 0x48, 0x69, 0x8f, 0x1e, 0xa9, 0x4b, 0xe6, 0xce, 0x9d, 0x1b,
+	0xb7, 0xc1, 0x91, 0x71, 0xe3, 0xc6, 0x49, 0xed, 0xf6, 0xda, 0xe3, 0x10,
+	0xc6, 0x69, 0x24, 0x7e, 0xe9, 0xb4, 0x6e, 0xee, 0x72, 0x15, 0x30, 0x1f,
+	0xa5, 0x4c, 0x45, 0xca, 0x82, 0xc1, 0x8a, 0xb8, 0xbc, 0xaa, 0xc8, 0x48,
+	0xcf, 0xb0, 0x6c, 0xf4, 0x46, 0x84, 0x4b, 0x80, 0x43, 0x62, 0x28, 0xf8,
+	0x4a, 0x64, 0xc1, 0xc8, 0x7a, 0x22, 0xaf, 0xef, 0xd6, 0x03, 0x6b, 0x11,
+	0x09, 0x04, 0x02, 0x15, 0xaf, 0xd3, 0x41, 0x64, 0xa4, 0x67, 0x1c, 0xa2,
+	0xa2, 0x63, 0x15, 0x32, 0x89, 0x1c, 0x52, 0xd7, 0x9a, 0xe3, 0x68, 0xea,
+	0x80, 0x4a, 0x81, 0x32, 0x15, 0x2d, 0xab, 0xa9, 0xa9, 0x79, 0xef, 0xf5,
+	0xd7, 0x5f, 0x4f, 0x58, 0x4b, 0xeb, 0xf5, 0xf8, 0xae, 0x05, 0xae, 0x06,
+	0x0e, 0x22, 0xb2, 0xef, 0xf7, 0x00, 0x76, 0xdf, 0x70, 0x3e, 0xd4, 0x60,
+	0xdb, 0x4d, 0x0d, 0xe5, 0xf1, 0xf1, 0x40, 0xd0, 0x3f, 0xab, 0xcb, 0xb6,
+	0xbc, 0xd1, 0x18, 0x3e, 0x7c, 0xb8, 0xf4, 0xed, 0xbb, 0xcf, 0x30, 0x0b,
+	0x7b, 0x3f, 0x15, 0x86, 0x60, 0x33, 0x04, 0x61, 0x08, 0x8a, 0x85, 0x50,
+	0x0d, 0xb2, 0x0d, 0xa8, 0x46, 0xa9, 0x12, 0xf4, 0x73, 0x57, 0xaa, 0xeb,
+	0xe3, 0xf9, 0xf3, 0xe7, 0xb7, 0xeb, 0x7e, 0x44, 0xe9, 0x67, 0xa5, 0xf7,
+	0x10, 0xb7, 0xfb, 0x58, 0xd0, 0xa1, 0xc0, 0x10, 0x41, 0x87, 0x82, 0xf4,
+	0x03, 0x36, 0x28, 0xac, 0xb3, 0x60, 0x9d, 0x8a, 0xae, 0x1d, 0x3c, 0x78,
+	0xf0, 0xfb, 0x89, 0x68, 0x05, 0xba, 0x32, 0xc3, 0x87, 0x0f, 0xb7, 0xfa,
+	0xf6, 0x1d, 0x70, 0x1c, 0xe8, 0xbe, 0x8d, 0x6c, 0x3b, 0x10, 0xd8, 0xd2,
+	0xc8, 0xb6, 0xeb, 0x52, 0xac, 0x94, 0xff, 0x96, 0x55, 0x94, 0xd5, 0x76,
+	0x54, 0x3c, 0x2f, 0xbd, 0xf4, 0x52, 0x59, 0xbf, 0x7e, 0x7d, 0x3f, 0x94,
+	0x3e, 0x2e, 0xb7, 0xab, 0x6a, 0xd3, 0xa6, 0x4d, 0x55, 0x4b, 0x97, 0x2e,
+	0x35, 0x79, 0x6d, 0x30, 0x18, 0x0c, 0x06, 0x83, 0xc1, 0x60, 0x30, 0x18,
+	0x0c, 0x06, 0x83, 0xc1, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x83, 0xc1, 0x60,
+	0xe8, 0x68, 0x5c, 0xc6, 0x04, 0x86, 0xf6, 0x60, 0x42, 0x6e, 0xee, 0x61,
+	0xc3, 0x87, 0x8f, 0xb4, 0xdf, 0x7e, 0xeb, 0xf5, 0x5a, 0x63, 0x8d, 0xf8,
+	0x60, 0x19, 0x13, 0x18, 0xda, 0x03, 0xb1, 0x65, 0x55, 0x8a, 0xcb, 0xbe,
+	0xde, 0x58, 0x22, 0x7e, 0xb8, 0xbb, 0x42, 0x22, 0xc6, 0x8f, 0x1f, 0x6f,
+	0xb9, 0x5c, 0x69, 0x17, 0x21, 0x5c, 0x0b, 0x9c, 0x06, 0xf4, 0x03, 0x3e,
+	0x03, 0x3e, 0x02, 0xfe, 0x52, 0x52, 0x5c, 0xf8, 0x8a, 0xc9, 0x6a, 0x83,
+	0x69, 0x79, 0x93, 0x8c, 0x9c, 0x9c, 0x49, 0x3d, 0x5d, 0xee, 0xb4, 0x7f,
+	0x20, 0xbc, 0x48, 0xe4, 0xb0, 0xaf, 0x32, 0xe0, 0x7e, 0xe0, 0xdf, 0xc0,
+	0x11, 0xc0, 0xec, 0xac, 0xec, 0xbc, 0x97, 0x4c, 0x56, 0x77, 0x30, 0x2a,
+	0xc3, 0x6d, 0xdb, 0xfa, 0x9b, 0x31, 0x44, 0x1c, 0xbd, 0x99, 0xce, 0x9e,
+	0x80, 0xac, 0xec, 0xbc, 0x62, 0x22, 0xdb, 0xdb, 0x94, 0xd4, 0xd6, 0x6c,
+	0x9b, 0xf4, 0xf8, 0xe3, 0x8f, 0x87, 0x76, 0x09, 0x3b, 0xc7, 0x6d, 0xab,
+	0x35, 0x11, 0x78, 0x00, 0xb8, 0xaf, 0xa4, 0xb8, 0xf0, 0x0e, 0x93, 0xe5,
+	0x06, 0x23, 0xde, 0xe4, 0x10, 0xee, 0x91, 0xc0, 0xc7, 0xc0, 0xe2, 0x92,
+	0xe2, 0xc2, 0x91, 0x51, 0x7f, 0x93, 0x95, 0x65, 0x21, 0xee, 0x57, 0x81,
+	0x33, 0x4b, 0x8a, 0x0b, 0x07, 0x98, 0x2c, 0x37, 0x18, 0xb7, 0x39, 0x39,
+	0x6a, 0x9e, 0xb3, 0x00, 0x6c, 0x25, 0xab, 0xb9, 0xdf, 0x94, 0x94, 0x94,
+	0xd8, 0xc0, 0x54, 0xa0, 0x7f, 0x76, 0x76, 0xde, 0xe1, 0x26, 0xcb, 0x0d,
+	0x5d, 0x85, 0x4e, 0x3d, 0x60, 0xa5, 0x30, 0x1c, 0xa8, 0x7a, 0xa8, 0xa4,
+	0x70, 0x2f, 0x27, 0x16, 0xca, 0x47, 0xa0, 0x4f, 0x01, 0xfb, 0x01, 0xab,
+	0x9b, 0xb6, 0xe0, 0x13, 0x8f, 0x01, 0xbd, 0x1d, 0x38, 0xa1, 0xc1, 0x26,
+	0xef, 0xa1, 0x94, 0x94, 0x94, 0x14, 0xbe, 0x19, 0xa5, 0xb5, 0xbf, 0x0b,
+	0xe8, 0x59, 0x52, 0x5c, 0x78, 0x5b, 0x56, 0xf6, 0x44, 0x0f, 0xe8, 0x2d,
+	0xc0, 0x91, 0xc0, 0x1a, 0x84, 0xc7, 0x4a, 0x66, 0x14, 0x3e, 0x03, 0x30,
+	0x61, 0x42, 0x6e, 0x8a, 0x58, 0x92, 0x43, 0x64, 0x11, 0x7a, 0x1f, 0x60,
+	0x91, 0xcb, 0xd2, 0xdb, 0x8b, 0x8a, 0x8a, 0xa2, 0x9e, 0x42, 0x30, 0x7e,
+	0xe2, 0x44, 0xb1, 0x42, 0x7a, 0x83, 0xc0, 0x68, 0xe0, 0x64, 0xe0, 0x3d,
+	0x60, 0x41, 0x49, 0x71, 0x61, 0x51, 0xcc, 0x1e, 0x49, 0xce, 0xc4, 0x4b,
+	0x50, 0xbd, 0x08, 0xf8, 0x7e, 0x83, 0x67, 0xf2, 0xb6, 0x0a, 0x77, 0xcd,
+	0x9c, 0x51, 0xa8, 0x7b, 0xa4, 0xe5, 0x0f, 0xc0, 0xfe, 0x25, 0xc5, 0x85,
+	0xd7, 0x64, 0x65, 0xe5, 0x9e, 0x8c, 0xc8, 0x94, 0x06, 0x1b, 0x7c, 0x01,
+	0x1a, 0xb0, 0x2d, 0xfe, 0xf0, 0x50, 0x51, 0x51, 0xd4, 0x35, 0xd3, 0x13,
+	0xb2, 0x27, 0xa6, 0x0b, 0x3a, 0x19, 0x38, 0x0e, 0xd8, 0xa4, 0xf0, 0x12,
+	0x22, 0x0f, 0x12, 0x96, 0x11, 0x62, 0xd9, 0xbf, 0x50, 0xdb, 0xfa, 0xd5,
+	0xcc, 0x99, 0xd3, 0x6a, 0x1a, 0x3d, 0xeb, 0x2f, 0x28, 0xcf, 0x95, 0x94,
+	0x14, 0x96, 0xee, 0x8a, 0x67, 0xde, 0x9d, 0x28, 0x47, 0x94, 0x14, 0x17,
+	0x5e, 0x9b, 0x95, 0x93, 0x77, 0x22, 0xca, 0x6f, 0x80, 0x53, 0x88, 0x9c,
+	0xe3, 0xe4, 0x77, 0x59, 0x7a, 0x7f, 0x51, 0x51, 0x51, 0xd4, 0x2d, 0x8e,
+	0x72, 0x73, 0x73, 0x07, 0x84, 0x6d, 0xb9, 0x85, 0x48, 0x05, 0xde, 0x1b,
+	0xf8, 0x8f, 0x0a, 0x33, 0x67, 0xce, 0x28, 0x7c, 0xa7, 0xbb, 0x88, 0xb7,
+	0xb3, 0x0f, 0x58, 0x9d, 0x46, 0x2b, 0xf6, 0x8b, 0x2e, 0x29, 0x9e, 0xfe,
+	0x75, 0x49, 0x71, 0xe1, 0x35, 0xc5, 0xc5, 0x85, 0xaf, 0x37, 0x15, 0x63,
+	0xee, 0x15, 0xa0, 0xff, 0x25, 0xb2, 0x48, 0x7c, 0x45, 0x83, 0x68, 0x46,
+	0x21, 0x2c, 0x9a, 0x90, 0x9d, 0x97, 0x1d, 0x25, 0xb8, 0xf3, 0x80, 0xcb,
+	0xb2, 0xb2, 0xf3, 0x2e, 0x06, 0x9d, 0x43, 0x64, 0x77, 0x8a, 0xa5, 0xc0,
+	0x49, 0x28, 0x4f, 0x67, 0x65, 0xe7, 0xdd, 0x9c, 0x9d, 0x3d, 0xd1, 0x2d,
+	0x96, 0xcc, 0x02, 0x26, 0x03, 0xab, 0x80, 0xaf, 0x80, 0x1b, 0xc3, 0xb6,
+	0x7c, 0x38, 0x61, 0x42, 0x7e, 0xff, 0xa6, 0xae, 0xfd, 0x44, 0xb7, 0x2b,
+	0xa4, 0x4f, 0x0a, 0x3c, 0x42, 0x64, 0x93, 0x82, 0x52, 0x22, 0x87, 0xa3,
+	0x15, 0x66, 0x65, 0xe7, 0xc5, 0xb4, 0x9b, 0x63, 0x56, 0x76, 0xde, 0x3d,
+	0xa8, 0xbe, 0x00, 0x9c, 0xd4, 0x10, 0x4e, 0x0f, 0xe0, 0x4e, 0x51, 0x96,
+	0x5e, 0x77, 0xfd, 0x2f, 0xf6, 0x7c, 0xaf, 0x7f, 0x31, 0xf0, 0xf3, 0x09,
+	0xd9, 0x79, 0x23, 0x10, 0x59, 0x4a, 0x64, 0x17, 0x89, 0xca, 0x48, 0x1c,
+	0xe4, 0x1e, 0xcb, 0x96, 0xe7, 0x73, 0x73, 0x73, 0x25, 0xca, 0x33, 0x2e,
+	0x15, 0xb4, 0x02, 0xc8, 0x20, 0x32, 0xa2, 0xff, 0x5f, 0x81, 0x5c, 0x51,
+	0x0d, 0x88, 0xa5, 0x63, 0x81, 0x9f, 0x8b, 0xe8, 0x9e, 0x0d, 0xc3, 0xcf,
+	0x45, 0x38, 0x7e, 0x8f, 0x6b, 0xe7, 0x02, 0xd7, 0x64, 0x65, 0xe5, 0x7d,
+	0x1f, 0xe5, 0x0d, 0x60, 0x30, 0x91, 0x81, 0xc6, 0xfd, 0x80, 0xdf, 0x87,
+	0x6d, 0x79, 0x71, 0xfc, 0xc4, 0x89, 0x4d, 0xe6, 0x22, 0x64, 0x67, 0xe7,
+	0x9e, 0x14, 0xb6, 0xe5, 0xfd, 0x86, 0xb1, 0x8e, 0x0d, 0xc0, 0x07, 0xc0,
+	0x05, 0xa2, 0x2c, 0x9d, 0x90, 0x9d, 0x77, 0x85, 0x69, 0x79, 0x3b, 0x07,
+	0x87, 0x03, 0x6b, 0x9d, 0xde, 0x3c, 0x21, 0x3b, 0xef, 0x10, 0xe0, 0x6f,
+	0xc0, 0x12, 0xb7, 0x0b, 0x5f, 0x61, 0x61, 0x61, 0x6d, 0x64, 0xa0, 0x2b,
+	0xaf, 0xaf, 0xad, 0x2c, 0x16, 0xb8, 0x27, 0x37, 0x37, 0xf7, 0x89, 0xa2,
+	0xa2, 0xa2, 0x3d, 0xf7, 0xe1, 0x1a, 0x02, 0x14, 0x5b, 0x62, 0x1f, 0x3e,
+	0x63, 0xc6, 0x8c, 0x6f, 0x23, 0x2d, 0x6d, 0xce, 0xfe, 0x62, 0x59, 0x1f,
+	0x03, 0xf7, 0x80, 0xae, 0x02, 0x4e, 0xac, 0xaf, 0x73, 0x1d, 0xfe, 0xe8,
+	0xa3, 0x05, 0xdb, 0x1b, 0x04, 0x3a, 0x0e, 0xd1, 0x39, 0x62, 0x85, 0x67,
+	0x02, 0x57, 0xed, 0x5e, 0x85, 0xea, 0xaf, 0x51, 0x7e, 0x06, 0x72, 0x73,
+	0x49, 0xf1, 0xf4, 0x47, 0x22, 0x71, 0xc8, 0x11, 0x1b, 0x6b, 0x22, 0x4a,
+	0xc1, 0x84, 0x9c, 0xbc, 0xab, 0x66, 0xce, 0x28, 0xdc, 0xeb, 0x96, 0xb5,
+	0x59, 0x59, 0xb9, 0x63, 0x80, 0x3b, 0x80, 0xa9, 0x25, 0xc5, 0x85, 0xb7,
+	0x7c, 0x97, 0xce, 0xac, 0xbc, 0x8b, 0x45, 0x78, 0xa1, 0x77, 0xef, 0xbe,
+	0x7f, 0x04, 0xae, 0x8b, 0xd2, 0xfd, 0xf0, 0x23, 0x72, 0x56, 0xc9, 0x8c,
+	0xe9, 0x4b, 0x1a, 0x09, 0xb4, 0x3c, 0xe2, 0x35, 0xb8, 0x06, 0xd1, 0x74,
+	0x37, 0xd0, 0x27, 0x80, 0x1d, 0xb6, 0x25, 0xc7, 0x3c, 0x54, 0x34, 0xfd,
+	0x7f, 0x00, 0xf9, 0xf9, 0xf9, 0x29, 0xb5, 0x75, 0xe1, 0x72, 0xd0, 0xd8,
+	0xdf, 0xe5, 0x0a, 0x2f, 0xab, 0x70, 0xfe, 0xcc, 0x19, 0x85, 0xfe, 0x46,
+	0xcf, 0x9f, 0x0d, 0x5c, 0x60, 0xd5, 0x73, 0x74, 0x83, 0x38, 0x1b, 0x79,
+	0x5c, 0x32, 0x07, 0xb0, 0x55, 0xe5, 0xc4, 0x99, 0x25, 0xd3, 0xbf, 0x68,
+	0x68, 0x89, 0xfb, 0x84, 0x6d, 0xa9, 0x14, 0x78, 0x3a, 0x2b, 0x2b, 0xaf,
+	0xbc, 0xa4, 0xa4, 0x70, 0x9d, 0x69, 0x79, 0xbb, 0xf0, 0x80, 0x9b, 0x08,
+	0x67, 0x03, 0x8a, 0xca, 0x05, 0x3b, 0x85, 0x0b, 0x30, 0x63, 0x46, 0x61,
+	0x15, 0x2a, 0xd7, 0x02, 0x7d, 0xc3, 0xb6, 0x5c, 0x10, 0xe5, 0xd6, 0xde,
+	0x02, 0x97, 0xef, 0x14, 0x2e, 0xc0, 0xcc, 0x99, 0x33, 0xbe, 0x01, 0xfd,
+	0x35, 0x30, 0x40, 0xe1, 0x39, 0x4b, 0xb8, 0x60, 0xa7, 0x70, 0x01, 0xdc,
+	0x6e, 0x2d, 0x6d, 0x70, 0x07, 0x77, 0x3b, 0x31, 0xe1, 0xa6, 0x9b, 0xb3,
+	0xfa, 0xa2, 0xfc, 0x0e, 0x58, 0xb4, 0x53, 0xb8, 0x91, 0x38, 0xcc, 0x50,
+	0x6c, 0x2d, 0x02, 0xd6, 0x8a, 0xf2, 0xc8, 0xde, 0x85, 0x9b, 0x67, 0x21,
+	0xf2, 0x0a, 0xb0, 0xbe, 0xb1, 0x70, 0x01, 0x66, 0x96, 0x14, 0xfe, 0x13,
+	0x58, 0x04, 0x5c, 0x9b, 0x95, 0x9d, 0x17, 0x6d, 0x56, 0xdd, 0x84, 0xc6,
+	0xc2, 0x05, 0x08, 0xbb, 0xb8, 0x14, 0xb0, 0x43, 0xb6, 0xbd, 0xdb, 0x21,
+	0xe8, 0xd9, 0x39, 0xb9, 0x57, 0x37, 0xa4, 0x7f, 0xcc, 0x4e, 0xe1, 0x02,
+	0x14, 0x14, 0x14, 0xd4, 0x0f, 0x1a, 0xd8, 0xdf, 0x47, 0xeb, 0xb6, 0xb7,
+	0xd9, 0x23, 0x13, 0xe5, 0xf7, 0x8d, 0x85, 0x0b, 0xe0, 0xb2, 0xf4, 0x5a,
+	0xa0, 0x4e, 0x44, 0xb3, 0xf7, 0x68, 0xf5, 0x27, 0x03, 0x07, 0x81, 0x5e,
+	0xbc, 0x53, 0xb8, 0x00, 0x45, 0x45, 0x45, 0xd5, 0x02, 0x97, 0x47, 0x7a,
+	0x53, 0x72, 0x8d, 0x71, 0x9b, 0xbb, 0x38, 0xaa, 0xf2, 0x25, 0x68, 0x4e,
+	0x49, 0xc9, 0xf4, 0x0d, 0x4d, 0x85, 0xad, 0x5f, 0x37, 0xfc, 0x95, 0x1e,
+	0xe5, 0xd6, 0x4d, 0xc5, 0xc5, 0x85, 0x8b, 0xa2, 0x14, 0xc3, 0x7f, 0x35,
+	0xfc, 0xb1, 0x63, 0xc6, 0x8c, 0xc2, 0xdd, 0xb6, 0xbe, 0x2d, 0x2c, 0x2c,
+	0xb4, 0x89, 0xb8, 0xc5, 0xbd, 0x1a, 0x5f, 0x4f, 0x71, 0xb9, 0x7d, 0x80,
+	0x6d, 0x89, 0x7d, 0x49, 0xd3, 0xc1, 0xb6, 0xa2, 0x30, 0xca, 0x7d, 0x0d,
+	0xae, 0x6f, 0xcb, 0x02, 0xb0, 0xb4, 0x1f, 0x90, 0xaa, 0xc8, 0xc5, 0x51,
+	0x33, 0x5a, 0xec, 0x5f, 0x00, 0xa4, 0xb8, 0x5d, 0x3d, 0xa3, 0x18, 0xe2,
+	0x99, 0x3d, 0x2f, 0x3d, 0x5c, 0x58, 0xb8, 0x09, 0xa8, 0xdd, 0x39, 0x28,
+	0xd8, 0xc8, 0x66, 0x0f, 0x44, 0x5a, 0x3f, 0x6d, 0xb2, 0xe9, 0xdf, 0x94,
+	0x29, 0x53, 0xc2, 0xc0, 0x27, 0x0e, 0x72, 0xa2, 0xc9, 0x59, 0x57, 0x45,
+	0x45, 0x45, 0x1b, 0x1a, 0x5c, 0xe2, 0xef, 0xed, 0xf1, 0xd5, 0xf5, 0xc0,
+	0x1a, 0xb7, 0x4b, 0x9a, 0x8c, 0x73, 0x14, 0x17, 0x17, 0x7e, 0x02, 0x7c,
+	0x8e, 0xe8, 0x85, 0xdd, 0xa1, 0xfc, 0xba, 0xbb, 0x62, 0xa2, 0xb2, 0xb2,
+	0x26, 0x1e, 0x81, 0xe8, 0x83, 0x51, 0x46, 0xb8, 0x5e, 0x2b, 0x29, 0x29,
+	0x7c, 0xe2, 0xbb, 0x16, 0xa9, 0x78, 0xfa, 0x02, 0x60, 0x41, 0x33, 0xc2,
+	0xae, 0x8f, 0x9c, 0x71, 0xab, 0x07, 0x44, 0xf9, 0x3a, 0xd4, 0x4c, 0x13,
+	0x52, 0xdb, 0x70, 0xc4, 0xec, 0x9a, 0x66, 0xdc, 0x84, 0x8f, 0x14, 0xdc,
+	0xe3, 0xc7, 0x8f, 0x4f, 0x79, 0xf8, 0xe1, 0x87, 0xeb, 0x23, 0xcf, 0x61,
+	0x14, 0x42, 0xdd, 0x8c, 0x19, 0x33, 0xa2, 0xbb, 0x79, 0x2e, 0x16, 0x60,
+	0xe3, 0xca, 0xca, 0xca, 0xea, 0x55, 0x52, 0x52, 0xb2, 0xbd, 0xd9, 0xe2,
+	0x6f, 0x93, 0x81, 0xa0, 0x33, 0x8b, 0xa7, 0x47, 0x3d, 0x3a, 0x74, 0xc6,
+	0x8c, 0x19, 0x2b, 0xb3, 0xb2, 0xf3, 0xa8, 0xaf, 0x0f, 0x9f, 0x0e, 0xec,
+	0xb1, 0xd5, 0xab, 0xd5, 0xdc, 0x46, 0x7e, 0x61, 0x22, 0x13, 0x5f, 0x1a,
+	0xd3, 0x03, 0xd8, 0x56, 0x52, 0x5c, 0x54, 0xd3, 0xc2, 0x3d, 0xb1, 0xd2,
+	0xdc, 0x7c, 0xe7, 0x1a, 0xe0, 0xe8, 0x3d, 0xae, 0xed, 0x03, 0x04, 0x0b,
+	0x0b, 0x0b, 0x9b, 0x7b, 0xce, 0x16, 0xe0, 0x94, 0x29, 0x53, 0xa6, 0xc8,
+	0x94, 0x29, 0x53, 0xd4, 0x88, 0xb7, 0xf3, 0x39, 0xd3, 0xee, 0x86, 0xc1,
+	0x8f, 0xc6, 0x05, 0x6e, 0x04, 0xc2, 0x57, 0xcd, 0xdd, 0x32, 0x7e, 0xfc,
+	0xc4, 0xfe, 0x6e, 0xb7, 0x1e, 0x09, 0x1c, 0xaa, 0xaa, 0x16, 0xd8, 0x7d,
+	0x63, 0xf5, 0xca, 0x55, 0xa9, 0x6f, 0xb8, 0x23, 0xea, 0x89, 0x84, 0x8a,
+	0x7c, 0x0e, 0x2a, 0xae, 0xd4, 0xd4, 0xc3, 0x88, 0x8c, 0x02, 0x43, 0xc4,
+	0x75, 0x77, 0x65, 0x65, 0xe7, 0xfd, 0x29, 0x6a, 0xa0, 0x36, 0xbd, 0x01,
+	0x5c, 0x2e, 0xd7, 0x11, 0x0d, 0x03, 0x6a, 0xcd, 0xf9, 0x50, 0x19, 0x28,
+	0x34, 0x1b, 0xce, 0x2e, 0xdb, 0x1c, 0xd7, 0x54, 0xbc, 0xcd, 0x62, 0x03,
+	0x7d, 0x26, 0x4c, 0x98, 0x68, 0xcd, 0x9c, 0x39, 0x7d, 0xa7, 0xc0, 0x53,
+	0x1a, 0x06, 0xf5, 0xda, 0x83, 0x7a, 0x60, 0xc0, 0x0d, 0x37, 0xdc, 0x6a,
+	0x3d, 0xfe, 0xf8, 0x03, 0x3b, 0x9f, 0x3f, 0x00, 0x38, 0xaa, 0x85, 0x74,
+	0x1e, 0x0c, 0xf4, 0xde, 0xbc, 0x79, 0x73, 0x1a, 0xc9, 0x77, 0x2e, 0xb3,
+	0x11, 0xef, 0xde, 0x28, 0x29, 0x9e, 0xfe, 0x11, 0xe0, 0xf9, 0xae, 0x25,
+	0xce, 0xc9, 0x1b, 0x86, 0x46, 0x77, 0xe7, 0xb2, 0xb2, 0x73, 0x0f, 0x01,
+	0xb9, 0x1f, 0xf4, 0x8a, 0x86, 0x6a, 0x7a, 0x2b, 0x22, 0xea, 0xa4, 0x3f,
+	0x2d, 0x2a, 0xb4, 0x74, 0x22, 0xbd, 0xda, 0x12, 0x12, 0x4b, 0x71, 0xed,
+	0xbe, 0x7f, 0x75, 0x9f, 0x86, 0xee, 0xcb, 0xb1, 0x2d, 0x04, 0xbd, 0x08,
+	0xd8, 0xb1, 0x97, 0x2e, 0x40, 0x1f, 0x89, 0xc4, 0x79, 0x2f, 0xe1, 0xe8,
+	0x9a, 0x58, 0xd3, 0x65, 0xdb, 0xae, 0xdd, 0x7d, 0x01, 0xd5, 0x76, 0x3d,
+	0x2e, 0xb5, 0xae, 0xae, 0xe7, 0xee, 0xcf, 0x8f, 0xb4, 0xbe, 0xcd, 0xa5,
+	0xf3, 0x23, 0xe0, 0x23, 0xdb, 0x76, 0xd9, 0x74, 0x71, 0x3a, 0xbb, 0x78,
+	0xab, 0x89, 0x6d, 0x93, 0xec, 0x3d, 0x84, 0x3b, 0x71, 0x10, 0xe8, 0xf2,
+	0x06, 0xf1, 0xfc, 0x42, 0x08, 0xbf, 0x54, 0x5c, 0x5c, 0xbc, 0xb1, 0xc1,
+	0xf5, 0x1e, 0x8c, 0x68, 0x7b, 0x8d, 0x58, 0x56, 0x97, 0x14, 0x17, 0x9e,
+	0x15, 0x87, 0x70, 0xec, 0x38, 0x85, 0x93, 0xdc, 0x63, 0x15, 0xa2, 0x8f,
+	0xcd, 0x9c, 0x51, 0x74, 0x3f, 0xdd, 0x9c, 0xce, 0x2e, 0xde, 0x2f, 0x88,
+	0x4c, 0x68, 0x70, 0x5a, 0x0c, 0xee, 0x07, 0xfa, 0xa0, 0xe2, 0x2d, 0x29,
+	0x99, 0xbe, 0xa8, 0x83, 0xd2, 0xf0, 0x29, 0x91, 0xf7, 0x9a, 0x6d, 0xc2,
+	0x82, 0x8f, 0xb5, 0x7d, 0xa6, 0xbb, 0x86, 0x11, 0xd9, 0xbf, 0x03, 0xf3,
+	0x7c, 0x87, 0x68, 0x87, 0x3e, 0x3f, 0x69, 0xe8, 0xec, 0xa3, 0xcd, 0x7e,
+	0x60, 0xc0, 0x84, 0x09, 0xb9, 0x43, 0x62, 0xbd, 0xf1, 0x86, 0x1b, 0x6e,
+	0x10, 0x22, 0xb3, 0x9f, 0x3e, 0xeb, 0x40, 0xe1, 0x02, 0x32, 0x9f, 0x38,
+	0x1c, 0x03, 0x23, 0x22, 0xaf, 0x01, 0x72, 0xf3, 0xcd, 0x37, 0xf7, 0x4c,
+	0x70, 0x84, 0xeb, 0x81, 0xff, 0xeb, 0xc0, 0x3c, 0xdf, 0x08, 0xfa, 0x3d,
+	0x23, 0xdd, 0x4e, 0x2e, 0x5e, 0x55, 0x9d, 0x03, 0x88, 0x58, 0xf2, 0xf0,
+	0x5e, 0xfa, 0x83, 0x4d, 0x5a, 0xa4, 0xb4, 0xbe, 0x7d, 0xdd, 0x0d, 0x83,
+	0x1f, 0xcd, 0x1d, 0x0d, 0x79, 0x50, 0xbb, 0xa4, 0xc1, 0xb6, 0xe7, 0x02,
+	0x29, 0x59, 0xd9, 0x79, 0xbf, 0x68, 0x93, 0xbf, 0xac, 0xfa, 0x2e, 0x80,
+	0xe5, 0x4a, 0x7d, 0x2c, 0xc1, 0x51, 0xfe, 0x16, 0xe8, 0x91, 0x95, 0x95,
+	0xd7, 0xdc, 0xfb, 0xdc, 0xbe, 0x89, 0xf7, 0xb6, 0xe4, 0xcc, 0xac, 0xac,
+	0xbc, 0xc1, 0x46, 0xbc, 0x9d, 0x98, 0x1e, 0x69, 0xee, 0x65, 0x40, 0x05,
+	0x70, 0xc1, 0x84, 0xec, 0xbc, 0x0b, 0xa2, 0xb7, 0xb0, 0xb7, 0x5a, 0x82,
+	0xde, 0x04, 0x20, 0xe8, 0xdb, 0x3b, 0xaf, 0x97, 0x4c, 0x9b, 0x56, 0x4f,
+	0xe4, 0xec, 0xa3, 0x83, 0xae, 0xb9, 0x66, 0xca, 0x6e, 0x23, 0x32, 0x39,
+	0x39, 0x13, 0x07, 0x22, 0xfa, 0x42, 0xa4, 0x49, 0xdb, 0xfb, 0x3b, 0xd6,
+	0x36, 0x89, 0xd7, 0x65, 0x7d, 0xd8, 0xe0, 0xfe, 0x4f, 0xcf, 0xc9, 0xc9,
+	0xe9, 0xbd, 0xe7, 0xf7, 0x39, 0x39, 0xb9, 0x43, 0xb3, 0x9b, 0x49, 0x5b,
+	0x63, 0x4a, 0x8a, 0x0b, 0x43, 0x0d, 0xb6, 0xf8, 0x59, 0x76, 0xf6, 0xa4,
+	0x26, 0x6e, 0x65, 0x7e, 0x7e, 0x7e, 0x4a, 0x56, 0xf6, 0xc4, 0xfc, 0x36,
+	0xb7, 0xf0, 0xe8, 0x15, 0x80, 0x22, 0xe4, 0xe6, 0xe7, 0xe7, 0xef, 0x56,
+	0x29, 0x66, 0x67, 0xe7, 0x9d, 0x45, 0x64, 0x0d, 0x75, 0xc2, 0xb0, 0xe1,
+	0x5a, 0x20, 0x84, 0x70, 0xdb, 0x0d, 0x37, 0xdc, 0x6a, 0x35, 0x1d, 0xc7,
+	0xc8, 0xfb, 0x59, 0x76, 0xf6, 0xc4, 0x81, 0xa6, 0xcf, 0x9b, 0xe4, 0x14,
+	0x14, 0x14, 0xd8, 0x59, 0x59, 0xb9, 0x57, 0x22, 0xb2, 0x40, 0xe0, 0xa5,
+	0xac, 0xec, 0xbc, 0x3f, 0x82, 0xcc, 0x42, 0x59, 0x01, 0xea, 0xc6, 0xe2,
+	0x04, 0xb4, 0x6e, 0x02, 0x91, 0x59, 0x4d, 0x7f, 0x2e, 0x2e, 0x2e, 0xda,
+	0x73, 0x31, 0xf8, 0x6d, 0xc0, 0xbf, 0xfa, 0xf6, 0xdb, 0x32, 0x77, 0x42,
+	0x4e, 0xde, 0x9d, 0x62, 0xb3, 0x5d, 0x84, 0x33, 0x6d, 0xd5, 0x3b, 0x14,
+	0x9e, 0x12, 0xf8, 0x0d, 0x4a, 0x42, 0x0b, 0xc2, 0x43, 0x33, 0xa6, 0x87,
+	0x26, 0xe4, 0xe4, 0x8e, 0x11, 0x95, 0x15, 0xb6, 0x5a, 0x1f, 0x67, 0xe5,
+	0xe4, 0xde, 0xe8, 0x12, 0x96, 0x84, 0x6c, 0x39, 0x58, 0xe0, 0x0c, 0x5b,
+	0x99, 0x0e, 0x7c, 0x0d, 0xcc, 0xde, 0x5b, 0x58, 0x29, 0x6e, 0xeb, 0xbc,
+	0xfa, 0x90, 0xbd, 0x56, 0xb1, 0x57, 0x67, 0x67, 0xe7, 0x5d, 0xad, 0xca,
+	0x22, 0xb5, 0xa4, 0xbf, 0xa0, 0xa7, 0xd5, 0xd6, 0x85, 0x1f, 0x00, 0x06,
+	0x4c, 0xc8, 0xc9, 0x9b, 0x3e, 0x73, 0x46, 0xa1, 0xe3, 0x91, 0xd8, 0xe2,
+	0xe2, 0xa2, 0x65, 0x59, 0xd9, 0x79, 0x2b, 0x80, 0xdf, 0xd7, 0xd6, 0x85,
+	0x7b, 0x66, 0x67, 0xe7, 0xbe, 0x0a, 0xb2, 0x45, 0x61, 0x9c, 0xc2, 0xbd,
+	0x44, 0xa6, 0x52, 0xee, 0x97, 0x30, 0x7b, 0x15, 0x17, 0x7e, 0xd2, 0xf0,
+	0x9a, 0x68, 0x52, 0x5a, 0xcf, 0xba, 0xfe, 0xd9, 0xd9, 0x79, 0x7f, 0xb2,
+	0x2d, 0xfd, 0x4c, 0xc2, 0x72, 0x0a, 0xc2, 0x45, 0xc0, 0x0d, 0x36, 0xf6,
+	0xb9, 0xc0, 0x3c, 0xd3, 0xf2, 0x26, 0x39, 0x25, 0x25, 0x45, 0x6b, 0x11,
+	0x19, 0x01, 0x3c, 0x04, 0x5c, 0x0d, 0x5a, 0x8e, 0xe8, 0x1a, 0x84, 0xaf,
+	0x50, 0x4a, 0x81, 0xa3, 0x80, 0xeb, 0x4a, 0x8a, 0x0b, 0x9b, 0xb8, 0xa5,
+	0x76, 0x58, 0x5e, 0x03, 0x0a, 0x80, 0xd1, 0xa2, 0x2c, 0x41, 0x78, 0x57,
+	0xe1, 0x41, 0x85, 0x3f, 0x84, 0xea, 0xec, 0x29, 0x44, 0x26, 0x63, 0xf4,
+	0x4f, 0x74, 0x1a, 0x66, 0xce, 0x28, 0x5a, 0xa9, 0xa2, 0x47, 0x03, 0x55,
+	0xa8, 0xcc, 0x0e, 0xdb, 0xb2, 0x56, 0x22, 0x8b, 0x1d, 0x1e, 0x06, 0x5e,
+	0x45, 0x43, 0xad, 0x1a, 0x94, 0x9b, 0x3e, 0x7d, 0x5a, 0x4d, 0x7d, 0x9d,
+	0xeb, 0x00, 0xe0, 0x6d, 0x85, 0xe7, 0x10, 0xbe, 0x12, 0xd5, 0xf7, 0x51,
+	0x9e, 0x02, 0x3e, 0x42, 0x65, 0x58, 0x5b, 0x84, 0xbb, 0xcb, 0x5d, 0x08,
+	0x9d, 0x0a, 0xcc, 0x05, 0x6e, 0x57, 0x64, 0xb1, 0xc2, 0xfb, 0x44, 0x2a,
+	0xba, 0x4b, 0x1a, 0x2a, 0x9a, 0xc4, 0xe6, 0x79, 0x71, 0xe1, 0xcd, 0xc0,
+	0xcd, 0x28, 0x57, 0x2a, 0x2c, 0x11, 0x5b, 0xd6, 0x20, 0xcc, 0x23, 0x32,
+	0x3d, 0x32, 0xc7, 0x0e, 0xd5, 0x95, 0x99, 0x96, 0xb7, 0xb3, 0x08, 0x78,
+	0xc6, 0xf4, 0x2d, 0x40, 0x76, 0x56, 0xd6, 0xc4, 0xc9, 0x58, 0x7a, 0x86,
+	0x28, 0xfb, 0x02, 0x55, 0xaa, 0xfa, 0x79, 0x49, 0x49, 0xd1, 0x87, 0xcd,
+	0xd6, 0xe2, 0x0f, 0x4d, 0x0f, 0x01, 0x93, 0xb3, 0xb3, 0x73, 0x66, 0x28,
+	0xd6, 0xff, 0x09, 0xd4, 0x86, 0x42, 0xee, 0xc5, 0x0f, 0x3f, 0x3c, 0x75,
+	0x47, 0xc4, 0x0d, 0xcc, 0x1e, 0x24, 0xe2, 0xda, 0x43, 0xf0, 0x2e, 0x5f,
+	0x4a, 0x4a, 0xa8, 0x99, 0x4a, 0xaf, 0x7e, 0xb3, 0xcb, 0x72, 0xed, 0x23,
+	0x22, 0x51, 0x67, 0x60, 0xd5, 0xd6, 0x6e, 0x5d, 0xde, 0xbb, 0x77, 0xef,
+	0x7d, 0x06, 0x0c, 0x18, 0x50, 0x15, 0x45, 0xc0, 0xab, 0x81, 0x63, 0x26,
+	0x4c, 0xc8, 0x3b, 0x08, 0x8b, 0xd3, 0x44, 0x74, 0xbb, 0xa8, 0xbd, 0xac,
+	0xb8, 0xb8, 0x38, 0xa6, 0xd7, 0x55, 0x8f, 0x3e, 0x5a, 0x50, 0x0d, 0x9c,
+	0x95, 0x9b, 0x9b, 0x3b, 0x24, 0x6c, 0x5b, 0xa7, 0x03, 0x58, 0x12, 0x7e,
+	0x7f, 0xc6, 0x8c, 0x19, 0x9f, 0x47, 0x11, 0xe1, 0xe9, 0x2e, 0x97, 0xcb,
+	0x2a, 0x2a, 0x2a, 0x8c, 0x1a, 0x5f, 0x97, 0xa5, 0x87, 0x00, 0x52, 0xf2,
+	0xf0, 0x54, 0x7b, 0xf7, 0x0a, 0xb3, 0x24, 0x0c, 0xfc, 0x70, 0xc2, 0x84,
+	0xbc, 0xfd, 0xc4, 0x92, 0x11, 0x02, 0xd5, 0xd5, 0xd5, 0xd5, 0x95, 0x7f,
+	0xf9, 0xcb, 0xe3, 0xa1, 0xac, 0xec, 0xbc, 0x22, 0x00, 0x15, 0x3b, 0xbc,
+	0x47, 0x58, 0x83, 0x5c, 0x2e, 0xd7, 0x8e, 0xdd, 0x5b, 0x0e, 0x7b, 0x94,
+	0x58, 0xe2, 0x76, 0xbb, 0xdd, 0x51, 0x0f, 0x47, 0xb7, 0x84, 0xd3, 0x45,
+	0xd4, 0x7a, 0xf2, 0xc9, 0x29, 0x76, 0x14, 0x01, 0x3f, 0x7c, 0xcd, 0x35,
+	0x53, 0x1e, 0xeb, 0xd3, 0x6f, 0xcb, 0xff, 0x89, 0xc8, 0x11, 0xa2, 0xf6,
+	0x37, 0x21, 0x97, 0xbc, 0xf5, 0x70, 0x61, 0x61, 0x7d, 0x77, 0xe9, 0xf3,
+	0x0a, 0x06, 0x43, 0x1c, 0xc9, 0xca, 0xce, 0xfb, 0x1f, 0x30, 0x30, 0x54,
+	0x9f, 0xd6, 0xf3, 0x91, 0x47, 0xee, 0x37, 0xc7, 0x61, 0x1a, 0xb7, 0xd9,
+	0xd0, 0x19, 0xb8, 0xe9, 0xa6, 0xdb, 0x7a, 0x10, 0x99, 0xfd, 0xe4, 0x37,
+	0xc2, 0x35, 0xe2, 0x35, 0x24, 0x21, 0x37, 0xe7, 0xe5, 0x0d, 0xce, 0xc9,
+	0xc9, 0xdd, 0x6d, 0x20, 0x6f, 0xca, 0x94, 0x29, 0xe2, 0x4e, 0xa9, 0x7d,
+	0x0e, 0xe8, 0x21, 0xc2, 0x4d, 0xc6, 0x4a, 0xa6, 0xcf, 0x6b, 0x48, 0xc6,
+	0x1a, 0xdf, 0xe6, 0x5e, 0x5b, 0xe5, 0xfa, 0xac, 0xec, 0xbc, 0xb9, 0x44,
+	0x16, 0x58, 0xf4, 0xdd, 0xb0, 0x71, 0x4b, 0x3a, 0x70, 0x14, 0x22, 0xc5,
+	0xa1, 0xfa, 0x9a, 0x2f, 0x8c, 0x95, 0x8c, 0x78, 0x0d, 0x49, 0x88, 0x86,
+	0xf5, 0x5e, 0xb1, 0x64, 0x0d, 0x30, 0x8e, 0xc8, 0x7a, 0xdf, 0xed, 0xc0,
+	0xbb, 0x82, 0xe4, 0x17, 0xcf, 0x98, 0x3e, 0xdb, 0x58, 0xa8, 0x7d, 0xf8,
+	0x7f, 0x49, 0xf1, 0x1a, 0x6f, 0x4b, 0xd5, 0x18, 0xc6, 0x00, 0x00, 0x00,
+	0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
 };
 
-static const unsigned char app_icon_png[]={
-0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x0,0x0,0x0,0x0d,0x49,0x48,0x44,0x52,0x0,0x0,0x01,0x0,0x0,0x0,0x01,0x0,0x08,0x06,0x0,0x0,0x0,0x5c,0x72,0xa8,0x66,0x0,0x0,0x0,0x06,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x09,0x70,0x48,0x59,0x73,0x0,0x0,0x0d,0xd7,0x0,0x0,0x0d,0xd7,0x01,0x42,0x28,0x9b,0x78,0x0,0x0,0x20,0x0,0x49,0x44,0x41,0x54,0x78,0xda,0xed,0x9d,0x79,0x9c,0x54,0xd5,0x99,0xf7,0x7f,0xe7,0xde,0x5b,0x7b,0x55,0x57,0xf5,0xbe,0x77,0x43,0x37,0x6b,0xb3,0x8b,0x20,0x8b,0x22,0x2e,0xd1,0x98,0x31,0xd1,0xc4,0x84,0x44,0x07,0xd0,0x06,0x9d,0x64,0x26,0xaf,0x8e,0x89,0x79,0x67,0x46,0xf3,0x26,0xa2,0x93,0x65,0x7c,0xe7,0xcd,0x32,0x8e,0x66,0x24,0x09,0x69,0x40,0x8d,0x19,0x26,0x89,0x21,0x2e,0xb8,0x6f,0x80,0x88,0x82,0xa0,0xec,0x74,0x43,0xd3,0xd0,0x6b,0xf5,0x56,0xfb,0x7a,0xef,0x3d,0xef,0x1f,0x8d,0xad,0xd0,0x5b,0x55,0x77,0xed,0xf5,0x7c,0x3f,0x1f,0x3e,0x68,0x51,0x55,0xe7,0xd6,0x59,0x7e,0xe7,0x39,0xcf,0x79,0xce,0x73,0x0,0x82,0x20,0x08,0x82,0x20,0x08,0x82,0x20,0x08,0x82,0x20,0xb2,0x01,0x96,0xce,0x0f,0xbf,0x6d,0xe3,0x46,0xab,0x47,0xa3,0xd1,0xea,0x0,0x0b,0x67,0xcc,0xa4,0xaa,0xaa,0x8e,0x33,0x66,0xa3,0x66,0x25,0xe2,0x3a,0x68,0x38,0x0f,0x88,0xa2,0xe8,0x57,0x65,0xd9,0xc9,0xb5,0xda,0x90,0x28,0x8a,0x6e,0x8d,0x46,0xe3,0x5d,0xb5,0x6a,0x55,0x88,0x04,0x20,0x0e,0x34,0x34,0x34,0xd8,0x24,0xc6,0x96,0x73,0x60,0x16,0x38,0x9f,0x2e,0x70,0x3e,0x93,0x33,0x36,0x03,0x40,0x2e,0x75,0x47,0x22,0x35,0x46,0x12,0x93,0xc1,0x79,0x33,0x07,0x8e,0x0a,0x9c,0x9f,0xe0,0xc0,0x71,0xae,0xaa,0x1f,0xac,0x59,0xbf,0xfe,0x08,0x63,0x8c,0x93,0x0,0x44,0xc1,0xc6,0x8d,0x1b,0x8d,0x26,0x8d,0xe6,0x6a,0x15,0x58,0xc9,0x18,0x5b,0x09,0x60,0x3e,0x0,0x91,0x7a,0x19,0x91,0x86,0x74,0x83,0xb1,0xb7,0x39,0xf0,0x16,0x53,0x94,0xd7,0xd6,0xac,0x5f,0x7f,0x82,0x04,0x60,0x18,0xde,0xdc,0xb0,0x41,0x3a,0x57,0x5d,0x7d,0x83,0x0,0xac,0xe1,0xc0,0x17,0x01,0xe8,0xa9,0xef,0x10,0x19,0x07,0xe7,0xc7,0xc0,0xd8,0x36,0x41,0x51,0x1a,0xfe,0xf6,0xce,0x3b,0x5b,0xb2,0x5e,0x0,0xb6,0x6d,0xdc,0x68,0x0d,0x6a,0xb5,0xdf,0x06,0x70,0x27,0x80,0xc9,0xd4,0x43,0x88,0x2c,0x21,0x04,0xce,0x5f,0xe0,0x9c,0xff,0x7c,0xed,0xfa,0xf5,0xbb,0xb2,0x4e,0x0,0x9e,0xd9,0xb4,0xa9,0x4c,0x61,0xec,0x9f,0x39,0x63,0xeb,0x01,0x98,0xa8,0x3f,0x10,0x59,0x6c,0x15,0x1c,0xe0,0x8c,0xfd,0x74,0xcd,0x1d,0x77,0xfc,0x31,0xd1,0xfe,0x82,0x84,0x0b,0xc0,0xd6,0xad,0x5b,0x4d,0x90,0xe5,0xfb,0x19,0x63,0xf7,0x0,0xb0,0x50,0xeb,0x13,0xc4,0x20,0xbb,0x19,0xf0,0xbd,0xd5,0xf5,0xf5,0xef,0x65,0x9c,0x0,0x70,0xce,0xd9,0x53,0x5b,0xb6,0xac,0x01,0xe7,0x8f,0x0,0x28,0xa1,0xb6,0x26,0x88,0x11,0xc6,0x0a,0x63,0xcf,0x6b,0x54,0xf5,0x1f,0x6e,0x5d,0xb7,0xee,0x5c,0x46,0x08,0xc0,0xe6,0xcd,0x9b,0x6b,0x45,0xce,0x1f,0x03,0xf0,0x79,0x6a,0x5e,0x82,0x88,0x40,0x04,0x80,0x3e,0xc6,0xf9,0x03,0xab,0xeb,0xeb,0x7f,0x1d,0xcf,0x65,0x41,0xdc,0x05,0xe0,0xc9,0xdf,0xfd,0xee,0x4e,0x30,0xf6,0x28,0x0,0x03,0x35,0x2b,0x41,0x44,0x6d,0x39,0xbf,0xa9,0x30,0x76,0x5b,0x7d,0x7d,0x7d,0x67,0x5a,0x09,0xc0,0xc6,0x8d,0x1b,0x8d,0x26,0xad,0xf6,0x09,0x0e,0xac,0xa1,0x66,0x24,0x88,0x09,0xd1,0xc6,0x55,0xf5,0x1b,0xf1,0xd8,0x2d,0x88,0x8b,0x0,0x3c,0xb3,0x69,0x53,0x99,0x2c,0x8a,0xdb,0xc1,0xf9,0xa5,0xd4,0x76,0x04,0x11,0x13,0x42,0xe0,0xfc,0x9e,0x35,0xeb,0xd6,0x6d,0x4c,0x69,0x01,0x78,0xba,0xa1,0x61,0xbe,0x0a,0xbc,0x08,0xa0,0x94,0xda,0x8c,0x20,0x62,0x3c,0x63,0x73,0xfe,0x68,0xd3,0xd9,0xb3,0xdf,0xd9,0xb0,0x61,0x83,0x9a,0x72,0x02,0xf0,0xf4,0xe6,0xcd,0x2b,0x54,0xce,0xb7,0x03,0xa0,0x03,0x39,0x04,0x11,0x3f,0xfe,0x24,0x03,0xab,0xeb,0xeb,0xeb,0x03,0x13,0xfd,0x22,0x21,0x56,0x4f,0xf4,0x64,0x43,0xc3,0xe7,0x54,0xce,0x77,0xd0,0xe0,0x27,0x88,0xb8,0x73,0x8b,0x04,0x6c,0xdb,0xb6,0x6d,0x9b,0x36,0x25,0x2c,0x80,0xad,0x9b,0x36,0x5d,0xce,0x04,0xe1,0x15,0x90,0xa7,0x9f,0x20,0x12,0x07,0xe7,0x7f,0xd5,0x99,0xcd,0x5f,0x59,0xb5,0x6a,0x95,0x92,0x34,0x0b,0xe0,0xc9,0x4d,0x9b,0xe6,0x31,0x41,0x78,0x9e,0x06,0x3f,0x41,0x24,0xda,0x21,0xc0,0xbe,0x14,0xf4,0x7a,0x1f,0x4f,0xda,0x12,0xe0,0x99,0x4d,0x9b,0xca,0x98,0x20,0xfc,0x05,0x80,0x95,0x5a,0x83,0x20,0x92,0xc2,0x37,0x9f,0x6c,0x68,0xf8,0xe7,0x84,0x2f,0x01,0xb6,0x6d,0xdb,0xa6,0x0d,0x7a,0xbd,0xbb,0x0,0x2c,0xa2,0x36,0x20,0x88,0xe4,0x2e,0x06,0x0,0x7c,0x65,0x4d,0x7d,0xfd,0x5f,0x12,0x66,0x01,0x04,0x7d,0xbe,0x7f,0xa3,0xc1,0x4f,0x10,0xa9,0xb1,0x18,0x0,0xf0,0xbb,0x86,0x86,0x86,0x49,0x09,0x11,0x80,0xad,0x0d,0x0d,0x5f,0x01,0xe7,0xf7,0x52,0xbd,0x13,0x44,0xca,0x90,0x2b,0x02,0xff,0x1d,0xed,0xce,0x40,0xd4,0x02,0xf0,0xfb,0xdf,0xfc,0xa6,0x98,0x31,0xb6,0x11,0x69,0x9e,0x50,0x94,0x20,0x32,0xd0,0x0c,0x58,0x1c,0xf4,0x7a,0x1f,0x88,0xab,0x0,0x28,0x92,0xf4,0x4b,0x70,0x5e,0x40,0xd5,0x4d,0x10,0xa9,0xa8,0x02,0xec,0xfb,0x5b,0xb6,0x6c,0x99,0x1b,0x17,0x01,0x78,0xb2,0xa1,0xe1,0xf3,0x0,0xbe,0x41,0xb5,0x9c,0x1c,0x42,0xaa,0x80,0x10,0x17,0xd2,0xea,0x99,0xbd,0xaa,0x04,0x4e,0x4d,0x97,0x38,0x38,0x97,0x04,0x55,0x7d,0x8c,0x73,0x1e,0x91,0x85,0x1e,0xb1,0x19,0xff,0xe8,0xa3,0x8f,0xea,0x72,0x2d,0x96,0x43,0x0,0xa6,0x52,0x2d,0x27,0x06,0xa7,0xa2,0x81,0x3d,0xac,0x83,0x5d,0xd6,0xa3,0x27,0xac,0x87,0x5b,0x95,0x30,0x49,0xeb,0xc1,0xe5,0x96,0x9e,0xb4,0x19,0xfc,0x7f,0x75,0x94,0x83,0x73,0x20,0x57,0x0a,0xa3,0x44,0xe3,0x47,0xa1,0x14,0x44,0x91,0x26,0x0,0x2d,0x53,0xa9,0x81,0xe3,0x69,0x08,0x70,0xbe,0x66,0xf5,0xba,0x75,0x4f,0xc5,0x4c,0x0,0x9e,0x6a,0x68,0xb8,0x9b,0x03,0x8f,0x52,0xd5,0xc6,0x8f,0x30,0x67,0x68,0x0b,0x1b,0xd1,0x15,0xd6,0xc3,0x1e,0xd6,0xc3,0xa9,0x68,0x86,0x6d,0xb0,0xeb,0xad,0xed,0x28,0x90,0x52,0xff,0x0e,0x8a,0xdd,0xee,0x02,0x34,0x87,0xcc,0x43,0x5e,0x17,0x19,0x1f,0x14,0x82,0x72,0xad,0x1f,0x79,0x62,0x90,0x1c,0x4a,0xb1,0x5f,0x0a,0xb4,0xf6,0xbb,0x5c,0x53,0xee,0xb9,0xe7,0x9e,0xe0,0x68,0x6f,0x93,0x22,0xf9,0xae,0x6d,0xdb,0xb6,0x19,0xa2,0x75,0x2e,0x10,0x91,0xcf,0xf2,0xad,0x21,0x23,0xda,0xc2,0x46,0xd8,0xc3,0xda,0x31,0x35,0x99,0x03,0x78,0xdf,0x5b,0x80,0x2f,0x58,0xdb,0x53,0xfa,0x77,0x75,0x85,0x75,0xc3,0x0e,0x7e,0x0,0x50,0x38,0x43,0x67,0x58,0x8f,0xce,0xb0,0x1e,0x1f,0xfb,0x6c,0xd0,0x09,0x2a,0xca,0x34,0x3e,0x54,0x6a,0xfd,0x28,0xd3,0xf8,0x21,0x91,0x75,0x10,0x8b,0xa5,0x40,0x45,0x9e,0xc5,0xb2,0x1e,0xc0,0xaf,0x26,0x6c,0x01,0x6c,0x6d,0x68,0xf8,0x16,0x03,0xfe,0x8b,0x6a,0x35,0x76,0x83,0xfe,0x6c,0xc8,0x88,0xd6,0x90,0x11,0x7d,0xb2,0x6e,0x5c,0x6b,0xe4,0xe5,0xe6,0x6e,0x4c,0xd6,0x79,0x53,0xb3,0xef,0x01,0x78,0xd9,0x59,0x8a,0x1e,0x59,0x17,0xf5,0x67,0xb5,0x4c,0x45,0x99,0xc6,0x8f,0x0a,0xad,0x0f,0xe5,0x5a,0x1f,0x34,0x8c,0x3c,0x08,0x13,0x68,0x87,0x73,0x7a,0x93,0x69,0xca,0x68,0x57,0x96,0x8d,0x69,0x01,0xbc,0xb9,0x61,0x83,0xd4,0x0a,0xfc,0x13,0x55,0xe7,0xc4,0x08,0x72,0x11,0x67,0x02,0x46,0x9c,0x0e,0x59,0xd0,0x2b,0x4f,0xf8,0x10,0x17,0x0e,0xfa,0x72,0x51,0xa5,0xf5,0x41,0x4c,0xc1,0x01,0x72,0x26,0x64,0x1e,0xd7,0xe0,0x07,0x80,0x10,0x17,0x70,0x26,0x64,0xc2,0x99,0x90,0x09,0x22,0xe3,0xa8,0xd2,0x78,0x51,0xa3,0xf7,0xa2,0x54,0xe3,0xa7,0x4e,0x14,0xed,0x2a,0x0,0xa8,0x0c,0x79,0x3c,0xb7,0x02,0xd8,0x32,0x6e,0x01,0x68,0xab,0xaa,0xba,0x19,0x74,0x61,0xc7,0xb8,0x90,0x39,0x43,0x73,0xd0,0x84,0xe6,0x90,0x25,0x22,0xf3,0x3e,0x1a,0xbc,0xaa,0x84,0xa3,0x81,0x1c,0xcc,0x31,0x38,0x53,0xea,0x37,0x2b,0x9c,0xe1,0x80,0x37,0x37,0x66,0xdf,0xd5,0x1c,0x32,0xa3,0x39,0x64,0x86,0x56,0x50,0x51,0xad,0xf5,0xa1,0x46,0xe7,0x41,0xa1,0x14,0xa0,0xce,0x15,0xa9,0x15,0xc0,0xd8,0x77,0x46,0x13,0x80,0x31,0xf7,0x94,0x38,0xb0,0x8e,0xaa,0x31,0x3a,0x5c,0x8a,0x06,0xfb,0xbc,0x79,0x78,0xd6,0x51,0x89,0xbd,0xde,0x02,0xd8,0xc3,0x3a,0xc4,0x23,0x6e,0xea,0xb8,0xdf,0x9a,0x72,0xdb,0x82,0x8d,0x41,0x0b,0x7c,0x6a,0xec,0xaf,0x71,0x0c,0xa9,0x02,0x1a,0x03,0x66,0xbc,0xec,0x2c,0xc1,0x4b,0xce,0x52,0x34,0x06,0x2c,0x50,0x38,0xb9,0x0e,0x23,0x60,0xde,0xd6,0x4d,0x9b,0x2e,0x1d,0x97,0x05,0xd0,0xd0,0xd0,0x50,0x02,0xe0,0x3a,0xaa,0xc3,0xc8,0x68,0x0d,0x19,0x71,0x34,0x60,0x3d,0x3f,0xe0,0x13,0xb1,0xac,0x10,0x70,0xc4,0x6f,0xc5,0x02,0x63,0x7f,0x4a,0xfc,0xfe,0x30,0x67,0x38,0xe4,0x8b,0xff,0xc1,0xd0,0x1e,0x59,0x87,0x1e,0x59,0x87,0x0f,0x7d,0x79,0xa8,0xd1,0x7b,0x30,0x5b,0xef,0x80,0x41,0x50,0xa8,0x03,0x8e,0x34,0xcb,0x33,0xb6,0x06,0xc0,0xbe,0xa8,0x2d,0x0,0x91,0xf3,0x5b,0x41,0xb7,0xf2,0x8e,0x8a,0x0a,0x86,0xd3,0x41,0x13,0x5e,0x74,0x96,0xe1,0x2d,0x77,0x51,0xc2,0x06,0xff,0xa0,0x15,0x10,0xc8,0x81,0x5f,0x4d,0x8d,0x26,0x3a,0x16,0xb0,0x22,0xc8,0x13,0xf7,0x2c,0x61,0xce,0x70,0xc2,0x6f,0xc1,0xb3,0x8e,0x4a,0xec,0xf6,0x14,0x0c,0xbb,0x6d,0x4a,0x0,0x9c,0xb1,0x5b,0x37,0x6e,0xdc,0xa8,0x89,0xda,0x02,0x60,0x8c,0xdd,0x4a,0xd5,0x37,0x32,0xe7,0x42,0x46,0x1c,0xf4,0xe5,0x26,0xb5,0xe3,0x29,0x9c,0xe1,0x88,0xdf,0x8a,0x4b,0x4d,0x7d,0x49,0xad,0x8b,0x90,0x2a,0xe0,0xb8,0x3f,0x27,0x39,0x22,0xcc,0x81,0xe6,0xa0,0x19,0x2d,0x41,0x13,0xaa,0xb4,0x3e,0x5c,0x62,0xea,0x83,0x91,0x2c,0x82,0xcf,0x52,0x68,0xd4,0x6a,0xaf,0x01,0xf0,0x52,0xc4,0x16,0xc0,0x79,0xf3,0x9f,0xd2,0x7a,0x8f,0x42,0x73,0xd0,0x94,0x12,0xb3,0xce,0xc9,0x80,0x05,0x3e,0x55,0x4a,0xea,0x33,0x1c,0x0b,0x24,0xdf,0x1f,0xa1,0x82,0xe1,0x4c,0xc8,0x04,0xb7,0x22,0x51,0xe7,0x1c,0x3a,0x9b,0xff,0x4d,0x54,0x4b,0x0,0x89,0xf3,0xab,0x40,0x27,0xfe,0x46,0x45,0x9b,0x22,0x5b,0x70,0x2a,0x18,0x0e,0xf9,0x93,0x97,0x94,0x29,0xc8,0x45,0x1c,0x0b,0xe4,0x50,0xbb,0xa4,0xf4,0x5a,0x55,0xbd,0x26,0x3a,0x1f,0x80,0x20,0x5c,0x4d,0xb5,0x36,0x3a,0xa2,0x90,0x3a,0x1d,0xed,0x54,0xc0,0x0c,0x6f,0x92,0xac,0x80,0xa3,0x7e,0x0b,0xe4,0x14,0xf2,0xc8,0x8b,0x24,0x0,0xc3,0x59,0x0,0x33,0xb7,0x6c,0xd9,0x52,0x1e,0xb9,0x0,0x70,0x4e,0x02,0x30,0xd6,0x4c,0x83,0xd4,0x09,0x59,0x55,0x31,0xe0,0x0b,0x48,0xc6,0xec,0x7f,0xd2,0x9f,0x93,0x5a,0xed,0x42,0xa1,0xc4,0xc3,0xcf,0xe9,0x9c,0xaf,0x8c,0x48,0x0,0xb6,0x6e,0xdd,0x5a,0x04,0xa0,0x86,0xaa,0x6c,0x74,0xa4,0x14,0x9b,0x69,0x9a,0x02,0xe6,0x84,0xfb,0x02,0x8e,0xfb,0x73,0x10,0x86,0x90,0x62,0xed,0x42,0x02,0x30,0x02,0x4b,0x22,0xb3,0x0,0x64,0x79,0x26,0xd5,0x55,0x24,0xa6,0x66,0x6a,0x75,0x34,0x15,0x0c,0xc7,0x12,0x38,0x1b,0x87,0x39,0xc3,0x89,0x80,0x25,0xc5,0x5a,0x85,0xd3,0x12,0x60,0x64,0xab,0x7e,0x66,0x44,0x02,0xc0,0x04,0x61,0x3a,0xd5,0x56,0x7a,0x9a,0x9a,0x27,0x83,0x96,0x84,0xed,0xc5,0x9f,0x0c,0xe4,0xa4,0x5c,0x24,0xa2,0xc4,0x38,0x79,0xae,0x47,0xf6,0x03,0x4c,0x8f,0xcc,0x02,0xe0,0x9c,0x04,0x20,0x22,0x0b,0x20,0xf5,0x66,0x1a,0x85,0x33,0x9c,0xf0,0x9b,0xe3,0x6f,0x6d,0x70,0xe0,0x44,0x20,0x27,0xe5,0x7e,0x3f,0xed,0x0,0x8c,0x6a,0x01,0x94,0x6f,0x7b,0xfc,0x71,0xf3,0xd8,0x02,0x40,0x59,0x7f,0x22,0x42,0x93,0xa2,0x6b,0xcd,0x13,0x81,0x9c,0xb8,0xc7,0xc9,0x9f,0x0e,0x99,0xe3,0x12,0xf3,0x9f,0x89,0xa2,0x9c,0x4a,0x36,0x40,0xd8,0x68,0x9c,0x72,0x81,0xc5,0x34,0xc2,0x1b,0x4b,0xa8,0xae,0x22,0x11,0x80,0xd4,0xec,0x6c,0x41,0x2e,0xe2,0x74,0xd0,0x84,0xa9,0x7a,0xcf,0x88,0xef,0x09,0xa9,0x02,0x14,0x30,0x84,0xb9,0x80,0x30,0x67,0x0,0x18,0x04,0xc6,0x21,0x31,0x15,0x5a,0xc6,0x21,0x41,0x1d,0x71,0x30,0x71,0x20,0x69,0x51,0x7f,0xe9,0xb8,0x2c,0x4b,0x25,0xd4,0x8b,0xc6,0xb6,0x34,0x42,0x03,0x5b,0x68,0x1d,0x15,0xc9,0x7a,0x33,0x75,0x3b,0xdb,0xb1,0x80,0x15,0x12,0x1b,0x38,0x36,0xec,0x55,0x45,0x78,0x14,0x09,0x3e,0x55,0x82,0x47,0x95,0xa2,0xb2,0x0e,0xf4,0x82,0x02,0xb3,0xa0,0xc0,0x24,0x84,0x61,0x14,0x14,0x98,0x44,0x19,0x32,0x67,0x70,0x28,0xda,0x94,0xfc,0xdd,0x22,0x48,0x0,0x46,0x5d,0x05,0x0,0x96,0x31,0x05,0x80,0x5d,0xf4,0x26,0x22,0xfd,0x04,0xc0,0xa5,0x68,0xb0,0xdb,0x33,0xf1,0xec,0xed,0x01,0x55,0x44,0x40,0x15,0xd1,0x03,0x6d,0x5a,0xb4,0x09,0x59,0x0,0xa3,0x23,0x5c,0x34,0xb6,0x47,0xf2,0x01,0x90,0x0,0x44,0x80,0x81,0x3a,0x5b,0xca,0xa1,0xa3,0x43,0x40,0x63,0x91,0x13,0x89,0x0,0x98,0xa8,0x9e,0x22,0xb3,0x0,0xc8,0xe9,0x94,0x62,0xa2,0x2c,0x90,0x28,0x8f,0xea,0x03,0xe0,0x3c,0xa2,0x5d,0x0,0xca,0x01,0x10,0xe9,0x1a,0x99,0xd1,0x8c,0x93,0x5a,0x16,0x0,0x09,0xc0,0x68,0x30,0xc6,0xa4,0x48,0x04,0x80,0xa0,0x19,0x27,0x4d,0x05,0x59,0xa6,0x4a,0x88,0xce,0x27,0x40,0x50,0x87,0x23,0x41,0x26,0x01,0x20,0xc6,0x67,0x72,0x8a,0xd4,0xe1,0x48,0x90,0x49,0x0,0xb2,0x16,0x93,0x40,0x1d,0x2e,0x95,0xa0,0x54,0x60,0x24,0x0,0x09,0xc5,0x4c,0x02,0x90,0x32,0x48,0x4c,0x85,0x96,0x96,0x0,0x24,0x0,0x89,0x9d,0x71,0x48,0x0,0x52,0xc7,0x1a,0xa3,0xd9,0x9f,0x04,0x80,0x2c,0x80,0xec,0x6d,0x0b,0x91,0xda,0x82,0x04,0x20,0xd1,0x16,0x80,0xa8,0x0,0xa0,0x60,0xa0,0x94,0x68,0x0b,0x72,0x0,0x92,0x0,0x24,0x1a,0xb7,0x22,0x41,0xa4,0x93,0x53,0x29,0x41,0x90,0x8b,0x50,0x29,0x1d,0x48,0x54,0x50,0x02,0xf5,0xf1,0x76,0x36,0x55,0xc0,0x3e,0x5f,0x1e,0x9a,0x83,0x26,0x50,0xf6,0xf4,0xd4,0xe0,0x6c,0xc8,0x88,0x67,0xfb,0x2b,0xb0,0xc0,0xd8,0x87,0x9a,0x14,0xbd,0x3a,0x9d,0x04,0x20,0xcd,0xe1,0x18,0x48,0xbe,0x79,0xd0,0x9f,0x87,0xa0,0x4a,0x06,0x54,0xaa,0xe1,0x57,0x45,0xbc,0xeb,0x29,0xc4,0xe9,0xa0,0x05,0x8b,0x4c,0xbd,0xb0,0x8a,0x61,0xaa,0x14,0x12,0x80,0xd8,0x99,0xfb,0xef,0x7b,0xf3,0xd1,0x11,0x36,0x50,0x65,0xa4,0x38,0x9d,0x61,0x3d,0x76,0x38,0xcb,0x30,0xc7,0xe0,0xc4,0x4c,0x83,0x13,0x02,0xf9,0x69,0xd2,0xd3,0x07,0x10,0x50,0x45,0x7c,0xe4,0xb3,0x25,0xf4,0xd2,0xc9,0x8b,0x19,0xc8,0xb9,0x6f,0xc3,0xf3,0xce,0x72,0x1a,0xfc,0x69,0x84,0xcc,0x19,0x0e,0xf8,0x6c,0x78,0xd1,0x59,0x86,0x5e,0x59,0x97,0xd4,0x67,0xe9,0x0a,0xeb,0x71,0x3c,0x05,0x73,0x28,0xa6,0xb4,0x05,0x10,0xe6,0x0c,0xaf,0xbb,0x8b,0xd1,0x2f,0x6b,0x71,0x2c,0x90,0x83,0x3a,0xbd,0x0b,0x33,0x0d,0xce,0x84,0xa6,0xe2,0x72,0x28,0x5a,0xec,0xf6,0x14,0xa0,0x5f,0xd6,0xd2,0x88,0x4a,0x53,0x1c,0xb2,0x06,0x2f,0x39,0x4b,0x31,0xd3,0xe0,0xc2,0x7c,0x43,0x1f,0x84,0x04,0xba,0x6c,0x7a,0x65,0x1d,0x3e,0xf2,0xe7,0xa2,0x3d,0xa4,0x07,0x0,0x30,0xce,0x31,0xdd,0xe0,0x26,0x01,0x18,0x73,0xd6,0xe5,0xc0,0xdb,0xee,0xa2,0xc1,0x81,0x27,0x73,0x01,0x1f,0xfb,0x6d,0x38,0x11,0xcc,0xc1,0x2c,0x83,0x13,0xd3,0x75,0xae,0xb8,0x9f,0xc5,0x3f,0x19,0xcc,0xc1,0x7e,0x6f,0x6e,0xdc,0x13,0x6c,0x12,0xf1,0x87,0x03,0x38,0xea,0xcf,0x41,0x57,0x58,0x8f,0xcb,0xcd,0x76,0x58,0xe2,0x1c,0x33,0xe0,0x54,0x34,0x38,0xe8,0xcf,0x45,0x6b,0xd0,0x78,0xc1,0xe2,0xe3,0x03,0x5f,0x1e,0x0c,0xa2,0x8a,0x2a,0x6d,0x6a,0x38,0x29,0x85,0x54,0x6d,0xac,0x3d,0xde,0x42,0x74,0x0e,0x63,0x6e,0x07,0x55,0x01,0x1f,0x7a,0x73,0xf1,0x57,0x67,0x05,0xce,0x84,0x4c,0x71,0x59,0xd9,0x85,0xb8,0x80,0xb7,0xdd,0x45,0x78,0xdf,0x93,0x47,0x83,0x3f,0xc3,0xe8,0x95,0xb5,0x78,0xd1,0x51,0x76,0x7e,0xf7,0x26,0xf6,0x04,0xb9,0x88,0xbd,0xde,0x7c,0x3c,0xef,0x28,0xc7,0xb9,0x8b,0x06,0xff,0x0,0x0c,0xbb,0xdc,0x05,0xb0,0xcb,0x7a,0x12,0x80,0x91,0x78,0xdf,0x9b,0x3f,0x66,0x03,0x79,0x15,0x11,0xbb,0xdc,0x85,0xd8,0xe1,0x2c,0x83,0x3d,0x1c,0xbb,0xca,0xec,0x91,0x75,0x78,0xc1,0x51,0x86,0x73,0x21,0x23,0x8d,0x96,0x0c,0x25,0x0c,0x01,0xbb,0x3d,0x85,0xd8,0xed,0x29,0x88,0x99,0xc0,0x2b,0x9c,0xe1,0x63,0x9f,0x0d,0x7f,0xee,0xaf,0x40,0x63,0xc0,0x32,0xea,0xc4,0xa4,0x82,0xe1,0x0d,0x57,0x11,0xfa,0x52,0x60,0x59,0x99,0x72,0x02,0x70,0x2c,0x60,0x45,0x63,0x14,0xd7,0x4d,0xf5,0xc9,0x5a,0xbc,0xe2,0x2a,0xc6,0xbb,0x9e,0x02,0x04,0x26,0x98,0xa7,0xbe,0x39,0x68,0xc6,0xab,0xae,0x92,0xa4,0xdd,0xb2,0x4b,0x24,0x96,0x58,0xb5,0x77,0x6b,0xd8,0x88,0xe7,0x9d,0xe5,0xf8,0xd8,0x6f,0x8b,0x58,0x50,0x64,0x2e,0xe0,0x4d,0x77,0x71,0xd2,0xfb,0x5a,0x4a,0x09,0xc0,0xb9,0x90,0x11,0xfb,0xbd,0xb6,0x71,0x7c,0x92,0xe1,0x74,0xd0,0x8c,0xed,0x8e,0x0a,0x1c,0xf3,0xe7,0x44,0x1d,0x0d,0xa6,0x82,0x61,0xaf,0x37,0x3f,0xa6,0x33,0x02,0x91,0x1e,0xf4,0xc8,0x3a,0xbc,0xe8,0x28,0x1d,0x76,0xb9,0x39,0x16,0x6e,0x55,0xc2,0x5b,0xae,0x22,0xbc,0xe5,0x2a,0x82,0x5b,0x89,0x7e,0x20,0xfb,0x55,0x11,0x6f,0xba,0x8a,0x20,0x27,0xf1,0x7a,0xb5,0x94,0x11,0x0,0x87,0xac,0xc1,0xbb,0xee,0x02,0x4c,0x24,0xaa,0x2e,0xcc,0x19,0xf6,0xfb,0xf2,0xf0,0xa2,0xa3,0x14,0x5d,0x61,0x5d,0xc4,0x8d,0xf0,0x8a,0xb3,0x24,0x2a,0xab,0x83,0xc8,0x2c,0x82,0x5c,0xc4,0xeb,0xae,0x62,0x1c,0x8d,0xf0,0xb2,0x93,0x4f,0xcc,0xfd,0xe7,0x1d,0xe5,0x68,0x0d,0x4f,0x6c,0xa9,0xe8,0x50,0xb4,0xd8,0x15,0x83,0xf4,0xed,0x69,0x2d,0x0,0x41,0x2e,0xe2,0x2d,0x4f,0x71,0xcc,0xae,0x99,0x76,0x28,0x5a,0xbc,0xe6,0x2a,0xc5,0x6e,0x77,0x01,0x02,0xa3,0x44,0xeb,0xf5,0xc9,0x5a,0xec,0x70,0x96,0xa2,0x27,0xc9,0x7b,0xc4,0x44,0xf2,0xe1,0x0,0x3e,0xf4,0xe5,0xe1,0x5d,0x4f,0xc1,0xa8,0x16,0x64,0x5b,0xc8,0x80,0xe7,0xa2,0x34,0xf7,0xc7,0x5c,0x42,0x84,0x8c,0xf8,0xc8,0x67,0x4b,0xca,0xef,0x4e,0xfa,0x62,0x57,0x05,0xc3,0x4e,0x77,0x21,0x3c,0x8a,0x14,0xf3,0x06,0x6d,0x0e,0x99,0xd1,0x2e,0x1b,0xb1,0xd0,0xd8,0x3b,0x24,0x36,0xbc,0x35,0x6c,0xc4,0x2e,0x77,0x21,0x64,0x32,0xf9,0x89,0xcf,0x70,0x3a,0x68,0x86,0x47,0x95,0xb0,0xd2,0x62,0xbf,0xe0,0x92,0x91,0x20,0x17,0xf1,0x81,0x27,0x17,0x67,0x42,0xf1,0xb9,0x78,0xf5,0xb0,0xdf,0x06,0x9b,0x14,0x46,0x75,0x82,0xb7,0x07,0x93,0x6e,0x01,0xec,0xf5,0xe4,0xa3,0x33,0x1c,0xbf,0x2d,0x91,0xa0,0x2a,0xe0,0x5d,0x4f,0x21,0x5e,0x71,0x95,0xc2,0xa9,0x68,0x0,0x0,0x8d,0x01,0x0b,0xde,0x76,0x15,0xd1,0xe0,0x27,0x86,0xc5,0x1e,0xd6,0xe3,0x65,0x67,0xe9,0xa0,0x83,0xee,0x78,0x20,0x07,0xdb,0xfb,0xcb,0xe3,0x36,0xf8,0x3f,0x99,0xb0,0xde,0xf5,0x14,0xa0,0x27,0xc1,0x3b,0x03,0x49,0xb5,0x0,0x9a,0x82,0x16,0x9c,0x0a,0x9a,0x13,0xd4,0xa8,0x3a,0xec,0x70,0x96,0xa1,0x5a,0xeb,0xc5,0xa9,0x20,0xdd,0x7b,0x42,0x8c,0x8e,0x53,0xd1,0xe0,0x35,0x67,0x31,0xcc,0xa2,0x9c,0xb0,0xf0,0x6f,0x85,0x33,0xec,0x74,0x17,0xe1,0x0b,0xb6,0x0e,0xe8,0x12,0x74,0xdf,0x44,0xd2,0x2c,0x80,0x1e,0x59,0x87,0xf7,0xbd,0xf9,0x09,0x2d,0x53,0xe6,0xec,0xbc,0xe0,0xd0,0xcc,0x4f,0x8c,0x8d,0x5b,0xd5,0x24,0xfc,0xec,0x87,0x57,0x95,0xf0,0x8e,0xbb,0x30,0x61,0x47,0x97,0x92,0x22,0x0,0x41,0x55,0xc0,0x3b,0xee,0x42,0xa8,0x74,0x40,0x8b,0x20,0x86,0xd0,0x15,0xd6,0xe3,0x63,0x5f,0x6e,0xe6,0x0a,0xc0,0x7b,0xbe,0x02,0xf8,0x28,0xd8,0x86,0x20,0x46,0xe4,0x90,0x3f,0x27,0xae,0xbe,0xb1,0xa4,0x09,0x40,0x63,0xd0,0x82,0x73,0x41,0x0a,0xb3,0x25,0x88,0xd1,0x61,0xd8,0xed,0x29,0x8c,0xfb,0x31,0xf8,0x84,0x0a,0x80,0x43,0xd6,0x60,0x9f,0x37,0x8f,0xda,0x96,0x20,0x22,0xc0,0xaf,0x8a,0xd8,0xed,0x2e,0x88,0xab,0x3f,0x20,0x61,0x02,0xa0,0x70,0x86,0x9d,0x9e,0x22,0x0a,0xb5,0x25,0x88,0x28,0x68,0x0f,0x1b,0xe2,0x1a,0xa5,0x9a,0x30,0x01,0x38,0xe8,0xb3,0x0d,0xee,0xc3,0x13,0x04,0x11,0x39,0xfb,0x7d,0x79,0x71,0x1b,0x3b,0x09,0x11,0x80,0xce,0xb0,0x01,0xc7,0x03,0x56,0x6a,0x49,0x82,0x18,0xa7,0xf5,0xbc,0xcb,0x5d,0x18,0x97,0x94,0xe7,0x42,0x22,0x1e,0xfe,0x7d,0x6f,0x1e,0xa5,0x64,0x24,0x88,0x09,0xd0,0xaf,0x68,0xe3,0x92,0x53,0x30,0xee,0x02,0x70,0xd8,0x6f,0x83,0x8b,0x4c,0x7f,0x82,0x98,0x30,0x1f,0xf9,0x6c,0x70,0xc7,0x78,0xfb,0x3c,0xae,0x02,0xd0,0xaf,0x68,0x71,0xc4,0x9f,0x43,0x2d,0x47,0x10,0xb1,0xb2,0xa6,0x3d,0xf9,0xe9,0x23,0x0,0x7b,0x3d,0xf9,0x74,0x55,0x13,0x41,0xc4,0x90,0x8e,0xb0,0x21,0xa6,0xf9,0x0c,0xe3,0x26,0x0,0x27,0x03,0x16,0x3a,0x67,0x4f,0x10,0x71,0x60,0x9f,0x37,0x2f,0x66,0x01,0x42,0x71,0x11,0x80,0xa0,0x2a,0xe0,0xa0,0x3f,0x97,0x5a,0x8a,0x20,0xe2,0x31,0xbe,0xb8,0x18,0xb3,0x04,0x22,0x71,0x11,0x0,0x9d,0xa0,0xc2,0x2a,0xd0,0x9d,0x6c,0x04,0x11,0x2f,0x0a,0xa5,0x60,0x6a,0x2f,0x01,0x2e,0x33,0xf7,0x26,0xf4,0x06,0x16,0x82,0xc8,0x16,0x4a,0x35,0x7e,0x4c,0xd6,0x79,0x52,0x5b,0x0,0x6c,0x62,0x08,0xb3,0xf4,0x4e,0x6a,0x2d,0x82,0x88,0x21,0x1a,0xa8,0x58,0x62,0xee,0x8d,0xd9,0xf7,0xc5,0x75,0x17,0x60,0x8e,0xd1,0x41,0xd7,0x33,0x13,0x44,0x8c,0xc7,0x94,0x49,0x90,0xd3,0x43,0x0,0x04,0x70,0x5c,0x6a,0xea,0xa3,0x8d,0x40,0x82,0x88,0x01,0xb9,0x62,0x08,0x33,0x62,0x7c,0xb1,0x68,0xdc,0x23,0x01,0x4b,0x35,0x7e,0x4c,0xd5,0xbb,0xa9,0xf5,0x08,0x62,0x02,0x88,0x8c,0xe3,0x72,0x4b,0x37,0x84,0x18,0x07,0xd5,0x27,0xe4,0x30,0xd0,0x25,0xc6,0x3e,0x58,0x68,0x57,0x80,0x20,0xc6,0xcd,0x5c,0x83,0x33,0x2e,0xcb,0xe9,0x84,0x08,0x80,0xc4,0x38,0x96,0x9a,0x7b,0x0,0x3a,0x12,0x44,0x10,0x51,0x53,0x20,0x05,0x51,0x67,0x70,0xc4,0x69,0x99,0x9e,0x20,0x8a,0x34,0x41,0xcc,0xa0,0xa5,0x0,0x41,0x44,0x6d,0xfa,0x2f,0x35,0xf7,0xc4,0xcd,0x8f,0x96,0xd0,0x94,0x60,0xf3,0x4c,0x0e,0x58,0x62,0xe8,0xc1,0x24,0x88,0x4c,0x67,0x8e,0x21,0xbe,0x3b,0x69,0x09,0x15,0x0,0x0d,0x54,0x5c,0x61,0xb1,0x53,0x80,0x10,0x41,0x44,0x40,0x89,0x26,0x80,0xd9,0x86,0xf8,0xc6,0xd2,0x24,0x3c,0x2b,0x70,0x9e,0x14,0xc2,0xbc,0x38,0xad,0x67,0x08,0x22,0x53,0xd0,0x09,0x2a,0x96,0x9b,0xbb,0xe3,0x5e,0x4e,0x52,0xee,0x05,0x98,0x65,0x70,0xa0,0x44,0x13,0xa0,0x56,0x26,0x88,0x11,0x58,0x62,0xec,0x81,0x41,0x50,0x32,0x53,0x0,0x0,0x60,0xb9,0xb9,0x1b,0xba,0xcf,0xdc,0xbe,0x4a,0x10,0xc4,0x0,0x53,0x74,0x6e,0x54,0xea,0x7c,0x09,0x29,0x2b,0x69,0x02,0x60,0x10,0x14,0x2c,0x32,0xf5,0x52,0x6b,0x13,0xc4,0x67,0xc8,0x11,0xc3,0x58,0x68,0xea,0x4b,0x58,0x79,0x49,0xbd,0x1e,0x7c,0x92,0xce,0x8b,0x99,0x06,0x17,0xb5,0x3a,0x41,0x0,0x90,0x98,0x8a,0x95,0x16,0x3b,0x34,0x8c,0x67,0x87,0x0,0x0,0xc0,0x02,0x63,0x3f,0x8a,0x34,0x41,0x6a,0x7d,0x82,0xd6,0xfd,0xe6,0x3e,0xe4,0x24,0xf8,0xf0,0x5c,0xd2,0x05,0x40,0x0,0x3f,0xef,0x0f,0x50,0xa8,0x07,0x10,0x59,0x4b,0xad,0xde,0x83,0x49,0x5a,0x4f,0x12,0xc6,0x5f,0x0a,0x60,0x12,0x64,0x2c,0xb5,0xf4,0x82,0x42,0x85,0x89,0x6c,0xc4,0x26,0x86,0xb0,0xc8,0x98,0x1c,0x7f,0x98,0x90,0x2a,0x95,0x50,0xa1,0xf1,0xa5,0xce,0xc3,0x10,0x44,0x02,0x29,0xd3,0x06,0x20,0x31,0x9e,0xdd,0x02,0x40,0x10,0x04,0x09,0x0,0x41,0x10,0x09,0x44,0xa2,0x2a,0x88,0x1e,0x93,0x4e,0x42,0x65,0x9e,0x11,0x15,0xb9,0x46,0x68,0xa5,0x4f,0x35,0x54,0x51,0x39,0x3a,0x9d,0x7e,0x9c,0xed,0xf3,0xa1,0xdf,0x1b,0xa2,0x8a,0x4a,0x10,0x16,0xbd,0x06,0x55,0xf9,0x46,0x94,0xd9,0x0c,0xd0,0x88,0x9f,0xb6,0x87,0xac,0xaa,0xe8,0x70,0x04,0xd0,0xd2,0xeb,0x85,0xcb,0x4f,0xf9,0x28,0x48,0x0,0x26,0xc0,0xd4,0x62,0x0b,0x56,0xce,0x28,0xc2,0x82,0xea,0x5c,0x4c,0x2e,0x34,0x8f,0x79,0x3c,0xb3,0xcb,0x15,0xc0,0xc1,0x96,0x7e,0xec,0x6a,0xec,0xc6,0xfe,0x33,0xfd,0x50,0x39,0x39,0x38,0x63,0x05,0x03,0x50,0x57,0x6e,0xc5,0x8a,0xe9,0x45,0x58,0x50,0x65,0x43,0x55,0xfe,0xd8,0x37,0xe5,0xb4,0xf5,0xfb,0x70,0xe0,0xac,0x03,0xef,0x9c,0xb0,0xe3,0xd0,0x39,0x07,0xb9,0x9b,0x49,0x0,0x22,0xa8,0x1c,0x81,0x61,0xe5,0x8c,0x62,0x7c,0xe5,0xd2,0x0a,0xd4,0x14,0x9a,0xa3,0xfa,0x6c,0x71,0x8e,0x1e,0xd7,0xcf,0x29,0xc5,0xf5,0x73,0x4a,0xd1,0xeb,0x09,0xe2,0xb9,0x83,0xed,0x78,0xfe,0x60,0x1b,0x3c,0x41,0x3a,0x0e,0x3d,0x5e,0xb4,0x92,0x80,0xeb,0x66,0x95,0xe0,0xcb,0x0b,0x2b,0x50,0x9e,0x6b,0x8c,0xea,0xb3,0xe5,0xb9,0x46,0x94,0xe7,0x1a,0x71,0xe3,0xbc,0x32,0x74,0x3a,0x03,0xf8,0xcb,0x87,0xad,0x78,0xe9,0x50,0x07,0x02,0x61,0x85,0x04,0x80,0x18,0xca,0xe2,0x9a,0x7c,0xfc,0xfd,0xd5,0x53,0x50,0x6a,0x35,0x4c,0xf8,0xbb,0xf2,0xcd,0x3a,0xdc,0x71,0xf9,0x64,0x7c,0x6d,0x51,0x25,0x9e,0x7c,0xf7,0x0c,0x9e,0x3b,0xd8,0x06,0x45,0xa5,0x39,0x28,0x1a,0x56,0xce,0x28,0xc2,0xdf,0xad,0x9c,0x82,0x3c,0x93,0x76,0xc2,0xdf,0x55,0x62,0xd5,0xe3,0x5b,0x57,0x4d,0xc1,0x37,0x2e,0xab,0xc2,0xa6,0x77,0x4e,0xe3,0xb5,0x23,0x9d,0x59,0x6b,0x11,0x90,0x0,0x5c,0x84,0x51,0x2b,0xe1,0xee,0x6b,0xa7,0xe2,0xaa,0x99,0xc5,0x71,0xf1,0x1d,0x7c,0xeb,0xaa,0x29,0xb8,0xba,0xae,0x18,0x8f,0xbc,0x70,0x14,0x6d,0xfd,0x7e,0xaa,0xf0,0x31,0xb0,0x19,0xb5,0xb8,0xef,0xf3,0xd3,0xb1,0x68,0x72,0x7e,0x9c,0xbe,0x7b,0x06,0xae,0xa9,0x2b,0xc6,0xbf,0xef,0x38,0x8e,0x5e,0x4f,0xf6,0x45,0xa4,0xd2,0x2e,0xc0,0x45,0x66,0xe2,0xe3,0x6b,0x16,0xc6,0x65,0xf0,0x7f,0x96,0x69,0xc5,0x16,0x3c,0xb6,0xfa,0x52,0x2c,0xa9,0xcd,0xa7,0x4a,0x1f,0xa3,0x9e,0x7e,0xb5,0xf6,0xd2,0xb8,0x0c,0xfe,0xcf,0x32,0xbf,0x2a,0x17,0xbf,0x5a,0x7b,0x29,0x66,0x95,0x5b,0x49,0x0,0xb2,0x95,0xda,0x22,0x33,0x7e,0xf6,0x8d,0xf9,0x28,0xb5,0x19,0x12,0x52,0x9e,0x41,0x2b,0xe2,0x07,0x5f,0x9a,0x8d,0x6b,0xea,0x8a,0xa9,0xf2,0x87,0x61,0x4e,0x85,0x0d,0x8f,0xac,0x9a,0x1f,0x13,0x93,0x3f,0x12,0xac,0x06,0x0d,0x7e,0x72,0xcb,0x5c,0x2c,0x9a,0x9c,0x47,0x02,0x90,0x8d,0x83,0xff,0xff,0xae,0x9a,0x0f,0x9b,0x51,0x9b,0xd0,0x72,0x45,0x81,0xe1,0x7b,0x37,0xcc,0xc4,0xf5,0xb3,0x4b,0xa9,0x11,0x2e,0x1a,0xfc,0x3f,0xbe,0x65,0x2e,0x0c,0x5a,0x31,0xa1,0xe5,0xea,0x34,0x22,0x1e,0xbc,0x79,0x4e,0xdc,0x2d,0x0e,0x12,0x80,0x14,0x22,0xc7,0xa0,0xc1,0x83,0x37,0xcd,0x86,0x49,0x37,0x71,0x77,0x88,0xc7,0xe3,0x81,0xa2,0x44,0xe7,0x55,0x66,0x0,0xee,0xbe,0x76,0x2a,0x66,0x94,0xe6,0xd0,0xc8,0x07,0x50,0x94,0xa3,0xc7,0x0f,0x6f,0x9a,0x75,0x41,0x7c,0x45,0x24,0x70,0xce,0xe1,0x76,0xbb,0xc1,0x27,0xb8,0xdd,0x2a,0x09,0x0c,0x0f,0xdc,0x58,0x87,0x8a,0x3c,0x63,0x56,0xd4,0x77,0x56,0x3b,0x01,0x19,0x80,0xef,0x5e,0x3f,0x1d,0x45,0x39,0xfa,0xa8,0x3f,0xeb,0x74,0x3a,0xf1,0xde,0x7b,0x7b,0xb1,0xe7,0xdd,0x3d,0x68,0x6e,0x6e,0x86,0xdd,0x6e,0x47,0x30,0x18,0x84,0x28,0x8a,0xc8,0xcf,0xcf,0x43,0x79,0x79,0x05,0x16,0x2d,0x5e,0x84,0xa5,0x4b,0x97,0xa2,0xba,0xba,0x6a,0xf4,0x46,0x10,0x05,0xdc,0x7f,0x63,0x1d,0xbe,0xbd,0x75,0x5f,0x56,0x6f,0x13,0x8a,0x02,0xc3,0xbf,0xfc,0xcd,0x4c,0x58,0xf4,0x9a,0x31,0xdf,0x6b,0xb7,0xdb,0xb1,0x67,0xcf,0x1e,0xec,0xd9,0xf3,0x1e,0xce,0x9d,0x3d,0x87,0xee,0xee,0x6e,0xc8,0xb2,0x0c,0x49,0x92,0x50,0x54,0x54,0x84,0xca,0xca,0x4a,0x2c,0x5d,0xba,0x04,0x4b,0x96,0x2e,0x45,0x51,0x51,0x61,0xd4,0xcb,0xb3,0xfb,0xff,0xa6,0x0e,0xf7,0xfe,0xfe,0x43,0x84,0x15,0x95,0x04,0x20,0x53,0xf9,0xdc,0xec,0x12,0x2c,0xa9,0x2d,0x88,0xea,0x33,0x76,0xbb,0x1d,0x5b,0x36,0x6f,0xc5,0xcb,0x2f,0xbf,0x0c,0x55,0x1d,0xda,0x39,0x14,0x45,0x81,0xdd,0xde,0x0d,0xbb,0xbd,0x1b,0x07,0x0e,0x1c,0xc0,0xaf,0x37,0xfe,0x1a,0x75,0xb3,0xea,0x70,0xd7,0x5d,0x77,0x62,0xde,0xbc,0x79,0x23,0x7e,0x6f,0x71,0x8e,0x1e,0x77,0xad,0xac,0xc5,0x2f,0x5e,0x3e,0x91,0xb5,0xed,0xf1,0xd5,0x45,0x95,0xa8,0x2b,0x1b,0xdd,0x11,0x77,0xfa,0x74,0x33,0x36,0x6d,0xda,0x84,0x3d,0xef,0xee,0x19,0xf6,0xdf,0x65,0x59,0x46,0x7b,0x7b,0x3b,0xda,0xdb,0xdb,0xb1,0x77,0xef,0x5e,0xe0,0x97,0xff,0x81,0xe5,0xcb,0x97,0x63,0xdd,0xfa,0x7a,0x4c,0x9e,0x3c,0x39,0xaa,0x65,0xe1,0x6d,0x4b,0xab,0xb1,0x65,0x57,0x33,0x2d,0x01,0x32,0x11,0xa3,0x56,0x42,0xfd,0x15,0x35,0x51,0x99,0x98,0xcf,0x3c,0xf3,0x07,0xac,0x59,0xbd,0x16,0x3b,0x76,0xec,0x18,0x76,0xf0,0x8f,0xc4,0xd1,0x23,0x47,0xf1,0x9d,0x7b,0xbf,0x8b,0x1f,0xfe,0xe0,0x87,0xf0,0x7a,0xbd,0x23,0xbe,0xef,0xba,0x59,0x25,0x98,0x56,0x62,0xc9,0xca,0xf6,0xc8,0x37,0xeb,0xf0,0x8d,0xcb,0xaa,0x47,0xfc,0x77,0x59,0x96,0xf1,0x1f,0xbf,0x7c,0x14,0x77,0xdd,0x79,0xd7,0x88,0x83,0x7f,0x24,0x76,0xef,0xde,0x8d,0x3b,0xd7,0xdf,0x85,0xff,0xfc,0xcf,0xc7,0x20,0xcb,0x91,0x5b,0x58,0xb7,0x2c,0xac,0x8c,0x49,0x1c,0x08,0x09,0x40,0x0a,0x72,0xd3,0x25,0xe5,0xc8,0x8d,0xd0,0xe9,0x17,0x08,0x04,0xf0,0xd0,0x86,0x87,0xf1,0x9b,0x5f,0xff,0x06,0xe1,0xf0,0xf8,0x63,0xca,0x77,0xed,0xda,0x8d,0x6f,0xfe,0xdd,0xb7,0xd0,0xd2,0xd2,0x32,0xfc,0x92,0x84,0x31,0xdc,0xbe,0x7c,0x72,0x56,0xb6,0xc7,0xd7,0x17,0x57,0xc1,0xa0,0x19,0xde,0xe9,0xd7,0xd7,0xd7,0x87,0x7b,0xff,0xf1,0x3b,0xd8,0xbe,0x7d,0xfb,0xb8,0xd7,0xf8,0x9c,0x73,0x3c,0xfb,0xe7,0x67,0x71,0xef,0xbd,0xdf,0x41,0x5f,0x5f,0x64,0x39,0xf7,0xb4,0x92,0x80,0xdb,0x96,0x56,0x93,0x0,0x64,0xdc,0xba,0x47,0x14,0xf0,0xa5,0xf9,0xe5,0x11,0x77,0x9c,0x9f,0xfc,0xf8,0x27,0x78,0xe7,0x9d,0x77,0x62,0x52,0x76,0x7b,0x7b,0x3b,0xbe,0x77,0xdf,0xff,0x46,0x6f,0xef,0xf0,0x09,0x20,0x2e,0x99,0x94,0x87,0x49,0x05,0xa6,0x84,0xd4,0x03,0x63,0xc0,0xd5,0x33,0x8b,0xf1,0xe3,0x5b,0xe6,0xe2,0x7f,0xbe,0xbd,0x1c,0x2f,0xdd,0xb7,0x12,0xcf,0xde,0x7d,0x05,0xfe,0xfd,0xeb,0xf3,0xf1,0xc5,0xf9,0xe5,0x17,0x1c,0xac,0x89,0x27,0x66,0xbd,0x84,0xeb,0x66,0x97,0x0c,0xfb,0x6f,0xc1,0x60,0x10,0xf7,0xff,0xcb,0xfd,0x38,0x7a,0xf4,0x68,0x4c,0xca,0x3a,0x7a,0xe4,0x28,0x1e,0xb8,0xff,0xfb,0x08,0x06,0x23,0x0b,0xfa,0xb9,0x6a,0x46,0x11,0xf2,0xcd,0x3a,0x12,0x80,0x4c,0x62,0x49,0x4d,0x3e,0x72,0x23,0xdc,0x5f,0xfe,0xed,0x6f,0x37,0x61,0xd7,0xae,0xdd,0x31,0x2d,0xbf,0xb7,0xb7,0x17,0x0f,0xdc,0xff,0xc0,0xb0,0x9d,0x90,0x01,0xb8,0x61,0x4e,0xfc,0xb7,0x05,0x0b,0x2c,0x3a,0xfc,0xec,0x1b,0x0b,0xf0,0x4f,0x5f,0x98,0x89,0x85,0x93,0xf2,0x06,0x1d,0x6f,0x06,0xad,0x88,0x39,0x15,0x36,0x7c,0xfb,0x9a,0xa9,0xf8,0xd5,0xda,0x4b,0x31,0x39,0xca,0x33,0x10,0xe3,0xe1,0xaa,0x19,0xc5,0xd0,0x0f,0x33,0xfb,0x73,0x95,0xe3,0x47,0xff,0xfa,0x63,0x34,0x36,0x36,0xc5,0xb4,0xbc,0x93,0x27,0x4f,0xe2,0x27,0x3f,0xfe,0x69,0x44,0xd6,0x84,0x24,0x0a,0xb8,0x76,0x56,0x31,0x09,0x40,0x26,0x71,0xe5,0x8c,0xa2,0x88,0x67,0x8b,0x3f,0x3c,0xf3,0x87,0xb8,0x3c,0x43,0x63,0x63,0x13,0x9e,0x7e,0xfa,0xf7,0xc3,0xfe,0xdb,0x15,0xd3,0x8b,0x10,0xcf,0xdb,0xd3,0xcc,0x3a,0x09,0x3f,0xfd,0xea,0xbc,0x31,0x1d,0x6e,0x95,0x79,0x46,0xfc,0xdb,0xd7,0xe6,0xa1,0xc4,0xaa,0x8f,0x6f,0x7b,0x4c,0x1f,0xbe,0x3d,0x5e,0x79,0xf5,0x55,0xec,0xde,0xbd,0x3b,0x2e,0x65,0xee,0xdc,0xb9,0x13,0x6f,0xbc,0xf1,0x46,0x44,0xef,0x5d,0x31,0xad,0x88,0x04,0x20,0x53,0x60,0x0c,0x98,0x5f,0x65,0x8b,0xc8,0xf4,0x7f,0xec,0xb1,0xc7,0x27,0xbc,0xaf,0x3c,0x1a,0xdb,0xfe,0x7b,0x1b,0xec,0x76,0xfb,0x90,0xd7,0xf3,0x4c,0x5a,0x54,0xc7,0x71,0x19,0xb0,0x7a,0xd9,0x24,0x54,0x46,0xb8,0xcf,0x6d,0x35,0x68,0xf0,0xed,0x6b,0xa6,0xc6,0xed,0x59,0x0c,0x5a,0x11,0x33,0xcb,0x72,0x86,0xf5,0xbb,0xfc,0xf6,0x37,0xbf,0x8d,0x6b,0x5f,0xd8,0xf8,0xc4,0xaf,0x23,0x5a,0x0a,0xd4,0x14,0x99,0x23,0xf6,0x17,0x91,0x0,0xa4,0x38,0x55,0x79,0xa6,0x88,0xf6,0x99,0x3f,0xf8,0x60,0x1f,0x8e,0x1f,0x3f,0x1e,0xd7,0x67,0x09,0x85,0x42,0x23,0x5a,0x18,0xb3,0xe3,0x14,0x97,0xae,0x95,0x84,0xa8,0x23,0x0f,0x2f,0x9d,0x9c,0x1f,0x37,0x6f,0xf8,0xf4,0x92,0x1c,0x88,0xc3,0xdc,0x16,0xfb,0xc2,0x0b,0x2f,0x8e,0xe8,0x27,0x89,0x15,0x3d,0x3d,0x3d,0xd8,0xb1,0xe3,0xa5,0xb1,0x27,0x0d,0x60,0x58,0x91,0x22,0x01,0x48,0x43,0x26,0x15,0x46,0x36,0xb3,0xbe,0xf6,0xea,0xab,0x09,0x79,0x9e,0xd7,0x5f,0x7f,0x63,0xd8,0xe8,0xc1,0x78,0x39,0x02,0x2b,0xf3,0x8c,0x51,0x87,0xd8,0x32,0x0,0xd3,0x4a,0xe3,0xb3,0x3d,0x39,0x79,0x84,0xf6,0x78,0xf5,0x95,0xc4,0xd4,0x7f,0xa4,0xe5,0x24,0xca,0x31,0x4b,0x02,0x10,0x67,0xca,0x22,0x38,0xec,0x23,0xcb,0x32,0xf6,0xec,0x79,0x2f,0x21,0xcf,0xe3,0x76,0xbb,0xf1,0xf1,0xc7,0x1f,0x0f,0x7d,0xce,0xdc,0xf8,0x84,0xa2,0x9a,0xc7,0x19,0xf2,0x1c,0x89,0xd5,0x14,0xab,0xf6,0xb0,0xdb,0xed,0x68,0x6c,0x6c,0x4c,0x48,0xfd,0x1f,0x3f,0x7e,0x1c,0xdd,0xdd,0x63,0xdf,0xc2,0x5b,0x96,0x6b,0x20,0x01,0xc8,0x04,0x22,0x19,0x0,0x67,0xce,0x9c,0x19,0x35,0x60,0x27,0xd6,0x1c,0x3e,0x74,0x78,0x98,0x01,0x17,0x9f,0x20,0x4d,0xc6,0xc6,0xe7,0x5e,0x8c,0x97,0x53,0x72,0xb8,0x33,0x18,0x87,0x0f,0x1f,0x89,0xab,0xef,0xe5,0xb3,0x70,0xce,0x71,0xf4,0xe8,0xb1,0xa4,0x09,0x20,0x09,0x40,0x82,0x89,0xc4,0xfc,0xed,0xe9,0xe9,0x49,0xe8,0x33,0x0d,0x57,0xde,0x48,0x41,0x31,0x19,0xd7,0x1e,0xc3,0xfc,0xce,0x78,0xaf,0xfd,0x87,0xd4,0x7f,0x04,0x16,0x40,0xa6,0xb6,0x47,0xd6,0x09,0x40,0x58,0x19,0x7b,0x66,0xe9,0xed,0xed,0x4b,0x6c,0x07,0x1c,0xa6,0xc3,0xcb,0x59,0x92,0x32,0x6c,0xb8,0xdf,0x99,0x68,0x01,0x88,0xa4,0xbc,0x4c,0x3d,0x14,0x94,0x75,0x02,0x10,0x51,0x12,0xc8,0x44,0x67,0xf0,0x1d,0xa6,0x3c,0x5f,0x48,0xce,0xde,0xf6,0x48,0x70,0xfd,0x47,0x52,0x9a,0x3f,0x43,0x93,0x87,0x66,0x9d,0x0,0xf4,0xb8,0xc7,0xde,0xf7,0x2d,0x28,0x2c,0x48,0xe8,0x33,0x15,0x14,0x0e,0x3d,0xae,0xda,0xed,0xce,0x8e,0xfc,0x74,0xc3,0xfd,0xce,0xfc,0x82,0x04,0xd7,0x7f,0x04,0xe5,0x75,0xbb,0x82,0x24,0x0,0x99,0xc0,0xb9,0x3e,0xdf,0x98,0xef,0xc9,0xcf,0x4f,0x6c,0x46,0x98,0x82,0x61,0xca,0x8b,0xe4,0x39,0x33,0xb5,0x3d,0x12,0x5e,0xff,0x11,0x08,0x40,0x6b,0xbf,0x8f,0x04,0x20,0x13,0x38,0x65,0xf7,0x8c,0xe9,0x61,0xae,0xa9,0xa9,0x81,0xd5,0x9a,0xb8,0x04,0x91,0xf3,0xe6,0x0f,0xcd,0x13,0xd0,0xd4,0xe5,0xc9,0x8a,0xf6,0x68,0xea,0x72,0x0f,0xad,0x8f,0x79,0x73,0xc7,0xbd,0x5b,0x11,0x2d,0x8c,0x31,0xcc,0x9b,0x37,0x77,0xcc,0xf7,0x35,0x0e,0xf3,0x9c,0x24,0x0,0x69,0x88,0x3b,0x10,0xc6,0x29,0xfb,0xe8,0x83,0x4b,0x10,0x04,0x2c,0xbe,0x6c,0x71,0x42,0x9e,0xc7,0x6a,0xb5,0x62,0xf6,0xec,0xd9,0x17,0xbc,0xa6,0x72,0x8e,0x43,0xad,0x8e,0xac,0xb1,0x0,0x2e,0x4e,0xc7,0x9d,0x9f,0x9f,0x8f,0x69,0xd3,0xa7,0x25,0xa4,0xfc,0x99,0x75,0x33,0x61,0xb3,0x8d,0x1e,0x1a,0xee,0x09,0xc8,0x19,0x2b,0xc8,0x59,0x79,0x18,0xe8,0x83,0xe6,0xb1,0xbd,0xfc,0x2b,0x56,0x5c,0x91,0x90,0x67,0xb9,0xfc,0xf2,0xe5,0x10,0x84,0x0b,0x9b,0xe1,0x48,0x9b,0x13,0xde,0x2c,0x4a,0x0d,0x36,0x5c,0x7b,0xac,0x58,0xb1,0x22,0x21,0x65,0x47,0x52,0xce,0xbe,0x33,0x7d,0x19,0x7b,0xb5,0x5b,0x56,0x0a,0xc0,0x4b,0x87,0x3a,0xc6,0xf4,0xfc,0x2e,0x5f,0xbe,0x7c,0xc8,0xcc,0x1c,0x6b,0x74,0x3a,0x1d,0x6e,0xbf,0xe3,0xf6,0x21,0xaf,0xbf,0x72,0xb8,0x33,0xab,0xda,0xe3,0xe5,0xc3,0x1d,0x43,0x5e,0xfb,0xca,0x57,0xbe,0x1c,0x75,0x2e,0xbf,0x68,0x29,0x2a,0x2a,0xc2,0xcd,0x37,0xdf,0x34,0xe6,0xfb,0x5e,0x3d,0x92,0xb9,0xed,0x91,0x95,0x02,0xd0,0xe5,0x0a,0xe0,0xc3,0x33,0x63,0x5b,0x01,0xeb,0xd6,0xd5,0xc7,0xf5,0x39,0x6e,0xba,0xe9,0x4b,0x43,0x1c,0x50,0x2e,0x7f,0x18,0x3b,0x4f,0x76,0x67,0x55,0x7b,0x1c,0x6f,0x77,0x0d,0x59,0x96,0xe9,0x74,0x3a,0xdc,0x76,0xdb,0x6d,0x71,0x2d,0x77,0xed,0xed,0x6b,0xa1,0xd5,0x8e,0x7e,0xca,0xaf,0xad,0xdf,0x8f,0x03,0x2d,0xfd,0x24,0x0,0x99,0xc6,0x1f,0xf6,0x9e,0x1d,0xf3,0x3d,0xf3,0x17,0xcc,0xc7,0x9a,0xb5,0x6b,0xe2,0x52,0x7e,0xdd,0xac,0x3a,0xac,0x5b,0xbf,0x6e,0xc8,0xeb,0xcf,0xee,0x6f,0xcd,0xba,0x0b,0x2b,0x39,0x80,0x6d,0xef,0x0f,0x6d,0x8f,0x2f,0x7e,0xe9,0x8b,0xb8,0xfa,0x9a,0xab,0xe3,0x52,0xe6,0xb5,0xd7,0x5e,0x83,0x1b,0x6e,0xf8,0xfc,0x98,0xef,0xdb,0xf6,0xfe,0xd9,0x8c,0xbe,0xd9,0x39,0x6b,0x05,0xe0,0x50,0xab,0x23,0xa2,0x99,0xf6,0x8e,0xdb,0x6f,0xc7,0xb2,0x65,0xcb,0x62,0x5a,0x76,0x7e,0x7e,0x3e,0x36,0x6c,0x78,0x70,0xc8,0xec,0xd3,0xe1,0xf4,0xe3,0x4f,0xfb,0xcf,0x65,0x65,0x7b,0xbc,0x73,0xc2,0x8e,0x8f,0xce,0x5d,0xe8,0xf8,0x64,0x8c,0xe1,0xbe,0xfb,0xbe,0x8b,0xda,0xda,0xda,0x98,0x96,0x35,0x75,0xea,0x54,0xdc,0xf7,0xbd,0xfb,0xc6,0xdc,0x69,0x38,0xde,0xe1,0xc2,0x2b,0x47,0x3a,0x32,0xba,0xde,0xb3,0xfa,0x62,0x90,0xdf,0xbc,0x7d,0x6a,0xcc,0x88,0x3b,0x26,0x30,0x3c,0xf4,0xf0,0x86,0x88,0xd6,0x8a,0x91,0x30,0x6d,0xda,0x34,0xfc,0xd7,0x13,0xbf,0x1a,0x76,0xef,0x79,0xe3,0x9b,0x4d,0x08,0xc9,0x6a,0x56,0xb6,0x05,0x07,0xf0,0xc4,0x9b,0x4d,0x90,0x2f,0x0a,0xb9,0x35,0x18,0x0c,0xf8,0x8f,0x47,0x7f,0x89,0xa5,0x4b,0x97,0xc4,0xa4,0x9c,0xa5,0xcb,0x96,0xe2,0x17,0xbf,0xfc,0x39,0x74,0xba,0xd1,0xf3,0xfc,0xa9,0x9c,0xe3,0x89,0x37,0x9b,0xc0,0x33,0x3c,0x22,0x3b,0xab,0x05,0xc0,0xee,0x0a,0xe0,0xe7,0x2f,0x8d,0x9d,0x87,0x5f,0x14,0x45,0xdc,0x7d,0xcf,0xdd,0xb8,0xeb,0xae,0x3b,0x21,0x49,0xe3,0x3f,0xa5,0xb7,0x7c,0xf9,0x72,0xfc,0xec,0xe7,0xff,0x6f,0xd8,0xc1,0xbf,0xfd,0xc3,0x56,0xbc,0x77,0xaa,0x37,0x9b,0x9b,0x03,0xcd,0xdd,0x1e,0xfc,0xfa,0xed,0x53,0x43,0x5e,0x37,0x1a,0x8d,0x78,0xe8,0xe1,0x87,0x70,0xd3,0x4d,0x37,0x8d,0xff,0x34,0x23,0x63,0xb8,0xf9,0xcb,0x37,0xe3,0xa1,0x87,0x36,0xc0,0x68,0x1c,0xfb,0xa8,0xf5,0x96,0x5d,0xcd,0x38,0xde,0xe1,0xca,0xf8,0x3a,0xcf,0xfa,0xab,0xc1,0x76,0x35,0x76,0x63,0xfb,0x87,0xad,0x11,0x75,0xa0,0x5b,0x6f,0xbb,0x15,0xbf,0x7f,0xe6,0x69,0xdc,0x78,0xe3,0x8d,0x43,0xb6,0xee,0x46,0x63,0xd6,0xac,0x59,0x78,0xec,0xf1,0xff,0xc4,0xbf,0xfe,0xe8,0x61,0x98,0x4c,0x43,0x13,0x4b,0x1c,0x6b,0x77,0x61,0xd3,0xce,0xd3,0x20,0x80,0xe7,0x0e,0xb4,0xe1,0xed,0x13,0x43,0xd3,0xa4,0x49,0x92,0x84,0x7f,0xbc,0xf7,0x1e,0x34,0x6c,0xfe,0x1d,0xae,0x5c,0x79,0x65,0x54,0xdf,0x79,0xe5,0xca,0x2b,0xb1,0x79,0x4b,0x03,0xee,0xb9,0xe7,0xee,0x88,0x04,0x7c,0xef,0xe9,0x5e,0xfc,0xcf,0x07,0xd9,0xb1,0x14,0x93,0xa8,0xcb,0x01,0x4f,0xbc,0xd5,0x04,0x93,0x5e,0xc2,0xb5,0x75,0x25,0x63,0xbe,0xb7,0xa0,0xa0,0x0,0xdf,0xbd,0xef,0x3b,0xb8,0xf5,0xb6,0x6f,0xe0,0xdd,0xdd,0xef,0xe2,0xdd,0x77,0xf7,0xe0,0xec,0xd9,0xb3,0x70,0x38,0x1c,0x83,0x99,0x7d,0x72,0x72,0x72,0x50,0x5c,0x5c,0x84,0x4b,0x17,0x2d,0xc2,0xb2,0x65,0x4b,0x51,0x37,0xb3,0x0e,0x4c,0x18,0x7e,0xe6,0x3a,0xdd,0xed,0xc1,0x0f,0x9e,0xfd,0x38,0x6b,0x4d,0xff,0xe1,0x96,0x02,0xff,0xbe,0xe3,0x38,0x8c,0x5a,0x71,0xd8,0x4b,0x3a,0xab,0xaa,0xaa,0xf0,0xe0,0x83,0x3f,0xc4,0xa9,0xd5,0xa7,0xb0,0x67,0xcf,0x7b,0x78,0x6f,0xcf,0x7b,0xe8,0xe8,0xe8,0x80,0xc3,0xe1,0x0,0xe7,0x1c,0x8c,0x31,0xd8,0x6c,0x36,0x94,0x96,0x95,0x62,0xe9,0xd2,0xa5,0x58,0xba,0x74,0x09,0x6a,0x6a,0x22,0xbf,0x0,0xe6,0xe3,0x73,0x0e,0xfc,0xf8,0xb9,0x23,0x19,0xed,0xf8,0x23,0x01,0xb8,0xb8,0xd3,0x71,0xe0,0x67,0x3b,0x8e,0xc3,0xe9,0x0b,0xe3,0x96,0x4b,0x2b,0x23,0xfa,0x4c,0x69,0x69,0x29,0x6e,0xf9,0xea,0x2d,0xb8,0xe5,0xab,0xb7,0x9c,0xff,0x0e,0x0e,0x8f,0xc7,0x03,0x83,0xc1,0x10,0xf1,0x32,0xe1,0x40,0x4b,0x3f,0x1e,0xde,0x7e,0x38,0x63,0x4f,0x9a,0x8d,0x17,0x59,0x51,0xf1,0xe0,0xb3,0x87,0x71,0xef,0x75,0xd3,0x47,0xbc,0x2f,0xa0,0xb6,0xb6,0x16,0xb5,0xb5,0xb5,0x58,0xbd,0xfa,0x6f,0x01,0x0c,0x5c,0xc9,0xe6,0xf3,0xf9,0x60,0x32,0x99,0xa2,0xb2,0xce,0x3e,0xcb,0xce,0x93,0xdd,0x78,0xe4,0xc5,0x63,0x43,0xfc,0x10,0x24,0x0,0x59,0x32,0xf3,0xfc,0xf6,0xed,0x53,0xe8,0xf3,0x86,0x50,0x7f,0xf9,0x64,0x48,0x51,0x5e,0x8a,0xc1,0x18,0x83,0xc5,0x12,0x79,0xde,0xbc,0x57,0x8f,0x74,0xe2,0xf1,0xd7,0x1b,0x13,0xbe,0xe5,0x37,0x91,0x9b,0x75,0x12,0x89,0xca,0x39,0x7e,0xf9,0xca,0x09,0xf4,0x79,0x83,0xf8,0xfa,0xe2,0xaa,0x31,0xd7,0xfe,0xa2,0x28,0x46,0x55,0xff,0x17,0xb7,0xfd,0xb3,0xfb,0x5b,0xf1,0xbb,0x77,0x4e,0x65,0x4d,0x1e,0x06,0x12,0x80,0x11,0x3a,0xc2,0x9f,0xf6,0x9d,0xc3,0xa1,0x73,0x0e,0xfc,0xe3,0x75,0xd3,0x51,0x5b,0x14,0xfb,0x4b,0x31,0xfa,0xbd,0x21,0x3c,0xf1,0x56,0x13,0xde,0x3e,0x6e,0x4f,0xca,0x6f,0x74,0xfa,0xc7,0x77,0xb5,0x99,0xc3,0x17,0x4e,0xf8,0xb3,0xaa,0x9c,0x63,0xf3,0xae,0x66,0x1c,0x68,0xe9,0xc7,0x3d,0x9f,0x9b,0x8e,0xf2,0x38,0xe4,0xe5,0xeb,0x72,0x05,0xf0,0xd8,0x6b,0x27,0x23,0x0a,0x0f,0x27,0x01,0xc8,0x12,0x4e,0x76,0xb9,0x71,0xcf,0xd3,0xfb,0xf1,0x85,0xb9,0x65,0xf8,0xda,0xa2,0xca,0x71,0x5d,0x1f,0x7e,0x31,0xfe,0x90,0x82,0x17,0x3e,0x6a,0xc7,0x1f,0xf6,0xb6,0x24,0xf5,0x0a,0xf0,0xb3,0xbd,0x3e,0x38,0xfd,0x61,0x58,0x0d,0x9a,0xa8,0x06,0xe2,0x91,0x36,0x67,0xd2,0x9e,0xf9,0xa3,0x73,0x0e,0x7c,0x6b,0xcb,0x07,0xf8,0xf2,0xc2,0x0a,0x7c,0x65,0x61,0x05,0x6c,0x31,0xc8,0xd1,0xef,0xf2,0x87,0xb1,0xfd,0x40,0x1b,0xfe,0xb8,0xef,0x1c,0x82,0x59,0xbc,0x04,0x23,0x01,0x18,0x01,0x45,0xe5,0x78,0xee,0x60,0x1b,0x76,0x7c,0xdc,0x8e,0xcb,0xa7,0x15,0xe2,0xfa,0xd9,0xa5,0x98,0x5f,0x65,0x8b,0x7a,0x1b,0xaa,0xb9,0xdb,0x83,0x57,0x8f,0x74,0xe2,0x95,0xc3,0x9d,0x49,0x1d,0xf8,0x9f,0x1d,0xcc,0x2f,0x7e,0xd4,0x8e,0x5b,0x97,0x44,0x7e,0xe9,0xe5,0xce,0x93,0xdd,0xe8,0xf7,0x85,0x92,0xfa,0xdc,0x61,0x45,0xc5,0xb6,0xf7,0xcf,0xe2,0x2f,0x1f,0xb6,0xe2,0xaa,0x99,0xc5,0xb8,0x6e,0x56,0x09,0xea,0xca,0xad,0x51,0x27,0x2b,0x3d,0xde,0xe1,0xc2,0xab,0x47,0x3a,0xf1,0xfa,0xd1,0xae,0xac,0x8b,0xb8,0x24,0x01,0x18,0x07,0xb2,0xca,0xf1,0xd6,0x71,0x3b,0xde,0x3a,0x6e,0x47,0xae,0x51,0x8b,0x79,0x55,0x36,0xcc,0xae,0xb0,0xa1,0x2a,0xcf,0x88,0x8a,0x3c,0x23,0xcc,0x3a,0x09,0x5a,0x49,0x80,0xac,0x72,0x78,0x83,0x32,0x3a,0x9d,0x7e,0x9c,0xed,0xf5,0xe1,0x78,0x87,0x0b,0x07,0xcf,0xf6,0xa3,0xad,0xdf,0x9f,0x72,0xbf,0xe9,0x99,0xbd,0x2d,0x98,0x5b,0x69,0xc3,0xac,0x08,0x2e,0x1f,0x69,0x77,0xf8,0xf1,0xab,0xd7,0x1b,0x53,0xe6,0xd9,0x43,0xb2,0x8a,0x97,0x0f,0x75,0xe0,0xe5,0x43,0x1d,0x28,0xb0,0xe8,0x30,0xbf,0x32,0x17,0xb3,0xca,0xad,0xa8,0xca,0x37,0xa2,0x2c,0xd7,0x0,0x93,0x76,0xa0,0x3d,0xc2,0x8a,0x0a,0x6f,0x50,0x46,0x87,0x23,0x80,0xb3,0xbd,0x5e,0x1c,0x6d,0x77,0xe1,0xc0,0xd9,0x7e,0xd8,0x5d,0x01,0xea,0xd4,0x24,0x0,0xe3,0x5c,0xbf,0xfb,0x42,0x83,0x62,0x90,0xce,0x84,0x64,0x15,0x3f,0x7c,0xf6,0x10,0xfe,0xf7,0x0d,0x33,0xb0,0xa4,0xb6,0x60,0xd4,0xd9,0xf2,0x47,0xcf,0x1d,0x19,0xb7,0xdf,0x20,0xde,0xf4,0xb8,0x83,0x78,0xed,0x68,0x27,0x5e,0x3b,0xda,0x49,0x9d,0x93,0x04,0x80,0x88,0x06,0x6f,0x50,0xc6,0x86,0xbf,0x1c,0xc6,0x9c,0x0a,0x1b,0xae,0x9d,0x55,0x8c,0xb9,0x15,0x36,0x58,0xf4,0x1a,0xf8,0x42,0x32,0x8e,0x77,0xb8,0xf0,0xc6,0x31,0x3b,0xf6,0x9e,0xee,0x01,0xe7,0x54,0x57,0x24,0x0,0x44,0xc6,0x72,0xa8,0xd5,0x91,0x35,0xd9,0x87,0x88,0xa1,0x08,0x54,0x05,0x04,0x41,0x02,0x90,0x12,0x24,0x2a,0x11,0x24,0x41,0x10,0x29,0x26,0x0,0x4c,0x10,0x20,0x8a,0x64,0x90,0x10,0xd9,0x87,0x28,0x26,0xef,0xda,0xb1,0x94,0xf1,0x01,0x4c,0x9b,0x36,0x0d,0x4f,0xcd,0x5b,0x88,0x3d,0x4d,0x3d,0x78,0xe7,0x64,0x37,0x3e,0x3a,0xdb,0x9f,0x75,0x61,0x99,0x44,0xf6,0x61,0xd0,0x8a,0x98,0x39,0xa9,0x04,0xe8,0xe8,0xce,0x5e,0x01,0xd0,0xe9,0x74,0x98,0x77,0xc9,0x25,0xd0,0x6a,0x35,0xb8,0x7e,0x4e,0x29,0xae,0x9f,0x53,0x8a,0x60,0x58,0xc1,0x81,0xb3,0x0e,0xec,0x3c,0x69,0xc7,0xee,0xc6,0x1e,0x0a,0xda,0x20,0x32,0x06,0x9b,0x51,0x8b,0x2b,0x67,0x14,0x61,0xc5,0xb4,0x42,0xcc,0x2c,0xcb,0x01,0x38,0xc7,0x73,0xcf,0x9e,0x81,0xdb,0xed,0xce,0x4c,0x01,0x50,0xc1,0x20,0x8c,0x92,0x87,0x77,0xee,0xfc,0xf9,0x43,0xd2,0x63,0xe9,0x34,0x22,0x96,0xd4,0xe6,0x63,0x49,0x6d,0x3e,0xbe,0x75,0x55,0x18,0x2f,0x1f,0xea,0xc4,0xe6,0xdd,0xcd,0x59,0x75,0x52,0x8b,0xc8,0xbc,0x81,0x7f,0xd7,0x95,0xb5,0xb8,0x62,0x5a,0x21,0xb4,0xd2,0x67,0x96,0xbb,0x8c,0x61,0xee,0x82,0x05,0xd8,0xfd,0xce,0x3b,0x99,0xe9,0x03,0x68,0x09,0x1a,0xf1,0x57,0x47,0x39,0x0e,0xfa,0x6c,0x70,0x28,0x17,0x0e,0x74,0x5b,0x6e,0x2e,0xa6,0xcd,0x98,0x31,0xea,0xe7,0x2d,0x7a,0x0d,0xbe,0xba,0xa8,0x12,0x77,0xad,0xa8,0xa1,0x5e,0x44,0xa4,0x2d,0xff,0xe7,0x8b,0xb3,0x70,0x4d,0x5d,0xf1,0x85,0x83,0xff,0x3c,0x93,0x6b,0x6a,0x90,0x37,0xca,0x95,0x68,0xbd,0x8a,0x0e,0x3c,0x5d,0x05,0xc0,0xa1,0x68,0xe1,0x52,0x34,0x38,0xec,0xb7,0xe1,0x79,0x47,0x19,0x9e,0x75,0x54,0xe2,0x03,0x5f,0x3e,0xba,0x65,0x3d,0x16,0x2e,0x5e,0x1c,0xb1,0xf7,0xff,0x73,0xb3,0x4b,0x40,0xfb,0x04,0x44,0x3a,0x52,0x66,0x33,0x60,0x76,0xc5,0xe8,0xa1,0xd7,0x0b,0x16,0x2e,0xbc,0xc0,0x6a,0x6e,0x0d,0x19,0xb1,0xdb,0x53,0x80,0xff,0xe9,0xab,0xc4,0x0e,0x47,0x29,0x7c,0x6a,0xec,0x0d,0x76,0x29,0x51,0x02,0xf0,0x59,0xbc,0x8a,0x88,0x13,0x7e,0x0b,0x4e,0xf8,0x2d,0x38,0xf0,0x7c,0x0b,0x96,0x4e,0xf1,0x62,0xc5,0xb4,0xc2,0x31,0x63,0xd3,0x8d,0x5a,0x09,0x1a,0x49,0xa0,0xec,0x39,0x44,0xda,0x61,0x35,0x8e,0x7d,0xfa,0xb2,0xa8,0xa4,0x14,0x5e,0x73,0x05,0x0e,0x76,0x06,0xd0,0x1e,0x32,0x20,0xc8,0x2f,0xdc,0x1d,0x70,0x2a,0x1a,0x98,0x04,0x39,0x0d,0x05,0x40,0x1e,0xf9,0xc7,0xdb,0x5d,0x01,0x6c,0xff,0xb0,0x15,0xdb,0x3f,0x6c,0x45,0x4d,0xa1,0x19,0x2b,0xa6,0x17,0xe2,0x8a,0x69,0x45,0x71,0x39,0xfb,0xbd,0x70,0x52,0x1e,0xee,0x5c,0x51,0x83,0x7c,0xb3,0x0e,0xed,0x0e,0x3f,0x4e,0xd9,0x3d,0x83,0x7f,0x9a,0x7b,0x3c,0x24,0x2c,0x04,0xcc,0x3a,0x09,0x35,0x45,0x66,0xd4,0x16,0x99,0x51,0x53,0x38,0xf0,0x77,0x91,0x45,0x8f,0x26,0xbb,0x1b,0xff,0xf5,0x46,0x13,0x5a,0x7a,0xbd,0x31,0x2f,0xf3,0x64,0x97,0x1b,0x3b,0x4f,0x74,0x63,0xe7,0x49,0x3b,0x3a,0x9d,0x12,0x80,0xe1,0xf3,0x50,0x38,0x15,0x0d,0xca,0x34,0xfe,0xf4,0x12,0x0,0x0e,0xc0,0xab,0x46,0xb6,0xcf,0x79,0xba,0xdb,0x83,0xd3,0xdd,0x1e,0x6c,0xde,0xd5,0x8c,0x47,0xff,0x76,0x21,0xa6,0x95,0x58,0x62,0xf6,0x1c,0xd5,0xf9,0x26,0x3c,0x78,0xd3,0xec,0xc1,0xf5,0x57,0x8e,0x41,0x83,0x19,0xa5,0x39,0x9f,0x9a,0x5c,0x9c,0xa3,0xb5,0xcf,0x37,0x20,0x08,0xdd,0x1e,0x9c,0xb6,0x7b,0xd0,0x64,0xf7,0xc0,0x95,0xa2,0x07,0x61,0x88,0x89,0x53,0x94,0xa3,0x1f,0x1c,0xe4,0xb5,0x85,0x66,0xd4,0x14,0x99,0x51,0x62,0x1d,0x3e,0xf7,0xc3,0xfc,0xaa,0x5c,0xfc,0xe8,0x96,0xb9,0xf8,0xe6,0xe6,0x0f,0xc6,0x4c,0x25,0x1f,0x0d,0x2f,0x1d,0xea,0xc0,0x2f,0x5f,0x39,0x11,0xd1,0x7b,0xdd,0x8a,0x26,0xe6,0x75,0x10,0x77,0x01,0x08,0x73,0x01,0x18,0xc7,0xca,0x5d,0x89,0x71,0x0c,0xc0,0xb2,0xa9,0x05,0xc3,0x3a,0x5f,0x06,0x9d,0x21,0x8c,0xa1,0x2a,0xdf,0x84,0xaa,0x7c,0x13,0xae,0x9a,0x59,0x3c,0xf8,0x7a,0x8f,0x3b,0x38,0x28,0x08,0x9f,0x88,0x43,0xa7,0xc3,0x0f,0x8a,0x50,0x48,0x1f,0x44,0x81,0xa1,0x32,0xcf,0xf8,0xe9,0x60,0x3f,0xff,0xc7,0xa2,0x8f,0x6e,0x40,0x15,0x5a,0x74,0x98,0x53,0x61,0xc5,0xde,0xd3,0xb1,0x4b,0xdf,0x1e,0x4d,0x3f,0x1f,0x18,0x4b,0xe9,0x26,0x0,0x6a,0x6a,0xb8,0xed,0xf2,0x4d,0xe3,0xcb,0x22,0x53,0x60,0xd1,0xa1,0xc0,0xa2,0xc3,0x65,0x35,0x9f,0x7a,0x68,0x65,0x95,0xa3,0xad,0xdf,0x87,0xc6,0x2e,0x37,0x1a,0xbb,0x3c,0x68,0xea,0x72,0xe3,0xb4,0xdd,0x43,0xc9,0x3d,0x53,0x80,0x5c,0xa3,0x16,0xd3,0x4a,0x2c,0x98,0x5a,0x6c,0xc1,0x94,0x62,0x0b,0xaa,0x0b,0x8c,0x28,0xce,0xd1,0x43,0x88,0x51,0x98,0x79,0xbe,0x59,0x97,0xb4,0xdf,0x16,0xe6,0x2c,0x0d,0x05,0x0,0x62,0xc6,0x75,0x32,0x49,0x60,0xa8,0xce,0x37,0xa1,0x3a,0xdf,0x84,0x6b,0xeb,0x3e,0x15,0x85,0xb3,0xbd,0x5e,0x9c,0xb2,0x0f,0x2c,0x63,0x4e,0x76,0xba,0x71,0xb4,0xcd,0x49,0x96,0x42,0x3c,0xdb,0x41,0x14,0x30,0xaf,0xd2,0x86,0x29,0x9f,0x99,0xd5,0xcb,0x6c,0x33,0x6b,0x97,0xff,0x0,0x0,0x10,0xb2,0x49,0x44,0x41,0x54,0x86,0x8c,0x3d,0x53,0x12,0x52,0xd3,0xd0,0x02,0xc8,0x96,0x03,0xe5,0x92,0xc0,0x50,0x53,0x38,0xe0,0x38,0xfa,0xac,0x73,0xe7,0xe1,0xed,0x87,0xd1,0xe3,0x0e,0xd2,0x68,0x8d,0x31,0xd3,0x4b,0x72,0xf0,0x83,0x2f,0xcd,0x42,0x81,0x45,0x47,0x95,0x31,0x01,0xe2,0x1e,0x07,0x90,0xea,0xe7,0x7b,0x5e,0x39,0xdc,0x89,0x5d,0x8d,0xdd,0xe8,0x70,0xc6,0x3e,0x75,0xd7,0xb4,0x62,0x0b,0xbe,0xb9,0x72,0x0a,0xf5,0xb2,0x38,0xf0,0x4f,0x5f,0x98,0x19,0xf3,0xc1,0xaf,0xa8,0x1c,0x2d,0xbd,0x5e,0xbc,0x71,0xac,0x2b,0xa6,0xeb,0xfc,0x98,0x4d,0x32,0x2c,0xf6,0x93,0x69,0xdc,0x2d,0x0,0x0d,0x52,0x7b,0x6b,0xed,0xa5,0x43,0x1d,0x38,0xda,0xee,0x1c,0x9c,0xc5,0xcb,0x72,0x8d,0x98,0x5a,0x6c,0xc6,0xd4,0xe2,0x81,0x75,0x64,0x6d,0x91,0x19,0x7a,0xcd,0xf8,0x97,0x31,0x63,0x05,0x7f,0x4c,0x84,0xda,0x22,0x33,0xd6,0xaf,0xa8,0x45,0xa9,0x4d,0x9f,0x52,0x75,0xaa,0xaa,0xc0,0x29,0xbb,0x1b,0x1b,0xdf,0x3a,0x85,0x5e,0x4f,0xec,0xad,0x9f,0x3c,0x93,0x76,0xc2,0xdb,0xc4,0x4e,0x7f,0x18,0xc7,0xda,0x5d,0x68,0xea,0x72,0xa3,0xa5,0xd7,0x8b,0x96,0x5e,0x1f,0xda,0xfa,0x7d,0x83,0x4e,0xb9,0x1b,0xe7,0x97,0x5f,0xe0,0xf7,0x49,0x05,0x34,0x42,0x1a,0x0a,0x80,0x56,0x50,0x31,0xb0,0x19,0x98,0xfa,0xeb,0xb2,0x4f,0xd6,0xf1,0x67,0x7b,0xbd,0x78,0xfd,0x68,0xd7,0x40,0xa5,0x8b,0x02,0x26,0x15,0x98,0x2e,0xf0,0x1e,0x4f,0x2e,0x34,0xc3,0x10,0xa1,0x28,0xe8,0xa5,0xf8,0xf8,0x40,0x0a,0x2c,0x3a,0x3c,0xb2,0x6a,0x3e,0xcc,0xba,0xd4,0x4c,0xea,0x54,0x9e,0x6b,0x40,0x75,0x81,0x09,0xff,0xeb,0xc9,0xfd,0x08,0xc7,0xf8,0xfc,0xc6,0x68,0xbb,0x39,0xc3,0xe1,0xf2,0x87,0x07,0x77,0x70,0x3e,0x89,0xfb,0x68,0xed,0xf3,0xa5,0xdd,0xf5,0x5f,0x3a,0xa6,0xa4,0x9f,0x0,0x08,0xe0,0x30,0x89,0x2a,0xbc,0x4a,0x7a,0x3a,0x03,0xc3,0x8a,0x7a,0xde,0xdb,0xef,0x1e,0x32,0x0b,0x4d,0x2d,0xb6,0xa0,0xba,0xc0,0x84,0xaa,0x7c,0x23,0xa6,0x16,0x5b,0x50,0x95,0x6f,0x4a,0x98,0xcc,0xad,0x98,0x56,0x94,0xb2,0x83,0xff,0x13,0xaa,0xf3,0x4d,0x98,0x55,0x6e,0xc5,0xc1,0xb3,0xfd,0x89,0xb1,0x3c,0x38,0xc7,0xb9,0xbe,0x0b,0x77,0x67,0x5a,0x7a,0xbc,0x29,0x91,0x8e,0x3d,0x16,0x98,0x85,0x70,0xfa,0x09,0x0,0x0,0x98,0x58,0x18,0xde,0x0c,0xdb,0x0d,0xe8,0xf3,0x86,0xb0,0xf7,0x74,0xef,0x05,0x6b,0xc5,0x86,0x3b,0x2f,0x43,0xa9,0xd5,0x90,0x90,0xf2,0xf3,0x4c,0xda,0xb4,0xa8,0xa7,0x44,0x3e,0xe7,0x7b,0x4d,0xbd,0x78,0xf8,0xaf,0x87,0x33,0xd6,0xef,0x61,0x11,0x63,0x2f,0x64,0x09,0x71,0xd1,0x59,0xa5,0xd8,0x29,0x57,0x2c,0x6e,0x85,0x21,0x88,0x44,0x63,0x35,0x4c,0xbc,0xdf,0xe6,0x88,0x69,0x6a,0x01,0x14,0x4a,0x01,0x34,0x22,0x36,0x61,0xbd,0x5b,0xef,0x5a,0x82,0x96,0x5e,0x2f,0x76,0x9e,0xe8,0xc6,0xdb,0x27,0xec,0x38,0xd7,0xe7,0xa3,0xde,0xf5,0x19,0xfc,0x61,0x05,0x8a,0x12,0xfd,0xda,0x56,0xaf,0x11,0x20,0x89,0x03,0x07,0xad,0xc6,0x73,0x26,0x42,0x2b,0x09,0x51,0xaf,0xcd,0x33,0x19,0x06,0xa0,0xae,0xdc,0x8a,0x2b,0xa6,0x15,0x62,0xe9,0x94,0x02,0x14,0x4f,0xf0,0x7a,0x39,0x1d,0x53,0xd3,0x57,0x0,0x0a,0xa4,0xd8,0x5e,0x2b,0x55,0x9d,0x6f,0x42,0xf5,0x32,0x13,0x56,0x2f,0x9b,0x34,0x28,0x06,0x7b,0x4f,0xf7,0x0e,0x59,0xa7,0x67,0x23,0x3f,0xfa,0xeb,0x11,0xec,0x3f,0x93,0xf8,0x8b,0x2e,0xbf,0x7a,0x69,0x25,0xee,0xbc,0xb2,0x36,0xab,0xeb,0x5e,0x14,0x18,0xe6,0x56,0xda,0x70,0x59,0x4d,0x3e,0x96,0x4d,0x29,0x88,0xc9,0x9d,0x92,0x9f,0x90,0x2f,0x05,0xe3,0xe2,0x5f,0x4a,0x88,0x0,0x58,0xc4,0x30,0x8c,0x82,0x1c,0xd5,0x79,0xe6,0x7e,0x6f,0x28,0x6a,0x31,0xe8,0x74,0x06,0xf0,0xde,0xa9,0x1e,0xec,0x3c,0xd9,0x4d,0x51,0x78,0x44,0x42,0x90,0x04,0x86,0x85,0x93,0xf2,0x70,0xc5,0xf4,0x42,0x2c,0x9e,0x9c,0x8f,0x1c,0x43,0x74,0xe7,0x0b,0x22,0xdd,0x26,0x2d,0xd1,0xc6,0xe7,0x4a,0xb3,0x84,0x08,0x0,0x03,0x50,0xa9,0xf5,0xe1,0x44,0x20,0x27,0xe2,0xcf,0x3c,0xf7,0x51,0x1b,0x96,0x4c,0xc9,0x8f,0x2a,0x86,0xbb,0xc4,0xaa,0xc7,0xcd,0x97,0x54,0xe0,0xe6,0x4b,0x2a,0x60,0x77,0x05,0xf0,0x6e,0xd3,0x79,0x31,0x68,0x77,0x52,0x4f,0x25,0x62,0x37,0x68,0x44,0x01,0x0b,0xab,0x73,0x71,0xc5,0xf4,0x42,0x5c,0x56,0x93,0x1f,0xf5,0xa1,0xa2,0x4f,0xf0,0x06,0xe5,0xc1,0xed,0xe6,0xb1,0xa8,0xd4,0xfa,0xd2,0x57,0x0,0x30,0x0e,0x01,0x38,0xd0,0xd2,0x8f,0xef,0xff,0xe9,0x63,0xdc,0xbe,0x7c,0x32,0xa6,0x97,0xe6,0x44,0x6d,0xfe,0x14,0xe5,0x7c,0x2a,0x06,0x1d,0x0e,0x7f,0xcc,0x4f,0x17,0x12,0xd9,0xc9,0x0d,0x73,0x4b,0xb1,0x76,0xf9,0xa4,0x09,0x39,0xa3,0x65,0x95,0x63,0xff,0x99,0x3e,0x6c,0x7a,0xe7,0x34,0xba,0x22,0xb8,0xac,0xd4,0x26,0x86,0x60,0x11,0xc2,0xe9,0x2d,0x0,0x45,0x9a,0x20,0x0c,0x82,0x02,0xbf,0x2a,0x46,0x25,0x02,0x07,0x5a,0xfa,0x51,0x60,0xd1,0x61,0xf9,0x94,0x02,0x2c,0x9b,0x5a,0x88,0x39,0x15,0xd6,0xa8,0x4f,0x76,0x95,0xda,0x0c,0xd4,0x73,0x89,0x98,0x30,0xb5,0x78,0x7c,0xce,0xec,0x90,0xac,0x62,0x5f,0x73,0x1f,0x76,0x37,0x0d,0xf8,0xab,0x3c,0x81,0xc8,0xb7,0xf4,0x26,0xeb,0xe2,0xe7,0xe8,0x4e,0x98,0x0,0x08,0xe0,0x98,0xaa,0x77,0xe3,0x63,0x9f,0x2d,0xea,0xcf,0xf6,0xb8,0x83,0xd8,0x7e,0xa0,0x0d,0xdb,0x0f,0xb4,0x41,0xa7,0x11,0x31,0xbf,0xd2,0x86,0x2b,0xa6,0x17,0x62,0xf9,0x94,0x42,0x18,0xb4,0x22,0xf5,0x4a,0x22,0x25,0xe9,0xf7,0x86,0xf0,0xf6,0x09,0x3b,0x76,0x9e,0xec,0xc6,0xb1,0x76,0xd7,0xb8,0x22,0x0f,0x05,0x70,0x4c,0xd1,0xbb,0xd3,0x5f,0x0,0x0,0x60,0x8a,0xce,0x83,0xc3,0x3e,0x2b,0xd4,0x09,0xf8,0x33,0x83,0x61,0x65,0x30,0x0,0xe7,0x51,0xe9,0x24,0x16,0x54,0xe5,0xe2,0xb2,0xda,0x01,0xaf,0x2b,0xc5,0x08,0x10,0xc9,0xa6,0xc7,0x1d,0xc4,0xae,0xc6,0xee,0x41,0xdf,0xd3,0x44,0xa3,0x8d,0x2b,0x75,0xbe,0xb8,0x84,0x0,0x27,0x45,0x0,0x8c,0x82,0x8c,0x2a,0xad,0x0f,0x67,0x42,0xa6,0x98,0x7c,0x5f,0x48,0x56,0x07,0xc5,0xe0,0x89,0x37,0x9b,0xb0,0x70,0x52,0x1e,0x96,0x4d,0x29,0xc0,0x92,0xda,0xc8,0x1d,0x33,0x74,0xcf,0x0,0x31,0x1c,0x8a,0x1a,0x79,0xbf,0xb0,0xbb,0x02,0xd8,0xd3,0xd4,0x83,0x5d,0x8d,0x3d,0x38,0xd2,0xe6,0x8c,0xe9,0x19,0x83,0x99,0x7a,0x57,0x5c,0x7f,0x67,0xc2,0x83,0xc9,0xe7,0x18,0x1d,0x68,0x09,0x99,0x62,0xbe,0x45,0x17,0x92,0x55,0xec,0x69,0xea,0xc1,0x9e,0xa6,0x1e,0x48,0xe7,0xf7,0x63,0x97,0x4f,0x1d,0x08,0xc2,0x18,0x29,0x1c,0xd5,0x17,0x92,0x71,0x36,0xce,0x81,0x44,0xa2,0xc0,0x30,0xb3,0x2c,0x07,0xed,0xfd,0x7e,0x38,0x29,0xbf,0xe0,0x84,0x60,0x0,0xf2,0x2d,0xba,0x71,0xaf,0xc3,0xa3,0xe1,0x64,0xa7,0x7b,0xd4,0x23,0x6c,0x6d,0xfd,0x3e,0xec,0x6a,0xec,0xc1,0xee,0xc6,0x6e,0x34,0x9e,0x7f,0x6f,0xac,0x29,0xd7,0xfa,0x51,0x20,0x05,0x33,0x4b,0x0,0xac,0x62,0x18,0x93,0x74,0x5e,0x34,0x07,0x4d,0x71,0x2b,0x43,0x56,0x39,0x3e,0x6c,0xe9,0xc7,0x87,0x2d,0xfd,0x78,0xec,0xf5,0x93,0xa8,0x2b,0xb3,0x62,0xd9,0x94,0x02,0x2c,0x9f,0x5a,0x38,0x98,0xf4,0x31,0x10,0x56,0xf0,0xb3,0x97,0x4e,0xc4,0xfd,0xca,0x31,0xad,0x24,0xe0,0x17,0xb7,0x5e,0x32,0x68,0x6d,0x74,0x7b,0x82,0xe8,0x74,0x04,0xd0,0xe1,0xf4,0xa3,0xd3,0x19,0x40,0x87,0x63,0xe0,0xef,0x96,0x5e,0x2f,0x65,0x25,0x06,0x60,0xd0,0x88,0xa8,0xc8,0x33,0xa2,0xc4,0xaa,0x47,0xa9,0xcd,0x30,0xf0,0xb7,0xd5,0x80,0x12,0x9b,0x1e,0x45,0x16,0x3d,0x44,0x21,0x31,0xc7,0xad,0x4e,0xd9,0x3d,0xd8,0xb2,0xab,0x19,0x6b,0x97,0x4f,0x1a,0x74,0x3a,0x9f,0xb2,0x7b,0xb0,0xbb,0xb1,0x1b,0xbb,0x1b,0x7b,0xe2,0x92,0x1d,0xf8,0x62,0xb1,0x9b,0x6b,0x70,0xc4,0xfd,0x77,0x26,0xe5,0x38,0xd9,0x7c,0x63,0x3f,0xce,0x86,0x8c,0x50,0x78,0xfc,0x1b,0x93,0x73,0xe0,0x48,0x9b,0x13,0x47,0xda,0x9c,0xf8,0xcd,0xdb,0xa7,0x30,0xa9,0xc0,0x84,0x5c,0x93,0x16,0xa7,0x92,0x90,0xf1,0x57,0x12,0x05,0x94,0x5a,0x0d,0x28,0xb5,0x1a,0xb0,0x0,0xb9,0x17,0x99,0x9c,0x1c,0x76,0x77,0x60,0x58,0x71,0x38,0xd7,0xe7,0xcb,0xa8,0xbb,0x11,0x4d,0x3a,0x09,0x65,0xe7,0x07,0x77,0x75,0xbe,0x09,0xd5,0x05,0xa6,0xc1,0x81,0x6e,0xd6,0xa7,0xce,0x09,0xc7,0x3f,0xec,0x6d,0xc1,0x5b,0xc7,0xbb,0x50,0x6a,0x33,0xa0,0xad,0xdf,0x0f,0xbb,0x2b,0x90,0xb0,0xb2,0x27,0xe9,0xbc,0xc8,0x97,0x82,0x99,0x29,0x0,0x26,0x41,0xc6,0x6c,0x83,0x13,0x1f,0x8d,0x63,0x47,0x60,0xa2,0x9c,0xe9,0xf1,0xe2,0x4c,0x4f,0x7c,0xd4,0x3b,0x18,0x1e,0xff,0x0c,0x2e,0x0a,0x6c,0x44,0x71,0x90,0x15,0x15,0x5d,0xae,0x0,0xda,0x1d,0x01,0xb4,0x3b,0xfc,0x68,0x77,0xf8,0x51,0x91,0x97,0x1e,0x5b,0x9b,0x75,0x65,0x39,0xc8,0x33,0x6b,0x51,0x66,0x33,0x0c,0xfe,0x29,0xb4,0xe8,0xe2,0x92,0xb7,0x2f,0x1e,0x49,0x59,0x3b,0x9d,0x01,0x74,0x3a,0x03,0x09,0xad,0x33,0x89,0xa9,0x58,0x60,0x4c,0x4c,0x38,0x77,0xd2,0xe4,0xb6,0x4e,0xef,0xc4,0xa9,0xa0,0x19,0x1e,0x45,0x42,0xa6,0xb0,0xaf,0xb9,0x0f,0x93,0x0a,0x62,0xbf,0xb4,0x91,0x44,0x01,0xe5,0xb9,0x46,0x94,0xe7,0x1a,0xd3,0xae,0x4e,0x6e,0x9c,0x5f,0x9e,0xb0,0xb2,0x3e,0x68,0xee,0xcd,0x88,0x7e,0x34,0xd7,0xe8,0x84,0x51,0x48,0x8c,0xc5,0x97,0xb4,0xe3,0x5b,0x22,0xe3,0x58,0x6e,0xee,0xc9,0xa8,0xbb,0xfe,0x9e,0xda,0x73,0x06,0xef,0x36,0xf5,0xd0,0x19,0x84,0x04,0x23,0xab,0x1c,0x7f,0xdc,0x77,0x0e,0x6f,0x1f,0xb7,0xa7,0xfd,0x6f,0x29,0x94,0x82,0x98,0xa9,0x4f,0x5c,0xe8,0xba,0x94,0xdc,0x1f,0x1b,0xc0,0x2c,0x83,0x13,0x87,0xfd,0xd6,0x8c,0xe8,0x88,0x81,0xb0,0x82,0x87,0xb7,0x1f,0x46,0x81,0x45,0x87,0x49,0xf9,0x26,0x94,0xda,0x0c,0x28,0xb5,0x19,0x50,0x66,0x1b,0x70,0x68,0x95,0x5a,0x0d,0x74,0x64,0x76,0x02,0x78,0x83,0x32,0x3a,0x1c,0x7e,0x74,0x38,0x07,0x96,0x42,0x9d,0x4e,0x3f,0x3a,0x1c,0x01,0x9c,0xee,0xce,0x8c,0x1b,0x9c,0x24,0xc6,0xb1,0xcc,0x92,0xd8,0x49,0x31,0xe9,0xf6,0xf7,0x5c,0x43,0x3f,0x3a,0xc2,0x7a,0xf4,0xca,0x99,0x93,0xde,0xb9,0xc7,0x1d,0x1c,0x31,0x15,0x78,0xbe,0x59,0x87,0x52,0xdb,0x80,0xc3,0xab,0xec,0xbc,0x40,0x7c,0xf2,0xff,0xd1,0x9e,0x24,0x1b,0xa9,0xec,0x64,0xd0,0xeb,0x8d,0xcd,0x91,0xef,0x5e,0x4f,0x10,0x1d,0xe7,0x1d,0xa1,0xed,0x0e,0xff,0xa0,0x23,0xb4,0xdd,0xe1,0xcf,0xf8,0x6b,0xda,0x16,0x99,0xfa,0xe2,0x16,0xf3,0x9f,0xb2,0x02,0x20,0x30,0xe0,0x4a,0x4b,0x37,0x5e,0x74,0x96,0x22,0xa0,0x66,0x7e,0x58,0x6f,0xaf,0x27,0x88,0x5e,0x4f,0x10,0x87,0x5b,0x87,0x9a,0x79,0x26,0x9d,0x74,0xde,0x52,0xd0,0x0f,0x8a,0x43,0xc9,0xf9,0xff,0x8e,0xc4,0x71,0x76,0xa2,0xd3,0x85,0xb3,0x7d,0xde,0xa4,0xfc,0xae,0xfd,0x67,0xfa,0xd0,0xef,0x0b,0x21,0x77,0x8c,0x68,0xcc,0x01,0x87,0x66,0x10,0x1d,0xce,0x81,0xc1,0xdd,0xe1,0xf0,0xa3,0xdd,0x11,0x40,0xe7,0xf9,0x01,0x9f,0xad,0x5b,0xa1,0xd3,0xf5,0x2e,0xd4,0xea,0x12,0x9f,0xcf,0x22,0x25,0x3c,0x70,0x46,0x41,0xc6,0x95,0x16,0x3b,0x5e,0x75,0x95,0x22,0x9b,0x0f,0xed,0x79,0x83,0x32,0x9a,0xba,0xdc,0x68,0x1a,0x26,0xb1,0x89,0x24,0x0a,0x83,0x5b,0x65,0x65,0x36,0x3d,0x4a,0xac,0x9f,0x2e,0x2f,0x04,0xc6,0x70,0xa4,0xdd,0x89,0xad,0xbb,0xcf,0x24,0xed,0x1e,0x16,0x97,0x3f,0x8c,0xef,0xff,0xf1,0x63,0xac,0x5e,0x36,0x09,0x93,0x0a,0x4c,0xf0,0x87,0x94,0xcf,0x0c,0xf2,0xc0,0xe0,0x6c,0xde,0xed,0x0e,0xa6,0x5d,0x36,0xde,0x78,0x53,0xa2,0x09,0x60,0xa1,0xa9,0x3f,0x29,0x65,0xa7,0x8c,0x0b,0xbe,0x50,0x0a,0x62,0x85,0xb9,0x0b,0x6f,0xbb,0x8b,0xc9,0x89,0x36,0xc2,0xcc,0xd9,0xda,0xe7,0x43,0x6b,0x0a,0xa7,0x40,0x3b,0xdd,0xed,0xc1,0xc3,0xdb,0x0f,0x53,0x63,0x45,0x41,0x9e,0x14,0xc2,0x95,0x96,0x2e,0x08,0x49,0xea,0xf5,0x29,0xe5,0x91,0xaa,0xd0,0xfa,0xb1,0xd8,0xd4,0x4b,0xbd,0x82,0xc8,0x0a,0x4c,0x82,0x8c,0x95,0x96,0x2e,0x68,0x58,0xf2,0xa6,0xbc,0x94,0x73,0x49,0x4f,0xd5,0xbb,0x51,0xa7,0xa7,0x0c,0x3e,0x44,0x66,0xa3,0x63,0x2a,0xae,0xb2,0x74,0x25,0x6c,0xbf,0x3f,0x6d,0x04,0x0,0x0,0x2e,0x31,0xf5,0x63,0x81,0xb1,0x9f,0x7a,0x09,0x91,0x91,0x18,0x04,0x05,0xd7,0x59,0x3b,0x60,0x93,0x92,0xbf,0xab,0x91,0xb2,0x61,0x78,0xb3,0x0c,0x4e,0x30,0x70,0x7c,0xe8,0xcb,0xa3,0x1e,0x43,0x64,0x0c,0x46,0x41,0xc6,0xb5,0x39,0x5d,0x71,0x49,0xf1,0x9d,0x51,0x02,0x0,0x0,0x75,0x06,0x17,0x18,0x80,0xfd,0xbe,0x5c,0x0,0x8c,0x7a,0x0f,0x91,0xd6,0x58,0x44,0x19,0xd7,0x58,0x3a,0x61,0x16,0x53,0xe7,0xaa,0xb2,0x91,0x04,0x40,0x01,0x52,0xe3,0x2e,0xaf,0x99,0x06,0x17,0xac,0x62,0x08,0x3b,0x3d,0xc5,0x08,0x73,0x12,0x01,0x22,0x3d,0x29,0xd5,0xf8,0x71,0xa5,0xa5,0x1b,0x12,0x4b,0x6e,0x9c,0x03,0xe7,0x5c,0x8e,0xc4,0x07,0xe0,0x49,0xa5,0xca,0x2b,0xd3,0x06,0x70,0x8d,0xa5,0x13,0x06,0x41,0xa1,0x9e,0x44,0xa4,0x1d,0xd5,0x3a,0x2f,0x56,0x5a,0xec,0x49,0x1f,0xfc,0x0,0xc0,0x18,0x73,0x8f,0x2d,0x0,0x17,0xbd,0x29,0x15,0x28,0xd0,0x04,0x71,0xa3,0xad,0x1d,0x25,0x9a,0x0,0xf5,0x28,0x22,0x2d,0x10,0x18,0x70,0x99,0xa9,0x07,0x57,0x98,0xbb,0x21,0xb2,0x14,0x89,0x6e,0xe1,0xdc,0x35,0xb6,0x0,0xa8,0x6a,0x4a,0xde,0xb1,0xa5,0x63,0x0a,0xae,0xb6,0x74,0x62,0x9a,0xce,0x45,0xbd,0x8b,0x48,0x69,0xf4,0x82,0x8a,0xab,0x2d,0x9d,0x98,0xaa,0x4f,0x29,0x63,0x1a,0x0c,0x70,0x8f,0xe9,0x03,0xe0,0x8c,0xb9,0x53,0x75,0xb5,0x2d,0x30,0x60,0xb1,0xb9,0x0f,0x95,0x3a,0x3f,0xf6,0x78,0x0a,0xe0,0x53,0x29,0x2d,0x38,0x91,0x5a,0x4c,0xd2,0x7a,0xb0,0xd8,0xdc,0x07,0x2d,0x4b,0xbd,0x73,0x0d,0xea,0x45,0x02,0x20,0x8c,0xa0,0x12,0x5d,0xa9,0x5e,0xc9,0xa5,0x1a,0x3f,0x6e,0xb0,0xb6,0xa3,0x54,0xe3,0xa7,0x1e,0x47,0xa4,0x04,0x22,0xe3,0x58,0x6c,0xea,0xc5,0x72,0x4b,0x4f,0x4a,0x0e,0xfe,0x81,0x67,0x64,0x5d,0x63,0x2f,0x01,0x80,0xe3,0xe9,0x50,0xe1,0x06,0x41,0xc1,0x35,0x39,0x5d,0x58,0x61,0xe9,0x8e,0x6b,0xee,0x74,0x82,0x18,0x8b,0x4a,0xad,0x0f,0x37,0xd9,0x5a,0x31,0x4d,0xef,0x4e,0xe5,0x0d,0x6b,0x55,0x63,0x32,0x9d,0x88,0x64,0x09,0x70,0x82,0xa5,0xd1,0x89,0xad,0x2a,0xad,0x17,0x25,0x36,0x3f,0x0e,0xf8,0xf3,0xd0,0x18,0x30,0x53,0x6f,0x24,0x12,0x86,0x8e,0x29,0xb8,0xcc,0xdc,0x87,0x2a,0xad,0x37,0x1d,0x1e,0xf7,0xdc,0xaa,0x55,0xab,0xfc,0x63,0x0a,0x0,0x14,0xe5,0x04,0x84,0xf4,0xca,0x5c,0xa3,0x15,0x54,0x5c,0x66,0xea,0x41,0xb9,0xc6,0x87,0xfd,0xde,0x3c,0xb8,0x55,0x89,0x7a,0x27,0x11,0x37,0x18,0x80,0x49,0x3a,0x0f,0x2e,0x31,0xf6,0xa7,0xd3,0xf6,0xf4,0x89,0x8b,0x5f,0x18,0x7e,0x94,0x68,0x34,0x27,0xa1,0xa4,0xa7,0x49,0x5d,0xa1,0xf5,0xa1,0x4c,0xeb,0xc7,0xc9,0x80,0x05,0x1f,0xf9,0x72,0x29,0x78,0x88,0x88,0x39,0x85,0x52,0x10,0x8b,0x4c,0xbd,0xc8,0x93,0x42,0xe9,0xf5,0xe0,0x8c,0x9d,0xbc,0xf8,0xa5,0x61,0xa7,0xf9,0xb5,0x6b,0xd7,0xda,0x01,0x9c,0x4c,0xd7,0x06,0x12,0xc0,0x31,0x43,0xef,0xc2,0x8d,0xb6,0x36,0x4c,0xd1,0x79,0x28,0x88,0x98,0x88,0x09,0x26,0x41,0xc6,0x52,0x53,0x0f,0xae,0xb3,0x76,0xa4,0xdf,0xe0,0x07,0xc0,0x54,0x75,0x57,0x64,0x16,0xc0,0x80,0x89,0xf3,0x06,0x07,0xa6,0xa5,0x7b,0x83,0x2d,0x31,0xf7,0x60,0x8e,0xa1,0x1f,0x87,0x03,0xb9,0x68,0x0a,0x98,0x29,0xd9,0x08,0x11,0x35,0x46,0x41,0xc1,0x1c,0x43,0x3f,0x6a,0xf5,0xde,0xa4,0x25,0xee,0x88,0x01,0x5c,0x95,0xa4,0x37,0x23,0x16,0x0,0x15,0x78,0x83,0x01,0xdf,0xca,0x08,0xe5,0x16,0x15,0x5c,0x66,0xea,0xc1,0x54,0x9d,0x0b,0x87,0x02,0x36,0xb4,0x06,0x8d,0x24,0x04,0xc4,0x98,0xe8,0x05,0x15,0x33,0xf5,0x4e,0x4c,0xd7,0xbb,0x53,0x22,0x8c,0x77,0x82,0x1c,0x3a,0x6f,0xd9,0x47,0x26,0x0,0x5c,0x10,0xde,0x60,0xaa,0xaa,0x22,0x45,0x73,0x06,0x8c,0x87,0x3c,0x29,0x84,0x2b,0xcd,0x76,0x38,0x0c,0x5a,0x1c,0xf6,0x59,0x71,0x26,0x64,0x04,0x9d,0x32,0x24,0x2e,0xc6,0x20,0x28,0xa8,0x33,0xb8,0x30,0x55,0xe7,0x82,0xc4,0x32,0x63,0xaa,0xe0,0xc0,0x1b,0xc3,0x2f,0x97,0x47,0xe0,0xf6,0xdb,0x6f,0xef,0x05,0xb0,0x3f,0x13,0x1b,0xd8,0x26,0x86,0x70,0xb9,0xa5,0x1b,0x5f,0xcd,0x6d,0xc5,0x5c,0x83,0x83,0x62,0x08,0x08,0x0,0x40,0x89,0xc6,0x8f,0x95,0x16,0x3b,0x6e,0xc9,0x3d,0x87,0x99,0x7a,0x67,0xc6,0x0c,0xfe,0xf3,0x4b,0xfa,0x97,0x87,0x7b,0x7d,0xd4,0xbd,0x32,0xce,0xd8,0x16,0xc6,0xf9,0xa2,0xcc,0x35,0xf1,0x14,0xcc,0x35,0x3a,0x30,0xd3,0xe0,0xc4,0xa9,0xa0,0x05,0x27,0x03,0x16,0xb8,0x14,0x0d,0x8d,0x84,0x2c,0x42,0x0,0x47,0x85,0xd6,0x8f,0xe9,0x7a,0x27,0x8a,0x35,0xc1,0xcc,0xfc,0x91,0x8c,0xb5,0x9e,0x3a,0x73,0xe6,0x95,0xa8,0x05,0x40,0x2f,0xcb,0xcf,0x04,0x45,0xf1,0x67,0x0,0x74,0x99,0xdc,0x09,0x34,0x6c,0x60,0xd7,0x60,0x86,0xde,0x85,0x5e,0x59,0x8b,0xa6,0x60,0x0e,0x9a,0x83,0x26,0xc8,0xb4,0x85,0x98,0xb1,0xd8,0xc4,0x10,0xa6,0xeb,0x5d,0xa8,0xd6,0xf9,0x52,0x36,0x6c,0x37,0x76,0xf6,0x3f,0x7f,0x66,0xc3,0x86,0x0d,0xea,0x08,0x96,0xc1,0xe8,0x6c,0x6d,0x68,0xf8,0x0b,0x03,0x6e,0xca,0xb6,0x0e,0xe2,0xe7,0x22,0x9a,0x83,0x66,0x9c,0x0e,0x9a,0xe1,0x90,0xc9,0x2a,0xc8,0x04,0x44,0xc6,0x51,0xa9,0xf1,0xa1,0x46,0xef,0x41,0x59,0x16,0x9d,0x21,0x51,0x18,0x9b,0x7d,0xc7,0x1d,0x77,0x1c,0x89,0xda,0x02,0x0,0x0,0x81,0xf3,0xa7,0x38,0x63,0x59,0x27,0x0,0x06,0xa6,0xa0,0x4e,0xef,0x44,0x9d,0xde,0x09,0x87,0xa2,0x45,0x73,0xd0,0x84,0x33,0x41,0x13,0xbc,0x14,0x61,0x98,0x6e,0x6b,0x5f,0x14,0x6b,0x02,0xa8,0xd1,0x79,0x50,0xa9,0xf5,0x26,0x35,0x05,0x77,0x92,0xf8,0x68,0xa4,0xc1,0x1f,0x91,0x0,0x34,0x9d,0x3d,0xfb,0xe7,0x29,0xd5,0xd5,0x47,0x38,0x30,0x2b,0x9b,0xcd,0xc5,0x05,0xc6,0x10,0x16,0x18,0xfb,0xe1,0x54,0x34,0x68,0x0d,0x19,0xd1,0x16,0x36,0xa2,0x3b,0xac,0xa3,0xed,0xc4,0x14,0x5d,0xd2,0x55,0x68,0xbd,0xa8,0xd6,0xfa,0x50,0xa2,0xf1,0x67,0x94,0x33,0x2f,0x6a,0x01,0xe4,0xfc,0xa7,0x63,0x09,0xe4,0x98,0x6c,0x6d,0x68,0xb8,0x83,0x01,0x0d,0xd4,0xb5,0x2e,0xc4,0xa9,0x68,0xd0,0x16,0x32,0xa2,0x3d,0x6c,0x80,0x3d,0xac,0x83,0x4a,0x5b,0x8a,0x49,0xc3,0x28,0xc8,0x28,0xd5,0x06,0x50,0xae,0xf1,0xa3,0x4c,0xe3,0xcf,0x84,0x7d,0xfb,0x58,0x70,0x52,0x67,0x32,0xd5,0xad,0x5a,0xb5,0x4a,0x19,0xb7,0x05,0x0,0x0,0xfe,0x50,0xe8,0x69,0x93,0x56,0xfb,0x20,0x07,0x26,0x51,0x9d,0x7e,0x8a,0x55,0x0c,0xc3,0x6a,0x70,0xa2,0xce,0xe0,0x84,0xcc,0x19,0xba,0xc2,0x7a,0xb4,0xcb,0x46,0x74,0x86,0xf4,0x70,0x29,0x1a,0xb2,0x0e,0xe2,0x39,0xcb,0x43,0x45,0x91,0x36,0x88,0x62,0xc9,0x8f,0x32,0x6d,0x0,0x36,0x31,0x44,0x95,0x32,0x74,0x76,0x7f,0x64,0xb4,0xc1,0x1f,0xb1,0x05,0x0,0x0,0x4f,0x35,0x34,0xdc,0xcd,0x81,0x47,0xa9,0x5a,0x23,0xc3,0xcf,0x45,0x74,0x85,0xf5,0xe8,0x3a,0x6f,0x1d,0x90,0x20,0x4c,0x0c,0x89,0xa9,0x28,0x90,0x42,0x28,0xd1,0x04,0x50,0x24,0xf9,0x51,0xa0,0x09,0xa5,0x73,0x58,0x6e,0x02,0x46,0x3f,0x6b,0xed,0x77,0xb9,0xa6,0xdc,0x73,0xcf,0x3d,0xc1,0x98,0x08,0xc0,0xb6,0x6d,0xdb,0xc4,0xa0,0xd7,0xbb,0x0f,0xc0,0x7c,0xaa,0xdd,0xe8,0x09,0x72,0x01,0xbd,0xb2,0x0e,0xdd,0x61,0x1d,0xba,0x65,0x3d,0xfa,0x64,0x2d,0x42,0x5c,0xa0,0x8a,0x19,0x06,0x91,0x71,0xe4,0x8a,0x21,0x14,0x48,0x41,0xe4,0x49,0x41,0xe4,0x4b,0x21,0x58,0x53,0xe4,0x22,0x8d,0x74,0x81,0x03,0xb7,0xac,0xad,0xaf,0xff,0x73,0x04,0x56,0x42,0xe4,0x3c,0xbd,0x65,0xcb,0x62,0x55,0x55,0xf7,0x20,0x83,0xc2,0x83,0x93,0x89,0x5b,0x95,0xe0,0x90,0xb5,0xe8,0x95,0xb5,0x70,0xc8,0x5a,0x38,0x54,0x2d,0x7c,0x8a,0x98,0x55,0xbe,0x04,0x2d,0x53,0x61,0x11,0x65,0xe4,0x8a,0x41,0xe4,0x4b,0x41,0x14,0x48,0x21,0x58,0xa5,0x30,0xcd,0xee,0x13,0x19,0xfc,0x8c,0x3d,0xbf,0xf6,0x8e,0x3b,0xbe,0x18,0xe1,0x32,0x21,0x3a,0xb6,0x36,0x34,0x6c,0x62,0xc0,0x3a,0xaa,0xe6,0xf8,0x11,0x52,0x05,0x38,0x55,0x2d,0x1c,0xb2,0x04,0x8f,0xaa,0x81,0x5b,0x91,0xe0,0x55,0x35,0x70,0x28,0x1a,0x28,0x69,0x18,0x9c,0x64,0x11,0x64,0x98,0xc4,0x30,0x2c,0xa2,0x02,0xb3,0x10,0x86,0x45,0x94,0x61,0x15,0x43,0x30,0x0b,0x72,0xea,0xa4,0xcb,0xce,0x1c,0x02,0xe7,0xf7,0xfd,0x4f,0x45,0xb4,0xb4,0x8a,0x7a,0x2d,0x26,0xcb,0x0f,0x28,0x1a,0xcd,0x97,0xc0,0x79,0x01,0xd5,0x75,0x9c,0x66,0x45,0x41,0x45,0xa1,0x10,0x40,0xe1,0x45,0xad,0xa3,0x82,0x9d,0x17,0x03,0x09,0x41,0x2e,0x22,0xa0,0x8a,0x08,0xaa,0x02,0x02,0xaa,0x88,0x0,0x1f,0xf8,0xef,0x20,0x17,0xe0,0x57,0xa5,0xb8,0x27,0x42,0x11,0xc0,0xa1,0x13,0x54,0xe8,0x98,0x02,0xbd,0xa0,0x42,0xcf,0x64,0xe8,0x05,0x15,0x5a,0xa6,0x40,0x2f,0x72,0x18,0x98,0x0c,0x1d,0x53,0x61,0x11,0xc3,0x74,0xa1,0x4b,0x62,0x79,0x24,0xd2,0xc1,0x3f,0x2e,0x0b,0xe0,0xfc,0x52,0xe0,0x2a,0x55,0x55,0x5f,0x45,0x8a,0x5c,0x1f,0x46,0x0c,0x45,0x05,0x43,0x50,0x15,0x20,0x73,0x86,0x10,0x17,0x10,0xe6,0x02,0x64,0x2e,0x40,0x86,0x80,0x70,0x84,0x3b,0x64,0x8c,0x01,0x5a,0xc6,0x21,0x41,0x81,0xc4,0x38,0x24,0xc6,0xa1,0x11,0x54,0x68,0xa1,0x42,0x27,0xd0,0x36,0x5b,0x0a,0xf2,0xea,0xa9,0x96,0x96,0xcf,0x8f,0x14,0xf6,0x1b,0x33,0x01,0x0,0x80,0x27,0x1b,0x1a,0x1e,0x06,0xf0,0x03,0xaa,0x73,0x82,0x48,0x09,0xda,0xb9,0x28,0x2e,0x18,0xee,0xcc,0xff,0xe8,0x96,0xdc,0x38,0x39,0xd5,0xd2,0xb2,0x81,0x31,0xf6,0x1a,0xd5,0x3b,0x41,0x24,0x1d,0x85,0x73,0x7e,0x5b,0xb4,0x83,0x7f,0x42,0x16,0x0,0x0,0x3c,0xb3,0x69,0x53,0x99,0x22,0x08,0xbb,0x29,0x40,0x88,0x20,0x92,0xca,0xbf,0xac,0xa9,0xaf,0x7f,0x64,0x3c,0x1f,0x9c,0xd0,0x76,0xde,0xad,0xeb,0xd7,0xb7,0x33,0xce,0xaf,0x01,0xd0,0x41,0x6d,0x40,0x10,0x89,0x87,0x03,0xff,0x36,0xde,0xc1,0x3f,0x61,0x0b,0xe0,0x13,0x9e,0x6a,0x68,0x98,0xc3,0x81,0xb7,0x01,0xe4,0x52,0x93,0x10,0x44,0xc2,0xd8,0xb4,0xfa,0x8e,0x3b,0xee,0x62,0x6c,0xfc,0x7b,0xa9,0x31,0x09,0xe8,0x59,0x5d,0x5f,0x7f,0x08,0xc0,0xd7,0x01,0xf8,0xa8,0x4d,0x08,0x22,0x21,0x3c,0xa7,0x33,0x99,0xfe,0x61,0x22,0x83,0x3f,0x66,0x02,0x0,0x0,0x6b,0xea,0xeb,0x5f,0x65,0xc0,0x12,0x0,0x6d,0xd4,0x36,0x04,0x11,0x57,0x7e,0xa5,0x33,0x99,0xbe,0xbc,0x6a,0xd5,0xaa,0x09,0x9f,0x80,0x8a,0x79,0xb4,0xc8,0xd6,0xad,0x5b,0x27,0x33,0x45,0x79,0x09,0x69,0x7e,0xa7,0x0,0x41,0xa4,0xe6,0x92,0x1f,0xf7,0x4f,0x64,0xcd,0x1f,0x37,0x0b,0xe0,0x13,0xd6,0xae,0x5d,0xdb,0x2c,0xa9,0xea,0x55,0x60,0x6c,0x1f,0xb5,0x17,0x41,0xc4,0x8c,0x10,0x38,0xff,0xfb,0x58,0x0e,0xfe,0xb8,0x08,0x0,0x30,0xb0,0x3b,0x50,0x71,0xe6,0xcc,0x52,0x0,0x0f,0x01,0xa0,0x90,0x31,0x82,0x98,0x18,0x47,0x19,0xe7,0x0b,0xd6,0xac,0x5b,0xb7,0x31,0xd6,0x5f,0x1c,0xf7,0x93,0x25,0x4f,0xfd,0xee,0x77,0x37,0xaa,0x8c,0x6d,0x61,0x40,0x1e,0xb5,0x23,0x41,0x44,0xcd,0x1f,0x42,0xaa,0xfa,0x77,0xeb,0xd7,0xaf,0x77,0xc7,0xe3,0xcb,0x13,0x72,0xb4,0x6c,0xf3,0xe6,0xcd,0xb5,0x22,0xe7,0x8f,0x01,0xf8,0x3c,0xb5,0x27,0x41,0x44,0xb4,0xd8,0xef,0x63,0x9c,0x3f,0xb0,0xba,0xbe,0xfe,0xd7,0x13,0xf5,0xf4,0x27,0x5d,0x0,0x06,0xad,0x81,0xcd,0x9b,0xaf,0x51,0x39,0x7f,0x8c,0x01,0x33,0xa8,0x89,0x09,0x62,0x58,0x14,0xc6,0xf9,0xe3,0x61,0xc6,0x1e,0xac,0xaf,0xaf,0x77,0xc4,0xbb,0xb0,0x84,0x1f,0x2e,0xdf,0xba,0x75,0xab,0x09,0xb2,0x7c,0x3f,0x63,0xec,0x1e,0x0,0x16,0x6a,0x6f,0x82,0x18,0x64,0x37,0x03,0xbe,0xb7,0xba,0xbe,0xfe,0xbd,0x44,0x15,0x98,0xb4,0xec,0x12,0xdb,0x1e,0x7f,0xdc,0x1c,0x34,0x1a,0xd7,0x03,0xf8,0x67,0x0,0xa5,0xd4,0xf6,0x44,0xb6,0x5a,0xfb,0x9c,0xb1,0x17,0x38,0x63,0x3f,0xb9,0xfd,0xf6,0xdb,0xf7,0x24,0xba,0xf0,0xa4,0xa7,0x97,0xd9,0xb6,0x71,0xa3,0x35,0xa0,0xd1,0xfc,0x03,0x13,0x84,0x75,0xe0,0x7c,0x0a,0xf5,0x07,0x22,0x4b,0x08,0x32,0xe0,0x05,0x55,0x55,0x7f,0xb1,0x76,0xfd,0xfa,0x5d,0xc9,0x7a,0x88,0x94,0xca,0x2f,0xb5,0x79,0xf3,0xe6,0x59,0x22,0xe7,0x5f,0x03,0xb0,0x06,0x40,0x0d,0xf5,0x11,0x22,0xc3,0x08,0x73,0xc6,0x5e,0x06,0xe7,0x5b,0xf5,0x26,0xd3,0xf3,0xab,0x56,0xad,0x4a,0xfa,0xfd,0x64,0x29,0x99,0x60,0xee,0xcd,0x0d,0x1b,0xa4,0xd6,0xea,0xea,0xa5,0x9c,0xf3,0x6b,0x19,0x63,0xd7,0x82,0xb1,0xc5,0xe0,0x9c,0xee,0xe4,0x22,0xd2,0x91,0x0e,0x06,0xbc,0xc6,0x19,0x7b,0x4d,0xe6,0xfc,0x95,0xfa,0xfa,0xfa,0xce,0x54,0x7a,0xb8,0xb4,0xc8,0x30,0xf9,0xd4,0x53,0x4f,0xe5,0xa8,0xe1,0xf0,0xe5,0x60,0x6c,0x36,0x38,0x9f,0x2e,0x70,0x3e,0x93,0x33,0x36,0x03,0x74,0xfa,0x90,0x48,0x99,0x91,0xc4,0x64,0x70,0xde,0xcc,0x81,0xa3,0x02,0xe7,0x27,0x38,0x70,0x5c,0x11,0x84,0xf7,0x47,0xbb,0x97,0x8f,0x04,0x20,0x06,0xfe,0x03,0x8f,0x46,0xa3,0xd5,0x01,0x16,0xce,0x98,0x89,0x31,0xa6,0xa5,0x9e,0x48,0x24,0x0a,0x55,0x96,0x9d,0x5c,0xab,0x0d,0x89,0xa2,0xe8,0xd6,0x68,0x34,0xde,0x58,0x1c,0xce,0x21,0x08,0x82,0x20,0x08,0x82,0x20,0x08,0x82,0x88,0x23,0xff,0x1f,0x03,0x13,0x3a,0x12,0x64,0x41,0x40,0x31,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+static const unsigned char app_icon_png[] = {
+	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
+	0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40,
+	0x08, 0x06, 0x00, 0x00, 0x00, 0xaa, 0x69, 0x71, 0xde, 0x00, 0x00, 0x00,
+	0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
+	0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x00,
+	0xdd, 0x00, 0x00, 0x00, 0xdd, 0x01, 0x70, 0x53, 0xa2, 0x07, 0x00, 0x00,
+	0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 0x74, 0x77, 0x61,
+	0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63,
+	0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00,
+	0x00, 0x0b, 0xe0, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0xed, 0x9b, 0x7b,
+	0x74, 0xd4, 0xd7, 0x71, 0xc7, 0x3f, 0x77, 0x57, 0x2b, 0xed, 0x4a, 0xbb,
+	0x7a, 0x20, 0xb4, 0x12, 0x12, 0x7e, 0x80, 0x1e, 0x08, 0xb0, 0x31, 0x36,
+	0x9c, 0x02, 0xb5, 0x63, 0xd0, 0x0a, 0x24, 0x70, 0x93, 0xda, 0x24, 0x81,
+	0xf8, 0x1c, 0xc7, 0x39, 0xf5, 0x49, 0x6d, 0x62, 0x37, 0x07, 0x6c, 0x04,
+	0xd8, 0x75, 0x82, 0xab, 0xc4, 0x75, 0x4a, 0x8c, 0x54, 0x3b, 0xad, 0xc3,
+	0x69, 0x4c, 0xeb, 0xe4, 0x70, 0xda, 0xb4, 0x91, 0x0d, 0x7e, 0x61, 0x1e,
+	0x32, 0x48, 0x22, 0xad, 0xeb, 0x1a, 0x0c, 0x18, 0x4c, 0x8c, 0x41, 0x36,
+	0xa0, 0x37, 0x7a, 0x3f, 0x56, 0x48, 0x2b, 0x69, 0xf7, 0x37, 0xfd, 0x43,
+	0x42, 0x68, 0xd9, 0xdf, 0xae, 0x56, 0xab, 0x45, 0xd4, 0x29, 0xdf, 0x73,
+	0xf4, 0x87, 0xee, 0xcc, 0x6f, 0xee, 0xcc, 0xec, 0xbd, 0x73, 0xef, 0xcc,
+	0x6f, 0x7e, 0x70, 0x03, 0x37, 0xf0, 0xff, 0x1a, 0xea, 0x5a, 0x09, 0x5e,
+	0x55, 0x52, 0x62, 0xec, 0xac, 0x9e, 0x3c, 0xd7, 0x20, 0xea, 0x1b, 0xa2,
+	0xf8, 0xba, 0xc0, 0x4b, 0xa5, 0x1b, 0x72, 0xfe, 0x2d, 0x98, 0x67, 0xf3,
+	0x8b, 0x2a, 0x1e, 0x56, 0x50, 0xa8, 0x29, 0x76, 0x2b, 0x4d, 0xde, 0x8d,
+	0xbd, 0xd4, 0xfc, 0xfb, 0xd7, 0x0b, 0x57, 0xf7, 0x5f, 0x0b, 0x3d, 0xc3,
+	0xee, 0x80, 0xbc, 0xa2, 0xb2, 0x79, 0x88, 0x7a, 0x54, 0x29, 0xbe, 0x03,
+	0xc4, 0x8f, 0x20, 0x7d, 0xd1, 0x62, 0xb3, 0xcd, 0x3a, 0xba, 0x66, 0xfe,
+	0x40, 0xa0, 0xe7, 0xe7, 0xfd, 0xea, 0x63, 0xd3, 0x64, 0xa7, 0xf3, 0x34,
+	0x90, 0x3e, 0x62, 0xb8, 0x43, 0x84, 0xdf, 0xa1, 0x64, 0x7b, 0xe9, 0x06,
+	0xc7, 0xd1, 0x70, 0xea, 0x1b, 0x36, 0x07, 0xe4, 0x6d, 0x2d, 0x5b, 0x60,
+	0x50, 0x86, 0x9f, 0x09, 0xe2, 0xf0, 0xcb, 0x24, 0xea, 0xb1, 0xfd, 0x1b,
+	0x97, 0x6c, 0x0f, 0x24, 0x67, 0x79, 0x71, 0xf9, 0x1a, 0x11, 0xfe, 0xc9,
+	0x1f, 0x5d, 0xa1, 0xca, 0x34, 0xd1, 0x9e, 0x2d, 0xdd, 0xe8, 0xf8, 0x68,
+	0x1c, 0xea, 0x0e, 0xc3, 0x10, 0x0e, 0x21, 0x83, 0x50, 0x8f, 0x04, 0x34,
+	0x1e, 0x40, 0xc9, 0x5f, 0xaf, 0x2a, 0x29, 0x31, 0xfa, 0x23, 0xaf, 0x2a,
+	0x29, 0x31, 0x8a, 0xb0, 0x31, 0x90, 0x08, 0x41, 0x1c, 0x4a, 0xa9, 0xbf,
+	0x08, 0x4d, 0x47, 0x5f, 0x84, 0xcd, 0x01, 0x4a, 0xd1, 0x1d, 0x04, 0xdb,
+	0xb4, 0xae, 0x9a, 0xc9, 0x0f, 0xf8, 0x23, 0x3a, 0x6b, 0xec, 0xdf, 0xc4,
+	0x7b, 0xe9, 0xeb, 0xcf, 0x25, 0x41, 0xcd, 0x15, 0x14, 0x22, 0xc2, 0x25,
+	0x48, 0x09, 0xdd, 0x12, 0xcc, 0x86, 0x12, 0x55, 0x90, 0x57, 0x7c, 0xe8,
+	0xb0, 0x28, 0x2d, 0xd9, 0x28, 0x62, 0x07, 0xf0, 0x28, 0xd5, 0xa4, 0xc4,
+	0xd0, 0xa8, 0x89, 0xb6, 0x3e, 0xc8, 0x3d, 0x79, 0x69, 0x1c, 0xaa, 0x7a,
+	0x21, 0x6c, 0x0e, 0xd0, 0x94, 0xea, 0x54, 0x48, 0x30, 0xac, 0x8b, 0x94,
+	0x68, 0xd5, 0x4a, 0x40, 0x86, 0x42, 0x90, 0x41, 0x00, 0xb4, 0xa0, 0xe7,
+	0x12, 0xe8, 0x08, 0x45, 0x47, 0x3d, 0x84, 0x2f, 0x06, 0x88, 0x34, 0x84,
+	0x4d, 0xd6, 0xe8, 0x93, 0xd5, 0x87, 0x4b, 0x52, 0xd8, 0x1c, 0x60, 0x34,
+	0x4e, 0x9c, 0x03, 0x44, 0xc9, 0xc5, 0x70, 0xc9, 0x0a, 0x9b, 0x03, 0x3c,
+	0x9a, 0x4a, 0x08, 0x97, 0xac, 0xd1, 0x61, 0x98, 0x14, 0x36, 0x49, 0x01,
+	0xa9, 0x22, 0x2a, 0xaf, 0xa8, 0x3c, 0x3b, 0x10, 0xcb, 0x92, 0xc2, 0x72,
+	0x73, 0x5e, 0x71, 0xc5, 0x2f, 0x14, 0xb2, 0x33, 0x5c, 0x4a, 0x8d, 0x06,
+	0x85, 0xec, 0xcc, 0x2f, 0x2a, 0x7f, 0x79, 0x49, 0x61, 0xb9, 0x39, 0x10,
+	0x5f, 0x5e, 0x51, 0x79, 0x36, 0x12, 0x38, 0x34, 0x07, 0x24, 0xe6, 0x15,
+	0x97, 0xff, 0x8d, 0x12, 0x79, 0x0e, 0xd4, 0x6b, 0xee, 0x08, 0xcf, 0x8f,
+	0x0f, 0x3e, 0xb9, 0xb4, 0x71, 0x24, 0x7d, 0xd9, 0x8b, 0x87, 0x32, 0x0d,
+	0x06, 0x79, 0x03, 0x64, 0x4e, 0xf0, 0xea, 0x87, 0x13, 0xea, 0xa4, 0xa6,
+	0xa9, 0x6f, 0xbf, 0xbf, 0x69, 0x71, 0xe5, 0xc8, 0xd1, 0xdc, 0x97, 0x0f,
+	0x24, 0x1b, 0x3d, 0xc6, 0x17, 0x94, 0xc8, 0x23, 0xa2, 0xd4, 0x4f, 0x4b,
+	0x0b, 0x72, 0x7e, 0xe2, 0x57, 0x82, 0x3f, 0x42, 0xfe, 0xd6, 0xb2, 0xfb,
+	0x51, 0xec, 0x02, 0x75, 0x79, 0x95, 0x74, 0x0a, 0xb2, 0xa9, 0xb4, 0x20,
+	0x67, 0x3b, 0x4a, 0x49, 0xfe, 0xd6, 0xf2, 0xa5, 0x28, 0x4a, 0x80, 0x09,
+	0x5c, 0xfa, 0xba, 0x68, 0x57, 0x4a, 0x56, 0xed, 0x2b, 0x70, 0x1c, 0x44,
+	0x44, 0x2d, 0xff, 0xfb, 0x8a, 0xc7, 0x44, 0xd4, 0x8b, 0x20, 0xb1, 0x83,
+	0x64, 0xd1, 0x94, 0x62, 0xe5, 0xbe, 0x02, 0xc7, 0x3b, 0x7a, 0x0f, 0xeb,
+	0x3a, 0x60, 0x45, 0xd1, 0x81, 0x59, 0x1a, 0xc6, 0xff, 0x01, 0x6c, 0x3a,
+	0xe4, 0x83, 0xa2, 0xd4, 0x4e, 0x25, 0xf2, 0x12, 0x10, 0x15, 0x26, 0x23,
+	0xc6, 0x8b, 0x3e, 0x51, 0xea, 0x29, 0x25, 0xf2, 0x2d, 0x20, 0xd7, 0x97,
+	0xac, 0xba, 0x3c, 0x46, 0xb5, 0xf0, 0xc0, 0x53, 0x8b, 0x4f, 0xfb, 0x50,
+	0xae, 0x1e, 0x58, 0x55, 0x58, 0x12, 0xd9, 0x65, 0x4d, 0x3a, 0x0a, 0xdc,
+	0x76, 0x2d, 0x34, 0xbd, 0x7e, 0x50, 0x27, 0x5b, 0x6c, 0xd6, 0xf9, 0x57,
+	0x27, 0x63, 0x3e, 0x41, 0xb0, 0xcb, 0x66, 0x7f, 0x9a, 0x3f, 0x3a, 0xe3,
+	0x01, 0x64, 0x4e, 0x62, 0xb7, 0x73, 0xd3, 0xd5, 0xa3, 0x5e, 0x2b, 0xe0,
+	0xbe, 0xe2, 0x03, 0x59, 0x1e, 0x31, 0x9e, 0x00, 0x02, 0x46, 0xd7, 0xaf,
+	0x30, 0xfa, 0x0c, 0x78, 0xee, 0xda, 0xbb, 0x61, 0xe9, 0x67, 0x97, 0x07,
+	0xbc, 0x56, 0x80, 0x47, 0x22, 0xb6, 0xf3, 0xc7, 0x6b, 0x3c, 0x40, 0x94,
+	0x47, 0x8c, 0xdb, 0x46, 0x0e, 0x5c, 0xb5, 0x05, 0xe4, 0xec, 0x44, 0x6a,
+	0x73, 0x3d, 0xa0, 0x0c, 0xde, 0x36, 0x7a, 0x3b, 0xc0, 0xd0, 0xf7, 0x34,
+	0x42, 0xf3, 0x84, 0x6a, 0x34, 0xb1, 0x68, 0x8d, 0x14, 0xf5, 0xec, 0xc8,
+	0x01, 0x2f, 0x07, 0xec, 0x5f, 0xbf, 0xbc, 0x4d, 0x54, 0xe0, 0x82, 0xc4,
+	0x57, 0x1a, 0x4a, 0xd6, 0xbf, 0xbb, 0x21, 0xa7, 0xc5, 0x6b, 0x48, 0x8f,
+	0x2f, 0x7f, 0x6b, 0xf9, 0x1b, 0x28, 0xbe, 0x35, 0x31, 0x5a, 0x4d, 0x10,
+	0x14, 0x6f, 0xef, 0x2f, 0xc8, 0xf1, 0x29, 0xc6, 0xe8, 0xe6, 0x02, 0x86,
+	0x28, 0xe3, 0xe3, 0x40, 0xd8, 0x32, 0xae, 0xeb, 0x0e, 0xa1, 0xd9, 0x6d,
+	0xf4, 0xac, 0xd1, 0x23, 0xe9, 0x3a, 0x60, 0xef, 0xda, 0x7b, 0x9b, 0x45,
+	0xf1, 0xca, 0xb5, 0xd5, 0x6a, 0xe2, 0x20, 0x06, 0x7e, 0x71, 0x75, 0x1e,
+	0x73, 0x19, 0x7e, 0x2b, 0x42, 0x06, 0x4d, 0xf5, 0x8b, 0x1a, 0xbd, 0xc2,
+	0x93, 0x68, 0x8d, 0xc2, 0x31, 0x33, 0x99, 0x69, 0x49, 0x31, 0x00, 0x9c,
+	0x6b, 0xee, 0xa6, 0xec, 0xb3, 0x46, 0xda, 0x2e, 0x85, 0xbf, 0x8c, 0x9f,
+	0x95, 0x62, 0xe3, 0x6b, 0x59, 0x49, 0xd8, 0x63, 0xcd, 0xb8, 0xfa, 0x3d,
+	0x9c, 0xa8, 0xe9, 0xe0, 0xf7, 0x67, 0x9b, 0x71, 0x7b, 0x02, 0x57, 0x93,
+	0x0c, 0x9a, 0xf2, 0xab, 0xcc, 0xb8, 0x4a, 0x62, 0xcb, 0x6f, 0x9f, 0xc2,
+	0x0f, 0x72, 0x32, 0x30, 0x9b, 0xae, 0x14, 0x7a, 0x1d, 0x33, 0x93, 0x79,
+	0x68, 0xd1, 0xad, 0x6c, 0x3b, 0x58, 0xc9, 0xfb, 0x7f, 0x08, 0xcf, 0x2e,
+	0x32, 0x19, 0x0d, 0xac, 0x5d, 0x96, 0xc5, 0xb2, 0xd9, 0x29, 0x5e, 0xe3,
+	0xf9, 0xb7, 0x4f, 0xe1, 0xa1, 0x45, 0xb7, 0xf2, 0xfc, 0x3b, 0xa7, 0xb8,
+	0xd0, 0x12, 0x5a, 0x99, 0x30, 0xe4, 0x82, 0x88, 0x63, 0x66, 0x32, 0x4f,
+	0xe6, 0xcd, 0x18, 0x36, 0xbe, 0xb6, 0xb6, 0x8e, 0xc3, 0x1f, 0x1d, 0xa6,
+	0xaa, 0xaa, 0x0a, 0x8b, 0xc9, 0x48, 0xc1, 0xf2, 0x6c, 0x96, 0x64, 0xdb,
+	0x43, 0x15, 0xef, 0x85, 0x8d, 0x2b, 0xb2, 0x59, 0x36, 0x3b, 0x05, 0xb7,
+	0xdb, 0xcd, 0xa9, 0x53, 0xa7, 0x38, 0x7c, 0xf8, 0x08, 0x4e, 0xa7, 0x13,
+	0x80, 0xb4, 0x04, 0x0b, 0x2f, 0xae, 0x9e, 0x8b, 0x3d, 0x36, 0xb4, 0xfb,
+	0x5b, 0x48, 0x2b, 0x20, 0x26, 0x2a, 0x82, 0xc7, 0x1d, 0x19, 0x00, 0xf4,
+	0xf7, 0xf7, 0xf3, 0xca, 0x3f, 0xfe, 0x92, 0xdd, 0xbb, 0x77, 0x0f, 0xd3,
+	0x1d, 0xb9, 0x0e, 0xd6, 0xaf, 0x7f, 0x8a, 0x27, 0x1c, 0x99, 0x1c, 0x3e,
+	0xd7, 0x46, 0x4f, 0xbf, 0x5b, 0x57, 0x8e, 0xc9, 0x68, 0x20, 0x21, 0x26,
+	0x92, 0xe6, 0x2e, 0x97, 0xdf, 0x72, 0xea, 0x82, 0xe9, 0x89, 0xdc, 0x3b,
+	0xc3, 0xce, 0xb9, 0x73, 0xe7, 0x78, 0xfe, 0xa7, 0xcf, 0x53, 0x55, 0x55,
+	0x0d, 0x40, 0x74, 0x74, 0x34, 0xeb, 0xd6, 0xad, 0x65, 0x59, 0xde, 0x32,
+	0x62, 0x2d, 0x26, 0x1e, 0x5d, 0x9c, 0xce, 0x0b, 0xef, 0xfe, 0x61, 0xcc,
+	0xb6, 0x84, 0xb4, 0x02, 0xee, 0x9d, 0x91, 0x84, 0xcd, 0x6c, 0x02, 0xe0,
+	0xb5, 0xd7, 0x7e, 0xed, 0x65, 0x3c, 0x40, 0xd9, 0xc1, 0x32, 0xb6, 0xfd,
+	0x72, 0x1b, 0xb1, 0x16, 0x13, 0x77, 0x67, 0x4e, 0xd6, 0x95, 0x61, 0x8f,
+	0x35, 0xf3, 0x9b, 0xbf, 0x5c, 0xc0, 0x8e, 0x47, 0x17, 0xf2, 0xdc, 0xfd,
+	0xb7, 0xf9, 0x2d, 0x4c, 0xac, 0x98, 0x33, 0x05, 0x97, 0xcb, 0xc5, 0xe6,
+	0x1f, 0x6f, 0x1e, 0x36, 0x1e, 0xa0, 0xa7, 0xa7, 0x87, 0x2d, 0x5b, 0x7e,
+	0xce, 0xa7, 0x9f, 0x9e, 0x02, 0xe0, 0x9e, 0xcc, 0xc9, 0xc4, 0x47, 0x47,
+	0x8e, 0xd9, 0x96, 0x90, 0x1c, 0x90, 0x95, 0x3c, 0x58, 0x6b, 0xe8, 0xee,
+	0xee, 0x66, 0xd7, 0xce, 0x5d, 0xba, 0x3c, 0x7b, 0xf7, 0xee, 0xa3, 0xa9,
+	0xa9, 0x89, 0x19, 0x53, 0x62, 0x75, 0xe9, 0xf7, 0x64, 0x26, 0x91, 0x68,
+	0x1d, 0x2c, 0x27, 0x2c, 0xca, 0x98, 0x4c, 0x4a, 0x9c, 0x45, 0x7f, 0xae,
+	0x94, 0x58, 0xf6, 0xec, 0xd9, 0x43, 0x43, 0x83, 0x6f, 0x3c, 0x11, 0x11,
+	0x76, 0xec, 0xd8, 0x01, 0x80, 0x52, 0x8a, 0xcc, 0x64, 0xeb, 0x98, 0x6d,
+	0x09, 0xc9, 0x01, 0x96, 0xc8, 0xc1, 0x7d, 0x5f, 0x57, 0x57, 0x87, 0xdb,
+	0xad, 0xbf, 0xbc, 0x45, 0x84, 0xaa, 0xaa, 0x2a, 0xa2, 0x23, 0xf5, 0xdf,
+	0x84, 0x45, 0x45, 0x78, 0x4f, 0x1d, 0x65, 0xd2, 0x57, 0xc5, 0x12, 0x69,
+	0xa4, 0xba, 0xba, 0xc6, 0xaf, 0x2e, 0xd5, 0x23, 0x56, 0x85, 0x25, 0x72,
+	0xec, 0x3b, 0x3a, 0x24, 0x07, 0xb4, 0x74, 0xf7, 0x01, 0x10, 0x17, 0x17,
+	0x17, 0x90, 0x2f, 0x3e, 0x3e, 0x9e, 0x16, 0x67, 0x5f, 0x28, 0x53, 0x0c,
+	0xa3, 0xd5, 0xd9, 0x47, 0x6c, 0xac, 0xfe, 0x2a, 0xba, 0x5a, 0x87, 0x50,
+	0xe6, 0x0a, 0xc9, 0x01, 0xc7, 0x2e, 0xb4, 0x01, 0x90, 0x92, 0x92, 0xc2,
+	0x9c, 0x39, 0xfa, 0xf5, 0xd0, 0xf4, 0xf4, 0x74, 0x32, 0xd2, 0x33, 0x38,
+	0x3a, 0xc4, 0x1b, 0x2a, 0x8e, 0x56, 0xb5, 0x93, 0x9b, 0xeb, 0x20, 0x22,
+	0x42, 0xff, 0xd7, 0xcd, 0xcf, 0xcf, 0x03, 0xc0, 0xe9, 0x1a, 0xe0, 0xec,
+	0xc5, 0xae, 0x31, 0xcb, 0x0f, 0xc9, 0x01, 0xc7, 0xab, 0xda, 0x39, 0x33,
+	0x34, 0xd9, 0x86, 0x8d, 0x05, 0xd8, 0xed, 0xde, 0xc7, 0x5d, 0x42, 0x42,
+	0x02, 0x9b, 0x9e, 0xde, 0xc4, 0xe9, 0x8b, 0x5d, 0x9c, 0xa8, 0x19, 0xdf,
+	0x5b, 0xac, 0x37, 0x8f, 0xd6, 0x30, 0x25, 0xed, 0x26, 0x7e, 0xf0, 0xf8,
+	0x1a, 0x0c, 0x06, 0x6f, 0x75, 0x17, 0x2d, 0x5a, 0xc8, 0xca, 0x6f, 0xae,
+	0x04, 0xe0, 0x8d, 0x23, 0x35, 0xb8, 0xb5, 0xa0, 0x5e, 0xcd, 0x79, 0x21,
+	0xa4, 0x63, 0x50, 0x80, 0x9f, 0xbf, 0x77, 0x9a, 0xe2, 0x07, 0xef, 0x64,
+	0xea, 0xd4, 0xa9, 0x6c, 0xff, 0xe7, 0x57, 0x79, 0xeb, 0xcd, 0xb7, 0xa8,
+	0xae, 0xae, 0x21, 0x35, 0x2d, 0x95, 0x07, 0x1e, 0xb8, 0x1f, 0xcd, 0x14,
+	0x4d, 0xc1, 0x7f, 0x1c, 0x0f, 0x45, 0xbc, 0x17, 0x2e, 0x76, 0xba, 0x78,
+	0xb9, 0xf4, 0x0c, 0x1b, 0x56, 0xae, 0x24, 0x3b, 0x3b, 0x9b, 0xf7, 0x4b,
+	0x0f, 0xd0, 0xdb, 0xdb, 0xcb, 0xbc, 0xf9, 0xf3, 0x58, 0xba, 0x34, 0x17,
+	0xa5, 0x14, 0x47, 0xce, 0xb7, 0xf1, 0xfa, 0x11, 0xff, 0x71, 0x22, 0x10,
+	0x42, 0xbe, 0x09, 0xd6, 0x77, 0xf4, 0xb2, 0xee, 0xb7, 0xc7, 0x78, 0xc2,
+	0x91, 0xc1, 0x82, 0xe9, 0x89, 0x3c, 0xfc, 0xbd, 0x87, 0x81, 0xc1, 0xe0,
+	0xf7, 0xe1, 0x17, 0xad, 0x6c, 0x2b, 0x3f, 0x16, 0x70, 0x4f, 0xb6, 0xf7,
+	0x5c, 0xb9, 0x9d, 0x8a, 0x08, 0x1d, 0x3d, 0xfe, 0x1b, 0x47, 0xca, 0x4e,
+	0x37, 0xd2, 0xde, 0xd3, 0xcf, 0xe3, 0x8e, 0x4c, 0xd6, 0x3d, 0xb9, 0x76,
+	0x78, 0xbc, 0x77, 0xc0, 0xc3, 0x9b, 0x47, 0x6b, 0xf9, 0xed, 0x87, 0x17,
+	0xd0, 0x64, 0xec, 0xbf, 0x3e, 0x8c, 0xf3, 0x2a, 0xdc, 0xd4, 0xe5, 0xa2,
+	0xf0, 0xad, 0x53, 0x4c, 0x8a, 0x89, 0x24, 0xdd, 0x3e, 0x58, 0x41, 0xff,
+	0xb2, 0xc9, 0x19, 0x54, 0x1e, 0x50, 0x76, 0xba, 0x91, 0xd9, 0x69, 0x71,
+	0x64, 0xa5, 0xd8, 0x78, 0xe7, 0x78, 0x1d, 0x1d, 0x3d, 0x81, 0x9f, 0x39,
+	0x5e, 0xd5, 0xce, 0x63, 0xbf, 0x3e, 0xcc, 0xb4, 0x24, 0x2b, 0x29, 0x71,
+	0x66, 0xba, 0x5d, 0x6e, 0xce, 0x36, 0x3a, 0xe9, 0x1b, 0xf0, 0x8c, 0xc7,
+	0x04, 0xff, 0x0e, 0x98, 0x96, 0x14, 0x93, 0x7a, 0xae, 0x25, 0xb8, 0x3e,
+	0x84, 0xb6, 0x4b, 0xfd, 0xb4, 0x9d, 0x6f, 0x1d, 0xd3, 0xc4, 0xfd, 0x6e,
+	0x8d, 0xe2, 0x7d, 0x9f, 0x8f, 0xe9, 0x19, 0x80, 0xf3, 0xcd, 0xdd, 0x9c,
+	0x6f, 0x1e, 0x5b, 0x7f, 0x44, 0x4a, 0xbc, 0xd9, 0xef, 0xbb, 0x44, 0x9f,
+	0x20, 0xb8, 0xe2, 0x1f, 0xf6, 0x44, 0x01, 0x14, 0x3f, 0x38, 0x77, 0xee,
+	0x33, 0x7f, 0x36, 0x8b, 0xd9, 0x69, 0x81, 0x8f, 0xba, 0xff, 0xcb, 0x88,
+	0x30, 0x1a, 0xb8, 0xff, 0xae, 0xa9, 0x3c, 0xfb, 0xf5, 0x59, 0x7e, 0xbb,
+	0x4e, 0xbc, 0x6e, 0xa0, 0x4b, 0x0a, 0xcb, 0x23, 0xa2, 0xac, 0x34, 0xa7,
+	0x25, 0x44, 0x1f, 0x7b, 0xc2, 0x91, 0xe1, 0xb8, 0xf3, 0x96, 0x04, 0xba,
+	0x5d, 0x6e, 0x56, 0x6f, 0xfb, 0xc0, 0xeb, 0xa1, 0x8c, 0x64, 0x1b, 0xcd,
+	0x5d, 0x2e, 0x3a, 0x7b, 0x03, 0x36, 0x7c, 0x4d, 0x18, 0x0c, 0x4a, 0x31,
+	0x75, 0x52, 0x34, 0x97, 0xfa, 0xdc, 0xb4, 0x76, 0x5f, 0x89, 0x3b, 0x77,
+	0x67, 0x26, 0xb1, 0xf9, 0xcf, 0x67, 0xd3, 0xd5, 0x3b, 0xe0, 0x79, 0xa6,
+	0xe4, 0x93, 0x17, 0xce, 0xb7, 0x5e, 0xca, 0x55, 0xa6, 0xde, 0xdc, 0xbd,
+	0x6b, 0xef, 0x1b, 0x66, 0xf2, 0xda, 0x02, 0x11, 0x66, 0x77, 0x2a, 0x44,
+	0xc4, 0xd7, 0xb5, 0xf7, 0x38, 0x7e, 0xb4, 0xf3, 0x24, 0xeb, 0x96, 0xcd,
+	0x60, 0xc9, 0x4c, 0xef, 0x23, 0xee, 0xe6, 0x49, 0xd1, 0xbc, 0xf2, 0xdd,
+	0x79, 0xc0, 0x60, 0x0c, 0xa8, 0x6c, 0x74, 0x52, 0xd9, 0xd8, 0x4d, 0x65,
+	0xa3, 0x93, 0xb3, 0x17, 0x9d, 0x38, 0x5d, 0xd7, 0xd6, 0x29, 0x4a, 0x41,
+	0x5a, 0x42, 0x34, 0x59, 0xc9, 0x36, 0x32, 0x92, 0x6d, 0x64, 0x25, 0xdb,
+	0x48, 0x4f, 0xb6, 0x62, 0x31, 0x19, 0xf9, 0xb4, 0xb6, 0x83, 0x8d, 0xbf,
+	0xfb, 0x64, 0x98, 0x37, 0x72, 0xe8, 0xb6, 0xf9, 0xa3, 0x9d, 0x27, 0x8d,
+	0xe7, 0x5a, 0x2e, 0x3d, 0x07, 0x80, 0xc7, 0x32, 0x05, 0xb8, 0x30, 0x6c,
+	0xb3, 0x97, 0xf4, 0xa8, 0xc8, 0x18, 0x46, 0x14, 0x17, 0x44, 0x27, 0x47,
+	0x33, 0x0f, 0x5d, 0x6d, 0x3f, 0xad, 0xed, 0x20, 0xca, 0x64, 0x64, 0xc1,
+	0xf4, 0x44, 0xee, 0xce, 0x4c, 0x1a, 0xa6, 0x1f, 0x39, 0xdf, 0xc6, 0xe6,
+	0x5d, 0x27, 0x75, 0x95, 0xcf, 0x4a, 0xb1, 0x11, 0x13, 0x35, 0x38, 0xa5,
+	0xdb, 0x23, 0xb8, 0x86, 0x02, 0x98, 0x02, 0x62, 0xcc, 0x57, 0x54, 0xa9,
+	0x6e, 0xed, 0xf1, 0xfa, 0x25, 0x2f, 0x23, 0xdd, 0x6e, 0x65, 0xcb, 0xaa,
+	0x3b, 0x86, 0x13, 0x31, 0x80, 0x8e, 0x9e, 0x7e, 0x4e, 0xd5, 0x76, 0x32,
+	0x3d, 0x29, 0x06, 0x8b, 0xc9, 0x6f, 0x03, 0xda, 0x30, 0xdc, 0x18, 0xbc,
+	0x92, 0x0e, 0x2f, 0x07, 0x98, 0x8c, 0xaa, 0x45, 0x0b, 0x32, 0xa8, 0xbe,
+	0x77, 0xa2, 0x9e, 0x8a, 0xcf, 0x9b, 0x88, 0x30, 0x28, 0xa6, 0x25, 0x59,
+	0xc9, 0x4c, 0xb6, 0xf1, 0x8d, 0xb9, 0xa9, 0xdc, 0x36, 0x55, 0x3f, 0x66,
+	0xcc, 0x4e, 0x8b, 0xa3, 0xf8, 0xc1, 0x3b, 0x83, 0x92, 0x5d, 0xd5, 0x7a,
+	0x89, 0x35, 0xbf, 0x39, 0xe2, 0x33, 0x7e, 0x4b, 0x62, 0x0c, 0x36, 0xb3,
+	0x89, 0x3d, 0x27, 0xeb, 0xf9, 0xf8, 0x42, 0x1b, 0x5f, 0x34, 0x76, 0xd3,
+	0xd4, 0xe5, 0x02, 0xe0, 0xc5, 0xd5, 0x73, 0xfd, 0xe6, 0x1d, 0x23, 0x21,
+	0xbd, 0x03, 0x4d, 0x23, 0xff, 0xf7, 0x72, 0xc0, 0xde, 0xb5, 0xf7, 0x36,
+	0xe7, 0x17, 0x55, 0xd4, 0x83, 0xa4, 0x02, 0x68, 0x9a, 0x60, 0x36, 0x19,
+	0xf9, 0xbb, 0x6f, 0xdf, 0xc1, 0xa1, 0x33, 0x4d, 0x7c, 0x50, 0xe9, 0x55,
+	0x51, 0x06, 0xc0, 0xad, 0xc9, 0xd0, 0x36, 0x70, 0x92, 0x91, 0x6c, 0x25,
+	0x25, 0x5e, 0x3f, 0xab, 0xb3, 0x0d, 0xfd, 0xc2, 0xbb, 0x8e, 0xd6, 0x50,
+	0xdb, 0xd6, 0xeb, 0x57, 0xc1, 0xe5, 0xb7, 0x4f, 0x21, 0xd1, 0x1a, 0x38,
+	0xad, 0xdd, 0x7b, 0xb2, 0x81, 0xca, 0x46, 0xa7, 0x5f, 0xfa, 0xf4, 0x24,
+	0x2b, 0x8b, 0xb3, 0xed, 0xe4, 0x0c, 0x15, 0x64, 0x3c, 0x57, 0x6e, 0x88,
+	0xb5, 0x07, 0x9f, 0x5d, 0xea, 0x75, 0x5c, 0xf9, 0x1e, 0x83, 0xc2, 0x01,
+	0x14, 0xdf, 0x03, 0x78, 0xfb, 0x78, 0x1d, 0x56, 0xb3, 0x89, 0x85, 0xe9,
+	0x89, 0xdc, 0x79, 0x4b, 0x02, 0x3f, 0xcc, 0xcd, 0xe4, 0x5c, 0x88, 0xa5,
+	0xa7, 0xcb, 0xf8, 0xe8, 0xcb, 0xd6, 0x80, 0xd7, 0xe3, 0x39, 0x37, 0xc5,
+	0x8f, 0xea, 0x00, 0x7f, 0x48, 0x8e, 0x33, 0xb3, 0xfd, 0x91, 0x3f, 0xe1,
+	0xa6, 0x49, 0xd1, 0xc0, 0xe0, 0x65, 0x6d, 0xc7, 0x07, 0xe7, 0x47, 0x96,
+	0xcb, 0x0e, 0x5c, 0xfd, 0x8c, 0x8f, 0x03, 0x94, 0x92, 0xed, 0xc2, 0xa0,
+	0x03, 0x6a, 0xda, 0x7a, 0xd8, 0xf2, 0xde, 0x67, 0x44, 0x99, 0x8c, 0x2c,
+	0x9c, 0x9e, 0xc8, 0xe2, 0x19, 0x76, 0xe6, 0x4f, 0x1b, 0x3c, 0x52, 0xfb,
+	0xfd, 0x14, 0x22, 0x0d, 0x0c, 0x06, 0x9f, 0x7e, 0x77, 0xf0, 0x6d, 0x6f,
+	0xc1, 0x22, 0x32, 0xc2, 0x7f, 0xea, 0x32, 0xe0, 0xd1, 0xb0, 0x99, 0x4d,
+	0xf4, 0xf6, 0x7b, 0x78, 0xe3, 0xe3, 0x1a, 0x0e, 0x7d, 0xde, 0xe4, 0xb3,
+	0x4a, 0x44, 0x69, 0x3e, 0x6d, 0xba, 0x3e, 0x0e, 0xd8, 0xb7, 0x21, 0xe7,
+	0xbf, 0xf2, 0xb6, 0x96, 0x1f, 0x52, 0x8a, 0xc5, 0x97, 0xc7, 0xfa, 0x06,
+	0x3c, 0x1c, 0x3a, 0xd3, 0xc4, 0xa1, 0x33, 0x4d, 0x44, 0x47, 0x46, 0x30,
+	0x3b, 0x2d, 0x96, 0xe3, 0x55, 0xed, 0x3e, 0x4a, 0xb8, 0x3d, 0x42, 0x94,
+	0xc9, 0xc8, 0xdb, 0x6b, 0xbf, 0x46, 0xb3, 0xb3, 0x8f, 0xfa, 0x8e, 0x5e,
+	0xea, 0xda, 0x07, 0xff, 0xe2, 0x2c, 0x26, 0x1f, 0x7e, 0x7f, 0x30, 0x19,
+	0x0d, 0x38, 0x66, 0x26, 0x93, 0x96, 0x60, 0x21, 0x2d, 0x21, 0x9a, 0xd4,
+	0x04, 0x0b, 0xa9, 0xf1, 0x16, 0xac, 0x43, 0x01, 0x74, 0x40, 0xc7, 0xf9,
+	0xaf, 0x1c, 0xa8, 0x24, 0x3e, 0xc6, 0xc4, 0xe7, 0xf5, 0x5d, 0xba, 0xe5,
+	0x35, 0x85, 0x2a, 0xdb, 0x5f, 0x90, 0xfb, 0xdf, 0xa3, 0x3a, 0x00, 0x40,
+	0x19, 0xe5, 0xaf, 0xd0, 0x0c, 0xc7, 0x40, 0x7c, 0xd6, 0x62, 0x4f, 0xbf,
+	0x9b, 0x23, 0xe7, 0xf5, 0x53, 0xdc, 0xd7, 0x8f, 0x54, 0xd3, 0xd1, 0xd3,
+	0xcf, 0xd4, 0x49, 0xd1, 0xa4, 0xc6, 0x5b, 0x48, 0xb7, 0x5b, 0x99, 0x7b,
+	0xb3, 0x77, 0x07, 0xcd, 0x68, 0x19, 0x9b, 0x47, 0x13, 0x62, 0x2d, 0x26,
+	0x36, 0xdd, 0x37, 0x13, 0x00, 0x4d, 0x84, 0xa6, 0xae, 0x3e, 0xce, 0x34,
+	0x74, 0x51, 0xdf, 0xd1, 0xcb, 0x17, 0x8d, 0xdd, 0x54, 0xe9, 0x6c, 0xc3,
+	0x86, 0xce, 0x5e, 0x1a, 0x3a, 0xfd, 0xc6, 0x96, 0x3e, 0xb7, 0x51, 0xfd,
+	0x50, 0x8f, 0x10, 0xa0, 0x47, 0xa8, 0xe2, 0x51, 0x94, 0xbc, 0x1a, 0x50,
+	0xdb, 0x20, 0x10, 0x6b, 0x31, 0x91, 0x1a, 0x6f, 0x21, 0x2d, 0xc1, 0x82,
+	0xd5, 0x6c, 0x62, 0xf7, 0x27, 0x75, 0x23, 0x83, 0x92, 0x0f, 0x6e, 0x4e,
+	0x8c, 0x61, 0xfe, 0xad, 0x09, 0x34, 0x74, 0xba, 0xa8, 0x6d, 0xeb, 0x91,
+	0xfa, 0x4e, 0x17, 0x1e, 0x8f, 0x36, 0xae, 0xae, 0x76, 0x51, 0xf2, 0xfd,
+	0xd2, 0x02, 0xc7, 0x6b, 0x7a, 0xb4, 0x80, 0x82, 0xf3, 0x8b, 0xcb, 0xb7,
+	0x20, 0x3c, 0x3d, 0x9e, 0xc9, 0xaf, 0x37, 0x04, 0xfe, 0xb6, 0x74, 0x43,
+	0xce, 0x66, 0x7f, 0xf4, 0x80, 0x05, 0x91, 0xfd, 0x05, 0x39, 0xcf, 0x28,
+	0xe1, 0x27, 0x83, 0x72, 0xbe, 0x72, 0x10, 0x94, 0x7a, 0x2e, 0x90, 0xf1,
+	0x10, 0xe4, 0x07, 0x13, 0xf9, 0x5b, 0xcb, 0x56, 0xa3, 0xd4, 0xbf, 0x00,
+	0x63, 0x2f, 0xbb, 0x5e, 0x1f, 0x38, 0x51, 0xf2, 0xc8, 0xfe, 0x02, 0xc7,
+	0xa8, 0xcd, 0x9b, 0x41, 0xef, 0xad, 0xbc, 0xad, 0x87, 0xa6, 0x29, 0xa5,
+	0xbd, 0x0a, 0x2c, 0x1d, 0x97, 0x6a, 0xd7, 0x1a, 0x8a, 0xff, 0xd4, 0x3c,
+	0x86, 0xef, 0x5f, 0xdd, 0x3c, 0xe9, 0x9f, 0x7d, 0x2c, 0x10, 0x51, 0x79,
+	0x45, 0x15, 0xdf, 0x51, 0x8a, 0xe7, 0x81, 0x8c, 0x50, 0xf4, 0xbb, 0x86,
+	0xa8, 0x14, 0xc5, 0xe6, 0xd2, 0xf5, 0x4b, 0x4a, 0x50, 0x41, 0xbc, 0xd5,
+	0x1d, 0x42, 0x48, 0xd1, 0x75, 0xde, 0xaf, 0x3e, 0x36, 0x25, 0x75, 0x3b,
+	0x1f, 0x12, 0xe1, 0x49, 0xe0, 0x8e, 0x50, 0x64, 0x84, 0x11, 0x9f, 0xa0,
+	0xe4, 0xa5, 0x16, 0x6b, 0xec, 0xbf, 0x8f, 0xf6, 0x41, 0x96, 0x1e, 0xc6,
+	0xfd, 0xd1, 0xd4, 0xf2, 0xa2, 0xf2, 0x7b, 0x34, 0xe1, 0xbb, 0x4a, 0xa9,
+	0x55, 0x20, 0x61, 0xeb, 0xe2, 0x1e, 0x05, 0xad, 0xc0, 0xeb, 0x9a, 0x26,
+	0xff, 0xfa, 0xfe, 0x26, 0xc7, 0x07, 0xa3, 0x72, 0x07, 0x40, 0xd8, 0xbe,
+	0x1a, 0x5b, 0x52, 0x58, 0x1e, 0x11, 0x69, 0xd5, 0xfe, 0xd4, 0x80, 0x61,
+	0x85, 0xc0, 0x62, 0xe0, 0x2e, 0xc2, 0xd7, 0x4a, 0xeb, 0x02, 0x8e, 0x8b,
+	0x92, 0x0a, 0xe5, 0x31, 0xec, 0xed, 0xeb, 0x91, 0x0f, 0x2b, 0x0a, 0x73,
+	0xf4, 0x5f, 0x49, 0x8d, 0x11, 0xd7, 0xee, 0xc3, 0xc9, 0xc2, 0x92, 0x48,
+	0xa7, 0xd5, 0x7e, 0x87, 0x86, 0xcc, 0x42, 0xc9, 0x0c, 0x25, 0x6a, 0x3a,
+	0x8a, 0x54, 0x84, 0x24, 0x50, 0x76, 0x10, 0xc5, 0x95, 0x46, 0xeb, 0x76,
+	0x50, 0x02, 0xd2, 0x04, 0xaa, 0x09, 0xa4, 0x01, 0xd4, 0x97, 0x28, 0xed,
+	0x8c, 0xa6, 0xd4, 0x67, 0x6d, 0x31, 0xb6, 0x13, 0xa1, 0x2c, 0xef, 0x1b,
+	0xb8, 0x81, 0x1b, 0x18, 0x15, 0xff, 0x0b, 0x12, 0x38, 0x4d, 0x79, 0xd2,
+	0x8f, 0xa8, 0xd2, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
+	0x42, 0x60, 0x82
 };
 
 static const Color boot_splash_bg_color = Color(224/255.0,224/255.0,224/255.0);
diff --git a/methods.py b/methods.py
index 7128b334ec..74c282b8cf 100755
--- a/methods.py
+++ b/methods.py
@@ -1326,7 +1326,9 @@ def android_add_aidl_dir(self,subpath):
 def android_add_jni_dir(self,subpath):
 	base_path = self.Dir(".").abspath+"/modules/"+self.current_module+"/"+subpath
 	self.android_jni_dirs.append(base_path)
-
+def android_add_default_config(self,config):
+	self.android_default_config.append(config)
+	
 def android_add_to_manifest(self,file):
 	base_path = self.Dir(".").abspath+"/modules/"+self.current_module+"/"+file
 	f = open(base_path,"rb")
diff --git a/modules/cscript/SCsub b/modules/cscript/SCsub
new file mode 100644
index 0000000000..403fe68f66
--- /dev/null
+++ b/modules/cscript/SCsub
@@ -0,0 +1,5 @@
+Import('env')
+
+env.add_source_files(env.modules_sources,"*.cpp")
+
+Export('env')
diff --git a/modules/cscript/config.py b/modules/cscript/config.py
new file mode 100644
index 0000000000..ea7e83378a
--- /dev/null
+++ b/modules/cscript/config.py
@@ -0,0 +1,11 @@
+
+
+def can_build(platform):
+  return True
+
+
+def configure(env):
+	pass
+
+
+
diff --git a/modules/cscript/godot_c.cpp b/modules/cscript/godot_c.cpp
new file mode 100644
index 0000000000..d5c1b53dfe
--- /dev/null
+++ b/modules/cscript/godot_c.cpp
@@ -0,0 +1,2 @@
+#include "godot_c.h"
+
diff --git a/modules/cscript/godot_c.h b/modules/cscript/godot_c.h
new file mode 100644
index 0000000000..b0465d8524
--- /dev/null
+++ b/modules/cscript/godot_c.h
@@ -0,0 +1,568 @@
+#ifndef GODOT_C_H
+#define GODOT_C_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#if defined(GDAPI_BUILT_IN) || !defined(WINDOWS_ENABLED)
+#define GDAPI
+#elif defined(GDAPI_EXPORTS)
+#define GDAPI __declspec(dllexport)
+#else
+#define GDAPI __declspec(dllimport)
+#endif
+
+
+#define GODOT_API_VERSION 1
+
+
+typedef int godot_bool;
+
+#define GODOT_FALSE 0
+#define GODOT_TRUE 1
+
+////// Image
+
+
+#define GODOT_IMAGE_FORMAT_GRAYSCALE 0
+#define GODOT_IMAGE_FORMAT_INTENSITY 1
+#define GODOT_IMAGE_FORMAT_GRAYSCALE_ALPHA 2
+#define GODOT_IMAGE_FORMAT_RGB 3
+#define GODOT_IMAGE_FORMAT_RGBA 4
+#define GODOT_IMAGE_FORMAT_INDEXED 5
+#define GODOT_IMAGE_FORMAT_INDEXED_ALPHA 6
+#define GODOT_IMAGE_FORMAT_YUV_422 7
+#define GODOT_IMAGE_FORMAT_YUV_444 8
+#define GODOT_IMAGE_FORMAT_BC1 9
+#define GODOT_IMAGE_FORMAT_BC2 10
+#define GODOT_IMAGE_FORMAT_BC3 11
+#define GODOT_IMAGE_FORMAT_BC4 12
+#define GODOT_IMAGE_FORMAT_BC5 13
+#define GODOT_IMAGE_FORMAT_PVRTC2 14
+#define GODOT_IMAGE_FORMAT_PVRTC2_ALPHA 15
+#define GODOT_IMAGE_FORMAT_PVRTC4 16
+#define GODOT_IMAGE_FORMAT_PVRTC4_ALPHA 17
+#define GODOT_IMAGE_FORMAT_ETC 18
+#define GODOT_IMAGE_FORMAT_ATC 19
+#define GODOT_IMAGE_FORMAT_ATC_ALPHA_EXPLICIT 20
+#define GODOT_IMAGE_FORMAT_ATC_ALPHA_INTERPOLATED 21
+
+typedef void* godot_image;
+
+godot_image GDAPI godot_image_create_empty();
+godot_image GDAPI godot_image_create(int p_width,int p_height,int p_format,int p_use_mipmaps);
+godot_image GDAPI godot_image_create_with_data(int p_width,int p_height,int p_format,int p_use_mipmaps,unsigned char* p_buffer);
+int GDAPI godot_image_get_width(godot_image p_image);
+int GDAPI godot_image_get_height(godot_image p_image);
+int GDAPI godot_image_get_format(godot_image p_image);
+int GDAPI godot_image_get_mipmap_count(godot_image p_image);
+godot_image GDAPI godot_image_copy(godot_image p_image);
+void GDAPI godot_image_free(godot_image p_image);
+
+
+////// RID
+
+typedef void* godot_rid;
+
+godot_rid GDAPI godot_rid_create();
+godot_rid GDAPI godot_rid_copy(godot_rid p_rid);
+void GDAPI godot_rid_free(godot_rid p_rid);
+
+////// Variant (forward declared)
+
+typedef void* godot_variant;
+
+
+////// Dictionary
+
+typedef void* godot_dictionary;
+
+godot_dictionary GDAPI godot_dictionary_create();
+void GDAPI godot_dictionary_has(godot_dictionary p_dictionary,godot_variant p_key);
+godot_variant GDAPI godot_dictionary_get(godot_dictionary p_dictionary,godot_variant p_key);
+void GDAPI godot_dictionary_insert(godot_dictionary p_dictionary,godot_variant p_key,godot_variant p_value);
+void GDAPI godot_dictionary_remove(godot_dictionary p_dictionary,godot_variant p_key);
+void GDAPI godot_dictionary_clear(godot_dictionary p_dictionary);
+int GDAPI godot_dictionary_get_size(godot_dictionary p_dictionary);
+void GDAPI godot_dictionary_get_keys(godot_dictionary p_dictionary,godot_variant* p_keys);
+godot_dictionary GDAPI godot_dictionary_copy(godot_dictionary p_dictionary);
+void GDAPI godot_dictionary_free(godot_dictionary p_dictionary);
+
+////// Array
+
+typedef void* godot_array;
+
+godot_array GDAPI godot_array_create();
+godot_variant GDAPI godot_array_get(godot_array p_array,int p_index);
+void GDAPI godot_array_set(godot_array p_array,int p_index,godot_variant p_value);
+void GDAPI godot_array_resize(godot_array p_array,int p_size);
+void GDAPI godot_array_insert(godot_array p_array,int p_position,godot_variant p_value);
+void GDAPI godot_array_remove(godot_array p_array,int p_position);
+void GDAPI godot_array_clear(godot_array p_array);
+int GDAPI godot_array_get_size(godot_array p_array);
+int GDAPI godot_array_find(godot_array p_array,godot_variant p_value,int p_from_pos=-1);
+godot_array GDAPI godot_array_copy(godot_array p_array);
+void GDAPI godot_array_free(godot_array p_array);
+
+////// InputEvent
+
+#define INPUT_EVENT_BUTTON_LEFT 1
+#define INPUT_EVENT_BUTTON_RIGHT 2
+#define INPUT_EVENT_BUTTON_MIDDLE 3
+#define INPUT_EVENT_BUTTON_WHEEL_UP 4
+#define INPUT_EVENT_BUTTON_WHEEL_DOWN 5
+#define INPUT_EVENT_BUTTON_WHEEL_LEFT 6
+#define INPUT_EVENT_BUTTON_WHEEL_RIGHT 7
+#define INPUT_EVENT_BUTTON_MASK_LEFT (1<<(INPUT_EVENT_BUTTON_LEFT-1))
+#define INPUT_EVENT_BUTTON_MASK_RIGHT (1<<(INPUT_EVENT_BUTTON_RIGHT-1))
+#define INPUT_EVENT_BUTTON_MASK_MIDDLE (1<<(INPUT_EVENT_BUTTON_MIDDLE-1))
+
+#define INPUT_EVENT_TYPE_NONE 0
+#define INPUT_EVENT_TYPE_KEY 1
+#define INPUT_EVENT_TYPE_MOUSE_MOTION 2
+#define INPUT_EVENT_TYPE_MOUSE_BUTTON 3
+#define INPUT_EVENT_TYPE_JOYSTICK_MOTION 4
+#define INPUT_EVENT_TYPE_JOYSTICK_BUTTON 5
+#define INPUT_EVENT_TYPE_SCREEN_TOUCH 6
+#define INPUT_EVENT_TYPE_SCREEN_DRAG 7
+#define INPUT_EVENT_TYPE_ACTION 8
+
+typedef void* godot_input_event;
+
+
+godot_input_event GDAPI godot_input_event_create();
+godot_input_event GDAPI godot_input_event_copy(godot_input_event p_input_event);
+void GDAPI godot_input_event_free(godot_input_event p_input_event);
+
+int GDAPI godot_input_event_get_type(godot_input_event p_event);
+int GDAPI godot_input_event_get_device(godot_input_event p_event);
+
+godot_bool GDAPI godot_input_event_mod_has_alt(godot_input_event p_event);
+godot_bool GDAPI godot_input_event_mod_has_ctrl(godot_input_event p_event);
+godot_bool GDAPI godot_input_event_mod_has_command(godot_input_event p_event);
+godot_bool GDAPI godot_input_event_mod_has_shift(godot_input_event p_event);
+godot_bool GDAPI godot_input_event_mod_has_meta(godot_input_event p_event);
+
+int GDAPI godot_input_event_key_get_scancode(godot_input_event p_event);
+int GDAPI godot_input_event_key_get_unicode(godot_input_event p_event);
+godot_bool GDAPI godot_input_event_key_is_pressed(godot_input_event p_event);
+godot_bool GDAPI godot_input_event_key_is_echo(godot_input_event p_event);
+
+int GDAPI godot_input_event_mouse_get_x(godot_input_event p_event);
+int GDAPI godot_input_event_mouse_get_y(godot_input_event p_event);
+int GDAPI godot_input_event_mouse_get_global_x(godot_input_event p_event);
+int GDAPI godot_input_event_mouse_get_global_y(godot_input_event p_event);
+int GDAPI godot_input_event_mouse_get_button_mask(godot_input_event p_event);
+
+int GDAPI godot_input_event_mouse_button_get_button_index(godot_input_event p_event);
+godot_bool GDAPI godot_input_event_mouse_button_is_pressed(godot_input_event p_event);
+godot_bool GDAPI godot_input_event_mouse_button_is_doubleclick(godot_input_event p_event);
+
+int GDAPI godot_input_event_mouse_motion_get_relative_x(godot_input_event p_event);
+int GDAPI godot_input_event_mouse_motion_get_relative_y(godot_input_event p_event);
+
+int GDAPI godot_input_event_mouse_motion_get_speed_x(godot_input_event p_event);
+int GDAPI godot_input_event_mouse_motion_get_speed_y(godot_input_event p_event);
+
+int GDAPI godot_input_event_joystick_motion_get_axis(godot_input_event p_event);
+float GDAPI godot_input_event_joystick_motion_get_axis_value(godot_input_event p_event);
+
+int GDAPI godot_input_event_joystick_button_get_button_index(godot_input_event p_event);
+godot_bool GDAPI godot_input_event_joystick_button_is_pressed(godot_input_event p_event);
+float GDAPI godot_input_event_joystick_button_get_pressure(godot_input_event p_event);
+
+
+int GDAPI godot_input_event_screen_touch_get_index(godot_input_event p_event);
+int GDAPI godot_input_event_screen_touch_get_x(godot_input_event p_event);
+int GDAPI godot_input_event_screen_touch_get_y(godot_input_event p_event);
+int GDAPI godot_input_event_screen_touch_is_pressed(godot_input_event p_event);
+
+int GDAPI godot_input_event_screen_drag_get_index(godot_input_event p_event);
+int GDAPI godot_input_event_screen_drag_get_x(godot_input_event p_event);
+int GDAPI godot_input_event_screen_drag_get_y(godot_input_event p_event);
+int GDAPI godot_input_event_screen_drag_get_relative_x(godot_input_event p_event);
+int GDAPI godot_input_event_screen_drag_get_relative_y(godot_input_event p_event);
+int GDAPI godot_input_event_screen_drag_get_speed_x(godot_input_event p_event);
+int GDAPI godot_input_event_screen_drag_get_speed_y(godot_input_event p_event);
+
+int GDAPI godot_input_event_is_action(godot_input_event p_event,char *p_action);
+int GDAPI godot_input_event_is_action_pressed(godot_input_event p_event,char *p_action);
+
+////// ByteArray
+
+typedef void* godot_byte_array;
+
+godot_byte_array GDAPI godot_byte_array_create();
+godot_byte_array GDAPI godot_byte_array_copy(godot_byte_array p_byte_array);
+void GDAPI godot_byte_array_free(godot_byte_array p_byte_array);
+
+int GDAPI godot_byte_array_get_size(godot_byte_array p_byte_array);
+unsigned char GDAPI godot_byte_array_get(godot_byte_array p_byte_array,int p_index);
+void GDAPI godot_byte_array_set(godot_byte_array p_byte_array,int p_index,unsigned char p_value);
+void GDAPI godot_byte_array_remove(godot_byte_array p_byte_array,int p_index);
+void GDAPI godot_byte_array_clear(godot_byte_array p_byte_array);
+
+typedef void* godot_byte_array_lock;
+
+godot_byte_array_lock GDAPI godot_byte_array_get_lock(godot_byte_array p_byte_array);
+unsigned char GDAPI *godot_byte_array_lock_get_pointer(godot_byte_array_lock p_byte_array_lock);
+void GDAPI godot_byte_array_lock_free(godot_byte_array_lock p_byte_array_lock);
+
+
+godot_image GDAPI godot_image_create_with_array(int p_width,int p_height,int p_format,int p_use_mipmaps,godot_array p_array);
+godot_byte_array GDAPI godot_image_get_data(godot_image p_image);
+
+
+////// IntArray
+
+typedef void* godot_int_array;
+
+godot_int_array GDAPI godot_int_array_create();
+godot_int_array GDAPI godot_int_array_copy(godot_int_array p_int_array);
+void GDAPI godot_int_array_free(godot_int_array p_int_array);
+
+int GDAPI godot_int_array_get_size(godot_int_array p_int_array);
+int GDAPI godot_int_array_get(godot_int_array p_int_array,int p_index);
+void GDAPI godot_int_array_set(godot_int_array p_int_array,int p_index,int p_value);
+void GDAPI godot_int_array_remove(godot_int_array p_int_array,int p_index);
+void GDAPI godot_int_array_clear(godot_int_array p_int_array);
+
+typedef void* godot_int_array_lock;
+
+godot_int_array_lock GDAPI godot_int_array_get_lock(godot_int_array p_int_array);
+int GDAPI *godot_int_array_lock_get_pointer(godot_int_array_lock p_int_array_lock);
+void GDAPI godot_int_array_lock_free(godot_int_array_lock p_int_array_lock);
+
+////// RealArray
+
+typedef void* godot_real_array;
+
+
+godot_real_array GDAPI godot_real_array_create();
+godot_real_array GDAPI godot_real_array_copy(godot_real_array p_real_array);
+void GDAPI godot_real_array_free(godot_real_array p_real_array);
+
+int GDAPI godot_real_array_get_size(godot_real_array p_real_array);
+float GDAPI godot_real_array_get(godot_real_array p_real_array,int p_index);
+void GDAPI godot_real_array_set(godot_real_array p_real_array,int p_index,float p_value);
+void GDAPI godot_real_array_remove(godot_real_array p_real_array,int p_index);
+void GDAPI godot_real_array_clear(godot_real_array p_real_array);
+
+typedef void* godot_real_array_lock;
+
+godot_real_array_lock GDAPI godot_real_array_get_lock(godot_real_array p_real_array);
+float GDAPI *godot_real_array_lock_get_pointer(godot_real_array_lock p_real_array_lock);
+void GDAPI godot_real_array_lock_free(godot_real_array_lock p_real_array_lock);
+
+
+////// StringArray
+
+typedef void* godot_string_array;
+
+
+godot_string_array GDAPI godot_string_array_create();
+godot_string_array GDAPI godot_string_array_copy(godot_string_array p_string_array);
+void GDAPI godot_string_array_free(godot_string_array p_string_array);
+
+int GDAPI godot_string_array_get_size(godot_string_array p_string_array);
+int GDAPI godot_string_array_get(godot_string_array p_string_array,int p_index,unsigned char* p_string,int p_max_len);
+void GDAPI godot_string_array_set(godot_string_array p_string_array,int p_index,unsigned char *p_string);
+void GDAPI godot_string_array_remove(godot_string_array p_string_array,int p_index);
+void GDAPI godot_string_array_clear(godot_string_array p_string_array);
+
+////// Vector2Array
+
+typedef void* godot_vector2_array;
+
+godot_vector2_array GDAPI godot_vector2_array_create();
+godot_vector2_array GDAPI godot_vector2_array_copy(godot_vector2_array p_vector2_array);
+void GDAPI godot_vector2_array_free(godot_vector2_array p_vector2_array);
+
+int GDAPI godot_vector2_array_get_size(godot_vector2_array p_vector2_array);
+int GDAPI godot_vector2_array_get_stride(godot_vector2_array p_vector2_array);
+void GDAPI godot_vector2_array_get(godot_vector2_array p_vector2_array,int p_index,float* p_vector2);
+void GDAPI godot_vector2_array_set(godot_vector2_array p_vector2_array,int p_index,float *p_vector2);
+void GDAPI godot_vector2_array_remove(godot_vector2_array p_vector2_array,int p_index);
+void GDAPI godot_vector2_array_clear(godot_vector2_array p_vector2_array);
+
+
+typedef void* godot_vector2_array_lock;
+
+godot_vector2_array_lock GDAPI godot_vector2_array_get_lock(godot_vector2_array p_vector2_array);
+float GDAPI *godot_vector2_array_lock_get_pointer(godot_vector2_array_lock p_vector2_array_lock);
+void GDAPI godot_vector2_array_lock_free(godot_vector2_array_lock p_vector2_array_lock);
+
+////// Vector3Array
+
+typedef void* godot_vector3_array;
+
+godot_vector3_array GDAPI godot_vector3_array_create();
+godot_vector3_array GDAPI godot_vector3_array_copy(godot_vector3_array p_vector3_array);
+void GDAPI godot_vector3_array_free(godot_vector3_array p_vector3_array);
+
+int GDAPI godot_vector3_array_get_size(godot_vector3_array p_vector3_array);
+int GDAPI godot_vector3_array_get_stride(godot_vector3_array p_vector3_array);
+void GDAPI godot_vector3_array_get(godot_vector3_array p_vector3_array,int p_index,float* p_vector3);
+void GDAPI godot_vector3_array_set(godot_vector3_array p_vector3_array,int p_index,float *p_vector3);
+void GDAPI godot_vector3_array_remove(godot_vector3_array p_vector3_array,int p_index);
+void GDAPI godot_vector3_array_clear(godot_vector3_array p_vector3_array);
+
+
+typedef void* godot_vector3_array_lock;
+
+godot_vector3_array_lock GDAPI godot_vector3_array_get_lock(godot_vector3_array p_vector3_array);
+float GDAPI *godot_vector3_array_lock_get_pointer(godot_vector3_array_lock p_vector3_array_lock);
+void GDAPI godot_vector3_array_lock_free(godot_vector3_array_lock p_vector3_array_lock);
+
+////// ColorArray
+
+typedef void* godot_color_array;
+
+godot_color_array GDAPI godot_color_array_create();
+godot_color_array GDAPI godot_color_array_copy(godot_color_array p_color_array);
+void GDAPI godot_color_array_free(godot_color_array p_color_array);
+
+int GDAPI godot_color_array_get_size(godot_color_array p_color_array);
+int GDAPI godot_color_array_get_stride(godot_color_array p_color_array);
+void GDAPI godot_color_array_get(godot_color_array p_color_array,int p_index,float* p_color);
+void GDAPI godot_color_array_set(godot_color_array p_color_array,int p_index,float *p_color);
+void GDAPI godot_color_array_remove(godot_color_array p_color_array,int p_index);
+void GDAPI godot_color_array_clear(godot_color_array p_color_array);
+
+
+typedef void* godot_color_array_lock;
+
+godot_color_array_lock GDAPI godot_color_array_get_lock(godot_color_array p_color_array);
+float GDAPI *godot_color_array_lock_get_pointer(godot_color_array_lock p_color_array_lock);
+void GDAPI godot_color_array_lock_free(godot_color_array_lock p_color_array_lock);
+
+
+////// Instance (forward declared)
+
+typedef void *godot_instance;
+
+////// Variant
+
+#define GODOT_VARIANT_NIL 0
+#define GODOT_VARIANT_BOOL 1
+#define GODOT_VARIANT_INT 2
+#define GODOT_VARIANT_REAL 3
+#define GODOT_VARIANT_STRING 4
+#define GODOT_VARIANT_VECTOR2 5
+#define GODOT_VARIANT_RECT2 6
+#define GODOT_VARIANT_VECTOR3 7
+#define GODOT_VARIANT_MATRIX32 8
+#define GODOT_VARIANT_PLANE 9
+#define GODOT_VARIANT_QUAT 10
+#define GODOT_VARIANT_AABB 11
+#define GODOT_VARIANT_MATRIX3 12
+#define GODOT_VARIANT_TRANSFORM 13
+#define GODOT_VARIANT_COLOR 14
+#define GODOT_VARIANT_IMAGE 15
+#define GODOT_VARIANT_NODE_PATH 16
+#define GODOT_VARIANT_RID 17
+#define GODOT_VARIANT_OBJECT 18
+#define GODOT_VARIANT_INPUT_EVENT 19
+#define GODOT_VARIANT_DICTIONARY 20
+#define GODOT_VARIANT_ARRAY 21
+#define GODOT_VARIANT_BYTE_ARRAY 22
+#define GODOT_VARIANT_INT_ARRAY 23
+#define GODOT_VARIANT_REAL_ARRAY 24
+#define GODOT_VARIANT_STRING_ARRAY 25
+#define GODOT_VARIANT_VECTOR2_ARRAY 26
+#define GODOT_VARIANT_VECTOR3_ARRAY 27
+#define GODOT_VARIANT_COLOR_ARRAY 28
+#define GODOT_VARIANT_MAX 29
+
+godot_variant *godot_variant_new();
+
+int GDAPI godot_variant_get_type(godot_variant p_variant);
+
+void GDAPI godot_variant_set_null(godot_variant p_variant);
+void GDAPI godot_variant_set_bool(godot_variant p_variant,godot_bool p_bool);
+void GDAPI godot_variant_set_int(godot_variant p_variant,int p_int);
+void GDAPI godot_variant_set_float(godot_variant p_variant,int p_float);
+void GDAPI godot_variant_set_string(godot_variant p_variant,char *p_string);
+void GDAPI godot_variant_set_vector2(godot_variant p_variant,float *p_elems);
+void GDAPI godot_variant_set_rect2(godot_variant p_variant,float *p_elems);
+void GDAPI godot_variant_set_vector3(godot_variant p_variant,float *p_elems);
+void GDAPI godot_variant_set_matrix32(godot_variant p_variant,float *p_elems);
+void GDAPI godot_variant_set_plane(godot_variant p_variant,float *p_elems);
+void GDAPI godot_variant_set_aabb(godot_variant p_variant,float *p_elems);
+void GDAPI godot_variant_set_matrix3(godot_variant p_variant,float *p_elems);
+void GDAPI godot_variant_set_transform(godot_variant p_variant,float *p_elems);
+void GDAPI godot_variant_set_color(godot_variant p_variant,float *p_elems);
+void GDAPI godot_variant_set_image(godot_variant p_variant,godot_image *p_image);
+void GDAPI godot_variant_set_node_path(godot_variant p_variant,char *p_path);
+void GDAPI godot_variant_set_rid(godot_variant p_variant,char *p_path);
+void GDAPI godot_variant_set_instance(godot_variant p_variant,godot_instance p_instance);
+void GDAPI godot_variant_set_input_event(godot_variant p_variant,godot_input_event p_instance);
+void GDAPI godot_variant_set_dictionary(godot_variant p_variant,godot_dictionary p_dictionary);
+void GDAPI godot_variant_set_array(godot_variant p_variant,godot_array p_array);
+void GDAPI godot_variant_set_byte_array(godot_variant p_variant,godot_byte_array p_array);
+void GDAPI godot_variant_set_int_array(godot_variant p_variant,godot_byte_array p_array);
+void GDAPI godot_variant_set_string_array(godot_variant p_variant,godot_string_array p_array);
+void GDAPI godot_variant_set_vector2_array(godot_variant p_variant,godot_vector2_array p_array);
+void GDAPI godot_variant_set_vector3_array(godot_variant p_variant,godot_vector3_array p_array);
+void GDAPI godot_variant_set_color_array(godot_variant p_variant,godot_color_array p_array);
+
+godot_bool GDAPI godot_variant_get_bool(godot_variant p_variant);
+int GDAPI godot_variant_get_int(godot_variant p_variant);
+float GDAPI godot_variant_get_float(godot_variant p_variant);
+int GDAPI godot_variant_get_string(godot_variant p_variant,char *p_string,int p_bufsize);
+void GDAPI godot_variant_get_vector2(godot_variant p_variant,float *p_elems);
+void GDAPI godot_variant_get_rect2(godot_variant p_variant,float *p_elems);
+void GDAPI godot_variant_get_vector3(godot_variant p_variant,float *p_elems);
+void GDAPI godot_variant_get_matrix32(godot_variant p_variant,float *p_elems);
+void GDAPI godot_variant_get_plane(godot_variant p_variant,float *p_elems);
+void GDAPI godot_variant_get_aabb(godot_variant p_variant,float *p_elems);
+void GDAPI godot_variant_get_matrix3(godot_variant p_variant,float *p_elems);
+void GDAPI godot_variant_get_transform(godot_variant p_variant,float *p_elems);
+void GDAPI godot_variant_get_color(godot_variant p_variant,float *p_elems);
+godot_image GDAPI *godot_variant_get_image(godot_variant p_variant);
+int GDAPI godot_variant_get_node_path(godot_variant p_variant,char *p_path, int p_bufsize);
+godot_rid GDAPI godot_variant_get_rid(godot_variant p_variant);
+godot_instance GDAPI godot_variant_get_instance(godot_variant p_variant);
+void GDAPI godot_variant_get_input_event(godot_variant p_variant,godot_input_event);
+void GDAPI godot_variant_get_dictionary(godot_variant p_variant,godot_dictionary);
+godot_array GDAPI godot_variant_get_array(godot_variant p_variant);
+godot_byte_array GDAPI godot_variant_get_byte_array(godot_variant p_variant);
+godot_byte_array GDAPI godot_variant_get_int_array(godot_variant p_variant);
+godot_string_array GDAPI godot_variant_get_string_array(godot_variant p_variant);
+godot_vector2_array GDAPI godot_variant_get_vector2_array(godot_variant p_variant);
+godot_vector3_array GDAPI godot_variant_get_vector3_array(godot_variant p_variant);
+godot_color_array GDAPI godot_variant_get_color_array(godot_variant p_variant);
+
+
+void GDAPI godot_variant_delete(godot_variant p_variant);
+
+////// Class
+///
+
+char GDAPI **godot_class_get_list(); //get list of classes in array to array of strings, must be freed, use godot_list_free()
+
+int GDAPI godot_class_get_base(char* p_class,char *p_base,int p_max_len);
+int GDAPI godot_class_get_name(char* p_class,char *p_base,int p_max_len);
+
+char GDAPI **godot_class_get_method_list(char* p_class); //free with godot_list_free()
+int GDAPI godot_class_method_get_argument_count(char* p_class,char *p_method);
+int GDAPI godot_class_method_get_argument_type(char* p_class,char *p_method,int p_argument);
+godot_variant GDAPI godot_class_method_get_argument_default_value(char* p_class,char *p_method,int p_argument);
+
+char GDAPI **godot_class_get_constant_list(char* p_class); //free with godot_list_free()
+int GDAPI godot_class_constant_get_value(char* p_class,char *p_constant);
+
+
+////// Instance
+
+typedef int godot_call_error;
+
+#define GODOT_CALL_OK
+#define GODOT_CALL_ERROR_WRONG_ARGUMENTS
+#define GODOT_CALL_ERROR_INVALID_INSTANCE
+
+godot_instance GDAPI godot_instance_new(char* p_class);
+int GDAPI godot_instance_get_class(godot_instance p_instance,char* p_class,int p_max_len);
+
+typedef struct {
+	char *name;
+	int hint;
+	char *hint_string;
+	int usage;
+} godot_property_info;
+
+godot_call_error GDAPI godot_instance_call(godot_instance p_instance, char* p_method, ...);
+godot_call_error GDAPI godot_instance_call_ret(godot_instance p_instance, godot_variant r_return, char* p_method, ...);
+godot_bool GDAPI godot_instance_set(godot_instance p_instance, char* p_prop,godot_variant p_value);
+godot_variant GDAPI godot_instance_get(godot_instance p_instance, char* p_prop);
+
+
+#define GODOT_PROPERTY_HINT_NONE 0 ///< no hint provided.
+#define GODOT_PROPERTY_HINT_RANGE 1///< hint_text = "min,max,step,slider; //slider is optional"
+#define GODOT_PROPERTY_HINT_EXP_RANGE 2///< hint_text = "min,max,step", exponential edit
+#define GODOT_PROPERTY_HINT_ENUM 3///< hint_text= "val1,val2,val3,etc"
+#define GODOT_PROPERTY_HINT_EXP_EASING 4/// exponential easing funciton (Math::ease)
+#define GODOT_PROPERTY_HINT_LENGTH 5///< hint_text= "length" (as integer)
+#define GODOT_PROPERTY_HINT_SPRITE_FRAME 6
+#define GODOT_PROPERTY_HINT_KEY_ACCEL 7///< hint_text= "length" (as integer)
+#define GODOT_PROPERTY_HINT_FLAGS 8///< hint_text= "flag1,flag2,etc" (as bit flags)
+#define GODOT_PROPERTY_HINT_ALL_FLAGS 9
+#define GODOT_PROPERTY_HINT_FILE 10 ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc,"
+#define GODOT_PROPERTY_HINT_DIR 11 ///< a directort path must be passed
+#define GODOT_PROPERTY_HINT_GLOBAL_FILE 12///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc,"
+#define GODOT_PROPERTY_HINT_GLOBAL_DIR 13 ///< a directort path must be passed
+#define GODOT_PROPERTY_HINT_RESOURCE_TYPE 14///< a resource object type
+#define GODOT_PROPERTY_HINT_MULTILINE_TEXT 15///< used for string properties that can contain multiple lines
+#define GODOT_PROPERTY_HINT_COLOR_NO_ALPHA 16///< used for ignoring alpha component when editing a color
+#define GODOT_PROPERTY_HINT_IMAGE_COMPRESS_LOSSY 17
+#define GODOT_PROPERTY_HINT_IMAGE_COMPRESS_LOSSLESS 18
+#define GODOT_PROPERTY_HINT_OBJECT_ID 19
+
+
+#define GODOT_PROPERTY_USAGE_STORAGE 1
+#define GODOT_PROPERTY_USAGE_EDITOR 2
+#define GODOT_PROPERTY_USAGE_NETWORK 4
+#define GODOT_PROPERTY_USAGE_EDITOR_HELPER 8
+#define GODOT_PROPERTY_USAGE_CHECKABLE 16 //used for editing global variables
+#define GODOT_PROPERTY_USAGE_CHECKED 32 //used for editing global variables
+#define GODOT_PROPERTY_USAGE_INTERNATIONALIZED 64 //hint for internationalized strings
+#define GODOT_PROPERTY_USAGE_BUNDLE 128 //used for optimized bundles
+#define GODOT_PROPERTY_USAGE_CATEGORY 256
+#define GODOT_PROPERTY_USAGE_STORE_IF_NONZERO 512 //only store if nonzero
+#define GODOT_PROPERTY_USAGE_STORE_IF_NONONE 1024 //only store if false
+#define GODOT_PROPERTY_USAGE_NO_INSTANCE_STATE 2048
+#define GODOT_PROPERTY_USAGE_RESTART_IF_CHANGED 4096
+#define GODOT_PROPERTY_USAGE_SCRIPT_VARIABLE 8192
+#define GODOT_PROPERTY_USAGE_STORE_IF_NULL 16384
+#define GODOT_PROPERTY_USAGE_ANIMATE_AS_TRIGGER 32768
+
+#define GODOT_PROPERTY_USAGE_DEFAULT GODOT_PROPERTY_USAGE_STORAGE|GODOT_PROPERTY_USAGE_EDITOR|GODOT_PROPERTY_USAGE_NETWORK
+#define GODOT_PROPERTY_USAGE_DEFAULT_INTL GODOT_PROPERTY_USAGE_STORAGE|GODOT_PROPERTY_USAGE_EDITOR|GODOT_PROPERTY_USAGE_NETWORK|GODOT_PROPERTY_USAGE_INTERNATIONALIZED
+#define GODOT_PROPERTY_USAGE_NOEDITOR GODOT_PROPERTY_USAGE_STORAGE|GODOT_PROPERTY_USAGE_NETWORK
+
+
+godot_property_info GDAPI **godot_instance_get_property_list(godot_instance p_instance);
+void GDAPI godot_instance_free_property_list(godot_instance p_instance,godot_property_info** p_list);
+
+
+
+void GDAPI godot_list_free(char **p_name); //helper to free all the class list
+
+
+////// Script API
+
+typedef void* (godot_script_instance_func)(godot_instance); //passed an instance, return a pointer to your userdata
+typedef void (godot_script_free_func)(godot_instance,void*); //passed an instance, please free your userdata
+
+void GDAPI godot_script_register(char* p_base,char* p_name,godot_script_instance_func p_instance_func,godot_script_free_func p_free_func);
+void GDAPI godot_script_unregister(char* p_name);
+
+typedef GDAPI godot_variant (godot_script_func)(godot_instance,void*,godot_variant*,int); //instance,userdata,arguments,argument count. Return something or NULL. Arguments must not be freed.
+
+
+void GDAPI godot_script_add_function(char* p_name,char* p_function_name,godot_script_func p_func);
+void GDAPI godot_script_add_validated_function(char* p_name,char* p_function_name,godot_script_func p_func,int* p_arg_types,int p_arg_count,godot_variant* p_default_args,int p_default_arg_count);
+
+typedef void (godot_set_property_func)(godot_instance,void*,godot_variant); //instance,userdata,value. Value must not be freed.
+typedef godot_variant (godot_get_property_func)(godot_instance,void*); //instance,userdata. Return a value or NULL.
+
+void GDAPI godot_script_add_property(char* p_name,char* p_path,godot_set_property_func p_set_func,godot_get_property_func p_get_func);
+void GDAPI godot_script_add_listed_property(char* p_name,char* p_path,godot_set_property_func p_set_func,godot_get_property_func p_get_func,int p_type,int p_hint,char* p_hint_string,int p_usage);
+
+
+////// System Functions
+
+//using these will help Godot track how much memory is in use in debug mode
+void GDAPI *godot_alloc(int p_bytes);
+void GDAPI *godot_realloc(void* p_ptr,int p_bytes);
+void GDAPI godot_free(void* p_ptr);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif // GODOT_C_H
diff --git a/tools/editor/import_settings.h b/modules/cscript/register_types.cpp
index 5a383a1a1a..267e5245ed 100644
--- a/tools/editor/import_settings.h
+++ b/modules/cscript/register_types.cpp
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  import_settings.h                                                    */
+/*  register_types.cpp                                                   */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -26,57 +26,12 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#ifndef IMPORT_SETTINGS_H
-#define IMPORT_SETTINGS_H
+#include "register_types.h"
 
-#include "object.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/tree.h"
-#include "scene/gui/label.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/line_edit.h"
-#include "scene/gui/file_dialog.h"
-#include "scene/gui/progress_bar.h"
-#include "scene/gui/slider.h"
-#include "scene/gui/spin_box.h"
-#include "scene/resources/mesh.h"
-#include "editor_import_export.h"
-#include "editor_file_system.h"
-#include "editor_dir_dialog.h"
-class EditorNode;
 
+void register_cscript_types() {
 
-class ImportSettingsDialog : public ConfirmationDialog {
+}
+void unregister_cscript_types() {
 
-	OBJ_TYPE(ImportSettingsDialog,ConfirmationDialog);
-
-	TreeItem *edited;
-	EditorNode *editor;
-	Tree *tree;
-	bool updating;
-
-	void _button_pressed(Object *p_button, int p_col, int p_id);
-	void _item_pressed(int p_idx);
-	bool _generate_fs(TreeItem *p_parent,EditorFileSystemDirectory *p_dir);
-
-	String texformat;
-
-	void _item_edited();
-	virtual void ok_pressed();
-
-protected:
-
-
-	void _notification(int p_what);
-	static void _bind_methods();
-public:
-
-	void update_tree();
-
-
-	void popup_import_settings();
-	ImportSettingsDialog(EditorNode *p_editor);
-
-};
-
-#endif // IMPORT_SETTINGS_H
+}
diff --git a/modules/cscript/register_types.h b/modules/cscript/register_types.h
new file mode 100644
index 0000000000..a0f41eee5d
--- /dev/null
+++ b/modules/cscript/register_types.h
@@ -0,0 +1,30 @@
+/*************************************************************************/
+/*  register_types.h                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+void register_cscript_types();
+void unregister_cscript_types();
diff --git a/modules/gdscript/gd_compiler.cpp b/modules/gdscript/gd_compiler.cpp
index 7481eac620..304ed6b100 100644
--- a/modules/gdscript/gd_compiler.cpp
+++ b/modules/gdscript/gd_compiler.cpp
@@ -460,7 +460,6 @@ int GDCompiler::_parse_expression(CodeGen& codegen,const GDParser::Node *p_expre
 
 						const GDParser::Node *instance = on->arguments[0];
 
-						bool in_static=false;
 						if (instance->type==GDParser::Node::TYPE_SELF) {
 							//room for optimization
 
@@ -550,17 +549,25 @@ int GDCompiler::_parse_expression(CodeGen& codegen,const GDParser::Node *p_expre
 
 					int index;
 					if (named) {
-#ifdef DEBUG_ENABLED
 						if (on->arguments[0]->type==GDParser::Node::TYPE_SELF && codegen.script && codegen.function_node && !codegen.function_node->_static) {
 
-							const Map<StringName,GDScript::MemberInfo>::Element *MI = codegen.script->member_indices.find(static_cast<GDParser::IdentifierNode*>(on->arguments[1])->name);
+							GDParser::IdentifierNode* identifier = static_cast<GDParser::IdentifierNode*>(on->arguments[1]);
+							const Map<StringName,GDScript::MemberInfo>::Element *MI = codegen.script->member_indices.find(identifier->name);
+
+#ifdef DEBUG_ENABLED
 							if (MI && MI->get().getter==codegen.function_node->name) {
 								String n = static_cast<GDParser::IdentifierNode*>(on->arguments[1])->name;
 								_set_error("Must use '"+n+"' instead of 'self."+n+"' in getter.",on);
 								return -1;
 							}
-						}
 #endif
+
+							if (MI && MI->get().getter=="") {
+								// Faster than indexing self (as if no self. had been used)
+								return (MI->get().index)|(GDFunction::ADDR_TYPE_MEMBER<<GDFunction::ADDR_BITS);
+							}
+						}
+
 						index=codegen.get_name_map_pos(static_cast<GDParser::IdentifierNode*>(on->arguments[1])->name);
 
 					} else {
@@ -763,8 +770,6 @@ int GDCompiler::_parse_expression(CodeGen& codegen,const GDParser::Node *p_expre
 
 						Vector<int> setchain;
 
-						int prev_key_idx=-1;
-
 						for(List<GDParser::OperatorNode*>::Element *E=chain.back();E;E=E->prev()) {
 
 
@@ -814,7 +819,6 @@ int GDCompiler::_parse_expression(CodeGen& codegen,const GDParser::Node *p_expre
 							setchain.push_back(named ? GDFunction::OPCODE_SET_NAMED : GDFunction::OPCODE_SET);
 
 							prev_pos=dst_pos;
-							prev_key_idx=key_idx;
 
 						}
 
@@ -1203,7 +1207,6 @@ Error GDCompiler::_parse_function(GDScript *p_script,const GDParser::ClassNode *
 
 	if (p_func) {
 		for(int i=0;i<p_func->arguments.size();i++) {
-			int idx = i;
 			codegen.add_stack_identifier(p_func->arguments[i],i);
 #ifdef TOOLS_ENABLED
 			argnames.push_back(p_func->arguments[i]);
@@ -1441,7 +1444,6 @@ Error GDCompiler::_parse_class(GDScript *p_script, GDScript *p_owner, const GDPa
 	p_script->name=p_class->name;
 
 
-	int index_from=0;
 	Ref<GDNativeClass> native;
 
 	if (p_class->extends_used) {
@@ -1497,7 +1499,8 @@ Error GDCompiler::_parse_class(GDScript *p_script, GDScript *p_owner, const GDPa
 					String sub = p_class->extends_class[i];
 					if (script->subclasses.has(sub)) {
 
-						script=script->subclasses[sub];
+						Ref<Script> subclass = script->subclasses[sub]; //avoid reference from dissapearing
+						script=subclass;
 					} else {
 
 						_set_error("Could not find subclass: "+sub,p_class);
@@ -1683,6 +1686,7 @@ Error GDCompiler::_parse_class(GDScript *p_script, GDScript *p_owner, const GDPa
 		if (err)
 			return err;
 
+
 		p_script->constants.insert(name,subclass); //once parsed, goes to the list of constants
 		p_script->subclasses.insert(name,subclass);
 
diff --git a/modules/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp
index b1da7e782c..520a8b18d8 100644
--- a/modules/gdscript/gd_editor.cpp
+++ b/modules/gdscript/gd_editor.cpp
@@ -212,7 +212,7 @@ String GDScriptLanguage::debug_get_stack_level_source(int p_level) const {
 
     ERR_FAIL_INDEX_V(p_level,_debug_call_stack_pos,"");
     int l = _debug_call_stack_pos - p_level -1;
-    return _call_stack[l].function->get_script()->get_path();
+    return _call_stack[l].function->get_source();
 
 }
 void GDScriptLanguage::debug_get_stack_level_locals(int p_level,List<String> *p_locals, List<Variant> *p_values, int p_max_subitems,int p_max_depth) {
@@ -449,57 +449,21 @@ static Ref<Reference> _get_parent_class(GDCompletionContext& context) {
 			}
 
 			String base=context._class->extends_class[0];
-			const GDParser::ClassNode *p = context._class->owner;
-			Ref<GDScript> base_class;
-#if 0
-			while(p) {
-
-				if (p->subclasses.has(base)) {
-
-					base_class=p->subclasses[base];
-					break;
-				}
-				p=p->_owner;
-			}
-#endif
-			if (base_class.is_valid()) {
-#if 0
-				for(int i=1;i<context._class->extends_class.size();i++) {
-
-					String subclass=context._class->extends_class[i];
-
-					if (base_class->subclasses.has(subclass)) {
-
-						base_class=base_class->subclasses[subclass];
-					} else {
-
-						//print_line("Could not find subclass: "+subclass);
-						return _get_type_from_class(context); //fail please
-					}
-				}
-
-				script=base_class;
-#endif
-
-			} else {
-
-				if (context._class->extends_class.size()>1) {
 
-					return REF();
+			if (context._class->extends_class.size()>1) {
 
+				return REF();
 
-				}
-				//if not found, try engine classes
-				if (!GDScriptLanguage::get_singleton()->get_global_map().has(base)) {
-
-					return REF();
-				}
+			}
+			//if not found, try engine classes
+			if (!GDScriptLanguage::get_singleton()->get_global_map().has(base)) {
 
-				int base_idx = GDScriptLanguage::get_singleton()->get_global_map()[base];
-				native = GDScriptLanguage::get_singleton()->get_global_array()[base_idx];
-				return native;
+				return REF();
 			}
 
+			int base_idx = GDScriptLanguage::get_singleton()->get_global_map()[base];
+			native = GDScriptLanguage::get_singleton()->get_global_array()[base_idx];
+			return native;
 
 		}
 
@@ -2100,10 +2064,8 @@ static void _find_call_arguments(GDCompletionContext& context,const GDParser::No
 }
 
 Error GDScriptLanguage::complete_code(const String& p_code, const String& p_base_path, Object*p_owner, List<String>* r_options, String &r_call_hint) {
-	//print_line( p_code.replace(String::chr(0xFFFF),"<cursor>"));
 
 	GDParser p;
-	//Error parse(const String& p_code, const String& p_base_path="", bool p_just_validate=false,const String& p_self_path="",bool p_for_completion=false);
 
 	Error err = p.parse(p_code,p_base_path,false,"",true);
 	bool isfunction=false;
@@ -2204,7 +2166,6 @@ Error GDScriptLanguage::complete_code(const String& p_code, const String& p_base
 								if (code!="") {
 									//if there is code, parse it. This way is slower but updates in real-time
 									GDParser p;
-									//Error parse(const String& p_code, const String& p_base_path="", bool p_just_validate=false,const String& p_self_path="",bool p_for_completion=false);
 
 									Error err = p.parse(scr->get_source_code(),scr->get_path().get_base_dir(),true,"",false);
 
diff --git a/modules/gdscript/gd_function.cpp b/modules/gdscript/gd_function.cpp
index 6e52686de4..de86eb2ab9 100644
--- a/modules/gdscript/gd_function.cpp
+++ b/modules/gdscript/gd_function.cpp
@@ -846,6 +846,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
 				gdfs->state._class=_class;
 				gdfs->state.ip=ip+ipofs;
 				gdfs->state.line=line;
+				gdfs->state.instance_id=(p_instance && p_instance->get_owner())?p_instance->get_owner()->get_instance_ID():0;
+				gdfs->state.script_id=_class->get_instance_ID();
 				//gdfs->state.result_pos=ip+ipofs-1;
 				gdfs->state.defarg=defarg;
 				gdfs->state.instance=p_instance;
@@ -1352,6 +1354,18 @@ GDFunction::~GDFunction()  {
 
 Variant GDFunctionState::_signal_callback(const Variant** p_args, int p_argcount, Variant::CallError& r_error) {
 
+#ifdef DEBUG_ENABLED
+	if (state.instance_id && !ObjectDB::get_instance(state.instance_id)) {
+		ERR_EXPLAIN("Resumed after yield, but class instance is gone");
+		ERR_FAIL_V(Variant());
+	}
+
+	if (state.script_id && !ObjectDB::get_instance(state.script_id)) {
+		ERR_EXPLAIN("Resumed after yield, but script is gone");
+		ERR_FAIL_V(Variant());
+	}
+#endif
+
 	Variant arg;
 	r_error.error=Variant::CallError::CALL_OK;
 
@@ -1398,6 +1412,17 @@ bool GDFunctionState::is_valid() const {
 Variant GDFunctionState::resume(const Variant& p_arg) {
 
 	ERR_FAIL_COND_V(!function,Variant());
+#ifdef DEBUG_ENABLED
+	if (state.instance_id && !ObjectDB::get_instance(state.instance_id)) {
+		ERR_EXPLAIN("Resumed after yield, but class instance is gone");
+		ERR_FAIL_V(Variant());
+	}
+
+	if (state.script_id && !ObjectDB::get_instance(state.script_id)) {
+		ERR_EXPLAIN("Resumed after yield, but script is gone");
+		ERR_FAIL_V(Variant());
+	}
+#endif
 
 	state.result=p_arg;
 	Variant::CallError err;
diff --git a/modules/gdscript/gd_function.h b/modules/gdscript/gd_function.h
index 1f790eaadc..e09c6509dd 100644
--- a/modules/gdscript/gd_function.h
+++ b/modules/gdscript/gd_function.h
@@ -136,6 +136,9 @@ public:
 
 	struct CallState {
 
+		ObjectID instance_id; //by debug only
+		ObjectID script_id;
+
 		GDInstance *instance;
 		Vector<uint8_t> stack;
 		int stack_size;
@@ -160,6 +163,7 @@ public:
 	int get_default_argument_count() const;
 	int get_default_argument_addr(int p_idx) const;
 	GDScript *get_script() const { return _script; }
+	StringName get_source() const { return source; }
 
 	void debug_get_stack_member_state(int p_line,List<Pair<StringName,int> > *r_stackvars) const;
 
diff --git a/modules/gdscript/gd_functions.cpp b/modules/gdscript/gd_functions.cpp
index ec66841662..b9815a5efd 100644
--- a/modules/gdscript/gd_functions.cpp
+++ b/modules/gdscript/gd_functions.cpp
@@ -502,7 +502,6 @@ void GDFunctions::call(Function p_func,const Variant **p_args,int p_arg_count,Va
 
 			Ref<FuncRef> fr = memnew( FuncRef);
 
-			Object *obj = *p_args[0];
 			fr->set_instance(*p_args[0]);
 			fr->set_function(*p_args[1]);
 
diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp
index ac96a2117c..e87bd99e4f 100644
--- a/modules/gdscript/gd_parser.cpp
+++ b/modules/gdscript/gd_parser.cpp
@@ -31,6 +31,7 @@
 #include "io/resource_loader.h"
 #include "os/file_access.h"
 #include "script_language.h"
+#include "gd_script.h"
 
 template<class T>
 T* GDParser::alloc_node() {
@@ -216,7 +217,7 @@ bool GDParser::_get_completable_identifier(CompletionType p_type,StringName& ide
 }
 
 
-GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_allow_assign) {
+GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_allow_assign,bool p_parsing_constant) {
 
 //	Vector<Node*> expressions;
 //	Vector<OperatorNode::Operator> operators;
@@ -243,7 +244,7 @@ GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_
 			//subexpression ()
 			tokenizer->advance();
 			parenthesis++;
-			Node* subexpr = _parse_expression(p_parent,p_static);
+			Node* subexpr = _parse_expression(p_parent,p_static,p_allow_assign,p_parsing_constant);
 			parenthesis--;
 			if (!subexpr)
 				return NULL;
@@ -477,20 +478,30 @@ GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_
 		} else if (tokenizer->get_token()==GDTokenizer::TK_IDENTIFIER) {
 			//identifier (reference)
 
-			const ClassNode* cln = static_cast<const ClassNode*>(get_parse_tree());
+			const ClassNode* cln = current_class;
 			bool             bfn = false;
 			StringName       identifier;
 			if (_get_completable_identifier(COMPLETION_IDENTIFIER,identifier)) {
 
 			}
 
-			for( int i=0; i<cln->constant_expressions.size(); ++i ) {
+			if (p_parsing_constant) {
+				for( int i=0; i<cln->constant_expressions.size(); ++i ) {
 
-				if( cln->constant_expressions[i].identifier == identifier ) {
+					if( cln->constant_expressions[i].identifier == identifier ) {
 
-					expr = cln->constant_expressions[i].expression;
-					bfn  = true;
-					break;
+						expr = cln->constant_expressions[i].expression;
+						bfn  = true;
+						break;
+					}
+				}
+
+				if (GDScriptLanguage::get_singleton()->get_global_map().has(identifier)) {
+					//check from constants
+					ConstantNode *constant = alloc_node<ConstantNode>();
+					constant->value = GDScriptLanguage::get_singleton()->get_global_array()[ GDScriptLanguage::get_singleton()->get_global_map()[identifier] ];
+					expr=constant;
+					bfn = true;
 				}
 			}
 
@@ -503,8 +514,7 @@ GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_
 		} else if (/*tokenizer->get_token()==GDTokenizer::TK_OP_ADD ||*/ tokenizer->get_token()==GDTokenizer::TK_OP_SUB || tokenizer->get_token()==GDTokenizer::TK_OP_NOT || tokenizer->get_token()==GDTokenizer::TK_OP_BIT_INVERT) {
 
 			//single prefix operators like !expr -expr ++expr --expr
-			OperatorNode *op = alloc_node<OperatorNode>();
-
+			alloc_node<OperatorNode>();
 			Expression e;
 			e.is_op=true;
 
@@ -567,7 +577,7 @@ GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_
 						_set_error("',' or ']' expected");
 						return NULL;
 					}
-					Node *n = _parse_expression(arr,p_static);
+					Node *n = _parse_expression(arr,p_static,p_allow_assign,p_parsing_constant);
 					if (!n)
 						return NULL;
 					arr->elements.push_back(n);
@@ -674,7 +684,7 @@ GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_
 							expecting=DICT_EXPECT_VALUE;
 						} else {
 							//python/js style more flexible
-							key = _parse_expression(dict,p_static);
+							key = _parse_expression(dict,p_static,p_allow_assign,p_parsing_constant);
 							if (!key)
 								return NULL;
 							expecting=DICT_EXPECT_COLON;
@@ -682,7 +692,7 @@ GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_
 					}
 
 					if (expecting==DICT_EXPECT_VALUE) {
-						Node *value = _parse_expression(dict,p_static);
+						Node *value = _parse_expression(dict,p_static,p_allow_assign,p_parsing_constant);
 						if (!value)
 							return NULL;
 						expecting=DICT_EXPECT_COMMA;
@@ -833,7 +843,7 @@ GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_
 
 				tokenizer->advance(1);
 
-				Node *subexpr = _parse_expression(op,p_static);
+				Node *subexpr = _parse_expression(op,p_static,p_allow_assign,p_parsing_constant);
 				if (!subexpr) {
 					return NULL;
 				}
@@ -1069,8 +1079,8 @@ GDParser::Node* GDParser::_parse_expression(Node *p_parent,bool p_static,bool p_
 				// can be followed by an unary op in a valid combination,
 				// due to how precedence works, unaries will always dissapear first
 
-				_set_error("Parser bug..");
-
+				_set_error("Unexpected two consecutive operators.");
+				return NULL;
 			}
 
 
@@ -1432,7 +1442,7 @@ GDParser::Node* GDParser::_reduce_expression(Node *p_node,bool p_to_const) {
 
 GDParser::Node* GDParser::_parse_and_reduce_expression(Node *p_parent,bool p_static,bool p_reduce_const,bool p_allow_assign) {
 
-	Node* expr=_parse_expression(p_parent,p_static,p_allow_assign);
+	Node* expr=_parse_expression(p_parent,p_static,p_allow_assign,p_reduce_const);
 	if (!expr || error_set)
 		return NULL;
 	expr = _reduce_expression(expr,p_reduce_const);
diff --git a/modules/gdscript/gd_parser.h b/modules/gdscript/gd_parser.h
index 6c49c1df52..4afc534a8c 100644
--- a/modules/gdscript/gd_parser.h
+++ b/modules/gdscript/gd_parser.h
@@ -435,7 +435,7 @@ private:
 	bool _parse_arguments(Node* p_parent, Vector<Node*>& p_args, bool p_static, bool p_can_codecomplete=false);
 	bool _enter_indent_block(BlockNode *p_block=NULL);
 	bool _parse_newline();
-	Node* _parse_expression(Node *p_parent,bool p_static,bool p_allow_assign=false);
+	Node* _parse_expression(Node *p_parent, bool p_static, bool p_allow_assign=false, bool p_parsing_constant=false);
 	Node* _reduce_expression(Node *p_node,bool p_to_const=false);
 	Node* _parse_and_reduce_expression(Node *p_parent,bool p_static,bool p_reduce_const=false,bool p_allow_assign=false);
 
diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp
index 026fd04869..d9783c218a 100644
--- a/modules/gdscript/gd_script.cpp
+++ b/modules/gdscript/gd_script.cpp
@@ -874,6 +874,10 @@ GDScript::~GDScript() {
 		memdelete( E->get() );
 	}
 
+	for (Map<StringName,Ref<GDScript> >::Element *E=subclasses.front();E;E=E->next()) {
+		E->get()->_owner=NULL; //bye, you are no longer owned cause I died
+	}
+
 #ifdef DEBUG_ENABLED
 	if (GDScriptLanguage::get_singleton()->lock) {
 		GDScriptLanguage::get_singleton()->lock->lock();
@@ -960,11 +964,16 @@ bool GDInstance::get(const StringName& p_name, Variant &r_ret) const {
 		}
 
 		{
-			const Map<StringName,Variant>::Element *E = script->constants.find(p_name);
-			if (E) {
-				r_ret=E->get();
-				return true; //index found
 
+			const GDScript *sl = sptr;
+			while(sl) {
+				const Map<StringName,Variant>::Element *E = sl->constants.find(p_name);
+				if (E) {
+					r_ret=E->get();
+					return true; //index found
+
+				}
+				sl=sl->_base;
 			}
 		}
 
@@ -1709,6 +1718,7 @@ void GDScriptLanguage::get_reserved_words(List<String> *p_words) const  {
 		"false",
 		"float",
 		"int",
+		"bool",
 		"null",
 		"PI",
 		"self",
diff --git a/modules/gdscript/gd_script.h b/modules/gdscript/gd_script.h
index 166e29ad70..723761c3a9 100644
--- a/modules/gdscript/gd_script.h
+++ b/modules/gdscript/gd_script.h
@@ -202,6 +202,8 @@ friend class GDCompiler;
 
 public:
 
+	_FORCE_INLINE_ Object* get_owner() { return owner; }
+
 	virtual bool set(const StringName& p_name, const Variant& p_value);
 	virtual bool get(const StringName& p_name, Variant &r_ret) const;
 	virtual void get_property_list(List<PropertyInfo> *p_properties) const;
diff --git a/modules/gdscript/gd_tokenizer.cpp b/modules/gdscript/gd_tokenizer.cpp
index 0a77b96569..93863c4eb2 100644
--- a/modules/gdscript/gd_tokenizer.cpp
+++ b/modules/gdscript/gd_tokenizer.cpp
@@ -1156,7 +1156,6 @@ Vector<uint8_t> GDTokenizerBuffer::parse_code_string(const String& p_code) {
 	GDTokenizerText tt;
 	tt.set_code(p_code);
 	int line=-1;
-	int col=0;
 
 	while(true) {
 
diff --git a/modules/gdscript/register_types.cpp b/modules/gdscript/register_types.cpp
index 6aa53f03ef..95b18cae4d 100644
--- a/modules/gdscript/register_types.cpp
+++ b/modules/gdscript/register_types.cpp
@@ -158,7 +158,7 @@ void register_gdscript_types() {
 void unregister_gdscript_types() {
 
 
-
+	ScriptServer::unregister_language(script_language_gd);
 
 	if (script_language_gd)
 		memdelete( script_language_gd );
diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp
index 5e30416641..37a3fb2b25 100644
--- a/modules/gridmap/grid_map.cpp
+++ b/modules/gridmap/grid_map.cpp
@@ -912,7 +912,6 @@ void GridMap::_octant_bake(const OctantKey &p_key, const Ref<TriangleMesh>& p_tm
 						int lc = p_lights.size();
 						const BakeLight* bl = p_lights.ptr();
 						float ofs = cell_size*0.02;
-						float att = 0.2;
 
 
 						for(;V;V=V->next()) {
diff --git a/modules/ik/ik.cpp b/modules/ik/ik.cpp
index 172e16459e..35b3ba7e83 100644
--- a/modules/ik/ik.cpp
+++ b/modules/ik/ik.cpp
@@ -241,7 +241,7 @@ void InverseKinematics::_notification(int p_what)
 			}
 		} break;
 		case NOTIFICATION_PROCESS: {
-			float delta = get_process_delta_time();
+
 			Spatial *sksp = skel->cast_to<Spatial>();
 			if (!bound)
 				break;
diff --git a/platform/android/SCsub b/platform/android/SCsub
index c8feac8690..0814f4a7bc 100644
--- a/platform/android/SCsub
+++ b/platform/android/SCsub
@@ -79,6 +79,11 @@ for x in env.android_jni_dirs:
 
 gradle_asset_dirs_text=""
 
+gradle_default_config_text=""
+
+for x in env.android_default_config:
+	gradle_default_config_text+=x+"\n\t\t"
+
 gradle_text = gradle_text.replace("$$GRADLE_REPOSITORY_URLS$$",gradle_maven_repos_text)
 gradle_text = gradle_text.replace("$$GRADLE_DEPENDENCIES$$",gradle_maven_dependencies_text)
 gradle_text = gradle_text.replace("$$GRADLE_JAVA_DIRS$$",gradle_java_dirs_text)
@@ -86,6 +91,7 @@ gradle_text = gradle_text.replace("$$GRADLE_RES_DIRS$$",gradle_res_dirs_text)
 gradle_text = gradle_text.replace("$$GRADLE_ASSET_DIRS$$",gradle_asset_dirs_text)
 gradle_text = gradle_text.replace("$$GRADLE_AIDL_DIRS$$",gradle_aidl_dirs_text)
 gradle_text = gradle_text.replace("$$GRADLE_JNI_DIRS$$",gradle_jni_dirs_text)
+gradle_text = gradle_text.replace("$$GRADLE_DEFAULT_CONFIG$$",gradle_default_config_text)
 
 
 gradle_baseout.write( gradle_text )
diff --git a/platform/android/build.gradle.template b/platform/android/build.gradle.template
index b0630d9a3a..9e617a9e9e 100644
--- a/platform/android/build.gradle.template
+++ b/platform/android/build.gradle.template
@@ -18,7 +18,7 @@ allprojects {
 
 dependencies {
 	compile 'com.android.support:support-v4:23.+'  // can be removed if minSdkVersion 16 and modify DownloadNotification.java & V14CustomNotification.java
-	$$GRADLE_DEPENDENCIES$$    
+	$$GRADLE_DEPENDENCIES$$
 }
 
 android {
@@ -39,31 +39,32 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 23
+		$$GRADLE_DEFAULT_CONFIG$$
 	}
 	sourceSets {
 		main {
 			manifest.srcFile 'AndroidManifest.xml'
 			java.srcDirs = ['src'
-				$$GRADLE_JAVA_DIRS$$    
+				$$GRADLE_JAVA_DIRS$$
 			]
 			resources.srcDirs = [
 				'res'
-				$$GRADLE_RES_DIRS$$    
+				$$GRADLE_RES_DIRS$$  
 			]
 			res.srcDirs = ['res']
 		//            libs.srcDirs = ['libs']
 			aidl.srcDirs = [
 				'aidl'
-				$$GRADLE_AIDL_DIRS$$    
+				$$GRADLE_AIDL_DIRS$$   
 			]
 			assets.srcDirs = [
 				'assets'
-				$$GRADLE_ASSET_DIRS$$    				
+				$$GRADLE_ASSET_DIRS$$
 			]
 			jniLibs.srcDirs = [
 				'libs'
-				$$GRADLE_JNI_DIRS$$    								
-			] 
+				$$GRADLE_JNI_DIRS$$
+			]
 		}
 
 	}
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index b8c44a4fc8..872f047c95 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -822,40 +822,6 @@ void EditorExportPlatformAndroid::_fix_manifest(Vector<uint8_t>& p_manifest,bool
 						}*/
 					}
 
-					if (tname=="application" && /*nspace=="android" &&*/ attrname=="label") {
-
-						print_line("FOUND application");
-						if (attr_value==0xFFFFFFFF) {
-							WARN_PRINT("Application name in a resource, should be plaintext (but you can ignore this).")
-						} else {
-
-							String aname = get_project_name();
-							string_table[attr_value]=aname;
-						}
-					}
-					if (tname=="activity" && /*nspace=="android" &&*/ attrname=="label") {
-
-						print_line("FOUND activity name");
-						if (attr_value==0xFFFFFFFF) {
-							WARN_PRINT("Activity name in a resource, should be plaintext (but you can ignore this)")
-						} else {
-							String aname;
-							if (this->name!="") {
-								aname=this->name;
-							} else {
-								aname = Globals::get_singleton()->get("application/name");
-
-							}
-
-							if (aname=="") {
-								aname=_MKSTR(VERSION_NAME);
-							}
-
-							print_line("APP NAME IS..."+aname);
-							string_table[attr_value]=aname;
-						}
-					}
-
 					if (tname=="uses-permission" && /*nspace=="android" &&*/ attrname=="name") {
 
 						if (value.begins_with("godot.custom")) {
@@ -880,13 +846,11 @@ void EditorExportPlatformAndroid::_fix_manifest(Vector<uint8_t>& p_manifest,bool
 
 					if (tname=="supports-screens" ) {
 
-						if (attr_value==0xFFFFFFFF) {
-							WARN_PRINT("Screen res name in a resource, should be plaintext")
-						} else if (attrname=="smallScreens") {
+						if (attrname=="smallScreens") {
 
 							encode_uint32(screen_support[SCREEN_SMALL]?0xFFFFFFFF:0,&p_manifest[iofs+16]);
 
-						} else if (attrname=="mediumScreens") {
+						} else if (attrname=="normalScreens") {
 
 							encode_uint32(screen_support[SCREEN_NORMAL]?0xFFFFFFFF:0,&p_manifest[iofs+16]);
 
diff --git a/platform/android/godot_android.cpp b/platform/android/godot_android.cpp
index edb051575f..9f909d7041 100644
--- a/platform/android/godot_android.cpp
+++ b/platform/android/godot_android.cpp
@@ -910,7 +910,7 @@ static Variant::Type get_jni_type(const String& p_type) {
 		{"java.lang.String",Variant::STRING},
 		{"[I",Variant::INT_ARRAY},
 		{"[F",Variant::REAL_ARRAY},
-		{"[java.lang.String",Variant::STRING_ARRAY},
+		{"[Ljava.lang.String;",Variant::STRING_ARRAY},
 		{NULL,Variant::NIL}
 	};
 
@@ -941,7 +941,7 @@ static const char* get_jni_sig(const String& p_type) {
 		{"java.lang.String","Ljava/lang/String;"},
 		{"[I","[I"},
 		{"[F","[F"},
-		{"[java.lang.String","[Ljava/lang/String;"},
+		{"[Ljava.lang.String;","[Ljava/lang/String;"},
 		{NULL,"V"}
 	};
 
diff --git a/platform/android/java/res/drawable-hdpi/notify_panel_notification_icon_bg.png b/platform/android/java/res/drawable-hdpi/notify_panel_notification_icon_bg.png
index f5b762ecf3..94bc406416 100644
--- a/platform/android/java/res/drawable-hdpi/notify_panel_notification_icon_bg.png
+++ b/platform/android/java/res/drawable-hdpi/notify_panel_notification_icon_bg.png
diff --git a/platform/android/java/res/drawable-mdpi/notify_panel_notification_icon_bg.png b/platform/android/java/res/drawable-mdpi/notify_panel_notification_icon_bg.png
index 9ecb8af06c..ef6fe4e836 100644
--- a/platform/android/java/res/drawable-mdpi/notify_panel_notification_icon_bg.png
+++ b/platform/android/java/res/drawable-mdpi/notify_panel_notification_icon_bg.png
diff --git a/platform/android/java/res/drawable/icon.png b/platform/android/java/res/drawable/icon.png
index e334f5fa78..a0a0f4af25 100644
--- a/platform/android/java/res/drawable/icon.png
+++ b/platform/android/java/res/drawable/icon.png
diff --git a/platform/android/java/res/values-id/strings.xml b/platform/android/java/res/values-in/strings.xml
index 9e9a8b0c03..9e9a8b0c03 100644
--- a/platform/android/java/res/values-id/strings.xml
+++ b/platform/android/java/res/values-in/strings.xml
diff --git a/platform/android/java/res/values-he/strings.xml b/platform/android/java/res/values-iw/strings.xml
index f52ede2085..f52ede2085 100644
--- a/platform/android/java/res/values-he/strings.xml
+++ b/platform/android/java/res/values-iw/strings.xml
diff --git a/platform/android/java/src/com/android/vending/billing/IInAppBillingService.aidl b/platform/android/java/src/com/android/vending/billing/IInAppBillingService.aidl
deleted file mode 100644
index 2a492f7845..0000000000
--- a/platform/android/java/src/com/android/vending/billing/IInAppBillingService.aidl
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.vending.billing;
-
-import android.os.Bundle;
-
-/**
- * InAppBillingService is the service that provides in-app billing version 3 and beyond.
- * This service provides the following features:
- * 1. Provides a new API to get details of in-app items published for the app including
- *    price, type, title and description.
- * 2. The purchase flow is synchronous and purchase information is available immediately
- *    after it completes.
- * 3. Purchase information of in-app purchases is maintained within the Google Play system
- *    till the purchase is consumed.
- * 4. An API to consume a purchase of an inapp item. All purchases of one-time
- *    in-app items are consumable and thereafter can be purchased again.
- * 5. An API to get current purchases of the user immediately. This will not contain any
- *    consumed purchases.
- *
- * All calls will give a response code with the following possible values
- * RESULT_OK = 0 - success
- * RESULT_USER_CANCELED = 1 - user pressed back or canceled a dialog
- * RESULT_BILLING_UNAVAILABLE = 3 - this billing API version is not supported for the type requested
- * RESULT_ITEM_UNAVAILABLE = 4 - requested SKU is not available for purchase
- * RESULT_DEVELOPER_ERROR = 5 - invalid arguments provided to the API
- * RESULT_ERROR = 6 - Fatal error during the API action
- * RESULT_ITEM_ALREADY_OWNED = 7 - Failure to purchase since item is already owned
- * RESULT_ITEM_NOT_OWNED = 8 - Failure to consume since item is not owned
- */
-interface IInAppBillingService {
-    /**
-     * Checks support for the requested billing API version, package and in-app type.
-     * Minimum API version supported by this interface is 3.
-     * @param apiVersion the billing version which the app is using
-     * @param packageName the package name of the calling app
-     * @param type type of the in-app item being purchased "inapp" for one-time purchases
-     *        and "subs" for subscription.
-     * @return RESULT_OK(0) on success, corresponding result code on failures
-     */
-    int isBillingSupported(int apiVersion, String packageName, String type);
-
-    /**
-     * Provides details of a list of SKUs
-     * Given a list of SKUs of a valid type in the skusBundle, this returns a bundle
-     * with a list JSON strings containing the productId, price, title and description.
-     * This API can be called with a maximum of 20 SKUs.
-     * @param apiVersion billing API version that the Third-party is using
-     * @param packageName the package name of the calling app
-     * @param skusBundle bundle containing a StringArrayList of SKUs with key "ITEM_ID_LIST"
-     * @return Bundle containing the following key-value pairs
-     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
-     *              failure as listed above.
-     *         "DETAILS_LIST" with a StringArrayList containing purchase information
-     *              in JSON format similar to:
-     *              '{ "productId" : "exampleSku", "type" : "inapp", "price" : "$5.00",
-     *                 "title : "Example Title", "description" : "This is an example description" }'
-     */
-    Bundle getSkuDetails(int apiVersion, String packageName, String type, in Bundle skusBundle);
-
-    /**
-     * Returns a pending intent to launch the purchase flow for an in-app item by providing a SKU,
-     * the type, a unique purchase token and an optional developer payload.
-     * @param apiVersion billing API version that the app is using
-     * @param packageName package name of the calling app
-     * @param sku the SKU of the in-app item as published in the developer console
-     * @param type the type of the in-app item ("inapp" for one-time purchases
-     *        and "subs" for subscription).
-     * @param developerPayload optional argument to be sent back with the purchase information
-     * @return Bundle containing the following key-value pairs
-     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
-     *              failure as listed above.
-     *         "BUY_INTENT" - PendingIntent to start the purchase flow
-     *
-     * The Pending intent should be launched with startIntentSenderForResult. When purchase flow
-     * has completed, the onActivityResult() will give a resultCode of OK or CANCELED.
-     * If the purchase is successful, the result data will contain the following key-value pairs
-     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
-     *              failure as listed above.
-     *         "INAPP_PURCHASE_DATA" - String in JSON format similar to
-     *              '{"orderId":"12999763169054705758.1371079406387615",
-     *                "packageName":"com.example.app",
-     *                "productId":"exampleSku",
-     *                "purchaseTime":1345678900000,
-     *                "purchaseToken" : "122333444455555",
-     *                "developerPayload":"example developer payload" }'
-     *         "INAPP_DATA_SIGNATURE" - String containing the signature of the purchase data that
-     *                                  was signed with the private key of the developer
-     *                                  TODO: change this to app-specific keys.
-     */
-    Bundle getBuyIntent(int apiVersion, String packageName, String sku, String type,
-        String developerPayload);
-
-    /**
-     * Returns the current SKUs owned by the user of the type and package name specified along with
-     * purchase information and a signature of the data to be validated.
-     * This will return all SKUs that have been purchased in V3 and managed items purchased using
-     * V1 and V2 that have not been consumed.
-     * @param apiVersion billing API version that the app is using
-     * @param packageName package name of the calling app
-     * @param type the type of the in-app items being requested
-     *        ("inapp" for one-time purchases and "subs" for subscription).
-     * @param continuationToken to be set as null for the first call, if the number of owned
-     *        skus are too many, a continuationToken is returned in the response bundle.
-     *        This method can be called again with the continuation token to get the next set of
-     *        owned skus.
-     * @return Bundle containing the following key-value pairs
-     *         "RESPONSE_CODE" with int value, RESULT_OK(0) if success, other response codes on
-     *              failure as listed above.
-     *         "INAPP_PURCHASE_ITEM_LIST" - StringArrayList containing the list of SKUs
-     *         "INAPP_PURCHASE_DATA_LIST" - StringArrayList containing the purchase information
-     *         "INAPP_DATA_SIGNATURE_LIST"- StringArrayList containing the signatures
-     *                                      of the purchase information
-     *         "INAPP_CONTINUATION_TOKEN" - String containing a continuation token for the
-     *                                      next set of in-app purchases. Only set if the
-     *                                      user has more owned skus than the current list.
-     */
-    Bundle getPurchases(int apiVersion, String packageName, String type, String continuationToken);
-
-    /**
-     * Consume the last purchase of the given SKU. This will result in this item being removed
-     * from all subsequent responses to getPurchases() and allow re-purchase of this item.
-     * @param apiVersion billing API version that the app is using
-     * @param packageName package name of the calling app
-     * @param purchaseToken token in the purchase information JSON that identifies the purchase
-     *        to be consumed
-     * @return 0 if consumption succeeded. Appropriate error values for failures.
-     */
-    int consumePurchase(int apiVersion, String packageName, String purchaseToken);
-}
diff --git a/platform/android/java/src/org/godotengine/godot/Godot.java b/platform/android/java/src/org/godotengine/godot/Godot.java
index cdf17e3161..4c0f4878f5 100644
--- a/platform/android/java/src/org/godotengine/godot/Godot.java
+++ b/platform/android/java/src/org/godotengine/godot/Godot.java
@@ -602,8 +602,8 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC
 		}
 
 		mView.onResume();
-		mSensorManager.registerListener(this, mAccelerometer, SensorManager.SENSOR_DELAY_NORMAL);
-		mSensorManager.registerListener(this, mMagnetometer, SensorManager.SENSOR_DELAY_NORMAL);
+		mSensorManager.registerListener(this, mAccelerometer, SensorManager.SENSOR_DELAY_GAME);
+		mSensorManager.registerListener(this, mMagnetometer, SensorManager.SENSOR_DELAY_GAME);
 		GodotLib.focusin();
 		if(use_immersive && Build.VERSION.SDK_INT >= 19.0){ // check if the application runs on an android 4.4+
 			Window window = getWindow();
diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp
index 1ea7cd7ebb..45d02876ba 100644
--- a/platform/android/java_glue.cpp
+++ b/platform/android/java_glue.cpp
@@ -238,6 +238,10 @@ String _get_class_name(JNIEnv * env, jclass cls, bool* array) {
 
 Variant _jobject_to_variant(JNIEnv * env, jobject obj) {
 
+	if (obj == NULL) {
+		return Variant();
+	}
+	
 	jclass c = env->GetObjectClass(obj);
 	bool array;
 	String name = _get_class_name(env, c, &array);
@@ -259,8 +263,7 @@ Variant _jobject_to_variant(JNIEnv * env, jobject obj) {
 
 		for (int i=0; i<stringCount; i++) {
 			jstring string = (jstring) env->GetObjectArrayElement(arr, i);
-			const char *rawString = env->GetStringUTFChars(string, 0);
-			sarr.push_back(String(rawString));
+			sarr.push_back(String::utf8(env->GetStringUTFChars(string, NULL)));
 			env->DeleteLocalRef(string);
 
 		}
@@ -506,7 +509,7 @@ public:
 			} break;
 			case Variant::BOOL: {
 
-				ret = env->CallBooleanMethodA(instance,E->get().method,v);
+				ret = env->CallBooleanMethodA(instance,E->get().method,v)==JNI_TRUE;
 				//print_line("call bool");
 			} break;
 			case Variant::INT: {
@@ -521,8 +524,7 @@ public:
 			case Variant::STRING: {
 
 				jobject o = env->CallObjectMethodA(instance,E->get().method,v);
-				String str = env->GetStringUTFChars((jstring)o, NULL );
-				ret=str;
+				ret = String::utf8(env->GetStringUTFChars((jstring)o, NULL));
 				env->DeleteLocalRef(o);
 			} break;
 			case Variant::STRING_ARRAY: {
@@ -1563,7 +1565,7 @@ static Variant::Type get_jni_type(const String& p_type) {
 		{"[I",Variant::INT_ARRAY},
 		{"[B",Variant::RAW_ARRAY},
 		{"[F",Variant::REAL_ARRAY},
-		{"[java.lang.String",Variant::STRING_ARRAY},
+		{"[Ljava.lang.String;",Variant::STRING_ARRAY},
 		{"org.godotengine.godot.Dictionary", Variant::DICTIONARY},
 		{NULL,Variant::NIL}
 	};
@@ -1599,7 +1601,7 @@ static const char* get_jni_sig(const String& p_type) {
 		{"[I","[I"},
 		{"[B","[B"},
 		{"[F","[F"},
-		{"[java.lang.String","[Ljava/lang/String;"},
+		{"[Ljava.lang.String;","[Ljava/lang/String;"},
 		{NULL,"V"}
 	};
 
diff --git a/platform/android/logo.png b/platform/android/logo.png
index a7e2c6f130..fcf684c026 100644
--- a/platform/android/logo.png
+++ b/platform/android/logo.png
diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp
index 4e6dfb2db2..13cdf2a020 100644
--- a/platform/android/os_android.cpp
+++ b/platform/android/os_android.cpp
@@ -708,8 +708,33 @@ void OS_Android::set_need_reload_hooks(bool p_needs_them) {
 
 String OS_Android::get_data_dir() const {
 
-	if (get_data_dir_func)
-		return get_data_dir_func();
+	if (data_dir_cache!=String())
+		return data_dir_cache;
+
+	if (get_data_dir_func) {
+		String data_dir=get_data_dir_func();
+
+		//store current dir
+		char real_current_dir_name[2048];
+		getcwd(real_current_dir_name,2048);
+
+		//go to data dir
+		chdir(data_dir.utf8().get_data());
+
+		//get actual data dir, so we resolve potential symlink (Android 6.0+ seems to use symlink)
+		char data_current_dir_name[2048];
+		getcwd(data_current_dir_name,2048);
+
+		//cache by parsing utf8
+		data_dir_cache.parse_utf8(data_current_dir_name);
+
+		//restore original dir so we don't mess things up
+		chdir(real_current_dir_name);
+
+		return data_dir_cache;
+	}
+
+
 	return ".";
 	//return Globals::get_singleton()->get_singleton_object("GodotOS")->call("get_data_dir");
 };
diff --git a/platform/android/os_android.h b/platform/android/os_android.h
index 843b3c4788..e82e08ea49 100644
--- a/platform/android/os_android.h
+++ b/platform/android/os_android.h
@@ -123,6 +123,8 @@ private:
 	PhysicsServer *physics_server;
 	Physics2DServer *physics_2d_server;
 
+	mutable String data_dir_cache;
+
 #if 0
 	AudioDriverAndroid audio_driver_android;
 #else
diff --git a/platform/android/thread_jandroid.cpp b/platform/android/thread_jandroid.cpp
index 1425e23c73..61ee237586 100644
--- a/platform/android/thread_jandroid.cpp
+++ b/platform/android/thread_jandroid.cpp
@@ -29,6 +29,7 @@
 #include "thread_jandroid.h"
 
 #include "os/memory.h"
+#include "script_language.h"
 
 Thread::ID ThreadAndroid::get_ID() const {
 
@@ -44,8 +45,10 @@ void *ThreadAndroid::thread_callback(void *userdata) {
 
 	ThreadAndroid *t=reinterpret_cast<ThreadAndroid*>(userdata);
 	setup_thread();
+	ScriptServer::thread_enter(); //scripts may need to attach a stack
 	t->id=(ID)pthread_self();
 	t->callback(t->user);
+	ScriptServer::thread_exit();
 	return NULL;
 }
 
diff --git a/platform/bb10/bar/icon.png b/platform/bb10/bar/icon.png
index a837c8009a..2161402438 100644
--- a/platform/bb10/bar/icon.png
+++ b/platform/bb10/bar/icon.png
diff --git a/platform/bb10/export/export.cpp b/platform/bb10/export/export.cpp
index 7cb0aa3607..14d87aef41 100644
--- a/platform/bb10/export/export.cpp
+++ b/platform/bb10/export/export.cpp
@@ -714,7 +714,6 @@ Error EditorExportPlatformBB10::run(int p_device, int p_flags) {
 	args.push_back("-installApp");
 	args.push_back("-launchApp");
 	args.push_back("-device");
-	int idx = devices[p_device].index;
 	String host = EditorSettings::get_singleton()->get("blackberry/device_"+itos(p_device+1)+"/host");
 	String pass = EditorSettings::get_singleton()->get("blackberry/device_"+itos(p_device+1)+"/password");
 	args.push_back(host);
diff --git a/platform/bb10/logo.png b/platform/bb10/logo.png
index d0fb1966ae..abf0d2cc69 100644
--- a/platform/bb10/logo.png
+++ b/platform/bb10/logo.png
diff --git a/platform/haiku/context_gl_haiku.cpp b/platform/haiku/context_gl_haiku.cpp
index 2fedd1532a..bf890d14bf 100644
--- a/platform/haiku/context_gl_haiku.cpp
+++ b/platform/haiku/context_gl_haiku.cpp
@@ -35,6 +35,8 @@ ContextGL_Haiku::ContextGL_Haiku(HaikuDirectWindow* p_window) {
 
 	uint32 type = BGL_RGB | BGL_DOUBLE | BGL_DEPTH;
 	view = new HaikuGLView(window->Bounds(), type);
+	
+	use_vsync = false;
 }
 
 ContextGL_Haiku::~ContextGL_Haiku() {
@@ -57,7 +59,7 @@ void ContextGL_Haiku::make_current() {
 }
 
 void ContextGL_Haiku::swap_buffers() {
-	view->SwapBuffers();
+	view->SwapBuffers(use_vsync);
 }
 
 int ContextGL_Haiku::get_window_width() {
@@ -68,4 +70,12 @@ int ContextGL_Haiku::get_window_height() {
 	return window->Bounds().IntegerHeight();
 }
 
+void ContextGL_Haiku::set_use_vsync(bool p_use) {
+	use_vsync = p_use;
+}
+
+bool ContextGL_Haiku::is_using_vsync() const {
+	return use_vsync;
+}
+
 #endif
diff --git a/platform/haiku/context_gl_haiku.h b/platform/haiku/context_gl_haiku.h
index 91aae6b382..c7f80543aa 100644
--- a/platform/haiku/context_gl_haiku.h
+++ b/platform/haiku/context_gl_haiku.h
@@ -40,6 +40,8 @@ class ContextGL_Haiku : public ContextGL {
 private:
 	HaikuGLView* view;
 	HaikuDirectWindow* window;
+	
+	bool use_vsync;
 
 public:
 	ContextGL_Haiku(HaikuDirectWindow* p_window);
@@ -51,6 +53,9 @@ public:
 	virtual void swap_buffers();
 	virtual int get_window_width();
 	virtual int get_window_height();
+	
+	virtual void set_use_vsync(bool p_use);
+	virtual bool is_using_vsync() const;
 };
 
 #endif
diff --git a/platform/haiku/detect.py b/platform/haiku/detect.py
index 6d1a96a8da..f36b0c567e 100644
--- a/platform/haiku/detect.py
+++ b/platform/haiku/detect.py
@@ -24,7 +24,7 @@ def get_opts():
 def get_flags():
 	return [
 		('builtin_zlib', 'no'),
-		#('glew', 'yes'), # TODO: investigate the GLEW situation on Haiku
+		('glew', 'yes'),
 	]
 
 def configure(env):
@@ -38,8 +38,8 @@ def configure(env):
 
 	env.Append(CPPPATH = ['#platform/haiku'])
 
-	env["CC"] = "gcc"
-	env["CXX"] = "g++"
+	env["CC"] = "gcc-x86"
+	env["CXX"] = "g++-x86"
 
 	if (env["target"]=="release"):
 		if (env["debug_release"]=="yes"):
diff --git a/platform/haiku/logo.png b/platform/haiku/logo.png
index 42d7728da8..d5d98e4cc6 100644
--- a/platform/haiku/logo.png
+++ b/platform/haiku/logo.png
diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py
index c3ee098350..9cb52d4561 100644
--- a/platform/iphone/detect.py
+++ b/platform/iphone/detect.py
@@ -22,8 +22,7 @@ def get_opts():
 	return [
 		('IPHONEPLATFORM', 'name of the iphone platform', 'iPhoneOS'),
 		('IPHONEPATH', 'the path to iphone toolchain', '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain'),
-		('IOS_SDK_VERSION', 'The SDK version', 'iPhoneOS'),
-		('IPHONESDK', 'path to the iphone SDK', '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/${IOS_SDK_VERSION}.sdk/'),
+		('IPHONESDK', 'path to the iphone SDK', '/Applications/Xcode.app/Contents/Developer/Platforms/${IPHONEPLATFORM}.platform/Developer/SDKs/${IPHONEPLATFORM}.sdk/'),
 		('game_center', 'Support for game center', 'yes'),
 		('store_kit', 'Support for in-app store', 'yes'),
 		('icloud', 'Support for iCloud', 'yes'),
@@ -31,6 +30,7 @@ def get_opts():
 		('ios_appirater', 'Enable Appirater', 'no'),
 		('ios_exceptions', 'Use exceptions when compiling on playbook', 'yes'),
 		('ios_triple', 'Triple for ios toolchain', ''),
+		('ios_sim', 'Build simulator binary', 'no'),
 	]
 
 def get_flags():
@@ -45,27 +45,53 @@ def get_flags():
 
 def configure(env):
 
-	env.Append(CPPPATH=['#platform/iphone', '#platform/iphone/include'])
+	env.Append(CPPPATH=['#platform/iphone'])
 
 	env['ENV']['PATH'] = env['IPHONEPATH']+"/Developer/usr/bin/:"+env['ENV']['PATH']
 
-#	env['CC'] = '$IPHONEPATH/Developer/usr/bin/gcc'
-#	env['CXX'] = '$IPHONEPATH/Developer/usr/bin/g++'
 	env['CC'] = '$IPHONEPATH/usr/bin/${ios_triple}clang'
 	env['CXX'] = '$IPHONEPATH/usr/bin/${ios_triple}clang++'
 	env['AR'] = '$IPHONEPATH/usr/bin/${ios_triple}ar'
 	env['RANLIB'] = '$IPHONEPATH/usr/bin/${ios_triple}ranlib'
 
 	import string
-	if (env["bits"]=="64"):
-		#env['CCFLAGS'] = string.split('-arch arm64 -fmessage-length=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit=0 -Wno-trigraphs -fpascal-strings -O0 -Wno-missing-field-initializers -Wno-missing-prototypes -Wno-return-type -Wno-non-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function -Wno-unused-label -Wno-unused-parameter -Wno-unused-variable -Wunused-value -Wno-empty-body -Wno-uninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wno-constant-conversion -Wno-int-conversion -Wno-bool-conversion -Wno-enum-conversion -Wshorten-64-to-32 -Wno-newline-eof -Wno-c++11-extensions -fstrict-aliasing -Wdeprecated-declarations -Winvalid-offsetof -g -Wno-sign-conversion -miphoneos-version-min=5.1.1 -Wmost -Wno-four-char-constants -Wno-unknown-pragmas -Wno-invalid-offsetof -ffast-math -m64 -DDEBUG -D_DEBUG -MMD -MT dependencies -isysroot $IPHONESDK')
+	if (env["ios_sim"]=="yes" or env["arch"] == "x86"): # i386, simulator
+		env["arch"]="x86"
+		env["bits"]="32"
+		env['CCFLAGS'] = string.split('-arch i386 -fobjc-abi-version=2 -fobjc-legacy-dispatch -fmessage-length=0 -fpascal-strings -fasm-blocks  -Wall -D__IPHONE_OS_VERSION_MIN_REQUIRED=40100 -isysroot $IPHONESDK -mios-simulator-version-min=4.3 -DCUSTOM_MATRIX_TRANSFORM_H=\\\"build/iphone/matrix4_iphone.h\\\" -DCUSTOM_VECTOR3_TRANSFORM_H=\\\"build/iphone/vector3_iphone.h\\\"')
+	elif (env["arch"]=="arm64"): # arm64
+		env["bits"] = "64"
 		env['CCFLAGS'] = string.split('-fno-objc-arc -arch arm64 -fmessage-length=0 -fno-strict-aliasing -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits -Wno-trigraphs -fpascal-strings -Wmissing-prototypes -Wreturn-type -Wparentheses -Wswitch -Wno-unused-parameter -Wunused-variable -Wunused-value -Wno-shorten-64-to-32 -fvisibility=hidden -Wno-sign-conversion -MMD -MT dependencies -miphoneos-version-min=5.1.1 -isysroot $IPHONESDK')
 		env.Append(CPPFLAGS=['-DNEED_LONG_INT'])
 		env.Append(CPPFLAGS=['-DLIBYUV_DISABLE_NEON'])
-	else:
+	else: # armv7
+		env["arch"] = "arm"
+		env["bits"] = "32"
 		env['CCFLAGS'] = string.split('-fno-objc-arc -arch armv7 -fmessage-length=0 -fno-strict-aliasing -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits -Wno-trigraphs -fpascal-strings -Wmissing-prototypes -Wreturn-type -Wparentheses -Wswitch -Wno-unused-parameter -Wunused-variable -Wunused-value -Wno-shorten-64-to-32 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk -fvisibility=hidden -Wno-sign-conversion -mthumb "-DIBOutlet=__attribute__((iboutlet))" "-DIBOutletCollection(ClassName)=__attribute__((iboutletcollection(ClassName)))" "-DIBAction=void)__attribute__((ibaction)" -miphoneos-version-min=5.1.1 -MMD -MT dependencies -isysroot $IPHONESDK')
 
-	if (env["bits"]=="64"):
+	if (env["arch"]=="x86"):
+		env['IPHONEPLATFORM'] = 'iPhoneSimulator'
+		env.Append(LINKFLAGS=['-arch', 'i386', '-mios-simulator-version-min=4.3',
+							'-isysroot', '$IPHONESDK',
+							#'-mmacosx-version-min=10.6',
+							'-Xlinker',
+							'-objc_abi_version',
+							'-Xlinker', '2',
+							'-framework', 'AudioToolbox',
+							'-framework', 'AVFoundation',
+							'-framework', 'CoreAudio',
+							'-framework', 'CoreGraphics',
+							'-framework', 'CoreMedia',
+							'-framework', 'Foundation',
+							'-framework', 'Security',
+							'-framework', 'UIKit',
+							'-framework', 'MediaPlayer',
+							'-framework', 'OpenGLES',
+							'-framework', 'QuartzCore',
+							'-framework', 'SystemConfiguration',
+							'-F$IPHONESDK',
+							])
+	elif (env["arch"]=="arm64"):
 		env.Append(LINKFLAGS=['-arch', 'arm64', '-Wl,-dead_strip', '-miphoneos-version-min=5.1.1',
 							'-isysroot', '$IPHONESDK',
 							#'-stdlib=libc++',
@@ -134,13 +160,16 @@ def configure(env):
 		env.Append(CCFLAGS=['-g','-pg', '-Os'])
 		env.Append(LINKFLAGS=['-pg'])
 
-
+	if (env["ios_sim"]=="yes"): #TODO: Check if needed?
+		env['ENV']['MACOSX_DEPLOYMENT_TARGET'] = '10.6'
 	env['ENV']['CODESIGN_ALLOCATE'] = '/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate'
 	env.Append(CPPFLAGS=['-DIPHONE_ENABLED', '-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DMPC_FIXED_POINT'])
 
 	if(env["opus"]=="yes"):
 		env.opus_fixed_point="yes"
-		if(env["bits"]=="64"):
+		if env["arch"]=="x86":
+			pass
+		elif(env["arch"]=="arm64"):
 			env.Append(CFLAGS=["-DOPUS_ARM64_OPT"])
 		else:
 			env.Append(CFLAGS=["-DOPUS_ARM_OPT"])
@@ -156,5 +185,3 @@ def configure(env):
 	env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
 	env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
 	env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-
-
diff --git a/platform/iphone/logo.png b/platform/iphone/logo.png
index d1851d7a5e..8dd718524c 100644
--- a/platform/iphone/logo.png
+++ b/platform/iphone/logo.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-568h@2x~iphone.png b/platform/iphone/xcode/godot_xcode/godot_ios/Default-568h@2x~iphone.png
index 1341174454..1d5e472665 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-568h@2x~iphone.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Default-568h@2x~iphone.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-667h.png b/platform/iphone/xcode/godot_xcode/godot_ios/Default-667h.png
index c480d2e3c0..b13a399c83 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-667h.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Default-667h.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-667h@2x.png b/platform/iphone/xcode/godot_xcode/godot_ios/Default-667h@2x.png
index 3cc1dfa290..b51598fed0 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-667h@2x.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Default-667h@2x.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-736h.png b/platform/iphone/xcode/godot_xcode/godot_ios/Default-736h.png
index 813d689162..8c44edbccd 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-736h.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Default-736h.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-736h@3x.png b/platform/iphone/xcode/godot_xcode/godot_ios/Default-736h@3x.png
index 7707005e76..33847ac136 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-736h@3x.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Default-736h@3x.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Landscape-736h.png b/platform/iphone/xcode/godot_xcode/godot_ios/Default-Landscape-736h.png
index b02873323e..2a025b745b 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Landscape-736h.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Default-Landscape-736h.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Landscape@2x~ipad.png b/platform/iphone/xcode/godot_xcode/godot_ios/Default-Landscape@2x~ipad.png
index d86c4a2510..7099f3e18d 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Landscape@2x~ipad.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Default-Landscape@2x~ipad.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Landscape~ipad.png b/platform/iphone/xcode/godot_xcode/godot_ios/Default-Landscape~ipad.png
index e4f6cef02b..4a761c339a 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Landscape~ipad.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Default-Landscape~ipad.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Portrait@2x~ipad.png b/platform/iphone/xcode/godot_xcode/godot_ios/Default-Portrait@2x~ipad.png
index f306652a31..b09cf21186 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Portrait@2x~ipad.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Default-Portrait@2x~ipad.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Portrait~ipad.png b/platform/iphone/xcode/godot_xcode/godot_ios/Default-Portrait~ipad.png
index 71a16db6df..fa698eb70c 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default-Portrait~ipad.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Default-Portrait~ipad.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default@2x~iphone.png b/platform/iphone/xcode/godot_xcode/godot_ios/Default@2x~iphone.png
index 5305cb9bdb..ddf2861f4d 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default@2x~iphone.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Default@2x~iphone.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Default~iphone.png b/platform/iphone/xcode/godot_xcode/godot_ios/Default~iphone.png
index 91c62d1e43..c485a33b03 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Default~iphone.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Default~iphone.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-100.png b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-100.png
index f9dca1ab57..165f4423b3 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-100.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-100.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-114.png b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-114.png
index e7f9bd7388..2e205e920c 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-114.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-114.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-120.png b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-120.png
index 4faa0f28e2..6245f83f48 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-120.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-120.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-144.png b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-144.png
index 1c4cb51d56..7b24e01bc6 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-144.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-144.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-152.png b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-152.png
index e99b11c519..344b470fa3 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-152.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-152.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-180.png b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-180.png
index 3edbcadfc5..0dcebbc3f2 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-180.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-180.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-29.png b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-29.png
index 0ae5893203..9ae94e9aaf 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-29.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-29.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-40.png b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-40.png
index bb4ffa70ad..569f24df91 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-40.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-40.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-50.png b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-50.png
index 7a4b7107e7..9e69ed3121 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-50.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-50.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-57.png b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-57.png
index b00bd79091..b970fa3067 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-57.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-57.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-58.png b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-58.png
index 46335efdf6..6097a6c73b 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-58.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-58.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-60.png b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-60.png
index 2c9c2b61dc..21b9622eb6 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-60.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-60.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-72.png b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-72.png
index d711958ef1..34dea8e6ad 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-72.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-72.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-76.png b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-76.png
index 464e7e7289..f72eb0b345 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-76.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-76.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-80.png b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-80.png
index 1151bc6b4b..793c9b1f5f 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-80.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/Icon-80.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-167.png b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-167.png
index 487c8326be..7cd0e054ab 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-167.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-167.png
diff --git a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-87.png b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-87.png
index e54cee23a6..e9b2429754 100644
--- a/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-87.png
+++ b/platform/iphone/xcode/godot_xcode/godot_ios/Images.xcassets/AppIcon.appiconset/icon-87.png
diff --git a/platform/isim/SCsub b/platform/isim/SCsub
deleted file mode 100644
index 8a46565e7e..0000000000
--- a/platform/isim/SCsub
+++ /dev/null
@@ -1,38 +0,0 @@
-Import('env')
-
-iphone_lib = [
-
-	'#platform/iphone/os_iphone.cpp',
-	#'#platform/iphone/rasterizer_iphone.cpp',
-	'#platform/iphone/audio_driver_iphone.cpp',
-	'#platform/iphone/sem_iphone.cpp',
-	'#platform/iphone/gl_view.mm',
-	'#platform/iphone/main.m',
-	'#platform/iphone/app_delegate.mm',
-	'#platform/iphone/view_controller.mm',
-	'#platform/iphone/game_center.mm',
-	'#platform/iphone/in_app_store.mm',
-	'#platform/iphone/icloud.mm',
-	#'#platform/iphone/Appirater.m',
-	'#platform/iphone/ios.mm',
-]
-
-#env.Depends('#core/math/vector3.h', 'vector3_psp.h')
-
-#iphone_lib = env.Library('iphone', iphone_lib)
-
-env_ios = env.Clone();
-
-
-if env['ios_gles22_override'] == "yes":
-	env_ios.Append(CPPFLAGS=['-DGLES2_OVERRIDE'])
-
-
-#if env['ios_appirater'] == "yes":
-#	env_ios.Append(CPPFLAGS=['-DAPPIRATER_ENABLED'])
-
-
-obj = env_ios.Object('#platform/iphone/godot_iphone.cpp')
-
-prog = None
-prog = env_ios.Program('#bin/godot', [obj] + iphone_lib)
diff --git a/platform/isim/detect.py b/platform/isim/detect.py
deleted file mode 100644
index 809b0ac368..0000000000
--- a/platform/isim/detect.py
+++ /dev/null
@@ -1,105 +0,0 @@
-import os
-import sys
-
-
-def is_active():
-	return False
-
-def get_name():
-	return "iSIM"
-
-
-def can_build():
-
-	import sys
-	if sys.platform == 'darwin':
-		return True
-
-	return False
-
-def get_opts():
-
-	return [
-		('ISIMPLATFORM', 'name of the iphone platform', 'iPhoneSimulator'),
-		('ISIMPATH', 'the path to iphone toolchain', '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain'),
-		('ISIMSDK', 'path to the iphone SDK', '/Applications/Xcode.app/Contents/Developer/Platforms/${ISIMPLATFORM}.platform/Developer/SDKs/${ISIMPLATFORM}.sdk'),
-		('game_center', 'Support for game center', 'yes'),
-		('store_kit', 'Support for in-app store', 'yes'),
-		('ios_gles22_override', 'Force GLES2.0 on iOS', 'yes'),
-		('ios_GLES1_override', 'Force legacy GLES (1.1) on iOS', 'no'),
-		('ios_appirater', 'Enable Appirater', 'no'),
-		('ios_exceptions', 'Use exceptions when compiling on playbook', 'no'),
-	]
-
-def get_flags():
-
-	return [
-		('tools', 'yes'),
-		('webp', 'yes'),
-	]
-
-
-
-def configure(env):
-
-	env.Append(CPPPATH=['#platform/iphone'])
-
-	env['ENV']['PATH'] = env['ISIMPATH']+"/Developer/usr/bin/:"+env['ENV']['PATH']
-
-	env['CC'] = '$ISIMPATH/usr/bin/${ios_triple}clang'
-	env['CXX'] = '$ISIMPATH/usr/bin/${ios_triple}clang++'
-	env['AR'] = '$ISIMPATH/usr/bin/${ios_triple}ar'
-	env['RANLIB'] = '$ISIMPATH/usr/bin/${ios_triple}ranlib'
-
-	import string
-	env['CCFLAGS'] = string.split('-arch i386 -fobjc-abi-version=2 -fobjc-legacy-dispatch -fmessage-length=0 -fpascal-strings -fasm-blocks  -Wall -D__IPHONE_OS_VERSION_MIN_REQUIRED=40100 -isysroot $ISIMSDK -mios-simulator-version-min=4.3 -DCUSTOM_MATRIX_TRANSFORM_H=\\\"build/iphone/matrix4_iphone.h\\\" -DCUSTOM_VECTOR3_TRANSFORM_H=\\\"build/iphone/vector3_iphone.h\\\"')
-
-	env.Append(LINKFLAGS=['-arch', 'i386',
-							'-mios-simulator-version-min=4.3',
-							'-isysroot', '$ISIMSDK',
-							#'-mmacosx-version-min=10.6',
-							'-Xlinker',
-							'-objc_abi_version',
-							'-Xlinker', '2',
-							'-framework', 'AudioToolbox',
-							'-framework', 'AVFoundation',
-							'-framework', 'CoreAudio',
-							'-framework', 'CoreGraphics',
-							'-framework', 'CoreMedia',
-							'-framework', 'Foundation',
-							'-framework', 'Security',
-							'-framework', 'UIKit',
-							'-framework', 'MediaPlayer',
-							'-framework', 'OpenGLES',
-							'-framework', 'QuartzCore',
-							'-framework', 'SystemConfiguration',
-							'-F$ISIMSDK',
-							])
-
-	env.Append(CPPPATH = ['$ISIMSDK/System/Library/Frameworks/OpenGLES.framework/Headers'])
-
-	if (env["target"]=="release"):
-
-		env.Append(CCFLAGS=['-O3', '-ffast-math'])
-		env.Append(LINKFLAGS=['-O3', '-ffast-math'])
-
-	elif (env["target"]=="debug"):
-
-		env.Append(CCFLAGS=['-DDEBUG', '-D_DEBUG', '-gdwarf-2', '-Wall', '-O0', '-DDEBUG_ENABLED'])
-		env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ALLOC'])
-
-	elif (env["target"]=="profile"):
-
-		env.Append(CCFLAGS=['-g','-pg'])
-		env.Append(LINKFLAGS=['-pg'])
-
-
-	env['ENV']['MACOSX_DEPLOYMENT_TARGET'] = '10.6'
-	env['ENV']['CODESIGN_ALLOCATE'] = '/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate'
-	env.Append(CPPFLAGS=['-DIPHONE_ENABLED', '-DUNIX_ENABLED', '-DGLES2_ENABLED', '-fexceptions'])
-
-	import methods
-	env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-	env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-	env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-
diff --git a/platform/javascript/audio_server_javascript.cpp b/platform/javascript/audio_server_javascript.cpp
index 9f82f084e5..71a7e77266 100644
--- a/platform/javascript/audio_server_javascript.cpp
+++ b/platform/javascript/audio_server_javascript.cpp
@@ -116,7 +116,7 @@ void AudioServerJavascript::sample_set_data(RID p_sample, const DVector<uint8_t>
 
 
 }
-const DVector<uint8_t> AudioServerJavascript::sample_get_data(RID p_sample) const{
+DVector<uint8_t> AudioServerJavascript::sample_get_data(RID p_sample) const{
 
 
 	return DVector<uint8_t>();
diff --git a/platform/javascript/audio_server_javascript.h b/platform/javascript/audio_server_javascript.h
index bb9a91f78a..e27192cd93 100644
--- a/platform/javascript/audio_server_javascript.h
+++ b/platform/javascript/audio_server_javascript.h
@@ -132,7 +132,7 @@ public:
 
 
 	virtual void sample_set_data(RID p_sample, const DVector<uint8_t>& p_buffer);
-	virtual const DVector<uint8_t> sample_get_data(RID p_sample) const;
+	virtual DVector<uint8_t> sample_get_data(RID p_sample) const;
 
 	virtual void sample_set_mix_rate(RID p_sample,int p_rate);
 	virtual int sample_get_mix_rate(RID p_sample) const;
diff --git a/platform/javascript/logo.png b/platform/javascript/logo.png
index 07e0a41292..ce911180ac 100644
--- a/platform/javascript/logo.png
+++ b/platform/javascript/logo.png
diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp
index 2e42e79996..1defcb7cb2 100644
--- a/platform/javascript/os_javascript.cpp
+++ b/platform/javascript/os_javascript.cpp
@@ -415,6 +415,9 @@ void OS_JavaScript::push_input(const InputEvent& p_ev) {
 
 	InputEvent ev = p_ev;
 	ev.ID=last_id++;
+	if (ev.type==InputEvent::MOUSE_MOTION) {
+		input->set_mouse_pos(Point2(ev.mouse_motion.x, ev.mouse_motion.y));
+	}
 	input->parse_input_event(p_ev);
 }
 
diff --git a/platform/osx/export/export.cpp b/platform/osx/export/export.cpp
index cb0514da9d..47b0392b25 100644
--- a/platform/osx/export/export.cpp
+++ b/platform/osx/export/export.cpp
@@ -48,6 +48,11 @@ class EditorExportPlatformOSX : public EditorExportPlatform {
 	String custom_release_package;
 	String custom_debug_package;
 
+	enum BitsMode {
+		BITS_FAT,
+		BITS_64,
+		BITS_32
+	};
 
 	int version_code;
 
@@ -59,8 +64,7 @@ class EditorExportPlatformOSX : public EditorExportPlatform {
 	String version;
 	String signature;
 	String copyright;
-	bool use64;
-	bool useFat;
+	BitsMode bits_mode;
 	bool high_resolution;
 
 	Ref<ImageTexture> logo;
@@ -83,7 +87,7 @@ public:
 
 
 	virtual bool poll_devices() { return false;}
-	virtual int get_device_count() const { return 0; };
+	virtual int get_device_count() const { return 0; }
 	virtual String get_device_name(int p_device) const  { return String(); }
 	virtual String get_device_info(int p_device) const { return String(); }
 	virtual Error run(int p_device,int p_flags=0);
@@ -122,10 +126,8 @@ bool EditorExportPlatformOSX::_set(const StringName& p_name, const Variant& p_va
 		version=p_value;
 	else if (n=="application/copyright")
 		copyright=p_value;
-	else if (n=="application/64_bits")
-		use64=p_value;
-	else if (n=="application/fat_bits")
-		useFat=p_value;
+	else if (n=="application/bits_mode")
+		bits_mode=BitsMode(int(p_value));
 	else if (n=="display/high_res")
 		high_resolution=p_value;
 	else
@@ -158,10 +160,8 @@ bool EditorExportPlatformOSX::_get(const StringName& p_name,Variant &r_ret) cons
 		r_ret=version;
 	else if (n=="application/copyright")
 		r_ret=copyright;
-	else if (n=="application/64_bits")
-		r_ret=use64;
-	else if (n=="application/fat_bits")
-		r_ret=useFat;
+	else if (n=="application/bits_mode")
+		r_ret=bits_mode;
 	else if (n=="display/high_res")
 		r_ret=high_resolution;
 	else
@@ -182,13 +182,9 @@ void EditorExportPlatformOSX::_get_property_list( List<PropertyInfo> *p_list) co
 	p_list->push_back( PropertyInfo( Variant::STRING, "application/short_version") );
 	p_list->push_back( PropertyInfo( Variant::STRING, "application/version") );
 	p_list->push_back( PropertyInfo( Variant::STRING, "application/copyright") );
-	p_list->push_back( PropertyInfo( Variant::BOOL, "application/64_bits") );
-	p_list->push_back( PropertyInfo( Variant::BOOL, "application/fat_bits") );
+	p_list->push_back( PropertyInfo( Variant::INT, "application/bits_mode", PROPERTY_HINT_ENUM, "Fat (32 & 64 bits),64 bits,32 bits") );
 	p_list->push_back( PropertyInfo( Variant::BOOL, "display/high_res") );
 
-
-	//p_list->push_back( PropertyInfo( Variant::INT, "resources/pack_mode", PROPERTY_HINT_ENUM,"Copy,Single Exec.,Pack (.pck),Bundles (Optical)"));
-
 }
 
 void EditorExportPlatformOSX::_make_icon(const Image& p_icon,Vector<uint8_t>& icon) {
@@ -321,7 +317,8 @@ Error EditorExportPlatformOSX::export_project(const String& p_path, bool p_debug
 	io2.opaque=&dst_f;
 	zipFile	dpkg=zipOpen2(p_path.utf8().get_data(),APPEND_STATUS_CREATE,NULL,&io2);
 
-	String binary_to_use="godot_osx_"+String(p_debug?"debug":"release")+"."+String(useFat?"fat":use64?"64":"32");
+	String binary_to_use = "godot_osx_" + String(p_debug ? "debug" : "release") + ".";
+	binary_to_use += String(bits_mode==BITS_FAT ? "fat" : bits_mode==BITS_64 ? "64" : "32");
 
 	print_line("binary: "+binary_to_use);
 	String pkg_name;
@@ -333,6 +330,8 @@ Error EditorExportPlatformOSX::export_project(const String& p_path, bool p_debug
 		pkg_name="Unnamed";
 
 
+	bool found_binary = false;
+
 	while(ret==UNZ_OK) {
 
 		//get filename
@@ -366,6 +365,7 @@ Error EditorExportPlatformOSX::export_project(const String& p_path, bool p_debug
 				ret = unzGoToNextFile(pkg);
 				continue; //ignore!
 			}
+			found_binary = true;
 			file="Contents/MacOS/"+pkg_name;
 		}
 
@@ -420,6 +420,13 @@ Error EditorExportPlatformOSX::export_project(const String& p_path, bool p_debug
 		ret = unzGoToNextFile(pkg);
 	}
 
+	if (!found_binary) {
+		ERR_PRINTS("Requested template binary '"+binary_to_use+"' not found. It might be missing from your template archive.");
+		zipClose(dpkg,NULL);
+		unzClose(pkg);
+		return ERR_FILE_NOT_FOUND;
+	}
+
 
 	ep.step("Making PKG",1);
 
@@ -487,13 +494,12 @@ EditorExportPlatformOSX::EditorExportPlatformOSX() {
 	logo = Ref<ImageTexture>( memnew( ImageTexture ));
 	logo->create_from_image(img);
 
-	info="This Game is Nice";
-	identifier="com.godot.macgame";
+	info="Made with Godot Engine";
+	identifier="org.godotengine.macgame";
 	signature="godotmacgame";
 	short_version="1.0";
 	version="1.0";
-	use64=false;
-	useFat=false;
+	bits_mode=BITS_FAT;
 	high_resolution=false;
 
 }
diff --git a/platform/osx/logo.png b/platform/osx/logo.png
index 2bcd3aa72e..93c6890e85 100644
--- a/platform/osx/logo.png
+++ b/platform/osx/logo.png
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h
index 8d64686335..e1c33cb018 100644
--- a/platform/osx/os_osx.h
+++ b/platform/osx/os_osx.h
@@ -142,6 +142,8 @@ public:
 
 	virtual String get_name();
 
+	virtual void alert(const String& p_alert, const String& p_title="ALERT!");
+
 	virtual void set_cursor_shape(CursorShape p_shape);
 
 	virtual void set_mouse_show(bool p_show);
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index b5503fcd73..45c500ec39 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -1209,6 +1209,22 @@ String OS_OSX::get_name() {
 	return "OSX";
 }
 
+void OS_OSX::alert(const String& p_alert, const String& p_title) {
+	// Set OS X-compliant variables
+	NSAlert *window = [[NSAlert alloc] init];
+	NSString *ns_title = [NSString stringWithUTF8String:p_title.utf8().get_data()];
+	NSString *ns_alert = [NSString stringWithUTF8String:p_alert.utf8().get_data()];
+
+	[window addButtonWithTitle:@"OK"];
+	[window setMessageText:ns_title];
+	[window setInformativeText:ns_alert];
+	[window setAlertStyle:NSWarningAlertStyle];
+
+	// Display it, then release
+	[window runModal];
+	[window release];
+}
+
 void OS_OSX::set_cursor_shape(CursorShape p_shape) {
 
 	if (cursor_shape==p_shape)
diff --git a/platform/server/logo.png b/platform/server/logo.png
index 6b7490097f..5e98ac26ec 100644
--- a/platform/server/logo.png
+++ b/platform/server/logo.png
diff --git a/platform/windows/godot.manifest b/platform/windows/godot.manifest
new file mode 100644
index 0000000000..c095f007b0
--- /dev/null
+++ b/platform/windows/godot.manifest
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+        <security>
+            <requestedPrivileges>
+                <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+            </requestedPrivileges>
+        </security>
+    </trustInfo>
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+        <application>
+            <!-- Windows 10 -->
+            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+            <!-- Windows 8.1 -->
+            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+            <!-- Windows 8 -->
+            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+            <!-- Windows 7 -->
+            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+            <!-- Windows Vista -->
+            <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+        </application>
+    </compatibility>
+</assembly>
diff --git a/platform/windows/godot_res.rc b/platform/windows/godot_res.rc
index 5f1e951e0f..d069ecdc79 100644
--- a/platform/windows/godot_res.rc
+++ b/platform/windows/godot_res.rc
@@ -1,3 +1,4 @@
+#include <winuser.h>
 #include "core/version.h"
 #ifndef _STR
 #define _STR(m_x) #m_x
@@ -6,6 +7,8 @@
 
 GODOT_ICON ICON platform/windows/godot.ico
 
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST platform/windows/godot.manifest
+
 1 VERSIONINFO
 FILEVERSION    	VERSION_MAJOR,VERSION_MINOR,0,0
 PRODUCTVERSION 	VERSION_MAJOR,VERSION_MINOR,0,0
diff --git a/platform/windows/joystick.cpp b/platform/windows/joystick.cpp
index 663bbe3b9b..e69bfe6a52 100644
--- a/platform/windows/joystick.cpp
+++ b/platform/windows/joystick.cpp
@@ -283,7 +283,7 @@ void joystick_windows::close_joystick(int id) {
 	d_joysticks[id].attached = false;
 	attached_joysticks[d_joysticks[id].id] = false;
 	d_joysticks[id].guid.Data1 = d_joysticks[id].guid.Data2 = d_joysticks[id].guid.Data3 = 0;
-	input->joy_connection_changed(id, false, "");
+	input->joy_connection_changed(d_joysticks[id].id, false, "");
 	joystick_count--;
 }
 
diff --git a/platform/windows/logo.png b/platform/windows/logo.png
index a27e14dde8..4376abd563 100644
--- a/platform/windows/logo.png
+++ b/platform/windows/logo.png
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 630d5715e9..b0a50ca4b8 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -604,10 +604,28 @@ LRESULT OS_Windows::WndProc(HWND hWnd,UINT uMsg, WPARAM	wParam,	LPARAM	lParam) {
 		} break;
 
 		case WM_SIZE: {
-			video_mode.width=LOWORD(lParam);
-			video_mode.height=HIWORD(lParam);
+			int window_w = LOWORD(lParam);
+			int window_h = HIWORD(lParam);
+			if (window_w > 0 && window_h > 0) {
+				video_mode.width = window_w;
+				video_mode.height = window_h;
+			}
 			//return 0;								// Jump Back
 		} break;
+
+		case WM_ENTERSIZEMOVE: {
+			move_timer_id = SetTimer(hWnd, 1, USER_TIMER_MINIMUM,(TIMERPROC) NULL);
+		} break;
+		case WM_EXITSIZEMOVE: {
+			KillTimer(hWnd, move_timer_id);
+		} break;
+		case WM_TIMER: {
+			if (wParam == move_timer_id) {
+				process_key_events();
+				Main::iteration();
+			}
+		} break;
+
 		case WM_SYSKEYDOWN:
 		case WM_SYSKEYUP:
 		case WM_KEYUP:
@@ -1136,7 +1154,7 @@ void OS_Windows::initialize(const VideoMode& p_desired,int p_video_driver,int p_
 
 	DragAcceptFiles(hWnd,true);
 
-
+	move_timer_id = 1;
 }
 
 void OS_Windows::set_clipboard(const String& p_text) {
@@ -2160,6 +2178,68 @@ String OS_Windows::get_locale() const {
 	return "en";
 }
 
+
+OS::LatinKeyboardVariant OS_Windows::get_latin_keyboard_variant() const {
+	
+	unsigned long azerty[] = { 
+		0x00020401, // Arabic (102) AZERTY
+		0x0001080c, // Belgian (Comma)
+		0x0000080c, // Belgian French
+		0x0000040c, // French
+		0 // <--- STOP MARK
+	};
+	unsigned long qwertz[] = {
+		0x0000041a, // Croation
+		0x00000405, // Czech
+		0x00000407, // German
+		0x00010407, // German (IBM)
+		0x0000040e, // Hungarian
+		0x0000046e, // Luxembourgish
+		0x00010415, // Polish (214)
+		0x00000418, // Romanian (Legacy)
+		0x0000081a, // Serbian (Latin)
+		0x0000041b, // Slovak
+		0x00000424, // Slovenian
+		0x0001042e, // Sorbian Extended
+		0x0002042e, // Sorbian Standard
+		0x0000042e, // Sorbian Standard (Legacy)
+		0x0000100c, // Swiss French
+		0x00000807, // Swiss German
+		0 // <--- STOP MARK
+	};
+	unsigned long dvorak[] = {
+		0x00010409, // US-Dvorak
+		0x00030409, // US-Dvorak for left hand
+		0x00040409, // US-Dvorak for right hand
+		0 // <--- STOP MARK
+	};
+
+	char name[ KL_NAMELENGTH + 1 ]; name[0] = 0;
+	GetKeyboardLayoutNameA( name );
+
+	unsigned long hex = strtoul(name, NULL, 16);
+
+	int i=0;
+	while( azerty[i] != 0 ) {
+		if (azerty[i] == hex) return LATIN_KEYBOARD_AZERTY;
+		i++;
+	}
+
+	i = 0;
+	while( qwertz[i] != 0 ) {
+		if (qwertz[i] == hex) return LATIN_KEYBOARD_QWERTZ;
+		i++;
+	}
+	
+	i = 0;
+	while( dvorak[i] != 0 ) {
+		if (dvorak[i] == hex) return LATIN_KEYBOARD_DVORAK;
+		i++; 
+	}
+
+	return LATIN_KEYBOARD_QWERTY;
+}
+
 void OS_Windows::release_rendering_thread() {
 
 	gl_context->release_current();
diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h
index 509d76abbf..5acb300c0f 100644
--- a/platform/windows/os_windows.h
+++ b/platform/windows/os_windows.h
@@ -104,6 +104,8 @@ class OS_Windows : public OS {
 	HINSTANCE	hInstance;		// Holds The Instance Of The Application
 	HWND hWnd;
 
+	uint32_t move_timer_id;
+
 	HCURSOR hCursor;
 
 	Size2 window_rect;
@@ -264,6 +266,7 @@ public:
 	virtual String get_executable_path() const;
 
 	virtual String get_locale() const;
+	virtual LatinKeyboardVariant get_latin_keyboard_variant() const; 
 
 	virtual void move_window_to_foreground();
 	virtual String get_data_dir() const;
diff --git a/platform/winrt/logo.png b/platform/winrt/logo.png
index a27e14dde8..4376abd563 100644
--- a/platform/winrt/logo.png
+++ b/platform/winrt/logo.png
diff --git a/platform/winrt/thread_winrt.cpp b/platform/winrt/thread_winrt.cpp
index 097050e511..e7028bd9dc 100644
--- a/platform/winrt/thread_winrt.cpp
+++ b/platform/winrt/thread_winrt.cpp
@@ -33,6 +33,8 @@
 Thread* ThreadWinrt::create_func_winrt(ThreadCreateCallback p_callback,void *p_user,const Settings&) {
 
 	ThreadWinrt* thread = memnew(ThreadWinrt);
+
+
 	std::thread new_thread(p_callback, p_user);
 	std::swap(thread->thread, new_thread);
 
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 5f272536ba..3c50e2cf5b 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -182,7 +182,9 @@ def configure(env):
 			print("PulseAudio development libraries not found, disabling driver")
 
 	env.Append(CPPFLAGS=['-DX11_ENABLED','-DUNIX_ENABLED','-DGLES2_ENABLED','-DGLES_OVER_GL'])
-	env.Append(LIBS=['GL', 'GLU', 'pthread', 'z', 'dl'])
+	env.Append(LIBS=['GL', 'GLU', 'pthread', 'z'])
+	if (platform.system() == "Linux"):
+		env.Append(LIBS='dl')
 	#env.Append(CPPFLAGS=['-DMPC_FIXED_POINT'])
 
 #host compiler is default..
@@ -209,5 +211,7 @@ def configure(env):
 	if (env["use_static_cpp"]=="yes"):
 		env.Append(LINKFLAGS=['-static-libstdc++'])
 
-	env["x86_opt_gcc"]=True
+	list_of_x86 = ['x86_64', 'x86', 'i386', 'i586']
+	if any(platform.machine() in s for s in list_of_x86):
+		env["x86_opt_gcc"]=True
 
diff --git a/platform/x11/joystick_linux.cpp b/platform/x11/joystick_linux.cpp
index 82f79c2640..4a6a4f3a52 100644
--- a/platform/x11/joystick_linux.cpp
+++ b/platform/x11/joystick_linux.cpp
@@ -45,7 +45,9 @@
 #define test_bit(nr, addr)  (((1UL << ((nr) % LONG_BITS)) & ((addr)[(nr) / LONG_BITS])) != 0)
 #define NBITS(x) ((((x)-1)/LONG_BITS)+1)
 
+#ifdef UDEV_ENABLED
 static const char* ignore_str = "/dev/input/js";
+#endif
 
 joystick_linux::Joystick::Joystick() {
 	fd = -1;
@@ -198,7 +200,6 @@ void joystick_linux::monitor_joysticks(udev *p_udev) {
 		}
 		usleep(50000);
 	}
-	//printf("exit udev\n");
 	udev_monitor_unref(mon);
 }
 #endif
diff --git a/platform/x11/logo.png b/platform/x11/logo.png
index c40214d6de..1cc93b46ac 100644
--- a/platform/x11/logo.png
+++ b/platform/x11/logo.png
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index c9349c1bbe..20fae72abd 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -116,7 +116,9 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
 	x11_display = XOpenDisplay(NULL);
 
 	char * modifiers = XSetLocaleModifiers ("@im=none");
-	ERR_FAIL_COND( modifiers == NULL );
+	if (modifiers==NULL) {
+		WARN_PRINT("Error setting locale modifiers");
+	}
 
 	const char* err;
 	xrr_get_monitors = NULL;
@@ -344,7 +346,7 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
 	/* set the name and class hints for the window manager to use */
 	classHint = XAllocClassHint();
 	if (classHint) {
-		classHint->res_name = (char *)"Godot";
+		classHint->res_name = (char *)"Godot_Engine";
 		classHint->res_class = (char *)"Godot";
 	}
 	XSetClassHint(x11_display, x11_window, classHint);
@@ -1771,7 +1773,6 @@ static String _get_clipboard(Atom p_source, Window x11_window, ::Display* x11_di
 
 	if (Sown == x11_window) {
 
-		printf("returning internal clipboard\n");
 		return p_internal_clipboard;
 	};
 
diff --git a/scene/2d/animated_sprite.cpp b/scene/2d/animated_sprite.cpp
index c062a6d1fc..73774e12d9 100644
--- a/scene/2d/animated_sprite.cpp
+++ b/scene/2d/animated_sprite.cpp
@@ -318,7 +318,7 @@ void AnimatedSprite::_validate_property(PropertyInfo& property) const {
 
 	if (property.name=="frame") {
 
-		property.hint=PROPERTY_HINT_RANGE;
+		property.hint=PROPERTY_HINT_SPRITE_FRAME;
 
 		if (frames->has_animation(animation)) {
 			property.hint_string="0,"+itos(frames->get_frame_count(animation)-1)+",1";
diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp
index 85256be940..f98a50e3e0 100644
--- a/scene/2d/camera_2d.cpp
+++ b/scene/2d/camera_2d.cpp
@@ -44,7 +44,6 @@ void Camera2D::_update_scroll() {
 	if (current) {
 		Matrix32 xform = get_camera_transform();
 
-		RID vp =  viewport->get_viewport();
 		if (viewport) {
 		       viewport->set_canvas_transform( xform );
 		}
@@ -409,6 +408,35 @@ void Camera2D::force_update_scroll() {
 	_update_scroll();
 }
 
+void Camera2D::reset_smoothing() {
+
+	smoothed_camera_pos = camera_pos;
+	_update_scroll();
+}
+
+void Camera2D::align() {
+
+	Size2 screen_size = get_viewport_rect().size;
+	screen_size=get_viewport_rect().size;
+	Point2 current_camera_pos = get_global_transform().get_origin();
+	if (anchor_mode==ANCHOR_MODE_DRAG_CENTER) {
+		if (h_ofs<0) {
+			camera_pos.x = current_camera_pos.x + screen_size.x * 0.5 * drag_margin[MARGIN_RIGHT] * h_ofs;
+		} else {
+			camera_pos.x = current_camera_pos.x + screen_size.x * 0.5 * drag_margin[MARGIN_LEFT] * h_ofs;
+		}
+		if (v_ofs<0) {
+			camera_pos.y = current_camera_pos.y + screen_size.y * 0.5 * drag_margin[MARGIN_TOP] * v_ofs;
+		} else {
+			camera_pos.y = current_camera_pos.y + screen_size.y * 0.5 * drag_margin[MARGIN_BOTTOM] * v_ofs;
+		}
+	} else if (anchor_mode==ANCHOR_MODE_FIXED_TOP_LEFT){
+
+		camera_pos=current_camera_pos;
+	}
+
+	_update_scroll();
+}
 
 void Camera2D::set_follow_smoothing(float p_speed) {
 
@@ -544,6 +572,8 @@ void Camera2D::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("is_follow_smoothing_enabled"),&Camera2D::is_follow_smoothing_enabled);
 
 	ObjectTypeDB::bind_method(_MD("force_update_scroll"),&Camera2D::force_update_scroll);
+	ObjectTypeDB::bind_method(_MD("reset_smoothing"),&Camera2D::reset_smoothing);
+	ObjectTypeDB::bind_method(_MD("align"),&Camera2D::align);
 
 	ObjectTypeDB::bind_method(_MD("_set_old_smoothing","follow_smoothing"),&Camera2D::_set_old_smoothing);
 
diff --git a/scene/2d/camera_2d.h b/scene/2d/camera_2d.h
index 22e5bc382a..b3f55d798d 100644
--- a/scene/2d/camera_2d.h
+++ b/scene/2d/camera_2d.h
@@ -128,6 +128,8 @@ public:
 
 	Vector2 get_camera_pos() const;
 	void force_update_scroll();
+	void reset_smoothing();
+	void align();
 
 	Camera2D();
 };
diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp
index eb37634b24..bc5bff3b8e 100644
--- a/scene/2d/canvas_item.cpp
+++ b/scene/2d/canvas_item.cpp
@@ -756,6 +756,17 @@ void CanvasItem::draw_set_transform(const Point2& p_offset, float p_rot, const S
 	VisualServer::get_singleton()->canvas_item_add_set_transform(canvas_item,xform);
 }
 
+void CanvasItem::draw_set_transform_matrix(const Matrix32& p_matrix) {
+
+	if (!drawing) {
+		ERR_EXPLAIN("Drawing is only allowed inside NOTIFICATION_DRAW, _draw() function or 'draw' signal.");
+		ERR_FAIL();
+	}
+
+	VisualServer::get_singleton()->canvas_item_add_set_transform(canvas_item,p_matrix);
+
+}
+
 void CanvasItem::draw_polygon(const Vector<Point2>& p_points, const Vector<Color>& p_colors,const Vector<Point2>& p_uvs, Ref<Texture> p_texture) {
 
 	if (!drawing) {
@@ -942,62 +953,8 @@ InputEvent CanvasItem::make_input_local(const InputEvent& p_event) const {
 
 	ERR_FAIL_COND_V(!is_inside_tree(),p_event);
 
-	InputEvent ev = p_event;
-
-	Matrix32 local_matrix = (get_canvas_transform() * get_global_transform()).affine_inverse();
-
-	switch(ev.type) {
-
-		case InputEvent::MOUSE_BUTTON: {
-
-			Vector2 g = local_matrix.xform(Vector2(ev.mouse_button.global_x,ev.mouse_button.global_y));
-			Vector2 l = local_matrix.xform(Vector2(ev.mouse_button.x,ev.mouse_button.y));
-			ev.mouse_button.x=l.x;
-			ev.mouse_button.y=l.y;
-			ev.mouse_button.global_x=g.x;
-			ev.mouse_button.global_y=g.y;
-
-		} break;
-		case InputEvent::MOUSE_MOTION: {
-
-			Vector2 g = local_matrix.xform(Vector2(ev.mouse_motion.global_x,ev.mouse_motion.global_y));
-			Vector2 l = local_matrix.xform(Vector2(ev.mouse_motion.x,ev.mouse_motion.y));
-			Vector2 r = local_matrix.basis_xform(Vector2(ev.mouse_motion.relative_x,ev.mouse_motion.relative_y));
-			Vector2 s = local_matrix.basis_xform(Vector2(ev.mouse_motion.speed_x,ev.mouse_motion.speed_y));
-			ev.mouse_motion.x=l.x;
-			ev.mouse_motion.y=l.y;
-			ev.mouse_motion.global_x=g.x;
-			ev.mouse_motion.global_y=g.y;
-			ev.mouse_motion.relative_x=r.x;
-			ev.mouse_motion.relative_y=r.y;
-			ev.mouse_motion.speed_x=s.x;
-			ev.mouse_motion.speed_y=s.y;
-
-		} break;
-		case InputEvent::SCREEN_TOUCH: {
-
-
-			Vector2 t = local_matrix.xform(Vector2(ev.screen_touch.x,ev.screen_touch.y));
-			ev.screen_touch.x=t.x;
-			ev.screen_touch.y=t.y;
-
-		} break;
-		case InputEvent::SCREEN_DRAG: {
-
-
-			Vector2 t = local_matrix.xform(Vector2(ev.screen_drag.x,ev.screen_drag.y));
-			Vector2 r = local_matrix.basis_xform(Vector2(ev.screen_drag.relative_x,ev.screen_drag.relative_y));
-			Vector2 s = local_matrix.basis_xform(Vector2(ev.screen_drag.speed_x,ev.screen_drag.speed_y));
-			ev.screen_drag.x=t.x;
-			ev.screen_drag.y=t.y;
-			ev.screen_drag.relative_x=r.x;
-			ev.screen_drag.relative_y=r.y;
-			ev.screen_drag.speed_x=s.x;
-			ev.screen_drag.speed_y=s.y;
-		} break;
-	}
+	return p_event.xform_by( (get_canvas_transform() * get_global_transform()).affine_inverse() );
 
-	return ev;
 }
 
 
@@ -1023,7 +980,7 @@ void CanvasItem::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_is_visible_"),&CanvasItem::_is_visible_);
 
 	ObjectTypeDB::bind_method(_MD("edit_set_state","state"),&CanvasItem::edit_set_state);
-	ObjectTypeDB::bind_method(_MD("edit_get"),&CanvasItem::edit_get_state);
+	ObjectTypeDB::bind_method(_MD("edit_get_state:Variant"),&CanvasItem::edit_get_state);
 	ObjectTypeDB::bind_method(_MD("edit_set_rect","rect"),&CanvasItem::edit_set_rect);
 	ObjectTypeDB::bind_method(_MD("edit_rotate","degrees"),&CanvasItem::edit_rotate);
 
@@ -1076,6 +1033,7 @@ void CanvasItem::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("draw_char","font:Font","pos","char","next","modulate"),&CanvasItem::draw_char,DEFVAL(Color(1,1,1)));
 
 	ObjectTypeDB::bind_method(_MD("draw_set_transform","pos","rot","scale"),&CanvasItem::draw_set_transform);
+	ObjectTypeDB::bind_method(_MD("draw_set_transform_matrix","xform"),&CanvasItem::draw_set_transform_matrix);
 	ObjectTypeDB::bind_method(_MD("get_transform"),&CanvasItem::get_transform);
 	ObjectTypeDB::bind_method(_MD("get_global_transform"),&CanvasItem::get_global_transform);
 	ObjectTypeDB::bind_method(_MD("get_global_transform_with_canvas"),&CanvasItem::get_global_transform_with_canvas);
diff --git a/scene/2d/canvas_item.h b/scene/2d/canvas_item.h
index 8b44e09857..8a61b449fd 100644
--- a/scene/2d/canvas_item.h
+++ b/scene/2d/canvas_item.h
@@ -222,6 +222,7 @@ public:
 	float draw_char(const Ref<Font>& p_font,const Point2& p_pos, const String& p_char,const String& p_next="",const Color& p_modulate=Color(1,1,1));
 
 	void draw_set_transform(const Point2& p_offset, float p_rot, const Size2& p_scale);
+	void draw_set_transform_matrix(const Matrix32& p_matrix);
 
 	/* RECT / TRANSFORM */
 
diff --git a/scene/2d/navigation2d.cpp b/scene/2d/navigation2d.cpp
index b4332cc75d..82c1327a8f 100644
--- a/scene/2d/navigation2d.cpp
+++ b/scene/2d/navigation2d.cpp
@@ -552,7 +552,6 @@ debug path
 		if (p_optimize) {
 			//string pulling
 
-			Polygon *apex_poly=end_poly;
 			Vector2 apex_point=end_point;
 			Vector2 portal_left=apex_point;
 			Vector2 portal_right=apex_point;
@@ -613,12 +612,9 @@ debug path
 						//print_line("***ADVANCE LEFT");
 					} else {
 
-						//_clip_path(path,apex_poly,portal_right,right_poly);
-
 						apex_point=portal_right;
 						p=right_poly;
 						left_poly=p;
-						apex_poly=p;
 						portal_left=apex_point;
 						portal_right=apex_point;
 						if (path[path.size()-1].distance_to(apex_point)>CMP_EPSILON)
@@ -637,12 +633,9 @@ debug path
 						//print_line("***ADVANCE RIGHT");
 					} else {
 
-						//_clip_path(path,apex_poly,portal_left,left_poly);
-
 						apex_point=portal_left;
 						p=left_poly;
 						right_poly=p;
-						apex_poly=p;
 						portal_right=apex_point;
 						portal_left=apex_point;
 						if (path[path.size()-1].distance_to(apex_point)>CMP_EPSILON)
diff --git a/scene/2d/parallax_background.cpp b/scene/2d/parallax_background.cpp
index 7f2e9efd96..1b6ab66fcc 100644
--- a/scene/2d/parallax_background.cpp
+++ b/scene/2d/parallax_background.cpp
@@ -104,16 +104,18 @@ void ParallaxBackground::_update_scroll() {
 	}
 	ofs = -ofs;
 
+	final_offset=ofs;
+
 	for(int i=0;i<get_child_count();i++) {
 
 		ParallaxLayer *l=get_child(i)->cast_to<ParallaxLayer>();
 		if (!l)
 			continue;
 
-        if (ignore_camera_zoom)
-            l->set_base_offset_and_scale(ofs, 1.0);
-        else
-            l->set_base_offset_and_scale(ofs, scale);
+		if (ignore_camera_zoom)
+			l->set_base_offset_and_scale(ofs, 1.0);
+		else
+			l->set_base_offset_and_scale(ofs, scale);
 	}
 }
 
@@ -180,6 +182,11 @@ bool ParallaxBackground::is_ignore_camera_zoom(){
 
 }
 
+Vector2 ParallaxBackground::get_final_offset() const {
+
+	return final_offset;
+}
+
 void ParallaxBackground::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("_camera_moved"),&ParallaxBackground::_camera_moved);
diff --git a/scene/2d/parallax_background.h b/scene/2d/parallax_background.h
index bdaf7d241f..c00cd52f26 100644
--- a/scene/2d/parallax_background.h
+++ b/scene/2d/parallax_background.h
@@ -44,6 +44,7 @@ class ParallaxBackground : public CanvasLayer {
 	String group_name;
 	Point2 limit_begin;
 	Point2 limit_end;
+	Point2 final_offset;
 	bool ignore_camera_zoom;
 
 	void _update_scroll();
@@ -73,8 +74,10 @@ public:
 	void set_limit_end(const Point2& p_ofs);
 	Point2 get_limit_end() const;
 
-    void set_ignore_camera_zoom(bool ignore);
-    bool is_ignore_camera_zoom();
+	void set_ignore_camera_zoom(bool ignore);
+	bool is_ignore_camera_zoom();
+
+	Vector2 get_final_offset() const;
 
 	ParallaxBackground();
 };
diff --git a/scene/2d/parallax_layer.cpp b/scene/2d/parallax_layer.cpp
index bf559deb09..e9378b1d02 100644
--- a/scene/2d/parallax_layer.cpp
+++ b/scene/2d/parallax_layer.cpp
@@ -32,6 +32,15 @@
 void ParallaxLayer::set_motion_scale(const Size2& p_scale) {
 
 	motion_scale=p_scale;
+
+
+	ParallaxBackground *pb = get_parent()->cast_to<ParallaxBackground>();
+	if (is_inside_tree() && pb) {
+		Vector2 ofs = pb->get_final_offset();
+		float scale = pb->get_scroll_scale();
+		set_base_offset_and_scale(ofs,scale);
+	}
+
 }
 
 Size2 ParallaxLayer::get_motion_scale() const {
@@ -40,6 +49,23 @@ Size2 ParallaxLayer::get_motion_scale() const {
 
 }
 
+void ParallaxLayer::set_motion_offset(const Size2& p_offset) {
+
+	motion_offset=p_offset;
+
+	ParallaxBackground *pb = get_parent()->cast_to<ParallaxBackground>();
+	if (is_inside_tree() && pb) {
+		Vector2 ofs = pb->get_final_offset();
+		float scale = pb->get_scroll_scale();
+		set_base_offset_and_scale(ofs,scale);
+	}
+}
+
+Size2 ParallaxLayer::get_motion_offset() const {
+
+	return motion_offset;
+
+}
 
 void ParallaxLayer::_update_mirroring() {
 
@@ -59,6 +85,11 @@ void ParallaxLayer::_update_mirroring() {
 void ParallaxLayer::set_mirroring(const Size2& p_mirroring) {
 
 	mirroring=p_mirroring;
+	if (mirroring.x<0)
+		mirroring.x=0;
+	if (mirroring.y<0)
+		mirroring.y=0;
+
 	_update_mirroring();
 
 }
@@ -89,7 +120,7 @@ void ParallaxLayer::set_base_offset_and_scale(const Point2& p_offset,float p_sca
 		return;
 	if (get_tree()->is_editor_hint())
 		return;
-	Point2 new_ofs = ((orig_offset+p_offset)*motion_scale)*p_scale;
+	Point2 new_ofs = ((orig_offset+p_offset)*motion_scale)*p_scale+motion_offset;
 
 	if (mirroring.x) {
 
@@ -132,10 +163,13 @@ void ParallaxLayer::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("set_motion_scale","scale"),&ParallaxLayer::set_motion_scale);
 	ObjectTypeDB::bind_method(_MD("get_motion_scale"),&ParallaxLayer::get_motion_scale);
+	ObjectTypeDB::bind_method(_MD("set_motion_offset","offset"),&ParallaxLayer::set_motion_offset);
+	ObjectTypeDB::bind_method(_MD("get_motion_offset"),&ParallaxLayer::get_motion_offset);
 	ObjectTypeDB::bind_method(_MD("set_mirroring","mirror"),&ParallaxLayer::set_mirroring);
 	ObjectTypeDB::bind_method(_MD("get_mirroring"),&ParallaxLayer::get_mirroring);
 
 	ADD_PROPERTY( PropertyInfo(Variant::VECTOR2,"motion/scale"),_SCS("set_motion_scale"),_SCS("get_motion_scale"));
+	ADD_PROPERTY( PropertyInfo(Variant::VECTOR2,"motion/offset"),_SCS("set_motion_offset"),_SCS("get_motion_offset"));
 	ADD_PROPERTY( PropertyInfo(Variant::VECTOR2,"motion/mirroring"),_SCS("set_mirroring"),_SCS("get_mirroring"));
 
 }
diff --git a/scene/2d/parallax_layer.h b/scene/2d/parallax_layer.h
index c2d345da47..6b1d73ea66 100644
--- a/scene/2d/parallax_layer.h
+++ b/scene/2d/parallax_layer.h
@@ -38,6 +38,7 @@ class ParallaxLayer : public Node2D {
 	Point2 orig_offset;
 	Point2 orig_scale;
 	Size2 motion_scale;
+	Vector2 motion_offset;
 	Vector2 mirroring;
 	void _update_mirroring();
 
@@ -48,6 +49,9 @@ protected:
 
 public:
 
+	void set_motion_offset(const Size2& p_scale);
+	Size2 get_motion_offset() const;
+
 	void set_motion_scale(const Size2& p_scale);
 	Size2 get_motion_scale() const;
 
diff --git a/scene/2d/sprite.cpp b/scene/2d/sprite.cpp
index 3e6384ea2c..c5b338bf59 100644
--- a/scene/2d/sprite.cpp
+++ b/scene/2d/sprite.cpp
@@ -120,6 +120,7 @@ void Sprite::set_texture(const Ref<Texture>& p_texture) {
 	}
 #endif
 	update();
+	emit_signal("texture_changed");
 	item_rect_changed();
 }
 
@@ -287,6 +288,17 @@ Rect2 Sprite::get_item_rect() const {
 }
 
 
+
+void Sprite::_validate_property(PropertyInfo& property) const {
+
+	if (property.name=="frame") {
+
+		property.hint=PROPERTY_HINT_SPRITE_FRAME;
+
+		property.hint_string="0,"+itos(vframes*hframes-1)+",1";
+	}
+}
+
 void Sprite::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("set_texture","texture:Texture"),&Sprite::set_texture);
@@ -323,6 +335,7 @@ void Sprite::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("get_modulate"),&Sprite::get_modulate);
 
 	ADD_SIGNAL(MethodInfo("frame_changed"));
+	ADD_SIGNAL(MethodInfo("texture_changed"));
 
 	ADD_PROPERTYNZ( PropertyInfo( Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE,"Texture"), _SCS("set_texture"),_SCS("get_texture"));
 	ADD_PROPERTYNO( PropertyInfo( Variant::BOOL, "centered"), _SCS("set_centered"),_SCS("is_centered"));
diff --git a/scene/2d/sprite.h b/scene/2d/sprite.h
index f789538b1d..32d3f476d1 100644
--- a/scene/2d/sprite.h
+++ b/scene/2d/sprite.h
@@ -61,6 +61,8 @@ protected:
 
 	static void _bind_methods();;
 
+	virtual void _validate_property(PropertyInfo& property) const;
+
 public:
 
 	virtual void edit_set_pivot(const Point2& p_pivot);
diff --git a/scene/2d/visibility_notifier_2d.cpp b/scene/2d/visibility_notifier_2d.cpp
index 12524a2192..5411950976 100644
--- a/scene/2d/visibility_notifier_2d.cpp
+++ b/scene/2d/visibility_notifier_2d.cpp
@@ -270,9 +270,6 @@ void VisibilityEnabler2D::_notification(int p_what){
 			return;
 
 
-		Node *from = this;
-		//find where current scene starts
-
 		for (Map<Node*,Variant>::Element *E=nodes.front();E;E=E->next()) {
 
 			if (!visible)
@@ -293,14 +290,7 @@ void VisibilityEnabler2D::_change_node_state(Node* p_node,bool p_enabled) {
 		RigidBody2D *rb = p_node->cast_to<RigidBody2D>();
 		if (rb) {
 
-			if (p_enabled) {
-				RigidBody2D::Mode mode = RigidBody2D::Mode(nodes[p_node].operator int());
-				//rb->set_mode(mode);
-				rb->set_sleeping(false);
-			} else {
-				//rb->set_mode(RigidBody2D::MODE_STATIC);
-				rb->set_sleeping(true);
-			}
+			rb->set_sleeping(!p_enabled);
 		}
 	}
 
diff --git a/scene/3d/physics_joint.cpp b/scene/3d/physics_joint.cpp
index 3f03b2aab3..084d96975f 100644
--- a/scene/3d/physics_joint.cpp
+++ b/scene/3d/physics_joint.cpp
@@ -369,9 +369,6 @@ RID HingeJoint::_configure_joint(PhysicsBody *body_a,PhysicsBody *body_b) {
 
 
 	Transform gt = get_global_transform();
-	Vector3 hingepos = gt.origin;
-	Vector3 hingedir = gt.basis.get_axis(2);
-
 	Transform ainv = body_a->get_global_transform().affine_inverse();
 
 	Transform local_a = ainv * gt;
@@ -532,9 +529,6 @@ RID SliderJoint::_configure_joint(PhysicsBody *body_a,PhysicsBody *body_b) {
 
 
 	Transform gt = get_global_transform();
-	Vector3 sliderpos = gt.origin;
-	Vector3 sliderdir = gt.basis.get_axis(2);
-
 	Transform ainv = body_a->get_global_transform().affine_inverse();
 
 	Transform local_a = ainv * gt;
diff --git a/scene/3d/skeleton.cpp b/scene/3d/skeleton.cpp
index d0b739e17f..c996a8123c 100644
--- a/scene/3d/skeleton.cpp
+++ b/scene/3d/skeleton.cpp
@@ -64,15 +64,17 @@ bool Skeleton::_set(const StringName& p_path, const Variant& p_value) {
 	else if (what=="bound_childs") {
 		Array children=p_value;
 
-		bones[which].nodes_bound.clear();
+		if (is_inside_tree()) {
+			bones[which].nodes_bound.clear();
 
-		for (int i=0;i<children.size();i++) {
+			for (int i=0;i<children.size();i++) {
 
-			NodePath path=children[i];
-			ERR_CONTINUE( path.operator String()=="" );
-			Node *node = get_node(path);
-			ERR_CONTINUE(!node);
-			bind_child_node_to_bone(which,node);
+				NodePath path=children[i];
+				ERR_CONTINUE( path.operator String()=="" );
+				Node *node = get_node(path);
+				ERR_CONTINUE(!node);
+				bind_child_node_to_bone(which,node);
+			}
 		}
 	} else {
 		return false;
diff --git a/scene/3d/sprite_3d.cpp b/scene/3d/sprite_3d.cpp
index 8c86c4bf35..74cab30b17 100644
--- a/scene/3d/sprite_3d.cpp
+++ b/scene/3d/sprite_3d.cpp
@@ -585,6 +585,17 @@ Rect2 Sprite3D::get_item_rect() const {
 	return Rect2(ofs,s);
 }
 
+
+void Sprite3D::_validate_property(PropertyInfo& property) const {
+
+	if (property.name=="frame") {
+
+		property.hint=PROPERTY_HINT_SPRITE_FRAME;
+
+		property.hint_string="0,"+itos(vframes*hframes-1)+",1";
+	}
+}
+
 void Sprite3D::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("set_texture","texture:Texture"),&Sprite3D::set_texture);
diff --git a/scene/3d/sprite_3d.h b/scene/3d/sprite_3d.h
index 41e6ba804a..31f8ec020f 100644
--- a/scene/3d/sprite_3d.h
+++ b/scene/3d/sprite_3d.h
@@ -158,6 +158,8 @@ class Sprite3D : public SpriteBase3D {
 protected:
 	virtual void _draw();
 	static void _bind_methods();
+
+	virtual void _validate_property(PropertyInfo& property) const;
 public:
 
 
diff --git a/scene/3d/vehicle_body.cpp b/scene/3d/vehicle_body.cpp
index 6ccf07db1e..7c7957640f 100644
--- a/scene/3d/vehicle_body.cpp
+++ b/scene/3d/vehicle_body.cpp
@@ -488,7 +488,6 @@ real_t VehicleBody::_ray_cast(int p_idx,PhysicsDirectBodyState *s) {
 void	VehicleBody::_update_suspension(PhysicsDirectBodyState *s)
 {
 
-	real_t deltaTime = s->get_step();
 	real_t chassisMass = mass;
 
 	for (int w_it=0; w_it<wheels.size(); w_it++)
@@ -596,21 +595,16 @@ void VehicleBody::_resolve_single_bilateral(PhysicsDirectBodyState *s, const Vec
 			    b2invinertia,
 			    b2invmass);
 
-	real_t jacDiagAB = jac.getDiagonal();
-	real_t jacDiagABInv = real_t(1.) / jacDiagAB;
-
 	real_t rel_vel = jac.getRelativeVelocity(
 				s->get_linear_velocity(),
 				s->get_transform().basis.transposed().xform(s->get_angular_velocity()),
 				b2lv,
 				b2trans.xform(b2av));
-	real_t a;
-	a=jacDiagABInv;
 
 
 	rel_vel = normal.dot(vel);
 
-	//todo: move this into proper structure
+	//TODO: move this into proper structure
 	real_t contactDamping = real_t(0.4);
 #define ONLY_USE_LINEAR_MASS
 #ifdef ONLY_USE_LINEAR_MASS
@@ -642,16 +636,16 @@ VehicleBody::btVehicleWheelContactPoint::btVehicleWheelContactPoint(PhysicsDirec
 		denom0= s->get_inverse_mass() + frictionDirectionWorld.dot(vec);
 	}
 
+	/* TODO: Why is this code unused?
 	if (body1) {
 
 		Vector3 r0 = frictionPosWorld - body1->get_global_transform().origin;
 		Vector3 c0 = (r0).cross(frictionDirectionWorld);
 		Vector3 vec = s->get_inverse_inertia_tensor().xform_inv(c0).cross(r0);
 		//denom1= body1->get_inverse_mass() + frictionDirectionWorld.dot(vec);
-		denom1=0;
 
 	}
-
+	*/
 
 	real_t	relaxation = 1.f;
 	m_jacDiagABInv = relaxation/(denom0+denom1);
diff --git a/scene/3d/visibility_notifier.cpp b/scene/3d/visibility_notifier.cpp
index 60097ad482..f3b5cde0eb 100644
--- a/scene/3d/visibility_notifier.cpp
+++ b/scene/3d/visibility_notifier.cpp
@@ -221,9 +221,6 @@ void VisibilityEnabler::_notification(int p_what){
 			return;
 
 
-		Node *from = this;
-		//find where current scene starts
-
 		for (Map<Node*,Variant>::Element *E=nodes.front();E;E=E->next()) {
 
 			if (!visible)
@@ -242,17 +239,9 @@ void VisibilityEnabler::_change_node_state(Node* p_node,bool p_enabled) {
 
 	{
 		RigidBody *rb = p_node->cast_to<RigidBody>();
-		if (rb) {
-
-			if (p_enabled) {
-				RigidBody::Mode mode = RigidBody::Mode(nodes[p_node].operator int());
-				//rb->set_mode(mode);
-				rb->set_sleeping(false);
-			} else {
-				//rb->set_mode(RigidBody::MODE_STATIC);
-				rb->set_sleeping(true);
-			}
-		}
+		if (rb)
+
+			rb->set_sleeping(!p_enabled);
 	}
 
 	{
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp
index dd4fa992ac..30af9b0094 100644
--- a/scene/animation/animation_player.cpp
+++ b/scene/animation/animation_player.cpp
@@ -540,7 +540,6 @@ void AnimationPlayer::_animation_process_data(PlaybackData &cd,float p_delta,flo
 
 	float len=cd.from->animation->get_length();
 	bool loop=cd.from->animation->has_loop();
-	bool loop_interpolation=cd.from->animation->has_loop_interpolation();
 
 	if (!loop) {
 
@@ -566,21 +565,10 @@ void AnimationPlayer::_animation_process_data(PlaybackData &cd,float p_delta,flo
 
 		}
 
-	} else if (loop_interpolation) {
+	} else {
 
 		next_pos=Math::fposmod(next_pos,len);
 
-	} else {
-		
-		if (next_pos<0 || next_pos>len) {
-			if (!backwards)
-				next_pos=0;
-			else if (backwards)
-				next_pos=len;
-		}
-		// fix delta - not sure if needed here
-		delta=next_pos-cd.pos;
-
 	}
 
 	cd.pos=next_pos;
diff --git a/scene/audio/stream_player.cpp b/scene/audio/stream_player.cpp
index 050e945c8f..99ecace1ed 100644
--- a/scene/audio/stream_player.cpp
+++ b/scene/audio/stream_player.cpp
@@ -77,7 +77,7 @@ void StreamPlayer::sp_update() {
 			if (to_mix==0) {
 				if (!stop_request) {
 					stop_request=true;
-					call_deferred("stop");
+					call_deferred("_do_stop");
 				}
 				return;
 			}
@@ -91,7 +91,10 @@ void StreamPlayer::sp_update() {
 	}
 }
 
-
+void StreamPlayer::_do_stop() {
+	stop();
+	emit_signal("finished");
+}
 
 void StreamPlayer::_notification(int p_what) {
 
@@ -181,7 +184,7 @@ void StreamPlayer::stop() {
 	stop_request=false;
 	playback->stop();
 	resampler.flush();
-	emit_signal("finished");
+	
 
 	//set_idle_process(false);
 }
@@ -381,6 +384,7 @@ void StreamPlayer::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("_set_play","play"),&StreamPlayer::_set_play);
 	ObjectTypeDB::bind_method(_MD("_get_play"),&StreamPlayer::_get_play);
+	ObjectTypeDB::bind_method(_MD("_do_stop"),&StreamPlayer::_do_stop);
 
 	ADD_PROPERTY( PropertyInfo(Variant::OBJECT, "stream/stream", PROPERTY_HINT_RESOURCE_TYPE,"AudioStream"), _SCS("set_stream"), _SCS("get_stream") );
 	ADD_PROPERTY( PropertyInfo(Variant::BOOL, "stream/play"), _SCS("_set_play"), _SCS("_get_play") );
diff --git a/scene/audio/stream_player.h b/scene/audio/stream_player.h
index 475139c2a4..4facc3c816 100644
--- a/scene/audio/stream_player.h
+++ b/scene/audio/stream_player.h
@@ -71,6 +71,8 @@ class StreamPlayer : public Node {
 
 	AudioRBResampler resampler;
 
+	void _do_stop();
+
 	bool _play;
 	void _set_play(bool p_play);
 	bool _get_play() const;
diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp
index bc498f47bc..699062fee4 100644
--- a/scene/gui/base_button.cpp
+++ b/scene/gui/base_button.cpp
@@ -31,6 +31,7 @@
 #include "print_string.h"
 #include "button_group.h"
 #include "scene/scene_string_names.h"
+#include "scene/main/viewport.h"
 
 void BaseButton::_input_event(InputEvent p_event) {
 
@@ -225,11 +226,21 @@ void BaseButton::_notification(int p_what) {
 		status.hovering=false;
 		update();
 	}
+	if (p_what==NOTIFICATION_DRAG_BEGIN) {
+
+		if (status.press_attempt) {
+			status.press_attempt=false;
+			status.pressing_button=0;
+			update();
+		}
+	}
+
 	if (p_what==NOTIFICATION_FOCUS_EXIT) {
 
 		if (status.pressing_button && status.press_attempt) {
 			status.press_attempt=false;
 			status.pressing_button=0;
+			update();
 		}
 	}
 
@@ -405,7 +416,11 @@ Ref<ShortCut> BaseButton:: get_shortcut() const {
 
 void BaseButton::_unhandled_input(InputEvent p_event) {
 
-	if (!is_disabled() && is_visible() && shortcut.is_valid() && shortcut->is_shortcut(p_event)) {
+	if (!is_disabled() && is_visible() && p_event.is_pressed() && shortcut.is_valid() && shortcut->is_shortcut(p_event)) {
+
+		if (get_viewport()->get_modal_stack_top() && !get_viewport()->get_modal_stack_top()->is_a_parent_of(this))
+			return; //ignore because of modal window
+
 		if (is_toggle_mode()) {
 			set_pressed(!is_pressed());
 			emit_signal("toggled",is_pressed());
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index d6bbdf2d21..06f8c27957 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -72,13 +72,16 @@ void ColorPicker::_notification(int p_what) {
 			_update_color();
 		}
 
-		case NOTIFICATION_VISIBILITY_CHANGED: {
-			c_text->call_deferred("grab_focus");
-			c_text->call_deferred("select");
-		} break;
+
 	}
 }
 
+void ColorPicker::set_focus_on_line_edit() {
+
+	c_text->grab_focus();
+	c_text->select();
+}
+
 void ColorPicker::_update_controls() {
 
 	if (edit_alpha) {
@@ -628,6 +631,7 @@ void ColorPickerButton::pressed() {
 	popup->set_pos(get_global_pos()-Size2(0,ms.height));
 	popup->set_size(ms);
 	popup->popup();
+	picker->set_focus_on_line_edit();
 
 
 }
diff --git a/scene/gui/color_picker.h b/scene/gui/color_picker.h
index f5de982200..b9ef1f1e2f 100644
--- a/scene/gui/color_picker.h
+++ b/scene/gui/color_picker.h
@@ -107,6 +107,7 @@ public:
 	void set_raw_mode(bool p_enabled);
 	bool is_raw_mode() const;
 
+	void set_focus_on_line_edit();
 
 	ColorPicker();
 };
diff --git a/scene/gui/color_ramp_edit.cpp b/scene/gui/color_ramp_edit.cpp
index 50e1ffbec9..b7347f00dc 100644
--- a/scene/gui/color_ramp_edit.cpp
+++ b/scene/gui/color_ramp_edit.cpp
@@ -271,7 +271,9 @@ void ColorRampEdit::_input_event(const InputEvent& p_event) {
 void ColorRampEdit::_notification(int p_what) {
 
 	if (p_what==NOTIFICATION_ENTER_TREE) {
-		picker->connect("color_changed",this,"_color_changed");
+		if (!picker->is_connected("color_changed",this,"_color_changed")) {
+			picker->connect("color_changed",this,"_color_changed");
+		}
 	}
 	if (p_what==NOTIFICATION_DRAW) {
 
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index edc8a8bcb8..fc27c0d24f 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -49,14 +49,22 @@
 
 Variant Control::edit_get_state() const {
 
-	return get_rect();
+	Dictionary s;
+	s["rect"]=get_rect();
+	s["rot"]=get_rotation();
+	s["scale"]=get_scale();
+	return s;
 
 }
 void Control::edit_set_state(const Variant& p_state) {
 
-	Rect2 state=p_state;
+	Dictionary s=p_state;
+
+	Rect2 state=s["rect"];
 	set_pos(state.pos);
 	set_size(state.size);
+	set_rotation(s["rot"]);
+	set_scale(s["scale"]);
 }
 
 void Control::set_custom_minimum_size(const Size2& p_custom) {
@@ -754,6 +762,11 @@ bool Control::is_window_modal_on_top() const {
 	return get_viewport()->_gui_is_modal_on_top(this);
 }
 
+uint64_t Control::get_modal_frame() const {
+
+	return data.modal_frame;
+}
+
 
 
 Size2 Control::get_minimum_size() const {
@@ -1829,6 +1842,7 @@ void Control::show_modal(bool p_exclusive) {
 	raise();
 	data.modal_exclusive=p_exclusive;
 	data.MI=get_viewport()->_gui_show_modal(this);
+	data.modal_frame=OS::get_singleton()->get_frames_drawn();
 
 }
 
@@ -2460,8 +2474,8 @@ void Control::_bind_methods() {
 	ADD_PROPERTY( PropertyInfo(Variant::BOOL,"focus/ignore_mouse"), _SCS("set_ignore_mouse"),_SCS("is_ignoring_mouse") );
 	ADD_PROPERTY( PropertyInfo(Variant::BOOL,"focus/stop_mouse"), _SCS("set_stop_mouse"),_SCS("is_stopping_mouse") );
 
-	ADD_PROPERTYNZ( PropertyInfo(Variant::INT,"size_flags/horizontal", PROPERTY_HINT_FLAGS, "Expand,Fill"), _SCS("set_h_size_flags"),_SCS("get_h_size_flags") );
-	ADD_PROPERTYNZ( PropertyInfo(Variant::INT,"size_flags/vertical", PROPERTY_HINT_FLAGS, "Expand,Fill"), _SCS("set_v_size_flags"),_SCS("get_v_size_flags") );
+	ADD_PROPERTY( PropertyInfo(Variant::INT,"size_flags/horizontal", PROPERTY_HINT_FLAGS, "Expand,Fill"), _SCS("set_h_size_flags"),_SCS("get_h_size_flags") );
+	ADD_PROPERTY( PropertyInfo(Variant::INT,"size_flags/vertical", PROPERTY_HINT_FLAGS, "Expand,Fill"), _SCS("set_v_size_flags"),_SCS("get_v_size_flags") );
 	ADD_PROPERTYNO( PropertyInfo(Variant::INT,"size_flags/stretch_ratio", PROPERTY_HINT_RANGE, "1,128,0.01"), _SCS("set_stretch_ratio"),_SCS("get_stretch_ratio") );
 	ADD_PROPERTYNZ( PropertyInfo(Variant::OBJECT,"theme/theme", PROPERTY_HINT_RESOURCE_TYPE, "Theme"), _SCS("set_theme"),_SCS("get_theme") );
 
@@ -2539,6 +2553,7 @@ Control::Control() {
 	data.parent_canvas_item=NULL;
 	data.scale=Vector2(1,1);
 	data.drag_owner=0;
+	data.modal_frame=0;
 
 
 	for (int i=0;i<4;i++) {
diff --git a/scene/gui/control.h b/scene/gui/control.h
index 07a28de1ea..830ebd1620 100644
--- a/scene/gui/control.h
+++ b/scene/gui/control.h
@@ -132,6 +132,7 @@ private:
 		ObjectID drag_owner;
 		bool modal;
 		bool modal_exclusive;
+		uint64_t modal_frame; //frame used to put something as modal
 		Ref<Theme> theme;
 		Control *theme_owner;
 		String tooltip;
@@ -249,6 +250,7 @@ public:
 	Size2 get_custom_minimum_size() const;
 
 	bool is_window_modal_on_top() const;
+	uint64_t get_modal_frame() const; //frame in which this was made modal
 
 	Control *get_parent_control() const;
 
diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp
index 6342391383..4dbc106834 100644
--- a/scene/gui/dialogs.cpp
+++ b/scene/gui/dialogs.cpp
@@ -62,7 +62,6 @@ void WindowDialog::_input_event(const InputEvent& p_event) {
 
 		Point2 rel( p_event.mouse_motion.relative_x, p_event.mouse_motion.relative_y );
 		Point2 pos = get_pos();
-		Size2 size = get_size();
 
 		pos+=rel;
 
@@ -409,7 +408,6 @@ AcceptDialog::AcceptDialog() {
 	ok->set_text(RTR("OK"));
 	hbc->add_child(ok);
 	hbc->add_spacer();
-	//add_child(ok);
 
 
 	ok->connect("pressed", this,"_ok");
diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp
index ee3b8913b4..06b1c42690 100644
--- a/scene/gui/graph_edit.cpp
+++ b/scene/gui/graph_edit.cpp
@@ -774,7 +774,6 @@ void GraphEdit::set_zoom(float p_zoom) {
 
 	Vector2 sbofs = (Vector2( h_scroll->get_val(), v_scroll->get_val() ) + get_size()/2)/zoom;
 
-	float prev_zoom = zoom;
 	zoom = p_zoom;
 	top_layer->update();
 
diff --git a/scene/gui/grid_container.cpp b/scene/gui/grid_container.cpp
index dde9768a6d..5e6622b3f8 100644
--- a/scene/gui/grid_container.cpp
+++ b/scene/gui/grid_container.cpp
@@ -156,6 +156,7 @@ void GridContainer::_notification(int p_what) {
 
 void GridContainer::set_columns(int p_columns) {
 
+	ERR_FAIL_COND(p_columns<1);
 	columns=p_columns;
 	queue_sort();
 	minimum_size_changed();
diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp
index 5379836746..d63c483ef9 100644
--- a/scene/gui/item_list.cpp
+++ b/scene/gui/item_list.cpp
@@ -1245,6 +1245,19 @@ real_t ItemList::get_icon_scale() const {
 	return icon_scale;
 }
 
+Vector<int> ItemList::get_selected_items() {
+	Vector<int> selected;
+	for (int i = 0; i < items.size(); i++) {
+		if (items[i].selected) {
+			selected.push_back(i);
+			if (this->select_mode == SELECT_SINGLE) {
+				break;
+			}
+		}
+	}
+	return selected;
+}
+
 void ItemList::_bind_methods(){
 
 	ObjectTypeDB::bind_method(_MD("add_item","text","icon:Texture","selectable"),&ItemList::add_item,DEFVAL(Variant()),DEFVAL(true));
@@ -1277,6 +1290,7 @@ void ItemList::_bind_methods(){
 	ObjectTypeDB::bind_method(_MD("select","idx","single"),&ItemList::select,DEFVAL(true));
 	ObjectTypeDB::bind_method(_MD("unselect","idx"),&ItemList::unselect);
 	ObjectTypeDB::bind_method(_MD("is_selected","idx"),&ItemList::is_selected);
+	ObjectTypeDB::bind_method(_MD("get_selected_items"),&ItemList::get_selected_items);
 
 	ObjectTypeDB::bind_method(_MD("get_item_count"),&ItemList::get_item_count);
 	ObjectTypeDB::bind_method(_MD("remove_item","idx"),&ItemList::remove_item);
@@ -1330,8 +1344,6 @@ void ItemList::_bind_methods(){
 	ADD_SIGNAL( MethodInfo("item_activated",PropertyInfo(Variant::INT,"index")));
 }
 
-
-
 ItemList::ItemList() {
 
 	current=-1;
diff --git a/scene/gui/item_list.h b/scene/gui/item_list.h
index aa6dd64c50..e1902d1c1f 100644
--- a/scene/gui/item_list.h
+++ b/scene/gui/item_list.h
@@ -144,6 +144,7 @@ public:
 	void select(int p_idx,bool p_single=true);
 	void unselect(int p_idx);
 	bool is_selected(int p_idx) const;
+	Vector<int> get_selected_items();
 
 	void set_current(int p_current);
 	int get_current() const;
diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp
index 2d4438c48c..0431d824fa 100644
--- a/scene/gui/label.cpp
+++ b/scene/gui/label.cpp
@@ -144,7 +144,6 @@ void Label::_notification(int p_what) {
 		if (!wc)
 			return;
 
-		int c = 0;
 		int line=0;
 		int line_to=lines_skipped + (lines_visible>0?lines_visible:1);
 		while(wc) {
@@ -536,7 +535,9 @@ void Label::set_text(const String& p_string) {
 	if (percent_visible<1)
 		visible_chars=get_total_character_count()*percent_visible;
 	update();
-	minimum_size_changed();
+	if (!autowrap) {
+		minimum_size_changed();
+	}
 
 }
 
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index 52ef57cf1c..6c47072b33 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -31,6 +31,10 @@
 #include "os/os.h"
 #include "print_string.h"
 #include "label.h"
+#include "translation.h"
+#ifdef TOOLS_ENABLED
+#include "tools/editor/editor_settings.h"
+#endif
 
 static bool _is_text_char(CharType c) {
 
@@ -57,6 +61,7 @@ void LineEdit::_input_event(InputEvent p_event) {
 			if (b.button_index!=BUTTON_LEFT)
 				break;
 
+			_reset_caret_blink_timer();
 			if (b.pressed) {
 
 				shift_selection_check_pre(b.mod.shift);
@@ -104,7 +109,7 @@ void LineEdit::_input_event(InputEvent p_event) {
 				selection.doubleclick=false;
 
 				if (OS::get_singleton()->has_virtual_keyboard())
-					OS::get_singleton()->show_virtual_keyboard(get_text(),get_global_rect());
+					OS::get_singleton()->show_virtual_keyboard(text,get_global_rect());
 			}
 
 			update();
@@ -227,7 +232,7 @@ void LineEdit::_input_event(InputEvent p_event) {
 				}
 			}
 
-
+			_reset_caret_blink_timer();
 			if (!k.mod.meta) {
 
 				bool handled=true;
@@ -294,6 +299,9 @@ void LineEdit::_input_event(InputEvent p_event) {
 					}
 					case KEY_LEFT: {
 
+#ifndef APPLE_STYLE_KEYS
+						if (!k.mod.alt)
+#endif
 						shift_selection_check_pre(k.mod.shift);
 
 #ifdef APPLE_STYLE_KEYS
@@ -543,14 +551,39 @@ void LineEdit::drop_data(const Point2& p_point,const Variant& p_data){
 void LineEdit::_notification(int p_what) {
 
 	switch(p_what) {
-
+#ifdef TOOLS_ENABLED
+		case NOTIFICATION_ENTER_TREE: {
+			if (get_tree()->is_editor_hint()) {
+				cursor_set_blink_enabled(EDITOR_DEF("text_editor/caret_blink", false));
+				cursor_set_blink_speed(EDITOR_DEF("text_editor/caret_blink_speed", 0.65));
+
+				if (!EditorSettings::get_singleton()->is_connected("settings_changed",this,"_editor_settings_changed")) {
+					EditorSettings::get_singleton()->connect("settings_changed",this,"_editor_settings_changed");
+				}
+			}
+		} break;
+#endif
 		case NOTIFICATION_RESIZED: {
 
 			set_cursor_pos( get_cursor_pos() );
 
 		} break;
+		case MainLoop::NOTIFICATION_WM_FOCUS_IN: {
+			window_has_focus = true;
+			draw_caret = true;
+			update();
+		} break;
+		case MainLoop::NOTIFICATION_WM_FOCUS_OUT: {
+			window_has_focus = false;
+			draw_caret = false;
+			update();
+		} break;
 		case NOTIFICATION_DRAW: {
 
+			if ((!has_focus() && !menu->has_focus()) || !window_has_focus) {
+				draw_caret = false;
+			}
+
 			int width,height;
 
 			Size2 size=get_size();
@@ -604,14 +637,19 @@ void LineEdit::_notification(int p_what) {
 			Color font_color_selected=get_color("font_color_selected");
 			Color cursor_color=get_color("cursor_color");
 
+			const String& t = text.empty() ? placeholder : text;
+			// draw placeholder color
+			if(text.empty())
+				font_color.a *= placeholder_alpha;
+
 			while(true) {
 
 		//end of string, break!
-				if (char_ofs>=text.length())
+				if (char_ofs>=t.length())
 					break;
 
-				CharType cchar=pass?'*':text[char_ofs];
-				CharType next=pass?'*':text[char_ofs+1];
+				CharType cchar=pass?'*':t[char_ofs];
+				CharType next=pass?'*':t[char_ofs+1];
 				int char_width=font->get_char_size( cchar,next ).width;
 
 		// end of widget, break!
@@ -627,23 +665,28 @@ void LineEdit::_notification(int p_what) {
 
 				font->draw_char(ci, Point2(x_ofs, y_ofs + font_ascent), cchar, next, selected ? font_color_selected : font_color);
 
-				if (char_ofs==cursor_pos && has_focus())
+				if (char_ofs==cursor_pos && draw_caret) {
 					VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(
 						Point2( x_ofs , y_ofs ), Size2( 1, y_area ) ), cursor_color );
+				}
 
 				x_ofs+=char_width;
 				char_ofs++;
 			}
 
-			if (char_ofs==cursor_pos && has_focus()) //may be at the end
+			if (char_ofs==cursor_pos && draw_caret) {//may be at the end
 				VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2(
 					Point2( x_ofs , y_ofs ), Size2( 1, y_area ) ), cursor_color );
-
+			}
 		} break;
 		case NOTIFICATION_FOCUS_ENTER: {
 
+			if (!caret_blink_enabled) {
+				draw_caret = true;
+			}
+
 			if (OS::get_singleton()->has_virtual_keyboard())
-				OS::get_singleton()->show_virtual_keyboard(get_text(),get_global_rect());
+				OS::get_singleton()->show_virtual_keyboard(text,get_global_rect());
 
 		} break;
 		case NOTIFICATION_FOCUS_EXIT: {
@@ -788,6 +831,45 @@ void LineEdit::set_cursor_at_pixel_pos(int p_x) {
 }
 
 
+bool LineEdit::cursor_get_blink_enabled() const {
+	return caret_blink_enabled;
+}
+
+void LineEdit::cursor_set_blink_enabled(const bool p_enabled) {
+	caret_blink_enabled = p_enabled;
+	if (p_enabled) {
+		caret_blink_timer->start();
+	} else {
+		caret_blink_timer->stop();
+	}
+	draw_caret = true;
+}
+
+float LineEdit::cursor_get_blink_speed() const {
+	return caret_blink_timer->get_wait_time();
+}
+
+void LineEdit::cursor_set_blink_speed(const float p_speed) {
+	ERR_FAIL_COND(p_speed <= 0);
+	caret_blink_timer->set_wait_time(p_speed);
+}
+
+void LineEdit::_reset_caret_blink_timer() {
+	if (caret_blink_enabled) {
+		caret_blink_timer->stop();
+		caret_blink_timer->start();
+		draw_caret = true;
+		update();
+	}
+ }
+
+void LineEdit::_toggle_draw_caret() {
+	draw_caret = !draw_caret;
+	if (is_visible()) {
+		update();
+	}
+}
+
 void LineEdit::delete_char() {
 
 	if ((text.length()<=0) || (cursor_pos==0)) return;
@@ -864,6 +946,29 @@ String LineEdit::get_text() const {
 	return text;
 }
 
+void LineEdit::set_placeholder(String p_text) {
+
+	placeholder = XL_MESSAGE(p_text);
+	update();
+}
+
+String LineEdit::get_placeholder() const {
+
+	return placeholder;
+}
+
+
+void LineEdit::set_placeholder_alpha(float p_alpha) {
+
+	placeholder_alpha = p_alpha;
+	update();
+}
+
+float LineEdit::get_placeholder_alpha() const {
+
+	return placeholder_alpha;
+}
+
 void LineEdit::set_cursor_pos(int p_pos) {
 
 	if (p_pos>(int)text.length())
@@ -876,10 +981,6 @@ void LineEdit::set_cursor_pos(int p_pos) {
 
 	cursor_pos=p_pos;
 
-//	if (cursor_pos>(window_pos+get_window_length())) {
-//	set_window_pos(cursor_pos-get_window_lengt//h());
-//	}
-
 	if (!is_inside_tree()) {
 
 		window_pos=cursor_pos;
@@ -898,7 +999,6 @@ void LineEdit::set_cursor_pos(int p_pos) {
 
 		if (window_width<0)
 			return;
-		int width_to_cursor=0;
 		int wp=window_pos;
 
 		if (font.is_valid()) {
@@ -1126,8 +1226,21 @@ PopupMenu *LineEdit::get_menu() const {
 	return menu;
 }
 
+#ifdef TOOLS_ENABLED
+	void LineEdit::_editor_settings_changed() {
+		cursor_set_blink_enabled(EDITOR_DEF("text_editor/caret_blink", false));
+		cursor_set_blink_speed(EDITOR_DEF("text_editor/caret_blink_speed", 0.65));
+	}
+#endif
+
 void LineEdit::_bind_methods() {
 
+	ObjectTypeDB::bind_method(_MD("_toggle_draw_caret"),&LineEdit::_toggle_draw_caret);
+
+#ifdef TOOLS_ENABLED
+	ObjectTypeDB::bind_method("_editor_settings_changed",&LineEdit::_editor_settings_changed);
+#endif
+
 	ObjectTypeDB::bind_method(_MD("set_align", "align"), &LineEdit::set_align);
 	ObjectTypeDB::bind_method(_MD("get_align"), &LineEdit::get_align);
 
@@ -1136,8 +1249,16 @@ void LineEdit::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("select_all"),&LineEdit::select_all);
 	ObjectTypeDB::bind_method(_MD("set_text","text"),&LineEdit::set_text);
 	ObjectTypeDB::bind_method(_MD("get_text"),&LineEdit::get_text);
+	ObjectTypeDB::bind_method(_MD("set_placeholder","text"),&LineEdit::set_placeholder);
+	ObjectTypeDB::bind_method(_MD("get_placeholder"),&LineEdit::get_placeholder);
+	ObjectTypeDB::bind_method(_MD("set_placeholder_alpha","alpha"),&LineEdit::set_placeholder_alpha);
+	ObjectTypeDB::bind_method(_MD("get_placeholder_alpha"),&LineEdit::get_placeholder_alpha);
 	ObjectTypeDB::bind_method(_MD("set_cursor_pos","pos"),&LineEdit::set_cursor_pos);
 	ObjectTypeDB::bind_method(_MD("get_cursor_pos"),&LineEdit::get_cursor_pos);
+	ObjectTypeDB::bind_method(_MD("cursor_set_blink_enabled", "enable"),&LineEdit::cursor_set_blink_enabled);
+	ObjectTypeDB::bind_method(_MD("cursor_get_blink_enabled"),&LineEdit::cursor_get_blink_enabled);
+	ObjectTypeDB::bind_method(_MD("cursor_set_blink_speed", "blink_speed"),&LineEdit::cursor_set_blink_speed);
+	ObjectTypeDB::bind_method(_MD("cursor_get_blink_speed"),&LineEdit::cursor_get_blink_speed);
 	ObjectTypeDB::bind_method(_MD("set_max_length","chars"),&LineEdit::set_max_length);
 	ObjectTypeDB::bind_method(_MD("get_max_length"),&LineEdit::get_max_length);
 	ObjectTypeDB::bind_method(_MD("append_at_cursor","text"),&LineEdit::append_at_cursor);
@@ -1166,12 +1287,15 @@ void LineEdit::_bind_methods() {
 	BIND_CONSTANT( MENU_MAX );
 
 	ADD_PROPERTYNZ( PropertyInfo( Variant::STRING, "text" ), _SCS("set_text"),_SCS("get_text") );
+	ADD_PROPERTYNZ( PropertyInfo( Variant::STRING, "placeholder/text" ), _SCS("set_placeholder"),_SCS("get_placeholder") );
+	ADD_PROPERTYNZ( PropertyInfo( Variant::REAL, "placeholder/alpha",PROPERTY_HINT_RANGE,"0,1,0.001" ), _SCS("set_placeholder_alpha"),_SCS("get_placeholder_alpha") );
 	ADD_PROPERTYNZ(PropertyInfo(Variant::INT, "align", PROPERTY_HINT_ENUM, "Left,Center,Right,Fill"), _SCS("set_align"), _SCS("get_align"));
 	ADD_PROPERTYNZ( PropertyInfo( Variant::INT, "max_length" ), _SCS("set_max_length"),_SCS("get_max_length") );
 	ADD_PROPERTYNO( PropertyInfo( Variant::BOOL, "editable" ), _SCS("set_editable"),_SCS("is_editable") );
 	ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "secret" ), _SCS("set_secret"),_SCS("is_secret") );
 	ADD_PROPERTY( PropertyInfo( Variant::INT,"focus_mode", PROPERTY_HINT_ENUM, "None,Click,All" ), _SCS("set_focus_mode"), _SCS("get_focus_mode") );
-
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "caret/caret_blink"), _SCS("cursor_set_blink_enabled"), _SCS("cursor_get_blink_enabled"));;
+	ADD_PROPERTYNZ(PropertyInfo(Variant::REAL, "caret/caret_blink_speed",PROPERTY_HINT_RANGE,"0.1,10,0.1"), _SCS("cursor_set_blink_speed"),_SCS("cursor_get_blink_speed") );
 }
 
 LineEdit::LineEdit() {
@@ -1180,8 +1304,10 @@ LineEdit::LineEdit() {
 	cached_width = 0;
 	cursor_pos=0;
 	window_pos=0;
+	window_has_focus=true;
 	max_length = 0;
 	pass=false;
+	placeholder_alpha=0.6;
 
 	selection_clear();
 	set_focus_mode( FOCUS_ALL );
@@ -1189,6 +1315,13 @@ LineEdit::LineEdit() {
 	set_default_cursor_shape(CURSOR_IBEAM);
 	set_stop_mouse(true);
 
+	draw_caret=true;
+	caret_blink_enabled=false;
+	caret_blink_timer = memnew(Timer);
+	add_child(caret_blink_timer);
+	caret_blink_timer->set_wait_time(0.65);
+	caret_blink_timer->connect("timeout", this,"_toggle_draw_caret");
+	cursor_set_blink_enabled(false);
 
 	menu = memnew( PopupMenu );
 	add_child(menu);
diff --git a/scene/gui/line_edit.h b/scene/gui/line_edit.h
index ce3958db02..112e4ad55e 100644
--- a/scene/gui/line_edit.h
+++ b/scene/gui/line_edit.h
@@ -67,6 +67,8 @@ private:
 
 	String undo_text;
 	String text;
+	String placeholder;
+	float placeholder_alpha;
 
 	PopupMenu *menu;
 
@@ -87,6 +89,11 @@ private:
 		bool drag_attempt;
 	} selection;
 
+	Timer *caret_blink_timer;
+	bool caret_blink_enabled;
+	bool draw_caret;
+	bool window_has_focus;
+
 	void shift_selection_check_pre(bool);
 	void shift_selection_check_post(bool);
 
@@ -97,10 +104,15 @@ private:
 
 	void set_cursor_at_pixel_pos(int p_x);
 
+	void _reset_caret_blink_timer();
+	void _toggle_draw_caret();
+
 	void clear_internal();
 	void changed_internal();
 
-
+#ifdef TOOLS_ENABLED
+	void _editor_settings_changed();
+#endif
 
 	void _input_event(InputEvent p_event);
 	void _notification(int p_what);
@@ -125,6 +137,10 @@ public:
 	void delete_text(int p_from_column, int p_to_column);
 	void set_text(String p_text);
 	String get_text() const;
+	void set_placeholder(String p_text);
+	String get_placeholder() const;
+	void set_placeholder_alpha(float p_alpha);
+	float get_placeholder_alpha() const;
 	void set_cursor_pos(int p_pos);
 	int get_cursor_pos() const;
 	void set_max_length(int p_max_length);
@@ -132,6 +148,12 @@ public:
 	void append_at_cursor(String p_text);
 	void clear();
 
+	bool cursor_get_blink_enabled() const;
+	void cursor_set_blink_enabled(const bool p_enabled);
+
+	float cursor_get_blink_speed() const;
+	void cursor_set_blink_speed(const float p_speed);
+
 	void copy_text();
 	void cut_text();
 	void paste_text();
diff --git a/scene/gui/patch_9_frame.cpp b/scene/gui/patch_9_frame.cpp
index a6a3490ad2..9ad6398359 100644
--- a/scene/gui/patch_9_frame.cpp
+++ b/scene/gui/patch_9_frame.cpp
@@ -79,6 +79,8 @@ void Patch9Frame::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("set_draw_center","draw_center"), & Patch9Frame::set_draw_center );
 	ObjectTypeDB::bind_method(_MD("get_draw_center"), & Patch9Frame::get_draw_center );
 
+	ADD_SIGNAL(MethodInfo("texture_changed"));
+
 	ADD_PROPERTYNZ( PropertyInfo( Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), _SCS("set_texture"),_SCS("get_texture") );
 	ADD_PROPERTYNO( PropertyInfo( Variant::COLOR, "modulate"), _SCS("set_modulate"),_SCS("get_modulate") );
 	ADD_PROPERTYNO( PropertyInfo( Variant::BOOL, "draw_center"), _SCS("set_draw_center"),_SCS("get_draw_center") );
@@ -93,11 +95,14 @@ void Patch9Frame::_bind_methods() {
 
 void Patch9Frame::set_texture(const Ref<Texture>& p_tex) {
 
+	if (texture==p_tex)
+		return;
 	texture=p_tex;
 	update();
 	//if (texture.is_valid())
 	//	texture->set_flags(texture->get_flags()&(~Texture::FLAG_REPEAT)); //remove repeat from texture, it looks bad in sprites
 	minimum_size_changed();
+	emit_signal("texture_changed");
 }
 
 Ref<Texture> Patch9Frame::get_texture() const {
diff --git a/scene/gui/progress_bar.cpp b/scene/gui/progress_bar.cpp
index 02da8ff27e..8af94c3638 100644
--- a/scene/gui/progress_bar.cpp
+++ b/scene/gui/progress_bar.cpp
@@ -51,7 +51,6 @@ void ProgressBar::_notification(int p_what) {
 		Ref<StyleBox> fg = get_stylebox("fg");
 		Ref<Font> font = get_font("font");
 		Color font_color=get_color("font_color");
-		Color font_color_shadow=get_color("font_color_shadow");
 
 		draw_style_box(bg,Rect2(Point2(),get_size()));
 		float r = get_unit_value();
@@ -63,7 +62,6 @@ void ProgressBar::_notification(int p_what) {
 		}
 
 		if (percent_visible) {
-			int fh=font->get_height();
 			String txt=itos(int(get_unit_value()*100))+"%";
 			font->draw_halign(get_canvas_item(),Point2(0,font->get_ascent()+(get_size().height-font->get_height())/2),HALIGN_CENTER,get_size().width,txt,font_color);
 		}
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index 786ce27a0c..b4fa463cde 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/rich_text_label.cpp
@@ -270,7 +270,6 @@ if (m_height > line_height) {\
 					if (p_mode!=PROCESS_CACHE) {
 						lh=line<l.height_caches.size()?l.height_caches[line]:1;
 					}
-					bool found_space=false;
 
 					while (c[end]!=0 && !(end && c[end-1]==' ' && c[end]!=' ')) {
 
@@ -284,30 +283,13 @@ if (m_height > line_height) {\
 						}
 
 						w+=cw;
-
-						if (c[end]==' ') {
-
-							fw+=cw;
-							/*
-							if (p_mode==PROCESS_CACHE) {
-								fw+=cw;
-							} else if (align==ALIGN_FILL && line<l.space_caches.size() && l.space_caches[line]>0) {
-								//print_line(String(c,end)+": "+itos(l.offset_caches[line])+"/"+itos(l.space_caches[line]));
-								//sub_space=cw;
-								found_space=true;
-							} else {
-								fw+=cw;
-							}*/
-						} else {
-							fw+=cw;
-						}
+						fw+=cw;
 
 						end++;
 					}
 
 					ENSURE_WIDTH(w);
 
-					//print_line("END: "+String::chr(c[end])+".");
 					if (end && c[end-1]==' ') {
 						if (p_mode==PROCESS_CACHE) {
 							spaces_size+=font->get_char_size(' ').width;
@@ -319,27 +301,17 @@ if (m_height > line_height) {\
 						}
 						spaces++;
 
-						/*
-						if (found_space) {
-							int ln = MIN(l.offset_caches.size()-1,line);
-
-							fw+=l.offset_caches[ln]/l.space_caches[ln];
-						}*/
-
 					}
 
 
 					{
 
-
 						int ofs=0;
 
 						for(int i=0;i<end;i++) {
 							int pofs=wofs+ofs;
 
 
-
-
 							if (p_mode==PROCESS_POINTER && r_click_char && p_click_pos.y>=p_ofs.y+y && p_click_pos.y<=p_ofs.y+y+lh) {
 								//int o = (wofs+w)-p_click_pos.x;
 
@@ -354,15 +326,6 @@ if (m_height > line_height) {\
 								if (p_click_pos.x-cw/2>p_ofs.x+align_ofs+pofs) {
 
 									rchar=int((&c[i])-cf);
-									//print_line("GOT: "+itos(rchar));
-
-
-									//if (i==end-1 && p_click_pos.x+cw/2 > pofs)
-									//	rchar++;
-									//int o = (wofs+w)-p_click_pos.x;
-
-								//	if (o>cw/2)
-								//		rchar++;
 								}
 
 
@@ -402,12 +365,9 @@ if (m_height > line_height) {\
 								}
 
 
-								//print_line("draw char: "+String::chr(c[i]));
-
 								if (underline) {
 									Color uc=color;
 									uc.a*=0.5;
-									//VS::get_singleton()->canvas_item_add_line(ci,Point2(pofs,y+ascent+2),Point2(pofs+cw,y+ascent+2),uc);
 									int uy = y+lh-fh+ascent+2;
 									VS::get_singleton()->canvas_item_add_line(ci,p_ofs+Point2(align_ofs+pofs,uy),p_ofs+Point2(align_ofs+pofs+cw,uy),uc);
 								}
@@ -462,28 +422,6 @@ if (m_height > line_height) {\
 				if (p_mode!=PROCESS_CACHE)
 					lh = line<l.height_caches.size()?l.height_caches[line]:1;
 
-
-#if 0
-				if (p_mode==PROCESS_POINTER && r_click_item ) {
-					//previous last "wrapped" line
-					int pl = line-1;
-					if (pl<0 || lines[pl].height_caches.size()==0)
-						break;
-					int py=lines[pl].offset_caches[ lines[pl].offset_caches.size() -1 ];
-					int ph=lines[pl].height_caches[ lines[pl].height_caches.size() -1 ];
-					print_line("py: "+itos(py));
-					print_line("ph: "+itos(ph));
-
-					rchar=0;
-					if (p_click_pos.y>=py && p_click_pos.y<=py+ph) {
-						if (r_outside) *r_outside=true;
-						*r_click_item=it;
-						*r_click_char=rchar;
-						return;
-					}
-				}
-
-#endif
 			} break;
 			case ITEM_TABLE: {
 
@@ -493,7 +431,6 @@ if (m_height > line_height) {\
 				int vseparation=get_constant("table_vseparation");
 				Color ccolor = _find_color(table,p_base_color);
 				Vector2 draw_ofs = Point2(wofs,y);
-				int max_y=get_size().height;
 
 				if (p_mode==PROCESS_CACHE) {
 
@@ -725,8 +662,7 @@ void RichTextLabel::_notification(int p_what) {
 		} break;
 		case NOTIFICATION_ENTER_TREE: {
 
-			if (use_bbcode)
-				parse_bbcode(bbcode);
+			set_bbcode(bbcode);
 			main->first_invalid_line=0; //invalidate ALL
 			update();
 
@@ -1503,7 +1439,6 @@ bool RichTextLabel::is_scroll_following() const {
 
 Error RichTextLabel::parse_bbcode(const String& p_bbcode) {
 
-
 	clear();
 	return append_bbcode(p_bbcode);
 }
@@ -1825,7 +1760,6 @@ bool RichTextLabel::search(const String& p_string,bool p_from_selection) {
 		charidx=selection.to_char+1;
 	}
 
-	int line=-1;
 	while(it) {
 
 		if (it->type==ITEM_TEXT) {
@@ -1922,6 +1856,10 @@ void RichTextLabel::set_bbcode(const String& p_bbcode) {
 	bbcode=p_bbcode;
 	if (is_inside_tree() && use_bbcode)
 		parse_bbcode(p_bbcode);
+	else { // raw text
+		clear();
+		add_text(p_bbcode);
+	}
 }
 
 String RichTextLabel::get_bbcode() const {
@@ -1933,19 +1871,37 @@ void RichTextLabel::set_use_bbcode(bool p_enable) {
 	if (use_bbcode==p_enable)
 		return;
 	use_bbcode=p_enable;
-	if (is_inside_tree() && use_bbcode)
-		parse_bbcode(bbcode);
+	set_bbcode(bbcode);
 }
 
 bool RichTextLabel::is_using_bbcode() const {
 
 	return use_bbcode;
 }
+
+String RichTextLabel::get_text() {
+	String text = "";
+	Item *it = main;
+	while (it) {
+		if (it->type == ITEM_TEXT) {
+			ItemText *t = static_cast<ItemText*>(it);
+			text += t->text;
+		} else if (it->type == ITEM_NEWLINE) {
+			text += "\n";
+		} else if (it->type == ITEM_INDENT) {
+			text += "\t";
+		}
+		it=_get_next_item(it,true);
+	}
+	return text;
+}
+
 void RichTextLabel::_bind_methods() {
 
 
 	ObjectTypeDB::bind_method(_MD("_input_event"),&RichTextLabel::_input_event);
 	ObjectTypeDB::bind_method(_MD("_scroll_changed"),&RichTextLabel::_scroll_changed);
+	ObjectTypeDB::bind_method(_MD("get_text"),&RichTextLabel::get_text);
 	ObjectTypeDB::bind_method(_MD("add_text","text"),&RichTextLabel::add_text);
 	ObjectTypeDB::bind_method(_MD("add_image","image:Texture"),&RichTextLabel::add_image);
 	ObjectTypeDB::bind_method(_MD("newline"),&RichTextLabel::add_newline);
diff --git a/scene/gui/rich_text_label.h b/scene/gui/rich_text_label.h
index 635fe87ad4..5147905a0e 100644
--- a/scene/gui/rich_text_label.h
+++ b/scene/gui/rich_text_label.h
@@ -280,6 +280,7 @@ protected:
 
 public:
 
+	String get_text();
 	void add_text(const String& p_text);
 	void add_image(const Ref<Texture>& p_image);
 	void add_newline();
diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp
index 9bf93aff77..190e8e141f 100644
--- a/scene/gui/scroll_container.cpp
+++ b/scene/gui/scroll_container.cpp
@@ -177,7 +177,6 @@ void ScrollContainer::_input_event(const InputEvent& p_input_event) {
 
 void ScrollContainer::_update_scrollbar_pos() {
 
-	Size2 size = get_size();
 	Size2 hmin = h_scroll->get_combined_minimum_size();
 	Size2 vmin = v_scroll->get_combined_minimum_size();
 
diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp
index 5eb579f1d2..0e0339c488 100644
--- a/scene/gui/tab_container.cpp
+++ b/scene/gui/tab_container.cpp
@@ -40,8 +40,6 @@ int TabContainer::_get_top_margin() const {
 
 	int h = MAX( tab_bg->get_minimum_size().height,tab_fg->get_minimum_size().height);
 
-//	h+=MIN( get_constant("label_valign_fg"), get_constant("label_valign_bg") );
-
 	int ch = font->get_height();;
 	for(int i=0;i<get_child_count();i++) {
 
@@ -207,9 +205,7 @@ void TabContainer::_notification(int p_what) {
 			Ref<StyleBox> tab_bg = get_stylebox("tab_bg");
 			Ref<StyleBox> tab_fg = get_stylebox("tab_fg");
 			Ref<Texture> incr = get_icon("increment");
-			Ref<Texture> incr_hl = get_icon("increment_hilite");
 			Ref<Texture> decr = get_icon("decrement");
-			Ref<Texture> decr_hl = get_icon("decrement_hilite");
 			Ref<Texture> menu = get_icon("menu");
 			Ref<Texture> menu_hl = get_icon("menu_hl");
 			Ref<Font> font = get_font("font");
@@ -219,9 +215,6 @@ void TabContainer::_notification(int p_what) {
 			int side_margin = get_constant("side_margin");
 			int top_margin = _get_top_margin();
 
-			int label_valign_fg = get_constant("label_valign_fg");
-			int label_valign_bg = get_constant("label_valign_bg");
-
 
 			Size2 top_size = Size2( size.width, top_margin );
 
@@ -338,17 +331,14 @@ void TabContainer::_notification(int p_what) {
 
 
 				Ref<StyleBox> sb;
-				int va;
 				Color col;
 
 				if (idx==current) {
 
 					sb=tab_fg;
-					va=label_valign_fg;
 					col=color_fg;
 				} else {
 					sb=tab_bg;
-					va=label_valign_bg;
 					col=color_bg;
 				}
 
@@ -371,23 +361,7 @@ void TabContainer::_notification(int p_what) {
 				}
 
 				font->draw(ci, Point2i( lpos.x, sb->get_margin(MARGIN_TOP)+((sb_rect.size.y-sb_ms.y)-font->get_height())/2+font->get_ascent() ), s, col );
-				//ofs+=sb_ms.x+w;
-
-				/*
-				int sb_mw = sb->get_minimum_size().width;
-				int font_ofs = sb_mw / 2;
-
-				Rect2i rect =Rect2( ofs, 0, w+sb_mw, top_margin);
 
-				rect.size
-				sb->draw(ci,rect);
-				rect.y+=va;
-				rect.height+=va;
-				int font_y = (rect.height - font->get_height())/2;
-
-				font->draw(ci, Point2( ofs+font_ofs, va+font_y ), s, col );
-
-*/
 				idx++;
 			}
 
@@ -477,7 +451,6 @@ void TabContainer::set_current_tab(int p_current) {
 
 	ERR_FAIL_INDEX( p_current, get_tab_count() );
 
-    //printf("DEBUG %p: set_current_tab to %i\n", this, p_current);
 	current=p_current;
 
 	int idx=0;
@@ -560,7 +533,6 @@ Control* TabContainer::get_current_tab_control() const {
 void TabContainer::remove_child_notify(Node *p_child) {
 
 	int tc = get_tab_count();
-//	bool set_curent=false;
 	if (current==tc-1) {
 		current--;
 		if (current<0)
@@ -705,9 +677,6 @@ Size2 TabContainer::get_minimum_size() const {
 		if (c->is_set_as_toplevel())
 			continue;
 
-		//if (!c->has_meta("_tab_name"))
-		//	continue;
-
 		if (!c->is_visible())
 			continue;
 
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 5e18da32aa..55e1a2cc52 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -852,6 +852,11 @@ void TextEdit::_notification(int p_what) {
 								k++;
 							}
 
+							// check for space between name and bracket
+							while (k < str.length() && (str[k] == '\t' || str[k] == ' ')) {
+								k++;
+							}
+
 							if (str[k] == '(') {
 								in_function_name = true;
 							}
@@ -1041,11 +1046,8 @@ void TextEdit::_notification(int p_what) {
 			if (completion_active) {
 				// code completion box
 				Ref<StyleBox> csb = get_stylebox("completion");
-				Ref<StyleBox> csel = get_stylebox("completion_selected");
 				int maxlines = get_constant("completion_lines");
 				int cmax_width = get_constant("completion_max_width")*cache.font->get_char_size('x').x;
-				Color existing = get_color("completion_existing");
-				existing.a=0.2;
 				int scrollw = get_constant("completion_scroll_width");
 				Color scrollc = get_color("completion_scroll_color");
 
@@ -1089,11 +1091,12 @@ void TextEdit::_notification(int p_what) {
 
 				draw_style_box(csb,Rect2(completion_rect.pos-csb->get_offset(),completion_rect.size+csb->get_minimum_size()+Size2(scrollw,0)));
 
-
+				if (cache.completion_background_color.a>0.01) {
+					VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(completion_rect.pos,completion_rect.size+Size2(scrollw,0)),cache.completion_background_color);
+				}
 				int line_from = CLAMP(completion_index - lines/2, 0, completion_options.size() - lines);
-				draw_style_box(csel,Rect2(Point2(completion_rect.pos.x,completion_rect.pos.y+(completion_index-line_from)*get_row_height()),Size2(completion_rect.size.width,get_row_height())));
-
-				draw_rect(Rect2(completion_rect.pos,Size2(nofs,completion_rect.size.height)),existing);
+				VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(Point2(completion_rect.pos.x,completion_rect.pos.y+(completion_index-line_from)*get_row_height()),Size2(completion_rect.size.width,get_row_height())),cache.completion_selected_color);
+				draw_rect(Rect2(completion_rect.pos,Size2(nofs,completion_rect.size.height)),cache.completion_existing_color);
 
 
 
@@ -1975,6 +1978,7 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
 					}
 				} break;
 				case KEY_TAB: {
+					if (k.mod.command) break; // avoid tab when command
 
 					if (readonly)
 						break;
@@ -2067,6 +2071,12 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
 
 					if (k.mod.shift)
 						_pre_shift_selection();
+#ifdef APPLE_STYLE_KEYS
+					else
+#else
+					else if (!k.mod.alt)
+#endif
+						deselect();
 
 #ifdef APPLE_STYLE_KEYS
 					if (k.mod.command) {
@@ -2120,6 +2130,12 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
 
 					if (k.mod.shift)
 						_pre_shift_selection();
+#ifdef APPLE_STYLE_KEYS
+					else
+#else
+					else if (!k.mod.alt)
+#endif
+						deselect();
 
 #ifdef APPLE_STYLE_KEYS
 					if (k.mod.command) {
@@ -3287,6 +3303,9 @@ void TextEdit::_update_caches() {
 
 	cache.style_normal=get_stylebox("normal");
 	cache.style_focus=get_stylebox("focus");
+	cache.completion_background_color=get_color("completion_background_color");
+	cache.completion_selected_color=get_color("completion_selected_color");
+	cache.completion_existing_color=get_color("completion_existing_color");
 	cache.font=get_font("font");
 	cache.caret_color=get_color("caret_color");
 	cache.line_number_color=get_color("line_number_color");
@@ -4103,7 +4122,7 @@ void TextEdit::_update_completion_candidates() {
 		}
 	}
 
-	if (l[cursor.column - 1] == '(' && !pre_keyword && !completion_strings[0].begins_with("\"")) {
+	if (cursor.column > 0 && l[cursor.column - 1] == '(' && !pre_keyword && !completion_strings[0].begins_with("\"")) {
 		cancel = true;
 	}
 
@@ -4118,16 +4137,28 @@ void TextEdit::_update_completion_candidates() {
 	completion_options.clear();
 	completion_index=0;
 	completion_base=s;
-	int ci_match=0;
 	Vector<float> sim_cache;
 	for(int i=0;i<completion_strings.size();i++) {
+		if (s == completion_strings[i]) {
+			// A perfect match, stop completion
+			_cancel_completion();
+			return;
+		}
 		if (s.is_subsequence_ofi(completion_strings[i])) {
 			// don't remove duplicates if no input is provided
 			if (s != "" && completion_options.find(completion_strings[i]) != -1) {
 				continue;
 			}
 			// Calculate the similarity to keep completions in good order
-			float similarity = s.similarity(completion_strings[i]);
+			float similarity;
+			if (completion_strings[i].to_lower().begins_with(s.to_lower())) {
+				// Substrings are the best candidates
+				similarity = 1.1;
+			} else {
+				// Otherwise compute the similarity
+				similarity = s.to_lower().similarity(completion_strings[i].to_lower());
+			}
+
 			int comp_size = completion_options.size();
 			if (comp_size == 0) {
 				completion_options.push_back(completion_strings[i]);
@@ -4137,8 +4168,8 @@ void TextEdit::_update_completion_candidates() {
 				int pos = 0;
 				do {
 					comp_sim = sim_cache[pos++];
-				} while(pos < comp_size && similarity <= comp_sim);
-				pos--; // Pos will be off by one
+				} while(pos < comp_size && similarity < comp_sim);
+				pos = similarity > comp_sim ? pos - 1 : pos; // Pos will be off by one
 				completion_options.insert(pos, completion_strings[i]);
 				sim_cache.insert(pos, similarity);
 			}
@@ -4528,6 +4559,7 @@ TextEdit::TextEdit()  {
 	scroll_past_end_of_file_enabled=false;
 	auto_brace_completion_enabled=false;
 	brace_matching_enabled=false;
+	highlight_all_occurrences=false;
 	auto_indent=false;
 	insert_mode = false;
 	window_has_focus=true;
diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h
index f01e6de1c9..acac687b59 100644
--- a/scene/gui/text_edit.h
+++ b/scene/gui/text_edit.h
@@ -74,6 +74,9 @@ class TextEdit : public Control  {
 		Ref<StyleBox> style_normal;
 		Ref<StyleBox> style_focus;
 		Ref<Font> font;
+		Color completion_background_color;
+		Color completion_selected_color;
+		Color completion_existing_color;
 		Color caret_color;
 		Color line_number_color;
 		Color font_color;
diff --git a/scene/gui/texture_button.cpp b/scene/gui/texture_button.cpp
index c885b2d73e..df2f5edd48 100644
--- a/scene/gui/texture_button.cpp
+++ b/scene/gui/texture_button.cpp
@@ -76,10 +76,7 @@ void TextureButton::_notification(int p_what) {
 	switch( p_what ) {
 
 		case NOTIFICATION_DRAW: {
-			RID canvas_item = get_canvas_item();
 			DrawMode draw_mode = get_draw_mode();
-//			if (normal.is_null())
-//				break;
 
 			Ref<Texture> texdraw;
 
diff --git a/scene/gui/texture_frame.cpp b/scene/gui/texture_frame.cpp
index 143f0e83b8..4aa45af863 100644
--- a/scene/gui/texture_frame.cpp
+++ b/scene/gui/texture_frame.cpp
@@ -37,9 +37,6 @@ void TextureFrame::_notification(int p_what) {
 			return;
 
 
-
-		RID ci = get_canvas_item();
-
 		switch(stretch_mode) {
 			case STRETCH_SCALE_ON_EXPAND: {
 				Size2 s=expand?get_size():texture->get_size();
@@ -85,23 +82,6 @@ void TextureFrame::_notification(int p_what) {
 
 		}
 
-
-/*
-		Vector<Point2> points;
-		points.resize(4);
-		points[0]=Point2(0,0);
-		points[1]=Point2(s.x,0);
-		points[2]=Point2(s.x,s.y);
-		points[3]=Point2(0,s.y);
-		Vector<Point2> uvs;
-		uvs.resize(4);
-		uvs[0]=Point2(0,0);
-		uvs[1]=Point2(1,0);
-		uvs[2]=Point2(1,1);
-		uvs[3]=Point2(0,1);
-
-		VisualServer::get_singleton()->canvas_item_add_primitive(ci,points,Vector<Color>(),uvs,texture->get_rid());
-*/
 	}
 }
 
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
index f8516f8f5d..a3d6ac9714 100644
--- a/scene/gui/tree.cpp
+++ b/scene/gui/tree.cpp
@@ -973,22 +973,12 @@ int Tree::draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2&
 
 	/* Draw label, if height fits */
 
-	Point2i guide_from;
 
 		bool skip=(p_item==root && hide_root);
-   // printf("skip (%p == %p && %i) %i\n",p_item,root,hide_root,skip);
 
 
 	if (!skip && (p_pos.y+label_h-cache.offset.y)>0) {
 
-	  //  printf("entering\n");
-
-		int height=label_h;
-
-		Point2i guide_space=Point2i( cache.guide_width , height );
-
-
-
 		if (!hide_folding && p_item->childs) { //has childs, draw the guide box
 
 			Ref<Texture> arrow;
@@ -1345,7 +1335,7 @@ int Tree::_count_selected_items(TreeItem* p_from) const {
 	return count;
 
 }
-void Tree::select_single_item(TreeItem *p_selected,TreeItem *p_current,int p_col,TreeItem *p_prev,bool *r_in_range) {
+void Tree::select_single_item(TreeItem *p_selected, TreeItem *p_current, int p_col, TreeItem *p_prev, bool *r_in_range, bool p_force_deselect) {
 
 	TreeItem::Cell &selected_cell=p_selected->cells[p_col];
 
@@ -1355,6 +1345,8 @@ void Tree::select_single_item(TreeItem *p_selected,TreeItem *p_current,int p_col
 		switched=true;
 	}
 
+	bool emitted_row=false;
+
 	for (int i=0;i<columns.size();i++) {
 
 		TreeItem::Cell &c=p_current->cells[i];
@@ -1373,7 +1365,10 @@ void Tree::select_single_item(TreeItem *p_selected,TreeItem *p_current,int p_col
 					selected_item=p_selected;
 					selected_col=0;
 					selected_item=p_selected;
-					emit_signal("item_selected");
+					if (!emitted_row) {
+						emit_signal("item_selected");
+						emitted_row=true;
+					}
 					//if (p_col==i)
 					//	p_current->selected_signal.call(p_col);
 				}
@@ -1414,7 +1409,7 @@ void Tree::select_single_item(TreeItem *p_selected,TreeItem *p_current,int p_col
 			} else {
 
 
-				if (r_in_range && *r_in_range) {
+				if (r_in_range && *r_in_range && !p_force_deselect) {
 
 
 					if (!c.selected && c.selectable) {
@@ -1422,7 +1417,7 @@ void Tree::select_single_item(TreeItem *p_selected,TreeItem *p_current,int p_col
 						emit_signal("multi_selected",p_current,i,true);
 					}
 
-				} else if (!r_in_range){
+				} else if (!r_in_range || p_force_deselect){
 					if (select_mode==SELECT_MULTI && c.selected)
 						emit_signal("multi_selected",p_current,i,false);
 					c.selected=false;
@@ -1441,7 +1436,7 @@ void Tree::select_single_item(TreeItem *p_selected,TreeItem *p_current,int p_col
 
 	while (c) {
 
-		select_single_item(p_selected,c,p_col,p_prev,r_in_range);
+		select_single_item(p_selected,c,p_col,p_prev,r_in_range,p_current->is_collapsed() || p_force_deselect);
 		c=c->next;
 	}
 
@@ -1655,7 +1650,6 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
 		/* editing */
 
 		bool bring_up_editor=force_select_on_already_selected ? (c.selected && already_selected) : c.selected;
-		bool bring_up_value_editor=false;
 		String editor_text=c.text;
 
 		switch (c.mode) {
@@ -1706,9 +1700,6 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
 					bring_up_editor=false;
 				} else {
 
-					Ref<Texture> updown = cache.updown;
-
-
 					if (x >= (col_width-item_h/2)) {
 
 						/* touching the combo */
@@ -1755,7 +1746,6 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
 					}  else {
 
 						editor_text=String::num( p_item->cells[col].val, Math::decimals( p_item->cells[col].step ) );
-						bring_up_value_editor=false;
 						if (select_mode==SELECT_MULTI && get_tree()->get_last_event_id() == focus_in_id)
 							bring_up_editor=false;
 
@@ -2274,7 +2264,7 @@ void Tree::_input_event(InputEvent p_event) {
 				update();
 			}
 
-			if (pressing_for_editor && popup_edited_item && popup_edited_item->get_cell_mode(popup_edited_item_col)==TreeItem::CELL_MODE_RANGE) {
+			if (pressing_for_editor && popup_edited_item &&	(popup_edited_item->get_cell_mode(popup_edited_item_col)==TreeItem::CELL_MODE_RANGE || popup_edited_item->get_cell_mode(popup_edited_item_col)==TreeItem::CELL_MODE_RANGE_EXPRESSION)) {
 				//range drag
 
 				if (!range_drag_enabled) {
diff --git a/scene/gui/tree.h b/scene/gui/tree.h
index 0172546c1d..f5100ab5b6 100644
--- a/scene/gui/tree.h
+++ b/scene/gui/tree.h
@@ -331,7 +331,7 @@ friend class TreeItem;
 //	void draw_item_text(String p_text,const Ref<Texture>& p_icon,int p_icon_max_w,bool p_tool,Rect2i p_rect,const Color& p_color);
 	void draw_item_rect(const TreeItem::Cell& p_cell,const Rect2i& p_rect,const Color& p_color);
 	int draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2& p_draw_size,TreeItem *p_item);
-	void select_single_item(TreeItem *p_selected,TreeItem *p_current,int p_col,TreeItem *p_prev=NULL,bool *r_in_range=NULL);
+	void select_single_item(TreeItem *p_selected,TreeItem *p_current,int p_col,TreeItem *p_prev=NULL,bool *r_in_range=NULL,bool p_force_deselect=false);
 	int propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_doubleclick,TreeItem *p_item,int p_button,const InputModifierState& p_mod);
 	void text_editor_enter(String p_text);
 	void _text_editor_modal_close();
diff --git a/scene/gui/video_player.cpp b/scene/gui/video_player.cpp
index e9ff76bd91..1be847929d 100644
--- a/scene/gui/video_player.cpp
+++ b/scene/gui/video_player.cpp
@@ -116,7 +116,6 @@ void VideoPlayer::_notification(int p_notification) {
 
 		case NOTIFICATION_ENTER_TREE: {
 
-			//set_idle_process(false); //don't annoy
 			if (stream.is_valid() && autoplay && !get_tree()->is_editor_hint()) {
 				play();
 			}
@@ -141,13 +140,6 @@ void VideoPlayer::_notification(int p_notification) {
 
 			playback->update(delta);
 
-			/*int prev_width = texture->get_width();
-			stream->pop_frame(texture);
-			if (prev_width == 0) {
-				update();
-				minimum_size_changed();
-			};*/
-
 		} break;
 
 		case NOTIFICATION_DRAW: {
@@ -158,8 +150,6 @@ void VideoPlayer::_notification(int p_notification) {
 				return;
 
 			Size2 s=expand?get_size():texture->get_size();
-			RID ci = get_canvas_item();
-			printf("drawing with size %f, %f\n", s.x, s.y);
 			draw_texture_rect(texture,Rect2(Point2(),s),false);
 
 		} break;
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 11b400d4a9..55106f5ee7 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -1206,7 +1206,6 @@ void Node::add_to_group(const StringName& p_identifier,bool p_persistent) {
 
 	GroupData gd;
 
-	SceneTree::Group *gptr=NULL;
 	if (data.tree) {
 		gd.group=data.tree->add_to_group(p_identifier,this);
 	} else {
@@ -1513,7 +1512,7 @@ int Node::get_position_in_parent() const {
 
 
 
-Node *Node::duplicate(bool p_use_instancing) const {
+Node *Node::_duplicate(bool p_use_instancing) const {
 
 
 	Node *node=NULL;
@@ -1592,9 +1591,21 @@ Node *Node::duplicate(bool p_use_instancing) const {
 		node->add_child(dup);
 	}
 
+
 	return node;
 }
 
+Node *Node::duplicate(bool p_use_instancing) const {
+
+	Node* dupe = _duplicate(p_use_instancing);
+
+	if (dupe) {
+		_duplicate_signals(this,dupe);
+	}
+
+	return dupe;
+}
+
 
 void Node::_duplicate_and_reown(Node* p_new_parent, const Map<Node*,Node*>& p_reown_map) const {
 
@@ -1664,12 +1675,13 @@ void Node::_duplicate_and_reown(Node* p_new_parent, const Map<Node*,Node*>& p_re
 
 void Node::_duplicate_signals(const Node* p_original,Node* p_copy) const {
 
-	if (this!=p_original && get_owner()!=p_original)
+	if (this!=p_original && (get_owner()!=p_original && get_owner()!=p_original->get_owner()))
 		return;
 
 	List<Connection> conns;
 	get_all_signal_connections(&conns);
 
+
 	for (List<Connection>::Element *E=conns.front();E;E=E->next()) {
 
 		if (E->get().flags&CONNECT_PERSIST) {
@@ -1678,14 +1690,17 @@ void Node::_duplicate_signals(const Node* p_original,Node* p_copy) const {
 			Node *copy = p_copy->get_node(p);
 
 			Node *target = E->get().target->cast_to<Node>();
-			if (!target)
+			if (!target) {
 				continue;
+			}
 			NodePath ptarget = p_original->get_path_to(target);
 			Node *copytarget = p_copy->get_node(ptarget);
 
+
 			if (copy && copytarget) {
 				copy->connect(E->get().signal,copytarget,E->get().method,E->get().binds,CONNECT_PERSIST);
 			}
+
 		}
 	}
 
@@ -2085,6 +2100,15 @@ bool Node::is_owned_by_parent() const {
 	return data.parent_owned;
 }
 
+void Node::set_display_folded(bool p_folded) {
+	data.display_folded=p_folded;
+}
+
+bool Node::is_displayed_folded() const {
+
+	return data.display_folded;
+}
+
 void Node::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("_add_child_below_node","node:Node","child_node:Node","legible_unique_name"),&Node::add_child_below_node,DEFVAL(false));
@@ -2140,6 +2164,8 @@ void Node::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("can_process"),&Node::can_process);
 	ObjectTypeDB::bind_method(_MD("print_stray_nodes"),&Node::_print_stray_nodes);
 	ObjectTypeDB::bind_method(_MD("get_position_in_parent"),&Node::get_position_in_parent);
+	ObjectTypeDB::bind_method(_MD("set_display_folded","fold"),&Node::set_display_folded);
+	ObjectTypeDB::bind_method(_MD("is_displayed_folded"),&Node::is_displayed_folded);
 
 	ObjectTypeDB::bind_method(_MD("get_tree:SceneTree"),&Node::get_tree);
 
@@ -2194,6 +2220,7 @@ void Node::_bind_methods() {
 	//ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "process/input" ), _SCS("set_process_input"),_SCS("is_processing_input" ) );
 	//ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "process/unhandled_input" ), _SCS("set_process_unhandled_input"),_SCS("is_processing_unhandled_input" ) );
 	ADD_PROPERTYNZ( PropertyInfo( Variant::INT, "process/pause_mode",PROPERTY_HINT_ENUM,"Inherit,Stop,Process" ), _SCS("set_pause_mode"),_SCS("get_pause_mode" ) );
+	ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "editor/display_folded",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR ), _SCS("set_display_folded"),_SCS("is_displayed_folded" ) );
 
 	BIND_VMETHOD( MethodInfo("_process",PropertyInfo(Variant::REAL,"delta")) );
 	BIND_VMETHOD( MethodInfo("_fixed_process",PropertyInfo(Variant::REAL,"delta")) );
@@ -2231,6 +2258,7 @@ Node::Node() {
 	data.in_constructor=true;
 	data.viewport=NULL;
 	data.use_placeholder=false;
+	data.display_folded=false;
 }
 
 Node::~Node() {
@@ -2240,6 +2268,7 @@ Node::~Node() {
 	data.owned.clear();
 	data.children.clear();
 
+
 	ERR_FAIL_COND(data.parent);
 	ERR_FAIL_COND(data.children.size());
 
diff --git a/scene/main/node.h b/scene/main/node.h
index 88334f32f0..10cfc5f9e6 100644
--- a/scene/main/node.h
+++ b/scene/main/node.h
@@ -111,6 +111,7 @@ private:
 		bool in_constructor;
 		bool use_placeholder;
 
+		bool display_folded;
 
 	} data;
 
@@ -137,6 +138,8 @@ private:
 
 	void _duplicate_signals(const Node* p_original,Node* p_copy) const;
 	void _duplicate_and_reown(Node* p_new_parent, const Map<Node*,Node*>& p_reown_map) const;
+	Node *_duplicate(bool p_use_instancing) const;
+
 	Array _get_children() const;
 	Array _get_groups() const;
 
@@ -325,6 +328,8 @@ public:
 
 	void update_configuration_warning();
 
+	void set_display_folded(bool p_folded);
+	bool is_displayed_folded() const;
 	/* CANVAS */
 
 	Node();
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index a1df7062ea..bb6e6e289b 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -1083,7 +1083,7 @@ void Viewport::_propagate_exit_world(Node *p_node) {
 		Spatial *s = p_node->cast_to<Spatial>();
 		if (s) {
 
-			s->notification(Spatial::NOTIFICATION_EXIT_WORLD,false);
+			s->notification(Spatial::NOTIFICATION_EXIT_WORLD, true);
 		} else {
 			Viewport *v = p_node->cast_to<Viewport>();
 			if (v) {
@@ -1331,11 +1331,11 @@ Matrix32 Viewport::_get_input_pre_xform() const {
 	Matrix32 pre_xf;
 	if (render_target) {
 
-		ERR_FAIL_COND_V(to_screen_rect.size.x==0,pre_xf);
-		ERR_FAIL_COND_V(to_screen_rect.size.y==0,pre_xf);
+		if (to_screen_rect!=Rect2()) {
 
-		pre_xf.elements[2]=-to_screen_rect.pos;
-		pre_xf.scale(rect.size/to_screen_rect.size);
+			pre_xf.elements[2]=-to_screen_rect.pos;
+			pre_xf.scale(rect.size/to_screen_rect.size);
+		}
 	} else {
 
 		pre_xf.elements[2]=-rect.pos;
@@ -1575,35 +1575,38 @@ void Viewport::_gui_call_input(Control *p_control,const InputEvent& p_input) {
 //	_block();
 
 
+	InputEvent ev = p_input;
+
 	//mouse wheel events can't be stopped
-	bool cant_stop_me_now = (p_input.type==InputEvent::MOUSE_BUTTON &&
-				 (p_input.mouse_button.button_index==BUTTON_WHEEL_DOWN ||
-				  p_input.mouse_button.button_index==BUTTON_WHEEL_UP ||
-				  p_input.mouse_button.button_index==BUTTON_WHEEL_LEFT ||
-				  p_input.mouse_button.button_index==BUTTON_WHEEL_RIGHT ) );
+	bool cant_stop_me_now = (ev.type==InputEvent::MOUSE_BUTTON &&
+				 (ev.mouse_button.button_index==BUTTON_WHEEL_DOWN ||
+				  ev.mouse_button.button_index==BUTTON_WHEEL_UP ||
+				  ev.mouse_button.button_index==BUTTON_WHEEL_LEFT ||
+				  ev.mouse_button.button_index==BUTTON_WHEEL_RIGHT ) );
 
 	CanvasItem *ci=p_control;
 	while(ci) {
 
 		Control *control = ci->cast_to<Control>();
 		if (control) {
-			control->call_multilevel(SceneStringNames::get_singleton()->_input_event,p_input);
+			control->call_multilevel(SceneStringNames::get_singleton()->_input_event,ev);
 			if (gui.key_event_accepted)
 				break;
 			if (!control->is_inside_tree())
 				break;
-			control->emit_signal(SceneStringNames::get_singleton()->input_event,p_input);
+			control->emit_signal(SceneStringNames::get_singleton()->input_event,ev);
 			if (!control->is_inside_tree() || control->is_set_as_toplevel())
 				break;
 			if (gui.key_event_accepted)
 				break;
-			if (!cant_stop_me_now && control->data.stop_mouse && (p_input.type==InputEvent::MOUSE_BUTTON || p_input.type==InputEvent::MOUSE_MOTION))
+			if (!cant_stop_me_now && control->data.stop_mouse && (ev.type==InputEvent::MOUSE_BUTTON || ev.type==InputEvent::MOUSE_MOTION))
 				break;
 		}
 
 		if (ci->is_set_as_toplevel())
 			break;
 
+		ev=ev.xform_by(ci->get_transform()); //transform event upwards
 		ci=ci->get_parent_item();
 	}
 
@@ -1749,8 +1752,9 @@ void Viewport::_gui_input_event(InputEvent p_event) {
 						Vector2 pos = top->get_global_transform_with_canvas().affine_inverse().xform(mpos);
 						if (!top->has_point(pos)) {
 
-							if (top->data.modal_exclusive) {
+							if (top->data.modal_exclusive || top->data.modal_frame==OS::get_singleton()->get_frames_drawn()) {
 								//cancel event, sorry, modal exclusive EATS UP ALL
+								//alternative, you can't pop out a window the same frame it was made modal (fixes many issues)
 								//get_tree()->call_group(SceneTree::GROUP_CALL_REALTIME,"windows","_cancel_input_ID",p_event.ID);
 								get_tree()->set_input_as_handled();
 								return; // no one gets the event if exclusive NO ONE
@@ -1784,15 +1788,12 @@ void Viewport::_gui_input_event(InputEvent p_event) {
 					if (p_event.mouse_button.button_index==BUTTON_LEFT) {
 						gui.drag_accum=Vector2();
 						gui.drag_attempted=false;
-						if (gui.drag_data.get_type()!=Variant::NIL) {
-							_propagate_viewport_notification(this,NOTIFICATION_DRAG_END);
-						}
-						gui.drag_data=Variant();
 					}
 
 
 				}
 
+
 				p_event.mouse_button.global_x = pos.x;
 				p_event.mouse_button.global_y = pos.y;
 
@@ -1828,30 +1829,55 @@ void Viewport::_gui_input_event(InputEvent p_event) {
 				get_tree()->call_group(SceneTree::GROUP_CALL_REALTIME,"windows","_cancel_input_ID",p_event.ID);
 				get_tree()->set_input_as_handled();
 
+
+				if (gui.drag_data.get_type()!=Variant::NIL && p_event.mouse_button.button_index==BUTTON_LEFT) {
+
+					//alternate drop use (when using force_drag(), as proposed by #5342
+					if (gui.mouse_focus && gui.mouse_focus->can_drop_data(pos,gui.drag_data)) {
+						gui.mouse_focus->drop_data(pos,gui.drag_data);
+					}
+
+					gui.drag_data=Variant();
+
+					if (gui.drag_preview) {
+						memdelete( gui.drag_preview );
+						gui.drag_preview=NULL;
+					}
+					_propagate_viewport_notification(this,NOTIFICATION_DRAG_END);
+					//change mouse accordingly
+				}
+
+
+
 				_gui_cancel_tooltip();
 				//gui.tooltip_popup->hide();
 
 			} else {
 
-				if (gui.drag_preview && p_event.mouse_button.button_index==BUTTON_LEFT) {
-					memdelete( gui.drag_preview );
-					gui.drag_preview=NULL;
-				}
 
-				if (!gui.mouse_focus) {
 
-					if (gui.mouse_over && gui.drag_data.get_type()!=Variant::NIL && p_event.mouse_button.button_index==BUTTON_LEFT) {
+				if (gui.drag_data.get_type()!=Variant::NIL && p_event.mouse_button.button_index==BUTTON_LEFT) {
 
+					if (gui.mouse_over) {
 						Size2 pos = mpos;
 						pos = gui.focus_inv_xform.xform(pos);
 						if (gui.mouse_over->can_drop_data(pos,gui.drag_data)) {
 							gui.mouse_over->drop_data(pos,gui.drag_data);
 						}
-						gui.drag_data=Variant();
-						_propagate_viewport_notification(this,NOTIFICATION_DRAG_END);
-						//change mouse accordingly
 					}
 
+					if (gui.drag_preview && p_event.mouse_button.button_index==BUTTON_LEFT) {
+						memdelete( gui.drag_preview );
+						gui.drag_preview=NULL;
+					}
+
+					gui.drag_data=Variant();
+					_propagate_viewport_notification(this,NOTIFICATION_DRAG_END);
+					//change mouse accordingly
+				}
+
+				if (!gui.mouse_focus) {
+					//release event is only sent if a mouse focus (previously pressed button) exists
 					break;
 				}
 
@@ -1871,10 +1897,10 @@ void Viewport::_gui_input_event(InputEvent p_event) {
 					gui.mouse_focus_button=-1;
 				}
 
-				if (gui.drag_data.get_type()!=Variant::NIL && p_event.mouse_button.button_index==BUTTON_LEFT) {
+				/*if (gui.drag_data.get_type()!=Variant::NIL && p_event.mouse_button.button_index==BUTTON_LEFT) {
 					_propagate_viewport_notification(this,NOTIFICATION_DRAG_END);
 					gui.drag_data=Variant(); //always clear
-				}
+				}*/
 
 
 				get_tree()->call_group(SceneTree::GROUP_CALL_REALTIME,"windows","_cancel_input_ID",p_event.ID);
@@ -1933,7 +1959,6 @@ void Viewport::_gui_input_event(InputEvent p_event) {
 			}
 
 
-
 			if (over!=gui.mouse_over) {
 
 				if (gui.mouse_over)
@@ -2033,7 +2058,12 @@ void Viewport::_gui_input_event(InputEvent p_event) {
 		case InputEvent::JOYSTICK_BUTTON:
 		case InputEvent::KEY: {
 
-			if (gui.key_focus) {
+
+			if (gui.key_focus && !gui.key_focus->is_visible()) {
+				gui.key_focus->release_focus();
+			}
+
+			if (gui.key_focus) {				
 
 				gui.key_event_accepted=false;
 				if (gui.key_focus->can_process()) {
@@ -2173,6 +2203,9 @@ void Viewport::_gui_remove_from_modal_stack(List<Control*>::Element *MI,ObjectID
 
 void Viewport::_gui_force_drag(Control *p_base, const Variant& p_data, Control *p_control) {
 
+	ERR_EXPLAIN("Drag data must be a value");
+	ERR_FAIL_COND(p_data.get_type()==Variant::NIL);
+
 	gui.drag_data=p_data;
 	gui.mouse_focus=NULL;
 
@@ -2369,8 +2402,8 @@ void Viewport::input(const InputEvent& p_event) {
 	ERR_FAIL_COND(!is_inside_tree());
 
 
+	get_tree()->_call_input_pause(input_group,"_input",p_event); //not a bug, must happen before GUI, order is _input -> gui input -> _unhandled input
 	_gui_input_event(p_event);
-	get_tree()->_call_input_pause(input_group,"_input",p_event);
 	//get_tree()->call_group(SceneTree::GROUP_CALL_REVERSE|SceneTree::GROUP_CALL_REALTIME|SceneTree::GROUP_CALL_MULIILEVEL,gui_input_group,"_gui_input",p_event); //special one for GUI, as controls use their own process check
 }
 
@@ -2499,6 +2532,9 @@ Variant Viewport::gui_get_drag_data() const {
 	return gui.drag_data;
 }
 
+Control *Viewport::get_modal_stack_top() const {
+	return gui.modal_stack.size()?gui.modal_stack.back()->get():NULL;
+}
 
 String Viewport::get_configuration_warning() const {
 
diff --git a/scene/main/viewport.h b/scene/main/viewport.h
index 545020dfc7..22a97a9888 100644
--- a/scene/main/viewport.h
+++ b/scene/main/viewport.h
@@ -39,6 +39,7 @@
 */
 
 class Camera;
+class Camera2D;
 class Listener;
 class Control;
 class CanvasItem;
@@ -374,6 +375,7 @@ public:
 	bool gui_has_modal_stack() const;
 
 	Variant gui_get_drag_data() const;
+	Control *get_modal_stack_top() const;
 
 	virtual String get_configuration_warning() const;
 
diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp
index 8be39e3021..1d15b6f2bc 100644
--- a/scene/resources/animation.cpp
+++ b/scene/resources/animation.cpp
@@ -38,8 +38,6 @@ bool Animation::_set(const StringName& p_name, const Variant& p_value) {
 		set_length(p_value);
 	else if (name=="loop")
 		set_loop(p_value);
-	else if (name=="loop_interpolation")
-		set_loop_interpolation(p_value);
 	else if (name=="step")
 		set_step(p_value);
 	else if (name.begins_with("tracks/")) {
@@ -270,8 +268,6 @@ bool Animation::_get(const StringName& p_name,Variant &r_ret) const {
 		r_ret= length;
 	else if (name=="loop")
 		r_ret= loop;
-	else if (name=="loop_interpolation")
-		r_ret= loop_interpolation;
 	else if (name=="step")
 		r_ret= step;
 	else if (name.begins_with("tracks/")) {
@@ -437,7 +433,6 @@ void Animation::_get_property_list( List<PropertyInfo> *p_list) const {
 
 	p_list->push_back( PropertyInfo( Variant::REAL, "length", PROPERTY_HINT_RANGE, "0.001,99999,0.001"));
 	p_list->push_back( PropertyInfo( Variant::BOOL, "loop" ));
-	p_list->push_back( PropertyInfo( Variant::BOOL, "loop_interpolation"));
 	p_list->push_back( PropertyInfo( Variant::REAL, "step", PROPERTY_HINT_RANGE, "0,4096,0.001" ));
 
 	for (int i=0;i<tracks.size();i++) {
@@ -1244,7 +1239,7 @@ T Animation::_interpolate( const Vector< TKey<T> >& p_keys, float p_time,  Inter
 	float c=0;
 	// prepare for all cases of interpolation
 
-	if (loop && loop_interpolation) {
+	if (loop) {
 	// loop
 		if (idx>=0) {
 
@@ -1632,19 +1627,10 @@ void Animation::set_loop(bool p_enabled) {
 	loop=p_enabled;
 	emit_changed();
 }
-void Animation::set_loop_interpolation(bool p_enabled) {
-
-	loop_interpolation=p_enabled;
-	emit_changed();
-}
 bool Animation::has_loop() const {
 
 	return loop;
 }
-bool Animation::has_loop_interpolation() const {
-
-	return loop_interpolation;
-}
 
 void Animation::track_move_up(int p_track) {
 
@@ -1741,9 +1727,7 @@ void Animation::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("get_length"),&Animation::get_length);
 
 	ObjectTypeDB::bind_method(_MD("set_loop","enabled"),&Animation::set_loop);
-	ObjectTypeDB::bind_method(_MD("set_loop_interpolation","enabled"),&Animation::set_loop_interpolation);
 	ObjectTypeDB::bind_method(_MD("has_loop"),&Animation::has_loop);
-	ObjectTypeDB::bind_method(_MD("has_loop_interpolation"),&Animation::has_loop_interpolation);
 
 	ObjectTypeDB::bind_method(_MD("set_step","size_sec"),&Animation::set_step);
 	ObjectTypeDB::bind_method(_MD("get_step"),&Animation::get_step);
@@ -1771,7 +1755,6 @@ void Animation::clear() {
 		memdelete( tracks[i] );
 	tracks.clear();
 	loop=false;
-	loop_interpolation=true;
 	length=1;
 
 }
@@ -2014,9 +1997,6 @@ void Animation::_transform_track_optimize(int p_idx,float p_alowed_linear_err,fl
 
 void Animation::optimize(float p_allowed_linear_err,float p_allowed_angular_err,float p_angle_max) {
 
-
-	int total_tt=0;
-
 	for(int i=0;i<tracks.size();i++) {
 
 		if (tracks[i]->type==TYPE_TRANSFORM)
@@ -2031,7 +2011,6 @@ Animation::Animation() {
 
 	step=0.1;
 	loop=false;
-	loop_interpolation=true;
 	length=1;
 }
 
@@ -2042,3 +2021,5 @@ Animation::~Animation() {
 		memdelete( tracks[i] );
 
 }
+
+
diff --git a/scene/resources/animation.h b/scene/resources/animation.h
index ee643c9678..6c8d7252aa 100644
--- a/scene/resources/animation.h
+++ b/scene/resources/animation.h
@@ -172,7 +172,6 @@ private:
 	float length;
 	float step;
 	bool loop;
-	bool loop_interpolation;
 
 // bind helpers
 private:
@@ -279,9 +278,7 @@ public:
 	float get_length() const;
 
 	void set_loop(bool p_enabled);
-	void set_loop_interpolation(bool p_enabled);
 	bool has_loop() const;
-	bool has_loop_interpolation() const;
 
 	void set_step(float p_step);
 	float get_step() const;
diff --git a/scene/resources/default_theme/background.png b/scene/resources/default_theme/background.png
index 1e4f198c0c..03cfab1de3 100644
--- a/scene/resources/default_theme/background.png
+++ b/scene/resources/default_theme/background.png
diff --git a/scene/resources/default_theme/base_green.png b/scene/resources/default_theme/base_green.png
index 9b270ccd23..d03d6f08d8 100644
--- a/scene/resources/default_theme/base_green.png
+++ b/scene/resources/default_theme/base_green.png
diff --git a/scene/resources/default_theme/button_disabled.png b/scene/resources/default_theme/button_disabled.png
index 6228c16e7f..d75e76989d 100644
--- a/scene/resources/default_theme/button_disabled.png
+++ b/scene/resources/default_theme/button_disabled.png
diff --git a/scene/resources/default_theme/button_focus.png b/scene/resources/default_theme/button_focus.png
index 52af26483e..44e354be95 100644
--- a/scene/resources/default_theme/button_focus.png
+++ b/scene/resources/default_theme/button_focus.png
diff --git a/scene/resources/default_theme/button_hover.png b/scene/resources/default_theme/button_hover.png
index 3420e71b0b..6e609f435f 100644
--- a/scene/resources/default_theme/button_hover.png
+++ b/scene/resources/default_theme/button_hover.png
diff --git a/scene/resources/default_theme/button_normal.png b/scene/resources/default_theme/button_normal.png
index b949477fc3..92482aaf28 100644
--- a/scene/resources/default_theme/button_normal.png
+++ b/scene/resources/default_theme/button_normal.png
diff --git a/scene/resources/default_theme/button_pressed.png b/scene/resources/default_theme/button_pressed.png
index 2cdbc00f3d..4a807544ed 100644
--- a/scene/resources/default_theme/button_pressed.png
+++ b/scene/resources/default_theme/button_pressed.png
diff --git a/scene/resources/default_theme/checked.png b/scene/resources/default_theme/checked.png
index a2240c227f..93e291a29e 100644
--- a/scene/resources/default_theme/checked.png
+++ b/scene/resources/default_theme/checked.png
diff --git a/scene/resources/default_theme/checker_bg.png b/scene/resources/default_theme/checker_bg.png
index 0674f9da26..f58dfed29c 100644
--- a/scene/resources/default_theme/checker_bg.png
+++ b/scene/resources/default_theme/checker_bg.png
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index 53a186f0c3..7ed83f50f8 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -469,8 +469,10 @@ void fill_default_theme(Ref<Theme>& t,const Ref<Font> & default_font,const Ref<F
 
 	t->set_font("font","TextEdit", default_font );
 
+	t->set_color("completion_background_color", "TextEdit",Color::html("2C2A32"));
+	t->set_color("completion_selected_color", "TextEdit",Color::html("434244"));
+	t->set_color("completion_existing_color", "TextEdit",Color::html("21dfdfdf"));
 	t->set_color("completion_scroll_color","TextEdit", control_font_color_pressed );
-	t->set_color("completion_existing","TextEdit", control_font_color );
 	t->set_color("font_color","TextEdit", control_font_color );
 	t->set_color("font_color_selected","TextEdit", Color(0,0,0) );
 	t->set_color("selection_color","TextEdit", font_color_selection );
@@ -696,12 +698,6 @@ void fill_default_theme(Ref<Theme>& t,const Ref<Font> & default_font,const Ref<F
 	t->set_stylebox("cursor_unfocused","ItemList", focus );
 
 
-	// TextEdit
-
-	t->set_stylebox("completion_selected","TextEdit", tree_selected );
-
-
-
 	// TabContainer
 
 	Ref<StyleBoxTexture> tc_sb = sb_expand( make_stylebox( tab_container_bg_png,4,4,4,4,4,4,4,4),3,3,3,3);
diff --git a/scene/resources/default_theme/dosfont.png b/scene/resources/default_theme/dosfont.png
index 1507e7e64e..814d2e9060 100644
--- a/scene/resources/default_theme/dosfont.png
+++ b/scene/resources/default_theme/dosfont.png
diff --git a/scene/resources/default_theme/dropdown.png b/scene/resources/default_theme/dropdown.png
index 72fc5d73a3..3a6a2ed778 100644
--- a/scene/resources/default_theme/dropdown.png
+++ b/scene/resources/default_theme/dropdown.png
diff --git a/scene/resources/default_theme/error_icon.png b/scene/resources/default_theme/error_icon.png
index f632ca6405..f291362350 100644
--- a/scene/resources/default_theme/error_icon.png
+++ b/scene/resources/default_theme/error_icon.png
diff --git a/scene/resources/default_theme/focus.png b/scene/resources/default_theme/focus.png
index fb1052bd79..5d37028f2d 100644
--- a/scene/resources/default_theme/focus.png
+++ b/scene/resources/default_theme/focus.png
diff --git a/scene/resources/default_theme/frame_focus.png b/scene/resources/default_theme/frame_focus.png
index 0df195d83e..9170db38ed 100644
--- a/scene/resources/default_theme/frame_focus.png
+++ b/scene/resources/default_theme/frame_focus.png
diff --git a/scene/resources/default_theme/full_panel_bg.png b/scene/resources/default_theme/full_panel_bg.png
index 771e50e2af..7f02dc7259 100644
--- a/scene/resources/default_theme/full_panel_bg.png
+++ b/scene/resources/default_theme/full_panel_bg.png
diff --git a/scene/resources/default_theme/graph_node.png b/scene/resources/default_theme/graph_node.png
index 3adccf2c3b..5eea134b25 100644
--- a/scene/resources/default_theme/graph_node.png
+++ b/scene/resources/default_theme/graph_node.png
diff --git a/scene/resources/default_theme/graph_node_default.png b/scene/resources/default_theme/graph_node_default.png
index ea6ec52828..e3a220301f 100644
--- a/scene/resources/default_theme/graph_node_default.png
+++ b/scene/resources/default_theme/graph_node_default.png
diff --git a/scene/resources/default_theme/graph_node_default_focus.png b/scene/resources/default_theme/graph_node_default_focus.png
index b7c38ae481..9972b07593 100644
--- a/scene/resources/default_theme/graph_node_default_focus.png
+++ b/scene/resources/default_theme/graph_node_default_focus.png
diff --git a/scene/resources/default_theme/graph_node_selected.png b/scene/resources/default_theme/graph_node_selected.png
index 06a9db4409..22fdc7e89f 100644
--- a/scene/resources/default_theme/graph_node_selected.png
+++ b/scene/resources/default_theme/graph_node_selected.png
diff --git a/scene/resources/default_theme/graph_port.png b/scene/resources/default_theme/graph_port.png
index 92f425f977..445e8548ce 100644
--- a/scene/resources/default_theme/graph_port.png
+++ b/scene/resources/default_theme/graph_port.png
diff --git a/scene/resources/default_theme/hseparator.png b/scene/resources/default_theme/hseparator.png
index 9f80dd4f41..99609ac118 100644
--- a/scene/resources/default_theme/hseparator.png
+++ b/scene/resources/default_theme/hseparator.png
diff --git a/scene/resources/default_theme/hslider_bg.png b/scene/resources/default_theme/hslider_bg.png
index 701c1d43b5..9c2a2df62a 100644
--- a/scene/resources/default_theme/hslider_bg.png
+++ b/scene/resources/default_theme/hslider_bg.png
diff --git a/scene/resources/default_theme/hslider_grabber.png b/scene/resources/default_theme/hslider_grabber.png
index 343d247bc5..2acd33879a 100644
--- a/scene/resources/default_theme/hslider_grabber.png
+++ b/scene/resources/default_theme/hslider_grabber.png
diff --git a/scene/resources/default_theme/hslider_grabber_hl.png b/scene/resources/default_theme/hslider_grabber_hl.png
index f0ba7dd212..f8a011e64b 100644
--- a/scene/resources/default_theme/hslider_grabber_hl.png
+++ b/scene/resources/default_theme/hslider_grabber_hl.png
diff --git a/scene/resources/default_theme/hslider_tick.png b/scene/resources/default_theme/hslider_tick.png
index e8e18b5402..f7afd78529 100644
--- a/scene/resources/default_theme/hslider_tick.png
+++ b/scene/resources/default_theme/hslider_tick.png
diff --git a/scene/resources/default_theme/hsplit_bg.png b/scene/resources/default_theme/hsplit_bg.png
index 34033289d0..7dd1d48b29 100644
--- a/scene/resources/default_theme/hsplit_bg.png
+++ b/scene/resources/default_theme/hsplit_bg.png
diff --git a/scene/resources/default_theme/hsplitter.png b/scene/resources/default_theme/hsplitter.png
index 4173dc02e7..71a3914d7e 100644
--- a/scene/resources/default_theme/hsplitter.png
+++ b/scene/resources/default_theme/hsplitter.png
diff --git a/scene/resources/default_theme/icon_stop.png b/scene/resources/default_theme/icon_stop.png
index b0fd5caa83..1f194d0e14 100644
--- a/scene/resources/default_theme/icon_stop.png
+++ b/scene/resources/default_theme/icon_stop.png
diff --git a/scene/resources/default_theme/line_edit.png b/scene/resources/default_theme/line_edit.png
index 85f7dd2bb4..bf2b91f1be 100644
--- a/scene/resources/default_theme/line_edit.png
+++ b/scene/resources/default_theme/line_edit.png
diff --git a/scene/resources/default_theme/line_edit_disabled.png b/scene/resources/default_theme/line_edit_disabled.png
index fe3b0681f6..a0fa505e4c 100644
--- a/scene/resources/default_theme/line_edit_disabled.png
+++ b/scene/resources/default_theme/line_edit_disabled.png
diff --git a/scene/resources/default_theme/line_edit_focus.png b/scene/resources/default_theme/line_edit_focus.png
index 41565a1d79..e66d7b60e3 100644
--- a/scene/resources/default_theme/line_edit_focus.png
+++ b/scene/resources/default_theme/line_edit_focus.png
diff --git a/scene/resources/default_theme/logo.png b/scene/resources/default_theme/logo.png
index a837c8009a..2161402438 100644
--- a/scene/resources/default_theme/logo.png
+++ b/scene/resources/default_theme/logo.png
diff --git a/scene/resources/default_theme/option_button_disabled.png b/scene/resources/default_theme/option_button_disabled.png
index 839f555c3a..ce727d56e1 100644
--- a/scene/resources/default_theme/option_button_disabled.png
+++ b/scene/resources/default_theme/option_button_disabled.png
diff --git a/scene/resources/default_theme/option_button_focus.png b/scene/resources/default_theme/option_button_focus.png
index bea1d17e71..c76d91287e 100644
--- a/scene/resources/default_theme/option_button_focus.png
+++ b/scene/resources/default_theme/option_button_focus.png
diff --git a/scene/resources/default_theme/option_button_hover.png b/scene/resources/default_theme/option_button_hover.png
index a10d0a3753..fd1e987ceb 100644
--- a/scene/resources/default_theme/option_button_hover.png
+++ b/scene/resources/default_theme/option_button_hover.png
diff --git a/scene/resources/default_theme/option_button_normal.png b/scene/resources/default_theme/option_button_normal.png
index cc0aa6a00f..9d7fb98d1c 100644
--- a/scene/resources/default_theme/option_button_normal.png
+++ b/scene/resources/default_theme/option_button_normal.png
diff --git a/scene/resources/default_theme/option_button_pressed.png b/scene/resources/default_theme/option_button_pressed.png
index cf42608e72..28b1d93468 100644
--- a/scene/resources/default_theme/option_button_pressed.png
+++ b/scene/resources/default_theme/option_button_pressed.png
diff --git a/scene/resources/default_theme/panel_bg.png b/scene/resources/default_theme/panel_bg.png
index cc25600ebd..320819ad6d 100644
--- a/scene/resources/default_theme/panel_bg.png
+++ b/scene/resources/default_theme/panel_bg.png
diff --git a/scene/resources/default_theme/popup_bg.png b/scene/resources/default_theme/popup_bg.png
index 3dac534ec6..63f5994441 100644
--- a/scene/resources/default_theme/popup_bg.png
+++ b/scene/resources/default_theme/popup_bg.png
diff --git a/scene/resources/default_theme/popup_bg_disabled.png b/scene/resources/default_theme/popup_bg_disabled.png
index d2245e071b..611d949380 100644
--- a/scene/resources/default_theme/popup_bg_disabled.png
+++ b/scene/resources/default_theme/popup_bg_disabled.png
diff --git a/scene/resources/default_theme/popup_hover.png b/scene/resources/default_theme/popup_hover.png
index de2bba3bb2..85d4e48475 100644
--- a/scene/resources/default_theme/popup_hover.png
+++ b/scene/resources/default_theme/popup_hover.png
diff --git a/scene/resources/default_theme/popup_unchecked.png b/scene/resources/default_theme/popup_unchecked.png
index 88dfe19dcf..c1137e6fbf 100644
--- a/scene/resources/default_theme/popup_unchecked.png
+++ b/scene/resources/default_theme/popup_unchecked.png
diff --git a/scene/resources/default_theme/popup_window.png b/scene/resources/default_theme/popup_window.png
index c897ada988..59362a8ffd 100644
--- a/scene/resources/default_theme/popup_window.png
+++ b/scene/resources/default_theme/popup_window.png
diff --git a/scene/resources/default_theme/progress_bar.png b/scene/resources/default_theme/progress_bar.png
index 3016c52216..bf81e3adea 100644
--- a/scene/resources/default_theme/progress_bar.png
+++ b/scene/resources/default_theme/progress_bar.png
diff --git a/scene/resources/default_theme/progress_fill.png b/scene/resources/default_theme/progress_fill.png
index ee7c3315e4..3a34dfdda6 100644
--- a/scene/resources/default_theme/progress_fill.png
+++ b/scene/resources/default_theme/progress_fill.png
diff --git a/scene/resources/default_theme/radio_checked.png b/scene/resources/default_theme/radio_checked.png
index ada8dde3c1..95d472022f 100644
--- a/scene/resources/default_theme/radio_checked.png
+++ b/scene/resources/default_theme/radio_checked.png
diff --git a/scene/resources/default_theme/radio_unchecked.png b/scene/resources/default_theme/radio_unchecked.png
index 018af99afd..7f0535c3a4 100644
--- a/scene/resources/default_theme/radio_unchecked.png
+++ b/scene/resources/default_theme/radio_unchecked.png
diff --git a/scene/resources/default_theme/reference_border.png b/scene/resources/default_theme/reference_border.png
index f9dcfc7a4d..96219676bf 100644
--- a/scene/resources/default_theme/reference_border.png
+++ b/scene/resources/default_theme/reference_border.png
diff --git a/scene/resources/default_theme/scroll_bg.png b/scene/resources/default_theme/scroll_bg.png
index e1e419d663..cefadb2c08 100644
--- a/scene/resources/default_theme/scroll_bg.png
+++ b/scene/resources/default_theme/scroll_bg.png
diff --git a/scene/resources/default_theme/scroll_button_down.png b/scene/resources/default_theme/scroll_button_down.png
index 88b218f581..caeac9b286 100644
--- a/scene/resources/default_theme/scroll_button_down.png
+++ b/scene/resources/default_theme/scroll_button_down.png
diff --git a/scene/resources/default_theme/scroll_button_down_hl.png b/scene/resources/default_theme/scroll_button_down_hl.png
index 90b1a48ac8..48036e0297 100644
--- a/scene/resources/default_theme/scroll_button_down_hl.png
+++ b/scene/resources/default_theme/scroll_button_down_hl.png
diff --git a/scene/resources/default_theme/scroll_button_left.png b/scene/resources/default_theme/scroll_button_left.png
index 8e60a96476..3b50938d97 100644
--- a/scene/resources/default_theme/scroll_button_left.png
+++ b/scene/resources/default_theme/scroll_button_left.png
diff --git a/scene/resources/default_theme/scroll_button_left_hl.png b/scene/resources/default_theme/scroll_button_left_hl.png
index 1114a92381..b3d348c24f 100644
--- a/scene/resources/default_theme/scroll_button_left_hl.png
+++ b/scene/resources/default_theme/scroll_button_left_hl.png
diff --git a/scene/resources/default_theme/scroll_button_right.png b/scene/resources/default_theme/scroll_button_right.png
index ee79c0aa56..1c622a41ad 100644
--- a/scene/resources/default_theme/scroll_button_right.png
+++ b/scene/resources/default_theme/scroll_button_right.png
diff --git a/scene/resources/default_theme/scroll_button_right_hl.png b/scene/resources/default_theme/scroll_button_right_hl.png
index b83e24a954..108796ca02 100644
--- a/scene/resources/default_theme/scroll_button_right_hl.png
+++ b/scene/resources/default_theme/scroll_button_right_hl.png
diff --git a/scene/resources/default_theme/scroll_button_up.png b/scene/resources/default_theme/scroll_button_up.png
index 251106b487..2c8238ae4c 100644
--- a/scene/resources/default_theme/scroll_button_up.png
+++ b/scene/resources/default_theme/scroll_button_up.png
diff --git a/scene/resources/default_theme/scroll_button_up_hl.png b/scene/resources/default_theme/scroll_button_up_hl.png
index 059b4b0f2b..4283bd114a 100644
--- a/scene/resources/default_theme/scroll_button_up_hl.png
+++ b/scene/resources/default_theme/scroll_button_up_hl.png
diff --git a/scene/resources/default_theme/scroll_grabber.png b/scene/resources/default_theme/scroll_grabber.png
index 3a193e5448..1d625a9b7b 100644
--- a/scene/resources/default_theme/scroll_grabber.png
+++ b/scene/resources/default_theme/scroll_grabber.png
diff --git a/scene/resources/default_theme/scroll_grabber_hl.png b/scene/resources/default_theme/scroll_grabber_hl.png
index 82c94c03c8..99eb24b7e7 100644
--- a/scene/resources/default_theme/scroll_grabber_hl.png
+++ b/scene/resources/default_theme/scroll_grabber_hl.png
diff --git a/scene/resources/default_theme/selection.png b/scene/resources/default_theme/selection.png
index 3b1c810c40..501877a8b4 100644
--- a/scene/resources/default_theme/selection.png
+++ b/scene/resources/default_theme/selection.png
diff --git a/scene/resources/default_theme/selection_oof.png b/scene/resources/default_theme/selection_oof.png
index e8680128cd..9594fe0913 100644
--- a/scene/resources/default_theme/selection_oof.png
+++ b/scene/resources/default_theme/selection_oof.png
diff --git a/scene/resources/default_theme/tab.png b/scene/resources/default_theme/tab.png
index b16903334c..3e4d792a48 100644
--- a/scene/resources/default_theme/tab.png
+++ b/scene/resources/default_theme/tab.png
diff --git a/scene/resources/default_theme/tab_behind.png b/scene/resources/default_theme/tab_behind.png
index e872446162..12f07c3a91 100644
--- a/scene/resources/default_theme/tab_behind.png
+++ b/scene/resources/default_theme/tab_behind.png
diff --git a/scene/resources/default_theme/tab_container_bg.png b/scene/resources/default_theme/tab_container_bg.png
index 6b713f76b2..92482aaf28 100644
--- a/scene/resources/default_theme/tab_container_bg.png
+++ b/scene/resources/default_theme/tab_container_bg.png
diff --git a/scene/resources/default_theme/tab_current.png b/scene/resources/default_theme/tab_current.png
index b18dd88183..7289e032da 100644
--- a/scene/resources/default_theme/tab_current.png
+++ b/scene/resources/default_theme/tab_current.png
diff --git a/scene/resources/default_theme/theme_data.h b/scene/resources/default_theme/theme_data.h
index 80148c0fc5..ab758f72b4 100644
--- a/scene/resources/default_theme/theme_data.h
+++ b/scene/resources/default_theme/theme_data.h
@@ -5,527 +5,527 @@
 
 
 static const unsigned char arrow_down_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x8,0x6,0x0,0x0,0x0,0x56,0x75,0x5c,0xe7,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x6d,0x49,0x44,0x41,0x54,0x28,0x91,0x63,0x60,0x18,0x74,0x80,0x11,0xc6,0x78,0xf0,0xe0,0xc1,0x7f,0x7c,0xa,0x15,0x14,0x14,0x18,0x19,0x18,0x18,0x18,0x98,0x48,0xb5,0x81,0x7c,0xd,0x8c,0x8c,0x8c,0xf1,0xc,0xc,0xc,0x5f,0xb1,0xa8,0xf9,0xce,0xc8,0xc8,0x98,0xe,0x57,0x87,0x2c,0x73,0xff,0xfe,0x7d,0xd,0x6,0x6,0x86,0x55,0x8c,0x8c,0x8c,0xba,0x50,0xa1,0x1b,0xcc,0xcc,0xcc,0x61,0xb2,0xb2,0xb2,0x97,0xb1,0x6a,0x60,0x60,0x60,0x60,0x78,0xf1,0xe2,0x5,0xf7,0xcf,0x9f,0x3f,0xa7,0x30,0x30,0x30,0x30,0xb0,0xb3,0xb3,0xe7,0x48,0x48,0x48,0x60,0xb3,0x75,0x30,0x1,0x0,0x28,0x20,0x14,0xc2,0x1b,0xd0,0x7c,0xca,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x8,0x4,0x0,0x0,0x0,0xfc,0x7c,0x94,0x6c,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x0,0x4a,0x49,0x44,0x41,0x54,0x18,0xd3,0x63,0x60,0xa0,0x1a,0x60,0x64,0x60,0x60,0x60,0x78,0xf0,0x1f,0x55,0x50,0x81,0x91,0x81,0x81,0x9,0x97,0xe,0xfc,0x12,0x8c,0xf1,0xc,0x5f,0xe1,0x22,0xdf,0x19,0xd3,0x91,0xe4,0xef,0x6b,0xdc,0xbf,0xf4,0xe0,0xff,0x83,0xff,0xf,0xae,0x3f,0xd6,0x45,0xb2,0x9c,0x81,0x81,0x81,0xe1,0x5,0xf7,0xcf,0x29,0xc,0xc,0xec,0x39,0x12,0x5f,0x19,0xa8,0xd,0x0,0x99,0x85,0x11,0xfa,0x28,0xbe,0xff,0xef,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xba,0x84,0x14,0xff,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xcb,0xd9,0xac,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char arrow_right_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x8,0x6,0x0,0x0,0x0,0x56,0x75,0x5c,0xe7,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x6c,0x49,0x44,0x41,0x54,0x28,0x91,0x63,0x60,0xa0,0x35,0x60,0x44,0xe6,0x3c,0x78,0xf0,0xe0,0x3f,0x8c,0xfd,0xff,0xff,0xff,0x44,0x45,0x45,0xc5,0x5,0xe8,0x1a,0x98,0x70,0x9a,0xc4,0xc8,0x38,0xe5,0xe1,0xc3,0x87,0xda,0x44,0x6b,0x60,0x60,0x60,0xe0,0xfe,0xff,0xff,0xff,0xaa,0x17,0x2f,0x5e,0x70,0x13,0xab,0x81,0x81,0x81,0x81,0x41,0xeb,0xe7,0xcf,0x9f,0x53,0x48,0xd1,0x80,0x1,0x8,0x69,0xb8,0xc6,0xce,0xce,0x9e,0x43,0xac,0x86,0xaf,0x8c,0x8c,0x8c,0x61,0x12,0x12,0x12,0x5f,0x89,0xd2,0xf0,0xff,0xff,0xff,0x1c,0x79,0x79,0xf9,0xab,0x84,0x1d,0x49,0x6d,0x0,0x0,0x8f,0x30,0x1e,0x10,0x6e,0x79,0xda,0xf9,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x8,0x4,0x0,0x0,0x0,0xfc,0x7c,0x94,0x6c,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x4e,0x49,0x44,0x41,0x54,0x18,0xd3,0x63,0x60,0x20,0x13,0x3c,0xf8,0xff,0xe0,0xff,0x83,0xff,0xf7,0x13,0x10,0x22,0x8c,0x30,0x9,0x6,0x6,0x6,0x6,0x86,0xaf,0x8c,0xe6,0xf2,0x57,0x21,0x22,0x4c,0x28,0x1a,0xb9,0xff,0xaf,0x7a,0xc1,0x8d,0x4d,0x82,0x81,0x41,0xeb,0xe7,0x14,0xec,0x12,0x70,0x80,0x2e,0x71,0x8d,0x3d,0x7,0x9b,0xc4,0x57,0xc6,0x30,0x89,0xaf,0x58,0x24,0xfe,0xe7,0xc0,0xdc,0x44,0xe,0x0,0x0,0xa0,0xe1,0x15,0x49,0x2,0x9f,0xab,0x0,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xba,0x84,0x14,0xff,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xcb,0xd9,0xac,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char background_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x20,0x8,0x2,0x0,0x0,0x0,0xfc,0x18,0xed,0xa3,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdb,0x3,0x1d,0x2,0x11,0x1,0x76,0xa4,0x74,0x36,0x0,0x0,0x2,0xec,0x49,0x44,0x41,0x54,0x48,0xc7,0x75,0x96,0x5b,0x92,0xdd,0x20,0x10,0x43,0x25,0x97,0xf7,0x5f,0x95,0x75,0x64,0x25,0xd9,0x14,0x27,0x1f,0xfd,0xc4,0x93,0xcc,0xcf,0xf5,0x60,0xc,0x6a,0x21,0xa9,0xf1,0xaf,0x3f,0xbf,0x91,0x2c,0x49,0x8a,0x7,0x74,0xfd,0xf5,0x88,0x6b,0xe4,0x9e,0xd0,0x5f,0xe7,0xcc,0xcf,0xa,0xf,0x92,0x10,0x31,0xca,0x77,0xf5,0x6b,0x81,0x7b,0x75,0xc7,0x23,0xf9,0x6b,0x4,0xfc,0xd8,0x5e,0x2f,0xac,0xf,0xec,0x9e,0xe1,0x81,0xcd,0xc1,0x1b,0x57,0xc1,0x2c,0xc4,0x2e,0x64,0xb6,0x28,0x3c,0x46,0x32,0xe8,0xcd,0xd2,0x48,0x10,0xcd,0x16,0xf1,0x40,0x6d,0x92,0x3f,0xc8,0xb1,0xa4,0x6,0x6,0x51,0x88,0x75,0x14,0xfb,0x21,0x44,0x80,0xe5,0x8d,0xff,0x64,0xc3,0xe6,0x39,0x20,0x66,0x55,0x1,0x8b,0x29,0xe1,0x43,0x9b,0x64,0xd3,0x83,0x68,0x31,0xe1,0x47,0x12,0x32,0xa7,0x18,0x8,0x62,0x83,0xcd,0x23,0xe0,0x9c,0x5e,0x54,0xc8,0x41,0x7a,0xfe,0x47,0xcd,0xfe,0x6c,0x19,0x6f,0x40,0xd2,0x9b,0x93,0x2c,0x23,0x6c,0x3b,0x56,0x8f,0x23,0xa0,0xf8,0xb3,0xb2,0x46,0xe3,0x85,0xb8,0x25,0x83,0x8b,0x63,0x7b,0x3e,0xb4,0xc4,0x93,0x5c,0x1f,0x21,0xeb,0xc0,0x3e,0xca,0x54,0x8a,0x75,0x28,0x81,0xd5,0x4f,0xaf,0x1e,0x1b,0x42,0xbd,0xa2,0x4,0x9,0x2,0xf9,0x5,0xf2,0xd0,0x92,0xe9,0x5,0x9a,0xa9,0xc3,0x45,0x51,0xcc,0xc0,0x55,0xa3,0xb9,0x46,0x73,0xdf,0x78,0xed,0x3a,0x64,0x73,0xd9,0xa8,0x75,0xdd,0x4a,0x17,0x2d,0x9f,0xc0,0xe3,0xa6,0xb1,0xa,0x72,0x15,0x93,0x9c,0x9f,0x24,0xfd,0xa9,0xaa,0xa8,0xda,0xe2,0x18,0x4d,0x2c,0xb2,0x9c,0x43,0x4c,0x32,0x42,0xa7,0xbe,0x48,0x8b,0xd6,0x88,0x6e,0x8a,0x31,0xaf,0xb0,0x4d,0xbb,0x8b,0xf2,0x8f,0x48,0x49,0xb7,0x29,0xa0,0xad,0x84,0x4f,0x1d,0x41,0x1b,0x4b,0x1f,0x1d,0xe6,0xd8,0xdb,0x4c,0x38,0xca,0xbf,0xf2,0xa2,0x15,0x56,0xc8,0x96,0x8,0xd6,0xac,0xa0,0x2c,0xf5,0x27,0xd7,0x11,0x21,0x49,0x4f,0x9e,0x14,0x3a,0x27,0x56,0x6c,0x1c,0x8b,0xa2,0xf6,0x73,0x81,0xd1,0x5,0x21,0x9,0xca,0x4d,0x4f,0x3a,0x39,0x7d,0xb0,0x3,0xa,0x1a,0x99,0x57,0xe6,0xa4,0xfe,0xb2,0xc8,0xca,0x93,0x11,0x12,0x2b,0x5e,0xfc,0x75,0xfa,0x5b,0xce,0xae,0x34,0xc8,0xc7,0x96,0xfd,0xe,0xeb,0xe6,0x87,0x42,0xaa,0x51,0x78,0x32,0x51,0xf1,0x77,0xf2,0xb3,0x57,0x85,0xd1,0x91,0x8f,0x9d,0x8d,0x6e,0x72,0x66,0xeb,0x9d,0x54,0x43,0xa5,0xdb,0x3f,0x2c,0x5b,0x27,0x92,0x37,0xb0,0xa4,0x5e,0xb8,0x54,0xf9,0x69,0x1f,0x59,0x58,0xeb,0xc0,0xdb,0x36,0x9b,0xaa,0x55,0xba,0x83,0xa2,0x7f,0x35,0xaa,0x6b,0x90,0xb5,0x4,0xff,0x7b,0xbb,0x92,0x69,0x4d,0x78,0xda,0x2c,0xdc,0x5f,0x8e,0x89,0x76,0x34,0xd5,0x92,0x48,0x9c,0xd9,0x80,0xea,0x58,0x5c,0x38,0xc9,0x86,0x83,0x3f,0x53,0xe3,0xc9,0x5c,0x95,0xed,0x76,0xea,0x32,0x59,0x7b,0xc7,0xeb,0x65,0x63,0xb5,0xa4,0x47,0xec,0x3,0x6b,0xe0,0xbe,0x3a,0x43,0x1e,0xe1,0x50,0x7c,0x3a,0x47,0x65,0x28,0x3d,0x70,0x69,0x3d,0xb2,0xe4,0xcd,0x14,0x5b,0xd2,0xa9,0x7a,0x9d,0x5d,0xad,0x4f,0xb4,0xf2,0xcf,0xa1,0xc4,0x89,0xc3,0x6e,0xd0,0xa5,0x1,0x67,0xc8,0xa,0x55,0xcb,0x8c,0x96,0xd2,0x12,0xf4,0xf4,0x9c,0xe8,0x62,0xf9,0xb1,0xab,0x28,0x5b,0xa7,0xa9,0xea,0xa8,0xe8,0xad,0x26,0xe7,0x5f,0x6d,0x4f,0x6a,0x29,0x31,0x1d,0xe0,0x4a,0xc,0x4f,0x2,0x6a,0x96,0xcd,0x5e,0x70,0xe5,0x5c,0x4b,0x3a,0xee,0x45,0xc8,0x47,0x95,0x33,0x70,0xb2,0xc1,0x39,0x52,0x33,0x85,0x61,0xd,0xc2,0x8a,0x8b,0xe3,0x4a,0x14,0x2f,0x27,0xc7,0x4,0xf7,0x65,0xeb,0x5d,0xea,0x66,0x9d,0x6b,0x70,0xb4,0x2c,0x69,0x76,0x6e,0x4c,0xb6,0x66,0x80,0x97,0x1a,0xbc,0xe3,0x5a,0x12,0x8f,0x56,0xd3,0xd8,0x89,0x6c,0xad,0x9c,0x83,0xb8,0x76,0x24,0x94,0xe9,0x35,0xd5,0x83,0xc8,0x9c,0x61,0x14,0xe8,0x28,0xe8,0x9d,0xe,0xb3,0x63,0xa2,0x8a,0x34,0xd3,0x8c,0x62,0xf9,0x89,0x4e,0x3e,0xf6,0xed,0xb6,0xb4,0x8c,0x27,0x3f,0xa5,0x10,0xe6,0x1a,0xd1,0x35,0x52,0x12,0xad,0xab,0x3,0xf7,0x7d,0x75,0x1b,0x2a,0xd,0xc6,0x88,0x36,0x1e,0x5f,0xee,0xe,0xb6,0xfb,0xb6,0x53,0x51,0x6c,0x81,0xfc,0xe8,0xd4,0xac,0x48,0xcc,0x86,0x91,0x1c,0xd9,0xc0,0xa3,0xca,0x68,0x8d,0x3,0xeb,0x56,0x71,0xfa,0x8e,0xe6,0xb9,0xfb,0x54,0xb5,0x73,0xb7,0xcb,0x5b,0x9,0x75,0x36,0x75,0x31,0x4,0xe3,0xbf,0xeb,0x1,0x1c,0xbe,0x5c,0x3b,0x28,0xc0,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x20,0x8,0x3,0x0,0x0,0x0,0x44,0xa4,0x8a,0xc6,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x1,0x11,0x50,0x4c,0x54,0x45,0x91,0xc9,0xab,0x90,0xc9,0xab,0x90,0xc9,0xaa,0x90,0xc8,0xab,0x91,0xc9,0xaa,0x91,0xc8,0xab,0x90,0xc8,0xaa,0x8f,0xc8,0xab,0x8f,0xc9,0xab,0x8f,0xc8,0xaa,0x90,0xc7,0xaa,0x90,0xc7,0xab,0x8f,0xc7,0xaa,0x8f,0xc7,0xab,0x8e,0xc7,0xab,0x8e,0xc6,0xab,0x8f,0xc6,0xab,0x8e,0xc6,0xaa,0x8f,0xc6,0xaa,0x8e,0xc7,0xaa,0x8e,0xc5,0xaa,0x8e,0xc5,0xab,0x8d,0xc5,0xaa,0x8d,0xc5,0xab,0x8d,0xc6,0xaa,0x8d,0xc6,0xab,0x8d,0xc4,0xaa,0x8e,0xc4,0xab,0x8d,0xc4,0xab,0x8e,0xc4,0xaa,0x8c,0xc4,0xaa,0x8c,0xc5,0xaa,0x8d,0xc3,0xab,0x8d,0xc3,0xaa,0x8c,0xc3,0xaa,0x8c,0xc4,0xab,0x8c,0xc3,0xab,0x8c,0xc2,0xab,0x8b,0xc2,0xaa,0x8b,0xc3,0xaa,0x8b,0xc3,0xab,0x8c,0xc2,0xaa,0x8b,0xc2,0xab,0x8b,0xc1,0xaa,0x8b,0xc1,0xab,0x8a,0xc2,0xaa,0x8a,0xc1,0xaa,0x8a,0xc0,0xaa,0x8b,0xc0,0xaa,0x8a,0xc1,0xa9,0x8a,0xc0,0xa9,0x89,0xc0,0xaa,0x8a,0xbf,0xaa,0x89,0xbf,0xaa,0x89,0xbf,0xa9,0x8a,0xbf,0xa9,0x88,0xbf,0xaa,0x89,0xbe,0xaa,0x89,0xbe,0xa9,0x88,0xbf,0xa9,0x88,0xbe,0xa9,0x88,0xbe,0xaa,0x88,0xbd,0xaa,0x88,0xbd,0xa9,0x89,0xbd,0xaa,0x89,0xbd,0xa9,0x87,0xbe,0xa9,0x87,0xbd,0xaa,0x87,0xbe,0xaa,0x87,0xbd,0xa9,0x87,0xbc,0xaa,0x88,0xbc,0xa9,0x88,0xbc,0xaa,0x87,0xbc,0xa9,0x86,0xbc,0xa9,0x87,0xbb,0xaa,0x87,0xbb,0xa9,0x86,0xbb,0xa9,0x86,0xbc,0xaa,0x86,0xbb,0xaa,0x86,0xba,0xaa,0x86,0xba,0xa9,0x85,0xba,0xa9,0x85,0xbb,0xaa,0x85,0xbb,0xa9,0x85,0xba,0xaa,0x85,0xb9,0xa9,0x86,0xb9,0xa9,0x86,0xb9,0xaa,0x85,0xb9,0xaa,0xff,0xff,0xff,0x25,0xe,0xc5,0xe1,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x5a,0x3,0xbb,0xa5,0xa2,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x2,0xaa,0x49,0x44,0x41,0x54,0x38,0xcb,0x45,0x4b,0xd,0x63,0x9a,0x56,0x14,0xbd,0x86,0x2d,0x24,0x2b,0xf8,0x8a,0x1,0xcc,0x18,0x23,0xcd,0x8b,0xc5,0x2a,0xa9,0x6e,0x51,0x98,0x58,0x3e,0xda,0x52,0x69,0x9e,0x4a,0x10,0xba,0xb8,0xec,0xff,0xff,0x91,0x9d,0x47,0xd2,0xf5,0xbc,0xcb,0x3d,0x1f,0xf7,0x40,0xd4,0x23,0x4c,0x4f,0x2,0x9b,0xa8,0x93,0x27,0x9d,0xa3,0xe7,0x50,0xe9,0xc9,0x79,0x69,0x74,0xf7,0x9f,0x7a,0x8a,0xd2,0xfb,0xf9,0xf4,0x25,0x53,0xd5,0x33,0xf4,0xcf,0xce,0x90,0x9d,0xa8,0xa,0x80,0x75,0xaa,0xc8,0xca,0xa9,0xa2,0x9c,0xf4,0x54,0x52,0x91,0x9c,0xab,0x2a,0x46,0x42,0xf9,0xe5,0xb4,0x2b,0xa9,0xe7,0xca,0xab,0x57,0xc8,0x15,0x8d,0x74,0x4d,0xd5,0x25,0x40,0x8a,0xae,0xea,0xda,0xb9,0xd6,0x59,0x55,0x12,0xfe,0xd0,0x49,0xef,0xb3,0xbe,0xfe,0x5a,0x37,0x34,0x66,0x30,0x5d,0xd3,0xfb,0xfa,0x80,0x69,0x3,0x7d,0x70,0xd1,0xd5,0xfa,0x9a,0x4e,0x3,0xe3,0x62,0xd0,0xd7,0xd,0xd6,0x37,0x98,0xd1,0xef,0xf,0xc0,0x9a,0xc1,0x2e,0xc,0xc6,0x2e,0xd8,0xeb,0x1,0x86,0x98,0x61,0x32,0x13,0x7f,0x33,0x66,0x49,0x36,0xba,0x41,0x68,0x18,0xdd,0x66,0x64,0x5b,0x96,0x69,0x59,0x90,0xd6,0xf0,0x72,0x68,0x9a,0x43,0xd3,0xfa,0xd5,0x32,0x2f,0x6d,0xe3,0xd2,0xb2,0x98,0x65,0x30,0x93,0x1c,0x7b,0x88,0x67,0xdb,0xa6,0xd,0x72,0x7e,0x1b,0xba,0xa8,0xc0,0xda,0xbf,0xf,0x91,0xba,0xb6,0x4b,0x8e,0xe7,0x78,0xee,0xd0,0x75,0x87,0x1e,0xac,0xe3,0x60,0x5f,0x39,0x57,0xe,0x84,0xe7,0xd8,0xb6,0x63,0x5f,0xd1,0x1b,0xe7,0x9a,0xcb,0x92,0xe7,0xba,0xae,0xe7,0xf0,0x1b,0xc7,0xb9,0x76,0x3c,0x8e,0xb3,0x87,0x16,0xbf,0xf1,0x88,0x73,0xee,0x8c,0x46,0xd8,0xd7,0x7c,0xe4,0xf1,0xef,0x18,0x79,0x37,0x9c,0x7b,0x6f,0xbc,0x11,0x27,0xfe,0xd6,0xf7,0xf9,0x98,0xf3,0x77,0x13,0xfe,0x96,0x8f,0xb8,0x3f,0x96,0x65,0x9f,0x4f,0x38,0x1f,0x4f,0xf8,0x68,0xc2,0xc9,0x7f,0xc6,0x74,0xea,0x73,0x49,0x13,0xcc,0x78,0xe2,0xfb,0x13,0x59,0xf2,0xdf,0xf9,0x63,0xa,0xa6,0xfe,0x34,0xf0,0xf1,0xba,0xe9,0x20,0x39,0xf0,0x6f,0x83,0xdb,0x69,0x10,0x4c,0x29,0x78,0x3f,0xb,0x50,0x91,0xe7,0xc0,0x9f,0x61,0xdd,0x6,0xb3,0xd9,0xcc,0xf7,0xdf,0x83,0xe0,0x2,0x9a,0xcd,0x67,0xcf,0x98,0x77,0xea,0xf,0x29,0xe4,0xfc,0x9,0x13,0x40,0xd0,0x1c,0x87,0x1f,0xb8,0x93,0xab,0xb,0xee,0x5e,0x62,0x5a,0x2c,0xe7,0x21,0x78,0xb9,0x58,0x2e,0xb1,0xd1,0xb8,0x5b,0x84,0x4b,0xd8,0xf9,0x7c,0x81,0xef,0x2e,0xa4,0xc5,0x22,0xc,0x97,0x61,0x18,0x85,0x12,0x51,0x4,0x5e,0x46,0x61,0xf4,0x97,0x74,0xb,0xb9,0xa8,0x3b,0xad,0xe2,0x38,0xa,0xd7,0xab,0x28,0x4,0x85,0x1f,0xe2,0x10,0x1c,0xc5,0xe1,0x2a,0x5c,0x25,0x2b,0x4a,0xe3,0x38,0x49,0x93,0x24,0x4d,0xe3,0x34,0x4e,0xe2,0x68,0xd,0x1f,0xad,0x93,0x24,0x59,0x23,0xfa,0xb0,0x4e,0x53,0xca,0xf2,0x2c,0xfb,0xf8,0xf1,0x13,0x6c,0x92,0x42,0xa7,0x49,0x9e,0xe6,0x69,0x92,0x49,0xd3,0x65,0x94,0x7d,0xce,0xb2,0x2c,0xc9,0xd2,0xa2,0xf8,0x92,0xe7,0x59,0x51,0xc0,0x7d,0xce,0xb,0xc8,0x1c,0xc8,0x36,0x5,0x95,0x5f,0xb3,0x72,0x53,0x66,0xf7,0x5f,0x37,0x70,0xf7,0x79,0x51,0x88,0xfb,0x12,0x3d,0x91,0xdd,0x8b,0x4d,0x99,0x8b,0x92,0x44,0x59,0xa,0x51,0x8a,0x72,0xb,0x2e,0x37,0x2,0x1a,0xa2,0x0,0x8b,0xd,0x62,0x21,0x48,0xec,0x76,0x7b,0x21,0xaa,0x52,0xec,0xb6,0xa2,0xaa,0xb6,0xf,0xfb,0x7d,0x2d,0xc4,0xf6,0xa1,0x7a,0x10,0xdb,0x9d,0x28,0x77,0x15,0x55,0xbb,0xba,0x92,0xd8,0x57,0xbb,0xaa,0xaa,0xeb,0x7d,0x2d,0xed,0xff,0xdf,0xbe,0xa6,0x43,0xd5,0x34,0x75,0xd3,0x54,0xcd,0xa1,0xaa,0xf,0x75,0x83,0xbc,0xae,0x5a,0xb4,0x64,0xf6,0xd,0x1d,0x6a,0x25,0x9a,0xa6,0x6d,0xab,0x43,0x3,0xfc,0x2d,0x57,0x8b,0xf7,0xf8,0xd8,0xb4,0x87,0xb6,0x6e,0xe9,0xb1,0x6d,0x8e,0x6d,0x7b,0x6c,0xff,0x39,0x3e,0x1d,0x9f,0x20,0x8f,0xd2,0x1d,0xff,0x45,0xa,0xdd,0xb6,0x4f,0xff,0x1,0xbe,0xd3,0xa6,0xf7,0x55,0x9e,0xe1,0xf0,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char base_green_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x20,0x8,0x2,0x0,0x0,0x0,0xfc,0x18,0xed,0xa3,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xd8,0xc,0x13,0x16,0x18,0x25,0x64,0x51,0xb2,0x4e,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x2c,0x49,0x44,0x41,0x54,0x48,0xc7,0xed,0xcd,0x31,0x1,0x0,0x30,0x8,0x0,0x20,0x5d,0xff,0xc3,0x1e,0x26,0xb1,0xd5,0x4a,0xe8,0x7,0x5,0xc8,0x9a,0x8e,0x4b,0x2f,0x8e,0x9,0x4,0x2,0x81,0x40,0x20,0x10,0x8,0x4,0x82,0x2d,0x1f,0xfd,0xf4,0x2,0x44,0x79,0x8c,0x0,0x63,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x20,0x1,0x3,0x0,0x0,0x0,0x49,0xb4,0xe8,0xb7,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x6,0x50,0x4c,0x54,0x45,0x90,0xc9,0xab,0xff,0xff,0xff,0xc6,0xd0,0x9d,0x30,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x1,0xff,0x2,0x2d,0xde,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0xc,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x18,0xdc,0x0,0x0,0x0,0xa0,0x0,0x1,0x61,0x25,0x7d,0x47,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char button_disabled_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0xa,0x45,0x69,0x43,0x43,0x50,0x49,0x43,0x43,0x20,0x70,0x72,0x6f,0x66,0x69,0x6c,0x65,0x0,0x0,0x78,0xda,0x9d,0x53,0x67,0x54,0x53,0xe9,0x16,0x3d,0xf7,0xde,0xf4,0x42,0x4b,0x88,0x80,0x94,0x4b,0x6f,0x52,0x15,0x8,0x20,0x52,0x42,0x8b,0x80,0x14,0x91,0x26,0x2a,0x21,0x9,0x10,0x4a,0x88,0x21,0xa1,0xd9,0x15,0x51,0xc1,0x11,0x45,0x45,0x4,0x1b,0xc8,0xa0,0x88,0x3,0x8e,0x8e,0x80,0x8c,0x15,0x51,0x2c,0xc,0x8a,0xa,0xd8,0x7,0xe4,0x21,0xa2,0x8e,0x83,0xa3,0x88,0x8a,0xca,0xfb,0xe1,0x7b,0xa3,0x6b,0xd6,0xbc,0xf7,0xe6,0xcd,0xfe,0xb5,0xd7,0x3e,0xe7,0xac,0xf3,0x9d,0xb3,0xcf,0x7,0xc0,0x8,0xc,0x96,0x48,0x33,0x51,0x35,0x80,0xc,0xa9,0x42,0x1e,0x11,0xe0,0x83,0xc7,0xc4,0xc6,0xe1,0xe4,0x2e,0x40,0x81,0xa,0x24,0x70,0x0,0x10,0x8,0xb3,0x64,0x21,0x73,0xfd,0x23,0x1,0x0,0xf8,0x7e,0x3c,0x3c,0x2b,0x22,0xc0,0x7,0xbe,0x0,0x1,0x78,0xd3,0xb,0x8,0x0,0xc0,0x4d,0x9b,0xc0,0x30,0x1c,0x87,0xff,0xf,0xea,0x42,0x99,0x5c,0x1,0x80,0x84,0x1,0xc0,0x74,0x91,0x38,0x4b,0x8,0x80,0x14,0x0,0x40,0x7a,0x8e,0x42,0xa6,0x0,0x40,0x46,0x1,0x80,0x9d,0x98,0x26,0x53,0x0,0xa0,0x4,0x0,0x60,0xcb,0x63,0x62,0xe3,0x0,0x50,0x2d,0x0,0x60,0x27,0x7f,0xe6,0xd3,0x0,0x80,0x9d,0xf8,0x99,0x7b,0x1,0x0,0x5b,0x94,0x21,0x15,0x1,0xa0,0x91,0x0,0x20,0x13,0x65,0x88,0x44,0x0,0x68,0x3b,0x0,0xac,0xcf,0x56,0x8a,0x45,0x0,0x58,0x30,0x0,0x14,0x66,0x4b,0xc4,0x39,0x0,0xd8,0x2d,0x0,0x30,0x49,0x57,0x66,0x48,0x0,0xb0,0xb7,0x0,0xc0,0xce,0x10,0xb,0xb2,0x0,0x8,0xc,0x0,0x30,0x51,0x88,0x85,0x29,0x0,0x4,0x7b,0x0,0x60,0xc8,0x23,0x23,0x78,0x0,0x84,0x99,0x0,0x14,0x46,0xf2,0x57,0x3c,0xf1,0x2b,0xae,0x10,0xe7,0x2a,0x0,0x0,0x78,0x99,0xb2,0x3c,0xb9,0x24,0x39,0x45,0x81,0x5b,0x8,0x2d,0x71,0x7,0x57,0x57,0x2e,0x1e,0x28,0xce,0x49,0x17,0x2b,0x14,0x36,0x61,0x2,0x61,0x9a,0x40,0x2e,0xc2,0x79,0x99,0x19,0x32,0x81,0x34,0xf,0xe0,0xf3,0xcc,0x0,0x0,0xa0,0x91,0x15,0x11,0xe0,0x83,0xf3,0xfd,0x78,0xce,0xe,0xae,0xce,0xce,0x36,0x8e,0xb6,0xe,0x5f,0x2d,0xea,0xbf,0x6,0xff,0x22,0x62,0x62,0xe3,0xfe,0xe5,0xcf,0xab,0x70,0x40,0x0,0x0,0xe1,0x74,0x7e,0xd1,0xfe,0x2c,0x2f,0xb3,0x1a,0x80,0x3b,0x6,0x80,0x6d,0xfe,0xa2,0x25,0xee,0x4,0x68,0x5e,0xb,0xa0,0x75,0xf7,0x8b,0x66,0xb2,0xf,0x40,0xb5,0x0,0xa0,0xe9,0xda,0x57,0xf3,0x70,0xf8,0x7e,0x3c,0x3c,0x45,0xa1,0x90,0xb9,0xd9,0xd9,0xe5,0xe4,0xe4,0xd8,0x4a,0xc4,0x42,0x5b,0x61,0xca,0x57,0x7d,0xfe,0x67,0xc2,0x5f,0xc0,0x57,0xfd,0x6c,0xf9,0x7e,0x3c,0xfc,0xf7,0xf5,0xe0,0xbe,0xe2,0x24,0x81,0x32,0x5d,0x81,0x47,0x4,0xf8,0xe0,0xc2,0xcc,0xf4,0x4c,0xa5,0x1c,0xcf,0x92,0x9,0x84,0x62,0xdc,0xe6,0x8f,0x47,0xfc,0xb7,0xb,0xff,0xfc,0x1d,0xd3,0x22,0xc4,0x49,0x62,0xb9,0x58,0x2a,0x14,0xe3,0x51,0x12,0x71,0x8e,0x44,0x9a,0x8c,0xf3,0x32,0xa5,0x22,0x89,0x42,0x92,0x29,0xc5,0x25,0xd2,0xff,0x64,0xe2,0xdf,0x2c,0xfb,0x3,0x3e,0xdf,0x35,0x0,0xb0,0x6a,0x3e,0x1,0x7b,0x91,0x2d,0xa8,0x5d,0x63,0x3,0xf6,0x4b,0x27,0x10,0x58,0x74,0xc0,0xe2,0xf7,0x0,0x0,0xf2,0xbb,0x6f,0xc1,0xd4,0x28,0x8,0x3,0x80,0x68,0x83,0xe1,0xcf,0x77,0xff,0xef,0x3f,0xfd,0x47,0xa0,0x25,0x0,0x80,0x66,0x49,0x92,0x71,0x0,0x0,0x5e,0x44,0x24,0x2e,0x54,0xca,0xb3,0x3f,0xc7,0x8,0x0,0x0,0x44,0xa0,0x81,0x2a,0xb0,0x41,0x1b,0xf4,0xc1,0x18,0x2c,0xc0,0x6,0x1c,0xc1,0x5,0xdc,0xc1,0xb,0xfc,0x60,0x36,0x84,0x42,0x24,0xc4,0xc2,0x42,0x10,0x42,0xa,0x64,0x80,0x1c,0x72,0x60,0x29,0xac,0x82,0x42,0x28,0x86,0xcd,0xb0,0x1d,0x2a,0x60,0x2f,0xd4,0x40,0x1d,0x34,0xc0,0x51,0x68,0x86,0x93,0x70,0xe,0x2e,0xc2,0x55,0xb8,0xe,0x3d,0x70,0xf,0xfa,0x61,0x8,0x9e,0xc1,0x28,0xbc,0x81,0x9,0x4,0x41,0xc8,0x8,0x13,0x61,0x21,0xda,0x88,0x1,0x62,0x8a,0x58,0x23,0x8e,0x8,0x17,0x99,0x85,0xf8,0x21,0xc1,0x48,0x4,0x12,0x8b,0x24,0x20,0xc9,0x88,0x14,0x51,0x22,0x4b,0x91,0x35,0x48,0x31,0x52,0x8a,0x54,0x20,0x55,0x48,0x1d,0xf2,0x3d,0x72,0x2,0x39,0x87,0x5c,0x46,0xba,0x91,0x3b,0xc8,0x0,0x32,0x82,0xfc,0x86,0xbc,0x47,0x31,0x94,0x81,0xb2,0x51,0x3d,0xd4,0xc,0xb5,0x43,0xb9,0xa8,0x37,0x1a,0x84,0x46,0xa2,0xb,0xd0,0x64,0x74,0x31,0x9a,0x8f,0x16,0xa0,0x9b,0xd0,0x72,0xb4,0x1a,0x3d,0x8c,0x36,0xa1,0xe7,0xd0,0xab,0x68,0xf,0xda,0x8f,0x3e,0x43,0xc7,0x30,0xc0,0xe8,0x18,0x7,0x33,0xc4,0x6c,0x30,0x2e,0xc6,0xc3,0x42,0xb1,0x38,0x2c,0x9,0x93,0x63,0xcb,0xb1,0x22,0xac,0xc,0xab,0xc6,0x1a,0xb0,0x56,0xac,0x3,0xbb,0x89,0xf5,0x63,0xcf,0xb1,0x77,0x4,0x12,0x81,0x45,0xc0,0x9,0x36,0x4,0x77,0x42,0x20,0x61,0x1e,0x41,0x48,0x58,0x4c,0x58,0x4e,0xd8,0x48,0xa8,0x20,0x1c,0x24,0x34,0x11,0xda,0x9,0x37,0x9,0x3,0x84,0x51,0xc2,0x27,0x22,0x93,0xa8,0x4b,0xb4,0x26,0xba,0x11,0xf9,0xc4,0x18,0x62,0x32,0x31,0x87,0x58,0x48,0x2c,0x23,0xd6,0x12,0x8f,0x13,0x2f,0x10,0x7b,0x88,0x43,0xc4,0x37,0x24,0x12,0x89,0x43,0x32,0x27,0xb9,0x90,0x2,0x49,0xb1,0xa4,0x54,0xd2,0x12,0xd2,0x46,0xd2,0x6e,0x52,0x23,0xe9,0x2c,0xa9,0x9b,0x34,0x48,0x1a,0x23,0x93,0xc9,0xda,0x64,0x6b,0xb2,0x7,0x39,0x94,0x2c,0x20,0x2b,0xc8,0x85,0xe4,0x9d,0xe4,0xc3,0xe4,0x33,0xe4,0x1b,0xe4,0x21,0xf2,0x5b,0xa,0x9d,0x62,0x40,0x71,0xa4,0xf8,0x53,0xe2,0x28,0x52,0xca,0x6a,0x4a,0x19,0xe5,0x10,0xe5,0x34,0xe5,0x6,0x65,0x98,0x32,0x41,0x55,0xa3,0x9a,0x52,0xdd,0xa8,0xa1,0x54,0x11,0x35,0x8f,0x5a,0x42,0xad,0xa1,0xb6,0x52,0xaf,0x51,0x87,0xa8,0x13,0x34,0x75,0x9a,0x39,0xcd,0x83,0x16,0x49,0x4b,0xa5,0xad,0xa2,0x95,0xd3,0x1a,0x68,0x17,0x68,0xf7,0x69,0xaf,0xe8,0x74,0xba,0x11,0xdd,0x95,0x1e,0x4e,0x97,0xd0,0x57,0xd2,0xcb,0xe9,0x47,0xe8,0x97,0xe8,0x3,0xf4,0x77,0xc,0xd,0x86,0x15,0x83,0xc7,0x88,0x67,0x28,0x19,0x9b,0x18,0x7,0x18,0x67,0x19,0x77,0x18,0xaf,0x98,0x4c,0xa6,0x19,0xd3,0x8b,0x19,0xc7,0x54,0x30,0x37,0x31,0xeb,0x98,0xe7,0x99,0xf,0x99,0x6f,0x55,0x58,0x2a,0xb6,0x2a,0x7c,0x15,0x91,0xca,0xa,0x95,0x4a,0x95,0x26,0x95,0x1b,0x2a,0x2f,0x54,0xa9,0xaa,0xa6,0xaa,0xde,0xaa,0xb,0x55,0xf3,0x55,0xcb,0x54,0x8f,0xa9,0x5e,0x53,0x7d,0xae,0x46,0x55,0x33,0x53,0xe3,0xa9,0x9,0xd4,0x96,0xab,0x55,0xaa,0x9d,0x50,0xeb,0x53,0x1b,0x53,0x67,0xa9,0x3b,0xa8,0x87,0xaa,0x67,0xa8,0x6f,0x54,0x3f,0xa4,0x7e,0x59,0xfd,0x89,0x6,0x59,0xc3,0x4c,0xc3,0x4f,0x43,0xa4,0x51,0xa0,0xb1,0x5f,0xe3,0xbc,0xc6,0x20,0xb,0x63,0x19,0xb3,0x78,0x2c,0x21,0x6b,0xd,0xab,0x86,0x75,0x81,0x35,0xc4,0x26,0xb1,0xcd,0xd9,0x7c,0x76,0x2a,0xbb,0x98,0xfd,0x1d,0xbb,0x8b,0x3d,0xaa,0xa9,0xa1,0x39,0x43,0x33,0x4a,0x33,0x57,0xb3,0x52,0xf3,0x94,0x66,0x3f,0x7,0xe3,0x98,0x71,0xf8,0x9c,0x74,0x4e,0x9,0xe7,0x28,0xa7,0x97,0xf3,0x7e,0x8a,0xde,0x14,0xef,0x29,0xe2,0x29,0x1b,0xa6,0x34,0x4c,0xb9,0x31,0x65,0x5c,0x6b,0xaa,0x96,0x97,0x96,0x58,0xab,0x48,0xab,0x51,0xab,0x47,0xeb,0xbd,0x36,0xae,0xed,0xa7,0x9d,0xa6,0xbd,0x45,0xbb,0x59,0xfb,0x81,0xe,0x41,0xc7,0x4a,0x27,0x5c,0x27,0x47,0x67,0x8f,0xce,0x5,0x9d,0xe7,0x53,0xd9,0x53,0xdd,0xa7,0xa,0xa7,0x16,0x4d,0x3d,0x3a,0xf5,0xae,0x2e,0xaa,0x6b,0xa5,0x1b,0xa1,0xbb,0x44,0x77,0xbf,0x6e,0xa7,0xee,0x98,0x9e,0xbe,0x5e,0x80,0x9e,0x4c,0x6f,0xa7,0xde,0x79,0xbd,0xe7,0xfa,0x1c,0x7d,0x2f,0xfd,0x54,0xfd,0x6d,0xfa,0xa7,0xf5,0x47,0xc,0x58,0x6,0xb3,0xc,0x24,0x6,0xdb,0xc,0xce,0x18,0x3c,0xc5,0x35,0x71,0x6f,0x3c,0x1d,0x2f,0xc7,0xdb,0xf1,0x51,0x43,0x5d,0xc3,0x40,0x43,0xa5,0x61,0x95,0x61,0x97,0xe1,0x84,0x91,0xb9,0xd1,0x3c,0xa3,0xd5,0x46,0x8d,0x46,0xf,0x8c,0x69,0xc6,0x5c,0xe3,0x24,0xe3,0x6d,0xc6,0x6d,0xc6,0xa3,0x26,0x6,0x26,0x21,0x26,0x4b,0x4d,0xea,0x4d,0xee,0x9a,0x52,0x4d,0xb9,0xa6,0x29,0xa6,0x3b,0x4c,0x3b,0x4c,0xc7,0xcd,0xcc,0xcd,0xa2,0xcd,0xd6,0x99,0x35,0x9b,0x3d,0x31,0xd7,0x32,0xe7,0x9b,0xe7,0x9b,0xd7,0x9b,0xdf,0xb7,0x60,0x5a,0x78,0x5a,0x2c,0xb6,0xa8,0xb6,0xb8,0x65,0x49,0xb2,0xe4,0x5a,0xa6,0x59,0xee,0xb6,0xbc,0x6e,0x85,0x5a,0x39,0x59,0xa5,0x58,0x55,0x5a,0x5d,0xb3,0x46,0xad,0x9d,0xad,0x25,0xd6,0xbb,0xad,0xbb,0xa7,0x11,0xa7,0xb9,0x4e,0x93,0x4e,0xab,0x9e,0xd6,0x67,0xc3,0xb0,0xf1,0xb6,0xc9,0xb6,0xa9,0xb7,0x19,0xb0,0xe5,0xd8,0x6,0xdb,0xae,0xb6,0x6d,0xb6,0x7d,0x61,0x67,0x62,0x17,0x67,0xb7,0xc5,0xae,0xc3,0xee,0x93,0xbd,0x93,0x7d,0xba,0x7d,0x8d,0xfd,0x3d,0x7,0xd,0x87,0xd9,0xe,0xab,0x1d,0x5a,0x1d,0x7e,0x73,0xb4,0x72,0x14,0x3a,0x56,0x3a,0xde,0x9a,0xce,0x9c,0xee,0x3f,0x7d,0xc5,0xf4,0x96,0xe9,0x2f,0x67,0x58,0xcf,0x10,0xcf,0xd8,0x33,0xe3,0xb6,0x13,0xcb,0x29,0xc4,0x69,0x9d,0x53,0x9b,0xd3,0x47,0x67,0x17,0x67,0xb9,0x73,0x83,0xf3,0x88,0x8b,0x89,0x4b,0x82,0xcb,0x2e,0x97,0x3e,0x2e,0x9b,0x1b,0xc6,0xdd,0xc8,0xbd,0xe4,0x4a,0x74,0xf5,0x71,0x5d,0xe1,0x7a,0xd2,0xf5,0x9d,0x9b,0xb3,0x9b,0xc2,0xed,0xa8,0xdb,0xaf,0xee,0x36,0xee,0x69,0xee,0x87,0xdc,0x9f,0xcc,0x34,0x9f,0x29,0x9e,0x59,0x33,0x73,0xd0,0xc3,0xc8,0x43,0xe0,0x51,0xe5,0xd1,0x3f,0xb,0x9f,0x95,0x30,0x6b,0xdf,0xac,0x7e,0x4f,0x43,0x4f,0x81,0x67,0xb5,0xe7,0x23,0x2f,0x63,0x2f,0x91,0x57,0xad,0xd7,0xb0,0xb7,0xa5,0x77,0xaa,0xf7,0x61,0xef,0x17,0x3e,0xf6,0x3e,0x72,0x9f,0xe3,0x3e,0xe3,0x3c,0x37,0xde,0x32,0xde,0x59,0x5f,0xcc,0x37,0xc0,0xb7,0xc8,0xb7,0xcb,0x4f,0xc3,0x6f,0x9e,0x5f,0x85,0xdf,0x43,0x7f,0x23,0xff,0x64,0xff,0x7a,0xff,0xd1,0x0,0xa7,0x80,0x25,0x1,0x67,0x3,0x89,0x81,0x41,0x81,0x5b,0x2,0xfb,0xf8,0x7a,0x7c,0x21,0xbf,0x8e,0x3f,0x3a,0xdb,0x65,0xf6,0xb2,0xd9,0xed,0x41,0x8c,0xa0,0xb9,0x41,0x15,0x41,0x8f,0x82,0xad,0x82,0xe5,0xc1,0xad,0x21,0x68,0xc8,0xec,0x90,0xad,0x21,0xf7,0xe7,0x98,0xce,0x91,0xce,0x69,0xe,0x85,0x50,0x7e,0xe8,0xd6,0xd0,0x7,0x61,0xe6,0x61,0x8b,0xc3,0x7e,0xc,0x27,0x85,0x87,0x85,0x57,0x86,0x3f,0x8e,0x70,0x88,0x58,0x1a,0xd1,0x31,0x97,0x35,0x77,0xd1,0xdc,0x43,0x73,0xdf,0x44,0xfa,0x44,0x96,0x44,0xde,0x9b,0x67,0x31,0x4f,0x39,0xaf,0x2d,0x4a,0x35,0x2a,0x3e,0xaa,0x2e,0x6a,0x3c,0xda,0x37,0xba,0x34,0xba,0x3f,0xc6,0x2e,0x66,0x59,0xcc,0xd5,0x58,0x9d,0x58,0x49,0x6c,0x4b,0x1c,0x39,0x2e,0x2a,0xae,0x36,0x6e,0x6c,0xbe,0xdf,0xfc,0xed,0xf3,0x87,0xe2,0x9d,0xe2,0xb,0xe3,0x7b,0x17,0x98,0x2f,0xc8,0x5d,0x70,0x79,0xa1,0xce,0xc2,0xf4,0x85,0xa7,0x16,0xa9,0x2e,0x12,0x2c,0x3a,0x96,0x40,0x4c,0x88,0x4e,0x38,0x94,0xf0,0x41,0x10,0x2a,0xa8,0x16,0x8c,0x25,0xf2,0x13,0x77,0x25,0x8e,0xa,0x79,0xc2,0x1d,0xc2,0x67,0x22,0x2f,0xd1,0x36,0xd1,0x88,0xd8,0x43,0x5c,0x2a,0x1e,0x4e,0xf2,0x48,0x2a,0x4d,0x7a,0x92,0xec,0x91,0xbc,0x35,0x79,0x24,0xc5,0x33,0xa5,0x2c,0xe5,0xb9,0x84,0x27,0xa9,0x90,0xbc,0x4c,0xd,0x4c,0xdd,0x9b,0x3a,0x9e,0x16,0x9a,0x76,0x20,0x6d,0x32,0x3d,0x3a,0xbd,0x31,0x83,0x92,0x91,0x90,0x71,0x42,0xaa,0x21,0x4d,0x93,0xb6,0x67,0xea,0x67,0xe6,0x66,0x76,0xcb,0xac,0x65,0x85,0xb2,0xfe,0xc5,0x6e,0x8b,0xb7,0x2f,0x1e,0x95,0x7,0xc9,0x6b,0xb3,0x90,0xac,0x5,0x59,0x2d,0xa,0xb6,0x42,0xa6,0xe8,0x54,0x5a,0x28,0xd7,0x2a,0x7,0xb2,0x67,0x65,0x57,0x66,0xbf,0xcd,0x89,0xca,0x39,0x96,0xab,0x9e,0x2b,0xcd,0xed,0xcc,0xb3,0xca,0xdb,0x90,0x37,0x9c,0xef,0x9f,0xff,0xed,0x12,0xc2,0x12,0xe1,0x92,0xb6,0xa5,0x86,0x4b,0x57,0x2d,0x1d,0x58,0xe6,0xbd,0xac,0x6a,0x39,0xb2,0x3c,0x71,0x79,0xdb,0xa,0xe3,0x15,0x5,0x2b,0x86,0x56,0x6,0xac,0x3c,0xb8,0x8a,0xb6,0x2a,0x6d,0xd5,0x4f,0xab,0xed,0x57,0x97,0xae,0x7e,0xbd,0x26,0x7a,0x4d,0x6b,0x81,0x5e,0xc1,0xca,0x82,0xc1,0xb5,0x1,0x6b,0xeb,0xb,0x55,0xa,0xe5,0x85,0x7d,0xeb,0xdc,0xd7,0xed,0x5d,0x4f,0x58,0x2f,0x59,0xdf,0xb5,0x61,0xfa,0x86,0x9d,0x1b,0x3e,0x15,0x89,0x8a,0xae,0x14,0xdb,0x17,0x97,0x15,0x7f,0xd8,0x28,0xdc,0x78,0xe5,0x1b,0x87,0x6f,0xca,0xbf,0x99,0xdc,0x94,0xb4,0xa9,0xab,0xc4,0xb9,0x64,0xcf,0x66,0xd2,0x66,0xe9,0xe6,0xde,0x2d,0x9e,0x5b,0xe,0x96,0xaa,0x97,0xe6,0x97,0xe,0x6e,0xd,0xd9,0xda,0xb4,0xd,0xdf,0x56,0xb4,0xed,0xf5,0xf6,0x45,0xdb,0x2f,0x97,0xcd,0x28,0xdb,0xbb,0x83,0xb6,0x43,0xb9,0xa3,0xbf,0x3c,0xb8,0xbc,0x65,0xa7,0xc9,0xce,0xcd,0x3b,0x3f,0x54,0xa4,0x54,0xf4,0x54,0xfa,0x54,0x36,0xee,0xd2,0xdd,0xb5,0x61,0xd7,0xf8,0x6e,0xd1,0xee,0x1b,0x7b,0xbc,0xf6,0x34,0xec,0xd5,0xdb,0x5b,0xbc,0xf7,0xfd,0x3e,0xc9,0xbe,0xdb,0x55,0x1,0x55,0x4d,0xd5,0x66,0xd5,0x65,0xfb,0x49,0xfb,0xb3,0xf7,0x3f,0xae,0x89,0xaa,0xe9,0xf8,0x96,0xfb,0x6d,0x5d,0xad,0x4e,0x6d,0x71,0xed,0xc7,0x3,0xd2,0x3,0xfd,0x7,0x23,0xe,0xb6,0xd7,0xb9,0xd4,0xd5,0x1d,0xd2,0x3d,0x54,0x52,0x8f,0xd6,0x2b,0xeb,0x47,0xe,0xc7,0x1f,0xbe,0xfe,0x9d,0xef,0x77,0x2d,0xd,0x36,0xd,0x55,0x8d,0x9c,0xc6,0xe2,0x23,0x70,0x44,0x79,0xe4,0xe9,0xf7,0x9,0xdf,0xf7,0x1e,0xd,0x3a,0xda,0x76,0x8c,0x7b,0xac,0xe1,0x7,0xd3,0x1f,0x76,0x1d,0x67,0x1d,0x2f,0x6a,0x42,0x9a,0xf2,0x9a,0x46,0x9b,0x53,0x9a,0xfb,0x5b,0x62,0x5b,0xba,0x4f,0xcc,0x3e,0xd1,0xd6,0xea,0xde,0x7a,0xfc,0x47,0xdb,0x1f,0xf,0x9c,0x34,0x3c,0x59,0x79,0x4a,0xf3,0x54,0xc9,0x69,0xda,0xe9,0x82,0xd3,0x93,0x67,0xf2,0xcf,0x8c,0x9d,0x95,0x9d,0x7d,0x7e,0x2e,0xf9,0xdc,0x60,0xdb,0xa2,0xb6,0x7b,0xe7,0x63,0xce,0xdf,0x6a,0xf,0x6f,0xef,0xba,0x10,0x74,0xe1,0xd2,0x45,0xff,0x8b,0xe7,0x3b,0xbc,0x3b,0xce,0x5c,0xf2,0xb8,0x74,0xf2,0xb2,0xdb,0xe5,0x13,0x57,0xb8,0x57,0x9a,0xaf,0x3a,0x5f,0x6d,0xea,0x74,0xea,0x3c,0xfe,0x93,0xd3,0x4f,0xc7,0xbb,0x9c,0xbb,0x9a,0xae,0xb9,0x5c,0x6b,0xb9,0xee,0x7a,0xbd,0xb5,0x7b,0x66,0xf7,0xe9,0x1b,0x9e,0x37,0xce,0xdd,0xf4,0xbd,0x79,0xf1,0x16,0xff,0xd6,0xd5,0x9e,0x39,0x3d,0xdd,0xbd,0xf3,0x7a,0x6f,0xf7,0xc5,0xf7,0xf5,0xdf,0x16,0xdd,0x7e,0x72,0x27,0xfd,0xce,0xcb,0xbb,0xd9,0x77,0x27,0xee,0xad,0xbc,0x4f,0xbc,0x5f,0xf4,0x40,0xed,0x41,0xd9,0x43,0xdd,0x87,0xd5,0x3f,0x5b,0xfe,0xdc,0xd8,0xef,0xdc,0x7f,0x6a,0xc0,0x77,0xa0,0xf3,0xd1,0xdc,0x47,0xf7,0x6,0x85,0x83,0xcf,0xfe,0x91,0xf5,0x8f,0xf,0x43,0x5,0x8f,0x99,0x8f,0xcb,0x86,0xd,0x86,0xeb,0x9e,0x38,0x3e,0x39,0x39,0xe2,0x3f,0x72,0xfd,0xe9,0xfc,0xa7,0x43,0xcf,0x64,0xcf,0x26,0x9e,0x17,0xfe,0xa2,0xfe,0xcb,0xae,0x17,0x16,0x2f,0x7e,0xf8,0xd5,0xeb,0xd7,0xce,0xd1,0x98,0xd1,0xa1,0x97,0xf2,0x97,0x93,0xbf,0x6d,0x7c,0xa5,0xfd,0xea,0xc0,0xeb,0x19,0xaf,0xdb,0xc6,0xc2,0xc6,0x1e,0xbe,0xc9,0x78,0x33,0x31,0x5e,0xf4,0x56,0xfb,0xed,0xc1,0x77,0xdc,0x77,0x1d,0xef,0xa3,0xdf,0xf,0x4f,0xe4,0x7c,0x20,0x7f,0x28,0xff,0x68,0xf9,0xb1,0xf5,0x53,0xd0,0xa7,0xfb,0x93,0x19,0x93,0x93,0xff,0x4,0x3,0x98,0xf3,0xfc,0xef,0x35,0x94,0x82,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xa,0x14,0x2,0x2b,0x36,0x0,0x39,0x60,0xad,0x0,0x0,0x1,0x24,0x49,0x44,0x41,0x54,0x38,0xcb,0xa5,0x93,0x41,0x6e,0x2,0x31,0xc,0x45,0x5f,0x12,0x8b,0xa9,0xda,0x5,0xd9,0xb0,0x19,0xe,0xc3,0x1d,0x7a,0x9a,0x39,0x2,0xea,0x61,0x7a,0x83,0x2e,0x38,0xc,0x9b,0x59,0x8c,0x6,0x9,0x24,0x86,0x64,0xe2,0x6e,0x3c,0xa8,0xad,0xa,0x5,0x6a,0xc9,0x92,0x95,0x38,0xff,0xfb,0x3b,0xb6,0x3,0x4,0x98,0x1,0x15,0xf0,0x64,0x71,0x0,0x3c,0xdf,0xad,0x0,0x23,0x70,0x2,0x8e,0xc0,0x0,0x9c,0xa6,0xc7,0x2f,0x40,0x4,0xe6,0x16,0x57,0x80,0x33,0x7,0x50,0xf3,0x1,0x38,0x0,0x3b,0xa0,0xc7,0xd8,0x2b,0x20,0xae,0x56,0xab,0xd7,0xe5,0x72,0xd9,0xe4,0x9c,0x23,0x57,0x4c,0x44,0xfa,0xed,0x76,0xbb,0xde,0x6c,0x36,0xef,0x40,0x16,0x2b,0x7b,0x5e,0xd7,0x75,0xd3,0x75,0x5d,0xcc,0x39,0xa3,0xaa,0xbf,0x3e,0x76,0xce,0x21,0x22,0xb1,0xae,0xeb,0x6,0xf8,0x0,0xf6,0x67,0x9,0x29,0xa5,0x98,0x52,0xba,0x46,0x8e,0xaa,0x92,0x52,0x22,0xa5,0x14,0x4d,0xea,0x4c,0xac,0x61,0x55,0x29,0xe5,0x22,0xf3,0x4f,0x2b,0xa5,0x60,0xd2,0x83,0x58,0xb7,0x9d,0xaa,0x4e,0x17,0x7f,0x9a,0x11,0x39,0xc0,0xcb,0x24,0xef,0x81,0xa,0xdc,0xf4,0xb,0xe7,0xc3,0x3b,0x1,0xf8,0xa,0xa0,0xaa,0x7a,0x33,0x80,0xe5,0xe9,0x4,0x50,0x0,0x2d,0xa5,0xdc,0xdc,0x3,0xcb,0x53,0xa0,0x88,0x8d,0xe7,0xf0,0x40,0x5,0x3,0x30,0x7a,0x9b,0xed,0x83,0xf7,0xbe,0xf,0x21,0x30,0x1,0x5d,0xf2,0x10,0x2,0xde,0xfb,0xde,0x46,0xfa,0x24,0xb6,0x18,0xbb,0xb6,0x6d,0xd7,0x8b,0xc5,0xa2,0x19,0xc7,0x31,0x5e,0x9b,0xc4,0x10,0x42,0xd7,0xb6,0xed,0x9b,0xed,0xc3,0xd1,0x1,0xcf,0xff,0x58,0xa6,0x83,0x98,0x4,0x80,0xc,0xec,0xef,0x5d,0xe7,0x4f,0x9b,0xaf,0xbc,0xfd,0x3c,0x63,0x97,0x76,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x4,0x0,0x0,0x0,0xb5,0xfa,0x37,0xea,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0xd9,0x49,0x44,0x41,0x54,0x28,0xcf,0x7d,0x91,0x41,0x4e,0xc3,0x30,0x14,0x44,0x9f,0xed,0x8f,0x6d,0x35,0x8b,0x9a,0x6d,0xb9,0x6,0xfb,0xde,0x81,0xd3,0xe4,0x8,0xf4,0x32,0xbd,0x1,0xb,0x6e,0xc0,0x25,0x60,0x83,0xa8,0x2,0x6a,0xa4,0xc6,0x49,0xfc,0xbb,0x88,0x54,0x11,0x94,0x30,0xb3,0xf9,0xd2,0x9f,0x19,0x8d,0x34,0x6,0xc1,0x13,0x88,0x78,0x1c,0x96,0x9,0x85,0x91,0xcc,0x85,0x8e,0x2c,0x78,0x2a,0x12,0x5b,0x2a,0x2,0x6,0x3,0x28,0x4a,0x47,0xcb,0x37,0xd,0x8,0x81,0xb4,0x7f,0x7a,0xa8,0x87,0xc4,0xc,0xd2,0xbc,0x3f,0xbf,0x1e,0x19,0x84,0xc8,0x76,0x57,0x9f,0xd2,0x80,0xfe,0x7a,0x1b,0x24,0xed,0x6a,0x5e,0x38,0xb,0x9e,0xaa,0x4f,0xfd,0xdc,0x8e,0xd2,0xd3,0x27,0x2a,0xbc,0xe0,0x8,0x65,0xe6,0xe6,0xd6,0x94,0x80,0x13,0x2c,0x46,0x29,0xb,0x2,0x5,0x83,0x15,0xc0,0xac,0x26,0x18,0x90,0xe9,0x5c,0x11,0x30,0x9,0x54,0x17,0x5,0xa,0xa,0x42,0x41,0xcb,0x62,0x87,0x2,0x4a,0x11,0x46,0xba,0xd5,0x84,0x8e,0xd1,0x92,0x69,0x6d,0xe3,0xd0,0x3f,0x74,0xd8,0x86,0x96,0xec,0xb8,0xc3,0xa5,0xaf,0xfb,0x47,0x1f,0x3d,0xe1,0xc6,0x48,0x3c,0x7d,0x1e,0x3e,0xde,0xf8,0x31,0x6c,0xfe,0x1d,0xab,0x15,0x32,0x30,0x70,0x5e,0x9b,0xfb,0xa,0xbb,0x7c,0x61,0xa2,0x50,0x44,0x45,0xca,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char button_focus_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0xa,0x45,0x69,0x43,0x43,0x50,0x49,0x43,0x43,0x20,0x70,0x72,0x6f,0x66,0x69,0x6c,0x65,0x0,0x0,0x78,0xda,0x9d,0x53,0x67,0x54,0x53,0xe9,0x16,0x3d,0xf7,0xde,0xf4,0x42,0x4b,0x88,0x80,0x94,0x4b,0x6f,0x52,0x15,0x8,0x20,0x52,0x42,0x8b,0x80,0x14,0x91,0x26,0x2a,0x21,0x9,0x10,0x4a,0x88,0x21,0xa1,0xd9,0x15,0x51,0xc1,0x11,0x45,0x45,0x4,0x1b,0xc8,0xa0,0x88,0x3,0x8e,0x8e,0x80,0x8c,0x15,0x51,0x2c,0xc,0x8a,0xa,0xd8,0x7,0xe4,0x21,0xa2,0x8e,0x83,0xa3,0x88,0x8a,0xca,0xfb,0xe1,0x7b,0xa3,0x6b,0xd6,0xbc,0xf7,0xe6,0xcd,0xfe,0xb5,0xd7,0x3e,0xe7,0xac,0xf3,0x9d,0xb3,0xcf,0x7,0xc0,0x8,0xc,0x96,0x48,0x33,0x51,0x35,0x80,0xc,0xa9,0x42,0x1e,0x11,0xe0,0x83,0xc7,0xc4,0xc6,0xe1,0xe4,0x2e,0x40,0x81,0xa,0x24,0x70,0x0,0x10,0x8,0xb3,0x64,0x21,0x73,0xfd,0x23,0x1,0x0,0xf8,0x7e,0x3c,0x3c,0x2b,0x22,0xc0,0x7,0xbe,0x0,0x1,0x78,0xd3,0xb,0x8,0x0,0xc0,0x4d,0x9b,0xc0,0x30,0x1c,0x87,0xff,0xf,0xea,0x42,0x99,0x5c,0x1,0x80,0x84,0x1,0xc0,0x74,0x91,0x38,0x4b,0x8,0x80,0x14,0x0,0x40,0x7a,0x8e,0x42,0xa6,0x0,0x40,0x46,0x1,0x80,0x9d,0x98,0x26,0x53,0x0,0xa0,0x4,0x0,0x60,0xcb,0x63,0x62,0xe3,0x0,0x50,0x2d,0x0,0x60,0x27,0x7f,0xe6,0xd3,0x0,0x80,0x9d,0xf8,0x99,0x7b,0x1,0x0,0x5b,0x94,0x21,0x15,0x1,0xa0,0x91,0x0,0x20,0x13,0x65,0x88,0x44,0x0,0x68,0x3b,0x0,0xac,0xcf,0x56,0x8a,0x45,0x0,0x58,0x30,0x0,0x14,0x66,0x4b,0xc4,0x39,0x0,0xd8,0x2d,0x0,0x30,0x49,0x57,0x66,0x48,0x0,0xb0,0xb7,0x0,0xc0,0xce,0x10,0xb,0xb2,0x0,0x8,0xc,0x0,0x30,0x51,0x88,0x85,0x29,0x0,0x4,0x7b,0x0,0x60,0xc8,0x23,0x23,0x78,0x0,0x84,0x99,0x0,0x14,0x46,0xf2,0x57,0x3c,0xf1,0x2b,0xae,0x10,0xe7,0x2a,0x0,0x0,0x78,0x99,0xb2,0x3c,0xb9,0x24,0x39,0x45,0x81,0x5b,0x8,0x2d,0x71,0x7,0x57,0x57,0x2e,0x1e,0x28,0xce,0x49,0x17,0x2b,0x14,0x36,0x61,0x2,0x61,0x9a,0x40,0x2e,0xc2,0x79,0x99,0x19,0x32,0x81,0x34,0xf,0xe0,0xf3,0xcc,0x0,0x0,0xa0,0x91,0x15,0x11,0xe0,0x83,0xf3,0xfd,0x78,0xce,0xe,0xae,0xce,0xce,0x36,0x8e,0xb6,0xe,0x5f,0x2d,0xea,0xbf,0x6,0xff,0x22,0x62,0x62,0xe3,0xfe,0xe5,0xcf,0xab,0x70,0x40,0x0,0x0,0xe1,0x74,0x7e,0xd1,0xfe,0x2c,0x2f,0xb3,0x1a,0x80,0x3b,0x6,0x80,0x6d,0xfe,0xa2,0x25,0xee,0x4,0x68,0x5e,0xb,0xa0,0x75,0xf7,0x8b,0x66,0xb2,0xf,0x40,0xb5,0x0,0xa0,0xe9,0xda,0x57,0xf3,0x70,0xf8,0x7e,0x3c,0x3c,0x45,0xa1,0x90,0xb9,0xd9,0xd9,0xe5,0xe4,0xe4,0xd8,0x4a,0xc4,0x42,0x5b,0x61,0xca,0x57,0x7d,0xfe,0x67,0xc2,0x5f,0xc0,0x57,0xfd,0x6c,0xf9,0x7e,0x3c,0xfc,0xf7,0xf5,0xe0,0xbe,0xe2,0x24,0x81,0x32,0x5d,0x81,0x47,0x4,0xf8,0xe0,0xc2,0xcc,0xf4,0x4c,0xa5,0x1c,0xcf,0x92,0x9,0x84,0x62,0xdc,0xe6,0x8f,0x47,0xfc,0xb7,0xb,0xff,0xfc,0x1d,0xd3,0x22,0xc4,0x49,0x62,0xb9,0x58,0x2a,0x14,0xe3,0x51,0x12,0x71,0x8e,0x44,0x9a,0x8c,0xf3,0x32,0xa5,0x22,0x89,0x42,0x92,0x29,0xc5,0x25,0xd2,0xff,0x64,0xe2,0xdf,0x2c,0xfb,0x3,0x3e,0xdf,0x35,0x0,0xb0,0x6a,0x3e,0x1,0x7b,0x91,0x2d,0xa8,0x5d,0x63,0x3,0xf6,0x4b,0x27,0x10,0x58,0x74,0xc0,0xe2,0xf7,0x0,0x0,0xf2,0xbb,0x6f,0xc1,0xd4,0x28,0x8,0x3,0x80,0x68,0x83,0xe1,0xcf,0x77,0xff,0xef,0x3f,0xfd,0x47,0xa0,0x25,0x0,0x80,0x66,0x49,0x92,0x71,0x0,0x0,0x5e,0x44,0x24,0x2e,0x54,0xca,0xb3,0x3f,0xc7,0x8,0x0,0x0,0x44,0xa0,0x81,0x2a,0xb0,0x41,0x1b,0xf4,0xc1,0x18,0x2c,0xc0,0x6,0x1c,0xc1,0x5,0xdc,0xc1,0xb,0xfc,0x60,0x36,0x84,0x42,0x24,0xc4,0xc2,0x42,0x10,0x42,0xa,0x64,0x80,0x1c,0x72,0x60,0x29,0xac,0x82,0x42,0x28,0x86,0xcd,0xb0,0x1d,0x2a,0x60,0x2f,0xd4,0x40,0x1d,0x34,0xc0,0x51,0x68,0x86,0x93,0x70,0xe,0x2e,0xc2,0x55,0xb8,0xe,0x3d,0x70,0xf,0xfa,0x61,0x8,0x9e,0xc1,0x28,0xbc,0x81,0x9,0x4,0x41,0xc8,0x8,0x13,0x61,0x21,0xda,0x88,0x1,0x62,0x8a,0x58,0x23,0x8e,0x8,0x17,0x99,0x85,0xf8,0x21,0xc1,0x48,0x4,0x12,0x8b,0x24,0x20,0xc9,0x88,0x14,0x51,0x22,0x4b,0x91,0x35,0x48,0x31,0x52,0x8a,0x54,0x20,0x55,0x48,0x1d,0xf2,0x3d,0x72,0x2,0x39,0x87,0x5c,0x46,0xba,0x91,0x3b,0xc8,0x0,0x32,0x82,0xfc,0x86,0xbc,0x47,0x31,0x94,0x81,0xb2,0x51,0x3d,0xd4,0xc,0xb5,0x43,0xb9,0xa8,0x37,0x1a,0x84,0x46,0xa2,0xb,0xd0,0x64,0x74,0x31,0x9a,0x8f,0x16,0xa0,0x9b,0xd0,0x72,0xb4,0x1a,0x3d,0x8c,0x36,0xa1,0xe7,0xd0,0xab,0x68,0xf,0xda,0x8f,0x3e,0x43,0xc7,0x30,0xc0,0xe8,0x18,0x7,0x33,0xc4,0x6c,0x30,0x2e,0xc6,0xc3,0x42,0xb1,0x38,0x2c,0x9,0x93,0x63,0xcb,0xb1,0x22,0xac,0xc,0xab,0xc6,0x1a,0xb0,0x56,0xac,0x3,0xbb,0x89,0xf5,0x63,0xcf,0xb1,0x77,0x4,0x12,0x81,0x45,0xc0,0x9,0x36,0x4,0x77,0x42,0x20,0x61,0x1e,0x41,0x48,0x58,0x4c,0x58,0x4e,0xd8,0x48,0xa8,0x20,0x1c,0x24,0x34,0x11,0xda,0x9,0x37,0x9,0x3,0x84,0x51,0xc2,0x27,0x22,0x93,0xa8,0x4b,0xb4,0x26,0xba,0x11,0xf9,0xc4,0x18,0x62,0x32,0x31,0x87,0x58,0x48,0x2c,0x23,0xd6,0x12,0x8f,0x13,0x2f,0x10,0x7b,0x88,0x43,0xc4,0x37,0x24,0x12,0x89,0x43,0x32,0x27,0xb9,0x90,0x2,0x49,0xb1,0xa4,0x54,0xd2,0x12,0xd2,0x46,0xd2,0x6e,0x52,0x23,0xe9,0x2c,0xa9,0x9b,0x34,0x48,0x1a,0x23,0x93,0xc9,0xda,0x64,0x6b,0xb2,0x7,0x39,0x94,0x2c,0x20,0x2b,0xc8,0x85,0xe4,0x9d,0xe4,0xc3,0xe4,0x33,0xe4,0x1b,0xe4,0x21,0xf2,0x5b,0xa,0x9d,0x62,0x40,0x71,0xa4,0xf8,0x53,0xe2,0x28,0x52,0xca,0x6a,0x4a,0x19,0xe5,0x10,0xe5,0x34,0xe5,0x6,0x65,0x98,0x32,0x41,0x55,0xa3,0x9a,0x52,0xdd,0xa8,0xa1,0x54,0x11,0x35,0x8f,0x5a,0x42,0xad,0xa1,0xb6,0x52,0xaf,0x51,0x87,0xa8,0x13,0x34,0x75,0x9a,0x39,0xcd,0x83,0x16,0x49,0x4b,0xa5,0xad,0xa2,0x95,0xd3,0x1a,0x68,0x17,0x68,0xf7,0x69,0xaf,0xe8,0x74,0xba,0x11,0xdd,0x95,0x1e,0x4e,0x97,0xd0,0x57,0xd2,0xcb,0xe9,0x47,0xe8,0x97,0xe8,0x3,0xf4,0x77,0xc,0xd,0x86,0x15,0x83,0xc7,0x88,0x67,0x28,0x19,0x9b,0x18,0x7,0x18,0x67,0x19,0x77,0x18,0xaf,0x98,0x4c,0xa6,0x19,0xd3,0x8b,0x19,0xc7,0x54,0x30,0x37,0x31,0xeb,0x98,0xe7,0x99,0xf,0x99,0x6f,0x55,0x58,0x2a,0xb6,0x2a,0x7c,0x15,0x91,0xca,0xa,0x95,0x4a,0x95,0x26,0x95,0x1b,0x2a,0x2f,0x54,0xa9,0xaa,0xa6,0xaa,0xde,0xaa,0xb,0x55,0xf3,0x55,0xcb,0x54,0x8f,0xa9,0x5e,0x53,0x7d,0xae,0x46,0x55,0x33,0x53,0xe3,0xa9,0x9,0xd4,0x96,0xab,0x55,0xaa,0x9d,0x50,0xeb,0x53,0x1b,0x53,0x67,0xa9,0x3b,0xa8,0x87,0xaa,0x67,0xa8,0x6f,0x54,0x3f,0xa4,0x7e,0x59,0xfd,0x89,0x6,0x59,0xc3,0x4c,0xc3,0x4f,0x43,0xa4,0x51,0xa0,0xb1,0x5f,0xe3,0xbc,0xc6,0x20,0xb,0x63,0x19,0xb3,0x78,0x2c,0x21,0x6b,0xd,0xab,0x86,0x75,0x81,0x35,0xc4,0x26,0xb1,0xcd,0xd9,0x7c,0x76,0x2a,0xbb,0x98,0xfd,0x1d,0xbb,0x8b,0x3d,0xaa,0xa9,0xa1,0x39,0x43,0x33,0x4a,0x33,0x57,0xb3,0x52,0xf3,0x94,0x66,0x3f,0x7,0xe3,0x98,0x71,0xf8,0x9c,0x74,0x4e,0x9,0xe7,0x28,0xa7,0x97,0xf3,0x7e,0x8a,0xde,0x14,0xef,0x29,0xe2,0x29,0x1b,0xa6,0x34,0x4c,0xb9,0x31,0x65,0x5c,0x6b,0xaa,0x96,0x97,0x96,0x58,0xab,0x48,0xab,0x51,0xab,0x47,0xeb,0xbd,0x36,0xae,0xed,0xa7,0x9d,0xa6,0xbd,0x45,0xbb,0x59,0xfb,0x81,0xe,0x41,0xc7,0x4a,0x27,0x5c,0x27,0x47,0x67,0x8f,0xce,0x5,0x9d,0xe7,0x53,0xd9,0x53,0xdd,0xa7,0xa,0xa7,0x16,0x4d,0x3d,0x3a,0xf5,0xae,0x2e,0xaa,0x6b,0xa5,0x1b,0xa1,0xbb,0x44,0x77,0xbf,0x6e,0xa7,0xee,0x98,0x9e,0xbe,0x5e,0x80,0x9e,0x4c,0x6f,0xa7,0xde,0x79,0xbd,0xe7,0xfa,0x1c,0x7d,0x2f,0xfd,0x54,0xfd,0x6d,0xfa,0xa7,0xf5,0x47,0xc,0x58,0x6,0xb3,0xc,0x24,0x6,0xdb,0xc,0xce,0x18,0x3c,0xc5,0x35,0x71,0x6f,0x3c,0x1d,0x2f,0xc7,0xdb,0xf1,0x51,0x43,0x5d,0xc3,0x40,0x43,0xa5,0x61,0x95,0x61,0x97,0xe1,0x84,0x91,0xb9,0xd1,0x3c,0xa3,0xd5,0x46,0x8d,0x46,0xf,0x8c,0x69,0xc6,0x5c,0xe3,0x24,0xe3,0x6d,0xc6,0x6d,0xc6,0xa3,0x26,0x6,0x26,0x21,0x26,0x4b,0x4d,0xea,0x4d,0xee,0x9a,0x52,0x4d,0xb9,0xa6,0x29,0xa6,0x3b,0x4c,0x3b,0x4c,0xc7,0xcd,0xcc,0xcd,0xa2,0xcd,0xd6,0x99,0x35,0x9b,0x3d,0x31,0xd7,0x32,0xe7,0x9b,0xe7,0x9b,0xd7,0x9b,0xdf,0xb7,0x60,0x5a,0x78,0x5a,0x2c,0xb6,0xa8,0xb6,0xb8,0x65,0x49,0xb2,0xe4,0x5a,0xa6,0x59,0xee,0xb6,0xbc,0x6e,0x85,0x5a,0x39,0x59,0xa5,0x58,0x55,0x5a,0x5d,0xb3,0x46,0xad,0x9d,0xad,0x25,0xd6,0xbb,0xad,0xbb,0xa7,0x11,0xa7,0xb9,0x4e,0x93,0x4e,0xab,0x9e,0xd6,0x67,0xc3,0xb0,0xf1,0xb6,0xc9,0xb6,0xa9,0xb7,0x19,0xb0,0xe5,0xd8,0x6,0xdb,0xae,0xb6,0x6d,0xb6,0x7d,0x61,0x67,0x62,0x17,0x67,0xb7,0xc5,0xae,0xc3,0xee,0x93,0xbd,0x93,0x7d,0xba,0x7d,0x8d,0xfd,0x3d,0x7,0xd,0x87,0xd9,0xe,0xab,0x1d,0x5a,0x1d,0x7e,0x73,0xb4,0x72,0x14,0x3a,0x56,0x3a,0xde,0x9a,0xce,0x9c,0xee,0x3f,0x7d,0xc5,0xf4,0x96,0xe9,0x2f,0x67,0x58,0xcf,0x10,0xcf,0xd8,0x33,0xe3,0xb6,0x13,0xcb,0x29,0xc4,0x69,0x9d,0x53,0x9b,0xd3,0x47,0x67,0x17,0x67,0xb9,0x73,0x83,0xf3,0x88,0x8b,0x89,0x4b,0x82,0xcb,0x2e,0x97,0x3e,0x2e,0x9b,0x1b,0xc6,0xdd,0xc8,0xbd,0xe4,0x4a,0x74,0xf5,0x71,0x5d,0xe1,0x7a,0xd2,0xf5,0x9d,0x9b,0xb3,0x9b,0xc2,0xed,0xa8,0xdb,0xaf,0xee,0x36,0xee,0x69,0xee,0x87,0xdc,0x9f,0xcc,0x34,0x9f,0x29,0x9e,0x59,0x33,0x73,0xd0,0xc3,0xc8,0x43,0xe0,0x51,0xe5,0xd1,0x3f,0xb,0x9f,0x95,0x30,0x6b,0xdf,0xac,0x7e,0x4f,0x43,0x4f,0x81,0x67,0xb5,0xe7,0x23,0x2f,0x63,0x2f,0x91,0x57,0xad,0xd7,0xb0,0xb7,0xa5,0x77,0xaa,0xf7,0x61,0xef,0x17,0x3e,0xf6,0x3e,0x72,0x9f,0xe3,0x3e,0xe3,0x3c,0x37,0xde,0x32,0xde,0x59,0x5f,0xcc,0x37,0xc0,0xb7,0xc8,0xb7,0xcb,0x4f,0xc3,0x6f,0x9e,0x5f,0x85,0xdf,0x43,0x7f,0x23,0xff,0x64,0xff,0x7a,0xff,0xd1,0x0,0xa7,0x80,0x25,0x1,0x67,0x3,0x89,0x81,0x41,0x81,0x5b,0x2,0xfb,0xf8,0x7a,0x7c,0x21,0xbf,0x8e,0x3f,0x3a,0xdb,0x65,0xf6,0xb2,0xd9,0xed,0x41,0x8c,0xa0,0xb9,0x41,0x15,0x41,0x8f,0x82,0xad,0x82,0xe5,0xc1,0xad,0x21,0x68,0xc8,0xec,0x90,0xad,0x21,0xf7,0xe7,0x98,0xce,0x91,0xce,0x69,0xe,0x85,0x50,0x7e,0xe8,0xd6,0xd0,0x7,0x61,0xe6,0x61,0x8b,0xc3,0x7e,0xc,0x27,0x85,0x87,0x85,0x57,0x86,0x3f,0x8e,0x70,0x88,0x58,0x1a,0xd1,0x31,0x97,0x35,0x77,0xd1,0xdc,0x43,0x73,0xdf,0x44,0xfa,0x44,0x96,0x44,0xde,0x9b,0x67,0x31,0x4f,0x39,0xaf,0x2d,0x4a,0x35,0x2a,0x3e,0xaa,0x2e,0x6a,0x3c,0xda,0x37,0xba,0x34,0xba,0x3f,0xc6,0x2e,0x66,0x59,0xcc,0xd5,0x58,0x9d,0x58,0x49,0x6c,0x4b,0x1c,0x39,0x2e,0x2a,0xae,0x36,0x6e,0x6c,0xbe,0xdf,0xfc,0xed,0xf3,0x87,0xe2,0x9d,0xe2,0xb,0xe3,0x7b,0x17,0x98,0x2f,0xc8,0x5d,0x70,0x79,0xa1,0xce,0xc2,0xf4,0x85,0xa7,0x16,0xa9,0x2e,0x12,0x2c,0x3a,0x96,0x40,0x4c,0x88,0x4e,0x38,0x94,0xf0,0x41,0x10,0x2a,0xa8,0x16,0x8c,0x25,0xf2,0x13,0x77,0x25,0x8e,0xa,0x79,0xc2,0x1d,0xc2,0x67,0x22,0x2f,0xd1,0x36,0xd1,0x88,0xd8,0x43,0x5c,0x2a,0x1e,0x4e,0xf2,0x48,0x2a,0x4d,0x7a,0x92,0xec,0x91,0xbc,0x35,0x79,0x24,0xc5,0x33,0xa5,0x2c,0xe5,0xb9,0x84,0x27,0xa9,0x90,0xbc,0x4c,0xd,0x4c,0xdd,0x9b,0x3a,0x9e,0x16,0x9a,0x76,0x20,0x6d,0x32,0x3d,0x3a,0xbd,0x31,0x83,0x92,0x91,0x90,0x71,0x42,0xaa,0x21,0x4d,0x93,0xb6,0x67,0xea,0x67,0xe6,0x66,0x76,0xcb,0xac,0x65,0x85,0xb2,0xfe,0xc5,0x6e,0x8b,0xb7,0x2f,0x1e,0x95,0x7,0xc9,0x6b,0xb3,0x90,0xac,0x5,0x59,0x2d,0xa,0xb6,0x42,0xa6,0xe8,0x54,0x5a,0x28,0xd7,0x2a,0x7,0xb2,0x67,0x65,0x57,0x66,0xbf,0xcd,0x89,0xca,0x39,0x96,0xab,0x9e,0x2b,0xcd,0xed,0xcc,0xb3,0xca,0xdb,0x90,0x37,0x9c,0xef,0x9f,0xff,0xed,0x12,0xc2,0x12,0xe1,0x92,0xb6,0xa5,0x86,0x4b,0x57,0x2d,0x1d,0x58,0xe6,0xbd,0xac,0x6a,0x39,0xb2,0x3c,0x71,0x79,0xdb,0xa,0xe3,0x15,0x5,0x2b,0x86,0x56,0x6,0xac,0x3c,0xb8,0x8a,0xb6,0x2a,0x6d,0xd5,0x4f,0xab,0xed,0x57,0x97,0xae,0x7e,0xbd,0x26,0x7a,0x4d,0x6b,0x81,0x5e,0xc1,0xca,0x82,0xc1,0xb5,0x1,0x6b,0xeb,0xb,0x55,0xa,0xe5,0x85,0x7d,0xeb,0xdc,0xd7,0xed,0x5d,0x4f,0x58,0x2f,0x59,0xdf,0xb5,0x61,0xfa,0x86,0x9d,0x1b,0x3e,0x15,0x89,0x8a,0xae,0x14,0xdb,0x17,0x97,0x15,0x7f,0xd8,0x28,0xdc,0x78,0xe5,0x1b,0x87,0x6f,0xca,0xbf,0x99,0xdc,0x94,0xb4,0xa9,0xab,0xc4,0xb9,0x64,0xcf,0x66,0xd2,0x66,0xe9,0xe6,0xde,0x2d,0x9e,0x5b,0xe,0x96,0xaa,0x97,0xe6,0x97,0xe,0x6e,0xd,0xd9,0xda,0xb4,0xd,0xdf,0x56,0xb4,0xed,0xf5,0xf6,0x45,0xdb,0x2f,0x97,0xcd,0x28,0xdb,0xbb,0x83,0xb6,0x43,0xb9,0xa3,0xbf,0x3c,0xb8,0xbc,0x65,0xa7,0xc9,0xce,0xcd,0x3b,0x3f,0x54,0xa4,0x54,0xf4,0x54,0xfa,0x54,0x36,0xee,0xd2,0xdd,0xb5,0x61,0xd7,0xf8,0x6e,0xd1,0xee,0x1b,0x7b,0xbc,0xf6,0x34,0xec,0xd5,0xdb,0x5b,0xbc,0xf7,0xfd,0x3e,0xc9,0xbe,0xdb,0x55,0x1,0x55,0x4d,0xd5,0x66,0xd5,0x65,0xfb,0x49,0xfb,0xb3,0xf7,0x3f,0xae,0x89,0xaa,0xe9,0xf8,0x96,0xfb,0x6d,0x5d,0xad,0x4e,0x6d,0x71,0xed,0xc7,0x3,0xd2,0x3,0xfd,0x7,0x23,0xe,0xb6,0xd7,0xb9,0xd4,0xd5,0x1d,0xd2,0x3d,0x54,0x52,0x8f,0xd6,0x2b,0xeb,0x47,0xe,0xc7,0x1f,0xbe,0xfe,0x9d,0xef,0x77,0x2d,0xd,0x36,0xd,0x55,0x8d,0x9c,0xc6,0xe2,0x23,0x70,0x44,0x79,0xe4,0xe9,0xf7,0x9,0xdf,0xf7,0x1e,0xd,0x3a,0xda,0x76,0x8c,0x7b,0xac,0xe1,0x7,0xd3,0x1f,0x76,0x1d,0x67,0x1d,0x2f,0x6a,0x42,0x9a,0xf2,0x9a,0x46,0x9b,0x53,0x9a,0xfb,0x5b,0x62,0x5b,0xba,0x4f,0xcc,0x3e,0xd1,0xd6,0xea,0xde,0x7a,0xfc,0x47,0xdb,0x1f,0xf,0x9c,0x34,0x3c,0x59,0x79,0x4a,0xf3,0x54,0xc9,0x69,0xda,0xe9,0x82,0xd3,0x93,0x67,0xf2,0xcf,0x8c,0x9d,0x95,0x9d,0x7d,0x7e,0x2e,0xf9,0xdc,0x60,0xdb,0xa2,0xb6,0x7b,0xe7,0x63,0xce,0xdf,0x6a,0xf,0x6f,0xef,0xba,0x10,0x74,0xe1,0xd2,0x45,0xff,0x8b,0xe7,0x3b,0xbc,0x3b,0xce,0x5c,0xf2,0xb8,0x74,0xf2,0xb2,0xdb,0xe5,0x13,0x57,0xb8,0x57,0x9a,0xaf,0x3a,0x5f,0x6d,0xea,0x74,0xea,0x3c,0xfe,0x93,0xd3,0x4f,0xc7,0xbb,0x9c,0xbb,0x9a,0xae,0xb9,0x5c,0x6b,0xb9,0xee,0x7a,0xbd,0xb5,0x7b,0x66,0xf7,0xe9,0x1b,0x9e,0x37,0xce,0xdd,0xf4,0xbd,0x79,0xf1,0x16,0xff,0xd6,0xd5,0x9e,0x39,0x3d,0xdd,0xbd,0xf3,0x7a,0x6f,0xf7,0xc5,0xf7,0xf5,0xdf,0x16,0xdd,0x7e,0x72,0x27,0xfd,0xce,0xcb,0xbb,0xd9,0x77,0x27,0xee,0xad,0xbc,0x4f,0xbc,0x5f,0xf4,0x40,0xed,0x41,0xd9,0x43,0xdd,0x87,0xd5,0x3f,0x5b,0xfe,0xdc,0xd8,0xef,0xdc,0x7f,0x6a,0xc0,0x77,0xa0,0xf3,0xd1,0xdc,0x47,0xf7,0x6,0x85,0x83,0xcf,0xfe,0x91,0xf5,0x8f,0xf,0x43,0x5,0x8f,0x99,0x8f,0xcb,0x86,0xd,0x86,0xeb,0x9e,0x38,0x3e,0x39,0x39,0xe2,0x3f,0x72,0xfd,0xe9,0xfc,0xa7,0x43,0xcf,0x64,0xcf,0x26,0x9e,0x17,0xfe,0xa2,0xfe,0xcb,0xae,0x17,0x16,0x2f,0x7e,0xf8,0xd5,0xeb,0xd7,0xce,0xd1,0x98,0xd1,0xa1,0x97,0xf2,0x97,0x93,0xbf,0x6d,0x7c,0xa5,0xfd,0xea,0xc0,0xeb,0x19,0xaf,0xdb,0xc6,0xc2,0xc6,0x1e,0xbe,0xc9,0x78,0x33,0x31,0x5e,0xf4,0x56,0xfb,0xed,0xc1,0x77,0xdc,0x77,0x1d,0xef,0xa3,0xdf,0xf,0x4f,0xe4,0x7c,0x20,0x7f,0x28,0xff,0x68,0xf9,0xb1,0xf5,0x53,0xd0,0xa7,0xfb,0x93,0x19,0x93,0x93,0xff,0x4,0x3,0x98,0xf3,0xfc,0xef,0x35,0x94,0x82,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xa,0x14,0x2,0x27,0xa,0x83,0xe3,0x53,0x26,0x0,0x0,0x0,0xaf,0x49,0x44,0x41,0x54,0x38,0xcb,0xcd,0xd2,0x31,0xe,0x1,0x41,0x18,0xc5,0xf1,0x1f,0x51,0xd0,0x28,0x5c,0x83,0x44,0xaf,0x53,0xed,0x19,0x68,0x89,0x13,0x38,0xc6,0x9e,0x0,0x17,0x51,0x6d,0x45,0x2f,0xe1,0x1a,0x12,0x1a,0x34,0x4b,0x33,0x9b,0x6c,0x36,0xbb,0xac,0x8a,0xd7,0xcc,0x4c,0xbe,0xf7,0xfe,0x33,0x93,0x3c,0x7e,0xad,0x46,0xb6,0x89,0xe2,0xa4,0x8b,0x3e,0x86,0xe8,0xe5,0x67,0x41,0x4f,0x9c,0x71,0xc0,0x69,0xbb,0x1c,0x5f,0xa1,0x95,0x33,0xc,0x30,0xc2,0x6,0xf7,0x8a,0xb,0xdb,0x98,0x7,0xf8,0xbe,0x8,0x18,0x62,0xbd,0x5d,0x8e,0x2f,0x6f,0x5e,0x7c,0x8f,0xe2,0x64,0x8d,0x69,0x6,0x68,0xe6,0x86,0x3d,0xdc,0x6a,0x7c,0xfb,0x16,0xbc,0x8a,0x80,0xb2,0x73,0x99,0x9a,0xdf,0x6,0xea,0xd3,0xfe,0x2,0x90,0xd6,0xc8,0xa4,0x55,0x80,0x33,0x3a,0x35,0x0,0xed,0xe0,0x55,0xec,0xc1,0x1,0x8b,0x28,0x4e,0x56,0x78,0x54,0x84,0x3b,0x98,0x65,0x1d,0x28,0x2,0x8e,0x61,0x9d,0x7c,0xa8,0xf2,0xe,0x27,0x7f,0xa3,0x17,0x70,0x92,0x23,0xf,0xde,0x2f,0xa7,0x24,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x4,0x3,0x0,0x0,0x0,0xed,0xdd,0xe2,0x52,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x30,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0xff,0xff,0xff,0xb9,0xa2,0x9b,0xc9,0x0,0x0,0x0,0xf,0x74,0x52,0x4e,0x53,0x0,0xe,0x39,0x68,0x7a,0x7b,0x3a,0x74,0x10,0x8,0x69,0xf,0x6,0x75,0x11,0xb8,0x16,0x0,0x1,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0xf,0x18,0xba,0x0,0xd9,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x3f,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0xc0,0x4,0x42,0x26,0xa1,0xa1,0xce,0x8a,0x40,0x46,0x7a,0xe7,0xcc,0x99,0x33,0xca,0x80,0x8c,0xd5,0x20,0xe1,0x5d,0x40,0x1c,0x3,0x62,0x1c,0x5,0xe2,0x48,0x10,0x63,0x2a,0x7e,0x6,0x5c,0x31,0x58,0xbb,0x14,0x10,0xe7,0xee,0x9c,0x39,0x73,0x1e,0xc8,0x40,0x31,0x98,0x15,0xe8,0x0,0x0,0xec,0xe0,0x11,0x6d,0x2c,0x6f,0x45,0x2b,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char button_hover_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0xa,0x45,0x69,0x43,0x43,0x50,0x49,0x43,0x43,0x20,0x70,0x72,0x6f,0x66,0x69,0x6c,0x65,0x0,0x0,0x78,0xda,0x9d,0x53,0x67,0x54,0x53,0xe9,0x16,0x3d,0xf7,0xde,0xf4,0x42,0x4b,0x88,0x80,0x94,0x4b,0x6f,0x52,0x15,0x8,0x20,0x52,0x42,0x8b,0x80,0x14,0x91,0x26,0x2a,0x21,0x9,0x10,0x4a,0x88,0x21,0xa1,0xd9,0x15,0x51,0xc1,0x11,0x45,0x45,0x4,0x1b,0xc8,0xa0,0x88,0x3,0x8e,0x8e,0x80,0x8c,0x15,0x51,0x2c,0xc,0x8a,0xa,0xd8,0x7,0xe4,0x21,0xa2,0x8e,0x83,0xa3,0x88,0x8a,0xca,0xfb,0xe1,0x7b,0xa3,0x6b,0xd6,0xbc,0xf7,0xe6,0xcd,0xfe,0xb5,0xd7,0x3e,0xe7,0xac,0xf3,0x9d,0xb3,0xcf,0x7,0xc0,0x8,0xc,0x96,0x48,0x33,0x51,0x35,0x80,0xc,0xa9,0x42,0x1e,0x11,0xe0,0x83,0xc7,0xc4,0xc6,0xe1,0xe4,0x2e,0x40,0x81,0xa,0x24,0x70,0x0,0x10,0x8,0xb3,0x64,0x21,0x73,0xfd,0x23,0x1,0x0,0xf8,0x7e,0x3c,0x3c,0x2b,0x22,0xc0,0x7,0xbe,0x0,0x1,0x78,0xd3,0xb,0x8,0x0,0xc0,0x4d,0x9b,0xc0,0x30,0x1c,0x87,0xff,0xf,0xea,0x42,0x99,0x5c,0x1,0x80,0x84,0x1,0xc0,0x74,0x91,0x38,0x4b,0x8,0x80,0x14,0x0,0x40,0x7a,0x8e,0x42,0xa6,0x0,0x40,0x46,0x1,0x80,0x9d,0x98,0x26,0x53,0x0,0xa0,0x4,0x0,0x60,0xcb,0x63,0x62,0xe3,0x0,0x50,0x2d,0x0,0x60,0x27,0x7f,0xe6,0xd3,0x0,0x80,0x9d,0xf8,0x99,0x7b,0x1,0x0,0x5b,0x94,0x21,0x15,0x1,0xa0,0x91,0x0,0x20,0x13,0x65,0x88,0x44,0x0,0x68,0x3b,0x0,0xac,0xcf,0x56,0x8a,0x45,0x0,0x58,0x30,0x0,0x14,0x66,0x4b,0xc4,0x39,0x0,0xd8,0x2d,0x0,0x30,0x49,0x57,0x66,0x48,0x0,0xb0,0xb7,0x0,0xc0,0xce,0x10,0xb,0xb2,0x0,0x8,0xc,0x0,0x30,0x51,0x88,0x85,0x29,0x0,0x4,0x7b,0x0,0x60,0xc8,0x23,0x23,0x78,0x0,0x84,0x99,0x0,0x14,0x46,0xf2,0x57,0x3c,0xf1,0x2b,0xae,0x10,0xe7,0x2a,0x0,0x0,0x78,0x99,0xb2,0x3c,0xb9,0x24,0x39,0x45,0x81,0x5b,0x8,0x2d,0x71,0x7,0x57,0x57,0x2e,0x1e,0x28,0xce,0x49,0x17,0x2b,0x14,0x36,0x61,0x2,0x61,0x9a,0x40,0x2e,0xc2,0x79,0x99,0x19,0x32,0x81,0x34,0xf,0xe0,0xf3,0xcc,0x0,0x0,0xa0,0x91,0x15,0x11,0xe0,0x83,0xf3,0xfd,0x78,0xce,0xe,0xae,0xce,0xce,0x36,0x8e,0xb6,0xe,0x5f,0x2d,0xea,0xbf,0x6,0xff,0x22,0x62,0x62,0xe3,0xfe,0xe5,0xcf,0xab,0x70,0x40,0x0,0x0,0xe1,0x74,0x7e,0xd1,0xfe,0x2c,0x2f,0xb3,0x1a,0x80,0x3b,0x6,0x80,0x6d,0xfe,0xa2,0x25,0xee,0x4,0x68,0x5e,0xb,0xa0,0x75,0xf7,0x8b,0x66,0xb2,0xf,0x40,0xb5,0x0,0xa0,0xe9,0xda,0x57,0xf3,0x70,0xf8,0x7e,0x3c,0x3c,0x45,0xa1,0x90,0xb9,0xd9,0xd9,0xe5,0xe4,0xe4,0xd8,0x4a,0xc4,0x42,0x5b,0x61,0xca,0x57,0x7d,0xfe,0x67,0xc2,0x5f,0xc0,0x57,0xfd,0x6c,0xf9,0x7e,0x3c,0xfc,0xf7,0xf5,0xe0,0xbe,0xe2,0x24,0x81,0x32,0x5d,0x81,0x47,0x4,0xf8,0xe0,0xc2,0xcc,0xf4,0x4c,0xa5,0x1c,0xcf,0x92,0x9,0x84,0x62,0xdc,0xe6,0x8f,0x47,0xfc,0xb7,0xb,0xff,0xfc,0x1d,0xd3,0x22,0xc4,0x49,0x62,0xb9,0x58,0x2a,0x14,0xe3,0x51,0x12,0x71,0x8e,0x44,0x9a,0x8c,0xf3,0x32,0xa5,0x22,0x89,0x42,0x92,0x29,0xc5,0x25,0xd2,0xff,0x64,0xe2,0xdf,0x2c,0xfb,0x3,0x3e,0xdf,0x35,0x0,0xb0,0x6a,0x3e,0x1,0x7b,0x91,0x2d,0xa8,0x5d,0x63,0x3,0xf6,0x4b,0x27,0x10,0x58,0x74,0xc0,0xe2,0xf7,0x0,0x0,0xf2,0xbb,0x6f,0xc1,0xd4,0x28,0x8,0x3,0x80,0x68,0x83,0xe1,0xcf,0x77,0xff,0xef,0x3f,0xfd,0x47,0xa0,0x25,0x0,0x80,0x66,0x49,0x92,0x71,0x0,0x0,0x5e,0x44,0x24,0x2e,0x54,0xca,0xb3,0x3f,0xc7,0x8,0x0,0x0,0x44,0xa0,0x81,0x2a,0xb0,0x41,0x1b,0xf4,0xc1,0x18,0x2c,0xc0,0x6,0x1c,0xc1,0x5,0xdc,0xc1,0xb,0xfc,0x60,0x36,0x84,0x42,0x24,0xc4,0xc2,0x42,0x10,0x42,0xa,0x64,0x80,0x1c,0x72,0x60,0x29,0xac,0x82,0x42,0x28,0x86,0xcd,0xb0,0x1d,0x2a,0x60,0x2f,0xd4,0x40,0x1d,0x34,0xc0,0x51,0x68,0x86,0x93,0x70,0xe,0x2e,0xc2,0x55,0xb8,0xe,0x3d,0x70,0xf,0xfa,0x61,0x8,0x9e,0xc1,0x28,0xbc,0x81,0x9,0x4,0x41,0xc8,0x8,0x13,0x61,0x21,0xda,0x88,0x1,0x62,0x8a,0x58,0x23,0x8e,0x8,0x17,0x99,0x85,0xf8,0x21,0xc1,0x48,0x4,0x12,0x8b,0x24,0x20,0xc9,0x88,0x14,0x51,0x22,0x4b,0x91,0x35,0x48,0x31,0x52,0x8a,0x54,0x20,0x55,0x48,0x1d,0xf2,0x3d,0x72,0x2,0x39,0x87,0x5c,0x46,0xba,0x91,0x3b,0xc8,0x0,0x32,0x82,0xfc,0x86,0xbc,0x47,0x31,0x94,0x81,0xb2,0x51,0x3d,0xd4,0xc,0xb5,0x43,0xb9,0xa8,0x37,0x1a,0x84,0x46,0xa2,0xb,0xd0,0x64,0x74,0x31,0x9a,0x8f,0x16,0xa0,0x9b,0xd0,0x72,0xb4,0x1a,0x3d,0x8c,0x36,0xa1,0xe7,0xd0,0xab,0x68,0xf,0xda,0x8f,0x3e,0x43,0xc7,0x30,0xc0,0xe8,0x18,0x7,0x33,0xc4,0x6c,0x30,0x2e,0xc6,0xc3,0x42,0xb1,0x38,0x2c,0x9,0x93,0x63,0xcb,0xb1,0x22,0xac,0xc,0xab,0xc6,0x1a,0xb0,0x56,0xac,0x3,0xbb,0x89,0xf5,0x63,0xcf,0xb1,0x77,0x4,0x12,0x81,0x45,0xc0,0x9,0x36,0x4,0x77,0x42,0x20,0x61,0x1e,0x41,0x48,0x58,0x4c,0x58,0x4e,0xd8,0x48,0xa8,0x20,0x1c,0x24,0x34,0x11,0xda,0x9,0x37,0x9,0x3,0x84,0x51,0xc2,0x27,0x22,0x93,0xa8,0x4b,0xb4,0x26,0xba,0x11,0xf9,0xc4,0x18,0x62,0x32,0x31,0x87,0x58,0x48,0x2c,0x23,0xd6,0x12,0x8f,0x13,0x2f,0x10,0x7b,0x88,0x43,0xc4,0x37,0x24,0x12,0x89,0x43,0x32,0x27,0xb9,0x90,0x2,0x49,0xb1,0xa4,0x54,0xd2,0x12,0xd2,0x46,0xd2,0x6e,0x52,0x23,0xe9,0x2c,0xa9,0x9b,0x34,0x48,0x1a,0x23,0x93,0xc9,0xda,0x64,0x6b,0xb2,0x7,0x39,0x94,0x2c,0x20,0x2b,0xc8,0x85,0xe4,0x9d,0xe4,0xc3,0xe4,0x33,0xe4,0x1b,0xe4,0x21,0xf2,0x5b,0xa,0x9d,0x62,0x40,0x71,0xa4,0xf8,0x53,0xe2,0x28,0x52,0xca,0x6a,0x4a,0x19,0xe5,0x10,0xe5,0x34,0xe5,0x6,0x65,0x98,0x32,0x41,0x55,0xa3,0x9a,0x52,0xdd,0xa8,0xa1,0x54,0x11,0x35,0x8f,0x5a,0x42,0xad,0xa1,0xb6,0x52,0xaf,0x51,0x87,0xa8,0x13,0x34,0x75,0x9a,0x39,0xcd,0x83,0x16,0x49,0x4b,0xa5,0xad,0xa2,0x95,0xd3,0x1a,0x68,0x17,0x68,0xf7,0x69,0xaf,0xe8,0x74,0xba,0x11,0xdd,0x95,0x1e,0x4e,0x97,0xd0,0x57,0xd2,0xcb,0xe9,0x47,0xe8,0x97,0xe8,0x3,0xf4,0x77,0xc,0xd,0x86,0x15,0x83,0xc7,0x88,0x67,0x28,0x19,0x9b,0x18,0x7,0x18,0x67,0x19,0x77,0x18,0xaf,0x98,0x4c,0xa6,0x19,0xd3,0x8b,0x19,0xc7,0x54,0x30,0x37,0x31,0xeb,0x98,0xe7,0x99,0xf,0x99,0x6f,0x55,0x58,0x2a,0xb6,0x2a,0x7c,0x15,0x91,0xca,0xa,0x95,0x4a,0x95,0x26,0x95,0x1b,0x2a,0x2f,0x54,0xa9,0xaa,0xa6,0xaa,0xde,0xaa,0xb,0x55,0xf3,0x55,0xcb,0x54,0x8f,0xa9,0x5e,0x53,0x7d,0xae,0x46,0x55,0x33,0x53,0xe3,0xa9,0x9,0xd4,0x96,0xab,0x55,0xaa,0x9d,0x50,0xeb,0x53,0x1b,0x53,0x67,0xa9,0x3b,0xa8,0x87,0xaa,0x67,0xa8,0x6f,0x54,0x3f,0xa4,0x7e,0x59,0xfd,0x89,0x6,0x59,0xc3,0x4c,0xc3,0x4f,0x43,0xa4,0x51,0xa0,0xb1,0x5f,0xe3,0xbc,0xc6,0x20,0xb,0x63,0x19,0xb3,0x78,0x2c,0x21,0x6b,0xd,0xab,0x86,0x75,0x81,0x35,0xc4,0x26,0xb1,0xcd,0xd9,0x7c,0x76,0x2a,0xbb,0x98,0xfd,0x1d,0xbb,0x8b,0x3d,0xaa,0xa9,0xa1,0x39,0x43,0x33,0x4a,0x33,0x57,0xb3,0x52,0xf3,0x94,0x66,0x3f,0x7,0xe3,0x98,0x71,0xf8,0x9c,0x74,0x4e,0x9,0xe7,0x28,0xa7,0x97,0xf3,0x7e,0x8a,0xde,0x14,0xef,0x29,0xe2,0x29,0x1b,0xa6,0x34,0x4c,0xb9,0x31,0x65,0x5c,0x6b,0xaa,0x96,0x97,0x96,0x58,0xab,0x48,0xab,0x51,0xab,0x47,0xeb,0xbd,0x36,0xae,0xed,0xa7,0x9d,0xa6,0xbd,0x45,0xbb,0x59,0xfb,0x81,0xe,0x41,0xc7,0x4a,0x27,0x5c,0x27,0x47,0x67,0x8f,0xce,0x5,0x9d,0xe7,0x53,0xd9,0x53,0xdd,0xa7,0xa,0xa7,0x16,0x4d,0x3d,0x3a,0xf5,0xae,0x2e,0xaa,0x6b,0xa5,0x1b,0xa1,0xbb,0x44,0x77,0xbf,0x6e,0xa7,0xee,0x98,0x9e,0xbe,0x5e,0x80,0x9e,0x4c,0x6f,0xa7,0xde,0x79,0xbd,0xe7,0xfa,0x1c,0x7d,0x2f,0xfd,0x54,0xfd,0x6d,0xfa,0xa7,0xf5,0x47,0xc,0x58,0x6,0xb3,0xc,0x24,0x6,0xdb,0xc,0xce,0x18,0x3c,0xc5,0x35,0x71,0x6f,0x3c,0x1d,0x2f,0xc7,0xdb,0xf1,0x51,0x43,0x5d,0xc3,0x40,0x43,0xa5,0x61,0x95,0x61,0x97,0xe1,0x84,0x91,0xb9,0xd1,0x3c,0xa3,0xd5,0x46,0x8d,0x46,0xf,0x8c,0x69,0xc6,0x5c,0xe3,0x24,0xe3,0x6d,0xc6,0x6d,0xc6,0xa3,0x26,0x6,0x26,0x21,0x26,0x4b,0x4d,0xea,0x4d,0xee,0x9a,0x52,0x4d,0xb9,0xa6,0x29,0xa6,0x3b,0x4c,0x3b,0x4c,0xc7,0xcd,0xcc,0xcd,0xa2,0xcd,0xd6,0x99,0x35,0x9b,0x3d,0x31,0xd7,0x32,0xe7,0x9b,0xe7,0x9b,0xd7,0x9b,0xdf,0xb7,0x60,0x5a,0x78,0x5a,0x2c,0xb6,0xa8,0xb6,0xb8,0x65,0x49,0xb2,0xe4,0x5a,0xa6,0x59,0xee,0xb6,0xbc,0x6e,0x85,0x5a,0x39,0x59,0xa5,0x58,0x55,0x5a,0x5d,0xb3,0x46,0xad,0x9d,0xad,0x25,0xd6,0xbb,0xad,0xbb,0xa7,0x11,0xa7,0xb9,0x4e,0x93,0x4e,0xab,0x9e,0xd6,0x67,0xc3,0xb0,0xf1,0xb6,0xc9,0xb6,0xa9,0xb7,0x19,0xb0,0xe5,0xd8,0x6,0xdb,0xae,0xb6,0x6d,0xb6,0x7d,0x61,0x67,0x62,0x17,0x67,0xb7,0xc5,0xae,0xc3,0xee,0x93,0xbd,0x93,0x7d,0xba,0x7d,0x8d,0xfd,0x3d,0x7,0xd,0x87,0xd9,0xe,0xab,0x1d,0x5a,0x1d,0x7e,0x73,0xb4,0x72,0x14,0x3a,0x56,0x3a,0xde,0x9a,0xce,0x9c,0xee,0x3f,0x7d,0xc5,0xf4,0x96,0xe9,0x2f,0x67,0x58,0xcf,0x10,0xcf,0xd8,0x33,0xe3,0xb6,0x13,0xcb,0x29,0xc4,0x69,0x9d,0x53,0x9b,0xd3,0x47,0x67,0x17,0x67,0xb9,0x73,0x83,0xf3,0x88,0x8b,0x89,0x4b,0x82,0xcb,0x2e,0x97,0x3e,0x2e,0x9b,0x1b,0xc6,0xdd,0xc8,0xbd,0xe4,0x4a,0x74,0xf5,0x71,0x5d,0xe1,0x7a,0xd2,0xf5,0x9d,0x9b,0xb3,0x9b,0xc2,0xed,0xa8,0xdb,0xaf,0xee,0x36,0xee,0x69,0xee,0x87,0xdc,0x9f,0xcc,0x34,0x9f,0x29,0x9e,0x59,0x33,0x73,0xd0,0xc3,0xc8,0x43,0xe0,0x51,0xe5,0xd1,0x3f,0xb,0x9f,0x95,0x30,0x6b,0xdf,0xac,0x7e,0x4f,0x43,0x4f,0x81,0x67,0xb5,0xe7,0x23,0x2f,0x63,0x2f,0x91,0x57,0xad,0xd7,0xb0,0xb7,0xa5,0x77,0xaa,0xf7,0x61,0xef,0x17,0x3e,0xf6,0x3e,0x72,0x9f,0xe3,0x3e,0xe3,0x3c,0x37,0xde,0x32,0xde,0x59,0x5f,0xcc,0x37,0xc0,0xb7,0xc8,0xb7,0xcb,0x4f,0xc3,0x6f,0x9e,0x5f,0x85,0xdf,0x43,0x7f,0x23,0xff,0x64,0xff,0x7a,0xff,0xd1,0x0,0xa7,0x80,0x25,0x1,0x67,0x3,0x89,0x81,0x41,0x81,0x5b,0x2,0xfb,0xf8,0x7a,0x7c,0x21,0xbf,0x8e,0x3f,0x3a,0xdb,0x65,0xf6,0xb2,0xd9,0xed,0x41,0x8c,0xa0,0xb9,0x41,0x15,0x41,0x8f,0x82,0xad,0x82,0xe5,0xc1,0xad,0x21,0x68,0xc8,0xec,0x90,0xad,0x21,0xf7,0xe7,0x98,0xce,0x91,0xce,0x69,0xe,0x85,0x50,0x7e,0xe8,0xd6,0xd0,0x7,0x61,0xe6,0x61,0x8b,0xc3,0x7e,0xc,0x27,0x85,0x87,0x85,0x57,0x86,0x3f,0x8e,0x70,0x88,0x58,0x1a,0xd1,0x31,0x97,0x35,0x77,0xd1,0xdc,0x43,0x73,0xdf,0x44,0xfa,0x44,0x96,0x44,0xde,0x9b,0x67,0x31,0x4f,0x39,0xaf,0x2d,0x4a,0x35,0x2a,0x3e,0xaa,0x2e,0x6a,0x3c,0xda,0x37,0xba,0x34,0xba,0x3f,0xc6,0x2e,0x66,0x59,0xcc,0xd5,0x58,0x9d,0x58,0x49,0x6c,0x4b,0x1c,0x39,0x2e,0x2a,0xae,0x36,0x6e,0x6c,0xbe,0xdf,0xfc,0xed,0xf3,0x87,0xe2,0x9d,0xe2,0xb,0xe3,0x7b,0x17,0x98,0x2f,0xc8,0x5d,0x70,0x79,0xa1,0xce,0xc2,0xf4,0x85,0xa7,0x16,0xa9,0x2e,0x12,0x2c,0x3a,0x96,0x40,0x4c,0x88,0x4e,0x38,0x94,0xf0,0x41,0x10,0x2a,0xa8,0x16,0x8c,0x25,0xf2,0x13,0x77,0x25,0x8e,0xa,0x79,0xc2,0x1d,0xc2,0x67,0x22,0x2f,0xd1,0x36,0xd1,0x88,0xd8,0x43,0x5c,0x2a,0x1e,0x4e,0xf2,0x48,0x2a,0x4d,0x7a,0x92,0xec,0x91,0xbc,0x35,0x79,0x24,0xc5,0x33,0xa5,0x2c,0xe5,0xb9,0x84,0x27,0xa9,0x90,0xbc,0x4c,0xd,0x4c,0xdd,0x9b,0x3a,0x9e,0x16,0x9a,0x76,0x20,0x6d,0x32,0x3d,0x3a,0xbd,0x31,0x83,0x92,0x91,0x90,0x71,0x42,0xaa,0x21,0x4d,0x93,0xb6,0x67,0xea,0x67,0xe6,0x66,0x76,0xcb,0xac,0x65,0x85,0xb2,0xfe,0xc5,0x6e,0x8b,0xb7,0x2f,0x1e,0x95,0x7,0xc9,0x6b,0xb3,0x90,0xac,0x5,0x59,0x2d,0xa,0xb6,0x42,0xa6,0xe8,0x54,0x5a,0x28,0xd7,0x2a,0x7,0xb2,0x67,0x65,0x57,0x66,0xbf,0xcd,0x89,0xca,0x39,0x96,0xab,0x9e,0x2b,0xcd,0xed,0xcc,0xb3,0xca,0xdb,0x90,0x37,0x9c,0xef,0x9f,0xff,0xed,0x12,0xc2,0x12,0xe1,0x92,0xb6,0xa5,0x86,0x4b,0x57,0x2d,0x1d,0x58,0xe6,0xbd,0xac,0x6a,0x39,0xb2,0x3c,0x71,0x79,0xdb,0xa,0xe3,0x15,0x5,0x2b,0x86,0x56,0x6,0xac,0x3c,0xb8,0x8a,0xb6,0x2a,0x6d,0xd5,0x4f,0xab,0xed,0x57,0x97,0xae,0x7e,0xbd,0x26,0x7a,0x4d,0x6b,0x81,0x5e,0xc1,0xca,0x82,0xc1,0xb5,0x1,0x6b,0xeb,0xb,0x55,0xa,0xe5,0x85,0x7d,0xeb,0xdc,0xd7,0xed,0x5d,0x4f,0x58,0x2f,0x59,0xdf,0xb5,0x61,0xfa,0x86,0x9d,0x1b,0x3e,0x15,0x89,0x8a,0xae,0x14,0xdb,0x17,0x97,0x15,0x7f,0xd8,0x28,0xdc,0x78,0xe5,0x1b,0x87,0x6f,0xca,0xbf,0x99,0xdc,0x94,0xb4,0xa9,0xab,0xc4,0xb9,0x64,0xcf,0x66,0xd2,0x66,0xe9,0xe6,0xde,0x2d,0x9e,0x5b,0xe,0x96,0xaa,0x97,0xe6,0x97,0xe,0x6e,0xd,0xd9,0xda,0xb4,0xd,0xdf,0x56,0xb4,0xed,0xf5,0xf6,0x45,0xdb,0x2f,0x97,0xcd,0x28,0xdb,0xbb,0x83,0xb6,0x43,0xb9,0xa3,0xbf,0x3c,0xb8,0xbc,0x65,0xa7,0xc9,0xce,0xcd,0x3b,0x3f,0x54,0xa4,0x54,0xf4,0x54,0xfa,0x54,0x36,0xee,0xd2,0xdd,0xb5,0x61,0xd7,0xf8,0x6e,0xd1,0xee,0x1b,0x7b,0xbc,0xf6,0x34,0xec,0xd5,0xdb,0x5b,0xbc,0xf7,0xfd,0x3e,0xc9,0xbe,0xdb,0x55,0x1,0x55,0x4d,0xd5,0x66,0xd5,0x65,0xfb,0x49,0xfb,0xb3,0xf7,0x3f,0xae,0x89,0xaa,0xe9,0xf8,0x96,0xfb,0x6d,0x5d,0xad,0x4e,0x6d,0x71,0xed,0xc7,0x3,0xd2,0x3,0xfd,0x7,0x23,0xe,0xb6,0xd7,0xb9,0xd4,0xd5,0x1d,0xd2,0x3d,0x54,0x52,0x8f,0xd6,0x2b,0xeb,0x47,0xe,0xc7,0x1f,0xbe,0xfe,0x9d,0xef,0x77,0x2d,0xd,0x36,0xd,0x55,0x8d,0x9c,0xc6,0xe2,0x23,0x70,0x44,0x79,0xe4,0xe9,0xf7,0x9,0xdf,0xf7,0x1e,0xd,0x3a,0xda,0x76,0x8c,0x7b,0xac,0xe1,0x7,0xd3,0x1f,0x76,0x1d,0x67,0x1d,0x2f,0x6a,0x42,0x9a,0xf2,0x9a,0x46,0x9b,0x53,0x9a,0xfb,0x5b,0x62,0x5b,0xba,0x4f,0xcc,0x3e,0xd1,0xd6,0xea,0xde,0x7a,0xfc,0x47,0xdb,0x1f,0xf,0x9c,0x34,0x3c,0x59,0x79,0x4a,0xf3,0x54,0xc9,0x69,0xda,0xe9,0x82,0xd3,0x93,0x67,0xf2,0xcf,0x8c,0x9d,0x95,0x9d,0x7d,0x7e,0x2e,0xf9,0xdc,0x60,0xdb,0xa2,0xb6,0x7b,0xe7,0x63,0xce,0xdf,0x6a,0xf,0x6f,0xef,0xba,0x10,0x74,0xe1,0xd2,0x45,0xff,0x8b,0xe7,0x3b,0xbc,0x3b,0xce,0x5c,0xf2,0xb8,0x74,0xf2,0xb2,0xdb,0xe5,0x13,0x57,0xb8,0x57,0x9a,0xaf,0x3a,0x5f,0x6d,0xea,0x74,0xea,0x3c,0xfe,0x93,0xd3,0x4f,0xc7,0xbb,0x9c,0xbb,0x9a,0xae,0xb9,0x5c,0x6b,0xb9,0xee,0x7a,0xbd,0xb5,0x7b,0x66,0xf7,0xe9,0x1b,0x9e,0x37,0xce,0xdd,0xf4,0xbd,0x79,0xf1,0x16,0xff,0xd6,0xd5,0x9e,0x39,0x3d,0xdd,0xbd,0xf3,0x7a,0x6f,0xf7,0xc5,0xf7,0xf5,0xdf,0x16,0xdd,0x7e,0x72,0x27,0xfd,0xce,0xcb,0xbb,0xd9,0x77,0x27,0xee,0xad,0xbc,0x4f,0xbc,0x5f,0xf4,0x40,0xed,0x41,0xd9,0x43,0xdd,0x87,0xd5,0x3f,0x5b,0xfe,0xdc,0xd8,0xef,0xdc,0x7f,0x6a,0xc0,0x77,0xa0,0xf3,0xd1,0xdc,0x47,0xf7,0x6,0x85,0x83,0xcf,0xfe,0x91,0xf5,0x8f,0xf,0x43,0x5,0x8f,0x99,0x8f,0xcb,0x86,0xd,0x86,0xeb,0x9e,0x38,0x3e,0x39,0x39,0xe2,0x3f,0x72,0xfd,0xe9,0xfc,0xa7,0x43,0xcf,0x64,0xcf,0x26,0x9e,0x17,0xfe,0xa2,0xfe,0xcb,0xae,0x17,0x16,0x2f,0x7e,0xf8,0xd5,0xeb,0xd7,0xce,0xd1,0x98,0xd1,0xa1,0x97,0xf2,0x97,0x93,0xbf,0x6d,0x7c,0xa5,0xfd,0xea,0xc0,0xeb,0x19,0xaf,0xdb,0xc6,0xc2,0xc6,0x1e,0xbe,0xc9,0x78,0x33,0x31,0x5e,0xf4,0x56,0xfb,0xed,0xc1,0x77,0xdc,0x77,0x1d,0xef,0xa3,0xdf,0xf,0x4f,0xe4,0x7c,0x20,0x7f,0x28,0xff,0x68,0xf9,0xb1,0xf5,0x53,0xd0,0xa7,0xfb,0x93,0x19,0x93,0x93,0xff,0x4,0x3,0x98,0xf3,0xfc,0xef,0x35,0x94,0x82,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xa,0x14,0x2,0x26,0x1b,0xf0,0x48,0x42,0x95,0x0,0x0,0x1,0x3c,0x49,0x44,0x41,0x54,0x38,0xcb,0xa5,0x93,0xc1,0x4a,0x3,0x41,0xc,0x86,0xbf,0x99,0x8d,0xae,0xe8,0xa1,0x7b,0xd4,0xc2,0x42,0x7d,0x13,0xf1,0xea,0xcd,0xa7,0xe9,0x23,0x14,0x1f,0xc6,0x9b,0x47,0xc5,0x37,0x11,0x2a,0x68,0x41,0x28,0x5b,0x68,0xa1,0xdb,0x9d,0x9d,0x78,0x68,0xa6,0xda,0xa2,0x6b,0x8b,0x81,0x30,0x39,0x64,0x92,0xff,0x4f,0xfe,0x38,0x40,0x80,0x63,0x20,0x7,0x4e,0x2c,0xce,0x0,0xcf,0xb6,0x45,0xa0,0x5,0x56,0xc0,0x12,0xa8,0x81,0x55,0xfa,0x7c,0x6,0x14,0x40,0xcf,0xe2,0x1c,0x70,0xe6,0x0,0x6a,0x5e,0x3,0xb,0x60,0x6,0x54,0x58,0xf7,0x1c,0x28,0xae,0xaf,0x6e,0x6e,0xcb,0xfe,0xe5,0x30,0xb4,0xa1,0x50,0x55,0x7e,0x32,0xe7,0x1c,0x92,0x49,0xf5,0xfa,0xf6,0x32,0x7a,0x7a,0x7e,0xb8,0x7,0x82,0x18,0xec,0x5e,0xd9,0x1f,0xc,0xa7,0xd5,0x47,0x11,0x42,0x43,0x67,0x1,0x39,0x2a,0xca,0xfe,0x60,0x8,0x3c,0x2,0x73,0x9f,0x28,0x84,0xb6,0xe9,0xfc,0xc,0xa0,0xaa,0x84,0xd0,0x10,0xda,0xa6,0x30,0xaa,0xc7,0x62,0x3,0xcb,0x63,0x8c,0xc4,0x18,0xf9,0xcb,0x54,0x35,0xe5,0xe5,0x40,0x26,0x36,0x6d,0xa7,0xa,0x1d,0xcd,0x77,0x8a,0xac,0x19,0x1,0x5e,0x12,0xbd,0xa8,0xda,0x9,0x7f,0x6b,0x9f,0xeb,0x3c,0x97,0xb6,0xb0,0xb3,0xa9,0xbd,0x30,0x6c,0x22,0xd9,0xa0,0x8a,0x7,0x50,0x88,0x5f,0x55,0xc4,0x14,0xa6,0x9b,0x67,0x3f,0x12,0xa9,0x40,0x14,0x93,0x67,0xfd,0x7d,0xca,0x5d,0xe6,0x5c,0x12,0x27,0x35,0xd0,0x7a,0xd3,0xf6,0xc2,0x79,0xa9,0x32,0x2f,0xa0,0x8e,0xb4,0x91,0x5d,0x47,0x1d,0x99,0x17,0xbc,0x97,0xca,0x24,0xbd,0x12,0x3b,0x8c,0xd9,0x64,0x32,0x1e,0x5d,0x9c,0x97,0xc3,0xd0,0x86,0xe2,0xd7,0x61,0xac,0xa5,0x3c,0x7d,0x9f,0x8c,0xef,0xec,0x1e,0x96,0xe,0x38,0xfd,0xc7,0x31,0x2d,0xc4,0x28,0x0,0x4,0x60,0x7e,0xe8,0x39,0x7f,0x2,0x5b,0xc,0xa3,0x3f,0x1f,0xdb,0xad,0x8d,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x8d,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x42,0x40,0x4b,0x5f,0x5a,0x6c,0x5f,0x5a,0x6b,0x56,0x53,0x64,0x57,0x53,0x64,0x3e,0x3b,0x46,0x57,0x53,0x63,0x57,0x53,0x63,0x5b,0x57,0x68,0x5a,0x56,0x67,0x4d,0x4a,0x57,0x49,0x46,0x52,0x48,0x45,0x51,0x5b,0x57,0x66,0x59,0x55,0x64,0x47,0x44,0x50,0x58,0x54,0x64,0x46,0x43,0x50,0x56,0x53,0x63,0x45,0x42,0x4f,0x56,0x53,0x62,0x45,0x42,0x4e,0x55,0x51,0x62,0x44,0x41,0x4e,0x55,0x51,0x60,0x44,0x41,0x4d,0x43,0x40,0x4c,0x47,0x43,0x51,0x43,0x3f,0x4d,0x42,0x3f,0x4c,0x53,0x50,0x5f,0x53,0x4f,0x5e,0xff,0xff,0xff,0x99,0x8b,0x2e,0x55,0x0,0x0,0x0,0x16,0x74,0x52,0x4e,0x53,0x4,0xa,0x11,0x19,0x1f,0x22,0x24,0x15,0x25,0x34,0x3f,0x46,0x47,0x48,0x77,0xef,0xef,0xef,0xef,0x77,0xef,0xed,0x6b,0x28,0x52,0x7a,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x2e,0x54,0xd3,0x10,0x87,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x97,0x49,0x44,0x41,0x54,0x18,0xd3,0x65,0xcf,0x49,0x12,0x82,0x30,0x10,0x5,0xd0,0xce,0x48,0x46,0x40,0x51,0x4,0x41,0x45,0xc4,0x20,0x88,0xf7,0xbf,0x9e,0x21,0x45,0x65,0xa1,0x6f,0xd7,0xbf,0xaa,0x27,0x0,0x84,0x9,0x65,0xdc,0x63,0x94,0x60,0x4,0x80,0x12,0x21,0x95,0x36,0xd6,0x1a,0xad,0xa4,0x48,0x10,0x60,0x91,0x66,0xe5,0x29,0x28,0xb3,0x54,0x60,0x20,0x32,0xaf,0xea,0x73,0x50,0x57,0xb9,0x24,0x40,0x55,0xb3,0xd5,0x3e,0x69,0x14,0x5,0xa6,0xdb,0x4b,0xd4,0x6a,0x6,0xdc,0x5c,0x6f,0xd1,0xd5,0x70,0xe0,0xb6,0xbb,0x47,0x9d,0x5d,0x83,0xfe,0x11,0xf5,0x6b,0x60,0x86,0x67,0x34,0xf8,0x16,0xa6,0xdd,0x18,0x39,0x3f,0x94,0x2a,0x37,0xbe,0x36,0xa3,0xf3,0x6b,0x89,0xdc,0x4d,0xf3,0x3b,0x98,0xa7,0xbd,0x3f,0xc,0x8b,0xe2,0xb0,0x7c,0x82,0xe5,0x58,0xf8,0xd3,0xff,0x9e,0xfb,0x7d,0xff,0xb,0x74,0xeb,0x15,0x11,0xe1,0xa7,0x60,0xfc,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char button_normal_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0xa,0x45,0x69,0x43,0x43,0x50,0x49,0x43,0x43,0x20,0x70,0x72,0x6f,0x66,0x69,0x6c,0x65,0x0,0x0,0x78,0xda,0x9d,0x53,0x67,0x54,0x53,0xe9,0x16,0x3d,0xf7,0xde,0xf4,0x42,0x4b,0x88,0x80,0x94,0x4b,0x6f,0x52,0x15,0x8,0x20,0x52,0x42,0x8b,0x80,0x14,0x91,0x26,0x2a,0x21,0x9,0x10,0x4a,0x88,0x21,0xa1,0xd9,0x15,0x51,0xc1,0x11,0x45,0x45,0x4,0x1b,0xc8,0xa0,0x88,0x3,0x8e,0x8e,0x80,0x8c,0x15,0x51,0x2c,0xc,0x8a,0xa,0xd8,0x7,0xe4,0x21,0xa2,0x8e,0x83,0xa3,0x88,0x8a,0xca,0xfb,0xe1,0x7b,0xa3,0x6b,0xd6,0xbc,0xf7,0xe6,0xcd,0xfe,0xb5,0xd7,0x3e,0xe7,0xac,0xf3,0x9d,0xb3,0xcf,0x7,0xc0,0x8,0xc,0x96,0x48,0x33,0x51,0x35,0x80,0xc,0xa9,0x42,0x1e,0x11,0xe0,0x83,0xc7,0xc4,0xc6,0xe1,0xe4,0x2e,0x40,0x81,0xa,0x24,0x70,0x0,0x10,0x8,0xb3,0x64,0x21,0x73,0xfd,0x23,0x1,0x0,0xf8,0x7e,0x3c,0x3c,0x2b,0x22,0xc0,0x7,0xbe,0x0,0x1,0x78,0xd3,0xb,0x8,0x0,0xc0,0x4d,0x9b,0xc0,0x30,0x1c,0x87,0xff,0xf,0xea,0x42,0x99,0x5c,0x1,0x80,0x84,0x1,0xc0,0x74,0x91,0x38,0x4b,0x8,0x80,0x14,0x0,0x40,0x7a,0x8e,0x42,0xa6,0x0,0x40,0x46,0x1,0x80,0x9d,0x98,0x26,0x53,0x0,0xa0,0x4,0x0,0x60,0xcb,0x63,0x62,0xe3,0x0,0x50,0x2d,0x0,0x60,0x27,0x7f,0xe6,0xd3,0x0,0x80,0x9d,0xf8,0x99,0x7b,0x1,0x0,0x5b,0x94,0x21,0x15,0x1,0xa0,0x91,0x0,0x20,0x13,0x65,0x88,0x44,0x0,0x68,0x3b,0x0,0xac,0xcf,0x56,0x8a,0x45,0x0,0x58,0x30,0x0,0x14,0x66,0x4b,0xc4,0x39,0x0,0xd8,0x2d,0x0,0x30,0x49,0x57,0x66,0x48,0x0,0xb0,0xb7,0x0,0xc0,0xce,0x10,0xb,0xb2,0x0,0x8,0xc,0x0,0x30,0x51,0x88,0x85,0x29,0x0,0x4,0x7b,0x0,0x60,0xc8,0x23,0x23,0x78,0x0,0x84,0x99,0x0,0x14,0x46,0xf2,0x57,0x3c,0xf1,0x2b,0xae,0x10,0xe7,0x2a,0x0,0x0,0x78,0x99,0xb2,0x3c,0xb9,0x24,0x39,0x45,0x81,0x5b,0x8,0x2d,0x71,0x7,0x57,0x57,0x2e,0x1e,0x28,0xce,0x49,0x17,0x2b,0x14,0x36,0x61,0x2,0x61,0x9a,0x40,0x2e,0xc2,0x79,0x99,0x19,0x32,0x81,0x34,0xf,0xe0,0xf3,0xcc,0x0,0x0,0xa0,0x91,0x15,0x11,0xe0,0x83,0xf3,0xfd,0x78,0xce,0xe,0xae,0xce,0xce,0x36,0x8e,0xb6,0xe,0x5f,0x2d,0xea,0xbf,0x6,0xff,0x22,0x62,0x62,0xe3,0xfe,0xe5,0xcf,0xab,0x70,0x40,0x0,0x0,0xe1,0x74,0x7e,0xd1,0xfe,0x2c,0x2f,0xb3,0x1a,0x80,0x3b,0x6,0x80,0x6d,0xfe,0xa2,0x25,0xee,0x4,0x68,0x5e,0xb,0xa0,0x75,0xf7,0x8b,0x66,0xb2,0xf,0x40,0xb5,0x0,0xa0,0xe9,0xda,0x57,0xf3,0x70,0xf8,0x7e,0x3c,0x3c,0x45,0xa1,0x90,0xb9,0xd9,0xd9,0xe5,0xe4,0xe4,0xd8,0x4a,0xc4,0x42,0x5b,0x61,0xca,0x57,0x7d,0xfe,0x67,0xc2,0x5f,0xc0,0x57,0xfd,0x6c,0xf9,0x7e,0x3c,0xfc,0xf7,0xf5,0xe0,0xbe,0xe2,0x24,0x81,0x32,0x5d,0x81,0x47,0x4,0xf8,0xe0,0xc2,0xcc,0xf4,0x4c,0xa5,0x1c,0xcf,0x92,0x9,0x84,0x62,0xdc,0xe6,0x8f,0x47,0xfc,0xb7,0xb,0xff,0xfc,0x1d,0xd3,0x22,0xc4,0x49,0x62,0xb9,0x58,0x2a,0x14,0xe3,0x51,0x12,0x71,0x8e,0x44,0x9a,0x8c,0xf3,0x32,0xa5,0x22,0x89,0x42,0x92,0x29,0xc5,0x25,0xd2,0xff,0x64,0xe2,0xdf,0x2c,0xfb,0x3,0x3e,0xdf,0x35,0x0,0xb0,0x6a,0x3e,0x1,0x7b,0x91,0x2d,0xa8,0x5d,0x63,0x3,0xf6,0x4b,0x27,0x10,0x58,0x74,0xc0,0xe2,0xf7,0x0,0x0,0xf2,0xbb,0x6f,0xc1,0xd4,0x28,0x8,0x3,0x80,0x68,0x83,0xe1,0xcf,0x77,0xff,0xef,0x3f,0xfd,0x47,0xa0,0x25,0x0,0x80,0x66,0x49,0x92,0x71,0x0,0x0,0x5e,0x44,0x24,0x2e,0x54,0xca,0xb3,0x3f,0xc7,0x8,0x0,0x0,0x44,0xa0,0x81,0x2a,0xb0,0x41,0x1b,0xf4,0xc1,0x18,0x2c,0xc0,0x6,0x1c,0xc1,0x5,0xdc,0xc1,0xb,0xfc,0x60,0x36,0x84,0x42,0x24,0xc4,0xc2,0x42,0x10,0x42,0xa,0x64,0x80,0x1c,0x72,0x60,0x29,0xac,0x82,0x42,0x28,0x86,0xcd,0xb0,0x1d,0x2a,0x60,0x2f,0xd4,0x40,0x1d,0x34,0xc0,0x51,0x68,0x86,0x93,0x70,0xe,0x2e,0xc2,0x55,0xb8,0xe,0x3d,0x70,0xf,0xfa,0x61,0x8,0x9e,0xc1,0x28,0xbc,0x81,0x9,0x4,0x41,0xc8,0x8,0x13,0x61,0x21,0xda,0x88,0x1,0x62,0x8a,0x58,0x23,0x8e,0x8,0x17,0x99,0x85,0xf8,0x21,0xc1,0x48,0x4,0x12,0x8b,0x24,0x20,0xc9,0x88,0x14,0x51,0x22,0x4b,0x91,0x35,0x48,0x31,0x52,0x8a,0x54,0x20,0x55,0x48,0x1d,0xf2,0x3d,0x72,0x2,0x39,0x87,0x5c,0x46,0xba,0x91,0x3b,0xc8,0x0,0x32,0x82,0xfc,0x86,0xbc,0x47,0x31,0x94,0x81,0xb2,0x51,0x3d,0xd4,0xc,0xb5,0x43,0xb9,0xa8,0x37,0x1a,0x84,0x46,0xa2,0xb,0xd0,0x64,0x74,0x31,0x9a,0x8f,0x16,0xa0,0x9b,0xd0,0x72,0xb4,0x1a,0x3d,0x8c,0x36,0xa1,0xe7,0xd0,0xab,0x68,0xf,0xda,0x8f,0x3e,0x43,0xc7,0x30,0xc0,0xe8,0x18,0x7,0x33,0xc4,0x6c,0x30,0x2e,0xc6,0xc3,0x42,0xb1,0x38,0x2c,0x9,0x93,0x63,0xcb,0xb1,0x22,0xac,0xc,0xab,0xc6,0x1a,0xb0,0x56,0xac,0x3,0xbb,0x89,0xf5,0x63,0xcf,0xb1,0x77,0x4,0x12,0x81,0x45,0xc0,0x9,0x36,0x4,0x77,0x42,0x20,0x61,0x1e,0x41,0x48,0x58,0x4c,0x58,0x4e,0xd8,0x48,0xa8,0x20,0x1c,0x24,0x34,0x11,0xda,0x9,0x37,0x9,0x3,0x84,0x51,0xc2,0x27,0x22,0x93,0xa8,0x4b,0xb4,0x26,0xba,0x11,0xf9,0xc4,0x18,0x62,0x32,0x31,0x87,0x58,0x48,0x2c,0x23,0xd6,0x12,0x8f,0x13,0x2f,0x10,0x7b,0x88,0x43,0xc4,0x37,0x24,0x12,0x89,0x43,0x32,0x27,0xb9,0x90,0x2,0x49,0xb1,0xa4,0x54,0xd2,0x12,0xd2,0x46,0xd2,0x6e,0x52,0x23,0xe9,0x2c,0xa9,0x9b,0x34,0x48,0x1a,0x23,0x93,0xc9,0xda,0x64,0x6b,0xb2,0x7,0x39,0x94,0x2c,0x20,0x2b,0xc8,0x85,0xe4,0x9d,0xe4,0xc3,0xe4,0x33,0xe4,0x1b,0xe4,0x21,0xf2,0x5b,0xa,0x9d,0x62,0x40,0x71,0xa4,0xf8,0x53,0xe2,0x28,0x52,0xca,0x6a,0x4a,0x19,0xe5,0x10,0xe5,0x34,0xe5,0x6,0x65,0x98,0x32,0x41,0x55,0xa3,0x9a,0x52,0xdd,0xa8,0xa1,0x54,0x11,0x35,0x8f,0x5a,0x42,0xad,0xa1,0xb6,0x52,0xaf,0x51,0x87,0xa8,0x13,0x34,0x75,0x9a,0x39,0xcd,0x83,0x16,0x49,0x4b,0xa5,0xad,0xa2,0x95,0xd3,0x1a,0x68,0x17,0x68,0xf7,0x69,0xaf,0xe8,0x74,0xba,0x11,0xdd,0x95,0x1e,0x4e,0x97,0xd0,0x57,0xd2,0xcb,0xe9,0x47,0xe8,0x97,0xe8,0x3,0xf4,0x77,0xc,0xd,0x86,0x15,0x83,0xc7,0x88,0x67,0x28,0x19,0x9b,0x18,0x7,0x18,0x67,0x19,0x77,0x18,0xaf,0x98,0x4c,0xa6,0x19,0xd3,0x8b,0x19,0xc7,0x54,0x30,0x37,0x31,0xeb,0x98,0xe7,0x99,0xf,0x99,0x6f,0x55,0x58,0x2a,0xb6,0x2a,0x7c,0x15,0x91,0xca,0xa,0x95,0x4a,0x95,0x26,0x95,0x1b,0x2a,0x2f,0x54,0xa9,0xaa,0xa6,0xaa,0xde,0xaa,0xb,0x55,0xf3,0x55,0xcb,0x54,0x8f,0xa9,0x5e,0x53,0x7d,0xae,0x46,0x55,0x33,0x53,0xe3,0xa9,0x9,0xd4,0x96,0xab,0x55,0xaa,0x9d,0x50,0xeb,0x53,0x1b,0x53,0x67,0xa9,0x3b,0xa8,0x87,0xaa,0x67,0xa8,0x6f,0x54,0x3f,0xa4,0x7e,0x59,0xfd,0x89,0x6,0x59,0xc3,0x4c,0xc3,0x4f,0x43,0xa4,0x51,0xa0,0xb1,0x5f,0xe3,0xbc,0xc6,0x20,0xb,0x63,0x19,0xb3,0x78,0x2c,0x21,0x6b,0xd,0xab,0x86,0x75,0x81,0x35,0xc4,0x26,0xb1,0xcd,0xd9,0x7c,0x76,0x2a,0xbb,0x98,0xfd,0x1d,0xbb,0x8b,0x3d,0xaa,0xa9,0xa1,0x39,0x43,0x33,0x4a,0x33,0x57,0xb3,0x52,0xf3,0x94,0x66,0x3f,0x7,0xe3,0x98,0x71,0xf8,0x9c,0x74,0x4e,0x9,0xe7,0x28,0xa7,0x97,0xf3,0x7e,0x8a,0xde,0x14,0xef,0x29,0xe2,0x29,0x1b,0xa6,0x34,0x4c,0xb9,0x31,0x65,0x5c,0x6b,0xaa,0x96,0x97,0x96,0x58,0xab,0x48,0xab,0x51,0xab,0x47,0xeb,0xbd,0x36,0xae,0xed,0xa7,0x9d,0xa6,0xbd,0x45,0xbb,0x59,0xfb,0x81,0xe,0x41,0xc7,0x4a,0x27,0x5c,0x27,0x47,0x67,0x8f,0xce,0x5,0x9d,0xe7,0x53,0xd9,0x53,0xdd,0xa7,0xa,0xa7,0x16,0x4d,0x3d,0x3a,0xf5,0xae,0x2e,0xaa,0x6b,0xa5,0x1b,0xa1,0xbb,0x44,0x77,0xbf,0x6e,0xa7,0xee,0x98,0x9e,0xbe,0x5e,0x80,0x9e,0x4c,0x6f,0xa7,0xde,0x79,0xbd,0xe7,0xfa,0x1c,0x7d,0x2f,0xfd,0x54,0xfd,0x6d,0xfa,0xa7,0xf5,0x47,0xc,0x58,0x6,0xb3,0xc,0x24,0x6,0xdb,0xc,0xce,0x18,0x3c,0xc5,0x35,0x71,0x6f,0x3c,0x1d,0x2f,0xc7,0xdb,0xf1,0x51,0x43,0x5d,0xc3,0x40,0x43,0xa5,0x61,0x95,0x61,0x97,0xe1,0x84,0x91,0xb9,0xd1,0x3c,0xa3,0xd5,0x46,0x8d,0x46,0xf,0x8c,0x69,0xc6,0x5c,0xe3,0x24,0xe3,0x6d,0xc6,0x6d,0xc6,0xa3,0x26,0x6,0x26,0x21,0x26,0x4b,0x4d,0xea,0x4d,0xee,0x9a,0x52,0x4d,0xb9,0xa6,0x29,0xa6,0x3b,0x4c,0x3b,0x4c,0xc7,0xcd,0xcc,0xcd,0xa2,0xcd,0xd6,0x99,0x35,0x9b,0x3d,0x31,0xd7,0x32,0xe7,0x9b,0xe7,0x9b,0xd7,0x9b,0xdf,0xb7,0x60,0x5a,0x78,0x5a,0x2c,0xb6,0xa8,0xb6,0xb8,0x65,0x49,0xb2,0xe4,0x5a,0xa6,0x59,0xee,0xb6,0xbc,0x6e,0x85,0x5a,0x39,0x59,0xa5,0x58,0x55,0x5a,0x5d,0xb3,0x46,0xad,0x9d,0xad,0x25,0xd6,0xbb,0xad,0xbb,0xa7,0x11,0xa7,0xb9,0x4e,0x93,0x4e,0xab,0x9e,0xd6,0x67,0xc3,0xb0,0xf1,0xb6,0xc9,0xb6,0xa9,0xb7,0x19,0xb0,0xe5,0xd8,0x6,0xdb,0xae,0xb6,0x6d,0xb6,0x7d,0x61,0x67,0x62,0x17,0x67,0xb7,0xc5,0xae,0xc3,0xee,0x93,0xbd,0x93,0x7d,0xba,0x7d,0x8d,0xfd,0x3d,0x7,0xd,0x87,0xd9,0xe,0xab,0x1d,0x5a,0x1d,0x7e,0x73,0xb4,0x72,0x14,0x3a,0x56,0x3a,0xde,0x9a,0xce,0x9c,0xee,0x3f,0x7d,0xc5,0xf4,0x96,0xe9,0x2f,0x67,0x58,0xcf,0x10,0xcf,0xd8,0x33,0xe3,0xb6,0x13,0xcb,0x29,0xc4,0x69,0x9d,0x53,0x9b,0xd3,0x47,0x67,0x17,0x67,0xb9,0x73,0x83,0xf3,0x88,0x8b,0x89,0x4b,0x82,0xcb,0x2e,0x97,0x3e,0x2e,0x9b,0x1b,0xc6,0xdd,0xc8,0xbd,0xe4,0x4a,0x74,0xf5,0x71,0x5d,0xe1,0x7a,0xd2,0xf5,0x9d,0x9b,0xb3,0x9b,0xc2,0xed,0xa8,0xdb,0xaf,0xee,0x36,0xee,0x69,0xee,0x87,0xdc,0x9f,0xcc,0x34,0x9f,0x29,0x9e,0x59,0x33,0x73,0xd0,0xc3,0xc8,0x43,0xe0,0x51,0xe5,0xd1,0x3f,0xb,0x9f,0x95,0x30,0x6b,0xdf,0xac,0x7e,0x4f,0x43,0x4f,0x81,0x67,0xb5,0xe7,0x23,0x2f,0x63,0x2f,0x91,0x57,0xad,0xd7,0xb0,0xb7,0xa5,0x77,0xaa,0xf7,0x61,0xef,0x17,0x3e,0xf6,0x3e,0x72,0x9f,0xe3,0x3e,0xe3,0x3c,0x37,0xde,0x32,0xde,0x59,0x5f,0xcc,0x37,0xc0,0xb7,0xc8,0xb7,0xcb,0x4f,0xc3,0x6f,0x9e,0x5f,0x85,0xdf,0x43,0x7f,0x23,0xff,0x64,0xff,0x7a,0xff,0xd1,0x0,0xa7,0x80,0x25,0x1,0x67,0x3,0x89,0x81,0x41,0x81,0x5b,0x2,0xfb,0xf8,0x7a,0x7c,0x21,0xbf,0x8e,0x3f,0x3a,0xdb,0x65,0xf6,0xb2,0xd9,0xed,0x41,0x8c,0xa0,0xb9,0x41,0x15,0x41,0x8f,0x82,0xad,0x82,0xe5,0xc1,0xad,0x21,0x68,0xc8,0xec,0x90,0xad,0x21,0xf7,0xe7,0x98,0xce,0x91,0xce,0x69,0xe,0x85,0x50,0x7e,0xe8,0xd6,0xd0,0x7,0x61,0xe6,0x61,0x8b,0xc3,0x7e,0xc,0x27,0x85,0x87,0x85,0x57,0x86,0x3f,0x8e,0x70,0x88,0x58,0x1a,0xd1,0x31,0x97,0x35,0x77,0xd1,0xdc,0x43,0x73,0xdf,0x44,0xfa,0x44,0x96,0x44,0xde,0x9b,0x67,0x31,0x4f,0x39,0xaf,0x2d,0x4a,0x35,0x2a,0x3e,0xaa,0x2e,0x6a,0x3c,0xda,0x37,0xba,0x34,0xba,0x3f,0xc6,0x2e,0x66,0x59,0xcc,0xd5,0x58,0x9d,0x58,0x49,0x6c,0x4b,0x1c,0x39,0x2e,0x2a,0xae,0x36,0x6e,0x6c,0xbe,0xdf,0xfc,0xed,0xf3,0x87,0xe2,0x9d,0xe2,0xb,0xe3,0x7b,0x17,0x98,0x2f,0xc8,0x5d,0x70,0x79,0xa1,0xce,0xc2,0xf4,0x85,0xa7,0x16,0xa9,0x2e,0x12,0x2c,0x3a,0x96,0x40,0x4c,0x88,0x4e,0x38,0x94,0xf0,0x41,0x10,0x2a,0xa8,0x16,0x8c,0x25,0xf2,0x13,0x77,0x25,0x8e,0xa,0x79,0xc2,0x1d,0xc2,0x67,0x22,0x2f,0xd1,0x36,0xd1,0x88,0xd8,0x43,0x5c,0x2a,0x1e,0x4e,0xf2,0x48,0x2a,0x4d,0x7a,0x92,0xec,0x91,0xbc,0x35,0x79,0x24,0xc5,0x33,0xa5,0x2c,0xe5,0xb9,0x84,0x27,0xa9,0x90,0xbc,0x4c,0xd,0x4c,0xdd,0x9b,0x3a,0x9e,0x16,0x9a,0x76,0x20,0x6d,0x32,0x3d,0x3a,0xbd,0x31,0x83,0x92,0x91,0x90,0x71,0x42,0xaa,0x21,0x4d,0x93,0xb6,0x67,0xea,0x67,0xe6,0x66,0x76,0xcb,0xac,0x65,0x85,0xb2,0xfe,0xc5,0x6e,0x8b,0xb7,0x2f,0x1e,0x95,0x7,0xc9,0x6b,0xb3,0x90,0xac,0x5,0x59,0x2d,0xa,0xb6,0x42,0xa6,0xe8,0x54,0x5a,0x28,0xd7,0x2a,0x7,0xb2,0x67,0x65,0x57,0x66,0xbf,0xcd,0x89,0xca,0x39,0x96,0xab,0x9e,0x2b,0xcd,0xed,0xcc,0xb3,0xca,0xdb,0x90,0x37,0x9c,0xef,0x9f,0xff,0xed,0x12,0xc2,0x12,0xe1,0x92,0xb6,0xa5,0x86,0x4b,0x57,0x2d,0x1d,0x58,0xe6,0xbd,0xac,0x6a,0x39,0xb2,0x3c,0x71,0x79,0xdb,0xa,0xe3,0x15,0x5,0x2b,0x86,0x56,0x6,0xac,0x3c,0xb8,0x8a,0xb6,0x2a,0x6d,0xd5,0x4f,0xab,0xed,0x57,0x97,0xae,0x7e,0xbd,0x26,0x7a,0x4d,0x6b,0x81,0x5e,0xc1,0xca,0x82,0xc1,0xb5,0x1,0x6b,0xeb,0xb,0x55,0xa,0xe5,0x85,0x7d,0xeb,0xdc,0xd7,0xed,0x5d,0x4f,0x58,0x2f,0x59,0xdf,0xb5,0x61,0xfa,0x86,0x9d,0x1b,0x3e,0x15,0x89,0x8a,0xae,0x14,0xdb,0x17,0x97,0x15,0x7f,0xd8,0x28,0xdc,0x78,0xe5,0x1b,0x87,0x6f,0xca,0xbf,0x99,0xdc,0x94,0xb4,0xa9,0xab,0xc4,0xb9,0x64,0xcf,0x66,0xd2,0x66,0xe9,0xe6,0xde,0x2d,0x9e,0x5b,0xe,0x96,0xaa,0x97,0xe6,0x97,0xe,0x6e,0xd,0xd9,0xda,0xb4,0xd,0xdf,0x56,0xb4,0xed,0xf5,0xf6,0x45,0xdb,0x2f,0x97,0xcd,0x28,0xdb,0xbb,0x83,0xb6,0x43,0xb9,0xa3,0xbf,0x3c,0xb8,0xbc,0x65,0xa7,0xc9,0xce,0xcd,0x3b,0x3f,0x54,0xa4,0x54,0xf4,0x54,0xfa,0x54,0x36,0xee,0xd2,0xdd,0xb5,0x61,0xd7,0xf8,0x6e,0xd1,0xee,0x1b,0x7b,0xbc,0xf6,0x34,0xec,0xd5,0xdb,0x5b,0xbc,0xf7,0xfd,0x3e,0xc9,0xbe,0xdb,0x55,0x1,0x55,0x4d,0xd5,0x66,0xd5,0x65,0xfb,0x49,0xfb,0xb3,0xf7,0x3f,0xae,0x89,0xaa,0xe9,0xf8,0x96,0xfb,0x6d,0x5d,0xad,0x4e,0x6d,0x71,0xed,0xc7,0x3,0xd2,0x3,0xfd,0x7,0x23,0xe,0xb6,0xd7,0xb9,0xd4,0xd5,0x1d,0xd2,0x3d,0x54,0x52,0x8f,0xd6,0x2b,0xeb,0x47,0xe,0xc7,0x1f,0xbe,0xfe,0x9d,0xef,0x77,0x2d,0xd,0x36,0xd,0x55,0x8d,0x9c,0xc6,0xe2,0x23,0x70,0x44,0x79,0xe4,0xe9,0xf7,0x9,0xdf,0xf7,0x1e,0xd,0x3a,0xda,0x76,0x8c,0x7b,0xac,0xe1,0x7,0xd3,0x1f,0x76,0x1d,0x67,0x1d,0x2f,0x6a,0x42,0x9a,0xf2,0x9a,0x46,0x9b,0x53,0x9a,0xfb,0x5b,0x62,0x5b,0xba,0x4f,0xcc,0x3e,0xd1,0xd6,0xea,0xde,0x7a,0xfc,0x47,0xdb,0x1f,0xf,0x9c,0x34,0x3c,0x59,0x79,0x4a,0xf3,0x54,0xc9,0x69,0xda,0xe9,0x82,0xd3,0x93,0x67,0xf2,0xcf,0x8c,0x9d,0x95,0x9d,0x7d,0x7e,0x2e,0xf9,0xdc,0x60,0xdb,0xa2,0xb6,0x7b,0xe7,0x63,0xce,0xdf,0x6a,0xf,0x6f,0xef,0xba,0x10,0x74,0xe1,0xd2,0x45,0xff,0x8b,0xe7,0x3b,0xbc,0x3b,0xce,0x5c,0xf2,0xb8,0x74,0xf2,0xb2,0xdb,0xe5,0x13,0x57,0xb8,0x57,0x9a,0xaf,0x3a,0x5f,0x6d,0xea,0x74,0xea,0x3c,0xfe,0x93,0xd3,0x4f,0xc7,0xbb,0x9c,0xbb,0x9a,0xae,0xb9,0x5c,0x6b,0xb9,0xee,0x7a,0xbd,0xb5,0x7b,0x66,0xf7,0xe9,0x1b,0x9e,0x37,0xce,0xdd,0xf4,0xbd,0x79,0xf1,0x16,0xff,0xd6,0xd5,0x9e,0x39,0x3d,0xdd,0xbd,0xf3,0x7a,0x6f,0xf7,0xc5,0xf7,0xf5,0xdf,0x16,0xdd,0x7e,0x72,0x27,0xfd,0xce,0xcb,0xbb,0xd9,0x77,0x27,0xee,0xad,0xbc,0x4f,0xbc,0x5f,0xf4,0x40,0xed,0x41,0xd9,0x43,0xdd,0x87,0xd5,0x3f,0x5b,0xfe,0xdc,0xd8,0xef,0xdc,0x7f,0x6a,0xc0,0x77,0xa0,0xf3,0xd1,0xdc,0x47,0xf7,0x6,0x85,0x83,0xcf,0xfe,0x91,0xf5,0x8f,0xf,0x43,0x5,0x8f,0x99,0x8f,0xcb,0x86,0xd,0x86,0xeb,0x9e,0x38,0x3e,0x39,0x39,0xe2,0x3f,0x72,0xfd,0xe9,0xfc,0xa7,0x43,0xcf,0x64,0xcf,0x26,0x9e,0x17,0xfe,0xa2,0xfe,0xcb,0xae,0x17,0x16,0x2f,0x7e,0xf8,0xd5,0xeb,0xd7,0xce,0xd1,0x98,0xd1,0xa1,0x97,0xf2,0x97,0x93,0xbf,0x6d,0x7c,0xa5,0xfd,0xea,0xc0,0xeb,0x19,0xaf,0xdb,0xc6,0xc2,0xc6,0x1e,0xbe,0xc9,0x78,0x33,0x31,0x5e,0xf4,0x56,0xfb,0xed,0xc1,0x77,0xdc,0x77,0x1d,0xef,0xa3,0xdf,0xf,0x4f,0xe4,0x7c,0x20,0x7f,0x28,0xff,0x68,0xf9,0xb1,0xf5,0x53,0xd0,0xa7,0xfb,0x93,0x19,0x93,0x93,0xff,0x4,0x3,0x98,0xf3,0xfc,0xef,0x35,0x94,0x82,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xa,0x14,0x2,0x25,0x38,0x79,0x2,0x60,0x24,0x0,0x0,0x1,0x3a,0x49,0x44,0x41,0x54,0x38,0xcb,0xa5,0x93,0x41,0x4a,0x3,0x51,0xc,0x86,0xbf,0x37,0xef,0xd1,0x11,0x5d,0x74,0x40,0xc1,0x5a,0xea,0x45,0xc4,0xa5,0x27,0xf0,0x34,0x73,0x84,0xe2,0x61,0x3c,0x81,0xee,0xc4,0x8b,0x8,0x76,0xd3,0xea,0x14,0x5a,0xe8,0x74,0xde,0x4b,0x5c,0x4c,0x46,0x2a,0xd4,0x3a,0xc5,0x40,0x20,0x8b,0xe4,0x4f,0xfe,0xf0,0xff,0xe,0x8,0xc0,0x0,0xc8,0x81,0x13,0xab,0x3d,0x90,0xf1,0x33,0x4,0x48,0xc0,0x16,0xd8,0x0,0x35,0xb0,0xed,0x86,0xcf,0x80,0x2,0x18,0x5a,0x9d,0x3,0xce,0x12,0x40,0x2d,0x6b,0x60,0xd,0x2c,0x81,0xa,0xdb,0x9e,0x3,0xc5,0xed,0xcd,0xdd,0xfd,0xf8,0xea,0xba,0x8c,0x29,0x16,0xaa,0xec,0xd,0xe7,0x20,0xf8,0x50,0xbd,0xcf,0xde,0xa6,0x2f,0xaf,0x4f,0x8f,0x40,0xc,0x76,0xf6,0x70,0x3c,0x9a,0x94,0xd5,0xe7,0xa2,0x88,0x31,0xa2,0xec,0x47,0x70,0x38,0x42,0x8,0xc5,0x78,0x34,0x29,0x81,0x67,0x60,0xf5,0x4d,0xa1,0x89,0x4d,0xd1,0xc4,0xe6,0xd7,0xe1,0x96,0x87,0xd2,0xc4,0x86,0x26,0x36,0x85,0x51,0x1d,0x4,0x7b,0x58,0x2e,0x22,0x88,0xa,0x7f,0x85,0xa2,0x88,0x8,0x46,0xdd,0x7,0xfb,0xb6,0x53,0x51,0x54,0x94,0x3e,0x61,0x7d,0xe,0xc8,0x42,0x47,0x2f,0x69,0xea,0x75,0x1,0x40,0xd2,0xd4,0x1,0x10,0x76,0x51,0x55,0x8f,0xba,0x80,0x5d,0x0,0x55,0x3d,0x2,0xa0,0xed,0xd3,0xe,0x40,0x5a,0xd0,0x84,0xf6,0xa4,0x20,0x2d,0x5,0x5,0x24,0x98,0x3c,0x6b,0x84,0xde,0x4f,0xa4,0xdd,0x53,0x3,0x29,0x33,0x6d,0xaf,0x71,0x59,0x95,0x79,0x8f,0xa8,0x1e,0xcc,0xcc,0x7b,0x70,0x59,0x65,0x92,0xde,0x6,0x33,0xc6,0x72,0xbe,0x98,0x4d,0x2f,0xce,0x2f,0xcb,0x24,0xa9,0xe0,0x80,0x96,0x7d,0x16,0x3e,0xe6,0x8b,0xd9,0x83,0xf9,0x61,0xe3,0x80,0xd3,0x7f,0x98,0x69,0x1d,0x8c,0x2,0x40,0x4,0x56,0xc7,0xda,0xf9,0xb,0x57,0x2d,0xbb,0xf5,0x2d,0xe4,0x89,0x1b,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x8a,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3c,0x3a,0x44,0x56,0x53,0x61,0x56,0x52,0x60,0x47,0x44,0x52,0x33,0x31,0x39,0x47,0x44,0x50,0x47,0x44,0x51,0x52,0x50,0x5d,0x51,0x4f,0x5d,0x46,0x42,0x4e,0x42,0x3e,0x4a,0x41,0x3e,0x49,0x51,0x4e,0x5b,0x40,0x3e,0x48,0x4f,0x4c,0x59,0x3f,0x3d,0x47,0x4e,0x4a,0x58,0x3e,0x3b,0x46,0x4b,0x49,0x55,0x3c,0x3a,0x44,0x4a,0x47,0x54,0x3b,0x39,0x43,0x49,0x46,0x53,0x3a,0x38,0x42,0x47,0x45,0x50,0x39,0x37,0x40,0x47,0x43,0x50,0x38,0x35,0x3f,0x36,0x34,0x3e,0x44,0x42,0x4d,0x44,0x41,0x4c,0xff,0xff,0xff,0xe5,0x37,0x10,0x78,0x0,0x0,0x0,0x15,0x74,0x52,0x4e,0x53,0x4,0xa,0x11,0x19,0x1f,0x22,0x24,0x15,0x25,0x34,0x3f,0x46,0x47,0x48,0x77,0xef,0xef,0xef,0x77,0xef,0xed,0xe8,0xff,0x76,0xed,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x2d,0xcd,0xda,0x41,0x3d,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x93,0x49,0x44,0x41,0x54,0x18,0xd3,0x65,0xcf,0x47,0x12,0x82,0x40,0x10,0x5,0xd0,0x9e,0xc8,0x44,0x92,0x22,0x41,0x54,0x44,0x40,0x14,0xef,0x7f,0x3e,0x7,0x8a,0xea,0x85,0xbe,0xe5,0xaf,0xea,0xf0,0x1,0x8,0x65,0x5c,0xc8,0x40,0x70,0x46,0x9,0x0,0x89,0x94,0x36,0xd6,0x79,0xef,0xac,0xd1,0x2a,0x22,0x40,0x55,0x9c,0x14,0xa7,0x4d,0x91,0xc4,0x8a,0x2,0xd3,0x69,0x59,0xd5,0x9b,0xaa,0x4c,0x35,0x3,0x6e,0x9a,0xfa,0xbc,0xab,0x1b,0xc3,0x41,0xd8,0xf6,0x82,0x5a,0x2b,0x40,0xba,0xeb,0xd,0x5d,0x9d,0x4,0xe9,0xbb,0x3b,0xea,0xfc,0x1a,0xf4,0xf,0xd4,0xaf,0x81,0x1b,0x46,0x34,0x84,0x11,0x61,0xa7,0x27,0x9a,0xc2,0x52,0x6e,0xe6,0x17,0x9a,0xc3,0x59,0xa6,0xb3,0xf1,0xbd,0x1b,0xb3,0xf0,0x18,0x55,0xf9,0x61,0xf9,0x6c,0x96,0x63,0x1e,0x5e,0xff,0x2b,0xf7,0x5b,0xff,0xb,0x69,0x5a,0x14,0xfa,0x84,0xf6,0xc2,0x8,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char button_pressed_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0xa,0x45,0x69,0x43,0x43,0x50,0x49,0x43,0x43,0x20,0x70,0x72,0x6f,0x66,0x69,0x6c,0x65,0x0,0x0,0x78,0xda,0x9d,0x53,0x67,0x54,0x53,0xe9,0x16,0x3d,0xf7,0xde,0xf4,0x42,0x4b,0x88,0x80,0x94,0x4b,0x6f,0x52,0x15,0x8,0x20,0x52,0x42,0x8b,0x80,0x14,0x91,0x26,0x2a,0x21,0x9,0x10,0x4a,0x88,0x21,0xa1,0xd9,0x15,0x51,0xc1,0x11,0x45,0x45,0x4,0x1b,0xc8,0xa0,0x88,0x3,0x8e,0x8e,0x80,0x8c,0x15,0x51,0x2c,0xc,0x8a,0xa,0xd8,0x7,0xe4,0x21,0xa2,0x8e,0x83,0xa3,0x88,0x8a,0xca,0xfb,0xe1,0x7b,0xa3,0x6b,0xd6,0xbc,0xf7,0xe6,0xcd,0xfe,0xb5,0xd7,0x3e,0xe7,0xac,0xf3,0x9d,0xb3,0xcf,0x7,0xc0,0x8,0xc,0x96,0x48,0x33,0x51,0x35,0x80,0xc,0xa9,0x42,0x1e,0x11,0xe0,0x83,0xc7,0xc4,0xc6,0xe1,0xe4,0x2e,0x40,0x81,0xa,0x24,0x70,0x0,0x10,0x8,0xb3,0x64,0x21,0x73,0xfd,0x23,0x1,0x0,0xf8,0x7e,0x3c,0x3c,0x2b,0x22,0xc0,0x7,0xbe,0x0,0x1,0x78,0xd3,0xb,0x8,0x0,0xc0,0x4d,0x9b,0xc0,0x30,0x1c,0x87,0xff,0xf,0xea,0x42,0x99,0x5c,0x1,0x80,0x84,0x1,0xc0,0x74,0x91,0x38,0x4b,0x8,0x80,0x14,0x0,0x40,0x7a,0x8e,0x42,0xa6,0x0,0x40,0x46,0x1,0x80,0x9d,0x98,0x26,0x53,0x0,0xa0,0x4,0x0,0x60,0xcb,0x63,0x62,0xe3,0x0,0x50,0x2d,0x0,0x60,0x27,0x7f,0xe6,0xd3,0x0,0x80,0x9d,0xf8,0x99,0x7b,0x1,0x0,0x5b,0x94,0x21,0x15,0x1,0xa0,0x91,0x0,0x20,0x13,0x65,0x88,0x44,0x0,0x68,0x3b,0x0,0xac,0xcf,0x56,0x8a,0x45,0x0,0x58,0x30,0x0,0x14,0x66,0x4b,0xc4,0x39,0x0,0xd8,0x2d,0x0,0x30,0x49,0x57,0x66,0x48,0x0,0xb0,0xb7,0x0,0xc0,0xce,0x10,0xb,0xb2,0x0,0x8,0xc,0x0,0x30,0x51,0x88,0x85,0x29,0x0,0x4,0x7b,0x0,0x60,0xc8,0x23,0x23,0x78,0x0,0x84,0x99,0x0,0x14,0x46,0xf2,0x57,0x3c,0xf1,0x2b,0xae,0x10,0xe7,0x2a,0x0,0x0,0x78,0x99,0xb2,0x3c,0xb9,0x24,0x39,0x45,0x81,0x5b,0x8,0x2d,0x71,0x7,0x57,0x57,0x2e,0x1e,0x28,0xce,0x49,0x17,0x2b,0x14,0x36,0x61,0x2,0x61,0x9a,0x40,0x2e,0xc2,0x79,0x99,0x19,0x32,0x81,0x34,0xf,0xe0,0xf3,0xcc,0x0,0x0,0xa0,0x91,0x15,0x11,0xe0,0x83,0xf3,0xfd,0x78,0xce,0xe,0xae,0xce,0xce,0x36,0x8e,0xb6,0xe,0x5f,0x2d,0xea,0xbf,0x6,0xff,0x22,0x62,0x62,0xe3,0xfe,0xe5,0xcf,0xab,0x70,0x40,0x0,0x0,0xe1,0x74,0x7e,0xd1,0xfe,0x2c,0x2f,0xb3,0x1a,0x80,0x3b,0x6,0x80,0x6d,0xfe,0xa2,0x25,0xee,0x4,0x68,0x5e,0xb,0xa0,0x75,0xf7,0x8b,0x66,0xb2,0xf,0x40,0xb5,0x0,0xa0,0xe9,0xda,0x57,0xf3,0x70,0xf8,0x7e,0x3c,0x3c,0x45,0xa1,0x90,0xb9,0xd9,0xd9,0xe5,0xe4,0xe4,0xd8,0x4a,0xc4,0x42,0x5b,0x61,0xca,0x57,0x7d,0xfe,0x67,0xc2,0x5f,0xc0,0x57,0xfd,0x6c,0xf9,0x7e,0x3c,0xfc,0xf7,0xf5,0xe0,0xbe,0xe2,0x24,0x81,0x32,0x5d,0x81,0x47,0x4,0xf8,0xe0,0xc2,0xcc,0xf4,0x4c,0xa5,0x1c,0xcf,0x92,0x9,0x84,0x62,0xdc,0xe6,0x8f,0x47,0xfc,0xb7,0xb,0xff,0xfc,0x1d,0xd3,0x22,0xc4,0x49,0x62,0xb9,0x58,0x2a,0x14,0xe3,0x51,0x12,0x71,0x8e,0x44,0x9a,0x8c,0xf3,0x32,0xa5,0x22,0x89,0x42,0x92,0x29,0xc5,0x25,0xd2,0xff,0x64,0xe2,0xdf,0x2c,0xfb,0x3,0x3e,0xdf,0x35,0x0,0xb0,0x6a,0x3e,0x1,0x7b,0x91,0x2d,0xa8,0x5d,0x63,0x3,0xf6,0x4b,0x27,0x10,0x58,0x74,0xc0,0xe2,0xf7,0x0,0x0,0xf2,0xbb,0x6f,0xc1,0xd4,0x28,0x8,0x3,0x80,0x68,0x83,0xe1,0xcf,0x77,0xff,0xef,0x3f,0xfd,0x47,0xa0,0x25,0x0,0x80,0x66,0x49,0x92,0x71,0x0,0x0,0x5e,0x44,0x24,0x2e,0x54,0xca,0xb3,0x3f,0xc7,0x8,0x0,0x0,0x44,0xa0,0x81,0x2a,0xb0,0x41,0x1b,0xf4,0xc1,0x18,0x2c,0xc0,0x6,0x1c,0xc1,0x5,0xdc,0xc1,0xb,0xfc,0x60,0x36,0x84,0x42,0x24,0xc4,0xc2,0x42,0x10,0x42,0xa,0x64,0x80,0x1c,0x72,0x60,0x29,0xac,0x82,0x42,0x28,0x86,0xcd,0xb0,0x1d,0x2a,0x60,0x2f,0xd4,0x40,0x1d,0x34,0xc0,0x51,0x68,0x86,0x93,0x70,0xe,0x2e,0xc2,0x55,0xb8,0xe,0x3d,0x70,0xf,0xfa,0x61,0x8,0x9e,0xc1,0x28,0xbc,0x81,0x9,0x4,0x41,0xc8,0x8,0x13,0x61,0x21,0xda,0x88,0x1,0x62,0x8a,0x58,0x23,0x8e,0x8,0x17,0x99,0x85,0xf8,0x21,0xc1,0x48,0x4,0x12,0x8b,0x24,0x20,0xc9,0x88,0x14,0x51,0x22,0x4b,0x91,0x35,0x48,0x31,0x52,0x8a,0x54,0x20,0x55,0x48,0x1d,0xf2,0x3d,0x72,0x2,0x39,0x87,0x5c,0x46,0xba,0x91,0x3b,0xc8,0x0,0x32,0x82,0xfc,0x86,0xbc,0x47,0x31,0x94,0x81,0xb2,0x51,0x3d,0xd4,0xc,0xb5,0x43,0xb9,0xa8,0x37,0x1a,0x84,0x46,0xa2,0xb,0xd0,0x64,0x74,0x31,0x9a,0x8f,0x16,0xa0,0x9b,0xd0,0x72,0xb4,0x1a,0x3d,0x8c,0x36,0xa1,0xe7,0xd0,0xab,0x68,0xf,0xda,0x8f,0x3e,0x43,0xc7,0x30,0xc0,0xe8,0x18,0x7,0x33,0xc4,0x6c,0x30,0x2e,0xc6,0xc3,0x42,0xb1,0x38,0x2c,0x9,0x93,0x63,0xcb,0xb1,0x22,0xac,0xc,0xab,0xc6,0x1a,0xb0,0x56,0xac,0x3,0xbb,0x89,0xf5,0x63,0xcf,0xb1,0x77,0x4,0x12,0x81,0x45,0xc0,0x9,0x36,0x4,0x77,0x42,0x20,0x61,0x1e,0x41,0x48,0x58,0x4c,0x58,0x4e,0xd8,0x48,0xa8,0x20,0x1c,0x24,0x34,0x11,0xda,0x9,0x37,0x9,0x3,0x84,0x51,0xc2,0x27,0x22,0x93,0xa8,0x4b,0xb4,0x26,0xba,0x11,0xf9,0xc4,0x18,0x62,0x32,0x31,0x87,0x58,0x48,0x2c,0x23,0xd6,0x12,0x8f,0x13,0x2f,0x10,0x7b,0x88,0x43,0xc4,0x37,0x24,0x12,0x89,0x43,0x32,0x27,0xb9,0x90,0x2,0x49,0xb1,0xa4,0x54,0xd2,0x12,0xd2,0x46,0xd2,0x6e,0x52,0x23,0xe9,0x2c,0xa9,0x9b,0x34,0x48,0x1a,0x23,0x93,0xc9,0xda,0x64,0x6b,0xb2,0x7,0x39,0x94,0x2c,0x20,0x2b,0xc8,0x85,0xe4,0x9d,0xe4,0xc3,0xe4,0x33,0xe4,0x1b,0xe4,0x21,0xf2,0x5b,0xa,0x9d,0x62,0x40,0x71,0xa4,0xf8,0x53,0xe2,0x28,0x52,0xca,0x6a,0x4a,0x19,0xe5,0x10,0xe5,0x34,0xe5,0x6,0x65,0x98,0x32,0x41,0x55,0xa3,0x9a,0x52,0xdd,0xa8,0xa1,0x54,0x11,0x35,0x8f,0x5a,0x42,0xad,0xa1,0xb6,0x52,0xaf,0x51,0x87,0xa8,0x13,0x34,0x75,0x9a,0x39,0xcd,0x83,0x16,0x49,0x4b,0xa5,0xad,0xa2,0x95,0xd3,0x1a,0x68,0x17,0x68,0xf7,0x69,0xaf,0xe8,0x74,0xba,0x11,0xdd,0x95,0x1e,0x4e,0x97,0xd0,0x57,0xd2,0xcb,0xe9,0x47,0xe8,0x97,0xe8,0x3,0xf4,0x77,0xc,0xd,0x86,0x15,0x83,0xc7,0x88,0x67,0x28,0x19,0x9b,0x18,0x7,0x18,0x67,0x19,0x77,0x18,0xaf,0x98,0x4c,0xa6,0x19,0xd3,0x8b,0x19,0xc7,0x54,0x30,0x37,0x31,0xeb,0x98,0xe7,0x99,0xf,0x99,0x6f,0x55,0x58,0x2a,0xb6,0x2a,0x7c,0x15,0x91,0xca,0xa,0x95,0x4a,0x95,0x26,0x95,0x1b,0x2a,0x2f,0x54,0xa9,0xaa,0xa6,0xaa,0xde,0xaa,0xb,0x55,0xf3,0x55,0xcb,0x54,0x8f,0xa9,0x5e,0x53,0x7d,0xae,0x46,0x55,0x33,0x53,0xe3,0xa9,0x9,0xd4,0x96,0xab,0x55,0xaa,0x9d,0x50,0xeb,0x53,0x1b,0x53,0x67,0xa9,0x3b,0xa8,0x87,0xaa,0x67,0xa8,0x6f,0x54,0x3f,0xa4,0x7e,0x59,0xfd,0x89,0x6,0x59,0xc3,0x4c,0xc3,0x4f,0x43,0xa4,0x51,0xa0,0xb1,0x5f,0xe3,0xbc,0xc6,0x20,0xb,0x63,0x19,0xb3,0x78,0x2c,0x21,0x6b,0xd,0xab,0x86,0x75,0x81,0x35,0xc4,0x26,0xb1,0xcd,0xd9,0x7c,0x76,0x2a,0xbb,0x98,0xfd,0x1d,0xbb,0x8b,0x3d,0xaa,0xa9,0xa1,0x39,0x43,0x33,0x4a,0x33,0x57,0xb3,0x52,0xf3,0x94,0x66,0x3f,0x7,0xe3,0x98,0x71,0xf8,0x9c,0x74,0x4e,0x9,0xe7,0x28,0xa7,0x97,0xf3,0x7e,0x8a,0xde,0x14,0xef,0x29,0xe2,0x29,0x1b,0xa6,0x34,0x4c,0xb9,0x31,0x65,0x5c,0x6b,0xaa,0x96,0x97,0x96,0x58,0xab,0x48,0xab,0x51,0xab,0x47,0xeb,0xbd,0x36,0xae,0xed,0xa7,0x9d,0xa6,0xbd,0x45,0xbb,0x59,0xfb,0x81,0xe,0x41,0xc7,0x4a,0x27,0x5c,0x27,0x47,0x67,0x8f,0xce,0x5,0x9d,0xe7,0x53,0xd9,0x53,0xdd,0xa7,0xa,0xa7,0x16,0x4d,0x3d,0x3a,0xf5,0xae,0x2e,0xaa,0x6b,0xa5,0x1b,0xa1,0xbb,0x44,0x77,0xbf,0x6e,0xa7,0xee,0x98,0x9e,0xbe,0x5e,0x80,0x9e,0x4c,0x6f,0xa7,0xde,0x79,0xbd,0xe7,0xfa,0x1c,0x7d,0x2f,0xfd,0x54,0xfd,0x6d,0xfa,0xa7,0xf5,0x47,0xc,0x58,0x6,0xb3,0xc,0x24,0x6,0xdb,0xc,0xce,0x18,0x3c,0xc5,0x35,0x71,0x6f,0x3c,0x1d,0x2f,0xc7,0xdb,0xf1,0x51,0x43,0x5d,0xc3,0x40,0x43,0xa5,0x61,0x95,0x61,0x97,0xe1,0x84,0x91,0xb9,0xd1,0x3c,0xa3,0xd5,0x46,0x8d,0x46,0xf,0x8c,0x69,0xc6,0x5c,0xe3,0x24,0xe3,0x6d,0xc6,0x6d,0xc6,0xa3,0x26,0x6,0x26,0x21,0x26,0x4b,0x4d,0xea,0x4d,0xee,0x9a,0x52,0x4d,0xb9,0xa6,0x29,0xa6,0x3b,0x4c,0x3b,0x4c,0xc7,0xcd,0xcc,0xcd,0xa2,0xcd,0xd6,0x99,0x35,0x9b,0x3d,0x31,0xd7,0x32,0xe7,0x9b,0xe7,0x9b,0xd7,0x9b,0xdf,0xb7,0x60,0x5a,0x78,0x5a,0x2c,0xb6,0xa8,0xb6,0xb8,0x65,0x49,0xb2,0xe4,0x5a,0xa6,0x59,0xee,0xb6,0xbc,0x6e,0x85,0x5a,0x39,0x59,0xa5,0x58,0x55,0x5a,0x5d,0xb3,0x46,0xad,0x9d,0xad,0x25,0xd6,0xbb,0xad,0xbb,0xa7,0x11,0xa7,0xb9,0x4e,0x93,0x4e,0xab,0x9e,0xd6,0x67,0xc3,0xb0,0xf1,0xb6,0xc9,0xb6,0xa9,0xb7,0x19,0xb0,0xe5,0xd8,0x6,0xdb,0xae,0xb6,0x6d,0xb6,0x7d,0x61,0x67,0x62,0x17,0x67,0xb7,0xc5,0xae,0xc3,0xee,0x93,0xbd,0x93,0x7d,0xba,0x7d,0x8d,0xfd,0x3d,0x7,0xd,0x87,0xd9,0xe,0xab,0x1d,0x5a,0x1d,0x7e,0x73,0xb4,0x72,0x14,0x3a,0x56,0x3a,0xde,0x9a,0xce,0x9c,0xee,0x3f,0x7d,0xc5,0xf4,0x96,0xe9,0x2f,0x67,0x58,0xcf,0x10,0xcf,0xd8,0x33,0xe3,0xb6,0x13,0xcb,0x29,0xc4,0x69,0x9d,0x53,0x9b,0xd3,0x47,0x67,0x17,0x67,0xb9,0x73,0x83,0xf3,0x88,0x8b,0x89,0x4b,0x82,0xcb,0x2e,0x97,0x3e,0x2e,0x9b,0x1b,0xc6,0xdd,0xc8,0xbd,0xe4,0x4a,0x74,0xf5,0x71,0x5d,0xe1,0x7a,0xd2,0xf5,0x9d,0x9b,0xb3,0x9b,0xc2,0xed,0xa8,0xdb,0xaf,0xee,0x36,0xee,0x69,0xee,0x87,0xdc,0x9f,0xcc,0x34,0x9f,0x29,0x9e,0x59,0x33,0x73,0xd0,0xc3,0xc8,0x43,0xe0,0x51,0xe5,0xd1,0x3f,0xb,0x9f,0x95,0x30,0x6b,0xdf,0xac,0x7e,0x4f,0x43,0x4f,0x81,0x67,0xb5,0xe7,0x23,0x2f,0x63,0x2f,0x91,0x57,0xad,0xd7,0xb0,0xb7,0xa5,0x77,0xaa,0xf7,0x61,0xef,0x17,0x3e,0xf6,0x3e,0x72,0x9f,0xe3,0x3e,0xe3,0x3c,0x37,0xde,0x32,0xde,0x59,0x5f,0xcc,0x37,0xc0,0xb7,0xc8,0xb7,0xcb,0x4f,0xc3,0x6f,0x9e,0x5f,0x85,0xdf,0x43,0x7f,0x23,0xff,0x64,0xff,0x7a,0xff,0xd1,0x0,0xa7,0x80,0x25,0x1,0x67,0x3,0x89,0x81,0x41,0x81,0x5b,0x2,0xfb,0xf8,0x7a,0x7c,0x21,0xbf,0x8e,0x3f,0x3a,0xdb,0x65,0xf6,0xb2,0xd9,0xed,0x41,0x8c,0xa0,0xb9,0x41,0x15,0x41,0x8f,0x82,0xad,0x82,0xe5,0xc1,0xad,0x21,0x68,0xc8,0xec,0x90,0xad,0x21,0xf7,0xe7,0x98,0xce,0x91,0xce,0x69,0xe,0x85,0x50,0x7e,0xe8,0xd6,0xd0,0x7,0x61,0xe6,0x61,0x8b,0xc3,0x7e,0xc,0x27,0x85,0x87,0x85,0x57,0x86,0x3f,0x8e,0x70,0x88,0x58,0x1a,0xd1,0x31,0x97,0x35,0x77,0xd1,0xdc,0x43,0x73,0xdf,0x44,0xfa,0x44,0x96,0x44,0xde,0x9b,0x67,0x31,0x4f,0x39,0xaf,0x2d,0x4a,0x35,0x2a,0x3e,0xaa,0x2e,0x6a,0x3c,0xda,0x37,0xba,0x34,0xba,0x3f,0xc6,0x2e,0x66,0x59,0xcc,0xd5,0x58,0x9d,0x58,0x49,0x6c,0x4b,0x1c,0x39,0x2e,0x2a,0xae,0x36,0x6e,0x6c,0xbe,0xdf,0xfc,0xed,0xf3,0x87,0xe2,0x9d,0xe2,0xb,0xe3,0x7b,0x17,0x98,0x2f,0xc8,0x5d,0x70,0x79,0xa1,0xce,0xc2,0xf4,0x85,0xa7,0x16,0xa9,0x2e,0x12,0x2c,0x3a,0x96,0x40,0x4c,0x88,0x4e,0x38,0x94,0xf0,0x41,0x10,0x2a,0xa8,0x16,0x8c,0x25,0xf2,0x13,0x77,0x25,0x8e,0xa,0x79,0xc2,0x1d,0xc2,0x67,0x22,0x2f,0xd1,0x36,0xd1,0x88,0xd8,0x43,0x5c,0x2a,0x1e,0x4e,0xf2,0x48,0x2a,0x4d,0x7a,0x92,0xec,0x91,0xbc,0x35,0x79,0x24,0xc5,0x33,0xa5,0x2c,0xe5,0xb9,0x84,0x27,0xa9,0x90,0xbc,0x4c,0xd,0x4c,0xdd,0x9b,0x3a,0x9e,0x16,0x9a,0x76,0x20,0x6d,0x32,0x3d,0x3a,0xbd,0x31,0x83,0x92,0x91,0x90,0x71,0x42,0xaa,0x21,0x4d,0x93,0xb6,0x67,0xea,0x67,0xe6,0x66,0x76,0xcb,0xac,0x65,0x85,0xb2,0xfe,0xc5,0x6e,0x8b,0xb7,0x2f,0x1e,0x95,0x7,0xc9,0x6b,0xb3,0x90,0xac,0x5,0x59,0x2d,0xa,0xb6,0x42,0xa6,0xe8,0x54,0x5a,0x28,0xd7,0x2a,0x7,0xb2,0x67,0x65,0x57,0x66,0xbf,0xcd,0x89,0xca,0x39,0x96,0xab,0x9e,0x2b,0xcd,0xed,0xcc,0xb3,0xca,0xdb,0x90,0x37,0x9c,0xef,0x9f,0xff,0xed,0x12,0xc2,0x12,0xe1,0x92,0xb6,0xa5,0x86,0x4b,0x57,0x2d,0x1d,0x58,0xe6,0xbd,0xac,0x6a,0x39,0xb2,0x3c,0x71,0x79,0xdb,0xa,0xe3,0x15,0x5,0x2b,0x86,0x56,0x6,0xac,0x3c,0xb8,0x8a,0xb6,0x2a,0x6d,0xd5,0x4f,0xab,0xed,0x57,0x97,0xae,0x7e,0xbd,0x26,0x7a,0x4d,0x6b,0x81,0x5e,0xc1,0xca,0x82,0xc1,0xb5,0x1,0x6b,0xeb,0xb,0x55,0xa,0xe5,0x85,0x7d,0xeb,0xdc,0xd7,0xed,0x5d,0x4f,0x58,0x2f,0x59,0xdf,0xb5,0x61,0xfa,0x86,0x9d,0x1b,0x3e,0x15,0x89,0x8a,0xae,0x14,0xdb,0x17,0x97,0x15,0x7f,0xd8,0x28,0xdc,0x78,0xe5,0x1b,0x87,0x6f,0xca,0xbf,0x99,0xdc,0x94,0xb4,0xa9,0xab,0xc4,0xb9,0x64,0xcf,0x66,0xd2,0x66,0xe9,0xe6,0xde,0x2d,0x9e,0x5b,0xe,0x96,0xaa,0x97,0xe6,0x97,0xe,0x6e,0xd,0xd9,0xda,0xb4,0xd,0xdf,0x56,0xb4,0xed,0xf5,0xf6,0x45,0xdb,0x2f,0x97,0xcd,0x28,0xdb,0xbb,0x83,0xb6,0x43,0xb9,0xa3,0xbf,0x3c,0xb8,0xbc,0x65,0xa7,0xc9,0xce,0xcd,0x3b,0x3f,0x54,0xa4,0x54,0xf4,0x54,0xfa,0x54,0x36,0xee,0xd2,0xdd,0xb5,0x61,0xd7,0xf8,0x6e,0xd1,0xee,0x1b,0x7b,0xbc,0xf6,0x34,0xec,0xd5,0xdb,0x5b,0xbc,0xf7,0xfd,0x3e,0xc9,0xbe,0xdb,0x55,0x1,0x55,0x4d,0xd5,0x66,0xd5,0x65,0xfb,0x49,0xfb,0xb3,0xf7,0x3f,0xae,0x89,0xaa,0xe9,0xf8,0x96,0xfb,0x6d,0x5d,0xad,0x4e,0x6d,0x71,0xed,0xc7,0x3,0xd2,0x3,0xfd,0x7,0x23,0xe,0xb6,0xd7,0xb9,0xd4,0xd5,0x1d,0xd2,0x3d,0x54,0x52,0x8f,0xd6,0x2b,0xeb,0x47,0xe,0xc7,0x1f,0xbe,0xfe,0x9d,0xef,0x77,0x2d,0xd,0x36,0xd,0x55,0x8d,0x9c,0xc6,0xe2,0x23,0x70,0x44,0x79,0xe4,0xe9,0xf7,0x9,0xdf,0xf7,0x1e,0xd,0x3a,0xda,0x76,0x8c,0x7b,0xac,0xe1,0x7,0xd3,0x1f,0x76,0x1d,0x67,0x1d,0x2f,0x6a,0x42,0x9a,0xf2,0x9a,0x46,0x9b,0x53,0x9a,0xfb,0x5b,0x62,0x5b,0xba,0x4f,0xcc,0x3e,0xd1,0xd6,0xea,0xde,0x7a,0xfc,0x47,0xdb,0x1f,0xf,0x9c,0x34,0x3c,0x59,0x79,0x4a,0xf3,0x54,0xc9,0x69,0xda,0xe9,0x82,0xd3,0x93,0x67,0xf2,0xcf,0x8c,0x9d,0x95,0x9d,0x7d,0x7e,0x2e,0xf9,0xdc,0x60,0xdb,0xa2,0xb6,0x7b,0xe7,0x63,0xce,0xdf,0x6a,0xf,0x6f,0xef,0xba,0x10,0x74,0xe1,0xd2,0x45,0xff,0x8b,0xe7,0x3b,0xbc,0x3b,0xce,0x5c,0xf2,0xb8,0x74,0xf2,0xb2,0xdb,0xe5,0x13,0x57,0xb8,0x57,0x9a,0xaf,0x3a,0x5f,0x6d,0xea,0x74,0xea,0x3c,0xfe,0x93,0xd3,0x4f,0xc7,0xbb,0x9c,0xbb,0x9a,0xae,0xb9,0x5c,0x6b,0xb9,0xee,0x7a,0xbd,0xb5,0x7b,0x66,0xf7,0xe9,0x1b,0x9e,0x37,0xce,0xdd,0xf4,0xbd,0x79,0xf1,0x16,0xff,0xd6,0xd5,0x9e,0x39,0x3d,0xdd,0xbd,0xf3,0x7a,0x6f,0xf7,0xc5,0xf7,0xf5,0xdf,0x16,0xdd,0x7e,0x72,0x27,0xfd,0xce,0xcb,0xbb,0xd9,0x77,0x27,0xee,0xad,0xbc,0x4f,0xbc,0x5f,0xf4,0x40,0xed,0x41,0xd9,0x43,0xdd,0x87,0xd5,0x3f,0x5b,0xfe,0xdc,0xd8,0xef,0xdc,0x7f,0x6a,0xc0,0x77,0xa0,0xf3,0xd1,0xdc,0x47,0xf7,0x6,0x85,0x83,0xcf,0xfe,0x91,0xf5,0x8f,0xf,0x43,0x5,0x8f,0x99,0x8f,0xcb,0x86,0xd,0x86,0xeb,0x9e,0x38,0x3e,0x39,0x39,0xe2,0x3f,0x72,0xfd,0xe9,0xfc,0xa7,0x43,0xcf,0x64,0xcf,0x26,0x9e,0x17,0xfe,0xa2,0xfe,0xcb,0xae,0x17,0x16,0x2f,0x7e,0xf8,0xd5,0xeb,0xd7,0xce,0xd1,0x98,0xd1,0xa1,0x97,0xf2,0x97,0x93,0xbf,0x6d,0x7c,0xa5,0xfd,0xea,0xc0,0xeb,0x19,0xaf,0xdb,0xc6,0xc2,0xc6,0x1e,0xbe,0xc9,0x78,0x33,0x31,0x5e,0xf4,0x56,0xfb,0xed,0xc1,0x77,0xdc,0x77,0x1d,0xef,0xa3,0xdf,0xf,0x4f,0xe4,0x7c,0x20,0x7f,0x28,0xff,0x68,0xf9,0xb1,0xf5,0x53,0xd0,0xa7,0xfb,0x93,0x19,0x93,0x93,0xff,0x4,0x3,0x98,0xf3,0xfc,0xef,0x35,0x94,0x82,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xa,0x14,0x2,0x33,0x2,0xa3,0x96,0xc,0x41,0x0,0x0,0x1,0x42,0x49,0x44,0x41,0x54,0x38,0xcb,0xa5,0x93,0x51,0x4a,0xc3,0x40,0x10,0x86,0xbf,0x99,0xdd,0x4d,0x44,0x1f,0x9a,0x7,0x5b,0x5a,0x3c,0x84,0xf8,0xe4,0x3d,0x3c,0x4d,0x8e,0x50,0x3c,0x8c,0x37,0xf0,0x0,0x3e,0x89,0x87,0x50,0x3,0x8a,0xa4,0xd8,0x42,0x5b,0x76,0x13,0x1f,0x3a,0x29,0x55,0x4a,0x48,0xf1,0x87,0x81,0x61,0xd9,0xf9,0x67,0xfe,0xe1,0x1f,0x1,0x3c,0x90,0x1,0x39,0x70,0x66,0xb9,0x3,0x94,0xdf,0x68,0x80,0x4,0x6c,0x81,0x35,0xb0,0x1,0xb6,0x5d,0xf1,0x5,0x50,0x0,0x23,0xcb,0x73,0x40,0x2c,0x0,0x5a,0x8b,0xd,0xb0,0x2,0x16,0x40,0x8d,0x75,0xcf,0x81,0xe2,0xe6,0xfa,0xf6,0x6e,0x7c,0x39,0x2d,0x53,0x4a,0x45,0x4b,0xcb,0x31,0x8,0x82,0x73,0xae,0xfe,0xf8,0xac,0xe6,0xcf,0x2f,0x4f,0xf,0x40,0xf4,0x36,0xf6,0x68,0x32,0x9e,0x95,0xdf,0xcb,0x45,0x11,0x63,0xa4,0xf,0xde,0xfb,0x62,0x32,0x9e,0x95,0xc0,0x23,0xb0,0xdc,0x4b,0x48,0x4d,0x53,0xc4,0x98,0xe,0xa6,0x3e,0x8e,0x18,0x13,0xa9,0x69,0xa,0x93,0x9a,0x79,0x5b,0x58,0xae,0x8,0x2a,0xfd,0xc5,0x1d,0x74,0xd7,0x24,0x7,0x9c,0xb7,0x6d,0x8b,0x38,0x41,0x74,0x18,0x81,0x38,0xc1,0x46,0x55,0xdf,0xbd,0xa9,0x38,0x44,0x74,0xd8,0x4,0xe2,0x3a,0x2,0xfc,0x9e,0x55,0x4,0x19,0x28,0xe1,0xf0,0x5f,0x47,0xd0,0x8a,0x9e,0x40,0xb0,0x93,0xda,0x76,0x4,0xd,0xd0,0x3a,0x71,0xe8,0x40,0x9,0x6e,0x27,0xa1,0x5,0x1a,0x6f,0xf6,0xdc,0xa8,0x53,0x44,0xb5,0x23,0xee,0xeb,0x8f,0x3a,0xc5,0x5c,0x99,0xd4,0xbc,0xbd,0xa,0x21,0xd4,0x59,0x8,0xa8,0xe8,0x7e,0x1f,0x7f,0x43,0x45,0xc9,0x42,0x20,0x84,0xac,0x36,0x4b,0x6f,0xbd,0x1d,0xc6,0xa2,0xaa,0xde,0xe6,0xb3,0xe9,0x55,0x19,0x63,0xec,0xb5,0xb2,0xf7,0xfe,0xeb,0xbd,0x7a,0xbd,0xb7,0x7b,0x58,0xb,0x70,0xfe,0x8f,0x63,0x5a,0x79,0x93,0x0,0x10,0x81,0xe5,0xa9,0xe7,0xfc,0x3,0xc1,0x39,0x63,0x22,0xdc,0x9d,0xb2,0x6a,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x93,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x31,0x2f,0x37,0x46,0x43,0x4f,0x47,0x44,0x50,0x55,0x52,0x5f,0x55,0x52,0x60,0x3d,0x3a,0x45,0x56,0x52,0x60,0x56,0x52,0x60,0x43,0x40,0x4c,0x42,0x40,0x4b,0x3a,0x38,0x41,0x36,0x34,0x3d,0x44,0x42,0x4e,0x36,0x34,0x3e,0x46,0x42,0x4f,0x38,0x35,0x3f,0x47,0x45,0x50,0x39,0x37,0x40,0x49,0x46,0x53,0x3a,0x38,0x42,0x4a,0x47,0x54,0x3b,0x39,0x43,0x4b,0x49,0x55,0x3c,0x3a,0x44,0x4e,0x4a,0x58,0x3e,0x3b,0x46,0x50,0x4d,0x5a,0x3f,0x3d,0x48,0x3f,0x3d,0x47,0x45,0x42,0x4d,0x41,0x3e,0x49,0x40,0x3e,0x48,0x52,0x4e,0x5c,0x51,0x4e,0x5b,0xff,0xff,0xff,0x32,0xd2,0xb4,0xc,0x0,0x0,0x0,0x16,0x74,0x52,0x4e,0x53,0x4,0xa,0x11,0x19,0x1f,0x22,0x24,0x15,0x25,0x34,0x3f,0x46,0x47,0x48,0x77,0xef,0xef,0xef,0xef,0x77,0xef,0xed,0x6b,0x28,0x52,0x7a,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x30,0xae,0xdc,0x2d,0xe4,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x95,0x49,0x44,0x41,0x54,0x18,0xd3,0x65,0xcf,0xdb,0x12,0x42,0x50,0x14,0x6,0xe0,0xb5,0x8f,0xf6,0x11,0xa5,0x24,0x9,0x49,0x22,0xd2,0xfb,0xbf,0x5d,0x9b,0x31,0xfb,0xa2,0xbe,0xcb,0x7f,0x66,0x1d,0x7e,0x0,0x84,0x9,0x65,0xdc,0x61,0x94,0x60,0x4,0x80,0x2,0x21,0x95,0x36,0xd6,0x1a,0xad,0xa4,0x8,0x10,0x60,0x11,0x46,0xe9,0x69,0x95,0x46,0xa1,0xc0,0x40,0x64,0x9c,0x9d,0x37,0x59,0x2c,0x9,0x50,0x95,0x5f,0xbc,0x5c,0x51,0x60,0xba,0xb8,0x7a,0x85,0x66,0xc0,0x4d,0x59,0x79,0xa5,0xe1,0xc0,0x6d,0x7d,0xf3,0x6a,0xbb,0x4,0xcd,0xdd,0x6b,0x96,0xc0,0xb4,0xf,0xaf,0x75,0x23,0x4c,0x77,0x4f,0xaf,0x73,0x4b,0xa9,0xea,0x87,0xd7,0x66,0xe8,0xdd,0x59,0x22,0x77,0xe3,0xf4,0x5e,0x4d,0xe3,0xde,0x3d,0x86,0x45,0x72,0x98,0x3f,0xab,0xf9,0x98,0xb8,0xd7,0xff,0xca,0xfd,0xd6,0xff,0x2,0x86,0xd,0x15,0x51,0x39,0x7d,0xa8,0x8e,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char checked_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x16,0x30,0x0,0x6d,0xeb,0x4,0xa7,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0xc1,0x49,0x44,0x41,0x54,0x38,0xcb,0xad,0x93,0x41,0x6b,0x13,0x51,0x14,0x85,0xbf,0x77,0x33,0xe3,0x80,0x5d,0x58,0x82,0x13,0x5b,0x28,0xa6,0xdb,0xda,0x3f,0xd0,0x76,0x67,0x17,0x5d,0xa4,0x2d,0x23,0xa,0x62,0xc0,0x5f,0xa0,0x69,0x37,0x82,0xd0,0x5d,0xb0,0x8b,0x52,0xa1,0x20,0x14,0x9,0x48,0x5,0x3,0x52,0x29,0x36,0x48,0x28,0x2e,0x14,0x8a,0xab,0x26,0xf5,0x7,0x84,0xb1,0xbb,0x11,0xa,0xb6,0x49,0x9,0xd9,0xa6,0x49,0xdf,0x73,0xe1,0x4c,0x48,0x71,0xd2,0x8d,0x5e,0x78,0xf0,0xe0,0x9e,0x7b,0xee,0xb9,0xf7,0x9d,0x7,0xff,0x18,0xa,0x60,0x71,0x3e,0xeb,0x0,0xe3,0xc0,0x4,0x90,0x2,0x24,0xe,0x3c,0x34,0x74,0x5d,0x1e,0x65,0xef,0xdf,0x7a,0xbb,0xf5,0x7e,0x1b,0x8,0xf6,0x3e,0x7f,0x68,0x5b,0x61,0x6e,0xbc,0x71,0xf6,0x6b,0xe3,0xe4,0xf4,0x78,0x4e,0x6b,0x6d,0x2b,0xa5,0x62,0xbb,0xe5,0x72,0x4f,0xf0,0xee,0x65,0xb8,0xe6,0x58,0x8f,0xb,0xaf,0xdf,0x65,0x80,0xa3,0x88,0x60,0xe2,0xe4,0xf4,0x78,0xe,0xb0,0x2d,0xcb,0x26,0x8e,0x20,0x9d,0x4e,0xb3,0xb4,0xf4,0x14,0x63,0xc,0xc5,0x62,0xf1,0x76,0xa8,0xf6,0x28,0x92,0x9a,0xd2,0x5a,0xdb,0x22,0x9,0x12,0x89,0x4,0x22,0xc2,0xe4,0xe4,0x9d,0xde,0x5d,0x44,0x58,0x5d,0xcd,0xe3,0x38,0xe,0xbb,0xbb,0x25,0xaa,0xd5,0x43,0x2b,0x1c,0xb5,0x37,0xab,0x28,0xa5,0x7a,0x9d,0x37,0x37,0x5f,0x51,0x2e,0x97,0x98,0x9e,0x9e,0x2,0xc0,0xf3,0x16,0x99,0x99,0x99,0xa2,0xd9,0x6c,0xb2,0xbe,0xbe,0x11,0xe1,0x84,0x41,0xcb,0xaa,0xd5,0x6a,0x0,0x64,0xb3,0xf,0x19,0x1e,0xbe,0xc1,0xca,0xca,0x73,0x0,0xd6,0xd6,0x5e,0xd2,0x6a,0xb5,0x2e,0x61,0xad,0x38,0x82,0x52,0xe9,0x13,0xcb,0xcb,0x39,0x66,0x67,0xef,0x72,0x7e,0xde,0x21,0x99,0x4c,0x52,0xa9,0x1c,0x52,0x2e,0xef,0xfd,0x85,0x8d,0x55,0xd0,0x68,0x9c,0xb1,0xbf,0xff,0xd,0xdb,0xb6,0x59,0x58,0xc8,0xd0,0x6e,0xb7,0xc9,0xe7,0x5f,0xc4,0xbe,0x8c,0xc,0x32,0xc8,0xce,0xce,0xc7,0x3f,0x46,0x51,0x8a,0x42,0xe1,0xd,0x41,0xf0,0x33,0x16,0x67,0xd,0x22,0x38,0x38,0xa8,0xe0,0x79,0xf,0x70,0xdd,0x9b,0x54,0xab,0xdf,0x7,0x3a,0x31,0x22,0xd0,0xc6,0x18,0x8c,0x31,0xbd,0x84,0x31,0x6,0xdf,0xff,0x81,0xef,0x5f,0x2e,0xe8,0xc3,0xe9,0x7e,0x82,0xba,0x88,0x74,0xb4,0xbe,0xb0,0x23,0xd9,0x71,0x61,0x8c,0x41,0xeb,0xb,0x44,0xa4,0xb,0xd4,0xfb,0x77,0xe0,0x8f,0xa4,0xc6,0xbe,0x2,0xdd,0x6e,0xb7,0xc3,0x55,0x7,0x54,0x67,0x24,0x35,0xf6,0x5,0xf0,0xfb,0x15,0x4,0xae,0x3b,0xfa,0xcc,0x75,0x47,0xb7,0xae,0xfa,0x4c,0xa1,0xec,0x7a,0x58,0x1c,0xf0,0x3f,0xe2,0x37,0x4f,0x82,0xa8,0x62,0xbb,0xcc,0x8d,0x11,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x8d,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x58,0x56,0x63,0xb0,0xaf,0xb5,0x38,0x37,0x40,0x20,0x20,0x24,0xb6,0xb6,0xb9,0x57,0x57,0x5a,0x20,0x20,0x24,0x38,0x36,0x40,0x20,0x20,0x25,0x1e,0x1e,0x22,0x1f,0x1f,0x23,0x8b,0x8b,0x8d,0xff,0xff,0xff,0x20,0x20,0x24,0x22,0x22,0x27,0x23,0x23,0x28,0x42,0x42,0x47,0xf8,0xf8,0xf8,0xfe,0xfe,0xfe,0x25,0x25,0x2a,0x4e,0x4e,0x52,0x26,0x26,0x2b,0xc5,0xc5,0xc7,0xaa,0xaa,0xab,0xb8,0xb8,0xba,0x5f,0x5f,0x63,0x74,0x74,0x77,0xed,0xed,0xed,0x33,0x33,0x38,0x8d,0x8d,0x8f,0xb8,0xb8,0xb9,0x35,0x35,0x39,0x3a,0x3a,0x3e,0xfb,0xfb,0xfb,0xfa,0xfa,0xfa,0xb2,0xb2,0xb4,0x45,0x45,0x49,0x61,0x61,0x65,0x8f,0x8f,0x92,0x63,0x63,0x66,0x2a,0x2a,0x2f,0x40,0x82,0xb,0xf6,0x0,0x0,0x0,0xf,0x74,0x52,0x4e,0x53,0x0,0x7,0x27,0x50,0x66,0x68,0x6a,0x81,0xb4,0xfa,0xdd,0xfb,0xfb,0xb4,0xfa,0xb8,0xf0,0x7f,0x59,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x12,0x7b,0xbc,0x6c,0x0,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x0,0x8e,0x49,0x44,0x41,0x54,0x18,0xd3,0x65,0xcf,0x5b,0x12,0x82,0x30,0xc,0x40,0x51,0x48,0x5b,0x15,0x5,0x5b,0x42,0x2b,0x4,0x50,0x40,0xc5,0xb7,0xee,0x7f,0x79,0x96,0x8a,0x88,0x7a,0x3f,0xcf,0x4c,0x26,0x89,0xe7,0xfd,0xe5,0x3,0xe3,0xc2,0x35,0x99,0x82,0x6f,0x1,0x66,0x81,0x54,0xae,0x18,0xe7,0x60,0x81,0x5,0x89,0x36,0x5d,0xab,0x34,0x5b,0x30,0xb,0x5c,0x6a,0xa2,0xbc,0x20,0x2a,0x71,0x2d,0xb9,0x5,0xa1,0xc,0x6d,0xb0,0xa2,0x1a,0x9b,0xad,0x12,0x3d,0xec,0x70,0xdf,0x36,0x58,0x9b,0x1,0xe,0xc7,0xd3,0x19,0x4b,0xfa,0x80,0x9d,0xc9,0xd2,0xcb,0x18,0xae,0x88,0x37,0x1a,0x43,0x91,0xdf,0x1f,0x6f,0x70,0x6b,0x5f,0x69,0xb7,0x76,0x38,0xcc,0xe8,0x24,0xec,0xe,0x83,0x28,0xec,0x4f,0x97,0xcb,0x8,0xbe,0x9e,0xe3,0xcc,0x3d,0xf7,0xd3,0x13,0x10,0x58,0xd,0x44,0xd4,0xa5,0x38,0x3e,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char checker_bg_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x8,0x6,0x0,0x0,0x0,0xc4,0xf,0xbe,0x8b,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xe,0xc4,0x0,0x0,0xe,0xc4,0x1,0x95,0x2b,0xe,0x1b,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x14,0xd,0x1c,0x1b,0x52,0x41,0x72,0xa4,0x0,0x0,0x0,0x24,0x49,0x44,0x41,0x54,0x28,0x53,0x63,0xfc,0xf,0x4,0xc,0x48,0xa0,0xa1,0xa1,0x1,0xca,0x82,0x0,0x26,0x28,0x8d,0x13,0x50,0xae,0x80,0xb1,0xbe,0xbe,0x7e,0x60,0xdd,0xc0,0xc0,0x0,0x0,0x78,0x11,0x9,0x87,0x2b,0xa,0xe1,0x69,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x8,0x0,0x0,0x0,0x0,0xe1,0x64,0xe1,0x57,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xe,0xc4,0x0,0x0,0xe,0xc4,0x1,0x95,0x2b,0xe,0x1b,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x1a,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0xfc,0xcf,0xc0,0xc0,0xd0,0xc0,0xc0,0xc0,0xc0,0xc4,0x0,0x5,0x98,0xc,0xc6,0x7a,0xc2,0x6a,0x0,0x8b,0x7a,0x2,0x8d,0x68,0x67,0xe3,0xa,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char close_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9b,0x49,0x44,0x41,0x54,0x38,0x8d,0xcd,0x92,0x31,0xe,0xc2,0x30,0x10,0x4,0x17,0xaa,0x3d,0x67,0xdb,0x58,0xd0,0xd3,0xf0,0xa3,0x7c,0x36,0x3c,0x82,0x48,0x44,0x22,0x6f,0xb1,0x4d,0x85,0x14,0x81,0xf,0x2c,0x28,0xe0,0xda,0xd5,0x8c,0x4e,0x77,0xb,0xfc,0xd5,0x98,0xd9,0x20,0x29,0x7a,0xb9,0xa4,0x68,0x66,0x83,0xb,0x93,0xcc,0x24,0xa7,0x9a,0x44,0x52,0x24,0x39,0x91,0xcc,0x55,0x89,0xa4,0xde,0xcc,0xce,0x24,0xb,0xc9,0x39,0x84,0xb0,0xf7,0xb2,0xae,0xeb,0x76,0xde,0x8a,0x4f,0x92,0x66,0xd8,0x91,0x5c,0x49,0x5e,0x9a,0xe1,0xb5,0x64,0x5,0x16,0x92,0x8b,0x7,0x6f,0x9b,0x8c,0x0,0x4a,0x29,0x9b,0x26,0x81,0xa4,0x3e,0xa5,0x34,0x2,0x38,0x2,0x58,0x0,0xcc,0x0,0xe,0x39,0xe7,0xd3,0xfa,0xb0,0xee,0xea,0x8f,0x7,0x7b,0xf5,0x9d,0xb7,0xb0,0x97,0x55,0x25,0x5f,0x17,0xe9,0x2e,0xf9,0xb8,0xca,0x3f,0x9b,0x1b,0x1a,0xe3,0x40,0x47,0xa0,0xda,0xda,0x61,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x4,0x0,0x0,0x0,0xb5,0xfa,0x37,0xea,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x6c,0x49,0x44,0x41,0x54,0x28,0xcf,0xad,0x90,0xd1,0xa,0x80,0x20,0xc,0x45,0xad,0xa7,0x6b,0xee,0x35,0xb1,0x3f,0xf3,0xbb,0x13,0xc,0xea,0x5f,0x5c,0xf,0x42,0x4d,0x1c,0x14,0xd4,0xde,0xc6,0x39,0xd3,0xdd,0x19,0xf3,0x53,0xd9,0x48,0x5e,0xf6,0xe4,0x6d,0x6c,0x30,0xa,0xd2,0xad,0x90,0x47,0x42,0x11,0xa,0xcd,0x76,0x5,0x63,0x9b,0x16,0xd9,0xb9,0x20,0x9f,0xbc,0x14,0x15,0xb,0x65,0x47,0x56,0x71,0x55,0x90,0xc1,0x60,0x1c,0x12,0x8f,0x5a,0x26,0x1e,0xd4,0x79,0xf9,0x45,0x5d,0x57,0x59,0xd2,0x85,0x36,0x51,0x87,0xfb,0xd0,0xef,0xe,0xf5,0x78,0xea,0x4f,0x75,0x2,0x30,0x98,0x34,0x72,0xa,0x11,0xfb,0xc2,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xba,0x84,0x14,0xff,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xcb,0xd9,0xac,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char close_hl_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9b,0x49,0x44,0x41,0x54,0x38,0x8d,0xcd,0x92,0x31,0xe,0xc2,0x30,0x10,0x4,0x17,0xaa,0x3d,0x67,0xdb,0x58,0xd0,0xd3,0xf0,0xa3,0x7c,0x36,0x3c,0x82,0x48,0x44,0x22,0x6f,0xb1,0x4d,0x85,0x14,0x81,0xf,0x2c,0x28,0xe0,0xda,0xd5,0x8c,0x4e,0x77,0xb,0xfc,0xd5,0x98,0xd9,0x20,0x29,0x7a,0xb9,0xa4,0x68,0x66,0x83,0xb,0x93,0xcc,0x24,0xa7,0x9a,0x44,0x52,0x24,0x39,0x91,0xcc,0x55,0x89,0xa4,0xde,0xcc,0xce,0x24,0xb,0xc9,0x39,0x84,0xb0,0xf7,0xb2,0xae,0xeb,0x76,0xde,0x8a,0x4f,0x92,0x66,0xd8,0x91,0x5c,0x49,0x5e,0x9a,0xe1,0xb5,0x64,0x5,0x16,0x92,0x8b,0x7,0x6f,0x9b,0x8c,0x0,0x4a,0x29,0x9b,0x26,0x81,0xa4,0x3e,0xa5,0x34,0x2,0x38,0x2,0x58,0x0,0xcc,0x0,0xe,0x39,0xe7,0xd3,0xfa,0xb0,0xee,0xea,0x8f,0x7,0x7b,0xf5,0x9d,0xb7,0xb0,0x97,0x55,0x25,0x5f,0x17,0xe9,0x2e,0xf9,0xb8,0xca,0x3f,0x9b,0x1b,0x1a,0xe3,0x40,0x47,0xa0,0xda,0xda,0x61,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x4,0x0,0x0,0x0,0xb5,0xfa,0x37,0xea,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x6c,0x49,0x44,0x41,0x54,0x28,0xcf,0xad,0x90,0xd1,0xa,0x80,0x20,0xc,0x45,0xad,0xa7,0x6b,0xee,0x35,0xb1,0x3f,0xf3,0xbb,0x13,0xc,0xea,0x5f,0x5c,0xf,0x42,0x4d,0x1c,0x14,0xd4,0xde,0xc6,0x39,0xd3,0xdd,0x19,0xf3,0x53,0xd9,0x48,0x5e,0xf6,0xe4,0x6d,0x6c,0x30,0xa,0xd2,0xad,0x90,0x47,0x42,0x11,0xa,0xcd,0x76,0x5,0x63,0x9b,0x16,0xd9,0xb9,0x20,0x9f,0xbc,0x14,0x15,0xb,0x65,0x47,0x56,0x71,0x55,0x90,0xc1,0x60,0x1c,0x12,0x8f,0x5a,0x26,0x1e,0xd4,0x79,0xf9,0x45,0x5d,0x57,0x59,0xd2,0x85,0x36,0x51,0x87,0xfb,0xd0,0xef,0xe,0xf5,0x78,0xea,0x4f,0x75,0x2,0x30,0x98,0x34,0x72,0xa,0x11,0xfb,0xc2,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xba,0x84,0x14,0xff,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xcb,0xd9,0xac,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char dosfont_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x80,0x8,0x4,0x0,0x0,0x0,0x69,0x37,0xa9,0x40,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x89,0x0,0x0,0xb,0x89,0x1,0x37,0xc9,0xcb,0xad,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdb,0x3,0x1d,0x2,0xa,0x28,0x9d,0x20,0x27,0xc0,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x5,0x60,0x49,0x44,0x41,0x54,0x78,0xda,0xed,0x5c,0xdb,0x76,0xac,0x20,0xc,0x1d,0x58,0xfe,0xff,0x2f,0xcf,0x79,0xb0,0x14,0x72,0xf,0x18,0x74,0x3a,0x27,0xfb,0xa1,0xad,0x55,0x21,0xdc,0x42,0x76,0x12,0x7c,0xbd,0x12,0x2b,0x78,0xbf,0xdf,0xef,0xef,0x68,0x49,0x95,0x1b,0x17,0xd7,0xc8,0x4f,0xee,0xae,0xa3,0x89,0xf8,0x7a,0x95,0xe2,0x6d,0x4e,0xfb,0xdd,0xde,0x38,0xff,0xe3,0x7d,0x9f,0xd6,0x38,0x53,0x7b,0xcc,0x80,0x9c,0xbf,0x4b,0xf9,0x99,0x1,0x6d,0xc4,0xb5,0xf1,0xeb,0xf3,0xe2,0xf5,0x2a,0xa5,0x94,0x52,0xc6,0xf7,0xfa,0xd5,0x7c,0xf3,0xe7,0xdf,0xbe,0xde,0xfc,0x2e,0x3f,0xb3,0x4,0xa0,0x60,0x32,0xf8,0xbb,0xe3,0x74,0x87,0x1d,0x24,0x35,0xff,0xbe,0x2e,0x38,0x7,0xb2,0xd5,0x7d,0xd6,0x59,0xe5,0xa6,0x9d,0x3f,0xc7,0xd9,0x81,0x45,0x1c,0xb,0xa2,0x1d,0xd2,0x27,0xda,0xec,0xe2,0xa0,0x3a,0x28,0x42,0x8b,0xf0,0x25,0x54,0xdc,0x60,0xad,0x33,0x4a,0x69,0xcd,0x3d,0x1,0x35,0xc0,0xf9,0x9f,0xd6,0xdc,0xf5,0x75,0xdd,0x6a,0x88,0xd5,0xb,0xb0,0xbc,0x2e,0xfd,0xb1,0x26,0x60,0x2b,0xa4,0x94,0xb3,0x60,0x2c,0xf0,0xba,0xf8,0xe3,0x38,0xb5,0xb2,0xb5,0x32,0xe1,0xb8,0x4a,0x75,0xca,0xf2,0x1c,0x31,0xfd,0xdb,0xc5,0xbc,0xaa,0xd5,0x47,0x6d,0xa0,0x2f,0x31,0x8f,0x9e,0xd2,0x74,0xe,0xb0,0x3,0xe4,0x75,0x8a,0x75,0x80,0xbd,0x16,0xaf,0x4e,0x5e,0xa8,0xa5,0xaf,0x5b,0x16,0xba,0x3c,0xd5,0x2a,0x10,0xeb,0x0,0xab,0xb,0x7a,0x75,0x7a,0x99,0xf0,0xde,0x28,0x64,0x1b,0x8c,0x71,0x50,0x56,0x15,0x29,0x6d,0x3e,0xde,0xbe,0xeb,0xaa,0x8a,0x6a,0x5,0xb7,0xeb,0x5e,0xb0,0x47,0x54,0xd8,0x5,0x7b,0xd,0x21,0x5c,0x72,0x88,0x92,0x7d,0xd6,0xb8,0x8d,0xac,0xfd,0x78,0xfd,0x41,0xdc,0x69,0x36,0x27,0x12,0x89,0xef,0x46,0xe1,0xd9,0xf9,0xa8,0x6c,0xf0,0x35,0x7c,0x83,0x33,0x45,0xc7,0xed,0x90,0xde,0xf7,0x95,0x1f,0xcf,0xfe,0xf9,0xf2,0x59,0x81,0xc7,0xbf,0xf0,0x35,0x76,0x81,0x58,0x64,0xd7,0x2a,0x8f,0x2f,0xff,0x8a,0x85,0xa7,0xd7,0x8f,0x3b,0xe4,0xb0,0xe8,0x84,0x54,0x85,0x57,0xac,0x75,0x4a,0xc4,0xcd,0x37,0x8f,0x81,0x7b,0x52,0x33,0x9b,0x16,0x9d,0x4f,0x1d,0x92,0x33,0x42,0xae,0x0,0x72,0xb4,0xa7,0x4c,0x21,0x6e,0xc9,0x76,0x93,0xbd,0x77,0x81,0xe5,0x76,0x2b,0x9e,0x1e,0x1f,0xd9,0xd9,0x38,0x91,0x70,0xd7,0x71,0xd7,0xfc,0x54,0xe4,0x75,0x80,0x77,0xbe,0x78,0x16,0x8b,0xbd,0x10,0x7f,0x38,0x86,0xfe,0xb8,0x35,0xf2,0xb4,0x89,0xb2,0xce,0xe0,0x75,0xcc,0x3c,0x8b,0x5c,0x79,0x4e,0xee,0x80,0x63,0xb6,0x82,0x15,0x4f,0x6e,0x2c,0xd9,0xc1,0x6b,0x9c,0x9f,0x41,0xde,0x3a,0x8f,0xbd,0xc2,0xc6,0x38,0xb0,0xa8,0x17,0x79,0xec,0x2,0x7b,0x27,0xd0,0x9c,0x29,0xd5,0xe2,0x5c,0x16,0xf3,0x8a,0x62,0x66,0x73,0x1d,0x6f,0xb9,0x4b,0xe8,0x9e,0x81,0x97,0xee,0xaf,0xd7,0x1,0x4f,0x21,0xdb,0x70,0xe1,0xd4,0xa2,0x6e,0xd8,0xf0,0x2a,0x15,0x3f,0x2f,0x37,0x5f,0xd3,0x49,0xbe,0xa7,0x35,0x43,0x2f,0x91,0x48,0x24,0x12,0xe9,0xf,0x78,0xcb,0xd4,0xc2,0xbb,0xe9,0x49,0xdb,0x28,0xcf,0x25,0x38,0x76,0xc0,0x6d,0xb3,0x98,0x78,0xe3,0x67,0xb9,0xd,0x4e,0xa3,0xbf,0xb8,0x7d,0xbf,0xf9,0x1,0x38,0x1c,0x85,0x3,0x8,0x50,0x78,0x1c,0x5,0xe8,0x81,0xb,0x1a,0xd4,0xb0,0x23,0x3d,0x34,0x38,0xb,0x83,0xb1,0xfa,0xb3,0x34,0x76,0x4d,0xc3,0x74,0x54,0xfe,0x21,0x3f,0x40,0x4f,0x70,0x80,0x8d,0xd6,0x6c,0x31,0x5e,0x54,0xe9,0xfd,0x68,0xd3,0x99,0x46,0x9a,0x7c,0xa8,0x30,0xc2,0x63,0x1b,0xa0,0xeb,0x2e,0x8c,0x88,0x88,0xe1,0x8a,0x23,0x6c,0x92,0xc,0x61,0x97,0xd7,0x5a,0x75,0x76,0xfc,0x30,0xb2,0xf9,0x3d,0x48,0xcf,0x6b,0x22,0xad,0x7d,0x7,0x2f,0xd0,0x18,0xf1,0xf3,0x52,0x54,0xed,0x9a,0x6,0xbc,0x63,0x53,0x62,0xe8,0x5c,0xd3,0x4b,0x47,0xe1,0xf1,0xce,0x8d,0x22,0x45,0xc0,0xec,0x6b,0x6d,0x35,0x7b,0xd8,0xdf,0xec,0x72,0x5,0x3a,0x60,0x76,0x22,0xc6,0x4e,0xed,0xb9,0x6,0xcd,0x2d,0xb4,0xa0,0xe,0x80,0xdb,0xa1,0xce,0xb9,0xe7,0x99,0xfb,0x55,0xf,0xc2,0x86,0xe,0x18,0x33,0xb4,0xc6,0x3d,0x1f,0x6e,0x96,0xd8,0x88,0xc1,0x29,0x53,0xd4,0x55,0xaa,0xe9,0x93,0xf1,0x1d,0x1c,0xbd,0xe7,0x47,0xdd,0xef,0x86,0xc1,0xf9,0xc,0x7a,0x4e,0x64,0x22,0x91,0x48,0x7c,0x5,0xfc,0x9e,0xec,0xfa,0xad,0xcd,0x77,0xef,0x12,0x16,0x5f,0xd6,0xee,0x73,0xbc,0x4f,0xe6,0xe7,0xfe,0x6b,0xc9,0x8e,0xd0,0x93,0x39,0x65,0x39,0x34,0x6e,0x51,0x2d,0xbe,0x4c,0xcf,0x7,0xec,0xa7,0xb7,0xa5,0x50,0xe3,0x7c,0x4c,0xc2,0xe6,0x9e,0xc7,0x4d,0xd3,0xd,0xb0,0xfe,0x46,0x5d,0x11,0xef,0xa,0xbd,0xe5,0x8c,0x29,0xbe,0x7c,0x2d,0xf0,0xa1,0x77,0xde,0xc,0xff,0x98,0x30,0x85,0xcf,0x2,0xa5,0xa4,0xe3,0xd9,0x2e,0xa0,0x23,0x35,0x26,0xdb,0xeb,0x4,0x38,0xd2,0x8e,0xab,0x9a,0x9e,0xc4,0xa6,0x70,0x2c,0x79,0x1d,0x9d,0x68,0xfe,0x74,0xfb,0x68,0x2a,0x5d,0x3d,0x64,0xd2,0xca,0xdd,0x5e,0x25,0xb9,0x7c,0x87,0xf8,0x2,0xf4,0x51,0x5d,0x50,0xbd,0xf4,0x33,0x92,0xd5,0x59,0x87,0xb4,0x7c,0xa7,0x95,0x42,0xd9,0x60,0x4c,0x66,0xbe,0xa4,0xe4,0x60,0x83,0x75,0x2f,0xb1,0x14,0x49,0xde,0xd5,0x5,0x35,0x5e,0xb1,0x50,0x25,0x37,0x9e,0x1,0xe0,0x5c,0xeb,0x2b,0xf6,0x5c,0xd4,0x26,0x7c,0xb4,0xf3,0x3e,0x92,0x48,0xf8,0xfe,0x38,0xa2,0x67,0x3,0xe9,0x7d,0xcb,0xc,0x91,0x96,0x84,0x66,0x10,0x71,0xc7,0x5e,0xa0,0xf,0xe2,0xf2,0xba,0xfc,0x3f,0x9d,0x4,0x68,0xb5,0x7d,0x5f,0xce,0x4,0x7f,0xd6,0x31,0x91,0x48,0x24,0x90,0x12,0x9c,0x53,0x86,0xfa,0x53,0xda,0x5d,0xfe,0x9e,0x9c,0xda,0xc6,0x3d,0x1f,0xa9,0xb0,0xeb,0x9a,0x81,0xe1,0x89,0x13,0xcb,0x81,0x92,0x35,0xf2,0xbd,0x47,0x93,0x6f,0x3b,0x36,0x37,0x97,0x50,0xbf,0xbb,0x99,0x6a,0x7,0x70,0xe,0x27,0x3d,0xb3,0x52,0x4a,0x46,0xe0,0x7d,0x5,0xfd,0x78,0xbd,0xc4,0xf8,0x7c,0xd3,0x5c,0x3b,0x3d,0xe,0x53,0x68,0xe0,0xc2,0xa1,0x2e,0xbd,0xf1,0x7e,0xa5,0xe,0x2f,0x8e,0xd2,0x70,0x9f,0xcc,0x80,0xd4,0x66,0x74,0xa1,0xd1,0x63,0xb1,0xb4,0xf9,0x96,0xaf,0xcf,0xa3,0x25,0xa8,0x1d,0xdb,0xca,0x95,0x5d,0x7a,0xf8,0x7e,0xed,0x91,0x33,0x9d,0xe,0xd3,0x3c,0x21,0x58,0xfd,0x9c,0xbf,0x70,0x76,0x7a,0x7b,0x3c,0x4,0x6b,0x4b,0xe6,0x58,0xf9,0x4,0xca,0x33,0xab,0x75,0xf,0xfe,0x48,0x5c,0x60,0x5f,0x90,0xbd,0xce,0x4c,0xc3,0x7b,0x4e,0xe,0xdc,0xdb,0x5,0x95,0x9e,0xff,0xef,0x8d,0x81,0x1f,0x4d,0xe1,0xbf,0x17,0x60,0xc5,0xdf,0xb1,0x4b,0x55,0xe2,0xfa,0x5a,0x9a,0xde,0x9c,0x4b,0x8d,0x77,0xcf,0x70,0x1f,0x51,0xb9,0x75,0xe9,0xfa,0xe7,0x47,0xfc,0xa7,0xbc,0x34,0x49,0xea,0xe7,0x34,0xfc,0x43,0xb8,0xc0,0x3e,0x97,0xc4,0x7c,0xd6,0xe1,0x8e,0x29,0xba,0xb3,0xec,0x44,0xe2,0x1b,0xfc,0x1,0xde,0x95,0x74,0xf7,0x1a,0x82,0xe4,0x48,0xa3,0x52,0x3c,0xf9,0xa,0xb5,0x4,0xef,0xd7,0xeb,0x30,0x72,0x8c,0x77,0xfa,0xd1,0x86,0xc1,0x87,0xbb,0x1f,0xf3,0x7,0x3c,0x69,0x34,0xcf,0xe8,0xf8,0x3,0x4f,0x19,0xf,0x9f,0xe6,0x7a,0x9a,0xeb,0xf9,0xb9,0x14,0x19,0xeb,0x74,0xfa,0x26,0x32,0x84,0xf9,0x3a,0x6e,0xc,0xe5,0xd3,0xf4,0x50,0xcc,0x9a,0x4d,0xaf,0xe5,0x0,0xc0,0xb4,0x7a,0x2e,0x2c,0xc6,0x9d,0x5f,0x59,0x59,0x9a,0x66,0x7e,0x0,0xce,0x10,0x89,0xa2,0x35,0x72,0x82,0xc,0x9e,0x47,0x5c,0x24,0x99,0x3b,0x22,0xb3,0x26,0x5f,0xd5,0x4,0x8d,0xcb,0x10,0x81,0xef,0x5b,0xeb,0xf4,0x4e,0xa2,0x52,0x7d,0x63,0xe6,0x27,0xa3,0x9e,0x29,0x7e,0x35,0x41,0xe2,0xd6,0xe,0x68,0x63,0x67,0x4f,0x43,0x79,0x8a,0xaf,0x25,0x48,0xdc,0x43,0xa3,0xc4,0x44,0x49,0xf9,0xbc,0x3f,0x36,0x3e,0x38,0xc3,0x83,0xfb,0x9b,0x4f,0xa4,0x84,0x7a,0x5f,0xde,0x5,0xfc,0x86,0xd0,0x9f,0xa5,0xad,0xcf,0x48,0xf0,0x31,0x3e,0xc1,0xa7,0xbe,0x5d,0x52,0x9e,0x66,0xc9,0xf9,0x41,0x8b,0x44,0x22,0x91,0x48,0x24,0x12,0x89,0x44,0x22,0x91,0x48,0x24,0x12,0x89,0x44,0x22,0x91,0x48,0x24,0x12,0x89,0x44,0x22,0x91,0x48,0x24,0x12,0xbb,0xf1,0xf,0x10,0xb2,0x0,0xa3,0x7c,0xba,0x64,0x83,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x80,0x1,0x0,0x0,0x0,0x0,0xeb,0x45,0x5c,0x66,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x74,0x52,0x4e,0x53,0x0,0x0,0x76,0x93,0xcd,0x38,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0x1,0xdd,0x8a,0x13,0xa4,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x89,0x0,0x0,0xb,0x89,0x1,0x37,0xc9,0xcb,0xad,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x2,0x83,0x49,0x44,0x41,0x54,0x48,0xc7,0xed,0xd4,0xb1,0x6e,0xdb,0x30,0x10,0x0,0x50,0x22,0x3,0x27,0x22,0xc8,0x78,0x83,0x91,0xa9,0x1f,0xc0,0xa9,0x10,0xa,0x7e,0xc,0x11,0x14,0x87,0xc,0x1c,0x32,0x9,0x1a,0xe,0x46,0xa6,0xfc,0x43,0xff,0x86,0xb5,0x80,0x9b,0x88,0x8e,0x5d,0x64,0x18,0x9e,0xdc,0xd5,0x53,0x91,0xc1,0xa0,0x7a,0xa4,0xe4,0xd4,0x31,0xd2,0x25,0x70,0x97,0xa2,0x37,0x48,0xe6,0x33,0x45,0xdd,0x51,0x24,0x95,0x7a,0x23,0xe0,0x75,0x13,0xb,0xd8,0x93,0xbf,0x51,0x51,0xa3,0xac,0x99,0xc9,0x29,0x87,0x81,0x83,0xb2,0x0,0xc7,0xfe,0xee,0x43,0x58,0x85,0x95,0xb7,0xa6,0xb6,0xaf,0x7a,0xe9,0x93,0x63,0xc3,0xf2,0xc,0x96,0x3e,0xba,0x97,0x11,0x3,0xb5,0x46,0xc0,0x15,0x30,0x43,0x1,0xbd,0x6,0x81,0x71,0xa9,0xb2,0x82,0x9,0x92,0x3d,0xf6,0xb0,0xbd,0x5c,0xf2,0x53,0xf2,0x75,0xc,0x11,0x5f,0xc7,0xe0,0xc4,0xaa,0xb4,0x40,0x41,0xc4,0x69,0xd0,0x27,0x55,0x12,0x13,0x78,0x74,0xa7,0xb5,0xd8,0x3f,0x14,0x77,0x81,0x0,0x22,0x93,0x9b,0x4c,0x54,0x5b,0x72,0x6d,0x98,0x17,0xd1,0x33,0xb3,0x94,0xaa,0x3c,0x93,0xea,0xb4,0x76,0x31,0x6a,0x66,0x0,0xa9,0x59,0x1c,0x8c,0xe,0x33,0xc0,0x12,0x4c,0x29,0xc2,0xa5,0xc3,0xc1,0xd0,0xb2,0x64,0x6a,0x60,0xa3,0xc0,0xea,0xac,0x19,0x58,0x4b,0xa9,0x4a,0x17,0xf0,0xda,0x68,0xb6,0x5,0xec,0xb2,0xf6,0x88,0x33,0xc8,0x18,0x52,0xd5,0x5a,0x1,0xb3,0x61,0x1,0x53,0xdf,0x2,0x51,0x2d,0x33,0xdd,0x12,0x59,0xea,0x94,0x95,0x3c,0x80,0x2e,0x5e,0xf9,0xdb,0x71,0x73,0x70,0xcf,0x39,0x3b,0x76,0xb7,0xbb,0x7d,0xcf,0x74,0x50,0xd,0x62,0x40,0x44,0x6,0x83,0xfe,0xc7,0x8e,0x51,0x5,0x5c,0xe1,0xdd,0xdd,0xaa,0xc2,0xf8,0x53,0x80,0x31,0xe2,0xfd,0x7d,0x14,0x8,0x7e,0xcc,0x5,0x28,0x62,0xd7,0xc5,0xc,0xa6,0xf3,0xc3,0x46,0xa6,0x30,0xd7,0x1e,0x1b,0x2e,0xd0,0x7f,0x63,0x5f,0x1f,0xf1,0x32,0xc9,0x90,0x82,0xef,0xb9,0x82,0xc,0x5a,0x1,0xef,0x66,0x90,0xd7,0x7a,0x2c,0x80,0x13,0x94,0xc4,0xf6,0x9f,0xd8,0x75,0xbb,0x2c,0x89,0xed,0xff,0x42,0xe9,0xa7,0xfb,0xa4,0x84,0xec,0x13,0x45,0x7,0x1a,0xb9,0x97,0x18,0x65,0xab,0x4,0xf9,0x54,0x8c,0x3c,0x54,0xe8,0xed,0xa3,0x7c,0x7b,0x55,0xe0,0x8b,0x0,0xf6,0x4f,0x36,0xd6,0x3d,0xc3,0xe8,0x41,0xc0,0xa1,0xb1,0xdb,0x9,0xa8,0x29,0x0,0xe,0xec,0xc3,0x4,0xc1,0x8,0xc,0x0,0xd6,0x36,0xf3,0x23,0xba,0x80,0x3,0x6f,0x17,0x15,0xbe,0x4b,0xe5,0x8c,0x23,0xc2,0x57,0x7b,0x5d,0x61,0x53,0xc0,0x61,0xf,0xbd,0xd5,0x15,0x68,0x47,0x8e,0x0,0x7b,0x37,0xba,0xab,0xba,0x59,0xcc,0x79,0x3d,0xd7,0xaf,0x5a,0xe3,0x85,0x66,0x69,0xab,0x16,0x32,0x31,0x5b,0xd0,0xdb,0x66,0x2,0x2f,0x6f,0xe,0xb2,0x42,0xb5,0x87,0xdf,0xf0,0x59,0xae,0x6a,0x86,0xae,0x93,0x4c,0x7d,0x1b,0x9a,0x6b,0x84,0xdd,0x9a,0xd6,0xca,0xc8,0x89,0xc3,0xfb,0xd4,0x82,0xe,0x30,0xa2,0x2c,0x18,0xc2,0x98,0xb2,0x4f,0x8,0xba,0x83,0xa1,0x40,0x12,0x88,0x6f,0x43,0x38,0x82,0x1c,0x1f,0x15,0x70,0x82,0x96,0xa8,0xa5,0x3d,0xed,0x9c,0xde,0xb9,0x1,0xe9,0xb8,0x5f,0x4c,0x39,0xd2,0xa6,0xac,0xa6,0x48,0xe7,0xd0,0x95,0x53,0xb0,0xc4,0x7b,0x97,0xd4,0xcd,0x3c,0xdd,0xf0,0xd0,0x4e,0xbf,0xe6,0x65,0x24,0x5b,0x7b,0x7d,0xe,0xe5,0xd6,0xae,0xe9,0x90,0x64,0xfd,0x70,0x9e,0x21,0xb5,0x6c,0x5,0xa4,0xa2,0x87,0xe9,0xa3,0x25,0xf4,0x5,0x5c,0x39,0x61,0xa6,0x1e,0xbe,0x11,0x18,0x80,0xed,0xb,0x18,0x9b,0x70,0x70,0xec,0x5f,0x80,0x3f,0x26,0x27,0xb3,0xc9,0x33,0xc8,0x5c,0x2c,0x5a,0x59,0x1f,0xcb,0x2c,0x89,0x9d,0xae,0xf,0x7d,0xcc,0xdb,0x9c,0xdd,0xd5,0xed,0x7c,0x7f,0xbe,0xd0,0x52,0xf9,0x1f,0xff,0x76,0xfc,0x2,0x24,0x3a,0x65,0x42,0xf6,0x41,0x91,0x95,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char dropdown_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x8,0x6,0x0,0x0,0x0,0xc4,0xf,0xbe,0x8b,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x14,0xd,0x1c,0x1b,0x52,0x41,0x72,0xa4,0x0,0x0,0x0,0x8b,0x49,0x44,0x41,0x54,0x18,0x95,0x6d,0x8e,0x31,0xe,0x2,0x21,0x10,0x45,0x3f,0xc3,0x66,0x1b,0x12,0x1a,0xa8,0x2c,0x3c,0x82,0x57,0xf0,0x26,0x76,0x9e,0xc6,0x63,0xec,0x5e,0xc3,0x1b,0x58,0x79,0x1,0x2b,0x2d,0x8,0x21,0x13,0x42,0x29,0x8c,0xcd,0x92,0x6c,0x88,0xd3,0xfd,0xff,0x7e,0x26,0xf,0x0,0xc0,0xcc,0x1a,0xc3,0xf5,0x4e,0x31,0xb3,0x6e,0xad,0x9d,0xf6,0x50,0x44,0x34,0x0,0x38,0xe7,0x1e,0x53,0xad,0xf5,0x5c,0x4a,0xb9,0x8f,0x1f,0x0,0x20,0x84,0x70,0x23,0xa5,0xd4,0x6b,0xcb,0xdf,0x71,0x40,0x44,0x4f,0x22,0xa2,0xb7,0xb5,0xf6,0x0,0x60,0x2,0x50,0x3b,0x34,0xc6,0x5c,0xbc,0xf7,0xab,0xda,0x84,0x66,0x11,0x71,0x39,0xe7,0xcf,0xe,0x2e,0xa3,0xf5,0x9c,0x52,0x3a,0xc6,0x18,0xaf,0xff,0x7c,0xfa,0x88,0xc6,0xee,0x7,0x3f,0xda,0x36,0xc7,0xfa,0xc,0x38,0x2c,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x8,0x4,0x0,0x0,0x0,0x6e,0x6,0x76,0x0,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x64,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x60,0xf8,0xc0,0xcc,0x0,0x5,0x1f,0x98,0x19,0x18,0x18,0x3f,0x30,0xff,0xd3,0x83,0x70,0xff,0x33,0x33,0x30,0x8,0x9f,0x61,0xf9,0x6b,0xff,0x65,0x2f,0x3,0x1c,0xbc,0xea,0x66,0x62,0xbc,0xcf,0xc0,0xc0,0xf0,0x7,0x26,0xc0,0x74,0x89,0x89,0xe9,0x29,0x9f,0x14,0x3,0xb,0xc3,0x5f,0x6,0x6,0x6,0x6,0xee,0x38,0x91,0x25,0xc,0xc,0xc,0x1f,0xd8,0xde,0x4b,0x3e,0xfc,0xff,0xf0,0xff,0x9b,0x58,0xb8,0xce,0xf,0x6c,0xef,0xe4,0xde,0xa4,0x32,0x20,0x83,0xf,0x4c,0x30,0x16,0x0,0x75,0xad,0x1b,0x7f,0x65,0xec,0x78,0x4c,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char error_icon_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x20,0x8,0x6,0x0,0x0,0x0,0x73,0x7a,0x7a,0xf4,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xda,0x2,0x11,0x5,0x16,0x13,0x73,0xf9,0xc0,0x91,0x0,0x0,0x0,0x6f,0x49,0x44,0x41,0x54,0x58,0xc3,0xed,0x96,0xc1,0xa,0xc0,0x20,0xc,0x43,0xcd,0xd8,0xff,0xff,0x72,0x3c,0x9,0xb5,0xac,0xae,0x3b,0x8c,0x3a,0x96,0x9e,0x24,0xc6,0xf2,0x68,0x10,0x5,0xc9,0x56,0x59,0x47,0x2b,0x2e,0x1,0x8,0x40,0x0,0x2,0x10,0x40,0x39,0xc0,0xe9,0x5,0x0,0xd3,0xeb,0x44,0x12,0x56,0x23,0x9,0xef,0x1b,0x9a,0xd5,0xef,0x7c,0x21,0x40,0x64,0xb4,0xd,0xc7,0xda,0x6b,0x76,0x6f,0xe5,0xdb,0x3b,0x82,0xab,0x31,0x3e,0xd1,0xb2,0xfd,0x5e,0x89,0x20,0x2,0xf8,0x6e,0x4,0x99,0xf1,0x46,0x37,0x26,0x7b,0xe,0xfa,0x13,0xa,0x40,0x0,0x2,0x10,0xc0,0xef,0x1,0x3a,0xc0,0x4e,0x6d,0x31,0x30,0x15,0x5b,0xf7,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x20,0x8,0x4,0x0,0x0,0x0,0xd9,0x73,0xb2,0x7f,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x5d,0x49,0x44,0x41,0x54,0x48,0xc7,0xed,0x94,0xc1,0xe,0x80,0x20,0xc,0x43,0x5b,0xe3,0xff,0xff,0x72,0x3d,0xcc,0x85,0xa1,0xbb,0x18,0xf4,0x62,0xca,0xa9,0x74,0xe3,0x65,0xd,0x1,0xa,0x6b,0x6b,0x5b,0x3c,0x6f,0x80,0x1,0x7f,0x1,0xec,0x29,0x78,0xbe,0x2a,0x31,0x94,0x98,0x9e,0x98,0xf5,0xab,0x37,0x1,0xaa,0x19,0x8d,0xe2,0x50,0xb1,0x9b,0xbd,0xb7,0x23,0x8c,0x21,0x7b,0xd5,0xf5,0x3d,0x88,0x50,0x1,0xdf,0x46,0xb8,0xf,0x5c,0xef,0xa6,0xab,0xd1,0x7f,0xa2,0x1,0x6,0x0,0x0,0xe,0x62,0x6,0x31,0x47,0xb6,0x7f,0xdd,0x14,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char focus_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x8,0x6,0x0,0x0,0x0,0x56,0x75,0x5c,0xe7,0x0,0x0,0xa,0x45,0x69,0x43,0x43,0x50,0x49,0x43,0x43,0x20,0x70,0x72,0x6f,0x66,0x69,0x6c,0x65,0x0,0x0,0x78,0xda,0x9d,0x53,0x67,0x54,0x53,0xe9,0x16,0x3d,0xf7,0xde,0xf4,0x42,0x4b,0x88,0x80,0x94,0x4b,0x6f,0x52,0x15,0x8,0x20,0x52,0x42,0x8b,0x80,0x14,0x91,0x26,0x2a,0x21,0x9,0x10,0x4a,0x88,0x21,0xa1,0xd9,0x15,0x51,0xc1,0x11,0x45,0x45,0x4,0x1b,0xc8,0xa0,0x88,0x3,0x8e,0x8e,0x80,0x8c,0x15,0x51,0x2c,0xc,0x8a,0xa,0xd8,0x7,0xe4,0x21,0xa2,0x8e,0x83,0xa3,0x88,0x8a,0xca,0xfb,0xe1,0x7b,0xa3,0x6b,0xd6,0xbc,0xf7,0xe6,0xcd,0xfe,0xb5,0xd7,0x3e,0xe7,0xac,0xf3,0x9d,0xb3,0xcf,0x7,0xc0,0x8,0xc,0x96,0x48,0x33,0x51,0x35,0x80,0xc,0xa9,0x42,0x1e,0x11,0xe0,0x83,0xc7,0xc4,0xc6,0xe1,0xe4,0x2e,0x40,0x81,0xa,0x24,0x70,0x0,0x10,0x8,0xb3,0x64,0x21,0x73,0xfd,0x23,0x1,0x0,0xf8,0x7e,0x3c,0x3c,0x2b,0x22,0xc0,0x7,0xbe,0x0,0x1,0x78,0xd3,0xb,0x8,0x0,0xc0,0x4d,0x9b,0xc0,0x30,0x1c,0x87,0xff,0xf,0xea,0x42,0x99,0x5c,0x1,0x80,0x84,0x1,0xc0,0x74,0x91,0x38,0x4b,0x8,0x80,0x14,0x0,0x40,0x7a,0x8e,0x42,0xa6,0x0,0x40,0x46,0x1,0x80,0x9d,0x98,0x26,0x53,0x0,0xa0,0x4,0x0,0x60,0xcb,0x63,0x62,0xe3,0x0,0x50,0x2d,0x0,0x60,0x27,0x7f,0xe6,0xd3,0x0,0x80,0x9d,0xf8,0x99,0x7b,0x1,0x0,0x5b,0x94,0x21,0x15,0x1,0xa0,0x91,0x0,0x20,0x13,0x65,0x88,0x44,0x0,0x68,0x3b,0x0,0xac,0xcf,0x56,0x8a,0x45,0x0,0x58,0x30,0x0,0x14,0x66,0x4b,0xc4,0x39,0x0,0xd8,0x2d,0x0,0x30,0x49,0x57,0x66,0x48,0x0,0xb0,0xb7,0x0,0xc0,0xce,0x10,0xb,0xb2,0x0,0x8,0xc,0x0,0x30,0x51,0x88,0x85,0x29,0x0,0x4,0x7b,0x0,0x60,0xc8,0x23,0x23,0x78,0x0,0x84,0x99,0x0,0x14,0x46,0xf2,0x57,0x3c,0xf1,0x2b,0xae,0x10,0xe7,0x2a,0x0,0x0,0x78,0x99,0xb2,0x3c,0xb9,0x24,0x39,0x45,0x81,0x5b,0x8,0x2d,0x71,0x7,0x57,0x57,0x2e,0x1e,0x28,0xce,0x49,0x17,0x2b,0x14,0x36,0x61,0x2,0x61,0x9a,0x40,0x2e,0xc2,0x79,0x99,0x19,0x32,0x81,0x34,0xf,0xe0,0xf3,0xcc,0x0,0x0,0xa0,0x91,0x15,0x11,0xe0,0x83,0xf3,0xfd,0x78,0xce,0xe,0xae,0xce,0xce,0x36,0x8e,0xb6,0xe,0x5f,0x2d,0xea,0xbf,0x6,0xff,0x22,0x62,0x62,0xe3,0xfe,0xe5,0xcf,0xab,0x70,0x40,0x0,0x0,0xe1,0x74,0x7e,0xd1,0xfe,0x2c,0x2f,0xb3,0x1a,0x80,0x3b,0x6,0x80,0x6d,0xfe,0xa2,0x25,0xee,0x4,0x68,0x5e,0xb,0xa0,0x75,0xf7,0x8b,0x66,0xb2,0xf,0x40,0xb5,0x0,0xa0,0xe9,0xda,0x57,0xf3,0x70,0xf8,0x7e,0x3c,0x3c,0x45,0xa1,0x90,0xb9,0xd9,0xd9,0xe5,0xe4,0xe4,0xd8,0x4a,0xc4,0x42,0x5b,0x61,0xca,0x57,0x7d,0xfe,0x67,0xc2,0x5f,0xc0,0x57,0xfd,0x6c,0xf9,0x7e,0x3c,0xfc,0xf7,0xf5,0xe0,0xbe,0xe2,0x24,0x81,0x32,0x5d,0x81,0x47,0x4,0xf8,0xe0,0xc2,0xcc,0xf4,0x4c,0xa5,0x1c,0xcf,0x92,0x9,0x84,0x62,0xdc,0xe6,0x8f,0x47,0xfc,0xb7,0xb,0xff,0xfc,0x1d,0xd3,0x22,0xc4,0x49,0x62,0xb9,0x58,0x2a,0x14,0xe3,0x51,0x12,0x71,0x8e,0x44,0x9a,0x8c,0xf3,0x32,0xa5,0x22,0x89,0x42,0x92,0x29,0xc5,0x25,0xd2,0xff,0x64,0xe2,0xdf,0x2c,0xfb,0x3,0x3e,0xdf,0x35,0x0,0xb0,0x6a,0x3e,0x1,0x7b,0x91,0x2d,0xa8,0x5d,0x63,0x3,0xf6,0x4b,0x27,0x10,0x58,0x74,0xc0,0xe2,0xf7,0x0,0x0,0xf2,0xbb,0x6f,0xc1,0xd4,0x28,0x8,0x3,0x80,0x68,0x83,0xe1,0xcf,0x77,0xff,0xef,0x3f,0xfd,0x47,0xa0,0x25,0x0,0x80,0x66,0x49,0x92,0x71,0x0,0x0,0x5e,0x44,0x24,0x2e,0x54,0xca,0xb3,0x3f,0xc7,0x8,0x0,0x0,0x44,0xa0,0x81,0x2a,0xb0,0x41,0x1b,0xf4,0xc1,0x18,0x2c,0xc0,0x6,0x1c,0xc1,0x5,0xdc,0xc1,0xb,0xfc,0x60,0x36,0x84,0x42,0x24,0xc4,0xc2,0x42,0x10,0x42,0xa,0x64,0x80,0x1c,0x72,0x60,0x29,0xac,0x82,0x42,0x28,0x86,0xcd,0xb0,0x1d,0x2a,0x60,0x2f,0xd4,0x40,0x1d,0x34,0xc0,0x51,0x68,0x86,0x93,0x70,0xe,0x2e,0xc2,0x55,0xb8,0xe,0x3d,0x70,0xf,0xfa,0x61,0x8,0x9e,0xc1,0x28,0xbc,0x81,0x9,0x4,0x41,0xc8,0x8,0x13,0x61,0x21,0xda,0x88,0x1,0x62,0x8a,0x58,0x23,0x8e,0x8,0x17,0x99,0x85,0xf8,0x21,0xc1,0x48,0x4,0x12,0x8b,0x24,0x20,0xc9,0x88,0x14,0x51,0x22,0x4b,0x91,0x35,0x48,0x31,0x52,0x8a,0x54,0x20,0x55,0x48,0x1d,0xf2,0x3d,0x72,0x2,0x39,0x87,0x5c,0x46,0xba,0x91,0x3b,0xc8,0x0,0x32,0x82,0xfc,0x86,0xbc,0x47,0x31,0x94,0x81,0xb2,0x51,0x3d,0xd4,0xc,0xb5,0x43,0xb9,0xa8,0x37,0x1a,0x84,0x46,0xa2,0xb,0xd0,0x64,0x74,0x31,0x9a,0x8f,0x16,0xa0,0x9b,0xd0,0x72,0xb4,0x1a,0x3d,0x8c,0x36,0xa1,0xe7,0xd0,0xab,0x68,0xf,0xda,0x8f,0x3e,0x43,0xc7,0x30,0xc0,0xe8,0x18,0x7,0x33,0xc4,0x6c,0x30,0x2e,0xc6,0xc3,0x42,0xb1,0x38,0x2c,0x9,0x93,0x63,0xcb,0xb1,0x22,0xac,0xc,0xab,0xc6,0x1a,0xb0,0x56,0xac,0x3,0xbb,0x89,0xf5,0x63,0xcf,0xb1,0x77,0x4,0x12,0x81,0x45,0xc0,0x9,0x36,0x4,0x77,0x42,0x20,0x61,0x1e,0x41,0x48,0x58,0x4c,0x58,0x4e,0xd8,0x48,0xa8,0x20,0x1c,0x24,0x34,0x11,0xda,0x9,0x37,0x9,0x3,0x84,0x51,0xc2,0x27,0x22,0x93,0xa8,0x4b,0xb4,0x26,0xba,0x11,0xf9,0xc4,0x18,0x62,0x32,0x31,0x87,0x58,0x48,0x2c,0x23,0xd6,0x12,0x8f,0x13,0x2f,0x10,0x7b,0x88,0x43,0xc4,0x37,0x24,0x12,0x89,0x43,0x32,0x27,0xb9,0x90,0x2,0x49,0xb1,0xa4,0x54,0xd2,0x12,0xd2,0x46,0xd2,0x6e,0x52,0x23,0xe9,0x2c,0xa9,0x9b,0x34,0x48,0x1a,0x23,0x93,0xc9,0xda,0x64,0x6b,0xb2,0x7,0x39,0x94,0x2c,0x20,0x2b,0xc8,0x85,0xe4,0x9d,0xe4,0xc3,0xe4,0x33,0xe4,0x1b,0xe4,0x21,0xf2,0x5b,0xa,0x9d,0x62,0x40,0x71,0xa4,0xf8,0x53,0xe2,0x28,0x52,0xca,0x6a,0x4a,0x19,0xe5,0x10,0xe5,0x34,0xe5,0x6,0x65,0x98,0x32,0x41,0x55,0xa3,0x9a,0x52,0xdd,0xa8,0xa1,0x54,0x11,0x35,0x8f,0x5a,0x42,0xad,0xa1,0xb6,0x52,0xaf,0x51,0x87,0xa8,0x13,0x34,0x75,0x9a,0x39,0xcd,0x83,0x16,0x49,0x4b,0xa5,0xad,0xa2,0x95,0xd3,0x1a,0x68,0x17,0x68,0xf7,0x69,0xaf,0xe8,0x74,0xba,0x11,0xdd,0x95,0x1e,0x4e,0x97,0xd0,0x57,0xd2,0xcb,0xe9,0x47,0xe8,0x97,0xe8,0x3,0xf4,0x77,0xc,0xd,0x86,0x15,0x83,0xc7,0x88,0x67,0x28,0x19,0x9b,0x18,0x7,0x18,0x67,0x19,0x77,0x18,0xaf,0x98,0x4c,0xa6,0x19,0xd3,0x8b,0x19,0xc7,0x54,0x30,0x37,0x31,0xeb,0x98,0xe7,0x99,0xf,0x99,0x6f,0x55,0x58,0x2a,0xb6,0x2a,0x7c,0x15,0x91,0xca,0xa,0x95,0x4a,0x95,0x26,0x95,0x1b,0x2a,0x2f,0x54,0xa9,0xaa,0xa6,0xaa,0xde,0xaa,0xb,0x55,0xf3,0x55,0xcb,0x54,0x8f,0xa9,0x5e,0x53,0x7d,0xae,0x46,0x55,0x33,0x53,0xe3,0xa9,0x9,0xd4,0x96,0xab,0x55,0xaa,0x9d,0x50,0xeb,0x53,0x1b,0x53,0x67,0xa9,0x3b,0xa8,0x87,0xaa,0x67,0xa8,0x6f,0x54,0x3f,0xa4,0x7e,0x59,0xfd,0x89,0x6,0x59,0xc3,0x4c,0xc3,0x4f,0x43,0xa4,0x51,0xa0,0xb1,0x5f,0xe3,0xbc,0xc6,0x20,0xb,0x63,0x19,0xb3,0x78,0x2c,0x21,0x6b,0xd,0xab,0x86,0x75,0x81,0x35,0xc4,0x26,0xb1,0xcd,0xd9,0x7c,0x76,0x2a,0xbb,0x98,0xfd,0x1d,0xbb,0x8b,0x3d,0xaa,0xa9,0xa1,0x39,0x43,0x33,0x4a,0x33,0x57,0xb3,0x52,0xf3,0x94,0x66,0x3f,0x7,0xe3,0x98,0x71,0xf8,0x9c,0x74,0x4e,0x9,0xe7,0x28,0xa7,0x97,0xf3,0x7e,0x8a,0xde,0x14,0xef,0x29,0xe2,0x29,0x1b,0xa6,0x34,0x4c,0xb9,0x31,0x65,0x5c,0x6b,0xaa,0x96,0x97,0x96,0x58,0xab,0x48,0xab,0x51,0xab,0x47,0xeb,0xbd,0x36,0xae,0xed,0xa7,0x9d,0xa6,0xbd,0x45,0xbb,0x59,0xfb,0x81,0xe,0x41,0xc7,0x4a,0x27,0x5c,0x27,0x47,0x67,0x8f,0xce,0x5,0x9d,0xe7,0x53,0xd9,0x53,0xdd,0xa7,0xa,0xa7,0x16,0x4d,0x3d,0x3a,0xf5,0xae,0x2e,0xaa,0x6b,0xa5,0x1b,0xa1,0xbb,0x44,0x77,0xbf,0x6e,0xa7,0xee,0x98,0x9e,0xbe,0x5e,0x80,0x9e,0x4c,0x6f,0xa7,0xde,0x79,0xbd,0xe7,0xfa,0x1c,0x7d,0x2f,0xfd,0x54,0xfd,0x6d,0xfa,0xa7,0xf5,0x47,0xc,0x58,0x6,0xb3,0xc,0x24,0x6,0xdb,0xc,0xce,0x18,0x3c,0xc5,0x35,0x71,0x6f,0x3c,0x1d,0x2f,0xc7,0xdb,0xf1,0x51,0x43,0x5d,0xc3,0x40,0x43,0xa5,0x61,0x95,0x61,0x97,0xe1,0x84,0x91,0xb9,0xd1,0x3c,0xa3,0xd5,0x46,0x8d,0x46,0xf,0x8c,0x69,0xc6,0x5c,0xe3,0x24,0xe3,0x6d,0xc6,0x6d,0xc6,0xa3,0x26,0x6,0x26,0x21,0x26,0x4b,0x4d,0xea,0x4d,0xee,0x9a,0x52,0x4d,0xb9,0xa6,0x29,0xa6,0x3b,0x4c,0x3b,0x4c,0xc7,0xcd,0xcc,0xcd,0xa2,0xcd,0xd6,0x99,0x35,0x9b,0x3d,0x31,0xd7,0x32,0xe7,0x9b,0xe7,0x9b,0xd7,0x9b,0xdf,0xb7,0x60,0x5a,0x78,0x5a,0x2c,0xb6,0xa8,0xb6,0xb8,0x65,0x49,0xb2,0xe4,0x5a,0xa6,0x59,0xee,0xb6,0xbc,0x6e,0x85,0x5a,0x39,0x59,0xa5,0x58,0x55,0x5a,0x5d,0xb3,0x46,0xad,0x9d,0xad,0x25,0xd6,0xbb,0xad,0xbb,0xa7,0x11,0xa7,0xb9,0x4e,0x93,0x4e,0xab,0x9e,0xd6,0x67,0xc3,0xb0,0xf1,0xb6,0xc9,0xb6,0xa9,0xb7,0x19,0xb0,0xe5,0xd8,0x6,0xdb,0xae,0xb6,0x6d,0xb6,0x7d,0x61,0x67,0x62,0x17,0x67,0xb7,0xc5,0xae,0xc3,0xee,0x93,0xbd,0x93,0x7d,0xba,0x7d,0x8d,0xfd,0x3d,0x7,0xd,0x87,0xd9,0xe,0xab,0x1d,0x5a,0x1d,0x7e,0x73,0xb4,0x72,0x14,0x3a,0x56,0x3a,0xde,0x9a,0xce,0x9c,0xee,0x3f,0x7d,0xc5,0xf4,0x96,0xe9,0x2f,0x67,0x58,0xcf,0x10,0xcf,0xd8,0x33,0xe3,0xb6,0x13,0xcb,0x29,0xc4,0x69,0x9d,0x53,0x9b,0xd3,0x47,0x67,0x17,0x67,0xb9,0x73,0x83,0xf3,0x88,0x8b,0x89,0x4b,0x82,0xcb,0x2e,0x97,0x3e,0x2e,0x9b,0x1b,0xc6,0xdd,0xc8,0xbd,0xe4,0x4a,0x74,0xf5,0x71,0x5d,0xe1,0x7a,0xd2,0xf5,0x9d,0x9b,0xb3,0x9b,0xc2,0xed,0xa8,0xdb,0xaf,0xee,0x36,0xee,0x69,0xee,0x87,0xdc,0x9f,0xcc,0x34,0x9f,0x29,0x9e,0x59,0x33,0x73,0xd0,0xc3,0xc8,0x43,0xe0,0x51,0xe5,0xd1,0x3f,0xb,0x9f,0x95,0x30,0x6b,0xdf,0xac,0x7e,0x4f,0x43,0x4f,0x81,0x67,0xb5,0xe7,0x23,0x2f,0x63,0x2f,0x91,0x57,0xad,0xd7,0xb0,0xb7,0xa5,0x77,0xaa,0xf7,0x61,0xef,0x17,0x3e,0xf6,0x3e,0x72,0x9f,0xe3,0x3e,0xe3,0x3c,0x37,0xde,0x32,0xde,0x59,0x5f,0xcc,0x37,0xc0,0xb7,0xc8,0xb7,0xcb,0x4f,0xc3,0x6f,0x9e,0x5f,0x85,0xdf,0x43,0x7f,0x23,0xff,0x64,0xff,0x7a,0xff,0xd1,0x0,0xa7,0x80,0x25,0x1,0x67,0x3,0x89,0x81,0x41,0x81,0x5b,0x2,0xfb,0xf8,0x7a,0x7c,0x21,0xbf,0x8e,0x3f,0x3a,0xdb,0x65,0xf6,0xb2,0xd9,0xed,0x41,0x8c,0xa0,0xb9,0x41,0x15,0x41,0x8f,0x82,0xad,0x82,0xe5,0xc1,0xad,0x21,0x68,0xc8,0xec,0x90,0xad,0x21,0xf7,0xe7,0x98,0xce,0x91,0xce,0x69,0xe,0x85,0x50,0x7e,0xe8,0xd6,0xd0,0x7,0x61,0xe6,0x61,0x8b,0xc3,0x7e,0xc,0x27,0x85,0x87,0x85,0x57,0x86,0x3f,0x8e,0x70,0x88,0x58,0x1a,0xd1,0x31,0x97,0x35,0x77,0xd1,0xdc,0x43,0x73,0xdf,0x44,0xfa,0x44,0x96,0x44,0xde,0x9b,0x67,0x31,0x4f,0x39,0xaf,0x2d,0x4a,0x35,0x2a,0x3e,0xaa,0x2e,0x6a,0x3c,0xda,0x37,0xba,0x34,0xba,0x3f,0xc6,0x2e,0x66,0x59,0xcc,0xd5,0x58,0x9d,0x58,0x49,0x6c,0x4b,0x1c,0x39,0x2e,0x2a,0xae,0x36,0x6e,0x6c,0xbe,0xdf,0xfc,0xed,0xf3,0x87,0xe2,0x9d,0xe2,0xb,0xe3,0x7b,0x17,0x98,0x2f,0xc8,0x5d,0x70,0x79,0xa1,0xce,0xc2,0xf4,0x85,0xa7,0x16,0xa9,0x2e,0x12,0x2c,0x3a,0x96,0x40,0x4c,0x88,0x4e,0x38,0x94,0xf0,0x41,0x10,0x2a,0xa8,0x16,0x8c,0x25,0xf2,0x13,0x77,0x25,0x8e,0xa,0x79,0xc2,0x1d,0xc2,0x67,0x22,0x2f,0xd1,0x36,0xd1,0x88,0xd8,0x43,0x5c,0x2a,0x1e,0x4e,0xf2,0x48,0x2a,0x4d,0x7a,0x92,0xec,0x91,0xbc,0x35,0x79,0x24,0xc5,0x33,0xa5,0x2c,0xe5,0xb9,0x84,0x27,0xa9,0x90,0xbc,0x4c,0xd,0x4c,0xdd,0x9b,0x3a,0x9e,0x16,0x9a,0x76,0x20,0x6d,0x32,0x3d,0x3a,0xbd,0x31,0x83,0x92,0x91,0x90,0x71,0x42,0xaa,0x21,0x4d,0x93,0xb6,0x67,0xea,0x67,0xe6,0x66,0x76,0xcb,0xac,0x65,0x85,0xb2,0xfe,0xc5,0x6e,0x8b,0xb7,0x2f,0x1e,0x95,0x7,0xc9,0x6b,0xb3,0x90,0xac,0x5,0x59,0x2d,0xa,0xb6,0x42,0xa6,0xe8,0x54,0x5a,0x28,0xd7,0x2a,0x7,0xb2,0x67,0x65,0x57,0x66,0xbf,0xcd,0x89,0xca,0x39,0x96,0xab,0x9e,0x2b,0xcd,0xed,0xcc,0xb3,0xca,0xdb,0x90,0x37,0x9c,0xef,0x9f,0xff,0xed,0x12,0xc2,0x12,0xe1,0x92,0xb6,0xa5,0x86,0x4b,0x57,0x2d,0x1d,0x58,0xe6,0xbd,0xac,0x6a,0x39,0xb2,0x3c,0x71,0x79,0xdb,0xa,0xe3,0x15,0x5,0x2b,0x86,0x56,0x6,0xac,0x3c,0xb8,0x8a,0xb6,0x2a,0x6d,0xd5,0x4f,0xab,0xed,0x57,0x97,0xae,0x7e,0xbd,0x26,0x7a,0x4d,0x6b,0x81,0x5e,0xc1,0xca,0x82,0xc1,0xb5,0x1,0x6b,0xeb,0xb,0x55,0xa,0xe5,0x85,0x7d,0xeb,0xdc,0xd7,0xed,0x5d,0x4f,0x58,0x2f,0x59,0xdf,0xb5,0x61,0xfa,0x86,0x9d,0x1b,0x3e,0x15,0x89,0x8a,0xae,0x14,0xdb,0x17,0x97,0x15,0x7f,0xd8,0x28,0xdc,0x78,0xe5,0x1b,0x87,0x6f,0xca,0xbf,0x99,0xdc,0x94,0xb4,0xa9,0xab,0xc4,0xb9,0x64,0xcf,0x66,0xd2,0x66,0xe9,0xe6,0xde,0x2d,0x9e,0x5b,0xe,0x96,0xaa,0x97,0xe6,0x97,0xe,0x6e,0xd,0xd9,0xda,0xb4,0xd,0xdf,0x56,0xb4,0xed,0xf5,0xf6,0x45,0xdb,0x2f,0x97,0xcd,0x28,0xdb,0xbb,0x83,0xb6,0x43,0xb9,0xa3,0xbf,0x3c,0xb8,0xbc,0x65,0xa7,0xc9,0xce,0xcd,0x3b,0x3f,0x54,0xa4,0x54,0xf4,0x54,0xfa,0x54,0x36,0xee,0xd2,0xdd,0xb5,0x61,0xd7,0xf8,0x6e,0xd1,0xee,0x1b,0x7b,0xbc,0xf6,0x34,0xec,0xd5,0xdb,0x5b,0xbc,0xf7,0xfd,0x3e,0xc9,0xbe,0xdb,0x55,0x1,0x55,0x4d,0xd5,0x66,0xd5,0x65,0xfb,0x49,0xfb,0xb3,0xf7,0x3f,0xae,0x89,0xaa,0xe9,0xf8,0x96,0xfb,0x6d,0x5d,0xad,0x4e,0x6d,0x71,0xed,0xc7,0x3,0xd2,0x3,0xfd,0x7,0x23,0xe,0xb6,0xd7,0xb9,0xd4,0xd5,0x1d,0xd2,0x3d,0x54,0x52,0x8f,0xd6,0x2b,0xeb,0x47,0xe,0xc7,0x1f,0xbe,0xfe,0x9d,0xef,0x77,0x2d,0xd,0x36,0xd,0x55,0x8d,0x9c,0xc6,0xe2,0x23,0x70,0x44,0x79,0xe4,0xe9,0xf7,0x9,0xdf,0xf7,0x1e,0xd,0x3a,0xda,0x76,0x8c,0x7b,0xac,0xe1,0x7,0xd3,0x1f,0x76,0x1d,0x67,0x1d,0x2f,0x6a,0x42,0x9a,0xf2,0x9a,0x46,0x9b,0x53,0x9a,0xfb,0x5b,0x62,0x5b,0xba,0x4f,0xcc,0x3e,0xd1,0xd6,0xea,0xde,0x7a,0xfc,0x47,0xdb,0x1f,0xf,0x9c,0x34,0x3c,0x59,0x79,0x4a,0xf3,0x54,0xc9,0x69,0xda,0xe9,0x82,0xd3,0x93,0x67,0xf2,0xcf,0x8c,0x9d,0x95,0x9d,0x7d,0x7e,0x2e,0xf9,0xdc,0x60,0xdb,0xa2,0xb6,0x7b,0xe7,0x63,0xce,0xdf,0x6a,0xf,0x6f,0xef,0xba,0x10,0x74,0xe1,0xd2,0x45,0xff,0x8b,0xe7,0x3b,0xbc,0x3b,0xce,0x5c,0xf2,0xb8,0x74,0xf2,0xb2,0xdb,0xe5,0x13,0x57,0xb8,0x57,0x9a,0xaf,0x3a,0x5f,0x6d,0xea,0x74,0xea,0x3c,0xfe,0x93,0xd3,0x4f,0xc7,0xbb,0x9c,0xbb,0x9a,0xae,0xb9,0x5c,0x6b,0xb9,0xee,0x7a,0xbd,0xb5,0x7b,0x66,0xf7,0xe9,0x1b,0x9e,0x37,0xce,0xdd,0xf4,0xbd,0x79,0xf1,0x16,0xff,0xd6,0xd5,0x9e,0x39,0x3d,0xdd,0xbd,0xf3,0x7a,0x6f,0xf7,0xc5,0xf7,0xf5,0xdf,0x16,0xdd,0x7e,0x72,0x27,0xfd,0xce,0xcb,0xbb,0xd9,0x77,0x27,0xee,0xad,0xbc,0x4f,0xbc,0x5f,0xf4,0x40,0xed,0x41,0xd9,0x43,0xdd,0x87,0xd5,0x3f,0x5b,0xfe,0xdc,0xd8,0xef,0xdc,0x7f,0x6a,0xc0,0x77,0xa0,0xf3,0xd1,0xdc,0x47,0xf7,0x6,0x85,0x83,0xcf,0xfe,0x91,0xf5,0x8f,0xf,0x43,0x5,0x8f,0x99,0x8f,0xcb,0x86,0xd,0x86,0xeb,0x9e,0x38,0x3e,0x39,0x39,0xe2,0x3f,0x72,0xfd,0xe9,0xfc,0xa7,0x43,0xcf,0x64,0xcf,0x26,0x9e,0x17,0xfe,0xa2,0xfe,0xcb,0xae,0x17,0x16,0x2f,0x7e,0xf8,0xd5,0xeb,0xd7,0xce,0xd1,0x98,0xd1,0xa1,0x97,0xf2,0x97,0x93,0xbf,0x6d,0x7c,0xa5,0xfd,0xea,0xc0,0xeb,0x19,0xaf,0xdb,0xc6,0xc2,0xc6,0x1e,0xbe,0xc9,0x78,0x33,0x31,0x5e,0xf4,0x56,0xfb,0xed,0xc1,0x77,0xdc,0x77,0x1d,0xef,0xa3,0xdf,0xf,0x4f,0xe4,0x7c,0x20,0x7f,0x28,0xff,0x68,0xf9,0xb1,0xf5,0x53,0xd0,0xa7,0xfb,0x93,0x19,0x93,0x93,0xff,0x4,0x3,0x98,0xf3,0xfc,0xef,0x35,0x94,0x82,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xa,0x14,0x3,0x19,0x2c,0x11,0xe9,0xa7,0x91,0x0,0x0,0x0,0x95,0x49,0x44,0x41,0x54,0x28,0xcf,0xbd,0xd2,0x21,0xe,0xc2,0x50,0x10,0x45,0xd1,0xf3,0x9b,0xa,0x30,0x8,0xb6,0x1,0x9,0xbe,0x28,0x54,0xd7,0x0,0x16,0x96,0xc0,0x32,0xba,0x2,0xca,0x46,0x50,0x55,0xe0,0x49,0x60,0x1b,0x4d,0x50,0x80,0x29,0x98,0x8f,0x20,0xd0,0x50,0xc5,0x75,0x33,0x79,0x77,0x32,0xe2,0x85,0xbc,0xa8,0x6,0x18,0x61,0x82,0x21,0x82,0x77,0x1e,0xa8,0x71,0xc4,0x39,0xc5,0x18,0x19,0xb6,0xb8,0xf9,0x4e,0xf,0x2b,0x84,0x34,0x5e,0x2e,0x77,0xeb,0xd9,0x45,0x3b,0xb7,0xbc,0xa8,0x4a,0x2c,0x92,0xf8,0xc6,0xd5,0x6f,0xae,0x18,0x26,0x71,0x48,0x3a,0x8,0x49,0xd7,0xe0,0xa7,0xf5,0x17,0xa1,0xe9,0x90,0x6d,0x5e,0x42,0x8d,0x7e,0x7,0xa1,0x87,0x3a,0xe4,0x45,0x95,0x61,0x8a,0xd,0xee,0x2d,0xe1,0x3e,0x96,0x38,0xa4,0x38,0xc5,0xe5,0xfc,0x47,0x35,0xf6,0x38,0x3f,0x1,0xce,0x6b,0x1e,0x5e,0xd6,0x59,0x76,0xbd,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x4,0x3,0x0,0x0,0x0,0xa4,0x5b,0x41,0xd4,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x30,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0xff,0xff,0xff,0xb9,0xa2,0x9b,0xc9,0x0,0x0,0x0,0xf,0x74,0x52,0x4e,0x53,0x0,0xe,0x39,0x68,0x7a,0x7b,0x3a,0x74,0x10,0x8,0x69,0xf,0x6,0x75,0x11,0xb8,0x16,0x0,0x1,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0xf,0x18,0xba,0x0,0xd9,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x38,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x10,0x32,0x9,0xd,0x75,0x56,0x64,0x48,0xef,0x9c,0x39,0x73,0x46,0x19,0xc3,0x6a,0x6,0x20,0xd8,0xc5,0x10,0x3,0xa2,0x8e,0x32,0x44,0x82,0xa8,0xa9,0xd8,0x29,0xa8,0x12,0xb0,0x6,0x29,0x86,0xdc,0x9d,0x33,0x67,0xce,0x2b,0x63,0x10,0x3,0x1b,0x6,0x0,0xdf,0xc6,0x11,0x6d,0xb8,0xf4,0x9c,0xac,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char frame_focus_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x8,0x6,0x0,0x0,0x0,0x56,0x75,0x5c,0xe7,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xa,0x14,0x3,0x18,0x33,0x85,0xfa,0x9b,0x25,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x95,0x49,0x44,0x41,0x54,0x28,0xcf,0xbd,0xd2,0x31,0xe,0xc1,0x70,0x18,0x86,0xf1,0xdf,0xbf,0xe9,0xa0,0x8b,0xc1,0x35,0x48,0xec,0xb5,0xd8,0xb8,0x2,0x2b,0x37,0x70,0xd,0x2e,0xa0,0xe,0x62,0xab,0x85,0x5d,0xc2,0x35,0x9a,0x98,0xb0,0x60,0xa9,0x41,0x68,0xda,0xc9,0xb3,0x7d,0x5f,0xde,0xe7,0xcb,0x37,0xbc,0x61,0xb4,0xcc,0xdb,0xe8,0xa2,0x8f,0xe,0x82,0x4f,0x9e,0x28,0x70,0xc4,0x39,0x46,0xf,0x29,0x36,0xb8,0xf9,0x4d,0xb,0x73,0x84,0xb8,0xbc,0x9c,0x6d,0x17,0xc3,0x8b,0x6a,0x6e,0xe3,0xd5,0x2e,0xc3,0x34,0x2a,0xdf,0xb8,0xaa,0xe7,0x8a,0x4e,0x54,0xe,0x51,0x3,0x21,0x6a,0x1a,0xfc,0xb6,0xfe,0x22,0x3c,0x1a,0x64,0x1f,0x6f,0xa1,0x40,0xd2,0x40,0x68,0xa1,0x8,0xa3,0x65,0x9e,0x62,0x80,0x35,0xee,0x15,0xe1,0x4,0x33,0x1c,0x62,0x9c,0xca,0xe5,0xa4,0xa6,0x1a,0x7b,0x9c,0x5f,0xce,0xb,0x1e,0x5e,0x4b,0xa1,0xce,0xa0,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x4,0x3,0x0,0x0,0x0,0xa4,0x5b,0x41,0xd4,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x30,0x50,0x4c,0x54,0x45,0xff,0xff,0xff,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0x47,0x8c,0xbf,0xff,0xff,0xff,0xcc,0x40,0x27,0xb9,0x0,0x0,0x0,0xf,0x74,0x52,0x4e,0x53,0x0,0xe,0x39,0x68,0x7a,0x7b,0x3a,0x74,0x10,0x8,0x69,0xf,0x6,0x75,0x11,0xb8,0x16,0x0,0x1,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x0,0x88,0x5,0x1d,0x48,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x0,0x38,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x10,0x32,0x9,0xd,0x75,0x56,0x64,0x48,0xef,0x9c,0x39,0x73,0x46,0x19,0xc3,0x6a,0x6,0x20,0xd8,0xc5,0x10,0x3,0xa2,0x8e,0x32,0x44,0x82,0xa8,0xa9,0xd8,0x29,0xa8,0x12,0xb0,0x6,0x29,0x86,0xdc,0x9d,0x33,0x67,0xce,0x2b,0x63,0x10,0x3,0x1b,0x6,0x0,0xdf,0xc6,0x11,0x6d,0xb8,0xf4,0x9c,0xac,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char full_panel_bg_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x20,0x8,0x6,0x0,0x0,0x0,0x73,0x7a,0x7a,0xf4,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x14,0xe,0x1c,0x26,0x8,0x6f,0x80,0xec,0x0,0x0,0x0,0xfb,0x49,0x44,0x41,0x54,0x58,0x85,0xed,0x97,0x31,0x6a,0x3,0x31,0x10,0x45,0x9f,0x66,0xa4,0xda,0x39,0x81,0xd,0x6e,0x16,0xdf,0xff,0x1a,0x29,0x72,0x2,0x83,0xdd,0x6,0x43,0x5c,0x6b,0x35,0x4a,0xe1,0x68,0x77,0x45,0x16,0xd2,0xac,0x36,0x8d,0x6,0x84,0x40,0xcd,0x7b,0xcc,0xa8,0x98,0xef,0x86,0xe1,0x92,0xf9,0xa9,0x9c,0x73,0x75,0x6f,0x5d,0xce,0xb9,0xea,0x6,0xf0,0x5,0xb8,0x76,0xb6,0x86,0xaf,0x9d,0x4a,0x20,0xa5,0x44,0x4a,0xa9,0xa9,0x80,0xaa,0xa2,0xaa,0xd3,0x9b,0x5f,0xc2,0xdf,0xe,0x7,0x4e,0xc7,0x33,0x66,0x23,0x66,0xb6,0xa9,0x80,0x88,0x20,0xe2,0xb9,0xdd,0xaf,0x7c,0x3d,0x9f,0xa8,0x2a,0x39,0xe7,0xb9,0x3,0x29,0x25,0x4e,0xc7,0x33,0x8f,0xc7,0x27,0x31,0xc6,0x4d,0xe1,0xa5,0x42,0x8,0x2f,0xc6,0xc7,0x3b,0x22,0xf2,0x12,0x5b,0xce,0xdc,0x6c,0x6c,0x6,0x7,0x88,0x31,0x62,0x36,0x56,0xff,0x4c,0x80,0x85,0xc0,0xb6,0x6d,0x5f,0x2b,0x33,0xab,0xfe,0x98,0x34,0x27,0xfe,0x51,0x5d,0xa0,0xb,0x74,0x81,0x2e,0xd0,0x5,0xba,0x40,0x17,0xe8,0x2,0x5d,0x40,0x60,0xde,0xd9,0xcb,0xa6,0xda,0x14,0x28,0x32,0xf1,0x0,0x64,0x99,0x52,0x44,0x3c,0x21,0x84,0x66,0xf0,0x10,0x2,0x22,0xfe,0x77,0x32,0x2a,0x89,0xe5,0x76,0xbf,0xee,0x12,0x4c,0x54,0x75,0xce,0x89,0xc3,0x70,0xc9,0x65,0x55,0xde,0x33,0x9a,0x95,0x91,0x4f,0x1d,0x0,0x50,0x55,0x44,0x64,0xb7,0x70,0xa,0xcc,0x2,0xce,0xb9,0x7f,0x89,0xe7,0xdf,0x5f,0xef,0xae,0xd,0xbd,0x13,0x36,0x6e,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x20,0x8,0x3,0x0,0x0,0x0,0x44,0xa4,0x8a,0xc6,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x33,0x50,0x4c,0x54,0x45,0x27,0x27,0x29,0x26,0x26,0x28,0x25,0x25,0x27,0x24,0x24,0x26,0x23,0x23,0x25,0x22,0x22,0x24,0x21,0x21,0x23,0x1e,0x1e,0x20,0x1d,0x1d,0x1f,0x1c,0x1c,0x1e,0x31,0x30,0x32,0x50,0x4e,0x54,0x4e,0x4c,0x50,0x4c,0x4a,0x4e,0x3d,0x3b,0x3f,0x38,0x36,0x3a,0xff,0xff,0xff,0x4,0xb3,0x69,0x9b,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x10,0x95,0xb2,0xd,0x2c,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x63,0x49,0x44,0x41,0x54,0x38,0xcb,0xed,0x93,0x29,0x12,0xc0,0x30,0xc,0xc4,0x7c,0x3b,0x67,0xf3,0xff,0xdf,0xb6,0xe1,0xce,0x98,0x15,0x45,0x58,0xb3,0x68,0x5,0x0,0x80,0x48,0x21,0x88,0xb0,0x41,0x62,0x51,0xb,0x50,0x61,0xda,0xa,0xb1,0x79,0xa9,0x1,0xc5,0x8d,0xe9,0x1b,0x60,0x6b,0x7d,0xcc,0x80,0xd1,0x9b,0x31,0x2,0x8a,0xf7,0x67,0x85,0x3c,0xdd,0x5,0x81,0xb4,0x8c,0x75,0x60,0x14,0x25,0x20,0xab,0xf3,0x24,0xcc,0x6a,0x57,0xb8,0xc2,0xff,0x42,0x76,0xda,0xf4,0xf6,0x69,0x38,0x69,0x7a,0x79,0xbc,0x49,0xfe,0x2f,0x65,0xd3,0x2d,0x45,0xb,0x5e,0xbc,0x3b,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char graph_node_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x40,0x8,0x6,0x0,0x0,0x0,0x13,0x7d,0xf7,0x96,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0xc,0x14,0x10,0x3,0x2e,0x15,0xb6,0x7,0x4a,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x2,0x6a,0x49,0x44,0x41,0x54,0x58,0xc3,0xed,0x97,0xbb,0x6e,0x13,0x51,0x10,0x86,0xbf,0xf1,0x2e,0xb1,0x83,0x85,0x63,0x5,0x10,0xe2,0x22,0xa5,0x0,0x1a,0x24,0x90,0x22,0x9e,0x81,0x2,0xd1,0x53,0xf1,0x2,0x20,0xa,0x1a,0xa,0xa0,0x44,0xd0,0xd0,0x20,0x81,0xe0,0x5,0xa8,0xe8,0x11,0x5,0xcf,0x80,0x22,0x81,0x42,0x3,0x14,0x91,0xb8,0x4,0x85,0x58,0x8e,0x21,0x78,0xd7,0xd9,0x73,0x86,0xe2,0x9c,0xdd,0xec,0xae,0xd7,0xce,0x85,0xe,0xed,0x34,0xbb,0x3a,0x3e,0xf3,0xcd,0xcc,0x3f,0x63,0x69,0x47,0xd8,0x36,0x1,0x1a,0x40,0xe0,0x9f,0x42,0xd1,0x14,0xb0,0x80,0xf1,0x4f,0x25,0x77,0xa9,0x1,0x1c,0x4,0xe6,0x81,0xa3,0x40,0x7,0x38,0x50,0x2,0x6c,0x1,0x3,0x60,0xd,0xe8,0x1,0x7f,0x0,0x9b,0x46,0x6d,0x3,0x67,0xe6,0xe,0x75,0xaf,0xb7,0x9a,0xad,0xcb,0x33,0x33,0xcd,0x53,0x54,0xd8,0x68,0x14,0x7f,0x89,0xe2,0xe8,0xf5,0xc6,0xaf,0xfe,0x73,0xe0,0x13,0xb0,0x29,0x3e,0xd2,0xc2,0x7c,0xf7,0xf0,0xe3,0xd3,0xb,0x67,0xaf,0x3c,0xb8,0xfb,0x88,0xd9,0x4e,0xab,0xca,0x9f,0xe1,0x20,0xe2,0xde,0xc3,0xdb,0x7c,0x5e,0xf9,0xf8,0xaa,0xd7,0x5f,0xbf,0x5,0xac,0x8,0xd0,0x2,0x16,0x8f,0x1f,0x3b,0xf9,0xe6,0xc5,0xb3,0x97,0xed,0x24,0xb1,0x24,0xa3,0xa4,0x12,0x10,0xce,0x84,0x84,0x61,0x83,0x6b,0x37,0xae,0x6e,0x7e,0xff,0xf1,0xf5,0x12,0xb0,0x14,0x7a,0x1d,0xda,0x61,0x10,0xb6,0x87,0xbf,0x63,0x10,0x75,0x47,0xa,0x2a,0x79,0x85,0x95,0x51,0xbc,0xc5,0x28,0x86,0x30,0x8,0xdb,0xbe,0x6c,0x49,0x1,0x1,0x80,0x51,0xeb,0xfc,0x9d,0xc0,0x4e,0x6b,0xf,0xd1,0xfc,0xb9,0xb3,0x20,0x5,0x68,0xfa,0x8b,0x5a,0x8b,0xaa,0x80,0x28,0x82,0xa0,0x28,0xa2,0x92,0x73,0xd3,0xb1,0xde,0x86,0x85,0x46,0x5b,0x45,0x51,0x50,0x45,0xc4,0x95,0x61,0x53,0x27,0x71,0x61,0x74,0x1a,0xc0,0xaa,0xcd,0x6e,0xa8,0x64,0x2f,0xee,0x5d,0x29,0x8a,0x32,0x39,0x3,0x5f,0xb6,0x2f,0x4c,0x45,0x73,0x5a,0xd8,0x31,0x48,0x1,0x60,0xac,0x2d,0xf1,0x5,0x51,0x75,0x45,0x68,0x5a,0xbf,0x4e,0xcf,0x60,0xfb,0x82,0x2b,0x5a,0x73,0x4e,0xb6,0xe2,0xf,0x52,0x2,0xd8,0x82,0xe2,0x14,0x50,0x54,0xc4,0x2f,0x8b,0x68,0xad,0x1f,0x99,0x54,0x79,0x41,0xdd,0x0,0xf8,0xb6,0x82,0x88,0x4e,0xeb,0x82,0x66,0x89,0xaa,0x3b,0xc8,0x52,0x48,0x41,0x56,0x76,0xcc,0x60,0x7b,0x74,0x75,0xac,0x1a,0x49,0x47,0x72,0x72,0x6,0xe2,0xe7,0x56,0x45,0xfd,0x5d,0xc9,0x44,0x28,0x40,0x2b,0x45,0x34,0xea,0x7,0xa8,0x14,0xc9,0x92,0x75,0x64,0x7,0x11,0x8d,0x8f,0x98,0x9b,0x87,0xf2,0xf4,0x4d,0xd5,0x40,0xd5,0xc9,0x97,0xf,0xa3,0x5a,0x74,0x9c,0x36,0x89,0xf7,0x9f,0xdc,0x61,0xaf,0x96,0x1,0x92,0x2d,0xc3,0xe2,0xf9,0x8b,0xbb,0x72,0x5a,0x7a,0xff,0xb6,0x3a,0x83,0x8d,0x41,0x7f,0xcf,0x19,0x34,0xf8,0x47,0xab,0x1,0x35,0xa0,0x6,0xd4,0x80,0x1a,0x50,0x3,0x6a,0xc0,0x7f,0x9,0x90,0x8a,0x4f,0xe0,0x3d,0x67,0x60,0xf7,0xe1,0x6b,0x53,0x80,0x5,0x22,0x63,0x4c,0x6c,0x93,0x5d,0x78,0x25,0x60,0x8c,0x89,0x81,0x8,0xb0,0xd,0xbf,0xca,0xae,0x47,0xf1,0x70,0x79,0xad,0xb7,0xca,0x34,0x88,0x4d,0x60,0xad,0xb7,0x4a,0x14,0xf,0x97,0x81,0x75,0xc0,0xa4,0x9b,0xeb,0x1c,0x70,0xa1,0xd3,0xee,0x3e,0x6d,0x35,0x67,0xcf,0x5,0x41,0x50,0x29,0xae,0x31,0xc6,0x46,0xf1,0xf0,0xc3,0x60,0xb3,0x7f,0x13,0x78,0x7,0x6c,0x48,0x6e,0x85,0xeb,0x0,0x27,0x80,0x23,0x40,0x73,0xc2,0xf2,0x1d,0x3,0x3f,0x81,0x6f,0x7e,0x8f,0x36,0x52,0x12,0x34,0x4c,0xf7,0xc1,0x9,0x55,0xa8,0x2f,0x39,0xd9,0xa7,0xf0,0xe3,0xf6,0x17,0x4c,0x97,0x1d,0x24,0x5b,0x8,0x8b,0x95,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x40,0x8,0x3,0x0,0x0,0x0,0x24,0xa3,0x7,0xa4,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x1,0x4d,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf,0xd,0x10,0x17,0x14,0x18,0x0,0x0,0x0,0x0,0x0,0x0,0x12,0x10,0x13,0x0,0x0,0x0,0x19,0x17,0x1b,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x16,0x12,0x19,0x0,0x0,0x0,0xe,0xb,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0xe,0xb,0x10,0x16,0x12,0x19,0x0,0x0,0x0,0x1d,0x1a,0x1f,0x35,0x2f,0x38,0xba,0xa9,0xc3,0xc3,0xb7,0xcb,0xbd,0xad,0xc5,0xb9,0xa9,0xc3,0xb5,0xa3,0xbf,0xb4,0xa1,0xbe,0xb4,0xa2,0xbd,0xb4,0xa2,0xbe,0xb3,0xa2,0xbe,0xb1,0xa0,0xbc,0xb2,0xa0,0xbc,0xb2,0x9f,0xbc,0xb0,0x9e,0xba,0xb0,0x9d,0xbb,0xb1,0x9e,0xbb,0xb0,0x9e,0xbb,0xb1,0x9e,0xba,0xaf,0x9c,0xb9,0xae,0x9c,0xb9,0xae,0x9c,0xb8,0xaf,0x9d,0xb9,0xad,0x9b,0xb7,0xad,0x9a,0xb7,0xad,0x9a,0xb8,0xac,0x99,0xb6,0xab,0x99,0xb6,0xac,0x98,0xb6,0xab,0x98,0xb6,0xab,0x99,0xb5,0xa9,0x97,0xb4,0xa9,0x97,0xb5,0xaa,0x97,0xb4,0xa8,0x95,0xb3,0xa8,0x95,0xb2,0xa7,0x95,0xb3,0xa7,0x93,0xb1,0xa6,0x93,0xb1,0xa5,0x91,0xaf,0xa5,0x91,0xb0,0xa4,0x91,0xaf,0xa5,0x92,0xb0,0xa4,0x91,0xb0,0xa5,0x92,0xaf,0xa3,0x90,0xae,0xa3,0x90,0xad,0xa3,0x8f,0xae,0xa2,0x90,0xae,0xa1,0x8e,0xac,0xa1,0x8e,0xad,0xa2,0x8e,0xac,0x9f,0x8d,0xab,0xa0,0x8d,0xab,0xa0,0x8c,0xab,0xa0,0x8d,0xaa,0x9f,0x8c,0xaa,0x9f,0x8c,0xab,0x9e,0x8a,0xaa,0x9e,0x8b,0xa9,0x9e,0x8b,0xaa,0x9e,0x8a,0xa9,0x9d,0x8a,0xa9,0x9c,0x88,0xa7,0x9c,0x88,0xa8,0x9c,0x89,0xa7,0x9c,0x89,0xa8,0x9a,0x87,0xa6,0x9b,0x87,0xa6,0x9b,0x86,0xa6,0x9b,0x87,0xa7,0x19,0x15,0x1c,0x4a,0x42,0x4f,0x3b,0x34,0x3f,0x39,0x30,0x3f,0x24,0x1e,0x27,0xff,0xff,0xff,0x8f,0x6b,0x6d,0x0,0x0,0x0,0x0,0x22,0x74,0x52,0x4e,0x53,0x0,0x1,0x3,0x6,0x8,0x9,0x2,0xc,0x1e,0x33,0x41,0x46,0xd,0x31,0x9a,0xe3,0x5,0x24,0xb4,0x39,0xf4,0x44,0xa,0x47,0x45,0x3d,0xf8,0x2a,0xcd,0x11,0x3f,0xd3,0xfd,0x2b,0x85,0xa8,0x7,0x57,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x6e,0x22,0xf,0x51,0x17,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x1,0x53,0x49,0x44,0x41,0x54,0x38,0xcb,0xed,0xd4,0x69,0x57,0x1,0x51,0x18,0xc0,0xf1,0x8b,0x99,0xb1,0x8c,0x65,0x6c,0x63,0x9d,0xc1,0x10,0xd1,0xc4,0x44,0x23,0x6b,0xb2,0x55,0xa8,0x24,0x92,0xb2,0x15,0x45,0x8a,0xef,0xff,0xb6,0x6b,0xba,0x39,0x4e,0xbd,0xe8,0xb,0xf8,0x9f,0xe7,0xdc,0x73,0x9e,0xdf,0xfb,0xe7,0x2,0x0,0x64,0x72,0x5,0x86,0xc3,0x30,0x85,0x5c,0x6,0x60,0x84,0x52,0xa5,0xd6,0x90,0x30,0x8d,0x5a,0xa5,0x24,0xe0,0xae,0xd5,0xe9,0xd,0x9c,0x94,0x41,0xaf,0xd3,0x12,0x80,0x32,0x9a,0xfc,0x81,0x3d,0xa9,0x80,0xdf,0x64,0xa4,0x0,0x66,0xb6,0x4,0x43,0xfb,0x52,0xa1,0xa0,0xc5,0x8c,0x1,0xdc,0xca,0x85,0x23,0x7,0x61,0x9e,0xe7,0x23,0x3c,0xcf,0x59,0x71,0x40,0xdb,0xb8,0xc3,0x68,0x34,0x1a,0x83,0x13,0x8b,0x71,0x36,0x1a,0xe0,0x24,0x27,0x1c,0x9,0x71,0x21,0x9e,0x48,0x8,0xc7,0x8,0xc4,0xe4,0x49,0x4a,0x4c,0x8a,0x29,0x51,0x44,0x90,0xce,0x64,0xd2,0xe9,0x2c,0x9c,0x2c,0x82,0x5c,0x3e,0x97,0x3b,0xcd,0x17,0xf2,0x67,0x5,0x4,0x45,0x58,0xa9,0x5c,0x2a,0x96,0xcb,0x8,0x2a,0xd5,0x6a,0x65,0xdd,0x79,0x5,0xc1,0xc5,0xe5,0xba,0xf5,0x8b,0xa0,0x56,0x6f,0xd4,0xae,0x1a,0x8d,0xfa,0xf5,0xd,0x82,0xe6,0x6d,0xb3,0xd9,0x6a,0xc1,0xb9,0x43,0xd0,0x6e,0x77,0xee,0xdb,0xb0,0x4e,0x1b,0x41,0xf7,0xa1,0xf7,0xf8,0xd4,0xef,0xf6,0x7b,0x7d,0x4,0x83,0xe1,0x68,0x38,0x1c,0xd,0xc6,0xe3,0x67,0x4,0x2f,0x93,0xe9,0x74,0x3a,0x81,0xbd,0x22,0x78,0x9b,0xc1,0xe6,0xf3,0xd9,0xec,0x1d,0xc1,0x56,0x12,0x2c,0x3e,0x36,0x2d,0xbe,0xe1,0x73,0xd3,0xe,0x76,0xf0,0x1f,0xd0,0xb6,0xdf,0x60,0xdf,0x6,0x3b,0xd,0x30,0x87,0x73,0xf9,0xb3,0x2f,0x9d,0xe,0xc,0x50,0x2e,0xf7,0xa,0xc9,0x72,0xe5,0x76,0x51,0x80,0x60,0x58,0x8f,0x77,0x21,0xe5,0xf5,0xb0,0xc,0xbc,0x75,0x39,0xe3,0x63,0x49,0x1b,0x8c,0x64,0x7d,0x8c,0x5c,0xfa,0xd,0x14,0x38,0x2d,0x85,0x2b,0x8,0xf0,0xb7,0x2f,0x56,0x15,0x7,0x92,0x8b,0x88,0xb4,0x10,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char graph_node_close_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x8,0x6,0x0,0x0,0x0,0x56,0x75,0x5c,0xe7,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x93,0x49,0x44,0x41,0x54,0x28,0x91,0x95,0x92,0x31,0xe,0xc2,0x30,0x10,0x4,0x17,0xaa,0x3d,0x7b,0xdb,0x58,0xa4,0xa7,0xe1,0x47,0xfe,0x2c,0x3c,0x82,0x48,0x44,0x22,0x6f,0xb1,0x4d,0x15,0xc9,0x20,0x1f,0x52,0xae,0xdd,0xd9,0x2b,0xe6,0xe,0x0,0x60,0x66,0x59,0x52,0x82,0x33,0x92,0x92,0x99,0x65,0xec,0x30,0xc9,0x4a,0x72,0x19,0x95,0x24,0x25,0x92,0xb,0xc9,0x6a,0x66,0x19,0x92,0x26,0x33,0x7b,0x92,0x6c,0x24,0xd7,0x10,0xc2,0xdc,0xc1,0x5f,0x59,0x8c,0xf1,0x32,0xc,0x42,0x8,0xb3,0xb,0x3b,0xdb,0xde,0x24,0x5f,0x2e,0xdc,0x97,0x3a,0xb0,0x91,0xdc,0x7e,0xe1,0xb3,0x67,0x66,0x9f,0xd6,0xda,0x69,0x58,0x90,0x34,0x95,0x52,0xee,0x0,0x6e,0x0,0x36,0x0,0x2b,0x80,0x6b,0xad,0xf5,0xd1,0x8b,0x70,0x6d,0xb8,0xf6,0xfe,0xd9,0x18,0x96,0xe,0x1f,0xe,0x38,0xf6,0x1a,0x1f,0x9f,0xec,0x40,0x47,0x56,0x51,0x84,0x77,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x8,0x4,0x0,0x0,0x0,0xfc,0x7c,0x94,0x6c,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x65,0x49,0x44,0x41,0x54,0x18,0xd3,0x75,0x90,0x4b,0xe,0x80,0x20,0xc,0x44,0x47,0x57,0x53,0x64,0x2b,0x91,0x9b,0x71,0x6e,0x49,0x30,0xd1,0xbb,0x80,0xb,0xa2,0xb6,0x26,0x74,0x37,0x9f,0x34,0xaf,0x5,0x20,0xc9,0x7,0xa8,0xf1,0x41,0x12,0x0,0x49,0xac,0xcc,0x5f,0xe4,0x3,0x33,0xab,0x24,0xf8,0x55,0x76,0x36,0x1e,0x2e,0x2,0x78,0xd5,0xb2,0x29,0xe1,0xa2,0xb1,0x55,0xef,0x64,0x31,0x76,0x8f,0x58,0xd8,0xd8,0x78,0x3d,0xf6,0x8c,0xdf,0xb4,0xc9,0xf4,0xf5,0xaa,0x8e,0x61,0x48,0xc,0xa1,0x25,0x51,0xd1,0xf0,0xc0,0xd1,0x4b,0x6e,0xc7,0xae,0x34,0x72,0x3,0xf5,0x60,0xdd,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xba,0x84,0x14,0xff,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xcb,0xd9,0xac,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char graph_node_default_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0x8,0x1a,0x17,0x2e,0xd,0x4c,0xb7,0x38,0x4,0x0,0x0,0x0,0x1d,0x69,0x54,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x0,0x0,0x0,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x64,0x2e,0x65,0x7,0x0,0x0,0x0,0x85,0x49,0x44,0x41,0x54,0x38,0xcb,0xed,0x93,0x31,0xa,0x83,0x40,0x14,0x44,0xdf,0xba,0xa5,0x20,0x41,0x30,0x20,0x4,0xab,0x40,0x20,0x7,0xc9,0x69,0xec,0x72,0x4e,0x9b,0xa0,0x1e,0xc1,0x2a,0x42,0x10,0x82,0xbb,0xc5,0x77,0x6d,0x4c,0x11,0x48,0xe3,0xb7,0x49,0xe1,0x6b,0x6,0xa6,0x78,0xd5,0x8c,0x1,0x6e,0x80,0xe1,0x9b,0xb0,0xe4,0xaf,0xde,0x3,0x4f,0xa0,0x3,0x6,0x93,0x67,0xa7,0xc0,0xa,0x44,0x64,0x72,0x7e,0x6c,0x87,0xf7,0xab,0x4,0x1e,0x68,0x38,0x17,0x97,0x90,0xc4,0x87,0xa,0xb8,0xa2,0xe5,0x98,0xe6,0x1,0xb8,0x47,0x5a,0x81,0xb5,0x16,0xa0,0x56,0xb,0x3e,0xec,0x82,0x3f,0x10,0x4c,0x6a,0x81,0x88,0x78,0xc0,0x45,0xda,0x29,0x3b,0x3f,0x36,0x40,0xbf,0xf9,0x4c,0x66,0xeb,0x9d,0x67,0x5c,0x46,0x37,0x51,0xb6,0x55,0x6d,0xc2,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x39,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x16,0x12,0x19,0xe,0xb,0x10,0xe,0xb,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x16,0x12,0x19,0x0,0x0,0x0,0x19,0x15,0x1c,0x24,0x1e,0x27,0x16,0x12,0x19,0xff,0xff,0xff,0x2b,0x4d,0xfd,0x66,0x0,0x0,0x0,0xf,0x74,0x52,0x4e,0x53,0x0,0x46,0x47,0x3f,0x2b,0x11,0x3,0xfd,0xd3,0xcd,0x2a,0x73,0x45,0xf8,0x3d,0x3f,0x57,0xda,0x84,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x12,0x7b,0xbc,0x6c,0x0,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x0,0x38,0x49,0x44,0x41,0x54,0x18,0xd3,0x63,0x60,0x64,0x2,0x2,0x46,0x8,0xc9,0xcc,0xc2,0xca,0xc6,0xc0,0x8f,0x4,0xd8,0x39,0x98,0x59,0x19,0x50,0x80,0x0,0x27,0x17,0xaa,0x0,0x83,0x20,0x37,0x9a,0x0,0x3f,0xd3,0xc0,0x8,0xf0,0xa0,0x9,0xf0,0xf2,0x61,0x3a,0x1d,0xc3,0x73,0xe8,0xde,0x7,0x0,0x89,0x4d,0x2,0xf2,0x16,0xd3,0x74,0x45,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char graph_node_default_focus_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0x8,0x1b,0x1,0x9,0x1c,0x5c,0xd5,0x12,0x34,0x0,0x0,0x0,0x1d,0x69,0x54,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x0,0x0,0x0,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x64,0x2e,0x65,0x7,0x0,0x0,0x0,0xfc,0x49,0x44,0x41,0x54,0x38,0xcb,0xbd,0x93,0x41,0x4a,0x4,0x41,0xc,0x45,0x7f,0xca,0x6a,0x14,0x42,0x2f,0xc4,0x85,0x7,0xf0,0x3c,0xde,0xa2,0xbc,0x41,0xd7,0xa2,0xa1,0x60,0xea,0x60,0xae,0x5c,0xea,0x19,0xdc,0xd7,0x42,0x97,0xe5,0xc,0x12,0xeb,0xbb,0x69,0xa5,0x84,0xe9,0x41,0x1d,0xf1,0x43,0x8,0x84,0xe4,0x2d,0x92,0x1f,0xc1,0x22,0x92,0x2,0xc0,0x2d,0x81,0x2e,0x7f,0xa8,0x75,0xb9,0x89,0x8,0x1,0x40,0x48,0x5e,0x76,0xcd,0xad,0x6b,0x74,0x7b,0xea,0x6,0xe0,0x75,0x9,0x13,0x11,0xca,0x34,0x4d,0xc4,0x37,0x35,0xc,0xc3,0xf3,0x38,0x8e,0xb7,0xf3,0x3c,0xdf,0x0,0xd8,0x1,0x30,0x90,0x4,0x49,0xe4,0x9c,0x11,0x42,0x40,0x29,0x65,0x15,0x50,0x4a,0xb9,0x8,0x21,0x30,0xe7,0x7c,0x47,0x52,0x49,0x9e,0x7c,0x2,0x62,0x8c,0x30,0x33,0xa8,0xea,0x2a,0x40,0x55,0xaf,0xcc,0x4c,0x62,0x8c,0x5b,0x92,0xe7,0x24,0x7,0xd7,0x2d,0x11,0xde,0x7b,0xd4,0x5a,0x57,0x1,0xb5,0xd6,0x47,0xef,0x3d,0x49,0x9e,0x1,0xf0,0x0,0x9c,0xc3,0xef,0xe5,0xf6,0x9d,0xea,0x5f,0x1,0x38,0x16,0xd0,0xfe,0x16,0x20,0x22,0x7,0x3d,0xd0,0x7b,0x41,0x44,0xb6,0x8b,0x2b,0x9b,0xeb,0x6e,0x8c,0x94,0x12,0xcc,0x6c,0x75,0xd8,0xcc,0xc6,0x94,0xd2,0x93,0xaa,0xde,0x2f,0x76,0x6e,0x3f,0xb2,0xb2,0x88,0xec,0x54,0xf5,0x61,0xb3,0xd9,0x5c,0x3,0x78,0x1,0x60,0xc7,0x3c,0x53,0x13,0x91,0x37,0xe9,0x9d,0xd8,0xe9,0xf4,0xc0,0xe2,0xbe,0xbc,0xf3,0x3b,0x49,0xa0,0x89,0xbf,0x71,0xc6,0xcd,0x1c,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x4,0x0,0x0,0x0,0xb5,0xfa,0x37,0xea,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0xb7,0x49,0x44,0x41,0x54,0x28,0xcf,0x9d,0x91,0x3d,0x6a,0x42,0x61,0x10,0x45,0xcf,0x8c,0x4f,0x22,0x7c,0x58,0x84,0x14,0x2e,0xc0,0xf5,0x64,0x17,0xba,0x3,0x2d,0x4,0x41,0x17,0x96,0x2a,0x65,0x5c,0x43,0x7a,0xb,0x53,0xfa,0xc3,0x63,0x9c,0x6b,0xf1,0x4,0xf9,0x24,0x31,0x21,0xb7,0x1b,0xe6,0x14,0x33,0xe7,0x1a,0x80,0xc,0xc7,0x1,0xa7,0x4b,0x2,0x49,0x9a,0xc0,0x34,0xc2,0xbb,0x11,0xae,0x58,0x92,0x4,0x2d,0x2d,0x61,0xb2,0x99,0xf8,0x26,0xfd,0xaf,0xe1,0xdb,0x62,0xca,0x89,0x40,0x88,0x35,0x13,0xb6,0x15,0xb0,0x7d,0x99,0x68,0xfd,0xae,0xa2,0x1e,0x42,0xcc,0x9,0x4a,0x5,0x94,0x71,0xd8,0xfc,0xa8,0x67,0xf5,0x1d,0x40,0x34,0xec,0x2b,0x60,0xff,0xd9,0x48,0x3,0x1a,0xdc,0x79,0x14,0xbf,0x3d,0xf6,0x4f,0x80,0xdf,0x80,0xfc,0x2b,0x60,0x77,0x16,0x3a,0x13,0x76,0x24,0x48,0x7,0x28,0x2c,0x89,0x6a,0x1d,0xc3,0xe5,0xae,0x7c,0xd0,0x92,0x3f,0xa8,0xb6,0x53,0xd9,0xac,0x5e,0x39,0x10,0x8f,0xcb,0x4a,0x3b,0x5b,0x67,0x12,0x80,0xa7,0xea,0xbc,0x6b,0xdd,0x17,0xbe,0x3f,0x4f,0x23,0x27,0x82,0x63,0x73,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char graph_node_selected_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x40,0x8,0x6,0x0,0x0,0x0,0x13,0x7d,0xf7,0x96,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0x7,0x12,0x1,0xc,0x6,0x23,0x98,0xc7,0x50,0x0,0x0,0x0,0x1d,0x69,0x54,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x0,0x0,0x0,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x64,0x2e,0x65,0x7,0x0,0x0,0x2,0x46,0x49,0x44,0x41,0x54,0x58,0xc3,0xed,0x97,0xcd,0x6a,0x13,0x51,0x14,0xc7,0x7f,0xe7,0xce,0x34,0x49,0xd,0xa6,0xb1,0x2a,0xe2,0x7,0x74,0xa1,0x6e,0x4,0x85,0xe2,0x3,0xb8,0x72,0x21,0xba,0x16,0x5c,0xb9,0x16,0x4,0x7d,0x84,0x3e,0x82,0x82,0xe0,0xda,0x95,0x2f,0x60,0x71,0xe1,0xca,0x7,0xd0,0x82,0xa5,0x6e,0xd4,0x45,0xc1,0x8f,0x4a,0x6c,0x9a,0x46,0x62,0x66,0xa6,0x73,0xef,0x71,0xe1,0x4c,0x92,0x99,0x4c,0x93,0x36,0xdd,0xc9,0xfc,0x37,0x77,0x3e,0xee,0xfd,0xdd,0x73,0xfe,0xf7,0xc,0xcc,0x11,0x86,0x12,0xc0,0x0,0x5e,0x32,0xa,0x59,0x29,0xe0,0x0,0x9b,0x8c,0xca,0xc8,0x24,0x3,0x1c,0x3,0x16,0x81,0xd3,0x40,0x3,0x98,0xcb,0x1,0xf6,0x80,0x2e,0xd0,0x2,0xda,0xc0,0x1f,0xc0,0xa5,0xbb,0xd6,0x81,0x4b,0xb,0xc7,0x9b,0xf,0x6a,0xd5,0xda,0xad,0x4a,0xa5,0x7a,0x81,0x2,0x45,0x51,0xf8,0x35,0x8,0x83,0xd7,0xbb,0xbf,0x3b,0xcf,0x81,0xcf,0x40,0x4f,0x92,0x9d,0x96,0x16,0x9b,0x27,0x9f,0x5c,0x5c,0xba,0x7c,0xfb,0xfe,0xcb,0x3b,0x34,0x2b,0x27,0x8a,0xd6,0xd3,0x89,0x76,0x78,0x71,0xef,0x15,0x5f,0x36,0x3f,0xad,0xb6,0x3b,0xdb,0x8f,0x81,0x4d,0x1,0x6a,0xc0,0xf2,0xd9,0x33,0xe7,0xdf,0xac,0xbc,0x7d,0x54,0xdf,0x73,0x11,0x81,0xed,0x17,0x2,0x6a,0xde,0x3c,0x73,0xa6,0xc2,0xca,0x8d,0xa7,0xbd,0x1f,0x3f,0xbf,0xdd,0x4,0xd6,0xfc,0xc4,0x87,0xba,0xef,0xf9,0xf5,0x6e,0xb4,0xc3,0x24,0xf5,0xe3,0x1e,0x7d,0x7a,0xf8,0x9e,0x5f,0x4f,0xd2,0x96,0x14,0xe0,0x1,0x58,0xb5,0x39,0xdb,0x1d,0x82,0x19,0x5c,0xe7,0xe4,0xa5,0x0,0x4d,0x8f,0x44,0x71,0xa8,0x2a,0x22,0x92,0x81,0x4c,0x92,0x3f,0x7a,0xe3,0xd4,0xe2,0x54,0x41,0xc1,0x13,0xf,0xc5,0xe1,0x54,0x31,0x22,0x8,0xa6,0x10,0x96,0x1,0x58,0x1d,0x4e,0x88,0x35,0x1e,0x79,0x9e,0xd6,0xd0,0x94,0x8,0x54,0xb3,0x93,0x1c,0x8a,0x41,0x6,0x63,0xfa,0x6c,0x5f,0x40,0xe4,0xa2,0xcc,0x4b,0x23,0x32,0xd8,0x37,0x4e,0x52,0x99,0x1c,0x41,0x2e,0x4c,0x9b,0xdd,0x6c,0xec,0xbe,0x20,0x5,0xe5,0xb0,0xca,0x99,0x68,0x93,0x48,0x14,0x41,0x30,0x22,0x3,0x63,0x5,0x41,0x51,0x3c,0x31,0x93,0x8f,0x31,0xf3,0xed,0x6a,0xf6,0x5b,0xfe,0xe7,0x85,0x9b,0x0,0x98,0x52,0x34,0x7,0x2a,0xa4,0xb4,0x74,0x8b,0x4c,0x2d,0x2a,0xa6,0xb1,0x42,0x32,0x8c,0x1b,0x39,0x3c,0x7b,0x37,0xbd,0x90,0xec,0x51,0x52,0x88,0x5d,0x3c,0x36,0x21,0xd,0x39,0x4d,0x4d,0x72,0xc5,0x94,0x1,0xac,0xde,0x7d,0x3f,0xbb,0x89,0xf1,0x9e,0x65,0xf9,0xea,0xf5,0x3,0x2d,0x5a,0x5b,0x7f,0x57,0x1c,0xc1,0x6e,0xb7,0x73,0xe8,0x8,0xc,0x47,0x54,0x9,0x28,0x1,0x25,0xa0,0x4,0x94,0x80,0x12,0x50,0x2,0xfe,0x4b,0x80,0x14,0xf4,0x88,0x87,0x8e,0xc0,0xcd,0xb0,0xd6,0xa5,0x0,0x7,0x4,0xd6,0xda,0xb0,0xe0,0x27,0x6d,0x7c,0x55,0xc,0xd6,0xda,0x10,0x8,0x0,0x67,0x92,0x56,0x76,0x3b,0x8,0xfb,0x1b,0xad,0xf6,0x16,0x93,0x20,0x2e,0x86,0x56,0x7b,0x8b,0x20,0xec,0x6f,0x0,0xdb,0x80,0x4d,0x3b,0xd7,0x5,0xe0,0x5a,0xa3,0xde,0x7c,0x56,0xab,0xce,0x5f,0xf1,0x3c,0xaf,0xd0,0x5c,0x6b,0xad,0xb,0xc2,0xfe,0xc7,0x6e,0xaf,0xf3,0x10,0xf8,0x0,0xec,0xca,0x48,0xb,0xd7,0x0,0xce,0x1,0xa7,0x80,0xea,0x3e,0xcd,0x77,0x8,0xfc,0x2,0xbe,0x27,0x7d,0xb4,0x95,0x9c,0xa1,0x7e,0xda,0xf,0xee,0x93,0x85,0x26,0x29,0xc7,0x33,0x1a,0x3f,0xae,0xbf,0xf0,0x27,0xf6,0x42,0xf6,0xf5,0xfd,0xae,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x40,0x8,0x3,0x0,0x0,0x0,0x24,0xa3,0x7,0xa4,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0xd8,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf,0xd,0x10,0x17,0x14,0x18,0x0,0x0,0x0,0x0,0x0,0x0,0x12,0x10,0x13,0x0,0x0,0x0,0x19,0x17,0x1b,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x16,0x12,0x19,0x0,0x0,0x0,0xe,0xb,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0xe,0xb,0x10,0x16,0x12,0x19,0x0,0x0,0x0,0x1d,0x1a,0x1f,0x35,0x2f,0x38,0x94,0xd6,0x84,0xa4,0xdc,0x95,0x99,0xd8,0x8a,0x8c,0xd3,0x7b,0x8b,0xd2,0x79,0x88,0xd1,0x76,0x87,0xd1,0x74,0x86,0xd0,0x73,0x85,0xd0,0x71,0x83,0xcf,0x70,0x82,0xcf,0x6f,0x81,0xce,0x6d,0x7f,0xce,0x6c,0x7b,0xcc,0x67,0x7d,0xcd,0x68,0x7a,0xcc,0x65,0x79,0xcb,0x64,0x76,0xca,0x61,0x75,0xca,0x60,0x78,0xcb,0x62,0x74,0xc9,0x5e,0x72,0xc9,0x5c,0x70,0xc8,0x59,0x71,0xc8,0x5b,0x6d,0xc7,0x57,0x6f,0xc7,0x58,0x6c,0xc6,0x55,0x68,0xc4,0x51,0x67,0xc4,0x4f,0x69,0xc5,0x52,0x19,0x15,0x1c,0x4a,0x42,0x4f,0x3b,0x34,0x3f,0x39,0x30,0x3f,0x24,0x1e,0x27,0xff,0xff,0xff,0x23,0xbb,0x3,0x70,0x0,0x0,0x0,0x22,0x74,0x52,0x4e,0x53,0x0,0x1,0x3,0x6,0x8,0x9,0x2,0xc,0x1e,0x33,0x41,0x46,0xd,0x31,0x9a,0xe3,0x5,0x24,0xb4,0x39,0xf4,0x44,0xa,0x47,0x45,0x3d,0xf8,0x2a,0xcd,0x11,0x3f,0xd3,0xfd,0x2b,0x85,0xa8,0x7,0x57,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x47,0x60,0xbd,0xc9,0x7b,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x1,0x7,0x49,0x44,0x41,0x54,0x38,0xcb,0xed,0xd4,0xd9,0x5a,0x82,0x40,0x14,0xc0,0xf1,0x23,0x9b,0xb,0x2e,0xb8,0x81,0x1b,0xa8,0x23,0x59,0xb1,0xa4,0x51,0x60,0x81,0x85,0x52,0xf8,0xfe,0x8f,0xd4,0x71,0x3a,0xcd,0xe7,0x57,0x17,0xbd,0x80,0xbf,0x99,0x73,0x71,0xfe,0xf7,0x33,0x0,0x50,0x91,0x64,0x45,0x45,0x8a,0x2c,0x55,0x0,0x69,0xd5,0x5a,0xbd,0xa1,0xa3,0x46,0xbd,0x56,0xd5,0x70,0x6f,0xb6,0xda,0x1d,0xc6,0x75,0xda,0xad,0xa6,0x6,0x46,0xb7,0xb7,0x72,0x6f,0x38,0x77,0xd5,0xeb,0x1a,0xa0,0xf4,0x7,0x6b,0xf7,0x96,0x73,0xd7,0x83,0xbe,0x2,0xea,0x90,0xdd,0x9,0x6c,0xa8,0x82,0x69,0xb1,0x7b,0xe4,0xe1,0xf5,0x3c,0x66,0x99,0xa0,0xea,0xcc,0xf3,0x3d,0x42,0x21,0x8,0x43,0x3f,0x8,0x3,0x3f,0x8,0x28,0x3c,0x8,0x14,0x36,0x68,0x8b,0x67,0xb3,0xa5,0xf0,0x88,0xa2,0x28,0xc2,0xa1,0xf0,0x24,0x50,0x78,0x16,0x28,0xc4,0x71,0x12,0xef,0x92,0x24,0x4e,0x76,0x14,0x5e,0x4,0xa,0xaf,0x2,0x85,0x34,0xcb,0xb2,0x14,0x65,0x29,0x85,0xfd,0xdb,0xd9,0x1e,0x51,0x78,0x17,0x28,0xe4,0x67,0x87,0x43,0x9e,0x1f,0x29,0x5c,0xe0,0xa1,0xf8,0x10,0x8a,0xef,0xf0,0x29,0x5c,0xc3,0x35,0xfc,0x17,0x4c,0xeb,0x77,0x18,0x5d,0x86,0x91,0x9,0xca,0x78,0x52,0xfe,0xec,0xe5,0x64,0xac,0x80,0x31,0x9d,0x9d,0xa8,0x94,0xa7,0xd9,0xd4,0x0,0xcd,0x76,0xe6,0x8b,0x82,0x5b,0xcc,0x1d,0x1b,0xdf,0xba,0x64,0x2f,0x1d,0xdd,0x42,0xba,0xb3,0xb4,0x25,0xfe,0x1b,0xc8,0xaa,0xc9,0xa9,0xb2,0x6,0x7f,0x7d,0x1,0x5d,0xdd,0xb5,0x61,0x26,0xcd,0x71,0x81,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char graph_port_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xa,0x0,0x0,0x0,0xa,0x8,0x6,0x0,0x0,0x0,0x8d,0x32,0xcf,0xbd,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x0,0x0,0x0,0x0,0x0,0xf9,0x43,0xbb,0x7f,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0xc,0x14,0x17,0x20,0x3,0xeb,0x8f,0x3a,0xdb,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x65,0x49,0x44,0x41,0x54,0x18,0xd3,0x4d,0xd0,0x4f,0x6b,0xda,0x70,0x1c,0x7,0xe0,0xcf,0x37,0x7f,0x7e,0x49,0x66,0xd2,0x64,0x61,0x5,0x61,0x76,0x47,0xf1,0xa4,0x2d,0xdb,0x75,0x5,0x11,0x84,0xb0,0x5e,0xeb,0xd9,0xeb,0xf4,0x6d,0xec,0x2d,0xf8,0x26,0xb6,0x77,0xe0,0x45,0xba,0xa3,0x6c,0xa0,0x3b,0xad,0x39,0xb6,0x36,0x8,0x1b,0x4b,0x32,0xd2,0xc6,0x6c,0x9a,0x4f,0x4f,0x85,0x3e,0x2f,0xe1,0x11,0x0,0x20,0x29,0xd3,0xe9,0xd4,0xda,0x6e,0xb7,0x23,0xdf,0xf7,0xbb,0x0,0x90,0xe7,0xf9,0x8f,0x66,0xb3,0xf9,0x79,0x36,0x9b,0x55,0x22,0x42,0x83,0xa4,0x44,0x51,0xf4,0xea,0xe2,0xe2,0xc3,0xf7,0xf1,0x78,0xdc,0xa,0x82,0x40,0x8,0x20,0xcf,0x32,0x2e,0x97,0xcb,0x4f,0x51,0x14,0xbd,0x25,0xf9,0x5b,0x26,0x93,0x89,0xdd,0xe9,0x74,0xe2,0xf7,0xe7,0xe7,0x27,0x59,0xfa,0x87,0x65,0xb9,0x13,0x0,0xb0,0x1d,0x9b,0xe1,0xcb,0x50,0xbe,0x5e,0x5d,0xdd,0xfe,0xbc,0xbe,0x6e,0x6b,0x49,0x92,0x8c,0x4e,0x7b,0xa7,0xad,0xbf,0x79,0x4e,0xd3,0x54,0x12,0x86,0x21,0xc2,0x30,0x84,0x32,0x95,0xe4,0x79,0xc6,0xde,0xd9,0x59,0x2b,0x49,0xee,0x46,0x86,0xeb,0xba,0x5d,0xfb,0x85,0x23,0x87,0xfd,0x1e,0xb6,0xed,0x40,0xd7,0x35,0x0,0x40,0x7d,0x38,0xa0,0xdc,0xed,0x44,0x37,0x74,0xb8,0xae,0xd7,0x35,0x48,0x62,0xff,0xff,0x1f,0xfc,0x20,0x80,0xae,0xe9,0x78,0x42,0x0,0xca,0xb2,0x90,0x65,0x19,0x58,0xd7,0xd0,0x8a,0xa2,0x58,0xa7,0x69,0x56,0x6b,0xa2,0x51,0x29,0x5,0xcb,0x52,0xb0,0x94,0x5,0x4b,0x29,0x88,0x8,0xd3,0x34,0xad,0x8b,0xfb,0x62,0xad,0xf,0x6,0x83,0xb8,0xaa,0xaa,0xb1,0xe7,0x79,0xbe,0x77,0x74,0x44,0xb7,0xe1,0x89,0x69,0x1a,0x28,0xcb,0x92,0x9b,0xcd,0x46,0x56,0xab,0xd5,0x86,0xe4,0x47,0x21,0x29,0xc3,0xe1,0xf0,0xb8,0xdf,0xef,0x7f,0x6b,0xb7,0xdb,0xaf,0x1b,0x8d,0x86,0x46,0x10,0xf,0xf7,0xf,0x75,0x1c,0xc7,0x77,0x8b,0xc5,0xe2,0xdd,0x7c,0x3e,0xff,0x25,0xcf,0xc3,0x6f,0x6e,0x6f,0x2e,0x1d,0xdb,0xe9,0x9,0x80,0xb2,0x2a,0xd7,0x27,0xad,0x37,0x5f,0x9e,0xc2,0x1f,0x1,0x3a,0xe6,0xa5,0x7b,0xef,0xf2,0xf3,0xcd,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xa,0x0,0x0,0x0,0xa,0x8,0x3,0x0,0x0,0x0,0xba,0xec,0x3f,0x8f,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0xc0,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0xff,0xff,0xff,0x6a,0x6a,0x6a,0x52,0x52,0x52,0x61,0x61,0x61,0x48,0x48,0x48,0x94,0x94,0x93,0xca,0xca,0xca,0x94,0x94,0x94,0x92,0x92,0x92,0xbf,0xbf,0xbe,0xbe,0xbf,0xbe,0x92,0x91,0x91,0x50,0x50,0x50,0xc2,0xc1,0xc2,0xc1,0xc1,0xc1,0xc1,0xc1,0xc0,0xc1,0xc2,0xc2,0x50,0x50,0x4f,0x5c,0x5c,0x5c,0x5b,0x5b,0x5b,0x5b,0x5a,0x5a,0x4f,0x4f,0x4f,0xb5,0xb5,0xb5,0xd7,0xd7,0xd7,0x4f,0x4f,0x4e,0x88,0x88,0x88,0xda,0xdb,0xdb,0xda,0xda,0xda,0x45,0x45,0x45,0x86,0x86,0x86,0xac,0xac,0xac,0x4c,0x4d,0x4c,0x55,0x55,0x55,0x56,0x55,0x55,0x4d,0x4e,0x4c,0xda,0xda,0xda,0xd9,0xda,0xda,0xcf,0xd0,0xd0,0xb6,0xb6,0xb6,0xd0,0xd0,0xd0,0xc4,0xc4,0xc4,0xc8,0xc8,0xc8,0xca,0xcb,0xcb,0xc7,0xc7,0xc7,0xcf,0xcf,0xd0,0xd2,0xd2,0xd2,0xd0,0xcf,0xcf,0xca,0xcb,0xca,0xc6,0xc6,0xc5,0xd5,0xd6,0xd5,0xd8,0xd8,0xd8,0xd7,0xd8,0xd8,0xd6,0xd6,0xd6,0xc6,0xc6,0xc6,0xde,0xde,0xde,0xdf,0xdf,0xde,0xdf,0xde,0xdf,0xbc,0xbc,0xbc,0xe8,0xe8,0xe9,0xe8,0xe8,0xe8,0xb7,0xb7,0xb7,0xb6,0xb7,0xb6,0x0,0x0,0x0,0xf5,0xba,0x5d,0x7a,0x0,0x0,0x0,0x24,0x74,0x52,0x4e,0x53,0x0,0x1,0x8,0x5e,0x8c,0x15,0xe2,0xfe,0xe2,0xe2,0xfe,0xfe,0xe2,0x5e,0xfe,0xfe,0xfe,0xfe,0x5e,0x8c,0x8c,0x8c,0x5d,0xfd,0xfe,0x5d,0xe2,0xfe,0xfe,0x16,0xe2,0xfd,0x5d,0x8c,0x8c,0x5d,0xce,0x80,0x8b,0x8f,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x0,0x88,0x5,0x1d,0x48,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x70,0x49,0x44,0x41,0x54,0x8,0xd7,0x15,0xcd,0xb,0x2,0x81,0x50,0x14,0x5,0xc0,0x73,0x6f,0x25,0x84,0x90,0x94,0xa8,0xa4,0x48,0x1f,0xa9,0x1e,0xa2,0x62,0xff,0xcb,0xc2,0x6,0x66,0x0,0x62,0x49,0x96,0x25,0x26,0x80,0x94,0x81,0x1a,0x1d,0xd5,0xa1,0x42,0xe0,0xd1,0x69,0x1c,0xc7,0xda,0x79,0xc2,0x98,0xce,0xf4,0x24,0x4d,0x93,0xf9,0x62,0x9,0x23,0xcb,0x2f,0x45,0x71,0xcd,0x4b,0x3,0xab,0xaa,0x16,0x42,0xdc,0xee,0xf,0x13,0x6b,0xcb,0x6e,0x9e,0xaf,0xc6,0xb6,0x36,0x60,0xa7,0xdd,0x76,0xfd,0xae,0x75,0x18,0xe4,0x7a,0xfe,0xfb,0xe3,0x7b,0xee,0x1f,0xe6,0x7d,0x70,0x8,0x7f,0xc5,0x17,0xe3,0x97,0xa,0x2b,0xff,0x1e,0x73,0x38,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char hseparator_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x8,0x6,0x0,0x0,0x0,0xc4,0xf,0xbe,0x8b,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xda,0x3,0x15,0x11,0x5,0xc,0x36,0x33,0x39,0xbd,0x0,0x0,0x0,0x24,0x49,0x44,0x41,0x54,0x18,0xd3,0x63,0x60,0x40,0x2,0xc5,0xb3,0x57,0x6d,0x66,0xc0,0x7,0xce,0xdd,0x79,0x88,0xa1,0x80,0x89,0x81,0x0,0x18,0x74,0xa,0x96,0xee,0x3f,0x89,0xa1,0x0,0x0,0x48,0xe6,0x7,0xe3,0x62,0xce,0xeb,0xba,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x2,0x3,0x0,0x0,0x0,0xb9,0x61,0x56,0x18,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0xc,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x73,0x9b,0xaa,0xce,0xdc,0xe1,0xff,0xff,0xff,0x64,0x6c,0x1,0xd2,0x0,0x0,0x0,0x3,0x74,0x52,0x4e,0x53,0x0,0xb3,0xb3,0x67,0xf6,0xdb,0x93,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x3,0x11,0xc,0x4c,0xf2,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x10,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x64,0x60,0x60,0xc2,0x40,0x8c,0xc,0x0,0x0,0xc7,0x0,0xf,0xf5,0x92,0x2f,0xa7,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char hslider_bg_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x16,0x2c,0x16,0x7f,0x48,0xec,0xab,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x47,0x49,0x44,0x41,0x54,0x38,0xcb,0xc5,0x92,0x31,0x8e,0x52,0x61,0x14,0x85,0xbf,0xff,0x5e,0x22,0xfc,0xbc,0x79,0x3a,0xcd,0xd3,0x4,0x42,0x62,0x61,0x78,0x15,0x95,0xcb,0x98,0xb8,0x0,0x13,0x66,0x1,0x66,0xda,0xd9,0x89,0xb1,0xb6,0x30,0xc1,0x5,0x18,0x97,0xe1,0x2,0x4,0xb,0xd,0x19,0xa,0x5f,0xcc,0x20,0x4f,0x78,0x23,0x70,0xff,0xdf,0x2,0xd0,0x40,0x43,0x22,0xc5,0x9c,0xe4,0x54,0xe7,0x7c,0xb7,0xb9,0x7,0xee,0x5b,0xe,0xe0,0xc5,0xc5,0xcb,0xff,0x82,0x3f,0x7c,0x7c,0x8f,0xdb,0xc2,0x35,0x20,0x3,0x72,0xa0,0x3,0x78,0x40,0xe,0xfa,0x1,0xa8,0x80,0x31,0xf0,0x19,0x28,0x80,0x75,0x6d,0xb,0x3f,0x2b,0xcb,0x9f,0x57,0xdf,0x8b,0x9b,0xcb,0x45,0x35,0x3f,0xb,0x21,0xaa,0x73,0xfb,0x74,0x8c,0x20,0xe2,0xac,0xe9,0x93,0x5f,0x8f,0xb3,0xf6,0xbb,0x34,0x7d,0xf4,0x6,0xf8,0xa2,0x79,0xb7,0xf7,0x64,0x56,0x4e,0xaf,0xbf,0x7e,0x1b,0xbd,0x5a,0xaf,0xd7,0x5e,0x44,0x45,0x55,0x10,0xd1,0x3d,0xab,0xa,0xce,0x89,0x2c,0x57,0xcb,0xc6,0xed,0xf4,0xc7,0x73,0xef,0x13,0xa9,0xd7,0x1b,0x9f,0x4,0xc8,0x8b,0x62,0xd2,0x77,0xce,0xa9,0xaa,0xa2,0xba,0x83,0xe4,0xc0,0x9b,0x4c,0x55,0x71,0xce,0x69,0x51,0x4c,0xfa,0x40,0x5e,0x3,0x3a,0x8b,0x6a,0x9e,0xee,0xa0,0x63,0x12,0x11,0x62,0x8c,0x2c,0xaa,0x79,0xa,0x74,0xe4,0xd4,0x37,0xa,0x30,0x6e,0xfa,0xa4,0xc,0x21,0x10,0x42,0x38,0xa,0xec,0x7a,0x4d,0x9f,0x94,0xc0,0x58,0x80,0x61,0x96,0xb5,0x6,0x31,0x46,0x33,0x33,0xcc,0x8c,0x10,0xec,0x6f,0xf1,0x9f,0x37,0x99,0x99,0x11,0x63,0xb4,0x2c,0x6b,0xd,0x80,0xa1,0xe6,0xdd,0x5e,0x55,0xaf,0x37,0x46,0xde,0x27,0xba,0x5a,0xde,0x75,0x97,0xab,0xdf,0xf,0xcc,0x82,0x8b,0x71,0xff,0x80,0x59,0x0,0x62,0x68,0xfa,0x64,0xd6,0x6e,0x3d,0x7d,0xfb,0x30,0x3d,0x7f,0xd,0x8c,0x4f,0x1e,0xd2,0xc9,0x53,0xbe,0x7f,0xfd,0x1,0xde,0x4b,0xa1,0x14,0xaf,0xc,0xa2,0x3a,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x4e,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x40,0x3e,0x4a,0x2a,0x29,0x2f,0x20,0x20,0x24,0x3f,0x3e,0x49,0x1f,0x1f,0x24,0x20,0x20,0x24,0x4d,0x4b,0x59,0x3f,0x3e,0x49,0x3f,0x3e,0x49,0x1e,0x1e,0x23,0x1f,0x1f,0x23,0x20,0x20,0x25,0x22,0x22,0x27,0x23,0x23,0x27,0x23,0x23,0x28,0x25,0x25,0x2a,0xff,0xff,0xff,0x5f,0xd6,0x94,0x4d,0x0,0x0,0x0,0x12,0x74,0x52,0x4e,0x53,0x0,0x0,0x4,0x19,0x40,0x5d,0x66,0x68,0x28,0x93,0xf0,0xfc,0x94,0xfc,0xfd,0x1a,0x96,0x95,0x6b,0xe2,0xd5,0x49,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x19,0xec,0x6e,0xb5,0x88,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x65,0x49,0x44,0x41,0x54,0x18,0xd3,0x85,0xce,0xdd,0xe,0x80,0x20,0x8,0x5,0x60,0x54,0xb4,0x22,0xb5,0x34,0x7f,0x7a,0xff,0x27,0x8d,0xad,0xd6,0x6a,0x5c,0xf8,0xdd,0xc1,0x6,0xe7,0x0,0x8c,0xa9,0x1f,0x9e,0xb5,0x41,0xeb,0x26,0xe6,0x2c,0x1a,0xad,0x40,0xcf,0xb,0xad,0xf9,0x60,0x79,0xa5,0x65,0xd6,0x60,0x7c,0x28,0xb5,0x75,0xd6,0x6a,0x9,0xde,0x0,0x52,0xe9,0xe7,0xa3,0x17,0x42,0xb0,0xb1,0x9e,0xaf,0x1a,0xad,0x5c,0x88,0x93,0x6d,0xff,0x3e,0xdd,0x37,0x8e,0x4d,0x14,0xef,0xd8,0x48,0x89,0x63,0x45,0x31,0x51,0x7d,0xe8,0x2,0xf5,0xf,0x9,0x67,0xd9,0x88,0x8f,0x5b,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char hslider_grabber_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x15,0x1a,0x26,0xd2,0xcb,0xf3,0x2b,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0xae,0x49,0x44,0x41,0x54,0x38,0xcb,0xa5,0x93,0x3f,0x8f,0x12,0x41,0x18,0xc6,0x7f,0x3b,0xbb,0xcb,0xc2,0x62,0xb2,0x85,0xc5,0xd1,0x10,0x8b,0xa5,0x93,0x5c,0x61,0xc9,0x77,0xb0,0xa2,0xb1,0xb1,0xdd,0xca,0x4f,0xe0,0xa7,0xb0,0x20,0x39,0x42,0x63,0x41,0x63,0x48,0xae,0x54,0x1a,0xb,0xa,0xb,0x8b,0x23,0x4,0xa3,0xd,0x39,0x42,0x22,0x24,0x86,0x9c,0xde,0xf1,0x3f,0xcc,0x32,0xbb,0x63,0xb3,0x87,0x66,0xef,0xc0,0x4b,0x7c,0xab,0xc9,0x33,0x33,0xbf,0xbc,0xef,0xf3,0xcc,0xc0,0x7f,0x96,0x71,0x8f,0x66,0x2,0x2e,0xe0,0x1,0xf9,0x44,0x5b,0x3,0x73,0x60,0x3,0x44,0xc7,0x0,0x26,0xf0,0x38,0x8,0x82,0x17,0xbe,0xef,0x57,0x3d,0xcf,0x3b,0x5,0x98,0xcf,0xe7,0x5f,0x86,0xc3,0xe1,0x79,0xa3,0xd1,0x78,0x7,0xfc,0xfa,0x1b,0x62,0xa6,0x0,0x8f,0x82,0x20,0x78,0x59,0x2e,0x97,0x5f,0x1b,0x86,0xf1,0x74,0xb5,0x5a,0x65,0xb7,0xdb,0x6d,0x36,0x93,0xc9,0x3c,0x29,0x14,0xa,0xcf,0x8a,0xc5,0xe2,0x4d,0xb7,0xdb,0xfd,0x6,0x84,0xb7,0x17,0x44,0xa,0xe0,0xf9,0xbe,0x5f,0x55,0x4a,0x9d,0x6c,0x36,0x1b,0x94,0x52,0x28,0xa5,0x48,0xd6,0x27,0xbe,0xef,0x57,0x93,0xd1,0x38,0x4,0xc8,0x7b,0x9e,0x77,0x2a,0xa5,0x44,0x6b,0xbd,0x17,0xb5,0xd6,0x48,0x29,0x49,0x46,0xca,0x1f,0x3,0x18,0x71,0x1c,0x1b,0x87,0x1c,0x8f,0xa2,0xc8,0x48,0xfb,0x96,0x6,0x84,0x52,0xca,0x2b,0xd3,0x34,0xef,0xc6,0x65,0x18,0x48,0x29,0xaf,0x1,0x75,0xc,0xb0,0x5e,0x2c,0x16,0x5f,0x6d,0xdb,0xbe,0x3,0xb0,0x6d,0x1b,0xad,0xf5,0x8f,0x24,0xca,0x83,0x80,0x65,0xbf,0xdf,0xff,0xe0,0x38,0x4e,0x24,0xc4,0x9f,0x2d,0x21,0x4,0xb9,0x5c,0x4e,0x77,0x3a,0x9d,0xb7,0xc0,0xe2,0x18,0x40,0xf6,0x7a,0xbd,0xb,0x29,0xe5,0xc4,0xb2,0xac,0xbd,0x68,0x59,0x16,0xbb,0xdd,0xee,0x7b,0xbb,0xdd,0xfe,0xf4,0xaf,0xe,0xe2,0xd1,0x68,0x34,0x9e,0x4e,0xa7,0x1f,0x5d,0xd7,0x45,0x8,0x81,0x10,0x2,0xd7,0x75,0x19,0x8f,0xc7,0xef,0x95,0x52,0x57,0x40,0x7c,0xc,0xa0,0x81,0x79,0xad,0x56,0x7b,0x13,0x45,0xd1,0xa5,0xe3,0x38,0x38,0x8e,0x43,0x1c,0xc7,0xc3,0x7a,0xbd,0x7e,0x96,0x6e,0xff,0xbe,0x97,0x8,0x10,0x87,0x61,0xb8,0x9e,0xcd,0x66,0x97,0x95,0x4a,0xe5,0x79,0x36,0x9b,0x8d,0x5b,0xad,0xd6,0xab,0xc1,0x60,0x70,0x1,0x6c,0x1f,0x2,0x0,0x50,0x93,0xc9,0xe4,0x67,0xa9,0x54,0xba,0x59,0x2e,0x97,0x9f,0x9b,0xcd,0xe6,0x39,0x30,0x7b,0xe8,0x6f,0xdc,0x7b,0x7,0x38,0xc9,0x99,0x6d,0x3a,0xff,0xdb,0xfa,0xd,0x29,0xd4,0xb4,0x4b,0x76,0xdc,0xe7,0x79,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x4,0x0,0x0,0x0,0xb5,0xfa,0x37,0xea,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x1,0x1d,0x49,0x44,0x41,0x54,0x28,0xcf,0x85,0xd1,0x3f,0x4b,0xc3,0x40,0x18,0xc7,0xf1,0xef,0x25,0xad,0x89,0xa9,0x70,0x83,0x43,0x5d,0xc4,0x21,0x6e,0x4a,0x7,0x47,0xdf,0x83,0x53,0x16,0x17,0xd7,0x4e,0xbe,0x2,0x5f,0x85,0x83,0xa0,0xb8,0x38,0xb8,0x88,0xd0,0x51,0x5d,0x1c,0x1c,0x1c,0x1c,0x2a,0xa2,0xe8,0x22,0x2d,0x82,0x2d,0x88,0x54,0xed,0x3f,0x1b,0x9a,0x78,0x49,0x1c,0x9a,0x54,0x4f,0x5,0x6f,0x3a,0xee,0xf9,0xf0,0x3c,0x3f,0x9e,0x83,0x7f,0x8e,0x18,0xdf,0x4c,0x1c,0x24,0x5,0x60,0x40,0x17,0x9f,0x48,0x7,0x26,0xd3,0xe5,0x55,0xd7,0x93,0x25,0xe8,0xde,0xd4,0x2b,0xbb,0x7,0xbc,0x8e,0x88,0x99,0x82,0xa9,0xf2,0xda,0xe2,0x86,0x58,0x78,0xb7,0x87,0xf6,0xc4,0xdc,0xcc,0xd2,0x6c,0xfb,0xf2,0x8e,0x10,0xc0,0x48,0x81,0x74,0x3d,0x55,0xf4,0x51,0x28,0x7c,0x54,0xd1,0xf5,0x90,0xa3,0x42,0x6,0xa,0xb2,0x14,0x90,0x0,0x90,0x10,0x20,0x4b,0x14,0x74,0x20,0x62,0xf1,0x3d,0x7b,0x24,0xb2,0x74,0x19,0x8,0x83,0x96,0x39,0x2e,0xb,0x82,0x37,0x94,0xe,0x6,0xbd,0xdb,0xfc,0x18,0xe4,0x49,0x9e,0xf0,0x75,0xd0,0xbf,0x3e,0xb6,0x22,0x23,0x7d,0x9a,0x4c,0xce,0xf6,0xe8,0xe9,0x20,0xb8,0xaa,0x6,0xcd,0x1c,0x0,0x39,0x3e,0x1e,0x4f,0xce,0x7f,0x76,0x88,0x1f,0x1a,0xcf,0xa7,0xe,0x6,0x6,0xe,0x8d,0x23,0xd5,0x22,0xd6,0x41,0x42,0x77,0x6b,0x33,0xaa,0x59,0x58,0xc4,0xf5,0x9d,0xed,0x6c,0xc0,0xd7,0x26,0x21,0xe,0x7,0x9d,0xda,0xf2,0x8a,0x1d,0x1f,0xae,0xdf,0x57,0x19,0xfe,0x6,0xa0,0x9a,0x2f,0xf3,0xed,0xfe,0xc5,0x7e,0x85,0xce,0x5f,0xbf,0x39,0xca,0x67,0x21,0x18,0x66,0x3b,0x0,0xf8,0x4,0x7e,0x5c,0x62,0x33,0x51,0xf0,0xbb,0xff,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char hslider_grabber_hl_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x15,0x17,0x2d,0xf0,0xb7,0x54,0xee,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0xcb,0x49,0x44,0x41,0x54,0x38,0xcb,0xa5,0x93,0xcd,0x4a,0x1b,0x51,0x1c,0xc5,0xcf,0x9d,0x3b,0x33,0x4e,0x3a,0x43,0x7,0x9b,0x16,0x93,0x82,0x14,0x8b,0x50,0xa8,0x61,0x28,0xf5,0x1,0xba,0xb5,0xb,0x41,0xc8,0x46,0x4,0xdf,0xa0,0x4f,0x50,0x70,0x95,0x95,0xb8,0x77,0x5b,0x10,0x84,0x6e,0xa2,0xab,0x4a,0x17,0x42,0x5a,0x74,0xe1,0xc2,0x82,0xa8,0xb5,0x14,0x12,0xa,0x2a,0xda,0xd4,0xc4,0x4c,0x32,0x33,0x72,0xe7,0xeb,0x5e,0x37,0x93,0x5a,0x26,0x31,0x16,0x3c,0xcb,0xc3,0xbd,0x3f,0xce,0xff,0xb,0xb8,0xa7,0x48,0x1f,0x8f,0x2,0x78,0x0,0xc0,0x4,0xa0,0x27,0x9e,0x7,0xa0,0xd,0xe0,0xa,0x40,0x3c,0x8,0x40,0x1,0x64,0xa7,0x4a,0xa5,0xd9,0x5c,0xc1,0x2a,0x2a,0x46,0xde,0x2,0x80,0xd0,0x3d,0xdf,0xff,0x7d,0xb8,0x5f,0xfe,0xbc,0xb0,0xf0,0x11,0x40,0xf3,0x5f,0x8,0x4d,0x1,0x8c,0xa9,0x52,0x69,0x3e,0xff,0xea,0xcd,0x7b,0xb7,0x6d,0x4e,0xd8,0x67,0xbe,0xe6,0x36,0x23,0x8d,0x13,0xf3,0x59,0x76,0x6c,0xf4,0x75,0xee,0xe5,0xf3,0x56,0xb5,0x52,0xf9,0xe,0x20,0xe8,0x7e,0x90,0x52,0x0,0x33,0x57,0xb0,0x8a,0x4e,0x4b,0x1d,0x71,0x1b,0xc,0x21,0x8b,0x11,0xb2,0x18,0x6e,0x83,0xc1,0x69,0xa9,0x23,0xb9,0x82,0x55,0x4c,0x4a,0xc3,0x6d,0x0,0x5d,0x31,0xf2,0x16,0xeb,0x4,0x10,0x5c,0xfc,0x35,0x5,0x17,0x60,0x9d,0x0,0x49,0x49,0xfa,0x20,0x0,0xe1,0x11,0x27,0x42,0xf4,0x76,0x56,0x70,0x80,0x47,0x31,0x49,0xf7,0x2d,0xd,0x8,0x78,0xe4,0x5e,0xc8,0x8a,0xd4,0x3,0x90,0x64,0x82,0x38,0xf0,0x2e,0x1,0x44,0x83,0x0,0x5e,0xe0,0xd4,0xf,0x55,0x5d,0xee,0x1,0xa8,0x19,0x19,0x94,0x6,0xe7,0xc9,0x28,0x6f,0x5,0x38,0xbf,0xb6,0xb6,0x37,0x32,0xf,0x95,0x58,0xa2,0x37,0x49,0x25,0x4a,0xa0,0xf,0xab,0xe2,0x60,0xbd,0xfc,0x1,0x40,0x67,0x10,0xc0,0xaf,0x7d,0xfd,0xb2,0x2b,0x11,0xfb,0x54,0xd1,0x6e,0x52,0x28,0x9a,0xc,0x99,0x76,0x8e,0xbf,0xad,0xac,0x6c,0xdf,0x95,0x80,0xd7,0x8f,0x7e,0x9c,0x78,0xf5,0xda,0xa6,0xf1,0x78,0x8,0x12,0x25,0x90,0x28,0x81,0xf1,0x44,0x83,0x7d,0x72,0xf4,0x29,0xe,0xc3,0xb,0x0,0xfc,0xae,0x55,0x56,0x34,0xd3,0x7c,0x31,0xb7,0xba,0xb6,0x6e,0xff,0xc9,0x8c,0xb,0x1,0x3c,0x7a,0xea,0xd7,0x56,0x67,0x67,0x66,0x58,0xbb,0xfd,0x13,0x40,0x98,0x5e,0xdd,0xb4,0x78,0xe4,0xfb,0xde,0xd5,0x65,0xbd,0x5a,0x98,0x7e,0x3b,0x6d,0x64,0x15,0xbe,0xb3,0xbc,0xf4,0xee,0x6c,0x6f,0x6f,0x17,0x0,0xeb,0x77,0x38,0xfd,0x14,0x35,0xab,0xb5,0xc6,0xe8,0xe4,0x44,0x2b,0x70,0x1a,0x3b,0x95,0xc5,0xc5,0x32,0x0,0xfb,0x7f,0xaf,0xb1,0x2b,0x19,0xc0,0x50,0xf2,0x86,0xa5,0xe7,0xdf,0xd5,0x35,0xea,0x59,0xb2,0xa3,0x9f,0xba,0x1f,0x74,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0xc6,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x48,0x83,0x83,0x60,0xaf,0xb1,0x65,0xbb,0xca,0x61,0xb3,0xc2,0x0,0x0,0x0,0x63,0xb7,0xc8,0x63,0xb7,0xc7,0x0,0x0,0x0,0x61,0xb3,0xbc,0x60,0xb1,0xbc,0x0,0x0,0x0,0x0,0x0,0x0,0x5b,0xa6,0xa5,0x63,0xb4,0xb6,0x0,0x0,0x0,0x0,0x0,0x0,0x3a,0x69,0x69,0x5e,0xb1,0xcd,0x5e,0xb0,0xcd,0x36,0x63,0x63,0x0,0x0,0x0,0x17,0x2a,0x29,0x60,0xb2,0xbd,0x62,0xb3,0xbf,0x3,0x5,0x5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x55,0x9b,0x9a,0x52,0x96,0x95,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0xf,0xf,0x62,0xb4,0xbd,0x63,0xb7,0xbf,0x0,0x0,0x0,0x27,0x48,0x47,0x68,0xc0,0xcf,0x68,0xc1,0xcf,0x2d,0x52,0x52,0x51,0x93,0x92,0x56,0x9d,0x9c,0x0,0x0,0x0,0x54,0xa2,0xc8,0x4c,0x94,0xc2,0x48,0x8e,0xc0,0x47,0x8c,0xbf,0x4b,0x93,0xc2,0x4b,0x92,0xc2,0x4f,0x98,0xc4,0x4d,0x96,0xc3,0x55,0xa3,0xc8,0x53,0x9f,0xc7,0x49,0x8f,0xc0,0x4e,0x97,0xc4,0x5a,0xab,0xcb,0x5a,0xac,0xcc,0x52,0x9e,0xc6,0x51,0x9d,0xc6,0xff,0xff,0xff,0x6b,0x1e,0xb5,0x61,0x0,0x0,0x0,0x31,0x74,0x52,0x4e,0x53,0x0,0x3,0xd,0x1c,0x27,0x16,0x6e,0xc1,0xef,0xe8,0x28,0xf0,0xf0,0x22,0xdb,0xde,0x24,0x17,0xaf,0xc5,0x1a,0xa,0x65,0xfc,0xfe,0x64,0xc,0x31,0xe0,0xe0,0x28,0x2,0x1,0x14,0x9c,0x95,0x13,0x5,0x2c,0xdb,0xdc,0xb,0x4f,0xf4,0xf7,0x55,0x73,0x7d,0x4,0x28,0xf1,0xfd,0xa1,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x41,0x89,0xde,0x6c,0x4e,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x0,0x9e,0x49,0x44,0x41,0x54,0x18,0xd3,0x6d,0xcf,0xd7,0x12,0x82,0x30,0x10,0x5,0x50,0x48,0x42,0x12,0xb0,0x77,0x8d,0xd,0xb,0x28,0x56,0x12,0x62,0xd,0x96,0xff,0xff,0x2a,0x61,0xc,0xe0,0x83,0xfb,0xb4,0xf7,0xcc,0xec,0xcc,0x5d,0xc3,0xf8,0x37,0x26,0x80,0x8,0x41,0x60,0xe6,0xd9,0xc2,0x84,0x52,0x82,0xad,0x4c,0x0,0xb6,0xb9,0x10,0xdc,0xc6,0x40,0x3,0x24,0x3c,0x92,0x32,0xe2,0x4,0x6a,0x40,0x54,0xc8,0x64,0x4,0x45,0x1a,0x9c,0xd2,0x29,0x85,0x73,0xd9,0xd1,0x50,0xa9,0x5e,0x52,0xb8,0xd6,0xea,0x1a,0x1a,0xcd,0x5b,0xa,0xf7,0x56,0x5b,0x43,0xa7,0xdb,0x53,0x52,0xaa,0xfe,0x80,0x65,0x3d,0x86,0xa3,0x58,0xca,0x78,0x3c,0x99,0x6a,0x70,0x67,0xf3,0x87,0x52,0xcf,0xc5,0x32,0xaf,0xee,0xf9,0xab,0xd7,0x7b,0xed,0x7b,0xc5,0x33,0xc1,0x66,0xbb,0xdb,0xb3,0x22,0x27,0x47,0x87,0xa3,0xe5,0xfe,0xfe,0x1b,0x6,0x2c,0xfc,0x6e,0x1f,0x93,0x2a,0x10,0x62,0x3,0x21,0x32,0x75,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char hslider_tick_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x31,0xb6,0xde,0xf3,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0xf,0x14,0x34,0x2e,0xcd,0x40,0x50,0x4c,0x0,0x0,0x0,0x65,0x49,0x44,0x41,0x54,0x18,0x95,0xbd,0x8f,0xb1,0x9,0x80,0x30,0x10,0x0,0x8f,0x44,0xb0,0x4a,0x61,0xa3,0x73,0x38,0x5e,0x76,0x70,0x80,0xc,0xe1,0x0,0x6e,0x21,0x36,0xc2,0xf7,0x16,0x62,0xa,0x41,0x78,0xc1,0x4a,0x1b,0xb5,0x50,0xb0,0xf4,0xca,0xab,0xee,0x2c,0x40,0x8,0xc1,0x1b,0x63,0x54,0x44,0x46,0x3,0xa0,0xaa,0x5c,0xbc,0x84,0x5,0x70,0xce,0x29,0x10,0x45,0x64,0x49,0x0,0xa6,0x34,0x6b,0xf9,0x15,0xb,0x50,0xd5,0xd,0xcb,0x6e,0x19,0xfa,0xee,0x2c,0x5d,0x1f,0xe9,0xc5,0x1a,0x7d,0xbe,0xcd,0xe5,0x2d,0x3e,0xe7,0xe,0xef,0x24,0x27,0x89,0xb7,0xa5,0x60,0x2,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x10,0x4,0x3,0x0,0x0,0x0,0xc3,0x98,0xc3,0xc0,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x1e,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x38,0x55,0x5f,0x8c,0xac,0xb8,0x81,0xa2,0xad,0x98,0x98,0x98,0x4e,0x4e,0x4e,0x8d,0x8d,0x8d,0x82,0x82,0x82,0x4e,0x4e,0x4e,0xff,0xff,0xff,0xc1,0xc9,0xb1,0x80,0x0,0x0,0x0,0x9,0x74,0x52,0x4e,0x53,0x0,0x0,0x0,0x0,0x79,0x31,0x79,0x79,0x1c,0x7e,0xed,0x4b,0xf4,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x9,0xf1,0xd9,0xa5,0xec,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x21,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x9,0x60,0x60,0xb,0x60,0x60,0xf,0x60,0x60,0x6d,0x60,0x60,0x14,0x60,0xc0,0x4,0x4c,0x2,0xc,0xcc,0x2,0xc,0x30,0x65,0x0,0x46,0x9d,0x2,0xbe,0x9f,0x3a,0x6c,0xab,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char hsplit_bg_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x8,0x6,0x0,0x0,0x0,0xc4,0xf,0xbe,0x8b,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x14,0xd,0x13,0x21,0x13,0xd5,0xb7,0xd9,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x15,0x49,0x44,0x41,0x54,0x18,0x95,0x63,0x54,0x57,0xd7,0xfc,0xcf,0x80,0x7,0x30,0xe1,0x93,0x1c,0x3e,0xa,0x0,0x86,0x1b,0x1,0x86,0x56,0xb4,0xba,0xe,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x1,0x3,0x0,0x0,0x0,0xfe,0xc1,0x2c,0xc8,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x6,0x50,0x4c,0x54,0x45,0x27,0x27,0x29,0xff,0xff,0xff,0x11,0xab,0xb9,0xf3,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x1,0xff,0x2,0x2d,0xde,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0xb,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x40,0x5,0x0,0x0,0x10,0x0,0x1,0xa1,0xc5,0x21,0xc1,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char hsplitter_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x40,0x8,0x6,0x0,0x0,0x0,0x27,0x4,0x36,0x8a,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0xf,0x14,0x34,0x17,0x92,0x45,0xd8,0x44,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x3c,0x49,0x44,0x41,0x54,0x48,0x89,0x63,0x60,0x20,0x6,0x2c,0x58,0xb0,0xe0,0x7f,0x6a,0x6a,0xea,0x7f,0x6c,0x7c,0x26,0x6,0x6,0x6,0x86,0xa3,0x47,0x8f,0x32,0x5c,0xbb,0x76,0xd,0xae,0x1,0x9d,0x4f,0x5,0x30,0xea,0x86,0x51,0x37,0x8c,0xba,0x61,0xd4,0xd,0xa3,0x6e,0x18,0x75,0xc3,0xa8,0x1b,0x6,0x8b,0x1b,0x0,0xa,0x48,0x3b,0xf0,0x67,0x1e,0xb,0x3a,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x40,0x8,0x0,0x0,0x0,0x0,0x2,0x6f,0x69,0x56,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x74,0x52,0x4e,0x53,0x0,0x0,0x76,0x93,0xcd,0x38,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x0,0x27,0x49,0x44,0x41,0x54,0x28,0xcf,0x63,0x60,0x80,0x2,0x66,0x86,0x5,0xa2,0xe7,0x18,0x16,0x88,0x9e,0x63,0x66,0x10,0xbd,0xf6,0x98,0x41,0xf4,0xda,0x63,0x6,0xc,0x30,0xaa,0x66,0x54,0xd,0x9a,0x1a,0x0,0x5c,0x29,0x6a,0x81,0x90,0x8f,0x52,0x12,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char icon_add_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x36,0x49,0x44,0x41,0x54,0x38,0x8d,0x63,0x60,0xa0,0x25,0x78,0xf0,0xe0,0xc1,0xff,0x7,0xf,0x1e,0xfc,0xc7,0xa7,0x86,0x89,0x52,0x4b,0x46,0xd,0x60,0x60,0x60,0x64,0x60,0x80,0x84,0x36,0x39,0x9a,0x15,0x14,0x14,0x18,0x29,0x76,0x1,0x5e,0x30,0x9a,0xe,0xe8,0x64,0x0,0xc5,0x0,0x0,0xc7,0x6e,0x12,0x94,0xf9,0x26,0x2e,0xdb,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x0,0x0,0x0,0x0,0x3a,0x98,0xa0,0xbd,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x74,0x52,0x4e,0x53,0x0,0x0,0x76,0x93,0xcd,0x38,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x0,0x21,0x49,0x44,0x41,0x54,0x18,0xd3,0x63,0x60,0xc0,0x1,0x1e,0x3c,0x80,0x32,0x98,0xd0,0x65,0xa8,0x21,0xc0,0xc8,0xf0,0x0,0x85,0xaf,0x80,0xa1,0x82,0x3e,0xee,0xc0,0x0,0x0,0x13,0x86,0x4,0x98,0x60,0x93,0x6c,0x5a,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xba,0x84,0x14,0xff,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xcb,0xd9,0xac,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char icon_close_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9b,0x49,0x44,0x41,0x54,0x38,0x8d,0xcd,0x92,0x31,0xe,0xc2,0x30,0x10,0x4,0x17,0xaa,0x3d,0x67,0xdb,0x58,0xd0,0xd3,0xf0,0xa3,0x7c,0x36,0x3c,0x82,0x48,0x44,0x22,0x6f,0xb1,0x4d,0x85,0x14,0x81,0xf,0x2c,0x28,0xe0,0xda,0xd5,0x8c,0x4e,0x77,0xb,0xfc,0xd5,0x98,0xd9,0x20,0x29,0x7a,0xb9,0xa4,0x68,0x66,0x83,0xb,0x93,0xcc,0x24,0xa7,0x9a,0x44,0x52,0x24,0x39,0x91,0xcc,0x55,0x89,0xa4,0xde,0xcc,0xce,0x24,0xb,0xc9,0x39,0x84,0xb0,0xf7,0xb2,0xae,0xeb,0x76,0xde,0x8a,0x4f,0x92,0x66,0xd8,0x91,0x5c,0x49,0x5e,0x9a,0xe1,0xb5,0x64,0x5,0x16,0x92,0x8b,0x7,0x6f,0x9b,0x8c,0x0,0x4a,0x29,0x9b,0x26,0x81,0xa4,0x3e,0xa5,0x34,0x2,0x38,0x2,0x58,0x0,0xcc,0x0,0xe,0x39,0xe7,0xd3,0xfa,0xb0,0xee,0xea,0x8f,0x7,0x7b,0xf5,0x9d,0xb7,0xb0,0x97,0x55,0x25,0x5f,0x17,0xe9,0x2e,0xf9,0xb8,0xca,0x3f,0x9b,0x1b,0x1a,0xe3,0x40,0x47,0xa0,0xda,0xda,0x61,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x4,0x0,0x0,0x0,0xb5,0xfa,0x37,0xea,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x6c,0x49,0x44,0x41,0x54,0x28,0xcf,0xad,0x90,0xd1,0xa,0x80,0x20,0xc,0x45,0xad,0xa7,0x6b,0xee,0x35,0xb1,0x3f,0xf3,0xbb,0x13,0xc,0xea,0x5f,0x5c,0xf,0x42,0x4d,0x1c,0x14,0xd4,0xde,0xc6,0x39,0xd3,0xdd,0x19,0xf3,0x53,0xd9,0x48,0x5e,0xf6,0xe4,0x6d,0x6c,0x30,0xa,0xd2,0xad,0x90,0x47,0x42,0x11,0xa,0xcd,0x76,0x5,0x63,0x9b,0x16,0xd9,0xb9,0x20,0x9f,0xbc,0x14,0x15,0xb,0x65,0x47,0x56,0x71,0x55,0x90,0xc1,0x60,0x1c,0x12,0x8f,0x5a,0x26,0x1e,0xd4,0x79,0xf9,0x45,0x5d,0x57,0x59,0xd2,0x85,0x36,0x51,0x87,0xfb,0xd0,0xef,0xe,0xf5,0x78,0xea,0x4f,0x75,0x2,0x30,0x98,0x34,0x72,0xa,0x11,0xfb,0xc2,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xba,0x84,0x14,0xff,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xcb,0xd9,0xac,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char icon_color_pick_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x1,0x55,0x49,0x44,0x41,0x54,0x38,0x8d,0xb5,0x92,0xb1,0x4a,0x3,0x41,0x14,0x45,0xef,0xdb,0x6c,0xac,0xf2,0x1,0xda,0xcd,0x40,0x4,0x25,0x11,0x4,0x8b,0x80,0x8d,0x20,0x88,0x5d,0x20,0x88,0x90,0x22,0x9d,0x9d,0xa0,0x85,0x58,0xeb,0x7,0x88,0xe0,0x7,0x58,0x8b,0x36,0x5a,0x88,0xa0,0xa5,0x85,0xa5,0x60,0x61,0xb0,0x70,0xb2,0xef,0x8d,0x44,0x41,0x21,0x1f,0x20,0x6c,0xf2,0x2c,0xcc,0xc2,0x12,0x92,0x8d,0x45,0xbc,0xe5,0xdc,0xb9,0x67,0xee,0xbc,0x19,0xe0,0xbf,0xe5,0xbd,0x2f,0x35,0x9b,0xcd,0x29,0x0,0x10,0x91,0x9a,0x88,0x7c,0x88,0xc8,0xa7,0x88,0xd4,0x0,0x80,0xb2,0xc2,0xcc,0x5c,0x21,0xa2,0x5b,0x22,0xba,0xef,0x76,0xbb,0x97,0x44,0x74,0x4a,0x44,0x61,0xdf,0xfe,0x32,0xc6,0x4c,0x87,0x59,0x0,0x0,0xdf,0x0,0x62,0x55,0xad,0x6,0x41,0x50,0x1d,0xf0,0x62,0x0,0x8,0xb2,0xd2,0xd6,0xda,0x27,0x0,0x27,0x83,0xeb,0xaa,0x1a,0x3,0xd8,0x19,0xb,0x60,0xe6,0x3a,0x80,0x6d,0x0,0xd,0x0,0x9d,0x14,0x60,0xcb,0x18,0x73,0x95,0x9,0x60,0xe6,0x3a,0x11,0x1d,0xc7,0x71,0xbc,0x6e,0x8c,0x39,0x53,0xd5,0xdd,0xc4,0xcb,0xe5,0x72,0x1b,0xc9,0x60,0x87,0x2,0xd2,0xe1,0x62,0xb1,0xf8,0xec,0xbd,0x2f,0x11,0xd1,0x51,0xaf,0xd7,0x3b,0x0,0xd0,0x51,0xd5,0x95,0x42,0xa1,0x30,0x3b,0xf2,0x64,0x11,0x79,0x77,0xce,0x95,0x81,0xdf,0x67,0x14,0x91,0x76,0xff,0x3a,0x60,0xe6,0x45,0x66,0xae,0xc,0xd,0x47,0x51,0xb4,0x29,0x22,0xed,0x56,0xab,0xb5,0xd0,0xdf,0x3c,0xe7,0xbd,0x7f,0x8b,0xa2,0xa8,0x31,0x7a,0x52,0x93,0x8,0x8b,0xc8,0x72,0xba,0xb6,0x73,0xae,0x9c,0xae,0x9d,0xa5,0x0,0x0,0x88,0x68,0xd,0xc0,0x8b,0xaa,0xbe,0x3a,0xe7,0xca,0x61,0x18,0xde,0xa9,0xea,0xbe,0xb5,0xf6,0x7c,0x1c,0x20,0xf9,0x89,0x4b,0x0,0x56,0xf3,0xf9,0xfc,0xd,0x80,0x79,0x55,0xdd,0xb3,0xd6,0x5e,0x8c,0xad,0x9e,0x0,0x54,0x75,0x86,0x88,0xae,0x1,0x3c,0x2,0x38,0x34,0xc6,0x3c,0xfc,0x25,0x3c,0x11,0xfd,0x0,0x28,0x54,0xbb,0xfe,0xad,0x99,0xe5,0xb8,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x4,0x0,0x0,0x0,0xb5,0xfa,0x37,0xea,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0xe0,0x49,0x44,0x41,0x54,0x28,0xcf,0x95,0x91,0xbf,0x6a,0xc2,0x60,0x14,0xc5,0xcf,0x17,0x82,0xcf,0xd0,0xad,0x75,0x13,0x12,0xa1,0x5b,0xc0,0xdd,0x35,0xe0,0x50,0xfc,0x43,0xfb,0x8,0x6e,0x8e,0x3e,0x44,0x1f,0xa0,0xf,0xd0,0xa9,0x88,0x53,0x85,0x3a,0x38,0x74,0x12,0xc1,0x45,0x1c,0x8c,0xf9,0xce,0x27,0x89,0xa0,0x19,0x3a,0x17,0xe2,0x17,0x87,0xb4,0x60,0x9a,0x48,0xc9,0x99,0xee,0xe5,0x7,0xe7,0x5e,0xce,0x1,0xca,0x4a,0x59,0xab,0xa,0xc0,0x16,0xf7,0x3c,0xb0,0x5,0x88,0x2c,0x96,0x8e,0x78,0x17,0xb3,0xd3,0x9b,0x78,0x11,0x26,0x80,0xe3,0xdd,0x8d,0xf9,0xc7,0xe0,0x1b,0x71,0xe2,0x1a,0xee,0xcf,0x16,0x3,0x46,0x96,0x57,0x97,0x78,0xfe,0x9d,0x93,0x18,0xfd,0xdc,0x7,0xb2,0xc3,0x90,0x3d,0x46,0xd4,0xd4,0xfe,0x53,0x21,0xf6,0x6c,0x40,0x76,0xa9,0xa9,0xd5,0x68,0x55,0x29,0xc4,0xca,0x62,0xe0,0xf,0x19,0xf1,0x4b,0x59,0x57,0xb0,0xec,0x0,0xf2,0x5e,0x3a,0x17,0xd8,0x7f,0x60,0xb0,0xad,0x3,0xb2,0xa6,0x76,0xfe,0x63,0xee,0xf6,0x3f,0x98,0x8d,0xd4,0xdc,0xb3,0x53,0xf3,0xac,0xc,0x40,0x34,0xb1,0x4e,0x36,0x9e,0x6d,0x4e,0x92,0x41,0xf5,0xb5,0x28,0xfd,0x31,0x35,0x3f,0x18,0xca,0x76,0x51,0x37,0x2,0xe0,0x5c,0xec,0xb1,0xc0,0xf4,0xf6,0xb3,0x74,0xb3,0x0,0x70,0x6,0x95,0x2,0x6f,0xae,0x29,0xa4,0x96,0x25,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x34,0x39,0x2b,0x30,0x32,0x3a,0x30,0x30,0xe3,0xb6,0x51,0xb2,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x34,0x39,0x2b,0x30,0x32,0x3a,0x30,0x30,0x92,0xeb,0xe9,0xe,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char icon_folder_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x5f,0x49,0x44,0x41,0x54,0x38,0x8d,0xed,0x8f,0xc1,0xd,0x80,0x30,0x8,0x45,0x9f,0x9d,0x84,0x39,0x4c,0x3b,0xbd,0x75,0x8f,0x32,0x9,0x5e,0xec,0xa5,0x9,0xa4,0xc6,0x26,0x5e,0x7c,0x17,0xe,0xc0,0xe3,0x3,0x5f,0xb3,0x1,0xb4,0xd6,0x4e,0x60,0x77,0x66,0xaa,0x88,0x14,0x4f,0x90,0xee,0xea,0x2d,0x3,0xe4,0x28,0x41,0x8a,0x9a,0x1d,0x55,0x75,0x25,0xfd,0x5,0x9b,0x11,0xd,0x54,0x11,0x29,0x53,0x9,0x1c,0x32,0x4c,0xbe,0x10,0xf1,0xb,0x16,0xa,0xea,0xd3,0x45,0x33,0x3b,0xde,0x1e,0x5f,0xc3,0x5,0x1f,0xc5,0x12,0x2c,0xc5,0x88,0xe1,0xb4,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x4,0x0,0x0,0x0,0xb5,0xfa,0x37,0xea,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x40,0x49,0x44,0x41,0x54,0x28,0xcf,0x63,0x60,0xa0,0x14,0x30,0x32,0x30,0x3c,0x38,0xca,0x60,0x85,0x24,0x72,0x44,0xc1,0x16,0x5d,0xc1,0x7f,0x54,0x3d,0xa,0x8c,0xc8,0x3c,0x26,0x4c,0x43,0x1f,0xda,0x10,0x30,0x1,0xd5,0x3a,0x26,0x6,0x7c,0xc0,0x6,0xab,0x15,0xa8,0x60,0xc8,0x28,0x38,0x82,0x4b,0xf2,0xff,0x61,0x42,0xda,0x89,0x1,0x0,0x7c,0x5,0xb,0xf5,0x5d,0xb6,0xe9,0xbb,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x34,0x39,0x2b,0x30,0x32,0x3a,0x30,0x30,0xe3,0xb6,0x51,0xb2,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x34,0x39,0x2b,0x30,0x32,0x3a,0x30,0x30,0x92,0xeb,0xe9,0xe,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char icon_play_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0xa2,0x49,0x44,0x41,0x54,0x38,0x8d,0x63,0x60,0x18,0xf2,0x80,0x11,0x99,0xf3,0xe0,0xc1,0x83,0xc3,0xc,0xc,0xc,0xc2,0xc,0xc,0xc,0xa5,0xa,0xa,0xa,0x5b,0xc9,0x31,0xe0,0x3f,0x5c,0x82,0x91,0x71,0x27,0x3,0x3,0x43,0x91,0xbc,0xbc,0xfc,0x35,0x7c,0x6,0x30,0xe1,0x92,0xf8,0xff,0xff,0xbf,0xfb,0xff,0xff,0xff,0x2f,0x3e,0x78,0xf0,0x60,0xca,0x93,0x27,0x4f,0x84,0x49,0x76,0x1,0x1a,0xf8,0xc0,0xc8,0xc8,0xd8,0xf1,0xeb,0xd7,0xaf,0x9,0xaa,0xaa,0xaa,0x3f,0x89,0x72,0x1,0x1a,0x10,0xf8,0xff,0xff,0x7f,0x7,0x2b,0x2b,0xeb,0x1e,0x74,0x9,0x62,0xd,0xc0,0x9,0x88,0x35,0xe0,0x3d,0x23,0x23,0x63,0xc5,0xef,0xdf,0xbf,0x5d,0xd0,0x25,0x58,0x8,0x68,0xfc,0xc3,0xc0,0xc0,0x30,0x93,0x85,0x85,0xa5,0x5e,0x46,0x46,0xe6,0x2d,0x36,0x5,0x38,0xd,0x20,0x36,0x1a,0xd1,0xd,0x38,0xc2,0x0,0x4d,0x48,0xf2,0xf2,0xf2,0x44,0x25,0xa4,0x61,0x0,0x0,0x1e,0x57,0x33,0x3c,0xcc,0xe7,0x34,0x69,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x4,0x0,0x0,0x0,0xb5,0xfa,0x37,0xea,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x6b,0x49,0x44,0x41,0x54,0x28,0xcf,0x63,0x60,0xa0,0x17,0x78,0x70,0xf8,0xc1,0xb5,0x7,0xde,0xf8,0x14,0xfc,0x7f,0xf0,0xff,0xc1,0xff,0x87,0x3b,0x1e,0x6a,0xa1,0xcb,0x30,0x21,0x73,0xfe,0xbb,0xff,0xbf,0xf8,0x60,0xca,0x13,0x61,0x64,0x31,0x46,0x98,0x9,0x48,0x62,0x1f,0x18,0x3b,0x7e,0x4d,0x50,0xfd,0x89,0x5b,0x1,0x3,0x3,0x3,0xc3,0x11,0x5,0x5b,0x2c,0x56,0x60,0x3,0xd8,0x14,0xbc,0x67,0xac,0xf8,0xed,0x2,0xe3,0xb0,0xa0,0x49,0xfe,0x61,0x98,0xc9,0x52,0x2f,0xf3,0x16,0x21,0x80,0xa2,0x80,0x71,0x27,0x43,0x91,0xfc,0x35,0xf2,0x2,0x8a,0x96,0x0,0x0,0xbc,0x2d,0x27,0xc4,0x79,0x12,0x82,0x82,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xba,0x84,0x14,0xff,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xcb,0xd9,0xac,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char icon_reload_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x1,0x59,0x49,0x44,0x41,0x54,0x38,0x8d,0xcd,0x92,0x31,0x4b,0x3,0x31,0x18,0x86,0x9f,0x5c,0xe,0xec,0x20,0x76,0x70,0x39,0xd0,0xe3,0xba,0x74,0x51,0x41,0xdd,0xfc,0x7,0xba,0xb8,0x8,0x52,0xec,0x2e,0x4e,0x3a,0x88,0x3f,0xa3,0xa3,0x53,0x7,0x47,0x67,0x41,0x17,0xdd,0x9c,0x5c,0x3b,0xd8,0x82,0x64,0x68,0xca,0xd5,0x55,0x11,0x3c,0x1a,0x87,0x24,0x2e,0xd7,0x72,0x9e,0x9e,0xab,0xbe,0xd3,0xc7,0x1b,0x9e,0x37,0xf9,0xbe,0x7c,0xf0,0xd7,0x12,0x3f,0x99,0x4a,0xa9,0xb9,0x30,0xc,0x8f,0x84,0x10,0x7,0xc0,0x5a,0x6e,0x3f,0x3a,0xe7,0x2e,0xad,0xb5,0xdd,0x66,0xb3,0xf9,0x51,0x19,0x90,0xa6,0xe9,0x92,0xb5,0xf6,0x6,0x58,0xaf,0xb8,0xb4,0x27,0xa5,0xdc,0x8d,0xe3,0xf8,0x19,0x20,0x28,0xdf,0x5c,0x80,0x53,0x60,0xdf,0x18,0x53,0x37,0xc6,0xd4,0xbd,0xf7,0x7b,0xc0,0x13,0xb0,0x61,0xad,0xbd,0x56,0x4a,0xcd,0x1,0x84,0xc5,0x80,0x30,0xc,0x8f,0xa6,0xb0,0x94,0x72,0x33,0x8e,0xe3,0x97,0xc2,0xf1,0xd5,0x68,0x34,0xba,0xf7,0xde,0xf7,0x80,0xd,0x29,0xe5,0x21,0x70,0xfe,0xe5,0x5,0x42,0x88,0x76,0x5e,0x9e,0x96,0x60,0x0,0x92,0x24,0x79,0x75,0xce,0x9d,0x1,0x4,0x41,0xd0,0xfe,0xd6,0x2,0xb0,0x2,0x60,0x8c,0xb9,0xab,0xe8,0x1f,0x6b,0xed,0x6d,0x5e,0xae,0xce,0x2,0xb4,0xd6,0x17,0x5a,0x6b,0x7,0xcc,0x3,0xd4,0x6a,0xb5,0x37,0xad,0xf5,0xc5,0x4f,0x1,0x41,0x10,0x7c,0x19,0x7c,0x90,0x3,0xc7,0xc0,0xa0,0xe0,0xf,0x72,0xef,0x9b,0x84,0x10,0xdb,0x79,0xd9,0x9f,0x5,0x44,0x51,0x94,0x9,0x21,0x5a,0x40,0x6,0x64,0x42,0x88,0x56,0x14,0x45,0x59,0x19,0x1e,0x8f,0xc7,0x8b,0x52,0xca,0xe,0x80,0x73,0xee,0x12,0xa,0xbf,0x90,0x24,0x49,0x7f,0x38,0x1c,0x1e,0x3,0x34,0x1a,0x8d,0x7e,0x11,0x54,0x4a,0x2d,0x48,0x29,0x77,0xac,0xb5,0x1d,0xef,0xfd,0x32,0xd0,0x9b,0x4c,0x26,0x5d,0xa8,0xd8,0xc4,0xb2,0xf2,0xf9,0x4c,0x55,0xbd,0x48,0xbf,0xe8,0x1d,0x78,0x70,0xce,0x9d,0x64,0x59,0xb6,0x35,0x85,0xff,0x87,0x3e,0x1,0x53,0x7,0x87,0x11,0xd3,0x3a,0x9b,0x9e,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x4,0x0,0x0,0x0,0xb5,0xfa,0x37,0xea,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0xe8,0x49,0x44,0x41,0x54,0x28,0xcf,0xa5,0x91,0x31,0x4e,0x2,0x51,0x10,0x86,0x3f,0x16,0x22,0x5b,0x10,0x88,0x5a,0x1a,0x4a,0x1b,0xd7,0x4,0x4a,0x6e,0x60,0x65,0xa3,0xc1,0xc4,0x8e,0x8e,0x46,0x38,0x90,0x5,0xa5,0x17,0x90,0x46,0xf,0x80,0x56,0x84,0x2,0x48,0xc,0xc9,0xee,0x3c,0x56,0xe,0x60,0xd0,0x64,0x2d,0xde,0x40,0xe3,0xbe,0xdd,0x4d,0xec,0x98,0x6a,0x26,0xf3,0x4d,0xe6,0x9f,0x7f,0xe0,0xd0,0x28,0x65,0xe9,0xaa,0x5a,0xe9,0x97,0xee,0xb9,0x4,0xe6,0xfa,0x64,0x1f,0xcf,0x7f,0xb,0x40,0x7c,0x66,0xc7,0xb4,0x72,0xa3,0xb3,0xf2,0x75,0x73,0x3,0x5e,0x3a,0x6d,0xc7,0xb4,0x88,0xe9,0x26,0x8d,0xa4,0xb1,0xbb,0xe1,0x83,0xb6,0x7d,0x5e,0x55,0x1d,0x1e,0xd,0x45,0xc5,0xc4,0x27,0x69,0x6d,0x8e,0xc5,0x88,0x86,0xf,0xe,0x90,0x77,0x51,0xb9,0xcd,0x8b,0xb,0xbb,0xa2,0x32,0x71,0x2b,0xb8,0x80,0xe4,0x35,0xf,0xd8,0x17,0x20,0x0,0xf,0x64,0x24,0x4a,0xd,0xfc,0x2f,0x19,0x65,0x80,0xf7,0x27,0xdf,0x3,0x7f,0xc0,0x12,0x80,0xa5,0x3f,0xc8,0xdd,0x7f,0x5,0x2c,0x52,0x49,0x81,0x6c,0x65,0x6b,0x82,0xac,0xfd,0x79,0x6a,0xd6,0x5,0x91,0x51,0x2f,0xea,0x39,0xc3,0xea,0xe1,0x9d,0x59,0x8b,0xca,0x74,0x71,0x54,0x70,0xd2,0x5d,0xa4,0xff,0x18,0x55,0x88,0x6f,0xde,0x74,0xf8,0xd3,0x69,0x6e,0xe,0x7e,0x24,0x0,0x7b,0x27,0x64,0x59,0x3b,0x41,0xb6,0x9a,0xe,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xba,0x84,0x14,0xff,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xcb,0xd9,0xac,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char icon_stop_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0xf,0x14,0x33,0x24,0x62,0xd4,0x2f,0x95,0x0,0x0,0x0,0x39,0x49,0x44,0x41,0x54,0x38,0x8d,0x63,0x60,0xa0,0x6,0xf8,0xf0,0xe1,0x3,0x33,0xb9,0x7a,0x18,0x61,0x2,0xf,0x1f,0x3e,0xfc,0x4f,0x8a,0x1,0xf2,0xf2,0xf2,0x8c,0xc,0xc,0xc,0xc,0x4c,0xa4,0xda,0x8c,0xe,0x46,0xd,0x18,0x35,0x60,0x70,0x18,0xc0,0xc0,0xc0,0x40,0x59,0x66,0xa2,0x18,0x0,0x0,0x2a,0xc7,0xf,0x64,0xd5,0xe,0x11,0x85,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x4,0x0,0x0,0x0,0xb5,0xfa,0x37,0xea,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x0,0x2b,0x49,0x44,0x41,0x54,0x28,0xcf,0x63,0x60,0x20,0xc,0x3e,0x30,0xe3,0x93,0x61,0x64,0x60,0x60,0x60,0x78,0xf8,0x1f,0xbb,0x2,0x79,0x46,0x6,0x6,0x26,0x42,0xe6,0x8f,0x2a,0xa0,0x96,0x2,0x6,0x42,0x91,0x45,0x10,0x0,0x0,0x95,0x31,0x5,0xe4,0xe,0x1,0x8e,0x3,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char icon_zoom_less_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x25,0x49,0x44,0x41,0x54,0x38,0x8d,0x63,0x60,0x18,0x5,0xc3,0x0,0x30,0x32,0x30,0x30,0x30,0x3c,0x78,0xf0,0xe0,0x3f,0x39,0x9a,0x15,0x14,0x14,0x18,0x99,0xa8,0xeb,0x9e,0x51,0x30,0x44,0x1,0x0,0xff,0xa9,0x4,0x4,0x4a,0xae,0x20,0xfa,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x0,0x0,0x0,0x0,0x3a,0x98,0xa0,0xbd,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x74,0x52,0x4e,0x53,0x0,0x0,0x76,0x93,0xcd,0x38,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x17,0x49,0x44,0x41,0x54,0x18,0xd3,0x63,0x60,0x18,0x10,0xc0,0xc8,0xf0,0x0,0x85,0xaf,0xc0,0x34,0x30,0xee,0xc0,0x0,0x0,0x97,0xf9,0x1,0x4,0xea,0x8f,0x4a,0x96,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x34,0x39,0x2b,0x30,0x32,0x3a,0x30,0x30,0xe3,0xb6,0x51,0xb2,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x34,0x39,0x2b,0x30,0x32,0x3a,0x30,0x30,0x92,0xeb,0xe9,0xe,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char icon_zoom_more_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x36,0x49,0x44,0x41,0x54,0x38,0x8d,0x63,0x60,0xa0,0x25,0x78,0xf0,0xe0,0xc1,0xff,0x7,0xf,0x1e,0xfc,0xc7,0xa7,0x86,0x89,0x52,0x4b,0x46,0xd,0x60,0x60,0x60,0x64,0x60,0x80,0x84,0x36,0x39,0x9a,0x15,0x14,0x14,0x18,0x29,0x76,0x1,0x5e,0x30,0x9a,0xe,0xe8,0x64,0x0,0xc5,0x0,0x0,0xc7,0x6e,0x12,0x94,0xf9,0x26,0x2e,0xdb,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x0,0x0,0x0,0x0,0x3a,0x98,0xa0,0xbd,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x74,0x52,0x4e,0x53,0x0,0x0,0x76,0x93,0xcd,0x38,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x21,0x49,0x44,0x41,0x54,0x18,0xd3,0x63,0x60,0xc0,0x1,0x1e,0x3c,0x80,0x32,0x98,0xd0,0x65,0xa8,0x21,0xc0,0xc8,0xf0,0x0,0x85,0xaf,0x80,0xa1,0x82,0x3e,0xee,0xc0,0x0,0x0,0x13,0x86,0x4,0x98,0x60,0x93,0x6c,0x5a,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xba,0x84,0x14,0xff,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xcb,0xd9,0xac,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char icon_zoom_reset_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x6f,0x49,0x44,0x41,0x54,0x38,0x8d,0xdd,0x91,0xbb,0xd,0x80,0x30,0x10,0x43,0x1f,0x11,0x23,0x20,0xea,0x4c,0xc5,0x62,0x48,0xec,0xc0,0x56,0x97,0x26,0x43,0xa4,0x31,0x15,0x12,0x45,0x72,0x8a,0x14,0xa,0x84,0xab,0xfb,0x58,0x3e,0xeb,0xc,0x83,0x98,0xee,0x22,0xa5,0xb4,0x49,0x3a,0x1,0x62,0x8c,0x53,0x8d,0x5c,0xe3,0x4,0x80,0x9c,0xf3,0x22,0x69,0xf7,0x2e,0xb5,0x38,0x1,0xa0,0x94,0x72,0x0,0xab,0x27,0xd0,0xc3,0xc1,0xcc,0x64,0x66,0x6a,0xf5,0xb5,0x59,0x70,0x15,0x3b,0x30,0x7b,0xcb,0xd6,0x33,0x9f,0x18,0x76,0xf0,0x71,0x81,0x5a,0xa,0xaf,0x3b,0xf8,0x41,0xa,0xc3,0xb8,0x0,0x6c,0x9c,0x3f,0xb8,0x84,0xfc,0x5b,0x85,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x4,0x0,0x0,0x0,0xb5,0xfa,0x37,0xea,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x4e,0x49,0x44,0x41,0x54,0x28,0xcf,0x63,0x60,0x20,0x6,0x3c,0xc,0x7b,0xf0,0xff,0xc1,0x7f,0xec,0x22,0x8c,0xc,0xc,0xcf,0x44,0x7e,0x5d,0x65,0x10,0x63,0x60,0x50,0x60,0x84,0x49,0x23,0x8b,0x30,0x31,0x30,0xfc,0x9a,0xc6,0x20,0x86,0x6a,0x22,0xa6,0x8,0x3,0xcc,0x40,0x84,0x55,0x30,0x16,0x13,0x21,0xf7,0xb1,0xa0,0x72,0x11,0xee,0x80,0x1,0x82,0x26,0x50,0x5d,0x1,0x7a,0x80,0xd,0xe,0x5f,0x10,0x4,0x0,0xfc,0xc5,0x22,0x8c,0x12,0xab,0xcb,0x61,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xba,0x84,0x14,0xff,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xcb,0xd9,0xac,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char line_edit_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xa,0x0,0x0,0x0,0xa,0x8,0x6,0x0,0x0,0x0,0x8d,0x32,0xcf,0xbd,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xa,0x14,0x3,0x1d,0x2f,0xec,0x8c,0x33,0x2f,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x9d,0x49,0x44,0x41,0x54,0x18,0xd3,0xb5,0x90,0x31,0xe,0xc2,0x40,0x10,0x3,0xed,0xbb,0xd5,0x25,0xa1,0xa1,0x3,0x9,0x41,0xc1,0x33,0x78,0x15,0x5f,0xc8,0x93,0x41,0x14,0x49,0x2e,0xbb,0xb7,0x29,0x2,0x52,0x20,0x14,0x34,0x58,0x72,0x63,0x4f,0x61,0x99,0xfb,0xdd,0xe1,0x9a,0x52,0xd5,0xc6,0x10,0x6b,0x92,0x58,0xca,0xdd,0x61,0xc5,0xfa,0x9c,0x87,0x96,0xa7,0xe3,0xf9,0x56,0xa5,0x7a,0x2b,0x22,0x0,0xde,0x41,0xc0,0xa1,0xaa,0x18,0x72,0x7f,0x97,0x18,0x62,0x23,0x22,0x88,0x22,0xe0,0x7,0xe8,0x70,0x0,0x80,0x6a,0x6c,0x2,0xc9,0x2,0x70,0x5,0x1,0x78,0x66,0x4,0xc9,0x12,0xf0,0xa3,0xfe,0x0,0xba,0x7b,0x98,0x67,0xfb,0xaa,0x9c,0x33,0x87,0xbb,0x7,0xb1,0x62,0x9d,0xaa,0xa6,0xd7,0xfc,0x6f,0xf7,0x58,0xb1,0x3e,0x36,0xf5,0xa6,0x3,0x70,0x29,0x66,0x30,0x53,0x5d,0x5a,0x75,0xd4,0x51,0xc7,0x47,0xce,0x43,0x3b,0x1,0xc,0x2e,0x55,0x5d,0x5f,0x72,0xb6,0x33,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xa,0x0,0x0,0x0,0xa,0x4,0x3,0x0,0x0,0x0,0x7f,0x1c,0xd2,0x8e,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2a,0x50,0x4c,0x54,0x45,0x17,0x16,0x1a,0x1d,0x1c,0x21,0x20,0x1e,0x24,0x21,0x1f,0x25,0x1d,0x1c,0x21,0x20,0x1e,0x24,0x1d,0x1c,0x21,0x1d,0x1c,0x21,0x24,0x22,0x29,0x28,0x26,0x2d,0x28,0x26,0x2e,0x2b,0x2a,0x31,0x2c,0x2a,0x32,0xff,0xff,0xff,0xb9,0x11,0x56,0x3e,0x0,0x0,0x0,0x8,0x74,0x52,0x4e,0x53,0x6f,0xef,0xf7,0xf7,0xf0,0xf9,0xf1,0xee,0xcf,0x21,0xd2,0xdf,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0xd,0xf6,0xb4,0x61,0xf5,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x0,0x2d,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x54,0x36,0x36,0x12,0x60,0xf0,0x98,0xb5,0x6a,0x65,0xb,0x43,0xe4,0x9e,0x33,0xa7,0xa7,0x32,0x58,0x9d,0x39,0x73,0x66,0x31,0x16,0x12,0x22,0xb,0x52,0xd9,0xc6,0xc0,0x2,0xd4,0x55,0x0,0x0,0xc,0x14,0x1a,0x90,0x55,0x1a,0xec,0xdb,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char line_edit_disabled_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xa,0x0,0x0,0x0,0xa,0x8,0x6,0x0,0x0,0x0,0x8d,0x32,0xcf,0xbd,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xa,0x14,0x3,0x1e,0x2,0x82,0x7e,0x3c,0x99,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x8e,0x49,0x44,0x41,0x54,0x18,0xd3,0xb5,0x90,0x31,0xe,0xc2,0x40,0xc,0x4,0x77,0xcf,0xd6,0x85,0xab,0x68,0x53,0xe5,0x1f,0xbc,0x8a,0x2f,0xe4,0xc9,0x20,0x8a,0x24,0x17,0xfb,0x4c,0x3,0x8,0x85,0x20,0xd1,0x30,0xd2,0x36,0xd6,0x14,0xbb,0x66,0xdf,0xf7,0xe7,0x9c,0xf3,0x28,0x22,0x7,0x92,0x78,0x27,0x22,0xe0,0xee,0x73,0xad,0x75,0xe4,0x30,0xc,0x97,0xae,0xeb,0x8e,0xaa,0x8a,0x3d,0xd1,0xcc,0xb0,0x2c,0xcb,0x55,0x45,0xa4,0xa8,0x2a,0xbe,0x89,0x0,0x60,0x66,0x25,0x91,0x6c,0x24,0x3f,0x24,0x0,0x78,0xde,0x49,0xb6,0x84,0x1f,0xf9,0x83,0x18,0x11,0x29,0x22,0x5e,0xc5,0xb7,0x63,0x1e,0x49,0xea,0xee,0x93,0x99,0xe5,0x67,0xf9,0xbd,0xf7,0xb8,0xfb,0x2c,0xa5,0x94,0x9,0xc0,0xa9,0xb5,0x6,0x77,0xb7,0x2d,0xeb,0xba,0xde,0x6a,0xad,0xe3,0x1d,0xd3,0x60,0x61,0x55,0x29,0xdd,0xd9,0x71,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xa,0x0,0x0,0x0,0xa,0x8,0x4,0x0,0x0,0x0,0x27,0x3b,0x7,0x36,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x64,0x49,0x44,0x41,0x54,0x8,0xd7,0x95,0xce,0x31,0x12,0x2,0x21,0x10,0x44,0xd1,0x3f,0x40,0xa1,0x44,0xa6,0x46,0xde,0x63,0x4f,0xe5,0x15,0x38,0xb2,0xd6,0x6,0xb0,0xc8,0x30,0x6,0x96,0xac,0x56,0x99,0xf8,0xb3,0x7e,0x51,0xcb,0xf9,0x1a,0xb3,0x3f,0xa,0xaf,0xc,0xad,0x2d,0xcb,0xe5,0x76,0x38,0x5,0x76,0xec,0x6c,0xf7,0xe0,0x53,0xe0,0x13,0xa1,0x27,0x27,0x43,0x26,0x81,0x20,0xc8,0x70,0xfc,0xe8,0xf,0x34,0x67,0xd8,0x9c,0x86,0x61,0x2e,0x68,0xe9,0x91,0xaf,0x4b,0x5a,0x7d,0x2a,0x2c,0x3,0xed,0xef,0x1e,0x6b,0xcb,0x4f,0xa6,0x66,0x2b,0x25,0x6,0x1,0x37,0x40,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char line_edit_focus_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdb,0xb,0x4,0x12,0x24,0x23,0x0,0xb2,0x7,0xc0,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0xf6,0x49,0x44,0x41,0x54,0x38,0xcb,0x9d,0x93,0xcb,0x4d,0x6,0x31,0xc,0x84,0xbf,0x91,0x10,0x2d,0xec,0x4a,0x5b,0x0,0x12,0x5,0x40,0x7,0xdc,0x11,0x15,0x40,0x1b,0x9c,0x69,0x80,0x2,0xe8,0x0,0x51,0x7,0x5,0x70,0xa0,0x7,0x2a,0x40,0xc4,0xf3,0x1f,0xfe,0x3c,0x57,0xe1,0xb2,0x39,0xe4,0xe1,0xd8,0xe3,0xf1,0x38,0xd1,0xb6,0xac,0x37,0xc0,0x27,0xc7,0xc6,0xad,0xb6,0x65,0xf5,0xfb,0xfd,0xef,0xa1,0xe8,0x87,0x8f,0x4b,0x2e,0xca,0xe1,0xea,0xe5,0xb,0x10,0x94,0x59,0x80,0xc1,0xd5,0x6a,0xdc,0x6e,0xf9,0x7e,0xbe,0x6,0x68,0x0,0x11,0x51,0x62,0xa6,0xeb,0x38,0x9a,0xa5,0x2,0x38,0x22,0x67,0x60,0x58,0x7b,0x0,0xe3,0x9e,0xe3,0x8,0x90,0x52,0x42,0xda,0x67,0xf1,0x0,0xb8,0xdf,0xef,0x18,0x24,0x2c,0x75,0x2e,0x1a,0xa3,0xd4,0x1d,0x3c,0x61,0x10,0x11,0x83,0x7a,0xca,0x7e,0x95,0x7e,0x80,0x4,0xf6,0x3f,0xc,0x22,0x52,0x8e,0x17,0x18,0x42,0x20,0x1b,0x5b,0x2d,0x61,0x64,0x6e,0x9a,0x1,0xf8,0xdc,0x85,0xaa,0xdc,0x44,0xc4,0x52,0x59,0xc4,0x4c,0x83,0x14,0xb5,0xd3,0xbd,0xb7,0x71,0xce,0x28,0x6c,0xa3,0x6c,0x9b,0x94,0xf0,0xd7,0x72,0x89,0xb3,0x6,0x13,0xe5,0xbd,0xe3,0xd4,0x1,0x78,0x20,0xad,0x8c,0xe0,0x8c,0x56,0x44,0xc5,0x63,0x49,0x63,0x1b,0x33,0xe9,0x32,0xf7,0xa,0xc4,0xf0,0xa0,0x26,0x0,0x3f,0xaf,0x77,0x87,0x3e,0x94,0xb6,0x65,0x7d,0x4,0xde,0xe,0x7e,0xe7,0xa7,0x13,0xa1,0xb6,0x74,0x1b,0x5b,0x1c,0x12,0x80,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0xab,0x50,0x4c,0x54,0x45,0x1b,0x17,0x18,0x1b,0x17,0x18,0x1b,0x17,0x18,0xc8,0x68,0x12,0xef,0xed,0xe7,0xef,0xed,0xe8,0xf0,0xed,0xe8,0xf0,0xee,0xe8,0xf0,0xed,0xe7,0xed,0xeb,0xe5,0xee,0xeb,0xe5,0xee,0xeb,0xe6,0xec,0xe9,0xe3,0xeb,0xe9,0xe3,0xeb,0xe9,0xe2,0xec,0xe9,0xe2,0xe9,0xe6,0xe0,0xea,0xe7,0xe0,0xea,0xe7,0xe1,0xe8,0xe4,0xdd,0xe8,0xe5,0xde,0xe8,0xe5,0xdd,0xe8,0xe4,0xde,0xe6,0xe2,0xdb,0xe6,0xe3,0xdb,0xe6,0xe3,0xdc,0xe7,0xe2,0xdb,0xe7,0xe3,0xdb,0xe4,0xe0,0xd8,0xe5,0xe0,0xd8,0xe5,0xe1,0xd9,0xe5,0xe0,0xd9,0xe4,0xe1,0xd9,0xe5,0xe1,0xd8,0xe4,0xe0,0xd9,0xe2,0xdf,0xd6,0xe3,0xdf,0xd6,0xe3,0xde,0xd6,0xe2,0xde,0xd6,0xe1,0xdc,0xd4,0xe1,0xdc,0xd3,0xe0,0xdc,0xd3,0xe1,0xdd,0xd3,0xe1,0xdd,0xd4,0xdf,0xda,0xd0,0xdf,0xda,0xd1,0xdf,0xdb,0xd1,0xe0,0xda,0xd1,0xdd,0xd8,0xcf,0xdd,0xd8,0xce,0xde,0xd9,0xce,0xde,0xd8,0xce,0xdd,0xd9,0xce,0xdc,0xd6,0xcc,0xdb,0xd6,0xcc,0xdc,0xd6,0xcb,0xff,0xff,0xff,0x73,0x72,0x65,0x6f,0x0,0x0,0x0,0x2,0x74,0x52,0x4e,0x53,0x36,0x61,0xc5,0x3a,0xd,0x83,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x38,0xa0,0x7,0xa5,0xd6,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x9e,0x49,0x44,0x41,0x54,0x18,0xd3,0x5d,0xcf,0xdb,0x16,0x82,0x20,0x10,0x85,0x61,0xb4,0xb4,0x13,0x1d,0x28,0x14,0xcb,0x4a,0x33,0xf,0x59,0x52,0x98,0x62,0xef,0xff,0x66,0xd1,0xf6,0xca,0xfe,0x19,0xd6,0x62,0x7d,0x77,0x43,0x88,0x3d,0x88,0x10,0x7b,0x34,0xc8,0x36,0x30,0x76,0x1c,0x77,0xe2,0x3a,0xee,0xd4,0x7c,0x0,0xb3,0x79,0x3f,0xa6,0x5,0x80,0xa2,0x25,0xa5,0xab,0x35,0x5,0x6c,0x18,0x63,0x5b,0xd6,0x7,0xd8,0x71,0xcf,0xe3,0x9c,0xfb,0x9c,0x7b,0x3e,0x40,0x4,0xfb,0xe0,0x10,0x84,0xa1,0x8,0x85,0x0,0x1c,0x4f,0xe7,0x28,0xbe,0x44,0x71,0x9c,0x24,0x67,0xc0,0x35,0x4d,0xb3,0x2c,0xcb,0xcd,0x4b,0x73,0x40,0x71,0x33,0x15,0xe5,0xfd,0x51,0x16,0x25,0xa0,0x92,0xf2,0xf9,0x92,0xbf,0x2a,0x9,0x50,0xaa,0x56,0xef,0x46,0xb5,0x4d,0x5b,0x37,0x0,0xdd,0x7d,0xb4,0x36,0xdb,0x69,0xad,0x1,0x7f,0xc7,0x59,0xc3,0xf3,0xad,0x2f,0x30,0x4f,0x11,0x50,0x3e,0x12,0x48,0xdb,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char logo_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x80,0x8,0x6,0x0,0x0,0x0,0xc3,0x3e,0x61,0xcb,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0x2e,0x23,0x0,0x0,0x2e,0x23,0x1,0x78,0xa5,0x3f,0x76,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdc,0x9,0x7,0x13,0x2,0x0,0x15,0xb9,0x53,0x97,0x0,0x0,0x1f,0x7c,0x49,0x44,0x41,0x54,0x78,0xda,0xed,0x7d,0x79,0x9c,0x54,0xd5,0x99,0xf6,0xf3,0xbc,0xb7,0xaa,0xbb,0x5,0x11,0x97,0x4,0xc1,0x25,0x86,0x38,0x31,0xa0,0x20,0x20,0xa2,0x51,0x51,0xc4,0x25,0x46,0x1d,0x41,0x23,0xa0,0xa2,0x60,0xdc,0x31,0x46,0x8d,0x5f,0xe2,0x97,0x4c,0x32,0x99,0x4c,0x66,0x32,0xfe,0xf2,0x25,0x99,0x4,0x25,0x20,0xe2,0x8a,0x40,0x5c,0x48,0x34,0x2a,0x2e,0x51,0xe3,0x86,0x92,0x44,0xb6,0xb0,0x9b,0x68,0x8c,0x26,0xa8,0x51,0x14,0xd,0x6b,0x77,0x57,0xdd,0xf3,0x7c,0x7f,0xdc,0x7b,0xab,0x6e,0x55,0x57,0x55,0x57,0x75,0x57,0x41,0x77,0xdb,0x87,0xdf,0xa5,0xab,0xea,0xee,0xe7,0xbc,0xe7,0x5d,0x9e,0xf3,0x2e,0x40,0x77,0xeb,0x6e,0xdd,0xad,0xbb,0x75,0xb7,0xee,0xd6,0xdd,0xba,0x5b,0x77,0xeb,0x6e,0xdd,0xed,0xe3,0xd5,0xd8,0xdd,0x5,0xc0,0xe7,0xbe,0x34,0x6d,0x37,0xb8,0xe6,0x5b,0x9d,0x73,0x7d,0x0,0x6e,0xa1,0xd9,0x46,0xa3,0xbd,0xb,0xf2,0x6d,0xc1,0xfe,0x4e,0xda,0xdf,0xcc,0xf3,0xd6,0xaf,0xbd,0x7f,0xca,0x3b,0x5d,0xed,0xdd,0x13,0xdd,0xc3,0xf,0xc8,0xa5,0xbf,0xe3,0xd2,0xcd,0xe3,0x33,0x13,0xc2,0xc1,0xf9,0xb4,0x6d,0x0,0xb6,0x0,0xdc,0xc,0x62,0xb3,0xdf,0xcc,0x2d,0x7,0x8d,0xfd,0xdf,0x6d,0x34,0xdb,0x48,0x7a,0x8b,0xe9,0x25,0x9f,0x5e,0x37,0xff,0xca,0xd5,0xdd,0x1c,0xa0,0x93,0xb7,0x81,0x13,0x66,0xf5,0x48,0x37,0x7e,0xf4,0xaa,0x9c,0xdb,0x87,0xcc,0xed,0x12,0x49,0x2d,0x3b,0x8c,0x4,0xc0,0xd,0x34,0xef,0x8f,0x5e,0xb2,0xe1,0x92,0x75,0xbf,0xbc,0xea,0xef,0xdd,0x4,0xb0,0x83,0xda,0x80,0x71,0x33,0x46,0x3b,0xbf,0xf9,0x54,0x48,0xbb,0xd0,0xec,0xa3,0x3f,0x3d,0x70,0xed,0x77,0xdb,0x73,0xbd,0x11,0xd7,0x2e,0xe2,0xa6,0xf5,0xcb,0x4e,0x55,0x6a,0xdb,0xaf,0x24,0x35,0x40,0x52,0x38,0xc2,0xc8,0xf9,0xc,0x28,0xec,0xab,0xf0,0xaf,0x20,0xc1,0x25,0x1b,0x7a,0x8d,0xdd,0x6d,0xff,0xe1,0x8f,0xfe,0xe1,0x67,0x9f,0x57,0x37,0x1,0xd4,0x4a,0x3e,0x9f,0x3d,0xfd,0xd3,0x90,0x7f,0x92,0xe4,0x3e,0x27,0x3f,0x3d,0xa,0xf2,0x47,0x84,0x53,0xb1,0xc9,0x12,0xd,0x53,0xfe,0xf4,0xc0,0x35,0x77,0xb5,0xe7,0xfa,0x7,0x8d,0xfd,0xe9,0x73,0x72,0xa9,0x91,0x20,0xbd,0x98,0x50,0x28,0xdd,0x35,0x12,0x0,0x36,0x7a,0xc9,0x86,0xef,0xfb,0xa9,0xed,0x3f,0x7a,0xf5,0x91,0x6f,0xba,0x6e,0x1d,0xa0,0xfa,0xb3,0xfd,0x50,0xc8,0x3f,0x42,0x7e,0xf3,0x17,0x9c,0x9f,0x3a,0x15,0xc0,0xae,0xc1,0xc0,0x4,0x6c,0x58,0x52,0xbd,0x4b,0x35,0xfe,0x64,0xc0,0xb8,0xe9,0xaf,0xbd,0xf2,0xcb,0xab,0x5e,0x6c,0xd3,0x3d,0xc6,0xdf,0xbc,0x9f,0xdf,0xb8,0x69,0x14,0xa2,0x69,0x9d,0x19,0xf5,0xd2,0xf3,0x22,0x9c,0xee,0x9e,0xe4,0xe,0x65,0x27,0x17,0xa2,0x1d,0x8e,0x0,0x6,0x9c,0x3d,0x63,0x30,0xe0,0x8f,0x74,0xe9,0xa6,0x33,0xe5,0xa7,0x4e,0x8e,0x46,0x23,0x94,0xbd,0x39,0xac,0x58,0xd0,0x5e,0x2e,0xd5,0xf4,0xe3,0x81,0xe3,0x67,0x8e,0x59,0x37,0x7f,0xca,0x86,0xca,0x34,0xff,0x9b,0x92,0x70,0xfe,0x58,0x80,0x3e,0x8,0xf,0xa8,0x70,0x28,0x49,0x4f,0xce,0x3f,0xc4,0x6b,0xd8,0x9d,0xdd,0x4,0x50,0xd,0x65,0x6c,0xfc,0xcd,0xfb,0x3,0x1a,0xe9,0x52,0x4d,0x17,0x3b,0x97,0x3e,0x29,0xec,0xe4,0xcc,0xcc,0x54,0xf4,0x35,0x64,0x2,0x20,0x44,0x10,0x92,0xff,0x79,0xb9,0xd4,0x37,0x6,0x8c,0x9b,0xfe,0xbd,0x57,0x7e,0x79,0x55,0x63,0xb9,0xf7,0xb3,0x44,0xbd,0x73,0xa9,0x6d,0xe7,0xd1,0x2c,0x94,0xe9,0x71,0x91,0x8f,0xc2,0xd2,0x40,0x80,0x24,0xd1,0x48,0x8,0x26,0xb9,0x3,0x2c,0xd1,0xd0,0x4d,0x0,0x55,0x32,0xc5,0xbe,0xe5,0xd2,0x4d,0x5f,0xc9,0xce,0xf6,0x70,0xe0,0x25,0x32,0x20,0x84,0xc,0x77,0x96,0x24,0xd2,0xa2,0x9f,0x9c,0x9f,0x6a,0xfc,0xbf,0x5e,0x5d,0xcf,0xc5,0x7,0x8d,0xfd,0xf1,0x3,0x7f,0x7e,0xe8,0xfa,0x82,0xf2,0xf8,0x90,0x89,0x77,0x27,0xfc,0xe6,0xad,0x7b,0x90,0xd6,0xb,0x70,0x49,0xc8,0xf5,0x95,0xf3,0x3f,0xf,0xc0,0x0,0x82,0x84,0xa,0x72,0x1,0xe6,0x7e,0x26,0x49,0x5,0xe6,0x1,0x21,0xed,0xda,0xd9,0xd,0xa9,0xe,0x43,0x0,0x2e,0x9d,0x3a,0x3b,0x9c,0x6d,0xd1,0x9c,0x8b,0xb1,0xfe,0x16,0xa6,0x58,0x4c,0x23,0xf,0x6,0xd0,0xa5,0x1b,0x7f,0xea,0xd5,0xf5,0x7a,0x73,0xe0,0xf8,0x9b,0xd7,0x82,0xb6,0x37,0x80,0xdd,0x9,0x24,0x41,0x50,0xce,0xd5,0xfb,0xcd,0x9b,0x3f,0x5,0xb9,0x21,0xbe,0xef,0xf7,0x27,0xb0,0x17,0xa4,0xfd,0x1,0x78,0xd9,0xb9,0x5d,0xbe,0x8,0x60,0xf8,0xbf,0x48,0xe7,0xd2,0xdb,0xdb,0x6d,0x1,0xc,0x3c,0xe7,0xb6,0x1e,0xeb,0xee,0xbb,0x74,0xdb,0xc7,0x9a,0x0,0x68,0xde,0xab,0x72,0xfa,0x64,0x30,0xa0,0x45,0xd4,0x70,0x66,0x35,0xb0,0x70,0x6,0x2a,0x43,0x24,0x72,0xfb,0x3b,0xbf,0xf9,0xff,0x90,0xb6,0xda,0xb9,0xa6,0x13,0x10,0xcc,0xee,0x1e,0x39,0x6a,0x5b,0x8e,0x12,0x97,0xd1,0x29,0x5a,0x6a,0x7d,0x6c,0x71,0x4a,0xf6,0x77,0x27,0x81,0x46,0x30,0x38,0xdb,0x6f,0xda,0xdc,0x2e,0x2,0x38,0xf8,0x9c,0x59,0xfd,0x9d,0xdf,0x7c,0xda,0xc0,0xf1,0x33,0x5f,0x58,0x37,0x7f,0xca,0xaa,0x8f,0xad,0x19,0x38,0x70,0xfc,0x8c,0x1f,0xb8,0x54,0xd3,0x57,0x25,0xd7,0x3b,0x3e,0xeb,0x8b,0x8d,0x83,0xf2,0xcd,0x32,0xd2,0x1,0x30,0xc4,0xc1,0x1b,0x32,0xda,0x97,0x67,0xd7,0x4b,0x50,0xc0,0xf7,0xb,0xd8,0xfc,0x71,0x91,0x5f,0xf0,0x7e,0xcc,0x82,0x44,0x69,0xaf,0x7e,0xd7,0xa3,0x24,0xf7,0xb6,0x79,0x75,0x9b,0xd7,0xde,0x7b,0xc9,0xe6,0xb2,0x7,0xfe,0xdc,0xdb,0x7b,0xc0,0xf9,0x9f,0x4a,0xa7,0xb6,0x2e,0x80,0x74,0x20,0x80,0xf7,0x2c,0xd9,0xe3,0x1c,0x33,0x6f,0xd1,0xda,0xfb,0x2e,0x6b,0xfe,0xd8,0x11,0xc0,0x80,0xf1,0x33,0x4f,0x53,0x6a,0xfb,0x2c,0x40,0xfb,0x86,0x63,0x22,0xb2,0x6c,0xb6,0x1c,0xe9,0xb,0x20,0xb3,0xb3,0x3a,0xf6,0xbd,0xea,0xef,0xa9,0x2c,0x4c,0x48,0x9a,0xf7,0x17,0x7a,0xc9,0xf9,0x66,0x89,0x3b,0x1,0xbc,0x95,0x6e,0xda,0xb2,0xfd,0xcf,0xf,0x7d,0xdd,0x15,0x27,0xf6,0x99,0x7b,0x4b,0xfe,0x64,0x97,0x6a,0xfa,0x51,0x74,0xb5,0x50,0xb7,0x80,0x25,0x1b,0xfe,0xcd,0xcc,0xbb,0x6d,0xed,0xfd,0x53,0xde,0xff,0x78,0x71,0x80,0x73,0x6e,0xfd,0x8c,0x6b,0xde,0xfa,0x94,0xe4,0x3e,0x3,0x21,0xd2,0xb4,0xcb,0x7b,0x5a,0xb5,0xb2,0xaf,0x5a,0x6f,0xaa,0xec,0xe0,0xd3,0xa,0x22,0x86,0xa0,0x25,0x1e,0xa4,0x57,0x77,0x23,0xbd,0xe4,0xb2,0x5e,0x7d,0xf,0xde,0x92,0x8f,0x12,0xe,0x9c,0x70,0xcb,0x41,0x2e,0xdd,0x34,0x13,0xf2,0x47,0x3,0x70,0xa1,0xc8,0xb,0x2e,0x3,0x8,0x24,0xcd,0xab,0xbb,0x5,0x96,0xf8,0xe1,0xba,0xfb,0xaf,0x78,0xa3,0xd6,0xfd,0x6e,0x1d,0x85,0x0,0xd6,0xdd,0x77,0xd9,0xeb,0xa4,0x35,0x5,0xaa,0x76,0x8c,0x85,0x93,0x31,0x95,0xb0,0xa8,0x4d,0x5e,0x9a,0xc4,0x59,0xc5,0xe9,0x42,0x20,0x3b,0xf8,0x50,0xf6,0x6,0x81,0x35,0xe9,0xfc,0xf4,0x59,0x7e,0xf3,0xb6,0xe7,0x5c,0xf3,0xd6,0x17,0x36,0xbd,0xb5,0xe2,0xf4,0x3c,0x79,0x7f,0xa2,0xdf,0xbc,0x6d,0x9d,0x9c,0x3f,0x3a,0x38,0x37,0xec,0x7f,0x41,0x4,0x43,0x42,0xa2,0x73,0x7e,0xf3,0x15,0x2e,0xdd,0x3c,0x67,0xe0,0x84,0x59,0xc7,0x7c,0x6c,0x38,0x40,0x0,0x2,0xfd,0xfc,0x5,0xe7,0xa7,0x8e,0x2d,0xa6,0xfd,0x77,0xbc,0x16,0x89,0x81,0xec,0xc3,0x86,0x92,0x41,0x64,0x64,0x5a,0x78,0x4b,0x2d,0x59,0xff,0x3d,0x2,0xbd,0xd3,0xcd,0xdb,0xe6,0x5,0xf4,0xdd,0x42,0x2c,0xe5,0xf0,0xa9,0xc8,0xcc,0xa4,0xd9,0x9b,0xf4,0x1a,0xfe,0xed,0x95,0xf9,0x57,0xdc,0x53,0xab,0x37,0xf0,0x3a,0x52,0x77,0x7e,0x72,0xd0,0x98,0x4,0xa0,0xe1,0x4,0x7a,0x15,0x47,0x66,0x3a,0x52,0x8b,0x58,0x54,0x76,0xf4,0x19,0xb4,0x80,0x84,0x5,0x89,0xe8,0x2b,0x97,0x1e,0x2f,0xe7,0x9f,0x49,0xca,0x63,0x56,0x8d,0x8c,0xb1,0xba,0xc,0x1b,0x51,0x44,0x4d,0x21,0x6,0xb6,0x3b,0x9c,0x7f,0xfc,0xde,0x87,0x9e,0xd5,0xbc,0x61,0xcd,0x82,0xdf,0x77,0x69,0x11,0x10,0x3c,0x8d,0xb7,0x10,0xc0,0x87,0xc1,0x67,0x63,0x56,0x4,0x74,0x92,0xcd,0x2c,0x30,0xe,0x23,0xc2,0xa5,0x81,0xa4,0x91,0xac,0x3,0x54,0x7,0x98,0x82,0xd,0x4,0x4c,0x5,0xae,0x11,0x10,0x81,0x59,0xb8,0xdf,0x0,0x68,0xaf,0x74,0xaa,0xf1,0x9b,0x3,0xc6,0xcf,0xfc,0x5a,0x97,0xe6,0x0,0x3,0x27,0xcc,0x1a,0x1f,0x28,0x47,0x1a,0x10,0x61,0x3d,0x31,0xe9,0xda,0x79,0x36,0x22,0x33,0xff,0x33,0x9f,0x81,0x90,0x33,0x20,0xdc,0x88,0xd8,0xbe,0xbc,0xf3,0xc9,0xd8,0x75,0x22,0x8e,0xb0,0x2b,0xe5,0x6,0xf7,0x19,0x7c,0xa6,0xb7,0x61,0xcd,0x82,0x45,0x5d,0xe,0x8,0x1a,0x38,0xe1,0x96,0xe9,0x2e,0xdd,0x78,0x16,0xa0,0x7e,0x81,0x8c,0x34,0x9,0x8a,0x3,0xc0,0x9d,0xb1,0xb1,0xbd,0xba,0x56,0x20,0x5,0x83,0xbe,0x10,0xd8,0x3,0x64,0xcf,0x2e,0x87,0x4,0x7e,0xee,0xec,0xe9,0xcf,0x2a,0xdd,0x3c,0x2,0x40,0xcf,0x60,0x8d,0x27,0x84,0x6e,0xd8,0xed,0xae,0x18,0xaa,0x3,0xa,0x91,0xd2,0x15,0xe6,0x25,0x6f,0xe8,0xb0,0x4,0x70,0xf0,0x39,0xb3,0x7e,0x22,0x61,0xb,0xcd,0xbb,0x71,0xed,0xbd,0x97,0x7c,0xd8,0xda,0xf1,0x83,0x26,0xde,0xb5,0x4b,0xba,0x79,0xdb,0x13,0x72,0xe9,0xe3,0x94,0xd5,0xfa,0x2b,0xc4,0x7f,0xba,0xfe,0xf0,0x7,0xfd,0xe1,0x6d,0x30,0x2f,0xb9,0x60,0xf5,0x2f,0x2e,0xaa,0x3a,0x42,0x58,0x95,0x9e,0x3e,0xf8,0xdc,0xdb,0xf,0x77,0xa9,0xed,0xf,0x4b,0xea,0x41,0xf3,0x56,0x82,0xf6,0x16,0x69,0xaf,0xd1,0xbc,0xd9,0x6b,0xef,0xbd,0xe4,0xb5,0x96,0xa0,0xcf,0x6d,0x7,0xca,0x6f,0xbe,0x4b,0x2e,0x3d,0x92,0x34,0xc4,0x46,0x3e,0xd4,0x8e,0xb,0x3d,0xa6,0x4a,0xbc,0x82,0x8a,0x1,0xb6,0x5,0x5e,0x55,0x65,0x5e,0x9b,0x65,0xa0,0x49,0xa5,0xce,0xab,0xe4,0x79,0x5b,0x9e,0x93,0xf1,0x3d,0x3,0x8,0x7a,0x8f,0x25,0x1b,0x76,0x1d,0xb7,0x6a,0xee,0xe4,0xed,0x1d,0x8e,0x0,0xe,0x3e,0x6f,0x76,0x2f,0xa5,0xb7,0x3d,0x2a,0xe7,0x1f,0x3,0x28,0x66,0x55,0xd8,0x26,0x9a,0xad,0x4,0xbd,0x65,0x34,0xef,0xf7,0x96,0x48,0x3e,0xbe,0x7a,0xee,0xe4,0x8f,0xe,0x3e,0xef,0x8e,0xa1,0x2e,0xd5,0x78,0xb,0xe4,0x1f,0x11,0x7b,0xc,0x81,0xdd,0xe,0xaa,0xb1,0xd1,0x8f,0x30,0x47,0x82,0xde,0x1b,0x96,0xa8,0xfb,0xf7,0xb5,0xf7,0x5e,0x3a,0xaf,0x16,0xb7,0x6a,0xb7,0x8,0x90,0xdf,0xf4,0x53,0x39,0x3f,0x4,0x6f,0x2c,0x8e,0xc3,0xef,0x26,0xe7,0x8f,0x4,0xfc,0x91,0x72,0xde,0xe9,0x72,0xfe,0xd8,0x81,0x13,0x66,0xfd,0x5d,0xe9,0xa6,0xe1,0x90,0x3b,0x22,0xc0,0xe8,0x33,0x7c,0x3f,0x54,0xf8,0x5a,0x9b,0xc1,0xe5,0xc0,0xfa,0x95,0xcc,0xca,0x7c,0x9f,0x4f,0x14,0xe1,0x26,0x68,0x65,0x7f,0xa9,0xef,0xe5,0x60,0xd4,0xd9,0x6b,0x6,0xda,0x2f,0x33,0xeb,0x4d,0x34,0xef,0x99,0xfa,0x1e,0xbd,0xef,0xeb,0x90,0x48,0xe0,0x21,0xe7,0xdd,0xf1,0x25,0x97,0xda,0xfe,0x4b,0x5,0xab,0xf8,0x99,0x51,0x8c,0x69,0xf0,0x52,0x74,0x8f,0x1c,0x8f,0x3b,0x3a,0x49,0x71,0xb4,0xbf,0x7b,0xf6,0xe7,0x6a,0xff,0xa,0xd6,0x98,0x12,0x2f,0xd3,0xab,0xbb,0x7e,0xcd,0x3d,0x17,0xbd,0x50,0xab,0x7b,0xb5,0x99,0x3,0xc,0x9a,0x78,0xd7,0xfe,0x7e,0x6a,0xfb,0xf,0x15,0x81,0x56,0xa1,0x63,0x15,0x63,0xfe,0x3b,0x19,0x30,0x4f,0x10,0xc,0x71,0xb8,0xd4,0xc8,0x90,0xed,0xb7,0x65,0xad,0xae,0x1a,0xeb,0x7b,0x6d,0x21,0xbd,0x52,0xe7,0xa8,0x2,0x26,0x85,0x12,0x8c,0x27,0x7e,0x7,0xf3,0xee,0xab,0xe5,0xe0,0xb7,0x19,0x9,0x3c,0x64,0xe2,0xec,0x3a,0xe7,0xd2,0xd7,0xc9,0xb9,0xcf,0x86,0x8b,0x37,0xc1,0xea,0x7a,0x9e,0xfa,0x9e,0xf9,0x9e,0x27,0xdf,0x83,0x35,0xf,0xb0,0xcd,0x73,0x9f,0x95,0xce,0xa8,0x1c,0xfe,0xac,0xe8,0x3f,0x1,0x39,0xee,0x3,0x52,0x19,0xf7,0x65,0x2b,0xcf,0xc4,0x36,0xbe,0x7,0xb,0xdc,0x68,0x7,0x44,0x1b,0x54,0x4c,0x0,0x83,0x2e,0x98,0xe3,0x41,0x6e,0x94,0x4b,0x37,0x5f,0x97,0x85,0xc1,0xe3,0x4b,0x76,0x3b,0x77,0x53,0x6c,0x85,0x2e,0xfc,0x1c,0xae,0xb5,0x7,0x3,0x2c,0x81,0x21,0xd0,0x90,0xd9,0xa2,0x7d,0x2c,0x8c,0xcd,0x29,0xbc,0x56,0xe6,0x73,0xed,0xb7,0x90,0x48,0xe5,0x7f,0xe9,0x90,0x89,0x77,0x1d,0xbb,0xa3,0xd0,0xaa,0xb2,0xda,0xe0,0xb,0xe6,0xf4,0x4b,0x37,0x6f,0x7f,0x8,0xce,0x1f,0x11,0x30,0xf0,0x62,0xa6,0x5b,0x25,0x8f,0xa0,0x56,0x1e,0x4f,0xe5,0x1c,0x9f,0x65,0xa2,0x8a,0xcc,0xa7,0x9c,0x6b,0x7d,0x4,0xf2,0x43,0x0,0x5b,0x0,0x6c,0x27,0xd9,0x8,0xd2,0x41,0x88,0xf4,0x91,0x4,0x80,0x6,0x9,0x3d,0x20,0xb7,0x7,0xa0,0x3e,0x50,0x8,0x95,0xb3,0xc8,0x3d,0xda,0x6d,0xb9,0x14,0x78,0x3f,0x5,0x3e,0x1,0x20,0x1c,0x24,0xa3,0x79,0x4f,0x5b,0xa2,0xfe,0xb2,0xd5,0xf3,0x2e,0x7c,0x63,0xa7,0x13,0xc0,0x90,0x2b,0x9f,0x63,0xfa,0x9f,0x6f,0x9c,0xee,0x52,0xdb,0x1f,0x1,0xe0,0x10,0x19,0xf1,0xf1,0x57,0x51,0x79,0x7e,0x1b,0x2a,0xa0,0x38,0x33,0xd6,0x17,0xca,0xeb,0x9f,0x16,0xc3,0xce,0xc8,0x41,0x38,0x86,0x99,0x64,0xf6,0x8,0x0,0x9a,0x69,0xde,0x3f,0x24,0xbc,0x47,0xda,0x7a,0x98,0xad,0x6,0xf8,0xa,0xc9,0xbf,0x2,0xdc,0x0,0xf2,0x3,0x42,0x4d,0xbe,0x53,0x2a,0x99,0xac,0xab,0x77,0x7e,0xaa,0x7,0x80,0x3d,0x9d,0x73,0xfd,0x20,0x1d,0x22,0xb9,0x11,0x84,0xf6,0x97,0xf4,0x9,0x40,0xfb,0x40,0x6e,0xcf,0xf8,0xab,0x30,0xe6,0xb3,0x9e,0x43,0xc,0x6a,0xf9,0x3e,0x39,0xfa,0x7e,0x1,0x18,0x20,0x67,0xa,0xc5,0x1d,0x63,0x83,0x37,0x72,0xf4,0xea,0x66,0x36,0x6d,0xdf,0x7a,0xf5,0x5f,0x1e,0xba,0xa6,0xea,0x11,0x48,0x15,0x29,0x81,0xfe,0xa6,0xbf,0xd,0x96,0xdf,0xfc,0xc3,0xd0,0x8d,0xda,0x22,0xd9,0x4a,0x32,0x8b,0x59,0xb0,0x38,0xf8,0xc2,0xfc,0xff,0x59,0x40,0xa3,0x63,0xa1,0xc9,0xdb,0xe2,0xb7,0x8,0x27,0x61,0xd6,0x85,0x5c,0x61,0x6c,0x27,0x3f,0x0,0x6c,0xbd,0x60,0xab,0xe8,0x25,0x16,0x24,0x13,0x75,0xf,0xaf,0xb8,0x7b,0x62,0x6b,0x0,0x4a,0x33,0x80,0xcd,0x0,0xde,0x5,0xb0,0xe,0xc0,0x33,0x59,0x7d,0xe7,0xee,0x1,0x72,0xa9,0x9,0x80,0x8e,0x81,0xdc,0x81,0x92,0xdb,0xf,0x42,0x7d,0x64,0xc1,0x6,0xf7,0x54,0x64,0xf2,0xc4,0x60,0xcc,0xac,0xab,0x40,0xdc,0xc,0xca,0x89,0x3f,0x8d,0xf9,0xa4,0x66,0xb4,0xe1,0x30,0x2,0x22,0x2,0xc6,0x24,0x98,0xe4,0x9f,0xd1,0xd0,0x73,0xb7,0x25,0x0,0xee,0xdc,0xa9,0x1c,0x60,0xd0,0xf9,0x77,0x9f,0xec,0xa7,0xb6,0x3f,0x21,0xc9,0xe2,0xbd,0xbf,0xa3,0x4d,0xa4,0xac,0x9d,0x2c,0x64,0x29,0x80,0x1f,0x92,0x7c,0x97,0x96,0xb8,0xd5,0x3c,0x6f,0xc6,0xaa,0xb9,0x93,0x1b,0xab,0x7d,0xef,0x43,0x26,0xce,0x3e,0x10,0xf2,0xbf,0x2f,0xb9,0x11,0x72,0xfe,0xa7,0x20,0x35,0x84,0x61,0x6a,0xca,0x51,0x7a,0xab,0xf7,0xae,0x59,0x9f,0x46,0x7a,0xb,0x99,0xd8,0xe5,0xe4,0x35,0xf3,0xce,0x6f,0xda,0x79,0x4,0x30,0xe9,0x9e,0x7a,0x97,0x6e,0x3a,0x5b,0x7e,0xf3,0xdd,0x80,0xbc,0xc8,0x1,0x73,0x47,0xe1,0xf7,0xd1,0xe0,0xc7,0x3b,0x5c,0xc2,0x76,0x2,0xdb,0x2c,0x59,0xff,0xdd,0xd5,0xf3,0x2e,0xbc,0x79,0x47,0x10,0xe1,0x21,0x93,0xee,0x4d,0x28,0xb5,0x75,0x96,0x9c,0x7f,0x2a,0xa0,0xbd,0x33,0xc1,0x2b,0x59,0x37,0x41,0xd5,0x80,0x18,0x7c,0x5a,0xe2,0xbe,0xb5,0xf7,0x5e,0x72,0xfe,0xce,0x55,0x2,0x27,0xcd,0xdb,0xc5,0xf9,0xe9,0xcb,0x5c,0xba,0x69,0x6a,0x24,0x6f,0x3,0x55,0x40,0x65,0x58,0xe8,0xad,0xa1,0x62,0xc5,0x51,0xbb,0x68,0x69,0x34,0x44,0x19,0x11,0x78,0xd2,0x7a,0x9b,0x61,0xde,0x1d,0xb4,0xc4,0x37,0xd7,0xcc,0x9b,0xd4,0xbc,0xa3,0xb9,0xd1,0xa0,0x49,0xbf,0xe8,0xe1,0x37,0x6f,0x5d,0xc,0xb9,0xfe,0x0,0x77,0x89,0x9c,0x93,0xc9,0xc8,0x23,0xd9,0x8a,0xa0,0x7e,0xc5,0xfa,0xa3,0x18,0xa,0x19,0xd0,0x14,0x68,0x2b,0xbc,0x44,0xfd,0x29,0xab,0xe7,0x4d,0x7e,0x37,0xbe,0x73,0xc4,0xb5,0x8b,0xb8,0xfd,0x83,0xd7,0x8d,0x5e,0x1d,0x5d,0x6a,0x2b,0x69,0x49,0x2,0xf4,0x57,0xcf,0x3d,0xdf,0xaf,0x9,0x12,0x38,0x78,0xd2,0x2f,0x76,0x71,0x7e,0xf3,0x77,0x5d,0xba,0xf9,0x9b,0x4,0x2c,0x26,0xf8,0x59,0x6d,0x57,0xae,0x38,0xcb,0xf,0x7,0x5f,0x0,0x60,0x66,0x1b,0x99,0xa8,0x1f,0xb3,0x7a,0xee,0xa4,0x45,0xd8,0xc9,0xed,0x90,0x89,0xb3,0xaf,0x77,0xe9,0xa6,0x6f,0x1,0xda,0x93,0x71,0x8f,0xa0,0xea,0x41,0x56,0x11,0xd1,0x83,0x96,0x78,0x71,0xed,0xbd,0x97,0x1c,0x3b,0x78,0xf2,0xbd,0xf5,0x2e,0xdd,0x44,0xf3,0xea,0x1a,0x24,0xbf,0x3f,0xa4,0x4f,0x8,0xea,0x4d,0xa0,0x97,0xa4,0x7d,0x69,0xde,0x4b,0x90,0xff,0xe2,0xea,0x79,0x17,0xa6,0x6a,0x2,0x5,0xf,0xba,0x60,0x5e,0x9d,0x5c,0xfa,0xdf,0xe5,0x37,0x7f,0x1b,0x64,0x14,0x90,0x41,0xd4,0x42,0x14,0x44,0x44,0x25,0x41,0x52,0xda,0xbc,0xc4,0x8b,0x5e,0x5d,0x8f,0xb3,0x56,0xce,0x3e,0xf7,0xa3,0x8e,0x2,0xdf,0xe,0xba,0x60,0xee,0x68,0x97,0x6e,0x9c,0x2d,0xe7,0xf6,0xf,0x80,0x2e,0xaa,0x6a,0x13,0x22,0x1b,0xdc,0x2,0x1,0x8d,0xa4,0xbd,0x9,0xa9,0x2f,0xa0,0xde,0x2d,0x6d,0xa0,0xe8,0x33,0x97,0x59,0xa2,0xfe,0xfa,0xd5,0xf3,0x26,0x3d,0x53,0x75,0x24,0x10,0x0,0x56,0xcf,0x3d,0xbf,0xd9,0xab,0xef,0xf9,0x5f,0x96,0xa8,0xbf,0x9e,0x40,0x3a,0x6e,0xcd,0x54,0x1d,0x16,0x9,0x3b,0x81,0x64,0xda,0xbc,0xe4,0xa3,0x6b,0xee,0xb9,0x78,0x74,0x47,0x1a,0xfc,0xa0,0x3f,0x2e,0x78,0xd6,0x12,0xf5,0x27,0x91,0xde,0xda,0x5c,0xd0,0x90,0x55,0x79,0xff,0xd8,0xdf,0x7a,0xc8,0x1d,0x4,0x68,0xb7,0xd2,0x80,0xa2,0x86,0xa,0xfa,0x97,0x9a,0x40,0xc1,0x51,0x5b,0x79,0xe7,0xb8,0xb4,0x57,0xd7,0x73,0x9a,0x25,0x1a,0x26,0xb,0xfc,0xb0,0x7c,0x44,0xb0,0x35,0x7c,0x35,0x8e,0xc2,0x5,0x64,0x1d,0xf0,0xfd,0xc4,0xd3,0x6b,0xee,0xb9,0xe8,0x4c,0x74,0xd0,0xb6,0x7a,0xee,0xa4,0x3f,0x5b,0x5d,0xc3,0x19,0x34,0x6f,0x49,0x88,0x38,0x86,0xe2,0x8b,0xf9,0xef,0x55,0xe0,0x7b,0xf1,0x63,0x42,0x6,0x2b,0xd2,0x14,0xf8,0x98,0x46,0x1b,0x45,0x5a,0xb4,0x74,0x94,0xc7,0x88,0xcd,0x8,0x7c,0xfa,0x33,0x17,0x3c,0xc2,0x9a,0x11,0x0,0x0,0xac,0xb8,0xf3,0xec,0x34,0x13,0x75,0xf,0x92,0xdc,0x96,0x7,0x85,0x94,0x1,0xaa,0xb3,0xe8,0x6f,0xa,0xf9,0x58,0xe8,0x2b,0x0,0xf3,0x92,0x4f,0x37,0x27,0xfb,0x9c,0x86,0xe,0xde,0x56,0xcf,0x39,0xff,0x75,0x4b,0xd4,0x4f,0xa6,0x79,0xb,0x91,0x5d,0x1d,0x2d,0x42,0xe4,0xad,0x49,0xe4,0xd8,0xea,0x50,0x16,0xa7,0x8e,0xef,0x67,0xbe,0xf5,0x19,0x10,0x5,0x25,0x8,0xce,0xa5,0xcf,0xed,0xc9,0x7f,0x4e,0xa8,0x29,0x1,0x0,0x80,0x4b,0xa7,0x6,0x0,0x48,0x46,0x1,0xf4,0xd5,0x70,0xb1,0x26,0x8d,0x2,0x5c,0xb0,0x24,0x9e,0x7c,0xdc,0x4b,0x36,0x8c,0x7b,0x75,0xf6,0x69,0x9d,0x22,0x19,0xd3,0xaa,0x39,0xe7,0xaf,0x83,0x25,0xa6,0x93,0xde,0xab,0xc1,0x12,0x83,0x49,0x81,0xb9,0xb4,0x23,0xdc,0xd3,0x19,0xad,0xb6,0x41,0xea,0x2f,0xa7,0x81,0xb5,0x27,0x0,0x3f,0x35,0x15,0xe0,0x9e,0xd5,0x56,0xfd,0x0,0x1a,0xcd,0x5b,0x45,0x4b,0xde,0xb4,0x72,0xf6,0xb9,0xff,0x44,0x27,0x6a,0x6b,0xe6,0x4d,0xba,0xf,0x96,0xb8,0x13,0xe4,0x96,0x10,0xaf,0xda,0x61,0xa0,0x59,0x3c,0x48,0x56,0x50,0xaf,0x9a,0x12,0xc0,0xa1,0x93,0xef,0xd9,0xd,0x70,0xc3,0x48,0x24,0xb2,0x76,0x6f,0x55,0xd4,0x1e,0x92,0xdc,0x44,0x4b,0xcc,0x5d,0x35,0x67,0xe2,0x13,0xe8,0x84,0xcd,0xcc,0x9b,0x4e,0x4b,0xdc,0x1f,0x62,0xd4,0xca,0x62,0xdf,0xb5,0x5d,0x4d,0x8c,0x6,0x3f,0xb4,0x9e,0xf,0x1d,0x34,0x69,0xde,0xd0,0x9a,0x10,0xc0,0x91,0xd7,0xfd,0x9e,0x20,0x87,0x7,0xec,0x1f,0x41,0x9a,0x95,0x76,0x4a,0x80,0x48,0x8e,0x1,0x0,0xbd,0xc4,0x43,0xa0,0xdd,0x89,0x4e,0xda,0x56,0xcd,0x99,0xb8,0xc9,0xbc,0xe4,0x1d,0x30,0x6f,0x51,0x8,0x9a,0x45,0x2b,0x7d,0x95,0xf5,0x49,0x81,0xcf,0x28,0xf2,0x7b,0x28,0x5,0x98,0x9,0x31,0x71,0xee,0x38,0x48,0x67,0xd5,0x84,0x0,0xb6,0xfc,0x63,0x1d,0x9d,0x9f,0x3e,0x87,0xb4,0x44,0x26,0xae,0xa5,0xfd,0xd4,0xb,0x9,0x4,0xed,0xd,0xc0,0x1e,0x5c,0x3d,0x67,0xe2,0x6,0x74,0xe2,0xb6,0xea,0xee,0xf3,0x5e,0xa2,0x25,0x16,0x4,0x94,0x6d,0x22,0x58,0xb1,0x61,0xc8,0x2,0x9f,0x59,0xe4,0xf7,0xbc,0x7e,0x14,0xc9,0x3a,0x12,0xfd,0x6b,0x42,0x0,0x6b,0xee,0xb9,0xc8,0xc9,0x4f,0x8f,0x1,0x94,0x24,0x2d,0x9e,0x7a,0xa5,0xf2,0x8d,0x8c,0x34,0xff,0x80,0x8b,0x98,0x37,0x9f,0x66,0x4f,0xa2,0xb,0x34,0xd2,0x16,0xd0,0x12,0x4f,0x23,0xcc,0x67,0x54,0x52,0xc,0xb0,0x8a,0xe2,0x80,0x91,0xa1,0x80,0xfa,0xcf,0x8e,0x9b,0x65,0x55,0x27,0x80,0xc1,0x17,0xde,0xd7,0x1f,0x44,0xdf,0x28,0x81,0x1b,0xdb,0xe3,0x18,0x14,0x74,0x14,0x43,0xad,0xf9,0x5d,0x9a,0xf7,0xcc,0xaa,0xbb,0xcf,0xdb,0xda,0x15,0x8,0x60,0xd5,0xdd,0xe7,0xad,0xa2,0x97,0x98,0x13,0x81,0xe5,0x25,0x19,0x25,0xaa,0x33,0xf6,0x81,0x5f,0x89,0x51,0x1,0x7a,0xda,0xbb,0xbe,0x47,0xaf,0x7d,0xab,0x4a,0x0,0x43,0x2e,0x7e,0x30,0x21,0xe7,0x46,0x2,0x74,0xd5,0x78,0x72,0x29,0x7b,0x3e,0xcd,0x9b,0x43,0xf3,0x96,0xa2,0x2b,0x35,0xda,0x5f,0x49,0x7b,0xbf,0xd6,0xee,0x73,0x91,0x4b,0x5c,0x98,0x71,0x26,0xa2,0x86,0xfd,0x21,0x7c,0xb6,0xaa,0x4,0xb0,0xe2,0x8e,0xb3,0xd2,0x84,0x3e,0x1f,0x5b,0xe9,0x62,0xfb,0xd8,0x24,0x33,0x79,0x52,0x68,0x89,0xc5,0x2b,0xef,0x9a,0xb0,0xa1,0x2b,0x8d,0xbf,0x99,0xad,0xb1,0x44,0xdd,0x8c,0x8c,0x89,0x2b,0x55,0x15,0xd3,0xc8,0xf5,0x49,0x8,0xc,0xc1,0x40,0x94,0xda,0xeb,0xf4,0x12,0xf,0x92,0xf6,0x76,0xa1,0xf3,0xca,0xf6,0x8,0x1a,0x7c,0xe1,0xbd,0xd,0xa4,0xb7,0xb7,0x9c,0xeb,0x2f,0x68,0x5f,0x2,0xbb,0x43,0xfe,0xe8,0x4c,0xc2,0xc6,0xea,0x98,0xb9,0x24,0xb9,0x1e,0xe0,0x7a,0x74,0xb1,0xb6,0xe2,0xce,0xf1,0x1b,0x87,0x7c,0x79,0xfe,0x23,0x0,0xfe,0x3,0x0,0x61,0x56,0x8d,0x51,0xcf,0xcc,0x3d,0x92,0x84,0x9c,0xb2,0x76,0x0,0xdf,0xa7,0x79,0xcf,0x93,0xde,0xdc,0xb4,0x6c,0xc1,0xda,0xbb,0xc7,0xa7,0x2b,0x22,0x80,0xc1,0x17,0xde,0xdf,0x1b,0xd2,0xe7,0x0,0xed,0xb,0x72,0x37,0x48,0x7d,0xa4,0xf4,0xc1,0x72,0xfe,0x31,0x90,0x3e,0x1b,0x5,0xae,0xc7,0x82,0x3a,0xdb,0xeb,0x11,0x13,0xb8,0x13,0x32,0x31,0x55,0xc0,0x4a,0x74,0xc1,0x26,0xc0,0x81,0xf6,0x21,0xa4,0x3d,0xaa,0x34,0x5d,0x14,0x3,0x7e,0x28,0x90,0x2,0x37,0x92,0x5c,0x4e,0x4b,0x3c,0x62,0x5e,0x62,0xce,0x8a,0x3b,0xc7,0x6d,0x2c,0x75,0x89,0x82,0x4,0x30,0xe4,0xcb,0xf3,0xf7,0x76,0xf2,0xcf,0x93,0xf3,0xa7,0x40,0xee,0x73,0x2d,0x58,0x75,0x2c,0x92,0x37,0x3,0xd9,0xb4,0x8f,0x3,0x64,0xc0,0x72,0xf3,0xbc,0x17,0x57,0xde,0x35,0x61,0x4b,0x97,0x24,0x0,0x69,0x2b,0x80,0xd7,0x0,0x8c,0x0,0xaa,0x9a,0xbe,0x8e,0x2,0xff,0x41,0xcf,0x7b,0x93,0xb0,0x87,0x41,0xde,0xb8,0x6a,0xf6,0x39,0x65,0x29,0xd0,0x45,0x38,0x80,0xc6,0xc9,0xf7,0xbf,0x3,0xe8,0x13,0x51,0x7a,0x66,0xb6,0x8c,0xdf,0x8e,0xad,0x4f,0x94,0xe5,0xb6,0x5d,0xf2,0x5,0x62,0x4a,0x64,0x97,0xd,0x13,0x23,0xf9,0x1e,0x2c,0xf1,0x98,0x5c,0x7a,0x44,0x61,0x97,0xf2,0x42,0x29,0x2a,0xb,0xcd,0x95,0x4c,0x3f,0x67,0x83,0xed,0xbc,0xe4,0x4f,0x7c,0x5f,0x53,0xd7,0xce,0x3d,0xd7,0xaf,0xe4,0x99,0xac,0xc8,0x74,0xec,0x3,0xa0,0x2e,0x32,0xcd,0x2,0x73,0x22,0xd2,0x2e,0x8d,0xe5,0x2c,0x61,0xb6,0x11,0xb,0x68,0x14,0xe0,0x77,0x55,0x2,0x58,0x79,0xd7,0xf8,0xf,0x69,0xde,0xd3,0x99,0x49,0x5b,0x74,0x99,0xbc,0xb5,0x10,0xa4,0x16,0xfd,0xfc,0x11,0x60,0x77,0x54,0x3a,0xf8,0x45,0x39,0x80,0xe4,0xf6,0x1,0xb0,0x5b,0xb0,0xbe,0xac,0x6c,0x62,0x9b,0x5c,0x6e,0x5d,0x1,0x77,0x7,0x5a,0xf1,0x7,0x8c,0xe2,0x72,0x36,0x10,0x6c,0x46,0x17,0x6e,0x24,0x3f,0x8,0xfb,0x95,0xb9,0x35,0x8a,0x2a,0xcf,0x8a,0x99,0x9,0x8a,0x30,0x26,0x3d,0xcf,0x6b,0x68,0xcb,0xf3,0x24,0x8a,0xdc,0xa3,0x77,0x16,0x5f,0xce,0x97,0x55,0x95,0x72,0x68,0x96,0xb3,0x3f,0x62,0x65,0x6f,0x81,0x68,0x44,0x97,0xa6,0x0,0x13,0x8,0xc7,0x58,0x50,0x4d,0x65,0xfd,0xca,0x5c,0x7d,0x2c,0x1c,0xc7,0x48,0x1f,0xab,0xa,0x1,0xd0,0xac,0x4e,0xbe,0xb,0x32,0x58,0xee,0x80,0x65,0xcc,0x8c,0xcb,0x1f,0xed,0x6d,0x80,0x5d,0x9a,0x0,0x8,0xf8,0x4,0x3f,0x94,0xb4,0x57,0x15,0xbb,0x36,0xd1,0x56,0x75,0xd2,0xaa,0xf6,0x5a,0x25,0xe5,0x15,0x4b,0xee,0xb,0x26,0x3,0x41,0xf2,0x1d,0x48,0x5d,0x9a,0x0,0x4,0xf8,0x2,0xff,0x99,0xeb,0xe0,0x53,0xcc,0x33,0xaa,0x98,0xbb,0x5c,0x56,0x18,0x44,0xf5,0x8b,0xda,0xea,0x8d,0x9b,0x28,0x3a,0x70,0x2c,0xf0,0x70,0x25,0x15,0x7c,0x16,0x4f,0xac,0xa1,0x12,0xfb,0xb3,0xd0,0x58,0x85,0x65,0x1b,0x3a,0xab,0x29,0x98,0x3f,0x90,0xe5,0xc4,0x95,0xb3,0xc,0x6b,0x81,0xa8,0x1a,0x1,0x4,0xe3,0x14,0x8e,0x16,0x4b,0x88,0xec,0x42,0xca,0x4b,0x6b,0xae,0x6e,0x2c,0x42,0x4d,0x81,0x8,0xdb,0x7,0xb4,0x86,0xae,0x4c,0x0,0x24,0x3d,0x1,0xbb,0x97,0x1e,0xaf,0x52,0xa9,0x6b,0xb2,0x7d,0xce,0xb0,0xb6,0x86,0x4,0xdf,0x39,0xa7,0xaa,0x11,0x80,0x80,0xe6,0x2c,0xb2,0xc7,0x36,0x46,0xfb,0x54,0x2a,0x3a,0x4,0x2,0xfd,0x48,0x76,0x79,0x2,0x20,0xb9,0x47,0x79,0xe1,0x2,0x2c,0xf3,0xb3,0xd2,0x6d,0x1d,0x86,0x44,0x91,0xa7,0xfc,0x27,0x23,0xac,0x3a,0xa7,0x7c,0x87,0xe2,0xb9,0xb,0x63,0x38,0x44,0x8c,0x46,0x5a,0x4d,0xa3,0x92,0x47,0x4f,0x21,0x98,0x19,0xde,0x67,0x5f,0x0,0xf5,0x5d,0x5c,0x8,0x64,0x73,0xa9,0x88,0xb1,0x8,0xe1,0x2,0x3,0x9f,0xe9,0xaa,0x3c,0x4e,0xc9,0xbc,0x98,0x73,0x30,0x1d,0x4b,0xd0,0xd5,0x7e,0x25,0x90,0xb0,0xb7,0x9,0x6e,0x62,0x3c,0xe2,0x4,0xc8,0xd3,0xb,0xe2,0x79,0xfc,0x59,0x3e,0x86,0xd1,0xc2,0xb3,0x19,0xd9,0x2a,0x50,0xd2,0x27,0xd5,0xe5,0x9,0x80,0x7d,0x32,0x4a,0xf,0x5b,0x51,0xfa,0x58,0x40,0x31,0x64,0x4c,0x47,0x63,0xc6,0x1b,0x28,0x5,0x60,0x5b,0xd5,0x8,0x40,0xd0,0xbb,0x20,0x9b,0x11,0x5,0x1c,0x4,0x64,0x8b,0x28,0x23,0x2,0x6b,0xf0,0x2f,0xb4,0x2,0x1a,0xd8,0xc1,0x52,0xd8,0x57,0xb3,0xd,0xb9,0xe4,0xd7,0x7b,0x3a,0xe7,0x9f,0x14,0xf6,0x2b,0xab,0xd5,0x77,0x92,0x76,0x7,0xf4,0xed,0x21,0x17,0xfd,0xd2,0xaa,0x42,0x0,0xe6,0x25,0x1e,0x6,0xbd,0xef,0xd2,0xbc,0xe7,0x23,0x1f,0x2d,0x21,0x9b,0xbd,0x24,0x54,0xea,0x63,0x1e,0x60,0xb1,0xca,0x1e,0xad,0xe9,0x6,0xf1,0xe3,0x63,0x41,0x20,0x34,0xcb,0xf9,0xad,0x6b,0xca,0x7f,0xeb,0x3,0xe8,0x54,0xc5,0xad,0x26,0x16,0xe2,0x9c,0x85,0xfa,0xb3,0x98,0x22,0xd,0xd0,0x8,0x39,0xff,0x72,0x80,0xcf,0xe,0xb9,0xf8,0x81,0xff,0x1e,0x72,0xc9,0x43,0xbb,0xb7,0x1b,0xa6,0x1b,0x72,0xc9,0xaf,0x7b,0x2,0xec,0xf,0xb9,0xfd,0x40,0xf4,0x85,0x70,0x0,0xa0,0x4f,0x4b,0xee,0x50,0x2,0x83,0x10,0xae,0x15,0x84,0x40,0x4e,0x3e,0xae,0xd9,0x46,0x3c,0x48,0xa4,0x25,0xbe,0x69,0x5e,0xf2,0xe6,0xe5,0xb7,0xfe,0xeb,0xe6,0xae,0x46,0x0,0x43,0x2f,0x7d,0xe8,0x30,0x97,0x6e,0xfe,0x2d,0x80,0xdd,0xab,0x1,0x2,0xc5,0xf2,0xe3,0xc4,0x93,0x6e,0x6e,0x22,0x6d,0x99,0xc0,0x47,0x68,0x76,0xf7,0x8a,0xdb,0xcf,0x7c,0xbf,0x4d,0x4,0x90,0xdf,0xe,0xbb,0xfc,0xd1,0x5e,0xce,0xf9,0x7b,0xca,0xb9,0x7d,0x68,0xb6,0xb7,0x9c,0xeb,0x3,0xf9,0xd7,0x48,0x6e,0x60,0x4b,0x58,0xb3,0x1d,0x2f,0x44,0xbe,0xe3,0x79,0x75,0xe3,0x97,0xdf,0x36,0xe6,0xa5,0x2e,0x28,0x2,0x46,0xc8,0x4f,0xbd,0x1c,0x66,0x15,0xa9,0x46,0x14,0x7d,0x8b,0x52,0x33,0x51,0xf5,0x31,0x1,0x1b,0x49,0x7b,0x89,0xe6,0xcd,0xf3,0xcc,0x1e,0x58,0x76,0xeb,0x98,0x54,0x5,0x40,0x50,0xcb,0xb6,0x6c,0xd6,0xe9,0x9b,0x11,0xe4,0xd1,0x79,0x33,0xf6,0x42,0x83,0xe8,0x30,0x20,0xab,0xd3,0xb4,0x3b,0x69,0x96,0x0,0xf4,0x73,0xd2,0x7e,0x5d,0x6d,0xf0,0x87,0x5d,0xb6,0x60,0x2f,0xe7,0xd2,0x63,0x43,0x31,0xd7,0x6,0x88,0xbd,0xa0,0x35,0x9e,0x63,0x47,0xc7,0xf2,0x32,0x8a,0xc0,0x9e,0x80,0xce,0x80,0xf3,0x87,0xf8,0xc0,0xb0,0x21,0x97,0x3c,0x3c,0x77,0xc5,0xed,0x63,0x56,0x97,0xa5,0x3,0x94,0xc5,0x11,0xa6,0x3c,0x91,0x30,0xda,0x1f,0x82,0xa1,0xf,0x43,0x91,0x2a,0x2c,0xad,0x91,0xf5,0x8f,0xc,0xa1,0xa7,0x8c,0x63,0x89,0x3e,0x3f,0xec,0xb2,0x87,0xf7,0xee,0x62,0xe6,0xdf,0x21,0x70,0xfe,0x94,0x50,0x50,0x32,0xe7,0xdd,0xcb,0xf2,0x13,0x65,0x2b,0x7d,0x88,0x4c,0x76,0xde,0xb0,0x1f,0x15,0x2c,0xe4,0xe9,0x53,0x90,0x1b,0x4b,0xaa,0x5f,0xd9,0x4a,0x60,0x59,0x1c,0x61,0xe6,0x17,0xd3,0x2,0x5e,0x42,0x58,0x47,0xb5,0x6d,0x7a,0x7f,0x2c,0xa4,0x81,0x96,0xdd,0x23,0x77,0xbe,0x84,0xc3,0xbb,0xd4,0xf0,0xcb,0x1d,0x8,0x60,0xaf,0x20,0xa5,0x18,0x8b,0x84,0x7c,0x54,0xde,0x87,0xc8,0x3f,0x37,0xd7,0xba,0x8,0xd3,0xb8,0xe2,0xd,0x9a,0xb7,0xae,0xaa,0x4,0x0,0x0,0x7f,0xbc,0x6d,0xcc,0x1b,0x34,0x7b,0x27,0x5a,0x32,0x2e,0xec,0xe8,0x5a,0x24,0xcd,0x41,0x41,0x4e,0x46,0x1,0x14,0xa4,0x4f,0xca,0xb9,0x13,0x87,0x5e,0xb6,0xa0,0x77,0x97,0x90,0xfd,0x97,0x3e,0x3c,0x44,0x4e,0x93,0x42,0x53,0x97,0xaa,0xa2,0x47,0x70,0x51,0xaf,0x1,0xc5,0x57,0x61,0xb8,0xa9,0xae,0xe7,0x27,0xde,0xaa,0x3a,0x1,0xc,0xb9,0xf8,0x1,0x3,0xec,0x21,0x1,0x29,0x1,0xc8,0x98,0x72,0x39,0x5b,0x3e,0xb,0xcb,0x67,0x7d,0x39,0xbf,0x67,0x9,0x17,0x1a,0x27,0xe7,0x4e,0xee,0x12,0xe6,0x1f,0x70,0x3a,0xe0,0x46,0x7,0x8e,0x55,0x0,0x77,0x40,0x45,0x34,0x5a,0xc6,0x97,0xf,0xa4,0x35,0xe6,0x57,0x30,0xad,0xa,0x1,0xd4,0xf5,0xea,0x2b,0xd0,0xee,0x97,0x90,0xce,0xab,0xc6,0xdd,0x12,0xc1,0x2a,0xcf,0x31,0x24,0x9e,0xd,0x6c,0x7f,0x52,0x67,0xd,0xbd,0xf4,0x91,0xbe,0x9d,0xdb,0xf4,0x7b,0xe4,0x38,0xc8,0x8d,0xc9,0x6a,0xfe,0x56,0x82,0xb,0xb6,0x9e,0x38,0xa3,0x30,0xdc,0x5a,0x34,0xcc,0x88,0x0,0x1b,0x69,0xf6,0x7a,0x45,0x40,0x50,0xb9,0x6d,0xf1,0x8d,0x47,0x8b,0xe6,0x2d,0x5,0x33,0x6e,0x5c,0x8c,0x47,0xf8,0x14,0x17,0x7,0xc5,0x63,0xa2,0xb2,0xee,0x52,0x84,0xa4,0xb1,0x0,0x2e,0xee,0xac,0x83,0x7f,0xd8,0x15,0x8f,0xf5,0x6,0xf4,0x65,0x49,0x47,0x6,0x9a,0xbf,0xb1,0xa5,0x28,0x6c,0xad,0xaf,0x50,0xc6,0xc0,0x17,0x34,0x19,0x14,0x2,0x4a,0xb,0x25,0x3c,0x58,0x13,0x2,0x0,0x80,0xe5,0xb3,0x4e,0xdb,0x6c,0xe6,0xbd,0xc,0xb2,0x84,0x18,0xa8,0x94,0x7d,0x59,0x4,0x3e,0xf6,0x84,0xdc,0x5,0x43,0x2f,0x7d,0x64,0x4c,0xa7,0x54,0xfc,0x9c,0xbb,0x5a,0x72,0xe7,0xc4,0x32,0x77,0xb4,0xb1,0x4f,0x50,0xe9,0x71,0xb1,0x7b,0xd9,0x8a,0x3f,0xde,0x76,0xc6,0xca,0x9a,0x11,0x40,0x8,0x1d,0x5f,0xb,0x60,0x63,0x39,0x4c,0xbe,0xb5,0x4c,0x39,0xb9,0xfe,0xe1,0x74,0x92,0x1b,0x8,0xe8,0xca,0xe1,0x53,0x1e,0xdf,0xad,0x53,0xd9,0xfd,0x97,0x3f,0x7a,0xa1,0x9c,0x7f,0x31,0xc9,0x1e,0x61,0x11,0x59,0xb5,0xa6,0xb8,0xb1,0x15,0xf1,0xc8,0x32,0x8f,0x8b,0x2,0x2d,0xc3,0x6f,0x25,0x63,0x2c,0xaa,0x43,0x0,0x96,0xf8,0x2b,0xc0,0x34,0x58,0xbe,0xe1,0xc7,0x2,0xb1,0xee,0x39,0xc6,0x51,0xe0,0x8f,0x68,0xa4,0x1,0xd2,0x17,0x7d,0x3f,0x7d,0x6f,0x27,0x62,0xfd,0x47,0x42,0xee,0x2a,0x10,0xfd,0x19,0x98,0x7d,0x8c,0x9b,0x67,0x28,0xb5,0x20,0xd6,0xda,0x82,0x59,0xeb,0xc7,0x89,0xb4,0x30,0x2f,0x95,0xbd,0x4a,0xda,0xea,0x9a,0x12,0xc0,0xf0,0x2b,0x9f,0x4a,0xf8,0x7e,0xea,0x22,0x92,0xbb,0xe6,0x2c,0x70,0xb4,0x37,0xb4,0xdd,0x48,0x41,0xa0,0x31,0x48,0xae,0x24,0x77,0xea,0xb0,0xcb,0x17,0x2c,0xe8,0xf8,0x83,0xff,0xf8,0x61,0xce,0xf7,0x67,0x49,0x6e,0x44,0xa6,0x2c,0xe,0xa1,0x76,0x86,0x7a,0x47,0xe7,0x17,0xbb,0x8e,0x5a,0xce,0x2f,0x82,0xf4,0xee,0xff,0xe3,0xad,0xff,0xfa,0xab,0x9a,0x11,0xc0,0x61,0x57,0x3e,0x99,0x90,0x4b,0x5d,0x2f,0xe7,0xdf,0x4,0xa0,0x77,0x4e,0x48,0x72,0x55,0x72,0xdd,0x18,0x32,0x61,0x6f,0x20,0x9c,0xef,0xbe,0x30,0xf4,0xb2,0x5,0xf,0x76,0x5c,0xb6,0xff,0xf8,0x30,0xc9,0xbf,0x7,0xd0,0xa1,0x21,0xa6,0xc1,0xd8,0xdf,0xf6,0xf4,0x3,0x83,0x30,0x7f,0x44,0x7f,0xe3,0x5b,0xa6,0xa,0x4a,0x7c,0x3,0xe0,0xd3,0xf8,0xb7,0x56,0xb9,0x77,0x3b,0x5e,0xb6,0x4e,0x7e,0xea,0x7,0xce,0xf7,0xff,0x1b,0x60,0xb2,0xb8,0x29,0x53,0x6e,0xf4,0x4b,0xeb,0x66,0x90,0x19,0x93,0x90,0xce,0x18,0x7a,0xe9,0x23,0xbf,0x1b,0x76,0xf9,0x63,0x7b,0x76,0xac,0x99,0xff,0xc4,0x89,0xce,0xa5,0x1e,0x96,0xd3,0x41,0xb9,0xb1,0x14,0xed,0x4e,0x96,0x99,0x77,0x8,0x1b,0x49,0xae,0x5,0xed,0x1d,0x9,0x8d,0x8a,0xd2,0x29,0x86,0x59,0x69,0x33,0x7,0xd3,0x56,0x8,0x7c,0xad,0x26,0x4,0x30,0xfc,0xca,0x27,0x7b,0x0,0xfa,0x89,0x73,0xee,0x7a,0x10,0x1e,0x8d,0x99,0x22,0xc7,0xb9,0x91,0x63,0xad,0xe2,0xd7,0x79,0xd9,0xa1,0xd0,0xc2,0xb,0x26,0x4c,0x7a,0x18,0x5e,0x37,0xac,0x2c,0xd,0x1d,0xe9,0x9c,0xff,0xea,0xd0,0xcb,0x1f,0x3b,0xa6,0x43,0xd8,0xfa,0x97,0x3d,0xfa,0x9f,0xce,0xa5,0xe7,0x93,0xdc,0x2f,0x32,0xbf,0x69,0x16,0xf8,0x39,0x17,0x4d,0x9,0x14,0xcf,0xec,0x84,0x22,0xe0,0x58,0xc4,0xde,0x63,0x48,0x19,0xb9,0x6c,0xf9,0xad,0x67,0xc,0x32,0x2f,0xf9,0x19,0x4b,0xd4,0xef,0x61,0x89,0x86,0x6,0x4b,0x24,0xfb,0x99,0x97,0x1c,0x4c,0x2f,0x39,0x8a,0x5e,0xf2,0x4c,0x9a,0xf7,0x55,0x9a,0xf7,0x15,0x82,0xcf,0xb7,0x15,0x49,0x2c,0x31,0xf8,0xbf,0xd9,0x55,0xce,0x7d,0x5d,0x72,0xdf,0x43,0x14,0x8d,0xc2,0x4a,0x23,0x5d,0xdb,0x14,0x18,0xab,0x50,0xc3,0x65,0xcc,0xb9,0x70,0x33,0x68,0x4f,0x24,0x7b,0xec,0x71,0xee,0xcb,0x53,0x8f,0xda,0xe1,0x49,0x24,0x87,0x5f,0xf9,0x54,0xbd,0xf3,0x53,0xab,0xe4,0xfc,0xfd,0x48,0xee,0x12,0x2d,0xc9,0x43,0x62,0x55,0xfb,0x24,0xf2,0xd0,0x25,0x97,0x83,0xde,0x89,0xcb,0x66,0x9e,0xd2,0xa2,0x36,0xf3,0x11,0x5f,0xfb,0x1d,0x9b,0xb7,0xbc,0x4f,0x2f,0x59,0x47,0x39,0x67,0x92,0xf3,0x97,0xcf,0x3a,0xdd,0x55,0x95,0x0,0x86,0x5d,0xf1,0x78,0x4f,0x0,0x93,0xe0,0xdc,0x74,0x20,0xac,0xfd,0x87,0x1d,0x5f,0x30,0x2,0xb9,0xeb,0xe0,0xcd,0x20,0xdf,0x15,0x78,0xbb,0x9f,0x4e,0xdf,0xb0,0xf2,0xf6,0x33,0x52,0x35,0x9f,0xf1,0x97,0x3f,0x96,0x24,0x30,0x9f,0xc4,0x11,0x72,0x2e,0xb3,0xca,0x46,0x56,0x35,0xe4,0x3b,0xef,0x95,0x91,0x16,0x78,0xcf,0xf2,0x59,0xa7,0x4d,0xae,0x32,0x4c,0x5d,0x91,0x9c,0x3b,0x41,0xf2,0x7f,0x1b,0xa8,0xb5,0x1,0x99,0xb7,0xb8,0x5a,0xb1,0xda,0xf,0x25,0x42,0x9,0x5a,0xd4,0x53,0x2e,0x55,0x2c,0x8c,0x85,0xab,0x83,0x49,0xda,0x4c,0xda,0x9b,0x20,0xe7,0x3,0xf6,0xb3,0x65,0x33,0xbf,0xb0,0xb9,0xfa,0x33,0xfe,0xc9,0x61,0xce,0xf9,0xd7,0x5,0xb9,0x91,0xb4,0x1f,0xc9,0x30,0x3f,0x62,0xa4,0xaa,0x2b,0x9b,0x2f,0xbf,0xd8,0xbb,0x94,0x53,0x65,0x36,0xb7,0xbf,0xc2,0x3c,0xc,0x7c,0x3e,0x51,0xd7,0x70,0xca,0xe2,0x9f,0x9f,0x50,0xd5,0x92,0x31,0x89,0xa,0x79,0xf0,0xbb,0x0,0x97,0x83,0x18,0x46,0xe4,0x96,0x6e,0x29,0x49,0x52,0x95,0xe4,0x49,0x66,0xab,0xe7,0x65,0xbb,0x96,0x39,0x9e,0x30,0xbd,0x24,0x37,0x8,0xe2,0x7e,0xa4,0x2e,0x18,0x76,0xc5,0xe3,0x8b,0x0,0x2e,0x0,0xf8,0xd4,0xf2,0x5b,0x4e,0x69,0x73,0x9a,0xd9,0x61,0x57,0x3c,0x71,0x28,0x81,0x33,0x40,0x9c,0xe4,0xfc,0xf4,0xa7,0x1,0xf4,0x25,0xd1,0x10,0x39,0xe1,0x30,0x93,0x6,0xb4,0x0,0x17,0x2c,0xc7,0xad,0xbf,0xf8,0xf7,0x58,0xd6,0x15,0xbe,0x49,0xb3,0x3b,0xaa,0x3d,0xf8,0x6d,0xd2,0x1,0xe,0x9b,0xf2,0x9b,0xd3,0xe4,0xfc,0x47,0x81,0x42,0x11,0xae,0x3b,0x1e,0x6d,0x8d,0xcf,0xa3,0x58,0xc6,0x12,0x48,0x6a,0x2,0xf9,0xf,0x0,0xef,0x3,0x78,0xf,0xe0,0x9f,0xcc,0xec,0x65,0x9,0x6b,0x25,0xb7,0xd1,0xcc,0xb6,0x8,0x4c,0x3,0xf0,0xcd,0xcc,0xf3,0xd3,0xa9,0x7a,0x80,0x3d,0xcc,0xb8,0x2f,0xa0,0xa3,0x9c,0xd3,0x31,0x80,0xf6,0x1,0xd0,0x4b,0xce,0xf5,0x25,0xb9,0x57,0x1e,0xab,0xcf,0xf4,0x5f,0xb5,0x6b,0x4,0xc5,0xaf,0x27,0xc9,0x81,0x76,0x73,0xef,0xbd,0xfa,0x5d,0xfd,0xdc,0xd,0x43,0xaa,0xae,0xe7,0x24,0x2a,0x7f,0x38,0x2c,0x5,0xed,0x25,0x40,0xc7,0x44,0x9e,0x3c,0xf1,0x6a,0xd1,0xb5,0x6f,0xb9,0x5e,0x50,0xb1,0xe7,0x42,0xb4,0xd6,0x22,0x41,0x34,0xd6,0x4b,0x38,0x0,0xc0,0x1,0xe1,0x11,0xc7,0x49,0x6e,0xac,0x84,0xf,0x21,0x35,0x41,0x2e,0x45,0xd0,0x1,0x90,0x9f,0x4a,0x93,0xa4,0x7,0x28,0xe1,0x9c,0x7a,0x2,0xda,0x1b,0x40,0xc6,0x23,0x29,0xa,0x92,0x9,0x1d,0xa2,0x99,0xef,0xce,0x57,0xf9,0xe0,0x17,0xf,0x92,0xc,0x9f,0x9d,0x12,0x1c,0x0,0x23,0xed,0x69,0x91,0x3f,0xaa,0xc5,0xe0,0xb7,0x89,0x0,0x48,0xbe,0xf,0xf2,0x7b,0x72,0xfe,0xd3,0xb5,0x2a,0x97,0xd6,0x16,0x62,0x88,0x13,0x60,0x36,0x51,0x5a,0x4e,0x61,0xc2,0x9e,0x0,0xfa,0x3,0xea,0x9f,0x2d,0xcb,0x1b,0x2f,0x35,0x19,0x15,0xba,0x8e,0xe2,0x35,0x98,0xcf,0x61,0x62,0xc9,0x32,0x6a,0xc7,0x7c,0xc3,0x82,0x53,0xa,0x6,0x9f,0xb,0x69,0xde,0x7f,0x2d,0x9b,0x71,0xf2,0xdf,0x6a,0xd5,0x83,0x15,0xb3,0xf0,0x65,0x33,0xbf,0xe0,0xcb,0xe9,0x5,0xc0,0x7e,0xc4,0xec,0xb2,0x93,0x8a,0xe1,0xfa,0x28,0x81,0x65,0x97,0xca,0x7f,0xcb,0x32,0x72,0xe6,0x96,0xc8,0x9b,0xcb,0x28,0xe4,0x3c,0xca,0x5f,0x1c,0x5,0xb5,0x18,0xd,0x46,0x8b,0x55,0x8f,0xe,0x7e,0xb,0xd6,0x1c,0x20,0xd2,0x80,0xf0,0x73,0xb,0xa7,0xbb,0x3c,0x3c,0xbf,0x58,0x5e,0xdf,0x52,0xc7,0xb0,0xc4,0xfb,0xc6,0x5d,0xb9,0x82,0x8c,0xd2,0xf6,0xd0,0xd2,0x19,0x27,0xd7,0xd4,0x3b,0xba,0x4d,0x32,0x7c,0xf9,0x2d,0xa7,0xa4,0xcc,0xf3,0xa6,0xd2,0xec,0x4f,0x81,0x47,0x60,0x54,0xfa,0x52,0x71,0x4c,0x5a,0x31,0x8c,0x27,0x5b,0x10,0x36,0xfc,0x4d,0x21,0x88,0x10,0x8f,0x74,0x2a,0x18,0xfd,0x84,0x3c,0xf7,0x86,0x2,0xd9,0xb2,0x91,0xbf,0xf,0x5,0xe2,0x4f,0x18,0x8a,0x88,0xd8,0x67,0x86,0x9e,0x33,0xd1,0x84,0xf,0xaa,0xb0,0x84,0x87,0xc4,0x3f,0xb3,0x45,0x2c,0x4b,0xc9,0xcc,0xde,0x28,0x81,0xf1,0xa0,0x48,0xc6,0xef,0xc2,0x80,0x20,0x13,0xb5,0xe6,0xa1,0x6d,0x56,0xe2,0x96,0xce,0x38,0xe9,0x1d,0xc0,0xbe,0x25,0xc1,0x45,0x91,0x2e,0x31,0xcc,0x1a,0x31,0x1c,0x3c,0x6b,0x20,0x87,0x35,0x6d,0x32,0xd0,0x5e,0x94,0xda,0xae,0x54,0xc2,0xe4,0x62,0xbd,0x5b,0x2a,0xc1,0x32,0xcb,0x4c,0xba,0xcc,0x12,0xe7,0x97,0x4a,0xde,0xcc,0xca,0x92,0x60,0x57,0xf4,0x2c,0x8,0x2b,0x8e,0x5,0xe2,0x68,0xfc,0x61,0x57,0x3e,0x35,0xba,0x43,0x12,0x0,0x0,0x2c,0xbd,0xf9,0xa4,0x5f,0xb,0x9c,0x15,0xae,0x4a,0x44,0xf5,0x6e,0x33,0x7e,0x8f,0xe1,0x6f,0x10,0xf0,0x3a,0xcd,0x9b,0xd,0xda,0xf,0x40,0x3e,0x99,0x67,0x25,0xb3,0x7a,0x3e,0x92,0x9d,0x3f,0xac,0x2c,0xde,0x87,0x80,0x86,0x3,0x98,0x7c,0xc4,0xd5,0xcf,0x26,0x3b,0x24,0x1,0x4,0x1a,0xb2,0xf7,0x75,0x9a,0xf7,0x5b,0x80,0x7e,0x50,0xf4,0x38,0x12,0x4,0xfc,0x48,0xe0,0x33,0x0,0x67,0x90,0xf6,0x1f,0x66,0x36,0x65,0xe9,0x8c,0x93,0xbe,0xb,0xd8,0x37,0x40,0xfb,0x5d,0xec,0xd8,0x28,0x45,0x4c,0x15,0x2a,0x69,0x0,0xb5,0x4c,0xc4,0xbc,0x23,0xb6,0x70,0xd1,0x43,0xd9,0x7e,0xd1,0x68,0x3f,0xed,0x9f,0xbb,0x23,0x6c,0xaa,0x36,0xb7,0xc3,0xaf,0x7a,0xe6,0x60,0xc9,0xfd,0x46,0x52,0x52,0xd2,0x5a,0x23,0x37,0xd3,0x6c,0x29,0xc0,0x5b,0x97,0x4c,0x3f,0xe1,0x9d,0x2,0xc7,0x7f,0xca,0x39,0x7f,0x8e,0xa4,0xe3,0xcc,0xe2,0xce,0xa0,0xe5,0x24,0xa3,0x50,0x99,0xaf,0xa5,0xa,0xba,0xa0,0x14,0x34,0x57,0xcb,0x25,0x86,0x62,0x29,0xe2,0x72,0x19,0x82,0xc4,0xc7,0x68,0x36,0x6e,0xd9,0x8c,0x13,0xb7,0x77,0x48,0x2,0x8,0x7,0xf5,0x6,0x49,0x6f,0x81,0x9c,0xbd,0x74,0xfa,0x9,0xad,0xa6,0x7a,0x1d,0xfe,0x95,0x67,0xea,0x21,0xf7,0xac,0xa0,0xa3,0xe2,0x66,0x57,0xa6,0x10,0x73,0x11,0xc4,0xa7,0x18,0x7a,0x5c,0x69,0x17,0xb7,0x86,0xc0,0x96,0x9d,0xab,0xb3,0xc6,0xa4,0x12,0x8a,0xc7,0xf7,0x49,0xfb,0xd1,0xd2,0x19,0x27,0xfe,0xb8,0xc3,0x12,0x40,0x5b,0xda,0x88,0x6b,0x17,0xd1,0x6f,0xde,0xfa,0x24,0x89,0x23,0x1,0xf4,0xa,0x92,0x67,0x44,0x79,0x48,0x8a,0x15,0x56,0xce,0xff,0x5e,0xe9,0xe2,0x43,0xb9,0x5,0x9b,0x8b,0xd,0x29,0x8b,0x9c,0xd7,0xda,0xfd,0x8a,0x3d,0x53,0xf1,0x85,0x8f,0x70,0x6d,0x21,0x2c,0x1c,0xcd,0xe7,0x9c,0xf0,0xc5,0xe5,0x37,0x9f,0x54,0x55,0x38,0x78,0xa7,0x42,0xb9,0x8b,0x6f,0x3c,0x5a,0xcb,0x6e,0x3e,0xf9,0x64,0x32,0x71,0xbb,0xc4,0xb7,0xa3,0xfc,0x13,0x85,0xe3,0xc,0x59,0xe4,0x7b,0xa9,0x20,0x14,0x94,0x5a,0x67,0x2f,0x71,0x9d,0x52,0x9e,0xb8,0xc5,0xce,0x6b,0xed,0x7e,0x2c,0xcf,0x2f,0x22,0x27,0x5e,0x92,0x8a,0xd9,0xb6,0x43,0x49,0x7e,0xa7,0xc3,0x29,0x81,0xd5,0x68,0x4b,0xa6,0x8f,0xbe,0xe,0xb4,0xeb,0x24,0xac,0x9,0x2b,0x90,0xb0,0xb3,0x2b,0x73,0x51,0x6e,0xe5,0xd6,0x7e,0x2b,0x5d,0xf5,0xc3,0x22,0x85,0x1a,0x0,0xb7,0x0,0xf8,0xa8,0x4b,0x89,0x80,0x96,0x7a,0xc1,0xb3,0x7d,0x41,0x3d,0x4e,0x60,0x68,0x71,0x36,0xdc,0xaa,0xe2,0xd4,0x4e,0xe5,0xab,0x1c,0xad,0x42,0xad,0x88,0x83,0x9c,0x52,0xf7,0xc,0x91,0xaf,0x8c,0x92,0x2b,0xb8,0x96,0x4b,0xe9,0x11,0xdb,0xf,0xb2,0x64,0x64,0xcf,0xd,0xf4,0x80,0xb7,0x48,0xfe,0xbf,0xa5,0x33,0x4e,0x98,0xb6,0xd3,0xd7,0x2,0x6a,0xa,0x4a,0x18,0xcf,0x14,0xb0,0x77,0xae,0x45,0xc0,0x1a,0xd2,0x6e,0x5b,0xaf,0xdd,0x72,0xfd,0xb6,0xc4,0x8a,0xa0,0xf,0x20,0x1d,0x4e,0xee,0xfa,0x70,0x80,0x8b,0x24,0x88,0xc8,0xcd,0x1b,0x10,0x1e,0xf3,0xf,0xcf,0xbc,0x1b,0x16,0xff,0xfc,0xf8,0x19,0x1d,0x12,0x7,0xa8,0x66,0x73,0xd2,0x64,0x80,0xfd,0x8a,0x3b,0x14,0xa2,0x9d,0xb6,0x7e,0xa1,0x1,0x6c,0x6d,0x7f,0xa1,0xc1,0x8f,0x57,0x37,0xa7,0x72,0x51,0xd0,0x38,0x28,0x66,0x24,0x6d,0xa1,0x99,0x77,0x3c,0x69,0x97,0x2a,0x9b,0xcb,0x91,0x41,0xfc,0x63,0xe,0xcb,0xcf,0x78,0xf,0x47,0xb3,0x3f,0xf0,0xe9,0xe7,0x65,0xb5,0x1a,0xfc,0x8e,0xc7,0x1,0xc8,0x28,0xb9,0x91,0xa,0x4f,0x7d,0x56,0x71,0xc6,0xb3,0xd,0xfb,0x5b,0x97,0x10,0x8a,0x12,0xdf,0x13,0xb,0x25,0xfd,0xf,0xc9,0x67,0x17,0x4f,0x1b,0x95,0x2,0xf0,0xfb,0x11,0x57,0x3f,0xff,0x9e,0x9c,0xfb,0x15,0x84,0x5d,0x4b,0xf8,0x8e,0x38,0x80,0x6,0xf2,0x69,0x92,0xdf,0x5e,0x3c,0x6d,0xd4,0xe2,0xe,0xb,0x5,0x57,0x55,0xfe,0x5f,0xf5,0xdc,0x81,0x4e,0xaa,0x6f,0x19,0x5f,0x88,0x12,0x9a,0x38,0xca,0xc8,0xb0,0x51,0x4e,0x2c,0x1d,0x8a,0xdc,0xaf,0xc0,0x35,0x82,0xf1,0x57,0xbc,0x50,0x6a,0x4c,0xb7,0x23,0xcd,0x1e,0xa6,0x79,0x23,0x41,0xfb,0x22,0xbd,0xba,0xa7,0x96,0xfc,0xfc,0xf8,0x8c,0x8f,0xe2,0xe2,0x69,0xa3,0x9e,0x4,0x6d,0x98,0x80,0xdf,0x28,0x4a,0xf7,0x48,0x2a,0x58,0x64,0x64,0x14,0x40,0x62,0x20,0xef,0x10,0x70,0x45,0xad,0x7,0xbf,0x63,0x71,0x0,0x62,0x0,0xc1,0xfa,0x96,0x38,0x4f,0xeb,0x3e,0x66,0x79,0x1e,0x34,0x21,0xfb,0xcc,0x41,0x18,0x5b,0xe1,0x8,0xac,0x88,0x4b,0x64,0xd7,0xec,0x23,0x77,0x8,0xfb,0x2b,0xc0,0xf9,0xa0,0x6e,0x7,0xf0,0x16,0xa0,0xed,0x4b,0xa6,0x8d,0x2a,0xe8,0x91,0xbb,0xe4,0xe7,0xa3,0x5e,0x3b,0xfc,0xea,0xe7,0x27,0x41,0x98,0x28,0xb9,0xa9,0x59,0xa5,0x31,0x5a,0x1c,0xe5,0x37,0x40,0xde,0xb5,0x74,0xda,0x71,0x1f,0xec,0x88,0x6e,0xef,0x48,0x22,0xe0,0x68,0x80,0xbd,0xa2,0xe4,0xa4,0x95,0x38,0x99,0x84,0xab,0x4f,0x91,0x7,0xd,0x63,0x8,0x5a,0x2c,0x24,0x3b,0x57,0x5d,0xcf,0xd3,0xd9,0xda,0xe2,0xcd,0xcb,0x40,0xb9,0xe3,0x60,0x90,0x9b,0x24,0x6d,0x5e,0x32,0x6d,0x54,0x59,0x8e,0xa8,0x4b,0xa6,0x8d,0xda,0x30,0xe2,0x9a,0x85,0xb3,0x20,0x2e,0x80,0xf4,0x3c,0x80,0x7d,0x25,0x6d,0x0,0x39,0x1,0xd0,0x4b,0x4b,0x3,0x91,0xb1,0x83,0xe6,0x5d,0x47,0x11,0x1,0x5f,0x7d,0xfe,0x45,0x12,0x47,0x85,0x9e,0x1c,0xe5,0xe,0x88,0x62,0x5c,0x80,0x0,0xef,0x4,0xb0,0x8,0xc0,0x89,0x80,0xce,0x42,0x89,0xb4,0xb3,0x31,0x6f,0xa1,0x8a,0xdc,0xda,0xf3,0xb8,0x4d,0x6a,0xc9,0xb4,0x51,0x75,0xed,0x42,0x43,0xaf,0x59,0x78,0xa0,0xa4,0xc3,0x0,0xac,0x59,0x32,0xed,0xb8,0xb5,0x3b,0x9e,0xf1,0x76,0x90,0x76,0xf8,0xd5,0x2f,0xbc,0xb,0xa0,0x4f,0x3c,0xdf,0x50,0xa9,0x41,0xc9,0xdf,0x2f,0xe9,0x2f,0x0,0x27,0x0,0x58,0xc9,0xa0,0x9e,0x71,0x1f,0x0,0xbb,0x4a,0xaa,0x43,0x50,0xde,0xbe,0x17,0x80,0xcf,0x0,0xea,0xf,0x60,0x4f,0x0,0x9f,0x6,0x82,0x44,0x54,0x95,0xfa,0xf3,0x47,0x62,0x46,0x52,0x8a,0xb4,0x1e,0x4b,0xa6,0x1d,0x9b,0x6e,0xcf,0xbb,0x1f,0xf9,0xb5,0x45,0x89,0x3f,0x4c,0x3d,0x3a,0xbd,0x33,0xfa,0xbd,0xc3,0x88,0x0,0x82,0xbf,0x10,0xf4,0x35,0x85,0x81,0x50,0x81,0x5f,0x24,0x8a,0xa5,0x1f,0xd,0x13,0x22,0x86,0xa,0x59,0x20,0x5,0xae,0xf7,0xd3,0xfe,0x1f,0x97,0xcd,0x38,0xde,0x1,0x58,0x1f,0x6e,0x59,0x2,0xbb,0xe6,0x25,0x12,0xae,0x17,0xc0,0x5d,0x43,0x82,0xe8,0x27,0xa7,0x85,0x66,0xf4,0x10,0x66,0x36,0xa9,0x40,0xe8,0x84,0x55,0x6e,0xab,0xe3,0x1d,0xb8,0xb3,0x6,0xbf,0x43,0x11,0x80,0x80,0x9f,0x90,0xb6,0x50,0x72,0x97,0x82,0x3c,0x35,0x5e,0xa6,0x2c,0xce,0x75,0x63,0x2c,0x5b,0x41,0xd4,0xb8,0x23,0x80,0x1f,0x4a,0x7c,0x3c,0x1c,0xfc,0xc2,0x72,0xf7,0xa6,0x63,0x4,0x60,0x53,0xb8,0xe1,0xf0,0xab,0x17,0xbe,0x45,0xf2,0x77,0x2,0x8e,0x1,0x90,0xa7,0x2a,0x14,0x10,0x34,0x39,0x95,0x5a,0x32,0xcf,0xb3,0xa5,0xb3,0x3b,0xa1,0x74,0x18,0x33,0x70,0xc9,0xb4,0x63,0xdf,0x5a,0x7c,0xd3,0xc8,0x7,0x0,0x5e,0xf,0xf0,0x22,0x9,0xbf,0x89,0x9c,0x4b,0xf2,0x1c,0x46,0x48,0x9a,0x62,0xfb,0xfe,0x0,0xf0,0x7f,0x97,0x4c,0x3b,0xb6,0xa2,0x5a,0x43,0x66,0x46,0x9a,0xdd,0x13,0xc3,0xe7,0x55,0xa6,0xcb,0x59,0x8,0xd6,0xc0,0x1,0x7c,0x13,0xb5,0x75,0x18,0xf8,0xf8,0xe8,0x0,0x2d,0x75,0x82,0x85,0x87,0x2,0x38,0x9c,0xe4,0xf1,0x0,0xc6,0x2,0xd8,0x2d,0x7f,0x4e,0x4a,0xda,0x8,0xe0,0xcc,0x25,0xd3,0x8e,0x5d,0xd8,0x36,0x5,0xec,0xa5,0x7d,0x25,0xb7,0x3e,0xac,0x8b,0xa8,0x72,0xfb,0x24,0xb4,0x30,0x52,0x92,0xe6,0x3,0x98,0xb4,0x64,0xda,0xb1,0xae,0x9b,0x0,0x6a,0x45,0x8,0xd7,0xbc,0xd8,0xf,0xc0,0xe9,0x0,0xfe,0x85,0xe0,0x11,0x0,0x46,0x87,0x28,0xc1,0x36,0x41,0x57,0x2d,0xb9,0x69,0xe4,0x5d,0xed,0xbc,0xfe,0x33,0x46,0x3b,0x16,0x41,0xed,0xbd,0xc0,0x4b,0xb8,0x8,0x29,0xc8,0xe5,0x98,0xb,0x8d,0x4e,0xee,0x3f,0x1,0xfc,0x78,0xc9,0x4d,0x23,0xbb,0x9,0x60,0x47,0xb4,0x23,0xbe,0xb6,0x68,0x38,0x80,0x89,0x21,0x37,0x58,0xff,0xf2,0xd4,0xa3,0xbf,0xdf,0x2e,0x13,0xec,0xda,0x45,0x94,0xdc,0xc9,0x24,0x7f,0xd,0x60,0x97,0x38,0x17,0x28,0x60,0x85,0x28,0x6b,0x6e,0x2,0x0,0x1c,0x80,0x31,0xa4,0x3d,0xb6,0x33,0x42,0xd3,0x3f,0x96,0x4,0x50,0x8b,0x36,0xe2,0xda,0x45,0xbb,0x48,0x7a,0x95,0xe4,0xbe,0xf9,0x66,0x67,0x31,0x6f,0x65,0x49,0xeb,0x49,0xbe,0x42,0xf2,0xa2,0x97,0xa7,0x1e,0xb5,0xbe,0x5b,0x7,0xe8,0xec,0x44,0x70,0xcd,0x4b,0x37,0xd0,0x78,0x3d,0x80,0x44,0xe8,0x87,0x95,0x2,0xd0,0x8,0xa1,0x11,0xc4,0x36,0x0,0x9b,0x24,0x6d,0x24,0xb9,0x5,0xc2,0x46,0x41,0xb,0xcd,0xec,0xf7,0x7f,0xf8,0xd9,0x51,0xab,0x3b,0xfb,0xbb,0x27,0xba,0x87,0x1f,0xa0,0xd9,0xff,0x48,0x3a,0x0,0x40,0x2f,0x92,0x9b,0x2,0xf3,0xe,0x1b,0x69,0xfc,0x0,0xc0,0x7b,0x92,0xde,0x0,0xf0,0xca,0xcb,0x53,0x8f,0xde,0xd0,0xdd,0x5b,0xdd,0xad,0xbb,0x75,0xb7,0xee,0xd6,0xdd,0xba,0x5b,0x77,0xeb,0x6e,0xdd,0xad,0xbb,0x75,0xb7,0xce,0xdd,0xfe,0x3f,0x32,0x68,0x5,0x7e,0xca,0x1c,0xa0,0x1d,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x80,0x8,0x6,0x0,0x0,0x0,0xc3,0x3e,0x61,0xcb,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0x2e,0x23,0x0,0x0,0x2e,0x23,0x1,0x78,0xa5,0x3f,0x76,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdc,0x9,0x7,0x13,0x2,0x0,0x15,0xb9,0x53,0x97,0x0,0x0,0x21,0x58,0x49,0x44,0x41,0x54,0x78,0xda,0xed,0x7d,0x79,0x9c,0x1c,0x55,0xb5,0xff,0xf7,0x7b,0xab,0x7b,0x66,0x48,0x8,0x61,0xd1,0x90,0xb0,0x88,0x91,0x27,0x24,0x24,0x21,0x3b,0x8,0x4,0x42,0x58,0x54,0xe0,0x91,0x80,0x24,0x1,0x2,0x9,0x42,0x80,0x4,0x11,0x90,0x9f,0xf2,0xd3,0xa7,0xcf,0xe7,0xf3,0x3d,0x1f,0x1f,0x7f,0xea,0xd3,0x48,0x4c,0x8,0x61,0xd,0x49,0x64,0x89,0x82,0x40,0x58,0x4,0x64,0xb,0x44,0x25,0x9b,0xd9,0x51,0x14,0x41,0x3,0xc8,0x16,0x20,0xfb,0x4c,0x77,0xdd,0xef,0xef,0x8f,0xaa,0xea,0xae,0xee,0xa9,0xea,0x9e,0xee,0xae,0x99,0xe9,0xe0,0x9c,0xf9,0xd4,0x74,0xd5,0xad,0x5b,0x77,0x39,0xe7,0xdc,0x7b,0xcf,0x39,0xf7,0xdc,0x7b,0x81,0x2e,0xe8,0x82,0x2e,0xe8,0x82,0x2e,0xe8,0x82,0x2e,0xe8,0x82,0x2e,0xe8,0x82,0x2e,0xf8,0xe7,0x2,0x76,0x76,0x1,0xea,0x1,0xe,0xff,0xc2,0xcc,0xbd,0x60,0x5b,0x6e,0xb6,0xd6,0xf6,0x2,0xb8,0x8d,0xc6,0x6c,0x36,0x34,0x6f,0x81,0x7c,0x43,0x30,0x7f,0x27,0xcd,0xdf,0x8c,0xe3,0x6c,0xda,0x70,0xef,0xf4,0x37,0x3b,0xbb,0xac,0x49,0x43,0xaa,0xb3,0xb,0x50,0xf,0x20,0x9b,0xfd,0x96,0xcd,0xb6,0x4c,0x40,0xd0,0x20,0x2c,0xac,0x4b,0xb3,0x3,0xc0,0x36,0x80,0x5b,0x41,0x6c,0x75,0x5b,0xb8,0xed,0xb0,0x71,0xff,0xbb,0x83,0xc6,0x6c,0x26,0x9d,0x65,0x74,0xd2,0x4f,0x6e,0x5c,0x74,0xc5,0xba,0xce,0x2e,0x7b,0xad,0xf0,0x4f,0xdf,0x3,0xf4,0x9f,0x38,0xb7,0x5b,0x76,0xd7,0x7,0x2f,0xcb,0xda,0x3,0xc8,0x42,0x94,0x48,0x6a,0x15,0x9f,0x24,0x0,0xbe,0x43,0xe3,0xfc,0xc1,0x49,0x37,0x4d,0xdd,0xf8,0x8b,0x2b,0xff,0xde,0xd9,0x75,0xa8,0x5,0x76,0x2b,0x6,0xe8,0x37,0x7e,0xf6,0x18,0xeb,0xb6,0x9c,0x6,0x69,0xf,0x1a,0xf3,0xc1,0x1f,0xef,0xbb,0xe6,0xdb,0xb5,0xa4,0x37,0xf2,0x9a,0xa5,0xdc,0xb2,0x69,0xe5,0x69,0xca,0xec,0xf8,0xa5,0xa4,0x26,0x48,0xf2,0x29,0x8c,0x82,0x7b,0x40,0x3e,0xae,0xfc,0x5f,0x41,0x82,0x4d,0x37,0xf5,0x18,0xb7,0xd7,0xc1,0xc3,0x1f,0xfe,0xfd,0x4f,0x3e,0xa3,0x2a,0x8b,0xd0,0xe9,0x50,0xf7,0xc,0x70,0xf8,0x39,0xb3,0x3e,0x9,0xb9,0xa7,0x48,0xf6,0x70,0xb9,0xd9,0xd1,0x90,0x3b,0xd2,0x2b,0x39,0x9b,0x4d,0xaa,0x69,0xfa,0x1f,0xef,0xbb,0xfa,0x8e,0x5a,0xd2,0x3f,0x6c,0xdc,0x8f,0x9f,0x91,0xcd,0x8c,0x2,0xe9,0xe4,0x43,0x3,0x7a,0xc7,0x80,0x4,0x80,0xbb,0x9c,0x74,0xd3,0x77,0xdd,0xcc,0xce,0x1f,0xbc,0xfc,0xd0,0xd7,0x6d,0x67,0xe3,0xa9,0x5a,0xa8,0x5b,0x19,0xa0,0xdf,0xf8,0xd9,0x47,0x42,0xee,0x51,0x72,0x5b,0x3e,0x6b,0xdd,0xcc,0x69,0x0,0xf6,0xf4,0x8,0xe3,0x75,0xc3,0x92,0x1a,0x6d,0x66,0xd7,0x8f,0xfa,0x8d,0x9f,0xf5,0xe7,0x97,0x7e,0x71,0xe5,0xf3,0x55,0xe5,0x31,0xe1,0xc6,0x83,0xdc,0x5d,0x5b,0x46,0x3,0x7e,0xb3,0xce,0x51,0xbd,0x74,0xbb,0xf0,0x9b,0xbb,0x23,0xd9,0x23,0x59,0xf7,0x4d,0xa8,0x34,0xd4,0x1d,0x3,0xf4,0x3b,0x67,0xf6,0x20,0xc0,0x1d,0x65,0xb3,0xcd,0x67,0xc9,0xcd,0x9c,0xa,0x9f,0x1a,0xfe,0xd8,0x5b,0xd0,0x15,0xb,0xda,0xcf,0x66,0x9a,0x7f,0xd8,0x7f,0xc2,0x9c,0xb1,0x1b,0x17,0x4d,0x7f,0xa7,0x92,0x7c,0xe,0xff,0xc2,0xd,0x69,0x58,0x77,0x1c,0x40,0x17,0x84,0x3,0x54,0x48,0x4a,0xd2,0x91,0x75,0x7,0x38,0x4d,0x7b,0xef,0xd6,0x2c,0x50,0x37,0xc,0xd0,0x7f,0xc2,0x8d,0x7,0x3,0x1a,0x65,0x33,0xcd,0x97,0x58,0x9b,0x3d,0x5,0x0,0x40,0xe6,0x5a,0xa6,0x82,0x47,0xbf,0x13,0x0,0x21,0x82,0x90,0xdc,0xcf,0xc8,0x66,0xbe,0xd6,0x6f,0xfc,0xac,0xef,0xbc,0xf4,0x8b,0x2b,0x77,0xb5,0x35,0x3f,0x93,0x6a,0xb4,0x36,0xb3,0xe3,0x7c,0x1a,0xe3,0x8f,0xe9,0xe1,0x21,0x3f,0x4,0xe1,0xd1,0x40,0x80,0x24,0xd1,0x90,0x10,0x8c,0x64,0xf,0x31,0xa9,0xa6,0x2e,0x6,0x48,0x2,0x64,0xb3,0xdf,0xb0,0xd9,0xe6,0x2f,0x1,0x41,0x6b,0xf7,0x9,0x2f,0x91,0x1e,0x23,0x78,0x40,0x9f,0x8,0x34,0x41,0x90,0x75,0x33,0xbb,0xfe,0xaf,0xd3,0xd0,0x7d,0xd9,0x61,0xe3,0x7e,0x78,0xdf,0x9f,0x1e,0xb8,0x2e,0x72,0x3c,0x1e,0x30,0xe9,0xce,0x94,0xdb,0xb2,0x7d,0x1f,0xd2,0xf4,0x0,0x6c,0x1a,0xb2,0xbd,0x65,0xdd,0xcf,0x0,0x30,0x0,0x41,0x42,0x91,0xbd,0x0,0xb,0xef,0x49,0x52,0x9e,0x7a,0x40,0x48,0x7b,0xee,0x6,0x62,0x54,0x49,0xa8,0x1b,0x6,0xb0,0xd9,0xcc,0x39,0x7e,0x6b,0xb,0xda,0x5c,0xa8,0xeb,0x2f,0x4,0x7a,0x81,0x41,0x3c,0x3,0x10,0x36,0xbb,0xeb,0xc7,0x4e,0x43,0x8f,0xd7,0xfa,0x4f,0xb8,0x71,0x3,0x68,0xf6,0x7,0xb0,0x37,0x81,0x34,0x8,0xca,0xda,0x46,0xb7,0x65,0xeb,0x27,0x20,0x3b,0xd8,0x75,0xdd,0xbe,0x4,0xf6,0x83,0x74,0x30,0x80,0x40,0xf0,0x53,0x25,0x43,0x0,0xfd,0xff,0x22,0xad,0xcd,0xee,0xac,0x59,0x3,0xe8,0x7f,0xee,0x2d,0xdd,0x36,0xde,0x73,0xe9,0x8e,0xce,0xc0,0x7b,0xdd,0x30,0x0,0x8d,0xf3,0xb2,0xac,0x3e,0xe,0xc0,0x20,0x4e,0xc,0xf,0xc8,0x1e,0x3c,0xf9,0x8a,0x3a,0x49,0x40,0xf6,0x60,0xeb,0xb6,0xfc,0x1f,0xd2,0xac,0xb3,0xb6,0xf9,0x24,0x78,0xad,0xbb,0x9b,0x17,0xb5,0x90,0x46,0xca,0x25,0x46,0x85,0x52,0x8e,0xcb,0xa7,0x30,0xdc,0x4a,0xa0,0x21,0xe8,0x7d,0xed,0x36,0x6f,0xad,0x89,0x1,0x8e,0x38,0x77,0x6e,0x5f,0xeb,0xb6,0x9c,0xde,0x7f,0xc2,0x9c,0xe7,0x36,0x2e,0x9a,0xbe,0xb6,0xc3,0xf1,0xde,0xd1,0x19,0xc6,0x41,0xff,0x9,0xb3,0xbf,0x67,0x33,0xcd,0x5f,0x96,0x6c,0xcf,0x70,0xab,0x8f,0xa3,0x43,0x41,0xb8,0x4,0x90,0x16,0x80,0x41,0xd8,0x78,0x43,0x6,0xef,0x8a,0xf4,0x7a,0x9,0xf2,0xfa,0x7d,0xff,0xb1,0x40,0x0,0x60,0x51,0xde,0xc5,0xf9,0x11,0x39,0x23,0x51,0xd6,0x69,0xdc,0xf3,0x18,0xc9,0xbe,0x61,0x9c,0x86,0xad,0x1b,0xee,0x9e,0xba,0xb5,0xad,0xf5,0x3d,0xe2,0xbc,0x5b,0xbb,0xc1,0xba,0x9f,0xc8,0x66,0xb6,0x2f,0x86,0x74,0x28,0x80,0xb7,0x4d,0xba,0xdb,0xb9,0xc6,0x38,0x4b,0x37,0xdc,0x73,0x59,0x4b,0x47,0xe1,0xbd,0x6e,0x18,0xa0,0xdf,0x84,0x39,0xa7,0x2b,0xb3,0x73,0x2e,0xa0,0x3,0x81,0x60,0x9c,0x6f,0x73,0xb7,0x1c,0xc8,0xb,0x20,0xf3,0xad,0x3a,0xf4,0x9c,0x78,0x3d,0x95,0x37,0x13,0x92,0xc6,0xf9,0xb,0x9d,0xf4,0x22,0x63,0x52,0xb7,0x3,0x78,0x3d,0xdb,0xbc,0x6d,0xe7,0x9f,0x1e,0xf8,0x6a,0xac,0x6d,0xa0,0xff,0x84,0x39,0xfb,0x4b,0xee,0x14,0x9b,0x69,0xfe,0x41,0x90,0x9a,0x2f,0x5b,0xc0,0xa4,0x9b,0xfe,0xcd,0x18,0xe7,0x96,0xd,0xf7,0x4e,0x7f,0xb7,0x23,0xf0,0x5e,0x37,0xc,0xd0,0xff,0xdc,0x9b,0x3f,0x65,0x5b,0xb6,0x3f,0x21,0xd9,0x4f,0x41,0x8,0x24,0xed,0xb6,0x95,0x56,0x65,0xde,0x25,0x55,0x53,0x3f,0xad,0x9c,0x26,0xe0,0x3f,0x14,0xf4,0x1e,0x26,0x75,0x3f,0x9d,0x86,0x9f,0xd2,0x49,0xaf,0xec,0xd1,0xfb,0x88,0x6d,0xc5,0x56,0xc2,0xfe,0x13,0x6f,0x3a,0xcc,0x66,0x9b,0xe7,0x40,0xee,0x18,0x0,0x5e,0xaf,0x15,0x24,0x3,0x8,0x24,0x8d,0xd3,0x70,0x13,0x4c,0xea,0xfb,0x1b,0xef,0x9d,0xf6,0x6a,0x7b,0xe3,0xdd,0xb4,0x77,0x6,0x6d,0x85,0x8d,0xf7,0x5c,0xf6,0xa,0x69,0x9a,0x3d,0x51,0x3b,0xc0,0x26,0xfd,0xb,0xa5,0x9,0x58,0xaa,0xa3,0x28,0xf7,0x6d,0x25,0xe0,0xa7,0x95,0x27,0x3e,0x94,0xcf,0xc0,0xd3,0x26,0xad,0x9b,0x3d,0xdb,0x6d,0xd9,0xf1,0x8c,0x6d,0xd9,0xfe,0xdc,0x96,0xd7,0x57,0x9f,0x11,0xfe,0xfc,0x88,0x73,0xe7,0x9e,0xec,0xb6,0xec,0xd8,0x28,0xeb,0x8e,0xf1,0xbe,0xf5,0xf1,0x2f,0x88,0xa0,0xcf,0x48,0xb4,0xd6,0x6d,0x99,0x66,0xb3,0x2d,0xf3,0xfb,0x4f,0x9c,0x7b,0x5c,0x7b,0xe3,0xbd,0x6e,0x7a,0x0,0x0,0xe8,0x77,0xce,0xcf,0x9e,0xb3,0x6e,0xe6,0x78,0x20,0x5a,0xfa,0xaf,0x3f,0x8,0x86,0x81,0x7c,0x61,0xfd,0x91,0x41,0x64,0xa0,0x5a,0x38,0x2b,0x4c,0xba,0xf1,0x3b,0x4,0x7a,0x66,0x5b,0x76,0x2c,0xf4,0xf8,0xbb,0xd5,0xb0,0x54,0xd0,0x4f,0x5,0x6a,0x26,0x8d,0x79,0x8d,0x4e,0xd3,0xbf,0xbd,0xb4,0x68,0xda,0x5d,0xed,0x55,0x3,0xa7,0xf6,0x24,0x92,0x83,0x8f,0xf,0x1c,0x9b,0x2,0x34,0x9c,0x40,0x8f,0x78,0xcb,0x4c,0x3d,0x41,0xd0,0x45,0xf9,0xe0,0xcb,0x2d,0xbe,0xd5,0x92,0x14,0x24,0xa2,0xb7,0x6c,0x76,0x82,0xac,0x7b,0x16,0x29,0x27,0x50,0x21,0x1,0x85,0xba,0xba,0x5c,0x37,0xe2,0xdb,0xbb,0x72,0x36,0xb0,0xbd,0x61,0xdd,0x13,0xf7,0x3f,0xf2,0xec,0x96,0x77,0xd6,0x2f,0xfe,0x5d,0x7b,0xd4,0xa0,0x6e,0x86,0x0,0xaf,0x34,0xce,0x12,0x0,0xef,0x7b,0xf7,0x86,0xf9,0x21,0x60,0x37,0xb9,0x8c,0xf1,0x94,0xc3,0x80,0x71,0x69,0x40,0xd2,0x90,0x6c,0x0,0xd4,0x0,0x18,0x79,0x17,0x8,0x18,0x45,0xa4,0xe1,0x31,0x81,0x31,0xfe,0x7b,0x3,0x40,0xfb,0x65,0x33,0xbb,0xbe,0xde,0x6f,0xc2,0x9c,0xaf,0xb4,0x7,0xca,0xeb,0xa6,0x7,0xe8,0x3f,0x71,0xee,0x4,0x4f,0x38,0x52,0x3f,0xf8,0xb6,0x9e,0xd0,0xe8,0xba,0xfb,0x5c,0x44,0xae,0xfd,0xe7,0xee,0x1,0xbf,0x67,0x80,0x7f,0x11,0xa1,0x77,0x45,0xdf,0x93,0xa1,0x74,0x82,0x1e,0x61,0x4f,0xca,0xe,0xea,0x35,0xe8,0x2c,0xe7,0x9d,0xf5,0x8b,0x97,0x26,0x89,0xf7,0xba,0x30,0x4,0xf5,0x9f,0x78,0xd3,0x2c,0x9b,0xdd,0x75,0x36,0xa0,0x3e,0xde,0x18,0x69,0x24,0x28,0x6c,0x0,0xde,0x1d,0x81,0x31,0xf7,0x6d,0x6,0x6f,0x14,0xf4,0x70,0x21,0xb0,0x1b,0xc8,0xee,0x49,0x17,0xb2,0xd3,0x19,0xe0,0xf0,0x73,0x66,0x3d,0xad,0x6c,0xcb,0x48,0x0,0xdd,0xbd,0x39,0x1e,0xdf,0x74,0x53,0xef,0xc3,0x7f,0x87,0x40,0xce,0xe4,0xd,0x1a,0x67,0xb5,0x71,0xd2,0xd7,0x27,0x9d,0x43,0x62,0xc,0x70,0xc4,0xb9,0x73,0x7f,0x24,0x61,0x1b,0x8d,0xf3,0xd3,0xd,0x77,0x4f,0x7d,0xbf,0x5c,0xfc,0x81,0x93,0xee,0xd8,0x23,0xdb,0xb2,0xe3,0x31,0xd9,0xec,0x9,0x5e,0x3f,0x97,0x13,0x80,0xbb,0x88,0xef,0x83,0x6f,0xc0,0x24,0xe9,0xbc,0x63,0x9c,0xf4,0xe2,0x75,0x3f,0xbf,0x38,0x71,0xb,0x61,0x22,0x98,0x3e,0xe2,0xbc,0x5b,0x47,0xd8,0xcc,0xce,0x7,0x25,0x75,0xa3,0x71,0xd6,0x80,0xe6,0x75,0xd2,0xfc,0x99,0xc6,0x99,0xb7,0xe1,0xee,0xa9,0x7f,0x2e,0x8e,0xdf,0xff,0xdc,0x5b,0xe,0x95,0xdb,0x72,0x87,0x6c,0x76,0x14,0xe9,0xab,0xc2,0x5e,0x4d,0xe1,0x49,0xc7,0x51,0xc5,0x8c,0x33,0xb9,0x87,0xe7,0x85,0x54,0xe2,0x9b,0x62,0x3,0x6f,0xb9,0xb4,0x63,0xb5,0xb4,0x88,0xf0,0xa8,0xef,0x2a,0x29,0x6f,0xeb,0x6f,0x72,0xbe,0x67,0x0,0x41,0xe7,0x91,0x74,0xd3,0x9e,0xe3,0xd7,0x2e,0x98,0xb2,0xb3,0x1a,0xfa,0x94,0x82,0x9a,0x19,0xe0,0x88,0xf3,0xe7,0xf5,0x50,0x76,0xc7,0xc3,0xb2,0xee,0x71,0x80,0x42,0x5a,0x85,0xd9,0x42,0x63,0xd6,0x80,0xce,0x4a,0x1a,0xe7,0x77,0x26,0x95,0x7e,0x74,0xdd,0x82,0x29,0x1f,0x1c,0x71,0xfe,0x6d,0x43,0x6c,0x66,0xd7,0x4d,0x90,0x7b,0x54,0xa8,0x18,0xc2,0x6e,0x3e,0xe0,0x27,0xa,0xca,0xd9,0x1c,0x9,0x3a,0xaf,0x9a,0x54,0xc3,0xbf,0x6f,0xb8,0xfb,0xd2,0x85,0xed,0x91,0x55,0xcd,0x43,0x80,0xdc,0xe6,0x1f,0xcb,0xba,0xbe,0xf1,0xc6,0x84,0xed,0xf0,0x7b,0xc9,0xba,0xa3,0x0,0x77,0x94,0xac,0x73,0x86,0xac,0x3b,0xae,0xff,0xc4,0xb9,0x7f,0x57,0xb6,0x79,0x38,0x64,0x8f,0xf2,0x6c,0xf4,0xb9,0x7e,0xdf,0x17,0xf8,0xca,0xb5,0xe0,0xb6,0x98,0xf5,0x2b,0x69,0x95,0xc5,0x3e,0x9f,0xe1,0xfb,0x72,0x71,0xdb,0x52,0xd6,0xf0,0x77,0x71,0xe5,0x2c,0xec,0x11,0x3c,0xe9,0x97,0xb9,0xf9,0x26,0x1a,0xe7,0xa9,0xc6,0x6e,0x3d,0xef,0xa9,0x95,0x4e,0x71,0x50,0x53,0xab,0x1b,0x70,0xfe,0x6d,0x5f,0xb0,0x99,0x9d,0xbf,0x90,0x37,0x8b,0x9f,0xa3,0x62,0x48,0x82,0x97,0x82,0x3c,0xa,0x3c,0xee,0x68,0x25,0x85,0xad,0xfd,0x5d,0xad,0x3f,0x4,0x9e,0x25,0x90,0x34,0x4e,0xea,0x45,0x3a,0xd,0xd7,0xad,0xbf,0xeb,0xe2,0xe7,0xda,0x2b,0xaf,0xaa,0x7b,0x80,0x81,0x93,0xee,0x38,0xd8,0xcd,0xec,0xfc,0xbe,0x2,0xa3,0x95,0xef,0x58,0xc5,0x90,0xff,0x4e,0xce,0x98,0x27,0x8,0x26,0x4f,0x64,0x8f,0xf8,0x7e,0xb7,0x5f,0xcd,0x5c,0x5d,0x12,0xf3,0x7b,0xd5,0xb0,0x5e,0xa9,0x6f,0x8a,0x1c,0xc7,0x2b,0xae,0x47,0xe1,0x77,0xde,0x9d,0x71,0xee,0x69,0x4f,0xe2,0x3,0x55,0x5a,0x2,0x7,0x4c,0x9a,0xd7,0x60,0x6d,0xf6,0x5a,0x59,0xfb,0x69,0x7f,0xf2,0xc6,0x9b,0x5d,0x2f,0x12,0xdf,0x73,0xcf,0x45,0xe3,0xbb,0x37,0xe7,0x91,0x73,0xac,0xa9,0x1c,0x2a,0xfc,0x46,0x2a,0xe8,0x9f,0x15,0xfc,0x13,0x50,0xe0,0x3e,0x20,0x95,0x49,0xa8,0xd4,0xc4,0x12,0x8b,0x7e,0x2b,0xad,0x7,0x8b,0x5f,0x30,0x5e,0x8e,0x4c,0x10,0x2a,0x66,0x80,0x81,0x17,0xce,0x77,0x20,0x3b,0xda,0x66,0x5b,0xae,0xcd,0x9b,0xc1,0xc3,0x53,0x76,0x9d,0x7b,0x29,0x34,0x43,0xe7,0xdf,0xfb,0x73,0xed,0x1e,0x81,0x25,0xd0,0x37,0x34,0xe4,0xae,0xe0,0x1d,0xa3,0x6d,0x73,0xf2,0xd3,0xca,0xdd,0xb7,0xff,0xe5,0x33,0xa9,0xdc,0x2f,0xc,0x98,0x74,0xc7,0xf1,0xed,0xc9,0x0,0x15,0xb7,0xbf,0x41,0x17,0xce,0xef,0x93,0x6d,0xd9,0xf9,0x0,0xac,0x3b,0xd2,0xeb,0xc0,0xe3,0x54,0xb7,0x4a,0x8a,0x50,0x4a,0x65,0x2,0x4a,0xb,0x5c,0x39,0xc8,0x77,0xa2,0xa,0xd4,0xa7,0x82,0xb4,0x3e,0x0,0xf9,0x3e,0x80,0x6d,0x0,0x76,0x92,0xdc,0x5,0xd2,0x42,0x8,0xe4,0x91,0x14,0x80,0x26,0x9,0xdd,0x20,0xbb,0xf,0xa0,0x5e,0x90,0x6f,0x2a,0x67,0x4c,0x1e,0x35,0x6b,0x2e,0x11,0xf5,0x93,0xe7,0x13,0x0,0xc2,0x42,0x32,0x34,0xce,0x93,0x26,0xd5,0x78,0xd9,0xba,0x85,0x17,0xbd,0x5a,0x5b,0x5e,0xa5,0x4b,0xd0,0x26,0x18,0x7c,0xc5,0x33,0xcc,0x7e,0xf8,0xea,0x19,0x36,0xb3,0xf3,0x21,0x0,0x16,0x81,0x12,0x1f,0xae,0x8a,0xe2,0x13,0x2d,0x18,0xf2,0x22,0x4,0xe7,0x3c,0xef,0x7,0xe6,0xaf,0xfc,0x87,0xad,0xc8,0xee,0x8b,0x1d,0xa,0xd6,0x8a,0x84,0xe6,0x66,0xfd,0x98,0x2d,0x34,0xce,0x3f,0x24,0xbc,0x4d,0x9a,0x4d,0x30,0x66,0x1d,0xc0,0x97,0x48,0xfe,0x15,0xe0,0x3b,0x20,0xdf,0x23,0xd4,0xec,0x5a,0x65,0xd2,0xe9,0x86,0x46,0xeb,0x66,0xba,0x1,0xd8,0xd7,0x5a,0xdb,0x7,0xd2,0x0,0xc9,0x8e,0x24,0x74,0xb0,0xa4,0x8f,0x1,0x3a,0x0,0xb2,0xfb,0x86,0xab,0xc2,0x90,0xcf,0x7a,0x1,0x33,0xa8,0x75,0x7d,0xa,0xe4,0xfd,0x8,0x33,0x40,0x41,0x13,0xa,0x3b,0xc6,0x7a,0x35,0xb2,0x74,0x1a,0xe6,0x34,0xef,0xdc,0x7e,0xd5,0x5f,0x1e,0xb8,0x3a,0xf1,0x15,0x48,0x15,0x9,0x81,0xee,0x96,0xbf,0xd,0x92,0xdb,0xf2,0x7d,0x80,0xa0,0x6f,0xb0,0xf7,0xb0,0x9f,0x9b,0xb7,0x40,0xde,0x23,0xab,0x88,0x82,0xb9,0xa7,0xd0,0xff,0x1c,0xc5,0x43,0x2c,0xc3,0xa8,0xc6,0xdb,0x2a,0x2c,0xb0,0x93,0x4,0x62,0x86,0xfc,0x29,0x78,0x80,0x7c,0xf,0x30,0x9b,0x4,0xb3,0x96,0x4e,0x6a,0x71,0x3a,0xd5,0xf0,0xe0,0xea,0x3b,0x27,0x95,0x33,0xa0,0xb4,0x0,0xd8,0xa,0xe0,0x2d,0x0,0x1b,0x1,0x3c,0x15,0xbc,0x18,0x30,0xe9,0xce,0x7e,0xb2,0x99,0x89,0x80,0x8e,0x83,0xec,0xa1,0x92,0x3d,0x8,0x42,0x63,0xa0,0xc1,0x7a,0x79,0x2a,0x50,0x79,0x42,0x66,0xcc,0xbc,0xab,0x40,0x58,0xd,0xca,0xd7,0x3b,0xa8,0x17,0xfc,0x70,0xbf,0x4a,0xfe,0xa,0x88,0xc0,0x30,0x26,0xc1,0x48,0xee,0x99,0x4d,0xdd,0xf7,0x5a,0xe,0xe0,0xf6,0xa4,0x19,0xa0,0xa2,0x1e,0x60,0xe0,0x5,0x77,0x9e,0xea,0x66,0x76,0x3e,0x26,0xc9,0x84,0xb1,0xdf,0x91,0x10,0xb2,0x15,0xcb,0xd7,0x32,0x7c,0xe,0xe0,0xfb,0x24,0xdf,0xa2,0x49,0xdd,0x6c,0x1c,0x67,0xf6,0xda,0x5,0x53,0xda,0xbc,0x48,0xa4,0xad,0x30,0x60,0xd2,0xbc,0x43,0x21,0xf7,0xbb,0x92,0x1d,0x29,0xeb,0x7e,0x2,0x52,0x93,0xbf,0x4c,0x2d,0xd4,0x10,0x12,0xad,0x6b,0xde,0xa7,0x91,0xce,0x12,0xa6,0xf6,0x38,0x75,0xfd,0xc2,0xb,0x9a,0x93,0xcc,0xa3,0x32,0x6,0x98,0x7c,0x57,0xa3,0xcd,0x36,0x9f,0x23,0xb7,0xe5,0x4e,0x40,0x4e,0xe0,0x80,0xd9,0x51,0xf6,0xfb,0x80,0xf8,0x61,0x84,0x4b,0xd8,0x49,0x60,0x87,0x49,0x37,0x7e,0x7b,0xdd,0xc2,0x8b,0x6e,0x6c,0xf7,0x42,0x0,0x18,0x30,0xf9,0xee,0x94,0x32,0xdb,0xe7,0xca,0xba,0xa7,0x1,0xda,0x3f,0xb7,0x78,0x25,0xef,0x26,0x98,0x38,0x42,0x24,0xb9,0x34,0xa9,0x7b,0x36,0xdc,0x3d,0xf5,0x82,0x24,0xd3,0xad,0x5c,0x8,0x9c,0xbc,0x70,0xf,0xeb,0x66,0x2f,0xb3,0xd9,0xe6,0x19,0xf0,0xc7,0x5b,0x4f,0x14,0xc8,0x69,0x57,0x25,0xd2,0x2c,0x67,0x15,0xb,0xc7,0x29,0xf2,0xe5,0xf7,0xa7,0x46,0xe1,0x59,0x19,0xe1,0x79,0xd2,0x3a,0x5b,0x61,0x9c,0xdb,0x68,0x52,0x5f,0x5f,0xbf,0x70,0x72,0x87,0xb9,0x52,0x7,0x30,0x70,0xf2,0xcf,0xbb,0xb9,0x2d,0xdb,0x97,0x41,0xb6,0x2f,0xc0,0x3d,0x2,0xe7,0x64,0x32,0xf0,0x48,0xe,0x44,0xa4,0x52,0xe,0xe6,0xc5,0x78,0x88,0x14,0x72,0x25,0x89,0xa0,0x59,0xed,0xa4,0x1a,0x3f,0xb7,0x6e,0xe1,0x94,0xb7,0xc2,0x2f,0x47,0x5e,0xb3,0x94,0x3b,0xdf,0x7b,0xc5,0xd0,0x69,0xa0,0xcd,0x6c,0x27,0x4d,0x9a,0x0,0xdd,0x75,0xb,0x2e,0x70,0xcb,0xd5,0xa1,0x2a,0x2e,0x1d,0x34,0xf9,0xe7,0x7b,0x58,0xb7,0xe5,0xdb,0x36,0xdb,0xf2,0x75,0x2,0x26,0x34,0xf0,0x33,0x69,0x57,0xae,0x70,0x97,0xf,0x8f,0xf8,0x2,0x0,0x63,0xcc,0x66,0xa6,0x1a,0xc7,0xae,0x5b,0x30,0x39,0x51,0x7,0x89,0x6a,0x60,0xc0,0xa4,0x79,0xd7,0xd9,0x6c,0xf3,0x37,0x0,0xed,0xcb,0xb0,0x47,0x50,0x72,0x26,0xab,0x80,0xe9,0x41,0x93,0x7a,0x7e,0xc3,0xdd,0x53,0x8f,0x1f,0x34,0xe5,0xee,0x46,0x9b,0x6d,0xa6,0x71,0x1a,0x9a,0x24,0xb7,0x2f,0xa4,0x8f,0x9,0xea,0x49,0xa0,0x87,0xa4,0x3,0x69,0x9c,0x17,0x20,0xf7,0xf9,0x75,0xb,0x2f,0xca,0x94,0x4a,0xbc,0xea,0xc2,0xd,0xbc,0x70,0x61,0x83,0x6c,0xf6,0xdf,0xe5,0xb6,0x7c,0x13,0x64,0xb0,0x20,0x23,0xbf,0xd8,0x22,0x49,0x8,0x98,0x4a,0x82,0xa4,0xac,0x71,0x52,0xcf,0x3b,0xd,0xdd,0xce,0x5e,0x33,0xef,0xbc,0xf,0x92,0xcf,0xac,0x5a,0x7c,0x2c,0x18,0x63,0xb3,0xbb,0xe6,0xc9,0xda,0x83,0x3d,0x43,0x17,0x3,0x49,0xbe,0xf6,0x6,0x91,0x5f,0xdc,0x2,0x1,0xbb,0x48,0xf3,0x1a,0xa4,0xde,0x80,0x7a,0x2,0x28,0xd2,0x81,0x82,0x7b,0xae,0x34,0xa9,0xc6,0xeb,0xd6,0x2d,0x9c,0xfc,0x54,0xa9,0xa4,0xab,0xf6,0x9,0x5c,0xb7,0xe0,0x82,0x16,0xa7,0xb1,0xfb,0x7f,0x99,0x54,0xe3,0x75,0x4,0xb2,0x8,0x69,0x33,0x89,0x9b,0x45,0x7c,0x24,0x90,0xcc,0x1a,0x27,0xfd,0xf0,0xfa,0xbb,0x2e,0x19,0x53,0x4f,0xc4,0xf7,0xf0,0x71,0xe1,0xd3,0x26,0xd5,0x78,0xa,0xe9,0x6c,0x40,0x41,0xd9,0x6b,0x77,0x6d,0x43,0xe1,0x6f,0x23,0x64,0xf,0x3,0xb4,0x17,0x8a,0xde,0x15,0xde,0x6b,0x88,0xa0,0x7f,0x29,0x57,0xee,0x9a,0x9c,0x42,0xd7,0xdc,0x3e,0x3e,0xeb,0x34,0x74,0x9f,0x69,0x52,0x4d,0x53,0x4,0xbe,0xdf,0x76,0x8b,0x60,0x18,0x4a,0x85,0x31,0xc7,0xd6,0x5e,0xbf,0x9f,0x7a,0x72,0xfd,0x5d,0x17,0x9f,0x95,0x18,0xd5,0x12,0x86,0x75,0xb,0x26,0xff,0xc9,0x34,0x34,0x9d,0x49,0xe3,0x2c,0xf7,0x2d,0x8e,0xfe,0xf0,0x15,0x26,0x63,0x31,0x59,0x4b,0x85,0x79,0xcf,0x7e,0x7,0x2b,0xd2,0xc8,0xf3,0x31,0xd,0x2e,0x8a,0x34,0xc1,0xd4,0x51,0x51,0x47,0x6c,0xc,0x81,0x4f,0x7e,0xea,0xc2,0x87,0x4a,0xf6,0x3e,0x35,0x7b,0x5,0xaf,0xbe,0xfd,0x9c,0x2c,0x53,0xd,0xf7,0x93,0xdc,0x51,0x64,0xa,0x29,0x1,0x51,0xcc,0x50,0x18,0x26,0xbf,0x1f,0x83,0xe7,0x2b,0x0,0xe3,0xa4,0x9f,0x6c,0x49,0xf7,0x3a,0xbd,0xdd,0xa8,0x97,0x10,0xac,0x9b,0x7f,0xc1,0x2b,0x26,0xd5,0x38,0x85,0xc6,0x59,0x82,0xfc,0xec,0x28,0xa2,0x99,0x1c,0x65,0xc2,0xf2,0xcf,0xcc,0xdb,0xa9,0xc3,0xef,0x99,0x7f,0x95,0x8b,0x27,0x4f,0x39,0x12,0xac,0xcd,0x9e,0xd7,0x9d,0x1f,0x4e,0x2c,0x55,0xde,0x44,0xdc,0xc2,0x6d,0x36,0xd3,0xf,0x40,0xda,0xa3,0x17,0x13,0x71,0xe7,0x26,0xd,0x5,0x58,0x6f,0x4a,0x3c,0xfd,0xa8,0x93,0x6e,0x1a,0xff,0xf2,0xbc,0xd3,0x77,0x8b,0xcd,0x98,0xd6,0xce,0xbf,0x60,0x23,0x4c,0x6a,0x16,0xe9,0xbc,0xec,0x4d,0x31,0x18,0xc9,0x53,0x97,0x6a,0xc6,0x4b,0x1b,0x2e,0x6,0xb3,0x6d,0x90,0xfa,0xca,0xaa,0x7f,0xfb,0x33,0x80,0x9b,0x99,0x1,0x70,0xdf,0x9a,0x13,0x2a,0x4,0x1,0x34,0x34,0xce,0x5a,0x9a,0xf4,0xd,0x6b,0xe6,0x9d,0xf7,0x61,0x7b,0x11,0xac,0x3d,0x60,0xfd,0xc2,0xc9,0xf7,0xc0,0xa4,0x6e,0x7,0xb9,0xcd,0xb7,0x57,0x75,0x98,0xd1,0x2c,0xbc,0x48,0x56,0x50,0x8f,0x52,0x71,0x6b,0x66,0x80,0x23,0xa7,0xdc,0xb5,0x17,0x60,0x87,0x92,0x48,0xe5,0xf5,0xde,0x44,0xc4,0x1e,0x92,0xdc,0x42,0x93,0x5a,0xb0,0x76,0xfe,0xa4,0xc7,0x3a,0xa,0x79,0x49,0x82,0x31,0xce,0x2c,0x9a,0xd4,0xbd,0xbe,0x8d,0x3a,0x98,0x25,0x69,0xf7,0x19,0xc5,0x80,0xf8,0xbe,0xf6,0x7c,0xe4,0xc0,0xc9,0xb,0x87,0xc4,0x96,0xb1,0x96,0xa,0x1e,0x7d,0xed,0xef,0x8,0x72,0x38,0x80,0xb4,0x97,0xa1,0xd7,0xcd,0xd5,0xd2,0x83,0xf9,0x5,0xf7,0x2a,0xe0,0xa4,0x1e,0x0,0x4d,0xe2,0xf6,0xef,0x8e,0x82,0xb5,0xf3,0x27,0x6d,0x31,0x4e,0xfa,0x36,0x18,0x67,0x29,0xfc,0x3e,0xd9,0x9f,0xe9,0xab,0xc,0x27,0x11,0xf7,0x88,0x9,0xf7,0x47,0x1,0xff,0x3f,0x1,0x6b,0x4f,0x80,0x74,0x76,0x5c,0x19,0x6b,0x62,0x80,0x6d,0xff,0xd8,0x48,0xeb,0x66,0xcf,0x25,0x4d,0xca,0x2f,0x51,0xcd,0xeb,0x79,0x7c,0x75,0x9f,0xa0,0x79,0x15,0x30,0xf7,0xaf,0x9b,0x3f,0xa9,0xa2,0xdd,0xbf,0xea,0xd,0xd6,0xde,0x79,0xfe,0xb,0x34,0xa9,0xc5,0x0,0x0,0x1a,0x11,0xac,0x58,0x31,0x64,0xc4,0x3d,0x63,0xc2,0x8b,0xf0,0x28,0x92,0xd,0x24,0xfa,0xc6,0x95,0xaf,0x26,0x6,0x58,0x7f,0xd7,0xc5,0x56,0x6e,0x76,0x2c,0xa0,0x34,0x69,0xc2,0x5b,0xaf,0x54,0x7e,0x91,0x81,0xe4,0xef,0xf5,0x22,0xc6,0x59,0x44,0x63,0x1e,0xef,0x6c,0x2,0x26,0x1,0xa4,0x59,0x4c,0x93,0x7a,0x12,0xfe,0x7e,0x46,0x28,0x35,0xc,0xb0,0xb6,0x6,0x54,0x98,0x16,0x82,0x6e,0xb5,0xf1,0xd3,0xe3,0xe7,0x46,0xd2,0xba,0x26,0x6,0x18,0x74,0xd1,0x3d,0x7d,0x41,0xf4,0xf6,0xc4,0x76,0x28,0xa7,0xf2,0x56,0x39,0xec,0xfb,0x92,0x3f,0x49,0xf3,0x16,0x8d,0xf3,0xd4,0xda,0x3b,0xcf,0xdf,0xde,0xd9,0xc4,0x4b,0x2,0xd6,0xde,0x79,0xfe,0x5a,0x3a,0xa9,0xf9,0x5e,0x25,0x73,0xe,0x1f,0x25,0xc4,0x9f,0xda,0x2f,0xcf,0xaf,0xc4,0x50,0x9e,0xf5,0xb4,0x67,0x63,0xb7,0x1e,0x7,0x46,0x95,0xad,0x6a,0x6,0x18,0x7c,0xc9,0xfd,0x29,0x59,0x3b,0xa,0xa0,0x4d,0xa2,0xe4,0x81,0x1,0x3,0x20,0x68,0x9c,0xf9,0x34,0xce,0x8a,0xce,0x26,0x5c,0xa2,0x40,0xf3,0x57,0xd2,0xbc,0x8b,0x76,0x76,0x9f,0xb,0x5c,0xe2,0xfc,0x1d,0x67,0xe0,0x73,0xc3,0xc1,0x10,0x3e,0x1d,0x55,0xac,0xaa,0x19,0x60,0xf5,0x6d,0x67,0x67,0x9,0x7d,0x26,0x34,0xd3,0x55,0x93,0x9a,0xc3,0xdc,0x46,0x4e,0x0,0x4d,0x6a,0xd9,0x9a,0x3b,0x26,0xee,0xd6,0x63,0x7f,0x31,0x18,0x63,0xd6,0x9b,0x54,0xc3,0x6c,0xff,0x51,0x91,0x5b,0x91,0xd7,0x0,0x85,0x3e,0x9,0x9e,0x22,0xe8,0xd,0xa5,0xe6,0x15,0x3a,0xa9,0xfb,0x49,0xf3,0x46,0xd4,0x77,0x6d,0xf6,0x8,0x1a,0x74,0xd1,0xdd,0x4d,0xa4,0xb3,0xbf,0xac,0xed,0x2b,0xe8,0x40,0x2,0x7b,0x43,0xee,0x98,0xdc,0x86,0x8d,0xc9,0xa8,0xb9,0x24,0xb9,0x9,0xe0,0xa6,0x24,0x91,0x53,0xf,0xb0,0xfa,0xf6,0x9,0x9b,0x7,0x7f,0x71,0xd1,0x43,0x0,0xfe,0x3,0x0,0x61,0x12,0x30,0xc1,0x84,0x26,0x80,0x48,0x12,0xb2,0xca,0xeb,0x1,0x7c,0x97,0xc6,0x79,0x96,0x74,0x16,0x64,0x65,0x16,0x6f,0xb8,0x73,0x42,0x36,0x2a,0x89,0x58,0x6,0x18,0x74,0xd1,0xbd,0x3d,0x21,0x1d,0xe,0xe8,0x40,0x90,0x7b,0x41,0xea,0x25,0x65,0x8f,0x90,0x75,0x8f,0x83,0xf4,0xe9,0x60,0xe1,0x7a,0x68,0x51,0x67,0xad,0x1e,0x31,0x9e,0x3b,0x21,0x53,0x33,0x4,0xac,0x69,0x2f,0x42,0x74,0x26,0x8,0xb0,0xa0,0x79,0x1f,0xd2,0x3e,0x9,0x35,0x97,0xc0,0x21,0xc7,0x73,0x8e,0x1,0x29,0x70,0x33,0xc9,0x55,0x34,0xa9,0x87,0x8c,0x93,0x9a,0xbf,0xfa,0xf6,0xf1,0x9b,0x4b,0x25,0x11,0xc9,0x0,0x83,0xbf,0xb8,0x68,0x7f,0x2b,0xf7,0x7c,0x59,0x77,0x3a,0x64,0xf,0x2f,0xcc,0x33,0xa7,0xb0,0x7b,0x4e,0xa,0xf0,0xf9,0xad,0xb6,0x1e,0x20,0x67,0x2c,0x37,0x8e,0xf3,0xfc,0x9a,0x3b,0x26,0x6e,0x4b,0x8,0xe7,0x75,0x5,0x92,0xb6,0x3,0xf8,0x33,0x80,0x91,0x40,0xa2,0xdb,0xd7,0x51,0xe0,0x3f,0xe8,0x38,0xaf,0x11,0xe6,0x41,0x90,0x3f,0x5d,0x3b,0xef,0xdc,0x36,0x9,0xd0,0x31,0x3d,0x80,0xc6,0xcb,0x75,0xbf,0x5,0xe8,0x63,0x60,0xd8,0xf1,0xb3,0xc0,0x41,0x23,0x34,0x3f,0xd1,0x26,0xb7,0xed,0x92,0x15,0xc8,0xff,0x7c,0x74,0xd7,0x86,0x93,0x7c,0x1b,0x26,0xf5,0x88,0x6c,0x76,0x24,0x22,0x5d,0xca,0x83,0xa0,0x72,0x4b,0x90,0x82,0x77,0xca,0xe1,0x8d,0x4e,0xfa,0x47,0xae,0xab,0x19,0x1b,0x16,0x9c,0x57,0xd6,0xb,0x28,0xc,0x91,0x3,0x91,0x80,0x5e,0x0,0x1a,0xbc,0x42,0x7b,0x53,0x8f,0x79,0xe9,0xd2,0x14,0x49,0xb1,0x40,0xe9,0xe7,0x8a,0x6c,0x1,0xbb,0x4,0x54,0x54,0x81,0xdd,0x9,0xd6,0xdc,0x31,0xe1,0x7d,0x1a,0xe7,0x49,0x1f,0x47,0x11,0xb6,0x80,0x0,0x8a,0x9f,0x11,0xf3,0x2e,0xf7,0xed,0x7,0x80,0xb9,0xad,0x52,0xe2,0x3,0x31,0x3d,0x80,0x64,0xf,0x0,0xb0,0x97,0x37,0xbf,0xac,0xfc,0xc6,0x36,0xde,0x5b,0x54,0xd6,0x73,0xb5,0x69,0x95,0x6c,0xb0,0x2e,0xe7,0x1d,0x82,0x1d,0xee,0xdb,0xd7,0x91,0x40,0xf2,0x3d,0x1f,0xaf,0x3e,0x46,0x8b,0x5b,0x7d,0x2e,0x66,0x4c,0xa,0xa1,0xb5,0x29,0xc1,0xa2,0x8,0xc3,0xb4,0xe3,0x38,0x4d,0xd5,0x94,0x27,0x7a,0x8,0x10,0x7a,0xe6,0xed,0xcb,0xc5,0x63,0x55,0xa5,0x3d,0x74,0xb9,0xf8,0x61,0x2c,0xf0,0x75,0x10,0x89,0xbb,0x73,0xd7,0x15,0xd0,0x8,0x84,0x65,0x68,0x51,0x4d,0x8,0xf,0x6d,0x49,0x20,0x7f,0x97,0x1f,0x2d,0x53,0x81,0x3c,0x56,0x29,0x44,0x32,0x0,0x8d,0x69,0x90,0x6b,0xbd,0x1d,0x2c,0x3b,0x60,0x1a,0x33,0xe7,0xf2,0x47,0xf3,0x6,0xc0,0x8f,0x34,0x3,0x10,0x70,0x9,0xbe,0x2f,0x69,0xbf,0x4,0x51,0x9b,0xaa,0x56,0x9c,0x4c,0x68,0x9f,0xc0,0x72,0xe3,0x15,0x4b,0xbe,0xf3,0x1a,0x3,0x41,0xf2,0x4d,0x48,0x1f,0x69,0x6,0x10,0xe0,0xa,0xfc,0xb0,0xd0,0xc1,0x27,0x6a,0xfc,0x8f,0xc3,0x1d,0xc3,0x69,0xe5,0xce,0x2f,0xaa,0xd6,0x1b,0x37,0x46,0xb,0xc8,0xa9,0x7a,0x68,0xd5,0xfb,0xc7,0xa,0xf8,0x8c,0x7e,0x9f,0xb,0x63,0xc9,0xef,0xe5,0x2f,0xa2,0xfb,0xe8,0xea,0x0,0x7e,0x3d,0x73,0xf5,0x67,0xcc,0x6f,0x14,0xc4,0x31,0x41,0x58,0xbe,0xaa,0xe,0x71,0xd1,0x43,0x0,0x0,0x5,0xd4,0x8a,0xcc,0x3b,0x1c,0xa8,0x88,0xf7,0x25,0xca,0xcf,0xf0,0x4d,0x78,0x55,0x2c,0x1,0xe0,0x0,0xd0,0x54,0x25,0xcc,0xec,0x2e,0x40,0xd2,0x11,0xb0,0x77,0x69,0x7a,0x85,0x9,0x1c,0x77,0xf,0xd0,0x3f,0x5b,0x43,0x82,0x6b,0xad,0xad,0xca,0xb4,0x1c,0xad,0x5,0x0,0x2d,0x79,0xcb,0x5e,0x39,0x83,0x45,0x2d,0x4d,0xb6,0x90,0x91,0x8,0xf4,0x21,0xf9,0x91,0x67,0x0,0x92,0xfb,0xb4,0x6d,0xb9,0x0,0xdb,0x78,0xaf,0x6c,0xb5,0x64,0x88,0x1e,0x2,0xc8,0xf,0x19,0xd8,0xaa,0xb,0x8e,0xef,0x8,0xfa,0xe8,0xfc,0x26,0x56,0x5e,0x9c,0x10,0x8f,0x94,0xdd,0x46,0xa5,0x88,0x9f,0x7c,0x63,0xa6,0x9f,0xcf,0x81,0x0,0x1a,0x13,0xc1,0x74,0xdd,0x82,0xf2,0x7b,0xa9,0x28,0x68,0x5f,0xc5,0x50,0xac,0x71,0x17,0xf5,0x94,0x2c,0x5a,0x73,0xe,0x66,0x43,0x1b,0x74,0x55,0x4,0x91,0x42,0x20,0x61,0xde,0x20,0xb8,0x85,0xe1,0x15,0x27,0x40,0x91,0x5c,0x10,0xb2,0x7,0x15,0xcb,0x9,0xa5,0x64,0xc2,0xe2,0x97,0x21,0x9b,0xa2,0xa4,0x8f,0xeb,0x23,0xcf,0x0,0xec,0x5,0x20,0xd8,0x53,0x0,0x28,0x25,0xf4,0x15,0xc,0x97,0x21,0x9c,0x7,0x32,0x9a,0x2f,0x48,0x12,0xcc,0x0,0xa8,0xea,0xd0,0xa9,0x18,0x4b,0xa0,0xde,0x2,0xd9,0x82,0x60,0xc1,0x81,0xc7,0xb6,0x8,0x76,0x44,0x60,0x3b,0xfc,0xf9,0x5a,0x40,0x13,0xeb,0x68,0x3,0xeb,0xa4,0x61,0xf0,0xd4,0x5f,0xed,0x6b,0xad,0x7b,0x8a,0x8f,0x57,0x26,0x85,0x3b,0x49,0x7b,0x3,0xfa,0xe6,0xe0,0x8b,0x7f,0x51,0xb1,0x56,0x17,0xed,0x26,0xe4,0xa4,0x1e,0x4,0x9d,0x6f,0xd3,0x38,0xcf,0x6,0x3e,0x5a,0xde,0xaf,0xaf,0xaf,0x3,0x40,0xfe,0x8,0xc7,0x3c,0x37,0x16,0x34,0xee,0x98,0x6e,0x20,0x1c,0x3f,0xb0,0x68,0x41,0xa2,0x31,0x5,0x61,0x1f,0x45,0x20,0x4d,0x2f,0x40,0xa7,0xe5,0x10,0x17,0x65,0xd5,0xcd,0xbd,0x63,0x99,0x9e,0x34,0x7f,0x43,0x43,0xc8,0xba,0x97,0x3,0x7c,0x7a,0xf0,0x25,0xf7,0xfd,0xf7,0xe0,0xa9,0xf,0xec,0xdd,0xe6,0x32,0xc5,0xbd,0x18,0x3c,0xf5,0x57,0xdd,0x1,0xf6,0x85,0xec,0x41,0x20,0x7a,0x43,0x38,0x4,0xd0,0x27,0x25,0x7b,0x24,0x81,0x81,0xf0,0xe7,0xa,0x80,0xf0,0x36,0xaf,0x35,0x51,0xcf,0x3f,0xf,0x32,0xf5,0x75,0xe3,0xa4,0x6f,0x5c,0x75,0xf3,0xbf,0xb6,0xf9,0x4,0xae,0xdd,0x5,0x86,0x5c,0xfa,0xc0,0x30,0x9b,0x6d,0xf9,0xd,0x80,0xbd,0x93,0x30,0x2,0x85,0xf6,0xc7,0x9,0x6f,0xba,0xb9,0x85,0x34,0x2b,0x5,0x3e,0x44,0x63,0xee,0x5c,0x7d,0xeb,0x59,0x25,0xf,0x9f,0x6a,0x73,0x29,0x86,0x5d,0xfe,0x70,0xf,0x6b,0xdd,0x7d,0x65,0xed,0x1,0x34,0x66,0x7f,0x59,0xdb,0xb,0x72,0xaf,0x96,0x6c,0xff,0xd6,0x66,0xcd,0x1a,0x2a,0x44,0xbe,0xe9,0x38,0xd,0x13,0x56,0xdd,0x32,0xf6,0x85,0x24,0xd2,0xac,0x27,0x18,0x3c,0xf5,0x57,0x23,0xe5,0x66,0x5e,0xf4,0x77,0x15,0x49,0x62,0x15,0x7d,0xab,0xa3,0x66,0x82,0xd3,0xc7,0x4,0x6c,0x26,0xcd,0xb,0x34,0xce,0x42,0xc7,0x98,0xfb,0x56,0xde,0x3c,0x36,0x72,0x99,0x78,0x9b,0x3d,0x82,0x56,0xce,0x3d,0x63,0x2b,0xbc,0x7d,0x74,0x5e,0xb,0x55,0x68,0x20,0x2d,0xfa,0x79,0x25,0x49,0x64,0xd3,0x2c,0x1,0xe8,0x63,0xa5,0x83,0x6a,0xc5,0x4c,0xbd,0xc1,0xd0,0xcb,0x16,0xef,0x67,0x6d,0x76,0x9c,0x3f,0xcc,0x55,0x61,0x62,0x8f,0xd4,0xc6,0xb,0xf4,0xe8,0xd0,0xbe,0x8c,0x22,0xb0,0x2f,0xa0,0x33,0x61,0xdd,0xc1,0x2e,0x30,0x74,0xf0,0xd4,0x7,0x17,0xac,0xbe,0x75,0xec,0xba,0xe2,0x4,0xaa,0x6e,0xb9,0xc3,0xa6,0x3f,0x96,0x32,0x34,0xbf,0xf7,0x48,0xef,0x2f,0x45,0xaa,0x68,0xf6,0x37,0x34,0xce,0xf9,0xaa,0x65,0xde,0xb1,0x44,0x9f,0x19,0x7a,0xd9,0x83,0xfb,0x77,0x14,0x71,0x3a,0x6,0x34,0x0,0xd6,0x9d,0xee,0xf,0x94,0x2c,0xa8,0x7b,0x9b,0xfc,0x44,0x59,0x6,0x87,0x41,0xfb,0xcb,0x9d,0x5b,0x24,0x6f,0x22,0x4f,0x9f,0x80,0xec,0x38,0x52,0x7d,0xa2,0x4a,0x55,0x35,0x3,0xac,0x9c,0xf3,0xf9,0xac,0x80,0x17,0xe0,0x9f,0xa3,0x5a,0x9d,0xdc,0x9f,0x2f,0xb7,0xa7,0x6d,0x4,0x9a,0x86,0xbd,0x40,0xc2,0x88,0xce,0x26,0x59,0x92,0x20,0xd9,0x43,0x1,0xec,0x7,0x50,0x85,0xcb,0x3b,0xc2,0x78,0xa8,0x1c,0x87,0x28,0xfe,0xb6,0x50,0xbb,0xa0,0xdf,0xad,0xbe,0x4a,0xe3,0x6c,0x8c,0x2a,0x57,0x4d,0x63,0xf7,0x1f,0x6e,0x19,0xfb,0x2a,0x8d,0x79,0x33,0x98,0x32,0x8e,0x76,0x74,0x8d,0x9a,0xf4,0x88,0xb3,0x6d,0x53,0x0,0x5,0xe9,0xe3,0xb2,0xf6,0xe4,0x21,0x97,0x2d,0xee,0xd9,0xb9,0x64,0x4b,0x6,0x6,0x5f,0xfa,0xe0,0x60,0x59,0x4d,0xf6,0x55,0xdd,0xdc,0x36,0x37,0x49,0x40,0xac,0xd7,0x40,0xce,0x96,0xf,0x10,0xdc,0xd2,0xd0,0xfd,0x63,0xaf,0x47,0xc5,0xab,0x89,0x1,0x6,0x5f,0x72,0x9f,0x1,0xcc,0x3,0x2,0x32,0x2,0x90,0x53,0xe5,0xa,0x2e,0x14,0x75,0x61,0xc5,0x5d,0x5f,0x41,0x78,0x9e,0x71,0xa1,0xf1,0xb2,0xf6,0xd4,0xc4,0xa9,0xd1,0x9,0x40,0xe0,0xc,0xc0,0x8e,0xf1,0x1c,0xab,0x0,0x76,0xc0,0x89,0x68,0x34,0x39,0x5f,0x3e,0x90,0x66,0x57,0xf1,0x9,0xa6,0x1,0xd4,0xc4,0x0,0xd,0x3d,0x7a,0xb,0x34,0xf7,0x4a,0xc8,0xfa,0x54,0x8c,0x98,0x19,0x2a,0x35,0x25,0x5c,0x1c,0xb7,0x60,0x37,0xb0,0x83,0x49,0x9d,0x3d,0xe4,0xd2,0x87,0x7a,0x77,0x36,0x1,0x6b,0x81,0x21,0x97,0x3e,0x74,0x2,0x64,0xc7,0xe6,0x25,0xff,0xf0,0xa,0xea,0xb6,0xe0,0xaa,0x54,0x58,0xdc,0xb7,0x61,0x13,0x2d,0x77,0xd1,0x98,0x57,0xe2,0xca,0x57,0x13,0x3,0x2c,0xfb,0xe9,0xb1,0xa2,0x71,0x56,0x80,0x39,0x37,0x2e,0x86,0x57,0xf8,0xb4,0x86,0x52,0x52,0x8e,0xf7,0x3e,0xef,0x2e,0x45,0x48,0x1a,0x7,0xe0,0x92,0x76,0xa0,0x4b,0x87,0xc0,0xb0,0x69,0x8f,0xf4,0x4,0xf4,0x45,0x49,0x47,0x7b,0x92,0xbf,0x9,0x26,0x4f,0x22,0xf0,0x11,0x87,0xab,0x52,0x61,0xb1,0xd,0xcb,0x77,0x15,0x20,0x40,0x2e,0x91,0x70,0x7f,0x5c,0x19,0x6b,0xd6,0xdf,0x57,0xcd,0x3d,0x7d,0xab,0x31,0xce,0x8b,0x20,0x4b,0xc,0x3,0x95,0x76,0x5f,0x26,0x30,0x3e,0x76,0x87,0xec,0x85,0x43,0x2e,0x7d,0x68,0x6c,0x47,0x10,0x2c,0x69,0x90,0xb5,0x57,0x49,0xf6,0xdc,0xd0,0xce,0x1d,0x55,0xe2,0x4,0x95,0xc6,0xb,0xe5,0x65,0x56,0xff,0xe1,0x96,0x33,0x63,0xd7,0x59,0x24,0x62,0xc0,0x31,0x4e,0xea,0x1a,0x0,0x9b,0xdb,0xd2,0xc9,0xc7,0x89,0x7f,0x45,0xcf,0x7e,0x55,0x68,0x25,0xdb,0x1f,0xd0,0x15,0xc3,0xa7,0x3f,0xba,0x17,0x76,0x23,0x18,0x7a,0xf9,0xc3,0x17,0xc9,0xba,0x97,0x90,0xec,0xe6,0x1f,0x22,0xdb,0xca,0x15,0x24,0xa,0x3f,0xa5,0xde,0xb0,0x8d,0xf1,0x82,0x85,0x96,0xfe,0x53,0xc9,0x35,0x16,0xc9,0x30,0x80,0x49,0xfd,0x15,0x60,0x16,0x2c,0xa7,0xb4,0xb4,0x56,0x78,0xe2,0x9e,0x7d,0x7f,0x44,0x43,0x1a,0x40,0xfa,0xbc,0xeb,0x66,0xef,0x4e,0x88,0x36,0xed,0xe,0xc3,0xa6,0x3d,0x72,0x34,0x64,0xaf,0x4,0xd1,0x97,0x9e,0xda,0xc7,0xb0,0x7a,0x86,0x12,0xf8,0x29,0x3b,0x61,0x56,0x3e,0x9e,0x48,0xe3,0xef,0x4b,0x65,0x5e,0x26,0xcd,0xba,0x52,0x65,0xad,0x99,0x1,0x86,0x5f,0xf1,0x44,0xca,0x75,0x33,0x17,0x93,0xdc,0xb3,0x60,0x82,0xa3,0xc6,0x8b,0x86,0x14,0x4,0x1a,0x7a,0x9b,0x2b,0xc9,0x9e,0x36,0xf4,0xf2,0xc5,0x8b,0x3b,0x9b,0xb8,0xe5,0x60,0xd8,0xb4,0x47,0x87,0x59,0xd7,0x9d,0x2b,0xd9,0x91,0xb9,0x63,0x71,0x88,0xa,0x8d,0x64,0x85,0x97,0x2,0xa5,0x2e,0x3e,0x9d,0x70,0x78,0x4e,0x93,0x22,0x9d,0x7b,0xff,0x70,0xf3,0xbf,0xfe,0xb2,0x54,0x79,0x6b,0x62,0x80,0x61,0x57,0x3c,0x9e,0x92,0xcd,0x5c,0x27,0xeb,0xde,0x0,0xa0,0x67,0xc1,0x92,0xe4,0x4,0x2e,0x7f,0xdf,0x3b,0xfa,0x27,0x8c,0xc1,0xba,0xf6,0xb3,0x43,0x2e,0x5b,0x7c,0x7f,0x65,0xa5,0xec,0x38,0x18,0x7a,0xf9,0xa3,0x43,0x25,0xf7,0x2e,0x40,0x47,0xfa,0x36,0xd,0x86,0x7e,0x6b,0xc1,0x3,0xbd,0x65,0xfe,0x8,0x7e,0xc3,0x57,0xee,0x14,0x94,0xf0,0x5,0xc0,0xa5,0xe1,0xdf,0xca,0x95,0xb9,0x6a,0x6,0x18,0x7a,0xf9,0xa3,0xd,0x72,0x33,0xdf,0xb3,0xae,0xfb,0xdf,0x0,0xd3,0x5e,0x68,0xb4,0x64,0x5f,0x9d,0x2a,0xd3,0x3a,0xdc,0x18,0xa6,0x21,0x9d,0x39,0xe4,0xd2,0x87,0x7e,0x3b,0xf4,0xf2,0x47,0x92,0xde,0x95,0xac,0x26,0x18,0x36,0xed,0xb1,0x93,0xad,0xcd,0x3c,0x28,0xab,0xc3,0xa,0xd7,0x52,0x94,0xd2,0x7a,0xe2,0x70,0x81,0xd6,0x71,0xf3,0x9a,0xdd,0x2e,0x92,0x1b,0x40,0xf3,0xa6,0x84,0x5d,0xa,0xb6,0x53,0x4,0x43,0x62,0x86,0x27,0xfc,0x9,0x6c,0x75,0x68,0x67,0x31,0x54,0xc5,0x0,0xc3,0xaf,0x78,0xbc,0x1b,0xa0,0x1f,0x59,0x6b,0xaf,0x3,0xe1,0xd0,0x10,0xc1,0x21,0xc7,0x85,0x2b,0xc7,0xa2,0x18,0x9f,0x45,0xe1,0xcc,0x8b,0x2b,0x5,0x78,0x8,0xb8,0x9f,0xa1,0x74,0x9,0x10,0x46,0xd0,0xd1,0xd6,0xba,0x2f,0xf,0xb9,0xfc,0x91,0xe3,0x3a,0x8c,0xc2,0x25,0x60,0xc8,0x65,0xf,0xff,0xa7,0xb5,0xd9,0x45,0x24,0xf,0xa,0xd4,0x6f,0x1a,0xe3,0xf9,0x39,0x17,0x8a,0x3f,0x85,0xf5,0x46,0xc,0x2e,0xa,0xf1,0x26,0x3f,0x2e,0x7d,0x7c,0xac,0x5c,0x75,0xf3,0x99,0x3,0x8d,0x93,0xfe,0x94,0x49,0x35,0xee,0x63,0x52,0x4d,0x4d,0x26,0x95,0xee,0x63,0x9c,0xf4,0x20,0x3a,0xe9,0xd1,0x74,0xd2,0x67,0xd1,0x38,0x5f,0xa6,0x71,0xbe,0x44,0xf0,0xd9,0x72,0x65,0x2f,0x27,0xb8,0x47,0x10,0xff,0xd7,0x7b,0xca,0xda,0xaf,0x4a,0xf6,0x3b,0x8,0x56,0xa3,0xb0,0xd2,0x95,0xae,0x55,0x2d,0x8c,0xf5,0xd8,0x5b,0x62,0xc8,0xb9,0x70,0x2b,0x68,0x1e,0x4b,0x77,0xdb,0xe7,0xbc,0x17,0x67,0x1c,0xd3,0xe1,0x9b,0x48,0xe,0xbf,0xe2,0x89,0x46,0xeb,0x66,0xd6,0xca,0xba,0x7,0x91,0xdc,0x23,0x98,0x92,0x87,0xc4,0x44,0x71,0x12,0x78,0xe8,0x92,0xab,0x40,0xe7,0xe4,0x95,0x73,0x3e,0xf7,0x7e,0x71,0x94,0xa3,0xbe,0xf2,0x5b,0xb6,0x6c,0x7b,0x97,0x4e,0xba,0x81,0xb2,0xd6,0x48,0xd6,0x5d,0x35,0xf7,0x8c,0xb2,0x47,0xcc,0x54,0x44,0x85,0xa1,0xd3,0x1e,0xed,0xe,0x60,0x32,0xac,0x9d,0x5,0xf8,0x67,0xff,0xa1,0xe3,0xf,0x8c,0x40,0xe1,0x3c,0x78,0xb,0xc8,0xb7,0x4,0xde,0xea,0x66,0xb3,0xd7,0xaf,0xb9,0xf5,0xcc,0x4c,0xd,0x59,0xb4,0x9,0x86,0x5c,0xfe,0x48,0x9a,0xc0,0x22,0x12,0x47,0xc9,0xda,0xdc,0x2c,0x1b,0x2b,0x26,0x7a,0x25,0x55,0x46,0x56,0xe0,0x5d,0xab,0xe6,0x9e,0x3e,0x25,0xc9,0xba,0x54,0x54,0xd8,0x61,0xd3,0x1e,0x3b,0x49,0x72,0x7f,0xe3,0x89,0xb5,0x1e,0x9b,0xb7,0x4a,0x2d,0xee,0xec,0x87,0x70,0xcc,0xb8,0xc5,0x23,0x2c,0x8a,0xab,0xc8,0x38,0x91,0xa7,0x83,0x49,0xda,0x4a,0x9a,0xd7,0x40,0x2e,0x2,0xcc,0x4f,0x56,0xce,0xf9,0x6c,0xe2,0x1e,0x45,0xc3,0xaf,0x78,0x7c,0xa8,0xb5,0xee,0xb5,0xde,0xde,0x48,0x3a,0x88,0xa4,0xbf,0x3f,0x62,0x20,0xaa,0x7b,0xc7,0x27,0xb6,0xaa,0x53,0xb8,0x2e,0x51,0x38,0x2a,0xf6,0xa4,0x2e,0xc4,0x97,0xbf,0xf,0x3,0x9f,0x4d,0x35,0x34,0x7d,0x6e,0xd9,0xcf,0x4e,0x4a,0xf4,0xc8,0x98,0x8a,0xe,0x8d,0x12,0xf0,0x16,0xc0,0x55,0x20,0x86,0x12,0x85,0x47,0xb7,0x14,0x54,0xa8,0x18,0xca,0x59,0x7f,0xc2,0x61,0x2c,0xfb,0x5d,0x1e,0xb5,0xb9,0x19,0x70,0x89,0x64,0xf,0xc9,0xe,0x84,0x78,0x10,0xa9,0xb,0x87,0x4e,0x7b,0x74,0x29,0xc0,0xc5,0x0,0x9f,0x58,0x75,0xd3,0xe7,0x3e,0xac,0x16,0x41,0x43,0xa7,0x3d,0x76,0x24,0x81,0x33,0x41,0x9c,0x62,0xdd,0xec,0x27,0x1,0xf4,0x26,0xd1,0xe4,0x17,0x26,0xe7,0xa,0x17,0xb9,0x8c,0x92,0x6d,0xb8,0x8f,0x7f,0xe,0xed,0xba,0xc2,0xd7,0x68,0xcc,0x6d,0x49,0x13,0x3f,0x8e,0x14,0x25,0x61,0xd8,0xf4,0x5f,0x9f,0x2e,0xeb,0x3e,0xc,0x44,0xad,0x70,0xed,0x70,0x28,0x68,0x57,0xa1,0x1d,0x4b,0x20,0xa9,0x19,0xe4,0x3f,0x0,0xbc,0xb,0xe0,0x6d,0x80,0x7f,0x34,0xc6,0xbc,0x28,0x61,0x83,0x64,0x37,0x1b,0x63,0xb6,0x9,0xcc,0x2,0x70,0x8d,0x31,0x8e,0x9b,0xcd,0x34,0x2,0xec,0x66,0xc,0xf,0x4,0x74,0x8c,0xb5,0x3a,0xe,0xd0,0x1,0x0,0x7a,0xc8,0xda,0xde,0x24,0xf7,0xcb,0x21,0x2d,0x7c,0x42,0xa,0xa,0xfb,0xe9,0x44,0x2a,0x15,0x4a,0x4f,0x92,0x5,0xcd,0x8d,0x3d,0xf7,0xeb,0x73,0xd5,0x33,0xd7,0xf,0x4e,0x5c,0xce,0xa9,0xf8,0xec,0x60,0x9,0x2b,0x40,0xf3,0x2,0xa0,0xe3,0x2,0x4f,0x9e,0xf0,0x69,0xd1,0xed,0xf,0x5,0x63,0x49,0xee,0xc1,0x3b,0x69,0x3b,0x68,0x3a,0x10,0xd,0x1b,0x25,0x1c,0x2,0xe0,0x10,0x3f,0xc6,0x9,0x92,0x1d,0x27,0xe1,0x7d,0x48,0xcd,0x90,0xcd,0x10,0xb4,0x0,0xe4,0x66,0xb2,0x24,0xe9,0x0,0x4a,0x59,0xab,0xee,0x80,0xf6,0x7,0x90,0xf3,0x48,0xa,0x16,0xc9,0xf8,0xe,0xd1,0x2c,0x76,0xe7,0xab,0x9c,0xf8,0xc5,0xe3,0x40,0x1,0x7e,0x45,0x43,0x4a,0xb0,0x0,0xc,0x69,0x9e,0x14,0xf9,0x83,0xf6,0x20,0x3e,0x50,0x5,0x3,0x90,0x7c,0x17,0xe4,0x77,0x64,0xdd,0x27,0xdb,0xeb,0xb8,0xb4,0xa,0x4a,0x13,0x2a,0x57,0x48,0x81,0x24,0xc2,0x4e,0x97,0xc1,0x88,0xda,0x1d,0x40,0x5f,0x40,0x7d,0xc1,0x9c,0x4a,0x91,0x4b,0x26,0x70,0x79,0xf,0x8c,0x6e,0xc8,0x7f,0x9b,0xcb,0x28,0xbf,0x59,0x46,0xb2,0x65,0x2f,0xc4,0x6f,0xee,0x5c,0x24,0x43,0x72,0x9,0x8d,0xf3,0x5f,0x2b,0x67,0x9f,0x5a,0xd6,0xa0,0x53,0x2d,0x54,0xdc,0x85,0xaf,0x9c,0xf3,0x59,0x57,0x56,0xcf,0x1,0xe6,0x7,0xcc,0x4f,0x3b,0x29,0xce,0xae,0xf,0xc4,0xdb,0xb2,0x11,0x11,0x16,0xf5,0x1e,0x31,0xdf,0x44,0x7d,0xe7,0x3f,0x33,0x58,0x72,0xe,0x7f,0x5b,0x4e,0x7f,0x7e,0x1,0x86,0x6,0x86,0x26,0xbf,0xb6,0xda,0xf,0xf3,0xe6,0x1c,0x20,0xd2,0x0,0xfe,0x7d,0xb1,0x52,0x5e,0x6c,0xcf,0x47,0x4c,0x19,0x4b,0xc5,0x61,0x89,0xfa,0x86,0x5d,0xb9,0xe8,0x19,0x73,0x1e,0x58,0x31,0xfb,0xd4,0x76,0xf5,0x8e,0xae,0x6a,0xc,0x5f,0x75,0xd3,0xe7,0x32,0xc6,0x71,0x66,0xd0,0x98,0x3f,0x7a,0x1e,0x81,0xf0,0x14,0x83,0xbc,0xcd,0x1a,0xa0,0x77,0x94,0x27,0x3,0x79,0x3d,0xf8,0xf1,0xc3,0xe4,0x1b,0x11,0x7c,0xbb,0x49,0x7e,0x4d,0x8,0xb,0xc3,0xa,0xec,0x61,0x21,0x3b,0x49,0x2e,0x6e,0x48,0x78,0x6c,0x65,0x53,0x2a,0x8e,0x1b,0x32,0x52,0x79,0xc6,0x2b,0x22,0xbc,0xcd,0xa1,0x77,0xa,0x8b,0x1f,0x25,0x7c,0x5f,0x9c,0x6f,0x51,0x18,0x23,0xca,0x15,0x67,0xe3,0x29,0x28,0x77,0x44,0x1d,0xa,0x3b,0x6,0x56,0xdc,0x43,0x77,0x8,0x3,0x0,0xc0,0x8a,0xd9,0xa7,0xbc,0x9,0x98,0x6f,0x48,0xb0,0xc1,0x4a,0x97,0x90,0xcd,0x3a,0xa8,0x72,0x40,0x71,0xff,0x40,0x54,0x13,0xd8,0xaa,0x3d,0xd3,0x5e,0xb0,0xb5,0x1d,0x22,0x30,0x57,0x80,0xc5,0x8,0xec,0xc6,0xc5,0x47,0x1b,0xe2,0x17,0x7f,0xc7,0x32,0xf9,0x97,0xcb,0xaf,0x5c,0x1e,0x95,0x94,0xc5,0xbb,0xf7,0x27,0xc0,0x34,0x61,0xd8,0x15,0x4f,0x8c,0xa9,0x4b,0x6,0x0,0x80,0x15,0x37,0x9e,0xf2,0x2b,0x81,0x73,0xfd,0x59,0x89,0xe0,0xbc,0xdb,0x9c,0xdf,0xa3,0x1f,0x6,0x1,0xaf,0xd0,0x38,0xf3,0x40,0xf3,0x3d,0x90,0x8f,0xa3,0x50,0x4b,0x66,0x72,0x3e,0x92,0x9d,0x24,0x8a,0x24,0x8,0x61,0x1c,0x2,0x1a,0xe,0x60,0xca,0x51,0x57,0x3d,0x9d,0x6e,0xaf,0xfc,0x6a,0x56,0xe3,0x68,0x9c,0xaf,0xd2,0x38,0xbf,0x1,0xe8,0x2,0xc,0x66,0xa5,0x8,0xf0,0x3,0x81,0x4f,0x1,0x9c,0x4d,0x9a,0xff,0x30,0xc6,0x4c,0x5f,0x31,0xfb,0x94,0x6f,0x3,0xe6,0x6b,0xa0,0xf9,0x6d,0x28,0xae,0xef,0x27,0x17,0xb5,0x6d,0x5a,0xa5,0x17,0x6a,0xfc,0xbe,0xf3,0x2f,0x7f,0xd2,0x43,0x79,0xbc,0x68,0x8c,0x9b,0x75,0xcf,0x6b,0x2f,0x6,0x48,0xa4,0xc9,0x8c,0xb8,0xf2,0xa9,0x23,0x24,0xfb,0x6b,0x49,0x69,0x49,0x1b,0xc,0xb9,0x95,0xc6,0xac,0x0,0x78,0xf3,0xf2,0x59,0x27,0xbd,0x19,0x11,0xff,0x13,0xd6,0xba,0xf3,0x25,0x9d,0x60,0x72,0xaa,0x5b,0xe8,0xa0,0xe4,0x92,0xc5,0x6d,0x4b,0x6f,0xd1,0xd6,0x78,0x51,0x71,0xc3,0xcf,0x95,0xa4,0x53,0xd,0x4,0x55,0x8d,0xcd,0x43,0x5e,0x2f,0xca,0x47,0x68,0xcc,0xf8,0x95,0xb3,0x4f,0x2e,0x77,0xa,0x7a,0xd5,0x25,0xa8,0x19,0x46,0x5c,0xf9,0xd4,0xf5,0x92,0x5e,0x7,0x39,0x6f,0xc5,0xac,0x93,0xca,0x6e,0xf5,0x3a,0xfc,0x4b,0x4f,0x35,0x42,0xf6,0x69,0x41,0xc7,0x78,0x2,0x1e,0x73,0x15,0x66,0x58,0xa7,0x8b,0x41,0x51,0x78,0xc,0x29,0x45,0x22,0x96,0xf9,0xbe,0x38,0x4e,0x71,0xfc,0x28,0x4,0x29,0x26,0x8d,0xf6,0x60,0x15,0x7f,0x78,0x7c,0x97,0x34,0x3f,0x58,0x31,0xfb,0xe4,0x1f,0x26,0x9d,0x7e,0xa7,0xe,0x9a,0x23,0xaf,0x59,0x4a,0xb7,0x65,0xfb,0xe3,0x24,0x8e,0x6,0xd0,0xc3,0xdb,0x3c,0x23,0xd8,0x87,0x24,0x8a,0x5,0x18,0xf1,0x5c,0xe9,0xe4,0x43,0x5c,0xba,0xa5,0x58,0x24,0xa,0x65,0xc5,0xdf,0x95,0xcb,0x2f,0xae,0x4c,0x8c,0xf9,0x46,0xc1,0x7a,0x4b,0xff,0xe0,0x68,0x3e,0x63,0x85,0xcf,0xaf,0xba,0xf1,0x94,0x44,0xcd,0xc1,0x9d,0x6a,0xca,0x5d,0xf6,0xd3,0x63,0xb5,0xf2,0xc6,0x53,0x4f,0x25,0x53,0xb7,0x4a,0x7c,0xc3,0x57,0xd5,0x19,0xbd,0xce,0x90,0x31,0xcf,0x61,0x4d,0xa1,0x54,0xdc,0x8,0xbd,0x32,0x36,0x9d,0xb8,0x30,0x96,0xf8,0xae,0x5c,0x7e,0x71,0x71,0xe2,0xbe,0xf1,0xe4,0xe3,0x90,0x6e,0x3b,0x84,0xe4,0xb7,0x92,0xa6,0x41,0x67,0xdb,0xf2,0x1,0x0,0xcb,0x67,0x8d,0xb9,0x16,0x34,0xd7,0x4a,0x58,0xf,0xef,0x4,0x92,0x28,0x4a,0xed,0x56,0x57,0xb0,0xb7,0x72,0xb9,0xb0,0x52,0xdf,0x6,0x2e,0x71,0x7e,0xf8,0x36,0x0,0x1f,0x24,0x8d,0xfb,0xba,0xd2,0x9b,0x86,0x7f,0xe9,0xe9,0xde,0xa0,0x1e,0x25,0x30,0x24,0x5f,0xbc,0xb8,0x3d,0x74,0x6b,0x19,0x71,0x4b,0xa5,0xd1,0x16,0xa9,0x22,0x4e,0x7a,0xc8,0x7d,0x17,0xac,0x95,0xf4,0x67,0x2d,0x73,0x5d,0x9b,0xef,0xc9,0x62,0x5b,0x4f,0xa5,0x7,0xdd,0xbe,0xb7,0x4b,0x46,0xfe,0x5b,0x0,0x92,0x5e,0x27,0xf9,0xff,0x56,0xcc,0x3e,0x69,0x66,0xd2,0x38,0x6f,0x77,0x4b,0x53,0x25,0x60,0xc,0xcf,0x12,0xb0,0x7f,0xa1,0x46,0x10,0xc7,0xa3,0x49,0xf0,0x6e,0xb5,0x69,0xb3,0xd5,0x73,0x89,0x19,0x41,0x17,0x40,0xd6,0x6f,0xdc,0x8d,0x3e,0x81,0x63,0x36,0x88,0x28,0xdc,0x37,0xc0,0x8f,0xf3,0xf,0xc7,0x38,0xd7,0x2f,0xfb,0xd9,0x89,0xb3,0xd1,0xe,0x50,0x17,0x43,0x40,0x0,0x56,0x9a,0x2,0xb0,0x4f,0xcc,0xa0,0x19,0x46,0x54,0x95,0x57,0xf8,0xfb,0xa8,0xb4,0xa2,0xde,0x17,0x43,0x41,0x9a,0xf2,0xaf,0x90,0x15,0x34,0x6c,0x14,0x33,0x24,0xcd,0x12,0x63,0x9c,0x13,0x49,0x73,0xa9,0xf2,0x7b,0x39,0xd2,0x5b,0xff,0x58,0xd0,0xe5,0xe7,0xbc,0x87,0x83,0xd6,0xef,0xf9,0xf4,0xf3,0xb2,0xf6,0x22,0x3e,0x50,0x6f,0x3d,0x0,0xb9,0xb7,0x7f,0xab,0xe8,0xa6,0x5f,0x6b,0xab,0x2f,0x47,0xe4,0x36,0x30,0x41,0x99,0x11,0x42,0xc1,0xc6,0xf7,0xc4,0x12,0x49,0xff,0x43,0xf2,0xe9,0x65,0x33,0x47,0x67,0x0,0xfc,0x6e,0xe4,0x55,0xcf,0xbe,0x2d,0x6b,0x7f,0x9,0x61,0xcf,0x12,0xbe,0x23,0x16,0xa0,0x1,0xf9,0x24,0xc9,0x6f,0x2e,0x9b,0x39,0x7a,0x59,0x72,0x18,0x6e,0xd,0x75,0xd3,0x3,0xc,0xbf,0xf2,0x99,0x43,0xad,0xd4,0xd8,0x7a,0x7d,0x21,0x4a,0x48,0xe2,0x40,0xbc,0x74,0x8f,0x98,0x6f,0xa3,0x24,0x7d,0xc4,0xe4,0x17,0x91,0x6,0x10,0x78,0xfb,0x22,0x98,0xb4,0xb,0xc9,0x76,0xa4,0x31,0xf,0xd2,0x38,0xa3,0x40,0xf3,0x79,0x3a,0xd,0x4f,0x2c,0xff,0xd9,0x89,0x39,0x1f,0xc5,0x65,0x33,0x47,0x3f,0xe,0x9a,0xa1,0x2,0x7e,0xed,0x37,0x79,0x81,0x94,0x37,0xc9,0xc8,0x60,0x1,0x89,0x1,0x79,0x9b,0x80,0x69,0xed,0x4d,0x7c,0xa0,0x9e,0x7a,0x0,0xa2,0x1f,0xc1,0xc6,0xdc,0x53,0x4e,0xb2,0x2a,0xd7,0x52,0x5b,0x79,0xd0,0xf8,0xdd,0x27,0x83,0x77,0x88,0x77,0x57,0x60,0x44,0x7a,0xe5,0x7b,0x89,0xfc,0x9c,0x7d,0xe0,0xe,0x61,0xfe,0xa,0x70,0x11,0xa8,0x5b,0x1,0xbc,0xe,0x68,0xe7,0xf2,0x99,0xa3,0x23,0x3d,0x72,0x97,0xff,0x6c,0xf4,0x9f,0x47,0x5c,0xf5,0xec,0x64,0x8,0x93,0x24,0x3b,0x23,0xa8,0x82,0xef,0xdc,0x42,0x80,0x5f,0x3,0x79,0xc7,0x8a,0x99,0x27,0xbc,0xd7,0x11,0x68,0xaf,0x1f,0x6,0x0,0x8e,0x5,0xd8,0xc3,0xf7,0xc9,0xa8,0xc8,0xc9,0xc4,0x9f,0x7d,0xa,0x3c,0x68,0x2,0x46,0x0,0x80,0xd0,0x92,0x6c,0x0,0x21,0x71,0xbd,0x48,0x66,0xab,0xc6,0x9b,0x97,0x0,0xb2,0x20,0x7,0x81,0xdc,0x22,0x69,0xeb,0xf2,0x99,0xa3,0xdb,0xe4,0x88,0xba,0x7c,0xe6,0xe8,0x77,0x46,0x5e,0xbd,0x64,0x2e,0xc4,0xc5,0x90,0x9e,0x5,0x70,0xa0,0xa4,0x77,0x40,0x4e,0x4,0xf4,0xc2,0xa,0x6f,0xc8,0xe8,0x10,0xa8,0x1b,0x35,0x70,0xf8,0x97,0x9f,0x7d,0x9e,0xc4,0x31,0xbe,0x27,0x47,0x5b,0x9,0x92,0xd7,0xbb,0x3c,0xcf,0xd9,0xdb,0x1,0x2c,0x5,0x70,0x32,0xa0,0xb3,0x51,0x62,0xdb,0xd9,0x90,0xb7,0x50,0x45,0x6e,0xed,0x45,0xbd,0x4d,0x66,0xf9,0xcc,0xd1,0xd,0x6d,0xfa,0x30,0x6,0x46,0x5e,0xbd,0xe4,0x50,0x49,0xc3,0x0,0xac,0x5f,0x3e,0xf3,0x84,0xd,0xed,0x89,0xe3,0x48,0x3c,0x74,0x74,0x86,0x71,0x30,0xe2,0xaa,0xe7,0xde,0x2,0xd0,0x2b,0xbc,0xdf,0x50,0x29,0xa2,0x14,0xbf,0x97,0xf4,0x17,0x80,0x13,0x1,0xac,0xa1,0x77,0x9e,0x71,0x2f,0x0,0x7b,0x4a,0x6a,0x80,0x77,0xbc,0x7d,0xf,0x0,0x9f,0x2,0xd4,0x17,0xc0,0xbe,0x0,0x3e,0x9,0x78,0x1b,0x51,0x55,0xea,0xcf,0x1f,0xc,0x33,0x92,0x32,0xa4,0xe9,0xb6,0x7c,0xe6,0xf1,0xd9,0xb6,0x7e,0x1b,0x5,0x47,0x7f,0x65,0x69,0xea,0xf7,0x33,0x8e,0xad,0x29,0x8d,0x6a,0xa1,0x6e,0x86,0x0,0x82,0x3f,0x17,0xf4,0x15,0xf9,0xb,0xa1,0x3c,0xbf,0x48,0x8f,0x28,0x11,0x94,0xf1,0x37,0x44,0xf4,0x5,0x32,0x6f,0x14,0xb8,0xce,0xcd,0xba,0x7f,0x58,0x39,0xfb,0x44,0xb,0x60,0x93,0x7f,0xe5,0x60,0xc4,0xd5,0x2f,0x90,0xb0,0x3d,0x0,0xee,0x9,0x8f,0x21,0xfa,0xc8,0x6a,0x89,0x31,0x74,0x0,0x6f,0x71,0x65,0x5,0x83,0x8e,0x7f,0xca,0x6d,0x32,0xde,0x81,0x9d,0x45,0x7c,0xa0,0x8e,0x18,0x40,0xc0,0x8f,0x48,0xb3,0x44,0xb2,0x97,0x82,0x3c,0x2d,0x24,0x4,0x14,0xf4,0xba,0x7e,0x80,0xbf,0xf,0x1e,0x20,0x6b,0x9,0xe0,0xfb,0x12,0x1f,0xf5,0x89,0x1f,0x9,0xcb,0x6f,0x38,0x4e,0x0,0xb6,0xf8,0x17,0x46,0x5c,0xb5,0xe4,0x75,0x92,0xbf,0x15,0x70,0x1c,0x80,0x22,0x51,0xa1,0x75,0xe1,0x42,0x5c,0xa8,0xd0,0x9e,0x8c,0xdb,0xea,0xa8,0x13,0xad,0xa,0xea,0x46,0xd,0x5c,0x3e,0xf3,0xf8,0xd7,0x97,0xdd,0x30,0xea,0x3e,0x80,0xd7,0x1,0xbc,0x58,0xc2,0xaf,0x3,0xe7,0x92,0x22,0x87,0x11,0x92,0x46,0xa1,0x77,0xbf,0x7,0xf8,0xbf,0xcb,0x67,0x1e,0x5f,0xd1,0x59,0x43,0xc6,0x18,0xd2,0x98,0xbb,0x42,0xf6,0xf9,0x78,0x3b,0x7d,0xa1,0x4b,0x97,0x6f,0xac,0x81,0x5,0xf8,0x1a,0xda,0xd7,0x61,0xa0,0xdd,0xa1,0x6e,0xd9,0x77,0xc4,0x55,0x4b,0x8e,0x4,0x30,0x82,0xe4,0x89,0x0,0xc6,0x1,0x8,0x6f,0x11,0x13,0x8c,0xc1,0x9b,0x1,0x9c,0xb5,0x7c,0xe6,0xf1,0x4b,0xaa,0xc9,0x63,0xe4,0xd5,0x2f,0x1c,0x28,0xd9,0x4d,0xfe,0xb9,0x88,0xa5,0x5c,0x0,0xa,0xc0,0xd7,0x30,0x32,0x92,0x16,0x1,0x98,0xbc,0x7c,0xe6,0xf1,0x65,0x17,0x61,0xd6,0x2b,0xd4,0x2d,0x3,0x4,0x30,0xe2,0xea,0xe7,0xfb,0x0,0x38,0x3,0xc0,0xbf,0x10,0x3c,0xa,0xc0,0x18,0xdf,0x4a,0xb0,0x43,0xd0,0x95,0xcb,0x6f,0x18,0x75,0x47,0x8d,0xe9,0x3f,0x65,0x68,0x8e,0x87,0x77,0xf6,0x9e,0xe7,0x25,0x1c,0xc3,0xa,0xb2,0x5,0xea,0xc2,0x2e,0x2b,0xfb,0x9f,0x0,0x7e,0xb8,0xfc,0x86,0x51,0x5d,0xc,0xd0,0x11,0x70,0xd4,0x57,0x96,0xe,0x7,0x30,0x9,0x5e,0x6f,0xb0,0xe9,0xc5,0x19,0xc7,0x7e,0xb7,0x96,0xf4,0x46,0x5e,0xb3,0x94,0x92,0x3d,0x95,0xe4,0xaf,0x0,0xec,0x11,0xee,0x5,0x22,0xb4,0x90,0x9c,0xfc,0xe1,0x3f,0x5b,0x0,0x63,0x49,0xf3,0x48,0x67,0x2c,0x4d,0x4f,0xa,0x76,0x2b,0x6,0x68,0xf,0x18,0x79,0xcd,0xd2,0x3d,0x24,0xbd,0x4c,0xf2,0xc0,0x62,0xb5,0x33,0xce,0x5b,0x59,0xd2,0x26,0x92,0x2f,0x91,0xbc,0xf8,0xc5,0x19,0xc7,0x6c,0x6a,0x4b,0x3e,0xf5,0xa,0xff,0xf4,0xc,0x0,0x0,0x23,0xaf,0x7e,0xe1,0x7a,0x1a,0x5e,0x7,0x20,0xe5,0xfb,0x61,0x65,0x0,0xec,0x82,0xb0,0xb,0xc4,0xe,0x0,0x5b,0x24,0x6d,0x26,0xb9,0xd,0xc2,0x66,0x41,0x4b,0x8c,0x31,0xbf,0xfb,0xfd,0x4f,0x8e,0x59,0x57,0x63,0xd6,0x9d,0xe,0x75,0xa3,0x6,0x76,0x26,0xd0,0x98,0xff,0x91,0x74,0x8,0x80,0x1e,0x24,0xb7,0xc0,0xdb,0x5b,0x6f,0x33,0xd,0xdf,0x3,0xf0,0xb6,0xa4,0x57,0x1,0xbc,0xf4,0xe2,0x8c,0x63,0xdf,0xe9,0xec,0xb2,0x76,0x41,0x17,0x74,0x41,0x17,0x74,0x41,0x17,0x74,0x41,0x17,0x74,0x41,0x17,0x74,0x41,0x17,0xd4,0x6,0xff,0x1f,0x32,0x68,0x5,0x7e,0x99,0xd5,0x97,0x49,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char option_arrow_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x8,0x6,0x0,0x0,0x0,0x56,0x75,0x5c,0xe7,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x98,0x49,0x44,0x41,0x54,0x28,0x91,0xbd,0x91,0xb1,0xd,0xc2,0x30,0x10,0x45,0xdf,0xd1,0xb8,0xf0,0x2,0xee,0xdc,0x87,0x1,0xd8,0x24,0xb5,0xe9,0x19,0x87,0x1e,0xea,0x6c,0xc2,0x0,0xa4,0xb5,0xdc,0x79,0x1,0x17,0xae,0x8e,0x26,0x48,0x76,0x14,0x40,0x48,0x88,0xdf,0xfd,0xf7,0xef,0x4b,0x77,0x3a,0xf8,0x85,0x62,0x8c,0x21,0xc6,0x18,0xb6,0x32,0x59,0x83,0x94,0xd2,0x5e,0x55,0x6f,0x0,0x22,0x72,0xf0,0xde,0xdf,0xdb,0x7c,0xd7,0x9a,0x9c,0xb3,0x55,0xd5,0x9,0xb0,0x80,0x55,0xd5,0x29,0xe7,0x6c,0x5f,0x16,0x6a,0xad,0x67,0x60,0x68,0xd0,0xb0,0xb0,0x3f,0xaa,0x3b,0x3a,0xa5,0x74,0x51,0xd5,0xd0,0xd,0x88,0x5c,0xbd,0xf7,0xc7,0xa7,0xef,0x6e,0x30,0xc6,0x9c,0x80,0xb9,0x41,0xf3,0xc2,0xd8,0x2c,0x38,0xe7,0x8a,0x88,0x8c,0x40,0x1,0x8a,0x88,0x8c,0xce,0xb9,0xf2,0x71,0xcf,0x77,0x8f,0xfb,0x5a,0xf,0x28,0x4a,0x37,0xff,0x58,0x46,0x7b,0x50,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x8,0x4,0x0,0x0,0x0,0xfc,0x7c,0x94,0x6c,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x0,0x5f,0x49,0x44,0x41,0x54,0x18,0xd3,0x63,0x60,0x20,0xc,0xee,0x27,0xdc,0x4f,0xc0,0x22,0xfc,0x50,0xfb,0xc1,0x97,0x7,0x5f,0x1e,0x6a,0xc3,0xf8,0x4c,0x10,0xea,0x5,0xf7,0xff,0x55,0xc,0xdc,0xc,0xdc,0xff,0x57,0xbd,0xe0,0x46,0x91,0xf8,0x39,0x85,0x41,0x8b,0x81,0x81,0x81,0x81,0x41,0xeb,0xe7,0x14,0x22,0x6c,0xc5,0x7,0x1e,0xce,0x7f,0xf0,0x1f,0x2,0x1f,0xce,0x87,0x88,0x30,0xc2,0x2c,0xff,0x71,0x8a,0x41,0x8b,0x81,0x81,0xe1,0x1a,0x87,0x99,0xc4,0x57,0xbc,0xce,0x25,0xec,0x41,0x74,0x0,0x0,0xec,0x66,0x28,0xba,0x76,0x22,0x7a,0x72,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xba,0x84,0x14,0xff,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xcb,0xd9,0xac,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char option_button_disabled_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x77,0x0,0x7d,0x59,0x0,0x0,0xa,0x45,0x69,0x43,0x43,0x50,0x49,0x43,0x43,0x20,0x70,0x72,0x6f,0x66,0x69,0x6c,0x65,0x0,0x0,0x78,0xda,0x9d,0x53,0x67,0x54,0x53,0xe9,0x16,0x3d,0xf7,0xde,0xf4,0x42,0x4b,0x88,0x80,0x94,0x4b,0x6f,0x52,0x15,0x8,0x20,0x52,0x42,0x8b,0x80,0x14,0x91,0x26,0x2a,0x21,0x9,0x10,0x4a,0x88,0x21,0xa1,0xd9,0x15,0x51,0xc1,0x11,0x45,0x45,0x4,0x1b,0xc8,0xa0,0x88,0x3,0x8e,0x8e,0x80,0x8c,0x15,0x51,0x2c,0xc,0x8a,0xa,0xd8,0x7,0xe4,0x21,0xa2,0x8e,0x83,0xa3,0x88,0x8a,0xca,0xfb,0xe1,0x7b,0xa3,0x6b,0xd6,0xbc,0xf7,0xe6,0xcd,0xfe,0xb5,0xd7,0x3e,0xe7,0xac,0xf3,0x9d,0xb3,0xcf,0x7,0xc0,0x8,0xc,0x96,0x48,0x33,0x51,0x35,0x80,0xc,0xa9,0x42,0x1e,0x11,0xe0,0x83,0xc7,0xc4,0xc6,0xe1,0xe4,0x2e,0x40,0x81,0xa,0x24,0x70,0x0,0x10,0x8,0xb3,0x64,0x21,0x73,0xfd,0x23,0x1,0x0,0xf8,0x7e,0x3c,0x3c,0x2b,0x22,0xc0,0x7,0xbe,0x0,0x1,0x78,0xd3,0xb,0x8,0x0,0xc0,0x4d,0x9b,0xc0,0x30,0x1c,0x87,0xff,0xf,0xea,0x42,0x99,0x5c,0x1,0x80,0x84,0x1,0xc0,0x74,0x91,0x38,0x4b,0x8,0x80,0x14,0x0,0x40,0x7a,0x8e,0x42,0xa6,0x0,0x40,0x46,0x1,0x80,0x9d,0x98,0x26,0x53,0x0,0xa0,0x4,0x0,0x60,0xcb,0x63,0x62,0xe3,0x0,0x50,0x2d,0x0,0x60,0x27,0x7f,0xe6,0xd3,0x0,0x80,0x9d,0xf8,0x99,0x7b,0x1,0x0,0x5b,0x94,0x21,0x15,0x1,0xa0,0x91,0x0,0x20,0x13,0x65,0x88,0x44,0x0,0x68,0x3b,0x0,0xac,0xcf,0x56,0x8a,0x45,0x0,0x58,0x30,0x0,0x14,0x66,0x4b,0xc4,0x39,0x0,0xd8,0x2d,0x0,0x30,0x49,0x57,0x66,0x48,0x0,0xb0,0xb7,0x0,0xc0,0xce,0x10,0xb,0xb2,0x0,0x8,0xc,0x0,0x30,0x51,0x88,0x85,0x29,0x0,0x4,0x7b,0x0,0x60,0xc8,0x23,0x23,0x78,0x0,0x84,0x99,0x0,0x14,0x46,0xf2,0x57,0x3c,0xf1,0x2b,0xae,0x10,0xe7,0x2a,0x0,0x0,0x78,0x99,0xb2,0x3c,0xb9,0x24,0x39,0x45,0x81,0x5b,0x8,0x2d,0x71,0x7,0x57,0x57,0x2e,0x1e,0x28,0xce,0x49,0x17,0x2b,0x14,0x36,0x61,0x2,0x61,0x9a,0x40,0x2e,0xc2,0x79,0x99,0x19,0x32,0x81,0x34,0xf,0xe0,0xf3,0xcc,0x0,0x0,0xa0,0x91,0x15,0x11,0xe0,0x83,0xf3,0xfd,0x78,0xce,0xe,0xae,0xce,0xce,0x36,0x8e,0xb6,0xe,0x5f,0x2d,0xea,0xbf,0x6,0xff,0x22,0x62,0x62,0xe3,0xfe,0xe5,0xcf,0xab,0x70,0x40,0x0,0x0,0xe1,0x74,0x7e,0xd1,0xfe,0x2c,0x2f,0xb3,0x1a,0x80,0x3b,0x6,0x80,0x6d,0xfe,0xa2,0x25,0xee,0x4,0x68,0x5e,0xb,0xa0,0x75,0xf7,0x8b,0x66,0xb2,0xf,0x40,0xb5,0x0,0xa0,0xe9,0xda,0x57,0xf3,0x70,0xf8,0x7e,0x3c,0x3c,0x45,0xa1,0x90,0xb9,0xd9,0xd9,0xe5,0xe4,0xe4,0xd8,0x4a,0xc4,0x42,0x5b,0x61,0xca,0x57,0x7d,0xfe,0x67,0xc2,0x5f,0xc0,0x57,0xfd,0x6c,0xf9,0x7e,0x3c,0xfc,0xf7,0xf5,0xe0,0xbe,0xe2,0x24,0x81,0x32,0x5d,0x81,0x47,0x4,0xf8,0xe0,0xc2,0xcc,0xf4,0x4c,0xa5,0x1c,0xcf,0x92,0x9,0x84,0x62,0xdc,0xe6,0x8f,0x47,0xfc,0xb7,0xb,0xff,0xfc,0x1d,0xd3,0x22,0xc4,0x49,0x62,0xb9,0x58,0x2a,0x14,0xe3,0x51,0x12,0x71,0x8e,0x44,0x9a,0x8c,0xf3,0x32,0xa5,0x22,0x89,0x42,0x92,0x29,0xc5,0x25,0xd2,0xff,0x64,0xe2,0xdf,0x2c,0xfb,0x3,0x3e,0xdf,0x35,0x0,0xb0,0x6a,0x3e,0x1,0x7b,0x91,0x2d,0xa8,0x5d,0x63,0x3,0xf6,0x4b,0x27,0x10,0x58,0x74,0xc0,0xe2,0xf7,0x0,0x0,0xf2,0xbb,0x6f,0xc1,0xd4,0x28,0x8,0x3,0x80,0x68,0x83,0xe1,0xcf,0x77,0xff,0xef,0x3f,0xfd,0x47,0xa0,0x25,0x0,0x80,0x66,0x49,0x92,0x71,0x0,0x0,0x5e,0x44,0x24,0x2e,0x54,0xca,0xb3,0x3f,0xc7,0x8,0x0,0x0,0x44,0xa0,0x81,0x2a,0xb0,0x41,0x1b,0xf4,0xc1,0x18,0x2c,0xc0,0x6,0x1c,0xc1,0x5,0xdc,0xc1,0xb,0xfc,0x60,0x36,0x84,0x42,0x24,0xc4,0xc2,0x42,0x10,0x42,0xa,0x64,0x80,0x1c,0x72,0x60,0x29,0xac,0x82,0x42,0x28,0x86,0xcd,0xb0,0x1d,0x2a,0x60,0x2f,0xd4,0x40,0x1d,0x34,0xc0,0x51,0x68,0x86,0x93,0x70,0xe,0x2e,0xc2,0x55,0xb8,0xe,0x3d,0x70,0xf,0xfa,0x61,0x8,0x9e,0xc1,0x28,0xbc,0x81,0x9,0x4,0x41,0xc8,0x8,0x13,0x61,0x21,0xda,0x88,0x1,0x62,0x8a,0x58,0x23,0x8e,0x8,0x17,0x99,0x85,0xf8,0x21,0xc1,0x48,0x4,0x12,0x8b,0x24,0x20,0xc9,0x88,0x14,0x51,0x22,0x4b,0x91,0x35,0x48,0x31,0x52,0x8a,0x54,0x20,0x55,0x48,0x1d,0xf2,0x3d,0x72,0x2,0x39,0x87,0x5c,0x46,0xba,0x91,0x3b,0xc8,0x0,0x32,0x82,0xfc,0x86,0xbc,0x47,0x31,0x94,0x81,0xb2,0x51,0x3d,0xd4,0xc,0xb5,0x43,0xb9,0xa8,0x37,0x1a,0x84,0x46,0xa2,0xb,0xd0,0x64,0x74,0x31,0x9a,0x8f,0x16,0xa0,0x9b,0xd0,0x72,0xb4,0x1a,0x3d,0x8c,0x36,0xa1,0xe7,0xd0,0xab,0x68,0xf,0xda,0x8f,0x3e,0x43,0xc7,0x30,0xc0,0xe8,0x18,0x7,0x33,0xc4,0x6c,0x30,0x2e,0xc6,0xc3,0x42,0xb1,0x38,0x2c,0x9,0x93,0x63,0xcb,0xb1,0x22,0xac,0xc,0xab,0xc6,0x1a,0xb0,0x56,0xac,0x3,0xbb,0x89,0xf5,0x63,0xcf,0xb1,0x77,0x4,0x12,0x81,0x45,0xc0,0x9,0x36,0x4,0x77,0x42,0x20,0x61,0x1e,0x41,0x48,0x58,0x4c,0x58,0x4e,0xd8,0x48,0xa8,0x20,0x1c,0x24,0x34,0x11,0xda,0x9,0x37,0x9,0x3,0x84,0x51,0xc2,0x27,0x22,0x93,0xa8,0x4b,0xb4,0x26,0xba,0x11,0xf9,0xc4,0x18,0x62,0x32,0x31,0x87,0x58,0x48,0x2c,0x23,0xd6,0x12,0x8f,0x13,0x2f,0x10,0x7b,0x88,0x43,0xc4,0x37,0x24,0x12,0x89,0x43,0x32,0x27,0xb9,0x90,0x2,0x49,0xb1,0xa4,0x54,0xd2,0x12,0xd2,0x46,0xd2,0x6e,0x52,0x23,0xe9,0x2c,0xa9,0x9b,0x34,0x48,0x1a,0x23,0x93,0xc9,0xda,0x64,0x6b,0xb2,0x7,0x39,0x94,0x2c,0x20,0x2b,0xc8,0x85,0xe4,0x9d,0xe4,0xc3,0xe4,0x33,0xe4,0x1b,0xe4,0x21,0xf2,0x5b,0xa,0x9d,0x62,0x40,0x71,0xa4,0xf8,0x53,0xe2,0x28,0x52,0xca,0x6a,0x4a,0x19,0xe5,0x10,0xe5,0x34,0xe5,0x6,0x65,0x98,0x32,0x41,0x55,0xa3,0x9a,0x52,0xdd,0xa8,0xa1,0x54,0x11,0x35,0x8f,0x5a,0x42,0xad,0xa1,0xb6,0x52,0xaf,0x51,0x87,0xa8,0x13,0x34,0x75,0x9a,0x39,0xcd,0x83,0x16,0x49,0x4b,0xa5,0xad,0xa2,0x95,0xd3,0x1a,0x68,0x17,0x68,0xf7,0x69,0xaf,0xe8,0x74,0xba,0x11,0xdd,0x95,0x1e,0x4e,0x97,0xd0,0x57,0xd2,0xcb,0xe9,0x47,0xe8,0x97,0xe8,0x3,0xf4,0x77,0xc,0xd,0x86,0x15,0x83,0xc7,0x88,0x67,0x28,0x19,0x9b,0x18,0x7,0x18,0x67,0x19,0x77,0x18,0xaf,0x98,0x4c,0xa6,0x19,0xd3,0x8b,0x19,0xc7,0x54,0x30,0x37,0x31,0xeb,0x98,0xe7,0x99,0xf,0x99,0x6f,0x55,0x58,0x2a,0xb6,0x2a,0x7c,0x15,0x91,0xca,0xa,0x95,0x4a,0x95,0x26,0x95,0x1b,0x2a,0x2f,0x54,0xa9,0xaa,0xa6,0xaa,0xde,0xaa,0xb,0x55,0xf3,0x55,0xcb,0x54,0x8f,0xa9,0x5e,0x53,0x7d,0xae,0x46,0x55,0x33,0x53,0xe3,0xa9,0x9,0xd4,0x96,0xab,0x55,0xaa,0x9d,0x50,0xeb,0x53,0x1b,0x53,0x67,0xa9,0x3b,0xa8,0x87,0xaa,0x67,0xa8,0x6f,0x54,0x3f,0xa4,0x7e,0x59,0xfd,0x89,0x6,0x59,0xc3,0x4c,0xc3,0x4f,0x43,0xa4,0x51,0xa0,0xb1,0x5f,0xe3,0xbc,0xc6,0x20,0xb,0x63,0x19,0xb3,0x78,0x2c,0x21,0x6b,0xd,0xab,0x86,0x75,0x81,0x35,0xc4,0x26,0xb1,0xcd,0xd9,0x7c,0x76,0x2a,0xbb,0x98,0xfd,0x1d,0xbb,0x8b,0x3d,0xaa,0xa9,0xa1,0x39,0x43,0x33,0x4a,0x33,0x57,0xb3,0x52,0xf3,0x94,0x66,0x3f,0x7,0xe3,0x98,0x71,0xf8,0x9c,0x74,0x4e,0x9,0xe7,0x28,0xa7,0x97,0xf3,0x7e,0x8a,0xde,0x14,0xef,0x29,0xe2,0x29,0x1b,0xa6,0x34,0x4c,0xb9,0x31,0x65,0x5c,0x6b,0xaa,0x96,0x97,0x96,0x58,0xab,0x48,0xab,0x51,0xab,0x47,0xeb,0xbd,0x36,0xae,0xed,0xa7,0x9d,0xa6,0xbd,0x45,0xbb,0x59,0xfb,0x81,0xe,0x41,0xc7,0x4a,0x27,0x5c,0x27,0x47,0x67,0x8f,0xce,0x5,0x9d,0xe7,0x53,0xd9,0x53,0xdd,0xa7,0xa,0xa7,0x16,0x4d,0x3d,0x3a,0xf5,0xae,0x2e,0xaa,0x6b,0xa5,0x1b,0xa1,0xbb,0x44,0x77,0xbf,0x6e,0xa7,0xee,0x98,0x9e,0xbe,0x5e,0x80,0x9e,0x4c,0x6f,0xa7,0xde,0x79,0xbd,0xe7,0xfa,0x1c,0x7d,0x2f,0xfd,0x54,0xfd,0x6d,0xfa,0xa7,0xf5,0x47,0xc,0x58,0x6,0xb3,0xc,0x24,0x6,0xdb,0xc,0xce,0x18,0x3c,0xc5,0x35,0x71,0x6f,0x3c,0x1d,0x2f,0xc7,0xdb,0xf1,0x51,0x43,0x5d,0xc3,0x40,0x43,0xa5,0x61,0x95,0x61,0x97,0xe1,0x84,0x91,0xb9,0xd1,0x3c,0xa3,0xd5,0x46,0x8d,0x46,0xf,0x8c,0x69,0xc6,0x5c,0xe3,0x24,0xe3,0x6d,0xc6,0x6d,0xc6,0xa3,0x26,0x6,0x26,0x21,0x26,0x4b,0x4d,0xea,0x4d,0xee,0x9a,0x52,0x4d,0xb9,0xa6,0x29,0xa6,0x3b,0x4c,0x3b,0x4c,0xc7,0xcd,0xcc,0xcd,0xa2,0xcd,0xd6,0x99,0x35,0x9b,0x3d,0x31,0xd7,0x32,0xe7,0x9b,0xe7,0x9b,0xd7,0x9b,0xdf,0xb7,0x60,0x5a,0x78,0x5a,0x2c,0xb6,0xa8,0xb6,0xb8,0x65,0x49,0xb2,0xe4,0x5a,0xa6,0x59,0xee,0xb6,0xbc,0x6e,0x85,0x5a,0x39,0x59,0xa5,0x58,0x55,0x5a,0x5d,0xb3,0x46,0xad,0x9d,0xad,0x25,0xd6,0xbb,0xad,0xbb,0xa7,0x11,0xa7,0xb9,0x4e,0x93,0x4e,0xab,0x9e,0xd6,0x67,0xc3,0xb0,0xf1,0xb6,0xc9,0xb6,0xa9,0xb7,0x19,0xb0,0xe5,0xd8,0x6,0xdb,0xae,0xb6,0x6d,0xb6,0x7d,0x61,0x67,0x62,0x17,0x67,0xb7,0xc5,0xae,0xc3,0xee,0x93,0xbd,0x93,0x7d,0xba,0x7d,0x8d,0xfd,0x3d,0x7,0xd,0x87,0xd9,0xe,0xab,0x1d,0x5a,0x1d,0x7e,0x73,0xb4,0x72,0x14,0x3a,0x56,0x3a,0xde,0x9a,0xce,0x9c,0xee,0x3f,0x7d,0xc5,0xf4,0x96,0xe9,0x2f,0x67,0x58,0xcf,0x10,0xcf,0xd8,0x33,0xe3,0xb6,0x13,0xcb,0x29,0xc4,0x69,0x9d,0x53,0x9b,0xd3,0x47,0x67,0x17,0x67,0xb9,0x73,0x83,0xf3,0x88,0x8b,0x89,0x4b,0x82,0xcb,0x2e,0x97,0x3e,0x2e,0x9b,0x1b,0xc6,0xdd,0xc8,0xbd,0xe4,0x4a,0x74,0xf5,0x71,0x5d,0xe1,0x7a,0xd2,0xf5,0x9d,0x9b,0xb3,0x9b,0xc2,0xed,0xa8,0xdb,0xaf,0xee,0x36,0xee,0x69,0xee,0x87,0xdc,0x9f,0xcc,0x34,0x9f,0x29,0x9e,0x59,0x33,0x73,0xd0,0xc3,0xc8,0x43,0xe0,0x51,0xe5,0xd1,0x3f,0xb,0x9f,0x95,0x30,0x6b,0xdf,0xac,0x7e,0x4f,0x43,0x4f,0x81,0x67,0xb5,0xe7,0x23,0x2f,0x63,0x2f,0x91,0x57,0xad,0xd7,0xb0,0xb7,0xa5,0x77,0xaa,0xf7,0x61,0xef,0x17,0x3e,0xf6,0x3e,0x72,0x9f,0xe3,0x3e,0xe3,0x3c,0x37,0xde,0x32,0xde,0x59,0x5f,0xcc,0x37,0xc0,0xb7,0xc8,0xb7,0xcb,0x4f,0xc3,0x6f,0x9e,0x5f,0x85,0xdf,0x43,0x7f,0x23,0xff,0x64,0xff,0x7a,0xff,0xd1,0x0,0xa7,0x80,0x25,0x1,0x67,0x3,0x89,0x81,0x41,0x81,0x5b,0x2,0xfb,0xf8,0x7a,0x7c,0x21,0xbf,0x8e,0x3f,0x3a,0xdb,0x65,0xf6,0xb2,0xd9,0xed,0x41,0x8c,0xa0,0xb9,0x41,0x15,0x41,0x8f,0x82,0xad,0x82,0xe5,0xc1,0xad,0x21,0x68,0xc8,0xec,0x90,0xad,0x21,0xf7,0xe7,0x98,0xce,0x91,0xce,0x69,0xe,0x85,0x50,0x7e,0xe8,0xd6,0xd0,0x7,0x61,0xe6,0x61,0x8b,0xc3,0x7e,0xc,0x27,0x85,0x87,0x85,0x57,0x86,0x3f,0x8e,0x70,0x88,0x58,0x1a,0xd1,0x31,0x97,0x35,0x77,0xd1,0xdc,0x43,0x73,0xdf,0x44,0xfa,0x44,0x96,0x44,0xde,0x9b,0x67,0x31,0x4f,0x39,0xaf,0x2d,0x4a,0x35,0x2a,0x3e,0xaa,0x2e,0x6a,0x3c,0xda,0x37,0xba,0x34,0xba,0x3f,0xc6,0x2e,0x66,0x59,0xcc,0xd5,0x58,0x9d,0x58,0x49,0x6c,0x4b,0x1c,0x39,0x2e,0x2a,0xae,0x36,0x6e,0x6c,0xbe,0xdf,0xfc,0xed,0xf3,0x87,0xe2,0x9d,0xe2,0xb,0xe3,0x7b,0x17,0x98,0x2f,0xc8,0x5d,0x70,0x79,0xa1,0xce,0xc2,0xf4,0x85,0xa7,0x16,0xa9,0x2e,0x12,0x2c,0x3a,0x96,0x40,0x4c,0x88,0x4e,0x38,0x94,0xf0,0x41,0x10,0x2a,0xa8,0x16,0x8c,0x25,0xf2,0x13,0x77,0x25,0x8e,0xa,0x79,0xc2,0x1d,0xc2,0x67,0x22,0x2f,0xd1,0x36,0xd1,0x88,0xd8,0x43,0x5c,0x2a,0x1e,0x4e,0xf2,0x48,0x2a,0x4d,0x7a,0x92,0xec,0x91,0xbc,0x35,0x79,0x24,0xc5,0x33,0xa5,0x2c,0xe5,0xb9,0x84,0x27,0xa9,0x90,0xbc,0x4c,0xd,0x4c,0xdd,0x9b,0x3a,0x9e,0x16,0x9a,0x76,0x20,0x6d,0x32,0x3d,0x3a,0xbd,0x31,0x83,0x92,0x91,0x90,0x71,0x42,0xaa,0x21,0x4d,0x93,0xb6,0x67,0xea,0x67,0xe6,0x66,0x76,0xcb,0xac,0x65,0x85,0xb2,0xfe,0xc5,0x6e,0x8b,0xb7,0x2f,0x1e,0x95,0x7,0xc9,0x6b,0xb3,0x90,0xac,0x5,0x59,0x2d,0xa,0xb6,0x42,0xa6,0xe8,0x54,0x5a,0x28,0xd7,0x2a,0x7,0xb2,0x67,0x65,0x57,0x66,0xbf,0xcd,0x89,0xca,0x39,0x96,0xab,0x9e,0x2b,0xcd,0xed,0xcc,0xb3,0xca,0xdb,0x90,0x37,0x9c,0xef,0x9f,0xff,0xed,0x12,0xc2,0x12,0xe1,0x92,0xb6,0xa5,0x86,0x4b,0x57,0x2d,0x1d,0x58,0xe6,0xbd,0xac,0x6a,0x39,0xb2,0x3c,0x71,0x79,0xdb,0xa,0xe3,0x15,0x5,0x2b,0x86,0x56,0x6,0xac,0x3c,0xb8,0x8a,0xb6,0x2a,0x6d,0xd5,0x4f,0xab,0xed,0x57,0x97,0xae,0x7e,0xbd,0x26,0x7a,0x4d,0x6b,0x81,0x5e,0xc1,0xca,0x82,0xc1,0xb5,0x1,0x6b,0xeb,0xb,0x55,0xa,0xe5,0x85,0x7d,0xeb,0xdc,0xd7,0xed,0x5d,0x4f,0x58,0x2f,0x59,0xdf,0xb5,0x61,0xfa,0x86,0x9d,0x1b,0x3e,0x15,0x89,0x8a,0xae,0x14,0xdb,0x17,0x97,0x15,0x7f,0xd8,0x28,0xdc,0x78,0xe5,0x1b,0x87,0x6f,0xca,0xbf,0x99,0xdc,0x94,0xb4,0xa9,0xab,0xc4,0xb9,0x64,0xcf,0x66,0xd2,0x66,0xe9,0xe6,0xde,0x2d,0x9e,0x5b,0xe,0x96,0xaa,0x97,0xe6,0x97,0xe,0x6e,0xd,0xd9,0xda,0xb4,0xd,0xdf,0x56,0xb4,0xed,0xf5,0xf6,0x45,0xdb,0x2f,0x97,0xcd,0x28,0xdb,0xbb,0x83,0xb6,0x43,0xb9,0xa3,0xbf,0x3c,0xb8,0xbc,0x65,0xa7,0xc9,0xce,0xcd,0x3b,0x3f,0x54,0xa4,0x54,0xf4,0x54,0xfa,0x54,0x36,0xee,0xd2,0xdd,0xb5,0x61,0xd7,0xf8,0x6e,0xd1,0xee,0x1b,0x7b,0xbc,0xf6,0x34,0xec,0xd5,0xdb,0x5b,0xbc,0xf7,0xfd,0x3e,0xc9,0xbe,0xdb,0x55,0x1,0x55,0x4d,0xd5,0x66,0xd5,0x65,0xfb,0x49,0xfb,0xb3,0xf7,0x3f,0xae,0x89,0xaa,0xe9,0xf8,0x96,0xfb,0x6d,0x5d,0xad,0x4e,0x6d,0x71,0xed,0xc7,0x3,0xd2,0x3,0xfd,0x7,0x23,0xe,0xb6,0xd7,0xb9,0xd4,0xd5,0x1d,0xd2,0x3d,0x54,0x52,0x8f,0xd6,0x2b,0xeb,0x47,0xe,0xc7,0x1f,0xbe,0xfe,0x9d,0xef,0x77,0x2d,0xd,0x36,0xd,0x55,0x8d,0x9c,0xc6,0xe2,0x23,0x70,0x44,0x79,0xe4,0xe9,0xf7,0x9,0xdf,0xf7,0x1e,0xd,0x3a,0xda,0x76,0x8c,0x7b,0xac,0xe1,0x7,0xd3,0x1f,0x76,0x1d,0x67,0x1d,0x2f,0x6a,0x42,0x9a,0xf2,0x9a,0x46,0x9b,0x53,0x9a,0xfb,0x5b,0x62,0x5b,0xba,0x4f,0xcc,0x3e,0xd1,0xd6,0xea,0xde,0x7a,0xfc,0x47,0xdb,0x1f,0xf,0x9c,0x34,0x3c,0x59,0x79,0x4a,0xf3,0x54,0xc9,0x69,0xda,0xe9,0x82,0xd3,0x93,0x67,0xf2,0xcf,0x8c,0x9d,0x95,0x9d,0x7d,0x7e,0x2e,0xf9,0xdc,0x60,0xdb,0xa2,0xb6,0x7b,0xe7,0x63,0xce,0xdf,0x6a,0xf,0x6f,0xef,0xba,0x10,0x74,0xe1,0xd2,0x45,0xff,0x8b,0xe7,0x3b,0xbc,0x3b,0xce,0x5c,0xf2,0xb8,0x74,0xf2,0xb2,0xdb,0xe5,0x13,0x57,0xb8,0x57,0x9a,0xaf,0x3a,0x5f,0x6d,0xea,0x74,0xea,0x3c,0xfe,0x93,0xd3,0x4f,0xc7,0xbb,0x9c,0xbb,0x9a,0xae,0xb9,0x5c,0x6b,0xb9,0xee,0x7a,0xbd,0xb5,0x7b,0x66,0xf7,0xe9,0x1b,0x9e,0x37,0xce,0xdd,0xf4,0xbd,0x79,0xf1,0x16,0xff,0xd6,0xd5,0x9e,0x39,0x3d,0xdd,0xbd,0xf3,0x7a,0x6f,0xf7,0xc5,0xf7,0xf5,0xdf,0x16,0xdd,0x7e,0x72,0x27,0xfd,0xce,0xcb,0xbb,0xd9,0x77,0x27,0xee,0xad,0xbc,0x4f,0xbc,0x5f,0xf4,0x40,0xed,0x41,0xd9,0x43,0xdd,0x87,0xd5,0x3f,0x5b,0xfe,0xdc,0xd8,0xef,0xdc,0x7f,0x6a,0xc0,0x77,0xa0,0xf3,0xd1,0xdc,0x47,0xf7,0x6,0x85,0x83,0xcf,0xfe,0x91,0xf5,0x8f,0xf,0x43,0x5,0x8f,0x99,0x8f,0xcb,0x86,0xd,0x86,0xeb,0x9e,0x38,0x3e,0x39,0x39,0xe2,0x3f,0x72,0xfd,0xe9,0xfc,0xa7,0x43,0xcf,0x64,0xcf,0x26,0x9e,0x17,0xfe,0xa2,0xfe,0xcb,0xae,0x17,0x16,0x2f,0x7e,0xf8,0xd5,0xeb,0xd7,0xce,0xd1,0x98,0xd1,0xa1,0x97,0xf2,0x97,0x93,0xbf,0x6d,0x7c,0xa5,0xfd,0xea,0xc0,0xeb,0x19,0xaf,0xdb,0xc6,0xc2,0xc6,0x1e,0xbe,0xc9,0x78,0x33,0x31,0x5e,0xf4,0x56,0xfb,0xed,0xc1,0x77,0xdc,0x77,0x1d,0xef,0xa3,0xdf,0xf,0x4f,0xe4,0x7c,0x20,0x7f,0x28,0xff,0x68,0xf9,0xb1,0xf5,0x53,0xd0,0xa7,0xfb,0x93,0x19,0x93,0x93,0xff,0x4,0x3,0x98,0xf3,0xfc,0xef,0x35,0x94,0x82,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xa,0x14,0x3,0x3,0x10,0x8e,0xab,0x21,0xcd,0x0,0x0,0x1,0xba,0x49,0x44,0x41,0x54,0x48,0xc7,0xad,0x95,0x51,0x8e,0xd3,0x30,0x10,0x86,0xbf,0xb1,0x53,0x52,0x95,0x4a,0x9b,0x97,0x3e,0x6c,0x7b,0x98,0xde,0x81,0x2b,0x20,0x71,0x86,0x1e,0x81,0x4b,0x70,0xe,0xae,0xb0,0xf,0x48,0x48,0x7b,0x7,0xb4,0xa8,0xf,0x15,0xec,0x82,0x96,0x6d,0xec,0x19,0x1e,0x62,0x37,0x29,0x88,0xd4,0x51,0x19,0x69,0x94,0xb1,0x64,0xcf,0xfc,0xf9,0xe7,0xb7,0x47,0x80,0xa,0x78,0x5,0xd4,0xc0,0x3c,0xc5,0x1e,0x70,0x9c,0x9b,0x2,0x2d,0xf0,0x2,0x3c,0x3,0xc7,0xb4,0x56,0xae,0xb0,0x5c,0xfc,0x35,0xd0,0x0,0x37,0x29,0xae,0x1,0x49,0x9e,0xad,0x4d,0x85,0x9f,0x80,0x3,0xf0,0x8,0xc4,0xff,0x1,0xa0,0x6,0x9a,0xed,0x76,0xfb,0x66,0xb3,0xd9,0xec,0x42,0x8,0xcd,0xd8,0x81,0xe5,0x72,0xc9,0xdd,0xdd,0x67,0xc0,0xf0,0xbe,0xc2,0x39,0x37,0x5a,0xc0,0xcc,0x92,0x2b,0xaa,0x8a,0x88,0x3c,0x78,0xef,0xdf,0xde,0xdf,0x7f,0xfa,0x98,0x1,0xcc,0x81,0x9b,0xf5,0x7a,0xbd,0x3b,0x1c,0xe,0x4d,0x8,0x1,0x33,0xfb,0x67,0x42,0x55,0x25,0x84,0x23,0xaa,0x11,0xef,0x67,0xc5,0x0,0x54,0x15,0xd5,0x8,0x70,0x5b,0xd7,0xf3,0xf,0xc0,0xfa,0xac,0x5,0x6d,0xdb,0x36,0x6d,0xdb,0x16,0x12,0x27,0x88,0x38,0xbc,0x77,0x38,0xe7,0xb,0x0,0xe4,0x2e,0x19,0x31,0x6,0x62,0x8c,0xb7,0xc3,0x16,0x78,0xa0,0x56,0xd5,0xd1,0x3f,0x1f,0x32,0x0,0x20,0x22,0x80,0x43,0x64,0x9c,0x1,0x11,0x43,0x15,0x9c,0x23,0x1,0x91,0xbf,0x34,0xe0,0x0,0xc9,0x34,0x5d,0x32,0x33,0x43,0xc4,0x30,0x3,0x91,0xce,0xc7,0xf7,0xe7,0x3d,0x76,0x62,0x61,0xa8,0xdb,0x2a,0x3,0x9d,0xca,0xc0,0x14,0xfb,0x33,0xed,0x70,0x5d,0xd,0x13,0x97,0x2,0x50,0xe5,0x24,0x2c,0xb9,0x40,0x41,0x7f,0x3,0xb2,0x10,0xed,0xac,0x4e,0xd5,0xef,0xb3,0x22,0x0,0xdd,0xbe,0x98,0x62,0xc5,0xac,0xc,0x40,0xe7,0x1d,0xfd,0xbd,0x28,0x3b,0x0,0xa,0x58,0x87,0x4e,0x8b,0x19,0x80,0x7c,0xbd,0xac,0xf0,0x1a,0xf6,0xdf,0xe1,0x99,0x2a,0xbd,0x66,0x2f,0xa5,0xc,0x74,0xad,0x52,0xa0,0x5c,0xb4,0x99,0x35,0xd5,0x98,0x6a,0x9c,0x3,0x38,0x2,0x3f,0x9d,0x73,0xdf,0xbc,0xf7,0x4d,0x8,0xe1,0x62,0xc2,0xe,0xc8,0x14,0x0,0x7a,0xd2,0x58,0x27,0x19,0xf9,0x3a,0x4,0xf0,0xb,0xf8,0xbe,0xdf,0xef,0xdf,0xaf,0x56,0xab,0x5d,0x8c,0xb1,0x19,0x63,0x62,0xb1,0x58,0x30,0x9b,0xcd,0x0,0xf0,0xde,0x4f,0x78,0x9,0x23,0x31,0x46,0x80,0x2f,0x20,0xef,0xfa,0x27,0xd,0x16,0x57,0xc,0xa3,0x67,0x20,0x5c,0x3b,0x8c,0x8e,0x29,0xe,0xc0,0x8f,0x89,0xe3,0xf8,0xaa,0x49,0x8,0xf0,0x1b,0x2,0x90,0x57,0xd1,0xcd,0x3c,0xcc,0x3e,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x40,0xde,0x8d,0x6b,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x1,0x32,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3f,0x3f,0x3f,0x5a,0x5a,0x5a,0x2b,0x2b,0x31,0x2e,0x2e,0x34,0x59,0x59,0x59,0x2a,0x2a,0x30,0x4b,0x4b,0x4b,0x22,0x22,0x27,0x35,0x35,0x35,0x4a,0x4a,0x4a,0x24,0x24,0x28,0x24,0x24,0x29,0x56,0x56,0x56,0x62,0x62,0x62,0x2a,0x2a,0x31,0x2a,0x2a,0x30,0x2d,0x2d,0x34,0x2f,0x2f,0x36,0x2e,0x2e,0x35,0x2c,0x2c,0x32,0x48,0x48,0x48,0x44,0x44,0x44,0x43,0x43,0x43,0x54,0x54,0x54,0x26,0x26,0x2b,0x24,0x24,0x28,0x27,0x27,0x2d,0x29,0x29,0x2f,0x28,0x28,0x2e,0x25,0x25,0x2b,0x23,0x23,0x28,0x26,0x26,0x2c,0x25,0x25,0x2a,0x2a,0x2a,0x2f,0x2b,0x2b,0x31,0x22,0x22,0x26,0x52,0x52,0x52,0x42,0x42,0x42,0x2d,0x2d,0x33,0x22,0x22,0x27,0x51,0x51,0x51,0x40,0x40,0x40,0x27,0x27,0x2b,0x2e,0x2e,0x34,0x2c,0x2c,0x31,0x29,0x29,0x2e,0x4f,0x4f,0x4f,0x3f,0x3f,0x3f,0x4d,0x4d,0x4d,0x3e,0x3e,0x3e,0x24,0x24,0x2a,0x24,0x24,0x29,0x20,0x20,0x25,0x4c,0x4c,0x4c,0x3d,0x3d,0x3d,0x28,0x28,0x2d,0x2b,0x2b,0x30,0x29,0x29,0x2d,0x20,0x20,0x23,0x4a,0x4a,0x4a,0x3b,0x3b,0x3b,0x22,0x22,0x28,0x27,0x27,0x2c,0x1e,0x1e,0x22,0x49,0x49,0x49,0x3a,0x3a,0x3a,0x21,0x21,0x26,0x21,0x21,0x25,0x23,0x23,0x27,0x20,0x20,0x24,0x1d,0x1d,0x21,0x39,0x39,0x39,0x47,0x47,0x47,0x1f,0x1f,0x24,0x1f,0x1f,0x23,0x1e,0x1e,0x21,0x46,0x46,0x46,0xff,0xff,0xff,0xbd,0x3f,0x83,0xbb,0x0,0x0,0x0,0x24,0x74,0x52,0x4e,0x53,0x0,0x4,0xa,0x11,0x19,0x1f,0x22,0x24,0x1d,0x16,0xd,0x7,0x2,0x15,0x25,0x34,0x3f,0x46,0x47,0x48,0x43,0x3a,0x2d,0x1b,0x77,0xef,0xe6,0x49,0xef,0xe6,0xef,0xe7,0x77,0xef,0xe4,0x4a,0xba,0xea,0xc1,0xeb,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x65,0xb5,0xdd,0x88,0x9f,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x1,0xb,0x49,0x44,0x41,0x54,0x28,0xcf,0x8d,0xd1,0xd9,0x56,0xc2,0x30,0x10,0x80,0x61,0xd6,0xa2,0xa8,0x6c,0x75,0xdf,0x10,0x54,0xa8,0x82,0x74,0xd2,0x4a,0x49,0x5b,0xa4,0xb5,0x5a,0x44,0x10,0x5c,0xd0,0xaa,0x80,0x8a,0xcb,0xfb,0x3f,0x83,0x21,0x24,0x1c,0x8e,0x5e,0xe8,0x77,0xfd,0x9f,0x93,0x99,0x89,0xcf,0x1f,0x8,0x86,0xc2,0x42,0x84,0x10,0x66,0x66,0xa3,0x73,0xf3,0xbe,0x9f,0x2,0xb,0xb1,0x78,0x22,0x99,0x12,0x45,0x71,0x71,0x69,0x79,0x25,0xea,0xff,0x15,0x4,0x63,0xab,0x6b,0x7b,0xcc,0x7e,0x2e,0x2f,0x1d,0x30,0x87,0x52,0x21,0xbf,0xbe,0x41,0x82,0x50,0x7c,0xb3,0x78,0x54,0x1a,0x93,0x1,0x29,0x2a,0x73,0xac,0x94,0x35,0x6d,0x8b,0x4,0xe1,0x84,0x5c,0xe2,0xe4,0xa,0xd6,0xb,0x8c,0xa1,0x2b,0xd8,0x54,0x48,0x20,0x24,0xab,0x27,0x5c,0xb5,0x2,0x39,0x89,0xa9,0x19,0x2a,0x58,0xa3,0x20,0x92,0xb2,0x4f,0x39,0xdb,0x1,0xe3,0x8c,0xa9,0x9d,0xbb,0x60,0x3a,0xa3,0x40,0xac,0x5f,0x70,0xf5,0xe9,0xc0,0x20,0x1,0xd0,0xa0,0x71,0xc9,0x35,0xca,0x4d,0x75,0x6a,0x86,0xd6,0x15,0xa6,0x4f,0xb4,0x3b,0x5c,0x1b,0xa1,0xeb,0x1b,0x46,0xbf,0x5,0xed,0xe,0xd1,0x21,0xbb,0xf7,0x5c,0xf7,0xc1,0xf2,0x26,0x6b,0x7a,0x4d,0xeb,0xd1,0xa2,0x6b,0x3e,0x3d,0x73,0xc5,0x5e,0x1f,0x7b,0xc,0xe0,0xc1,0xcb,0xab,0x49,0xf,0xb5,0xdd,0x79,0x63,0x86,0xbd,0x77,0xd,0x33,0xad,0x41,0xff,0xe3,0x33,0x4d,0x4f,0xbd,0x93,0x19,0x7e,0x8d,0xd9,0x0,0xee,0x64,0x6,0xd7,0x41,0xd9,0xdd,0xff,0x7c,0xd6,0x5f,0xdf,0xfd,0xd,0xbf,0xaa,0x55,0xdf,0x7c,0xb2,0x44,0x90,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char option_button_focus_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xda,0xa,0x13,0x14,0x2d,0x30,0x6a,0xb1,0x14,0xd6,0x0,0x0,0x1,0x33,0x49,0x44,0x41,0x54,0x38,0xcb,0xa5,0x93,0x3d,0x4e,0x3,0x31,0x10,0x46,0xdf,0x67,0x1b,0xaa,0x34,0xa4,0xe7,0xc,0x8,0xce,0x40,0x4b,0x45,0x47,0xc1,0x4d,0x38,0x46,0x38,0x0,0x5,0x12,0x5,0x12,0x12,0x2d,0x67,0x0,0xe5,0xc,0x11,0x35,0xfd,0xce,0xec,0x9a,0xc2,0xde,0x8d,0x43,0x52,0xb0,0xe0,0xc6,0x3b,0x6b,0xcf,0x37,0x6f,0x7e,0xac,0xd5,0xd3,0xb,0xff,0x59,0xa9,0x1f,0x6,0x2e,0x5f,0x9f,0xf3,0x5f,0x9c,0xdf,0xae,0xae,0x95,0xdc,0x8c,0xa1,0xef,0x39,0xb9,0x38,0x9f,0xe5,0xfc,0xf5,0xfe,0x81,0x9b,0x91,0xdc,0xc,0x21,0x0,0x36,0x37,0xb7,0x67,0xd3,0x8d,0x91,0x49,0x10,0x80,0xa1,0xb1,0x4f,0x1f,0x1f,0xd6,0x92,0x8a,0x80,0x99,0x51,0xfd,0x39,0x8e,0x1,0x10,0x81,0xcc,0x90,0x45,0x10,0xc,0xb9,0xc9,0x4e,0x22,0x34,0xb6,0x15,0x1,0x7,0x15,0x85,0x23,0x85,0xaa,0x25,0x72,0x15,0x4d,0xf5,0x2c,0x53,0xe3,0x54,0x1b,0x9,0x33,0x27,0x99,0xdb,0x8,0x50,0x9,0xa,0x6e,0xd0,0x7e,0xde,0x43,0xf3,0x2d,0xc0,0xdc,0x48,0xde,0x10,0xc4,0x10,0x20,0x43,0x14,0x53,0x5a,0x6d,0x4d,0xa2,0xda,0xda,0x8,0x2f,0x4,0xdd,0x74,0x3b,0x29,0x80,0x20,0xb,0x94,0xcb,0x4e,0xae,0xa7,0xa1,0xfa,0xe6,0x2d,0x83,0x79,0x47,0xf2,0xce,0xa7,0xb4,0x62,0x14,0xb9,0xa9,0xb6,0xea,0x9e,0x5b,0xa0,0x6d,0x9,0xf0,0xce,0x49,0xe6,0x3e,0xfd,0x8d,0xd2,0x3e,0xfa,0x81,0x95,0x27,0x2,0x2f,0x6d,0x1c,0x9,0x82,0x42,0x95,0xcf,0xec,0x96,0x7e,0x37,0x7c,0xf,0x48,0x2a,0x6d,0x74,0xb3,0x86,0xeb,0xc7,0x44,0xeb,0x70,0xec,0x71,0x95,0x41,0x72,0x9b,0xba,0xd0,0xdf,0xaf,0xd6,0xbf,0x9e,0x65,0xa9,0xb4,0xd1,0xcc,0x11,0x10,0x37,0x9f,0xb3,0xde,0x82,0xa0,0xc,0x12,0xc0,0xdd,0x62,0x29,0xfa,0x99,0x4f,0x71,0xb1,0x4,0xe0,0x1b,0xa7,0x20,0x88,0x9b,0x43,0x83,0x3b,0x1f,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0xb4,0x50,0x4c,0x54,0x45,0x95,0xa9,0xb0,0x92,0xa7,0xae,0x8e,0xa2,0xa9,0x8a,0x9d,0xa4,0x85,0x98,0x9f,0x80,0x93,0x9b,0x7b,0x8f,0x96,0x77,0x8a,0x92,0x72,0x86,0x8c,0x6e,0x80,0x88,0x69,0x7c,0x84,0x64,0x77,0x7f,0x60,0x72,0x7a,0x5b,0x6e,0x75,0x56,0x69,0x71,0xc8,0xe3,0xe7,0xc8,0xe2,0xe7,0xca,0xe3,0xe7,0xce,0xe6,0xe9,0xce,0xe6,0xea,0xd0,0xe6,0xe9,0xce,0xe5,0xea,0xd0,0xe6,0xea,0xce,0xe5,0xe9,0xd0,0xe5,0xe9,0xd3,0xe7,0xeb,0xd4,0xe7,0xeb,0xd9,0xea,0xed,0xd7,0xe9,0xed,0xd7,0xea,0xed,0xdc,0xec,0xef,0xdc,0xeb,0xef,0xe0,0xed,0xf1,0xdf,0xee,0xf1,0xdf,0xed,0xf1,0xe0,0xee,0xf1,0xe3,0xf0,0xf2,0xe2,0xef,0xf2,0xe3,0xef,0xf2,0xe6,0xf1,0xf3,0xe8,0xf2,0xf5,0xe8,0xf3,0xf4,0xe8,0xf2,0xf4,0xe8,0xf3,0xf5,0xd6,0x5a,0x5b,0xd4,0x57,0x58,0xe5,0x89,0x89,0xd5,0x57,0x59,0xd5,0x58,0x59,0xd5,0x59,0x5a,0xd6,0x59,0x5a,0xd6,0x5a,0x5c,0xd7,0x5b,0x5c,0xd7,0x5b,0x5d,0xd8,0x5c,0x5d,0xd8,0x5c,0x5e,0xd8,0x5d,0x5f,0xd9,0x5d,0x5f,0xe8,0x6c,0x6e,0xff,0xff,0xff,0xa1,0xe,0x37,0x8c,0x0,0x0,0x0,0x2c,0x74,0x52,0x4e,0x53,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0x2e,0xac,0x80,0x68,0x47,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x3b,0x39,0xe,0xf4,0x6c,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0xa3,0x49,0x44,0x41,0x54,0x18,0xd3,0x5d,0xce,0xdb,0x16,0x42,0x60,0x18,0x84,0xe1,0x4f,0x8,0x65,0x57,0x2a,0x45,0xd9,0x15,0xf9,0xa3,0x89,0x28,0xea,0xfe,0x2f,0x2c,0x4e,0x2c,0x79,0xd6,0xbc,0xe7,0x43,0x34,0xc5,0xe5,0x7f,0x38,0x9a,0xdd,0x31,0x72,0x9f,0x11,0xff,0x80,0x61,0x18,0xa6,0x69,0xac,0xba,0x50,0xf0,0x24,0x14,0x58,0x5b,0x9b,0xed,0xce,0xb6,0x6d,0x6b,0x8f,0x42,0x20,0xb1,0xc4,0xc1,0x71,0xe,0x7d,0x8e,0x83,0x52,0xa4,0xf9,0x13,0xae,0x7b,0x74,0x7b,0xa7,0x13,0x9e,0x73,0x92,0x72,0x78,0xbe,0xef,0x75,0x7c,0xcf,0x47,0x2e,0x91,0x5c,0x21,0x8,0xc2,0x20,0x8c,0x82,0x73,0x18,0xa1,0x92,0x49,0xa9,0x71,0x89,0xe3,0x38,0x49,0xba,0x25,0xa8,0x15,0x5a,0xbc,0x70,0x1d,0xe0,0xb5,0xa0,0xe5,0x1b,0x69,0xca,0xd8,0x8d,0x31,0x96,0x65,0x68,0x96,0xa4,0x36,0x60,0x3,0x34,0x2a,0x69,0xed,0xf8,0x7a,0xab,0x91,0xfe,0xf9,0x8e,0x7c,0x74,0xd2,0x27,0x7e,0x7e,0x46,0x20,0x17,0xe,0x2d,0x4e,0x9,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char option_button_hover_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x77,0x0,0x7d,0x59,0x0,0x0,0xa,0x45,0x69,0x43,0x43,0x50,0x49,0x43,0x43,0x20,0x70,0x72,0x6f,0x66,0x69,0x6c,0x65,0x0,0x0,0x78,0xda,0x9d,0x53,0x67,0x54,0x53,0xe9,0x16,0x3d,0xf7,0xde,0xf4,0x42,0x4b,0x88,0x80,0x94,0x4b,0x6f,0x52,0x15,0x8,0x20,0x52,0x42,0x8b,0x80,0x14,0x91,0x26,0x2a,0x21,0x9,0x10,0x4a,0x88,0x21,0xa1,0xd9,0x15,0x51,0xc1,0x11,0x45,0x45,0x4,0x1b,0xc8,0xa0,0x88,0x3,0x8e,0x8e,0x80,0x8c,0x15,0x51,0x2c,0xc,0x8a,0xa,0xd8,0x7,0xe4,0x21,0xa2,0x8e,0x83,0xa3,0x88,0x8a,0xca,0xfb,0xe1,0x7b,0xa3,0x6b,0xd6,0xbc,0xf7,0xe6,0xcd,0xfe,0xb5,0xd7,0x3e,0xe7,0xac,0xf3,0x9d,0xb3,0xcf,0x7,0xc0,0x8,0xc,0x96,0x48,0x33,0x51,0x35,0x80,0xc,0xa9,0x42,0x1e,0x11,0xe0,0x83,0xc7,0xc4,0xc6,0xe1,0xe4,0x2e,0x40,0x81,0xa,0x24,0x70,0x0,0x10,0x8,0xb3,0x64,0x21,0x73,0xfd,0x23,0x1,0x0,0xf8,0x7e,0x3c,0x3c,0x2b,0x22,0xc0,0x7,0xbe,0x0,0x1,0x78,0xd3,0xb,0x8,0x0,0xc0,0x4d,0x9b,0xc0,0x30,0x1c,0x87,0xff,0xf,0xea,0x42,0x99,0x5c,0x1,0x80,0x84,0x1,0xc0,0x74,0x91,0x38,0x4b,0x8,0x80,0x14,0x0,0x40,0x7a,0x8e,0x42,0xa6,0x0,0x40,0x46,0x1,0x80,0x9d,0x98,0x26,0x53,0x0,0xa0,0x4,0x0,0x60,0xcb,0x63,0x62,0xe3,0x0,0x50,0x2d,0x0,0x60,0x27,0x7f,0xe6,0xd3,0x0,0x80,0x9d,0xf8,0x99,0x7b,0x1,0x0,0x5b,0x94,0x21,0x15,0x1,0xa0,0x91,0x0,0x20,0x13,0x65,0x88,0x44,0x0,0x68,0x3b,0x0,0xac,0xcf,0x56,0x8a,0x45,0x0,0x58,0x30,0x0,0x14,0x66,0x4b,0xc4,0x39,0x0,0xd8,0x2d,0x0,0x30,0x49,0x57,0x66,0x48,0x0,0xb0,0xb7,0x0,0xc0,0xce,0x10,0xb,0xb2,0x0,0x8,0xc,0x0,0x30,0x51,0x88,0x85,0x29,0x0,0x4,0x7b,0x0,0x60,0xc8,0x23,0x23,0x78,0x0,0x84,0x99,0x0,0x14,0x46,0xf2,0x57,0x3c,0xf1,0x2b,0xae,0x10,0xe7,0x2a,0x0,0x0,0x78,0x99,0xb2,0x3c,0xb9,0x24,0x39,0x45,0x81,0x5b,0x8,0x2d,0x71,0x7,0x57,0x57,0x2e,0x1e,0x28,0xce,0x49,0x17,0x2b,0x14,0x36,0x61,0x2,0x61,0x9a,0x40,0x2e,0xc2,0x79,0x99,0x19,0x32,0x81,0x34,0xf,0xe0,0xf3,0xcc,0x0,0x0,0xa0,0x91,0x15,0x11,0xe0,0x83,0xf3,0xfd,0x78,0xce,0xe,0xae,0xce,0xce,0x36,0x8e,0xb6,0xe,0x5f,0x2d,0xea,0xbf,0x6,0xff,0x22,0x62,0x62,0xe3,0xfe,0xe5,0xcf,0xab,0x70,0x40,0x0,0x0,0xe1,0x74,0x7e,0xd1,0xfe,0x2c,0x2f,0xb3,0x1a,0x80,0x3b,0x6,0x80,0x6d,0xfe,0xa2,0x25,0xee,0x4,0x68,0x5e,0xb,0xa0,0x75,0xf7,0x8b,0x66,0xb2,0xf,0x40,0xb5,0x0,0xa0,0xe9,0xda,0x57,0xf3,0x70,0xf8,0x7e,0x3c,0x3c,0x45,0xa1,0x90,0xb9,0xd9,0xd9,0xe5,0xe4,0xe4,0xd8,0x4a,0xc4,0x42,0x5b,0x61,0xca,0x57,0x7d,0xfe,0x67,0xc2,0x5f,0xc0,0x57,0xfd,0x6c,0xf9,0x7e,0x3c,0xfc,0xf7,0xf5,0xe0,0xbe,0xe2,0x24,0x81,0x32,0x5d,0x81,0x47,0x4,0xf8,0xe0,0xc2,0xcc,0xf4,0x4c,0xa5,0x1c,0xcf,0x92,0x9,0x84,0x62,0xdc,0xe6,0x8f,0x47,0xfc,0xb7,0xb,0xff,0xfc,0x1d,0xd3,0x22,0xc4,0x49,0x62,0xb9,0x58,0x2a,0x14,0xe3,0x51,0x12,0x71,0x8e,0x44,0x9a,0x8c,0xf3,0x32,0xa5,0x22,0x89,0x42,0x92,0x29,0xc5,0x25,0xd2,0xff,0x64,0xe2,0xdf,0x2c,0xfb,0x3,0x3e,0xdf,0x35,0x0,0xb0,0x6a,0x3e,0x1,0x7b,0x91,0x2d,0xa8,0x5d,0x63,0x3,0xf6,0x4b,0x27,0x10,0x58,0x74,0xc0,0xe2,0xf7,0x0,0x0,0xf2,0xbb,0x6f,0xc1,0xd4,0x28,0x8,0x3,0x80,0x68,0x83,0xe1,0xcf,0x77,0xff,0xef,0x3f,0xfd,0x47,0xa0,0x25,0x0,0x80,0x66,0x49,0x92,0x71,0x0,0x0,0x5e,0x44,0x24,0x2e,0x54,0xca,0xb3,0x3f,0xc7,0x8,0x0,0x0,0x44,0xa0,0x81,0x2a,0xb0,0x41,0x1b,0xf4,0xc1,0x18,0x2c,0xc0,0x6,0x1c,0xc1,0x5,0xdc,0xc1,0xb,0xfc,0x60,0x36,0x84,0x42,0x24,0xc4,0xc2,0x42,0x10,0x42,0xa,0x64,0x80,0x1c,0x72,0x60,0x29,0xac,0x82,0x42,0x28,0x86,0xcd,0xb0,0x1d,0x2a,0x60,0x2f,0xd4,0x40,0x1d,0x34,0xc0,0x51,0x68,0x86,0x93,0x70,0xe,0x2e,0xc2,0x55,0xb8,0xe,0x3d,0x70,0xf,0xfa,0x61,0x8,0x9e,0xc1,0x28,0xbc,0x81,0x9,0x4,0x41,0xc8,0x8,0x13,0x61,0x21,0xda,0x88,0x1,0x62,0x8a,0x58,0x23,0x8e,0x8,0x17,0x99,0x85,0xf8,0x21,0xc1,0x48,0x4,0x12,0x8b,0x24,0x20,0xc9,0x88,0x14,0x51,0x22,0x4b,0x91,0x35,0x48,0x31,0x52,0x8a,0x54,0x20,0x55,0x48,0x1d,0xf2,0x3d,0x72,0x2,0x39,0x87,0x5c,0x46,0xba,0x91,0x3b,0xc8,0x0,0x32,0x82,0xfc,0x86,0xbc,0x47,0x31,0x94,0x81,0xb2,0x51,0x3d,0xd4,0xc,0xb5,0x43,0xb9,0xa8,0x37,0x1a,0x84,0x46,0xa2,0xb,0xd0,0x64,0x74,0x31,0x9a,0x8f,0x16,0xa0,0x9b,0xd0,0x72,0xb4,0x1a,0x3d,0x8c,0x36,0xa1,0xe7,0xd0,0xab,0x68,0xf,0xda,0x8f,0x3e,0x43,0xc7,0x30,0xc0,0xe8,0x18,0x7,0x33,0xc4,0x6c,0x30,0x2e,0xc6,0xc3,0x42,0xb1,0x38,0x2c,0x9,0x93,0x63,0xcb,0xb1,0x22,0xac,0xc,0xab,0xc6,0x1a,0xb0,0x56,0xac,0x3,0xbb,0x89,0xf5,0x63,0xcf,0xb1,0x77,0x4,0x12,0x81,0x45,0xc0,0x9,0x36,0x4,0x77,0x42,0x20,0x61,0x1e,0x41,0x48,0x58,0x4c,0x58,0x4e,0xd8,0x48,0xa8,0x20,0x1c,0x24,0x34,0x11,0xda,0x9,0x37,0x9,0x3,0x84,0x51,0xc2,0x27,0x22,0x93,0xa8,0x4b,0xb4,0x26,0xba,0x11,0xf9,0xc4,0x18,0x62,0x32,0x31,0x87,0x58,0x48,0x2c,0x23,0xd6,0x12,0x8f,0x13,0x2f,0x10,0x7b,0x88,0x43,0xc4,0x37,0x24,0x12,0x89,0x43,0x32,0x27,0xb9,0x90,0x2,0x49,0xb1,0xa4,0x54,0xd2,0x12,0xd2,0x46,0xd2,0x6e,0x52,0x23,0xe9,0x2c,0xa9,0x9b,0x34,0x48,0x1a,0x23,0x93,0xc9,0xda,0x64,0x6b,0xb2,0x7,0x39,0x94,0x2c,0x20,0x2b,0xc8,0x85,0xe4,0x9d,0xe4,0xc3,0xe4,0x33,0xe4,0x1b,0xe4,0x21,0xf2,0x5b,0xa,0x9d,0x62,0x40,0x71,0xa4,0xf8,0x53,0xe2,0x28,0x52,0xca,0x6a,0x4a,0x19,0xe5,0x10,0xe5,0x34,0xe5,0x6,0x65,0x98,0x32,0x41,0x55,0xa3,0x9a,0x52,0xdd,0xa8,0xa1,0x54,0x11,0x35,0x8f,0x5a,0x42,0xad,0xa1,0xb6,0x52,0xaf,0x51,0x87,0xa8,0x13,0x34,0x75,0x9a,0x39,0xcd,0x83,0x16,0x49,0x4b,0xa5,0xad,0xa2,0x95,0xd3,0x1a,0x68,0x17,0x68,0xf7,0x69,0xaf,0xe8,0x74,0xba,0x11,0xdd,0x95,0x1e,0x4e,0x97,0xd0,0x57,0xd2,0xcb,0xe9,0x47,0xe8,0x97,0xe8,0x3,0xf4,0x77,0xc,0xd,0x86,0x15,0x83,0xc7,0x88,0x67,0x28,0x19,0x9b,0x18,0x7,0x18,0x67,0x19,0x77,0x18,0xaf,0x98,0x4c,0xa6,0x19,0xd3,0x8b,0x19,0xc7,0x54,0x30,0x37,0x31,0xeb,0x98,0xe7,0x99,0xf,0x99,0x6f,0x55,0x58,0x2a,0xb6,0x2a,0x7c,0x15,0x91,0xca,0xa,0x95,0x4a,0x95,0x26,0x95,0x1b,0x2a,0x2f,0x54,0xa9,0xaa,0xa6,0xaa,0xde,0xaa,0xb,0x55,0xf3,0x55,0xcb,0x54,0x8f,0xa9,0x5e,0x53,0x7d,0xae,0x46,0x55,0x33,0x53,0xe3,0xa9,0x9,0xd4,0x96,0xab,0x55,0xaa,0x9d,0x50,0xeb,0x53,0x1b,0x53,0x67,0xa9,0x3b,0xa8,0x87,0xaa,0x67,0xa8,0x6f,0x54,0x3f,0xa4,0x7e,0x59,0xfd,0x89,0x6,0x59,0xc3,0x4c,0xc3,0x4f,0x43,0xa4,0x51,0xa0,0xb1,0x5f,0xe3,0xbc,0xc6,0x20,0xb,0x63,0x19,0xb3,0x78,0x2c,0x21,0x6b,0xd,0xab,0x86,0x75,0x81,0x35,0xc4,0x26,0xb1,0xcd,0xd9,0x7c,0x76,0x2a,0xbb,0x98,0xfd,0x1d,0xbb,0x8b,0x3d,0xaa,0xa9,0xa1,0x39,0x43,0x33,0x4a,0x33,0x57,0xb3,0x52,0xf3,0x94,0x66,0x3f,0x7,0xe3,0x98,0x71,0xf8,0x9c,0x74,0x4e,0x9,0xe7,0x28,0xa7,0x97,0xf3,0x7e,0x8a,0xde,0x14,0xef,0x29,0xe2,0x29,0x1b,0xa6,0x34,0x4c,0xb9,0x31,0x65,0x5c,0x6b,0xaa,0x96,0x97,0x96,0x58,0xab,0x48,0xab,0x51,0xab,0x47,0xeb,0xbd,0x36,0xae,0xed,0xa7,0x9d,0xa6,0xbd,0x45,0xbb,0x59,0xfb,0x81,0xe,0x41,0xc7,0x4a,0x27,0x5c,0x27,0x47,0x67,0x8f,0xce,0x5,0x9d,0xe7,0x53,0xd9,0x53,0xdd,0xa7,0xa,0xa7,0x16,0x4d,0x3d,0x3a,0xf5,0xae,0x2e,0xaa,0x6b,0xa5,0x1b,0xa1,0xbb,0x44,0x77,0xbf,0x6e,0xa7,0xee,0x98,0x9e,0xbe,0x5e,0x80,0x9e,0x4c,0x6f,0xa7,0xde,0x79,0xbd,0xe7,0xfa,0x1c,0x7d,0x2f,0xfd,0x54,0xfd,0x6d,0xfa,0xa7,0xf5,0x47,0xc,0x58,0x6,0xb3,0xc,0x24,0x6,0xdb,0xc,0xce,0x18,0x3c,0xc5,0x35,0x71,0x6f,0x3c,0x1d,0x2f,0xc7,0xdb,0xf1,0x51,0x43,0x5d,0xc3,0x40,0x43,0xa5,0x61,0x95,0x61,0x97,0xe1,0x84,0x91,0xb9,0xd1,0x3c,0xa3,0xd5,0x46,0x8d,0x46,0xf,0x8c,0x69,0xc6,0x5c,0xe3,0x24,0xe3,0x6d,0xc6,0x6d,0xc6,0xa3,0x26,0x6,0x26,0x21,0x26,0x4b,0x4d,0xea,0x4d,0xee,0x9a,0x52,0x4d,0xb9,0xa6,0x29,0xa6,0x3b,0x4c,0x3b,0x4c,0xc7,0xcd,0xcc,0xcd,0xa2,0xcd,0xd6,0x99,0x35,0x9b,0x3d,0x31,0xd7,0x32,0xe7,0x9b,0xe7,0x9b,0xd7,0x9b,0xdf,0xb7,0x60,0x5a,0x78,0x5a,0x2c,0xb6,0xa8,0xb6,0xb8,0x65,0x49,0xb2,0xe4,0x5a,0xa6,0x59,0xee,0xb6,0xbc,0x6e,0x85,0x5a,0x39,0x59,0xa5,0x58,0x55,0x5a,0x5d,0xb3,0x46,0xad,0x9d,0xad,0x25,0xd6,0xbb,0xad,0xbb,0xa7,0x11,0xa7,0xb9,0x4e,0x93,0x4e,0xab,0x9e,0xd6,0x67,0xc3,0xb0,0xf1,0xb6,0xc9,0xb6,0xa9,0xb7,0x19,0xb0,0xe5,0xd8,0x6,0xdb,0xae,0xb6,0x6d,0xb6,0x7d,0x61,0x67,0x62,0x17,0x67,0xb7,0xc5,0xae,0xc3,0xee,0x93,0xbd,0x93,0x7d,0xba,0x7d,0x8d,0xfd,0x3d,0x7,0xd,0x87,0xd9,0xe,0xab,0x1d,0x5a,0x1d,0x7e,0x73,0xb4,0x72,0x14,0x3a,0x56,0x3a,0xde,0x9a,0xce,0x9c,0xee,0x3f,0x7d,0xc5,0xf4,0x96,0xe9,0x2f,0x67,0x58,0xcf,0x10,0xcf,0xd8,0x33,0xe3,0xb6,0x13,0xcb,0x29,0xc4,0x69,0x9d,0x53,0x9b,0xd3,0x47,0x67,0x17,0x67,0xb9,0x73,0x83,0xf3,0x88,0x8b,0x89,0x4b,0x82,0xcb,0x2e,0x97,0x3e,0x2e,0x9b,0x1b,0xc6,0xdd,0xc8,0xbd,0xe4,0x4a,0x74,0xf5,0x71,0x5d,0xe1,0x7a,0xd2,0xf5,0x9d,0x9b,0xb3,0x9b,0xc2,0xed,0xa8,0xdb,0xaf,0xee,0x36,0xee,0x69,0xee,0x87,0xdc,0x9f,0xcc,0x34,0x9f,0x29,0x9e,0x59,0x33,0x73,0xd0,0xc3,0xc8,0x43,0xe0,0x51,0xe5,0xd1,0x3f,0xb,0x9f,0x95,0x30,0x6b,0xdf,0xac,0x7e,0x4f,0x43,0x4f,0x81,0x67,0xb5,0xe7,0x23,0x2f,0x63,0x2f,0x91,0x57,0xad,0xd7,0xb0,0xb7,0xa5,0x77,0xaa,0xf7,0x61,0xef,0x17,0x3e,0xf6,0x3e,0x72,0x9f,0xe3,0x3e,0xe3,0x3c,0x37,0xde,0x32,0xde,0x59,0x5f,0xcc,0x37,0xc0,0xb7,0xc8,0xb7,0xcb,0x4f,0xc3,0x6f,0x9e,0x5f,0x85,0xdf,0x43,0x7f,0x23,0xff,0x64,0xff,0x7a,0xff,0xd1,0x0,0xa7,0x80,0x25,0x1,0x67,0x3,0x89,0x81,0x41,0x81,0x5b,0x2,0xfb,0xf8,0x7a,0x7c,0x21,0xbf,0x8e,0x3f,0x3a,0xdb,0x65,0xf6,0xb2,0xd9,0xed,0x41,0x8c,0xa0,0xb9,0x41,0x15,0x41,0x8f,0x82,0xad,0x82,0xe5,0xc1,0xad,0x21,0x68,0xc8,0xec,0x90,0xad,0x21,0xf7,0xe7,0x98,0xce,0x91,0xce,0x69,0xe,0x85,0x50,0x7e,0xe8,0xd6,0xd0,0x7,0x61,0xe6,0x61,0x8b,0xc3,0x7e,0xc,0x27,0x85,0x87,0x85,0x57,0x86,0x3f,0x8e,0x70,0x88,0x58,0x1a,0xd1,0x31,0x97,0x35,0x77,0xd1,0xdc,0x43,0x73,0xdf,0x44,0xfa,0x44,0x96,0x44,0xde,0x9b,0x67,0x31,0x4f,0x39,0xaf,0x2d,0x4a,0x35,0x2a,0x3e,0xaa,0x2e,0x6a,0x3c,0xda,0x37,0xba,0x34,0xba,0x3f,0xc6,0x2e,0x66,0x59,0xcc,0xd5,0x58,0x9d,0x58,0x49,0x6c,0x4b,0x1c,0x39,0x2e,0x2a,0xae,0x36,0x6e,0x6c,0xbe,0xdf,0xfc,0xed,0xf3,0x87,0xe2,0x9d,0xe2,0xb,0xe3,0x7b,0x17,0x98,0x2f,0xc8,0x5d,0x70,0x79,0xa1,0xce,0xc2,0xf4,0x85,0xa7,0x16,0xa9,0x2e,0x12,0x2c,0x3a,0x96,0x40,0x4c,0x88,0x4e,0x38,0x94,0xf0,0x41,0x10,0x2a,0xa8,0x16,0x8c,0x25,0xf2,0x13,0x77,0x25,0x8e,0xa,0x79,0xc2,0x1d,0xc2,0x67,0x22,0x2f,0xd1,0x36,0xd1,0x88,0xd8,0x43,0x5c,0x2a,0x1e,0x4e,0xf2,0x48,0x2a,0x4d,0x7a,0x92,0xec,0x91,0xbc,0x35,0x79,0x24,0xc5,0x33,0xa5,0x2c,0xe5,0xb9,0x84,0x27,0xa9,0x90,0xbc,0x4c,0xd,0x4c,0xdd,0x9b,0x3a,0x9e,0x16,0x9a,0x76,0x20,0x6d,0x32,0x3d,0x3a,0xbd,0x31,0x83,0x92,0x91,0x90,0x71,0x42,0xaa,0x21,0x4d,0x93,0xb6,0x67,0xea,0x67,0xe6,0x66,0x76,0xcb,0xac,0x65,0x85,0xb2,0xfe,0xc5,0x6e,0x8b,0xb7,0x2f,0x1e,0x95,0x7,0xc9,0x6b,0xb3,0x90,0xac,0x5,0x59,0x2d,0xa,0xb6,0x42,0xa6,0xe8,0x54,0x5a,0x28,0xd7,0x2a,0x7,0xb2,0x67,0x65,0x57,0x66,0xbf,0xcd,0x89,0xca,0x39,0x96,0xab,0x9e,0x2b,0xcd,0xed,0xcc,0xb3,0xca,0xdb,0x90,0x37,0x9c,0xef,0x9f,0xff,0xed,0x12,0xc2,0x12,0xe1,0x92,0xb6,0xa5,0x86,0x4b,0x57,0x2d,0x1d,0x58,0xe6,0xbd,0xac,0x6a,0x39,0xb2,0x3c,0x71,0x79,0xdb,0xa,0xe3,0x15,0x5,0x2b,0x86,0x56,0x6,0xac,0x3c,0xb8,0x8a,0xb6,0x2a,0x6d,0xd5,0x4f,0xab,0xed,0x57,0x97,0xae,0x7e,0xbd,0x26,0x7a,0x4d,0x6b,0x81,0x5e,0xc1,0xca,0x82,0xc1,0xb5,0x1,0x6b,0xeb,0xb,0x55,0xa,0xe5,0x85,0x7d,0xeb,0xdc,0xd7,0xed,0x5d,0x4f,0x58,0x2f,0x59,0xdf,0xb5,0x61,0xfa,0x86,0x9d,0x1b,0x3e,0x15,0x89,0x8a,0xae,0x14,0xdb,0x17,0x97,0x15,0x7f,0xd8,0x28,0xdc,0x78,0xe5,0x1b,0x87,0x6f,0xca,0xbf,0x99,0xdc,0x94,0xb4,0xa9,0xab,0xc4,0xb9,0x64,0xcf,0x66,0xd2,0x66,0xe9,0xe6,0xde,0x2d,0x9e,0x5b,0xe,0x96,0xaa,0x97,0xe6,0x97,0xe,0x6e,0xd,0xd9,0xda,0xb4,0xd,0xdf,0x56,0xb4,0xed,0xf5,0xf6,0x45,0xdb,0x2f,0x97,0xcd,0x28,0xdb,0xbb,0x83,0xb6,0x43,0xb9,0xa3,0xbf,0x3c,0xb8,0xbc,0x65,0xa7,0xc9,0xce,0xcd,0x3b,0x3f,0x54,0xa4,0x54,0xf4,0x54,0xfa,0x54,0x36,0xee,0xd2,0xdd,0xb5,0x61,0xd7,0xf8,0x6e,0xd1,0xee,0x1b,0x7b,0xbc,0xf6,0x34,0xec,0xd5,0xdb,0x5b,0xbc,0xf7,0xfd,0x3e,0xc9,0xbe,0xdb,0x55,0x1,0x55,0x4d,0xd5,0x66,0xd5,0x65,0xfb,0x49,0xfb,0xb3,0xf7,0x3f,0xae,0x89,0xaa,0xe9,0xf8,0x96,0xfb,0x6d,0x5d,0xad,0x4e,0x6d,0x71,0xed,0xc7,0x3,0xd2,0x3,0xfd,0x7,0x23,0xe,0xb6,0xd7,0xb9,0xd4,0xd5,0x1d,0xd2,0x3d,0x54,0x52,0x8f,0xd6,0x2b,0xeb,0x47,0xe,0xc7,0x1f,0xbe,0xfe,0x9d,0xef,0x77,0x2d,0xd,0x36,0xd,0x55,0x8d,0x9c,0xc6,0xe2,0x23,0x70,0x44,0x79,0xe4,0xe9,0xf7,0x9,0xdf,0xf7,0x1e,0xd,0x3a,0xda,0x76,0x8c,0x7b,0xac,0xe1,0x7,0xd3,0x1f,0x76,0x1d,0x67,0x1d,0x2f,0x6a,0x42,0x9a,0xf2,0x9a,0x46,0x9b,0x53,0x9a,0xfb,0x5b,0x62,0x5b,0xba,0x4f,0xcc,0x3e,0xd1,0xd6,0xea,0xde,0x7a,0xfc,0x47,0xdb,0x1f,0xf,0x9c,0x34,0x3c,0x59,0x79,0x4a,0xf3,0x54,0xc9,0x69,0xda,0xe9,0x82,0xd3,0x93,0x67,0xf2,0xcf,0x8c,0x9d,0x95,0x9d,0x7d,0x7e,0x2e,0xf9,0xdc,0x60,0xdb,0xa2,0xb6,0x7b,0xe7,0x63,0xce,0xdf,0x6a,0xf,0x6f,0xef,0xba,0x10,0x74,0xe1,0xd2,0x45,0xff,0x8b,0xe7,0x3b,0xbc,0x3b,0xce,0x5c,0xf2,0xb8,0x74,0xf2,0xb2,0xdb,0xe5,0x13,0x57,0xb8,0x57,0x9a,0xaf,0x3a,0x5f,0x6d,0xea,0x74,0xea,0x3c,0xfe,0x93,0xd3,0x4f,0xc7,0xbb,0x9c,0xbb,0x9a,0xae,0xb9,0x5c,0x6b,0xb9,0xee,0x7a,0xbd,0xb5,0x7b,0x66,0xf7,0xe9,0x1b,0x9e,0x37,0xce,0xdd,0xf4,0xbd,0x79,0xf1,0x16,0xff,0xd6,0xd5,0x9e,0x39,0x3d,0xdd,0xbd,0xf3,0x7a,0x6f,0xf7,0xc5,0xf7,0xf5,0xdf,0x16,0xdd,0x7e,0x72,0x27,0xfd,0xce,0xcb,0xbb,0xd9,0x77,0x27,0xee,0xad,0xbc,0x4f,0xbc,0x5f,0xf4,0x40,0xed,0x41,0xd9,0x43,0xdd,0x87,0xd5,0x3f,0x5b,0xfe,0xdc,0xd8,0xef,0xdc,0x7f,0x6a,0xc0,0x77,0xa0,0xf3,0xd1,0xdc,0x47,0xf7,0x6,0x85,0x83,0xcf,0xfe,0x91,0xf5,0x8f,0xf,0x43,0x5,0x8f,0x99,0x8f,0xcb,0x86,0xd,0x86,0xeb,0x9e,0x38,0x3e,0x39,0x39,0xe2,0x3f,0x72,0xfd,0xe9,0xfc,0xa7,0x43,0xcf,0x64,0xcf,0x26,0x9e,0x17,0xfe,0xa2,0xfe,0xcb,0xae,0x17,0x16,0x2f,0x7e,0xf8,0xd5,0xeb,0xd7,0xce,0xd1,0x98,0xd1,0xa1,0x97,0xf2,0x97,0x93,0xbf,0x6d,0x7c,0xa5,0xfd,0xea,0xc0,0xeb,0x19,0xaf,0xdb,0xc6,0xc2,0xc6,0x1e,0xbe,0xc9,0x78,0x33,0x31,0x5e,0xf4,0x56,0xfb,0xed,0xc1,0x77,0xdc,0x77,0x1d,0xef,0xa3,0xdf,0xf,0x4f,0xe4,0x7c,0x20,0x7f,0x28,0xff,0x68,0xf9,0xb1,0xf5,0x53,0xd0,0xa7,0xfb,0x93,0x19,0x93,0x93,0xff,0x4,0x3,0x98,0xf3,0xfc,0xef,0x35,0x94,0x82,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xa,0x14,0x3,0x2,0x26,0x58,0xa,0x85,0x15,0x0,0x0,0x1,0xc5,0x49,0x44,0x41,0x54,0x48,0xc7,0xad,0x95,0x4b,0x8e,0x13,0x31,0x10,0x40,0x5f,0xd9,0x1d,0x3a,0x62,0x88,0xd2,0x4b,0x12,0x29,0x12,0xdc,0x4,0xb1,0x65,0xc7,0x15,0x90,0x38,0x43,0x8e,0xc0,0x25,0x38,0x7,0xb,0x96,0x2c,0xd8,0xb0,0x9a,0x23,0x8c,0x34,0x22,0x12,0xd2,0x68,0xf8,0x69,0x98,0xc4,0xae,0x62,0x61,0x3b,0xe9,0x30,0x9a,0x6e,0x8f,0x42,0x49,0x25,0xdb,0xad,0xb6,0xeb,0xd5,0xcf,0x16,0xa0,0x1,0x1e,0x1,0x2d,0x30,0xcd,0x73,0xf,0x38,0x8e,0x45,0x81,0x1d,0x70,0xb,0xdc,0x0,0xdb,0xbc,0x56,0x4e,0x90,0x62,0xfc,0xc,0xe8,0x80,0x79,0x9e,0xb7,0x80,0x64,0x2d,0xb2,0xcb,0x86,0x7f,0x2,0x57,0xc0,0xf,0x20,0xfe,0xf,0x80,0x16,0xe8,0x5e,0xbe,0x78,0xf5,0x7a,0xb5,0x7c,0xbe,0xe,0x31,0x74,0x66,0x76,0xef,0x86,0xd9,0x6c,0xce,0xa7,0xcf,0x1f,0x1,0xc3,0xfb,0x6,0xe7,0xdc,0xa0,0x1,0x33,0xcb,0xaa,0xa8,0x2a,0x22,0xf2,0xd5,0x7b,0xff,0xe6,0xfc,0xfc,0xcb,0x87,0x2,0x30,0x5,0xe6,0xab,0xe5,0xb3,0xf5,0xd5,0xf5,0xb7,0x2e,0x84,0x1d,0x43,0x0,0xa0,0x84,0xb0,0x45,0x35,0xe2,0xfd,0xa4,0x1a,0x40,0x55,0x51,0x8d,0x0,0x8b,0xb6,0x9d,0xbe,0x7,0x96,0x47,0x29,0x8,0x71,0x57,0x61,0xbc,0x88,0x20,0xe2,0xf0,0xde,0xe1,0x9c,0xaf,0x0,0x28,0x59,0x32,0x62,0xc,0xc4,0x18,0x17,0xfd,0x14,0x78,0xa0,0x4d,0x84,0xe3,0xe9,0x2c,0x80,0x22,0x2,0x38,0x44,0x86,0x23,0x20,0x62,0xa8,0x82,0x73,0x64,0x10,0xb9,0x53,0x3,0xe,0x10,0x33,0xa8,0x71,0xde,0x2c,0x1d,0x9a,0xc6,0xa4,0xe3,0xff,0x27,0xef,0x4b,0x14,0xfa,0x75,0xdb,0x14,0x50,0xcd,0xb9,0x1a,0x13,0xad,0x4a,0xd1,0x5d,0x88,0xfb,0xd6,0x4d,0xef,0x73,0x8f,0x72,0xf0,0x38,0x54,0xd9,0x17,0x96,0x8c,0x84,0xe0,0xd0,0x1,0xa5,0x10,0x8f,0x1d,0x6d,0xf6,0xff,0x69,0x65,0xa,0x14,0xcc,0xe2,0x7e,0x93,0x59,0x1d,0x40,0xd2,0x14,0xfe,0x43,0x51,0x26,0x0,0x4d,0xae,0x6b,0x65,0x4,0x94,0x54,0xab,0xa5,0xbd,0xac,0xb2,0xd,0xf,0x63,0x7f,0x4f,0x93,0x6f,0xb3,0xdb,0x7f,0xab,0x7c,0xbc,0xad,0xac,0xba,0x6b,0x92,0x46,0x54,0x63,0x3e,0xff,0x18,0x60,0xb,0xfc,0x16,0xd7,0x5c,0x7b,0xd7,0x74,0x21,0x4,0x6c,0x20,0x12,0x85,0xaf,0xe4,0xb4,0xe,0x20,0xb5,0xb8,0x99,0xe5,0x8e,0x90,0x4d,0x1f,0xe0,0xf,0xf0,0x7d,0xb3,0xb9,0x78,0xb7,0x78,0xba,0x5a,0x87,0x18,0xba,0xa1,0x62,0x78,0x72,0x36,0x63,0x32,0x99,0x0,0xe0,0xbd,0x7f,0xc0,0x4d,0x18,0x89,0x31,0x2,0x5c,0x82,0xbc,0x3d,0x5c,0x69,0xf0,0xf8,0x84,0xc7,0xe8,0x6,0x8,0xa7,0x3e,0x46,0xdb,0x3c,0xf,0xc0,0xaf,0x7,0x3e,0xc7,0x27,0xbd,0x84,0x0,0x7f,0x1,0xeb,0x59,0x47,0x10,0x4f,0x87,0xd2,0x63,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x40,0xde,0x8d,0x6b,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x1,0x44,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x42,0x40,0x4b,0x5f,0x5a,0x6c,0x2b,0x2b,0x31,0x2e,0x2e,0x34,0x5f,0x5a,0x6b,0x2a,0x2a,0x30,0x56,0x53,0x64,0x22,0x22,0x27,0x3e,0x3b,0x46,0x57,0x53,0x63,0x24,0x24,0x28,0x24,0x24,0x29,0x5b,0x57,0x68,0x5a,0x56,0x67,0x67,0x63,0x76,0x2a,0x2a,0x31,0x2a,0x2a,0x30,0x2d,0x2d,0x34,0x2f,0x2f,0x36,0x2e,0x2e,0x35,0x2c,0x2c,0x32,0x4d,0x4a,0x57,0x49,0x46,0x52,0x48,0x45,0x51,0x5a,0x56,0x65,0x26,0x26,0x2b,0x24,0x24,0x28,0x27,0x27,0x2d,0x29,0x29,0x2f,0x28,0x28,0x2e,0x25,0x25,0x2b,0x23,0x23,0x28,0x5b,0x57,0x66,0x26,0x26,0x2c,0x25,0x25,0x2a,0x2a,0x2a,0x2f,0x2b,0x2b,0x31,0x22,0x22,0x26,0x59,0x55,0x64,0x47,0x44,0x50,0x2d,0x2d,0x33,0x22,0x22,0x27,0x58,0x54,0x64,0x46,0x43,0x50,0x27,0x27,0x2b,0x2e,0x2e,0x34,0x2c,0x2c,0x31,0x29,0x29,0x2e,0x56,0x53,0x63,0x45,0x42,0x4f,0x56,0x53,0x62,0x45,0x42,0x4e,0x24,0x24,0x2a,0x24,0x24,0x29,0x20,0x20,0x25,0x55,0x51,0x62,0x44,0x41,0x4e,0x28,0x28,0x2d,0x2b,0x2b,0x30,0x29,0x29,0x2d,0x20,0x20,0x23,0x55,0x51,0x60,0x44,0x41,0x4d,0x22,0x22,0x28,0x27,0x27,0x2c,0x1e,0x1e,0x22,0x43,0x40,0x4c,0x54,0x50,0x5f,0x21,0x21,0x26,0x21,0x21,0x25,0x23,0x23,0x27,0x20,0x20,0x24,0x1d,0x1d,0x21,0x47,0x43,0x51,0x43,0x3f,0x4d,0x42,0x3f,0x4c,0x53,0x4f,0x5f,0x1f,0x1f,0x24,0x1f,0x1f,0x23,0x1e,0x1e,0x21,0x53,0x50,0x5f,0x53,0x4f,0x5e,0x5f,0x5a,0x6c,0xff,0xff,0xff,0xd1,0x85,0xc5,0x5,0x0,0x0,0x0,0x24,0x74,0x52,0x4e,0x53,0x0,0x4,0xa,0x11,0x19,0x1f,0x22,0x24,0x1d,0x16,0xd,0x7,0x2,0x15,0x25,0x34,0x3f,0x46,0x47,0x48,0x43,0x3a,0x2d,0x1b,0x77,0xef,0xe6,0x49,0xef,0xe6,0xef,0xe7,0x77,0xef,0xe4,0x4a,0xba,0xea,0xc1,0xeb,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x6b,0x52,0x65,0xa5,0x98,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x1,0x10,0x49,0x44,0x41,0x54,0x28,0xcf,0x8d,0xd1,0xd9,0x52,0xc2,0x30,0x14,0x80,0x61,0xd6,0xa2,0xa8,0x6c,0x75,0xdf,0x77,0xa8,0xa2,0x70,0xd2,0x4a,0x25,0x6d,0x81,0x62,0xa1,0x88,0x20,0x6e,0xc5,0xaa,0x80,0xfb,0xfa,0xfe,0xf,0x60,0x49,0x13,0x86,0xd1,0xb,0xfd,0x6e,0xf3,0xcf,0xe4,0x24,0xc7,0xe3,0xf5,0xf9,0x3,0x41,0x2e,0xe4,0xe0,0x46,0x46,0xc3,0x63,0xe3,0x9e,0x9f,0x7c,0x13,0x91,0x68,0x2c,0x9e,0xe0,0x79,0x7e,0x72,0x6a,0x7a,0x26,0xec,0xfd,0x15,0xf8,0x23,0xb3,0x73,0x9b,0x5b,0xae,0xed,0x64,0x4a,0xd8,0xa1,0x76,0x85,0x74,0x6a,0x7e,0xc1,0x9,0x2,0xd1,0xc5,0xbd,0xfd,0x8c,0x2b,0xb,0x48,0x94,0xa8,0x3,0x31,0x27,0xcb,0x4b,0x4e,0x10,0x8c,0x1d,0xb2,0xf3,0x4c,0x36,0x8f,0x95,0x34,0xa5,0x2a,0x22,0xd6,0x44,0x27,0xe0,0xe2,0x85,0x22,0x53,0xc8,0x43,0x52,0xa0,0x4a,0xaa,0x4,0x7a,0x3f,0x8,0x25,0xca,0x47,0x4c,0xd9,0x0,0xb5,0x42,0x95,0xaa,0x26,0x68,0x46,0x3f,0xe0,0x6b,0xc7,0x4c,0x6d,0x38,0x50,0x9d,0x0,0x48,0x50,0x3f,0x61,0xea,0xb9,0x86,0x34,0x34,0x43,0xf3,0x14,0x93,0x2b,0x5a,0x67,0x4c,0xb,0xa1,0xf3,0xb,0x4a,0xb9,0x4,0xf9,0xa,0x91,0x21,0xad,0x36,0x63,0x5d,0xeb,0xf6,0xe0,0x99,0x76,0x43,0xbf,0xd1,0xc9,0x33,0xad,0xf6,0x2d,0x75,0xd7,0xe9,0x62,0x9b,0x2,0xdc,0xbb,0x7f,0xd0,0xc8,0x47,0x2d,0x3f,0x3e,0x3d,0xbb,0x5e,0x3a,0xaf,0x32,0xa6,0x9a,0xbd,0xee,0xdb,0xfb,0xa,0xf9,0xea,0xd5,0xb5,0x8f,0x4f,0xd7,0x17,0x80,0x39,0x98,0xc1,0x34,0xd0,0xfa,0xc6,0x7f,0x96,0xf5,0xd7,0xba,0xbf,0x1,0xfe,0x22,0x58,0x7c,0xf4,0xd2,0xd1,0x68,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char option_button_normal_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x77,0x0,0x7d,0x59,0x0,0x0,0xa,0x45,0x69,0x43,0x43,0x50,0x49,0x43,0x43,0x20,0x70,0x72,0x6f,0x66,0x69,0x6c,0x65,0x0,0x0,0x78,0xda,0x9d,0x53,0x67,0x54,0x53,0xe9,0x16,0x3d,0xf7,0xde,0xf4,0x42,0x4b,0x88,0x80,0x94,0x4b,0x6f,0x52,0x15,0x8,0x20,0x52,0x42,0x8b,0x80,0x14,0x91,0x26,0x2a,0x21,0x9,0x10,0x4a,0x88,0x21,0xa1,0xd9,0x15,0x51,0xc1,0x11,0x45,0x45,0x4,0x1b,0xc8,0xa0,0x88,0x3,0x8e,0x8e,0x80,0x8c,0x15,0x51,0x2c,0xc,0x8a,0xa,0xd8,0x7,0xe4,0x21,0xa2,0x8e,0x83,0xa3,0x88,0x8a,0xca,0xfb,0xe1,0x7b,0xa3,0x6b,0xd6,0xbc,0xf7,0xe6,0xcd,0xfe,0xb5,0xd7,0x3e,0xe7,0xac,0xf3,0x9d,0xb3,0xcf,0x7,0xc0,0x8,0xc,0x96,0x48,0x33,0x51,0x35,0x80,0xc,0xa9,0x42,0x1e,0x11,0xe0,0x83,0xc7,0xc4,0xc6,0xe1,0xe4,0x2e,0x40,0x81,0xa,0x24,0x70,0x0,0x10,0x8,0xb3,0x64,0x21,0x73,0xfd,0x23,0x1,0x0,0xf8,0x7e,0x3c,0x3c,0x2b,0x22,0xc0,0x7,0xbe,0x0,0x1,0x78,0xd3,0xb,0x8,0x0,0xc0,0x4d,0x9b,0xc0,0x30,0x1c,0x87,0xff,0xf,0xea,0x42,0x99,0x5c,0x1,0x80,0x84,0x1,0xc0,0x74,0x91,0x38,0x4b,0x8,0x80,0x14,0x0,0x40,0x7a,0x8e,0x42,0xa6,0x0,0x40,0x46,0x1,0x80,0x9d,0x98,0x26,0x53,0x0,0xa0,0x4,0x0,0x60,0xcb,0x63,0x62,0xe3,0x0,0x50,0x2d,0x0,0x60,0x27,0x7f,0xe6,0xd3,0x0,0x80,0x9d,0xf8,0x99,0x7b,0x1,0x0,0x5b,0x94,0x21,0x15,0x1,0xa0,0x91,0x0,0x20,0x13,0x65,0x88,0x44,0x0,0x68,0x3b,0x0,0xac,0xcf,0x56,0x8a,0x45,0x0,0x58,0x30,0x0,0x14,0x66,0x4b,0xc4,0x39,0x0,0xd8,0x2d,0x0,0x30,0x49,0x57,0x66,0x48,0x0,0xb0,0xb7,0x0,0xc0,0xce,0x10,0xb,0xb2,0x0,0x8,0xc,0x0,0x30,0x51,0x88,0x85,0x29,0x0,0x4,0x7b,0x0,0x60,0xc8,0x23,0x23,0x78,0x0,0x84,0x99,0x0,0x14,0x46,0xf2,0x57,0x3c,0xf1,0x2b,0xae,0x10,0xe7,0x2a,0x0,0x0,0x78,0x99,0xb2,0x3c,0xb9,0x24,0x39,0x45,0x81,0x5b,0x8,0x2d,0x71,0x7,0x57,0x57,0x2e,0x1e,0x28,0xce,0x49,0x17,0x2b,0x14,0x36,0x61,0x2,0x61,0x9a,0x40,0x2e,0xc2,0x79,0x99,0x19,0x32,0x81,0x34,0xf,0xe0,0xf3,0xcc,0x0,0x0,0xa0,0x91,0x15,0x11,0xe0,0x83,0xf3,0xfd,0x78,0xce,0xe,0xae,0xce,0xce,0x36,0x8e,0xb6,0xe,0x5f,0x2d,0xea,0xbf,0x6,0xff,0x22,0x62,0x62,0xe3,0xfe,0xe5,0xcf,0xab,0x70,0x40,0x0,0x0,0xe1,0x74,0x7e,0xd1,0xfe,0x2c,0x2f,0xb3,0x1a,0x80,0x3b,0x6,0x80,0x6d,0xfe,0xa2,0x25,0xee,0x4,0x68,0x5e,0xb,0xa0,0x75,0xf7,0x8b,0x66,0xb2,0xf,0x40,0xb5,0x0,0xa0,0xe9,0xda,0x57,0xf3,0x70,0xf8,0x7e,0x3c,0x3c,0x45,0xa1,0x90,0xb9,0xd9,0xd9,0xe5,0xe4,0xe4,0xd8,0x4a,0xc4,0x42,0x5b,0x61,0xca,0x57,0x7d,0xfe,0x67,0xc2,0x5f,0xc0,0x57,0xfd,0x6c,0xf9,0x7e,0x3c,0xfc,0xf7,0xf5,0xe0,0xbe,0xe2,0x24,0x81,0x32,0x5d,0x81,0x47,0x4,0xf8,0xe0,0xc2,0xcc,0xf4,0x4c,0xa5,0x1c,0xcf,0x92,0x9,0x84,0x62,0xdc,0xe6,0x8f,0x47,0xfc,0xb7,0xb,0xff,0xfc,0x1d,0xd3,0x22,0xc4,0x49,0x62,0xb9,0x58,0x2a,0x14,0xe3,0x51,0x12,0x71,0x8e,0x44,0x9a,0x8c,0xf3,0x32,0xa5,0x22,0x89,0x42,0x92,0x29,0xc5,0x25,0xd2,0xff,0x64,0xe2,0xdf,0x2c,0xfb,0x3,0x3e,0xdf,0x35,0x0,0xb0,0x6a,0x3e,0x1,0x7b,0x91,0x2d,0xa8,0x5d,0x63,0x3,0xf6,0x4b,0x27,0x10,0x58,0x74,0xc0,0xe2,0xf7,0x0,0x0,0xf2,0xbb,0x6f,0xc1,0xd4,0x28,0x8,0x3,0x80,0x68,0x83,0xe1,0xcf,0x77,0xff,0xef,0x3f,0xfd,0x47,0xa0,0x25,0x0,0x80,0x66,0x49,0x92,0x71,0x0,0x0,0x5e,0x44,0x24,0x2e,0x54,0xca,0xb3,0x3f,0xc7,0x8,0x0,0x0,0x44,0xa0,0x81,0x2a,0xb0,0x41,0x1b,0xf4,0xc1,0x18,0x2c,0xc0,0x6,0x1c,0xc1,0x5,0xdc,0xc1,0xb,0xfc,0x60,0x36,0x84,0x42,0x24,0xc4,0xc2,0x42,0x10,0x42,0xa,0x64,0x80,0x1c,0x72,0x60,0x29,0xac,0x82,0x42,0x28,0x86,0xcd,0xb0,0x1d,0x2a,0x60,0x2f,0xd4,0x40,0x1d,0x34,0xc0,0x51,0x68,0x86,0x93,0x70,0xe,0x2e,0xc2,0x55,0xb8,0xe,0x3d,0x70,0xf,0xfa,0x61,0x8,0x9e,0xc1,0x28,0xbc,0x81,0x9,0x4,0x41,0xc8,0x8,0x13,0x61,0x21,0xda,0x88,0x1,0x62,0x8a,0x58,0x23,0x8e,0x8,0x17,0x99,0x85,0xf8,0x21,0xc1,0x48,0x4,0x12,0x8b,0x24,0x20,0xc9,0x88,0x14,0x51,0x22,0x4b,0x91,0x35,0x48,0x31,0x52,0x8a,0x54,0x20,0x55,0x48,0x1d,0xf2,0x3d,0x72,0x2,0x39,0x87,0x5c,0x46,0xba,0x91,0x3b,0xc8,0x0,0x32,0x82,0xfc,0x86,0xbc,0x47,0x31,0x94,0x81,0xb2,0x51,0x3d,0xd4,0xc,0xb5,0x43,0xb9,0xa8,0x37,0x1a,0x84,0x46,0xa2,0xb,0xd0,0x64,0x74,0x31,0x9a,0x8f,0x16,0xa0,0x9b,0xd0,0x72,0xb4,0x1a,0x3d,0x8c,0x36,0xa1,0xe7,0xd0,0xab,0x68,0xf,0xda,0x8f,0x3e,0x43,0xc7,0x30,0xc0,0xe8,0x18,0x7,0x33,0xc4,0x6c,0x30,0x2e,0xc6,0xc3,0x42,0xb1,0x38,0x2c,0x9,0x93,0x63,0xcb,0xb1,0x22,0xac,0xc,0xab,0xc6,0x1a,0xb0,0x56,0xac,0x3,0xbb,0x89,0xf5,0x63,0xcf,0xb1,0x77,0x4,0x12,0x81,0x45,0xc0,0x9,0x36,0x4,0x77,0x42,0x20,0x61,0x1e,0x41,0x48,0x58,0x4c,0x58,0x4e,0xd8,0x48,0xa8,0x20,0x1c,0x24,0x34,0x11,0xda,0x9,0x37,0x9,0x3,0x84,0x51,0xc2,0x27,0x22,0x93,0xa8,0x4b,0xb4,0x26,0xba,0x11,0xf9,0xc4,0x18,0x62,0x32,0x31,0x87,0x58,0x48,0x2c,0x23,0xd6,0x12,0x8f,0x13,0x2f,0x10,0x7b,0x88,0x43,0xc4,0x37,0x24,0x12,0x89,0x43,0x32,0x27,0xb9,0x90,0x2,0x49,0xb1,0xa4,0x54,0xd2,0x12,0xd2,0x46,0xd2,0x6e,0x52,0x23,0xe9,0x2c,0xa9,0x9b,0x34,0x48,0x1a,0x23,0x93,0xc9,0xda,0x64,0x6b,0xb2,0x7,0x39,0x94,0x2c,0x20,0x2b,0xc8,0x85,0xe4,0x9d,0xe4,0xc3,0xe4,0x33,0xe4,0x1b,0xe4,0x21,0xf2,0x5b,0xa,0x9d,0x62,0x40,0x71,0xa4,0xf8,0x53,0xe2,0x28,0x52,0xca,0x6a,0x4a,0x19,0xe5,0x10,0xe5,0x34,0xe5,0x6,0x65,0x98,0x32,0x41,0x55,0xa3,0x9a,0x52,0xdd,0xa8,0xa1,0x54,0x11,0x35,0x8f,0x5a,0x42,0xad,0xa1,0xb6,0x52,0xaf,0x51,0x87,0xa8,0x13,0x34,0x75,0x9a,0x39,0xcd,0x83,0x16,0x49,0x4b,0xa5,0xad,0xa2,0x95,0xd3,0x1a,0x68,0x17,0x68,0xf7,0x69,0xaf,0xe8,0x74,0xba,0x11,0xdd,0x95,0x1e,0x4e,0x97,0xd0,0x57,0xd2,0xcb,0xe9,0x47,0xe8,0x97,0xe8,0x3,0xf4,0x77,0xc,0xd,0x86,0x15,0x83,0xc7,0x88,0x67,0x28,0x19,0x9b,0x18,0x7,0x18,0x67,0x19,0x77,0x18,0xaf,0x98,0x4c,0xa6,0x19,0xd3,0x8b,0x19,0xc7,0x54,0x30,0x37,0x31,0xeb,0x98,0xe7,0x99,0xf,0x99,0x6f,0x55,0x58,0x2a,0xb6,0x2a,0x7c,0x15,0x91,0xca,0xa,0x95,0x4a,0x95,0x26,0x95,0x1b,0x2a,0x2f,0x54,0xa9,0xaa,0xa6,0xaa,0xde,0xaa,0xb,0x55,0xf3,0x55,0xcb,0x54,0x8f,0xa9,0x5e,0x53,0x7d,0xae,0x46,0x55,0x33,0x53,0xe3,0xa9,0x9,0xd4,0x96,0xab,0x55,0xaa,0x9d,0x50,0xeb,0x53,0x1b,0x53,0x67,0xa9,0x3b,0xa8,0x87,0xaa,0x67,0xa8,0x6f,0x54,0x3f,0xa4,0x7e,0x59,0xfd,0x89,0x6,0x59,0xc3,0x4c,0xc3,0x4f,0x43,0xa4,0x51,0xa0,0xb1,0x5f,0xe3,0xbc,0xc6,0x20,0xb,0x63,0x19,0xb3,0x78,0x2c,0x21,0x6b,0xd,0xab,0x86,0x75,0x81,0x35,0xc4,0x26,0xb1,0xcd,0xd9,0x7c,0x76,0x2a,0xbb,0x98,0xfd,0x1d,0xbb,0x8b,0x3d,0xaa,0xa9,0xa1,0x39,0x43,0x33,0x4a,0x33,0x57,0xb3,0x52,0xf3,0x94,0x66,0x3f,0x7,0xe3,0x98,0x71,0xf8,0x9c,0x74,0x4e,0x9,0xe7,0x28,0xa7,0x97,0xf3,0x7e,0x8a,0xde,0x14,0xef,0x29,0xe2,0x29,0x1b,0xa6,0x34,0x4c,0xb9,0x31,0x65,0x5c,0x6b,0xaa,0x96,0x97,0x96,0x58,0xab,0x48,0xab,0x51,0xab,0x47,0xeb,0xbd,0x36,0xae,0xed,0xa7,0x9d,0xa6,0xbd,0x45,0xbb,0x59,0xfb,0x81,0xe,0x41,0xc7,0x4a,0x27,0x5c,0x27,0x47,0x67,0x8f,0xce,0x5,0x9d,0xe7,0x53,0xd9,0x53,0xdd,0xa7,0xa,0xa7,0x16,0x4d,0x3d,0x3a,0xf5,0xae,0x2e,0xaa,0x6b,0xa5,0x1b,0xa1,0xbb,0x44,0x77,0xbf,0x6e,0xa7,0xee,0x98,0x9e,0xbe,0x5e,0x80,0x9e,0x4c,0x6f,0xa7,0xde,0x79,0xbd,0xe7,0xfa,0x1c,0x7d,0x2f,0xfd,0x54,0xfd,0x6d,0xfa,0xa7,0xf5,0x47,0xc,0x58,0x6,0xb3,0xc,0x24,0x6,0xdb,0xc,0xce,0x18,0x3c,0xc5,0x35,0x71,0x6f,0x3c,0x1d,0x2f,0xc7,0xdb,0xf1,0x51,0x43,0x5d,0xc3,0x40,0x43,0xa5,0x61,0x95,0x61,0x97,0xe1,0x84,0x91,0xb9,0xd1,0x3c,0xa3,0xd5,0x46,0x8d,0x46,0xf,0x8c,0x69,0xc6,0x5c,0xe3,0x24,0xe3,0x6d,0xc6,0x6d,0xc6,0xa3,0x26,0x6,0x26,0x21,0x26,0x4b,0x4d,0xea,0x4d,0xee,0x9a,0x52,0x4d,0xb9,0xa6,0x29,0xa6,0x3b,0x4c,0x3b,0x4c,0xc7,0xcd,0xcc,0xcd,0xa2,0xcd,0xd6,0x99,0x35,0x9b,0x3d,0x31,0xd7,0x32,0xe7,0x9b,0xe7,0x9b,0xd7,0x9b,0xdf,0xb7,0x60,0x5a,0x78,0x5a,0x2c,0xb6,0xa8,0xb6,0xb8,0x65,0x49,0xb2,0xe4,0x5a,0xa6,0x59,0xee,0xb6,0xbc,0x6e,0x85,0x5a,0x39,0x59,0xa5,0x58,0x55,0x5a,0x5d,0xb3,0x46,0xad,0x9d,0xad,0x25,0xd6,0xbb,0xad,0xbb,0xa7,0x11,0xa7,0xb9,0x4e,0x93,0x4e,0xab,0x9e,0xd6,0x67,0xc3,0xb0,0xf1,0xb6,0xc9,0xb6,0xa9,0xb7,0x19,0xb0,0xe5,0xd8,0x6,0xdb,0xae,0xb6,0x6d,0xb6,0x7d,0x61,0x67,0x62,0x17,0x67,0xb7,0xc5,0xae,0xc3,0xee,0x93,0xbd,0x93,0x7d,0xba,0x7d,0x8d,0xfd,0x3d,0x7,0xd,0x87,0xd9,0xe,0xab,0x1d,0x5a,0x1d,0x7e,0x73,0xb4,0x72,0x14,0x3a,0x56,0x3a,0xde,0x9a,0xce,0x9c,0xee,0x3f,0x7d,0xc5,0xf4,0x96,0xe9,0x2f,0x67,0x58,0xcf,0x10,0xcf,0xd8,0x33,0xe3,0xb6,0x13,0xcb,0x29,0xc4,0x69,0x9d,0x53,0x9b,0xd3,0x47,0x67,0x17,0x67,0xb9,0x73,0x83,0xf3,0x88,0x8b,0x89,0x4b,0x82,0xcb,0x2e,0x97,0x3e,0x2e,0x9b,0x1b,0xc6,0xdd,0xc8,0xbd,0xe4,0x4a,0x74,0xf5,0x71,0x5d,0xe1,0x7a,0xd2,0xf5,0x9d,0x9b,0xb3,0x9b,0xc2,0xed,0xa8,0xdb,0xaf,0xee,0x36,0xee,0x69,0xee,0x87,0xdc,0x9f,0xcc,0x34,0x9f,0x29,0x9e,0x59,0x33,0x73,0xd0,0xc3,0xc8,0x43,0xe0,0x51,0xe5,0xd1,0x3f,0xb,0x9f,0x95,0x30,0x6b,0xdf,0xac,0x7e,0x4f,0x43,0x4f,0x81,0x67,0xb5,0xe7,0x23,0x2f,0x63,0x2f,0x91,0x57,0xad,0xd7,0xb0,0xb7,0xa5,0x77,0xaa,0xf7,0x61,0xef,0x17,0x3e,0xf6,0x3e,0x72,0x9f,0xe3,0x3e,0xe3,0x3c,0x37,0xde,0x32,0xde,0x59,0x5f,0xcc,0x37,0xc0,0xb7,0xc8,0xb7,0xcb,0x4f,0xc3,0x6f,0x9e,0x5f,0x85,0xdf,0x43,0x7f,0x23,0xff,0x64,0xff,0x7a,0xff,0xd1,0x0,0xa7,0x80,0x25,0x1,0x67,0x3,0x89,0x81,0x41,0x81,0x5b,0x2,0xfb,0xf8,0x7a,0x7c,0x21,0xbf,0x8e,0x3f,0x3a,0xdb,0x65,0xf6,0xb2,0xd9,0xed,0x41,0x8c,0xa0,0xb9,0x41,0x15,0x41,0x8f,0x82,0xad,0x82,0xe5,0xc1,0xad,0x21,0x68,0xc8,0xec,0x90,0xad,0x21,0xf7,0xe7,0x98,0xce,0x91,0xce,0x69,0xe,0x85,0x50,0x7e,0xe8,0xd6,0xd0,0x7,0x61,0xe6,0x61,0x8b,0xc3,0x7e,0xc,0x27,0x85,0x87,0x85,0x57,0x86,0x3f,0x8e,0x70,0x88,0x58,0x1a,0xd1,0x31,0x97,0x35,0x77,0xd1,0xdc,0x43,0x73,0xdf,0x44,0xfa,0x44,0x96,0x44,0xde,0x9b,0x67,0x31,0x4f,0x39,0xaf,0x2d,0x4a,0x35,0x2a,0x3e,0xaa,0x2e,0x6a,0x3c,0xda,0x37,0xba,0x34,0xba,0x3f,0xc6,0x2e,0x66,0x59,0xcc,0xd5,0x58,0x9d,0x58,0x49,0x6c,0x4b,0x1c,0x39,0x2e,0x2a,0xae,0x36,0x6e,0x6c,0xbe,0xdf,0xfc,0xed,0xf3,0x87,0xe2,0x9d,0xe2,0xb,0xe3,0x7b,0x17,0x98,0x2f,0xc8,0x5d,0x70,0x79,0xa1,0xce,0xc2,0xf4,0x85,0xa7,0x16,0xa9,0x2e,0x12,0x2c,0x3a,0x96,0x40,0x4c,0x88,0x4e,0x38,0x94,0xf0,0x41,0x10,0x2a,0xa8,0x16,0x8c,0x25,0xf2,0x13,0x77,0x25,0x8e,0xa,0x79,0xc2,0x1d,0xc2,0x67,0x22,0x2f,0xd1,0x36,0xd1,0x88,0xd8,0x43,0x5c,0x2a,0x1e,0x4e,0xf2,0x48,0x2a,0x4d,0x7a,0x92,0xec,0x91,0xbc,0x35,0x79,0x24,0xc5,0x33,0xa5,0x2c,0xe5,0xb9,0x84,0x27,0xa9,0x90,0xbc,0x4c,0xd,0x4c,0xdd,0x9b,0x3a,0x9e,0x16,0x9a,0x76,0x20,0x6d,0x32,0x3d,0x3a,0xbd,0x31,0x83,0x92,0x91,0x90,0x71,0x42,0xaa,0x21,0x4d,0x93,0xb6,0x67,0xea,0x67,0xe6,0x66,0x76,0xcb,0xac,0x65,0x85,0xb2,0xfe,0xc5,0x6e,0x8b,0xb7,0x2f,0x1e,0x95,0x7,0xc9,0x6b,0xb3,0x90,0xac,0x5,0x59,0x2d,0xa,0xb6,0x42,0xa6,0xe8,0x54,0x5a,0x28,0xd7,0x2a,0x7,0xb2,0x67,0x65,0x57,0x66,0xbf,0xcd,0x89,0xca,0x39,0x96,0xab,0x9e,0x2b,0xcd,0xed,0xcc,0xb3,0xca,0xdb,0x90,0x37,0x9c,0xef,0x9f,0xff,0xed,0x12,0xc2,0x12,0xe1,0x92,0xb6,0xa5,0x86,0x4b,0x57,0x2d,0x1d,0x58,0xe6,0xbd,0xac,0x6a,0x39,0xb2,0x3c,0x71,0x79,0xdb,0xa,0xe3,0x15,0x5,0x2b,0x86,0x56,0x6,0xac,0x3c,0xb8,0x8a,0xb6,0x2a,0x6d,0xd5,0x4f,0xab,0xed,0x57,0x97,0xae,0x7e,0xbd,0x26,0x7a,0x4d,0x6b,0x81,0x5e,0xc1,0xca,0x82,0xc1,0xb5,0x1,0x6b,0xeb,0xb,0x55,0xa,0xe5,0x85,0x7d,0xeb,0xdc,0xd7,0xed,0x5d,0x4f,0x58,0x2f,0x59,0xdf,0xb5,0x61,0xfa,0x86,0x9d,0x1b,0x3e,0x15,0x89,0x8a,0xae,0x14,0xdb,0x17,0x97,0x15,0x7f,0xd8,0x28,0xdc,0x78,0xe5,0x1b,0x87,0x6f,0xca,0xbf,0x99,0xdc,0x94,0xb4,0xa9,0xab,0xc4,0xb9,0x64,0xcf,0x66,0xd2,0x66,0xe9,0xe6,0xde,0x2d,0x9e,0x5b,0xe,0x96,0xaa,0x97,0xe6,0x97,0xe,0x6e,0xd,0xd9,0xda,0xb4,0xd,0xdf,0x56,0xb4,0xed,0xf5,0xf6,0x45,0xdb,0x2f,0x97,0xcd,0x28,0xdb,0xbb,0x83,0xb6,0x43,0xb9,0xa3,0xbf,0x3c,0xb8,0xbc,0x65,0xa7,0xc9,0xce,0xcd,0x3b,0x3f,0x54,0xa4,0x54,0xf4,0x54,0xfa,0x54,0x36,0xee,0xd2,0xdd,0xb5,0x61,0xd7,0xf8,0x6e,0xd1,0xee,0x1b,0x7b,0xbc,0xf6,0x34,0xec,0xd5,0xdb,0x5b,0xbc,0xf7,0xfd,0x3e,0xc9,0xbe,0xdb,0x55,0x1,0x55,0x4d,0xd5,0x66,0xd5,0x65,0xfb,0x49,0xfb,0xb3,0xf7,0x3f,0xae,0x89,0xaa,0xe9,0xf8,0x96,0xfb,0x6d,0x5d,0xad,0x4e,0x6d,0x71,0xed,0xc7,0x3,0xd2,0x3,0xfd,0x7,0x23,0xe,0xb6,0xd7,0xb9,0xd4,0xd5,0x1d,0xd2,0x3d,0x54,0x52,0x8f,0xd6,0x2b,0xeb,0x47,0xe,0xc7,0x1f,0xbe,0xfe,0x9d,0xef,0x77,0x2d,0xd,0x36,0xd,0x55,0x8d,0x9c,0xc6,0xe2,0x23,0x70,0x44,0x79,0xe4,0xe9,0xf7,0x9,0xdf,0xf7,0x1e,0xd,0x3a,0xda,0x76,0x8c,0x7b,0xac,0xe1,0x7,0xd3,0x1f,0x76,0x1d,0x67,0x1d,0x2f,0x6a,0x42,0x9a,0xf2,0x9a,0x46,0x9b,0x53,0x9a,0xfb,0x5b,0x62,0x5b,0xba,0x4f,0xcc,0x3e,0xd1,0xd6,0xea,0xde,0x7a,0xfc,0x47,0xdb,0x1f,0xf,0x9c,0x34,0x3c,0x59,0x79,0x4a,0xf3,0x54,0xc9,0x69,0xda,0xe9,0x82,0xd3,0x93,0x67,0xf2,0xcf,0x8c,0x9d,0x95,0x9d,0x7d,0x7e,0x2e,0xf9,0xdc,0x60,0xdb,0xa2,0xb6,0x7b,0xe7,0x63,0xce,0xdf,0x6a,0xf,0x6f,0xef,0xba,0x10,0x74,0xe1,0xd2,0x45,0xff,0x8b,0xe7,0x3b,0xbc,0x3b,0xce,0x5c,0xf2,0xb8,0x74,0xf2,0xb2,0xdb,0xe5,0x13,0x57,0xb8,0x57,0x9a,0xaf,0x3a,0x5f,0x6d,0xea,0x74,0xea,0x3c,0xfe,0x93,0xd3,0x4f,0xc7,0xbb,0x9c,0xbb,0x9a,0xae,0xb9,0x5c,0x6b,0xb9,0xee,0x7a,0xbd,0xb5,0x7b,0x66,0xf7,0xe9,0x1b,0x9e,0x37,0xce,0xdd,0xf4,0xbd,0x79,0xf1,0x16,0xff,0xd6,0xd5,0x9e,0x39,0x3d,0xdd,0xbd,0xf3,0x7a,0x6f,0xf7,0xc5,0xf7,0xf5,0xdf,0x16,0xdd,0x7e,0x72,0x27,0xfd,0xce,0xcb,0xbb,0xd9,0x77,0x27,0xee,0xad,0xbc,0x4f,0xbc,0x5f,0xf4,0x40,0xed,0x41,0xd9,0x43,0xdd,0x87,0xd5,0x3f,0x5b,0xfe,0xdc,0xd8,0xef,0xdc,0x7f,0x6a,0xc0,0x77,0xa0,0xf3,0xd1,0xdc,0x47,0xf7,0x6,0x85,0x83,0xcf,0xfe,0x91,0xf5,0x8f,0xf,0x43,0x5,0x8f,0x99,0x8f,0xcb,0x86,0xd,0x86,0xeb,0x9e,0x38,0x3e,0x39,0x39,0xe2,0x3f,0x72,0xfd,0xe9,0xfc,0xa7,0x43,0xcf,0x64,0xcf,0x26,0x9e,0x17,0xfe,0xa2,0xfe,0xcb,0xae,0x17,0x16,0x2f,0x7e,0xf8,0xd5,0xeb,0xd7,0xce,0xd1,0x98,0xd1,0xa1,0x97,0xf2,0x97,0x93,0xbf,0x6d,0x7c,0xa5,0xfd,0xea,0xc0,0xeb,0x19,0xaf,0xdb,0xc6,0xc2,0xc6,0x1e,0xbe,0xc9,0x78,0x33,0x31,0x5e,0xf4,0x56,0xfb,0xed,0xc1,0x77,0xdc,0x77,0x1d,0xef,0xa3,0xdf,0xf,0x4f,0xe4,0x7c,0x20,0x7f,0x28,0xff,0x68,0xf9,0xb1,0xf5,0x53,0xd0,0xa7,0xfb,0x93,0x19,0x93,0x93,0xff,0x4,0x3,0x98,0xf3,0xfc,0xef,0x35,0x94,0x82,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xa,0x14,0x3,0x2,0x10,0x97,0xb0,0x10,0x8c,0x0,0x0,0x1,0xd3,0x49,0x44,0x41,0x54,0x48,0xc7,0xad,0x95,0x5f,0x6e,0xd4,0x30,0x10,0xc6,0x7f,0x63,0x67,0xc9,0x6a,0xb,0x6a,0x24,0x90,0x60,0x57,0x70,0x11,0xc4,0x23,0x27,0xe0,0xa,0x48,0x9c,0x61,0x8f,0xc0,0x25,0x7a,0xe,0x8e,0xc0,0xb,0x48,0xa8,0x77,0x40,0xe5,0x81,0x42,0xf9,0xa7,0xd2,0x8d,0x67,0x86,0x87,0x38,0xd9,0x4,0xd4,0x24,0xab,0x65,0x24,0x2b,0xb6,0xec,0xc9,0x7c,0xfe,0xe6,0x9b,0xb1,0x0,0x5,0x70,0x7,0x28,0x81,0x65,0x9e,0x47,0x20,0x30,0x34,0x3,0x6a,0xe0,0x6,0xb8,0x6,0x76,0x79,0x6d,0x1c,0x61,0x6d,0xf0,0x13,0xa0,0x2,0x4e,0xf3,0xbc,0x4,0x24,0x8f,0xd6,0xea,0x1c,0xf8,0x7,0xf0,0x5,0xf8,0xe,0xe8,0xff,0x0,0x50,0x2,0xd5,0xb3,0xa7,0xcf,0x5f,0x6c,0xd6,0x4f,0xb6,0x49,0x53,0xe5,0x7e,0xbb,0xc3,0xdd,0x93,0x7b,0xbc,0xff,0xf0,0x16,0x70,0x62,0x2c,0x8,0x21,0x8c,0x6,0x70,0xf7,0x3c,0xc,0x33,0x43,0x44,0x2e,0x62,0x8c,0x2f,0xcf,0xcf,0xdf,0xbd,0x69,0x1,0x2c,0x81,0xd3,0xcd,0xa3,0xc7,0xdb,0xab,0xaf,0x97,0x55,0x4a,0x9,0x67,0x4,0x81,0x1b,0x29,0xed,0x30,0x53,0x62,0x5c,0xcc,0x6,0x60,0x66,0x98,0x29,0xc0,0xba,0x2c,0x97,0x67,0xc0,0x66,0x90,0x82,0x3a,0xd5,0x55,0x9d,0xea,0xf1,0xe0,0x90,0xf7,0x5,0x91,0x40,0x8c,0x81,0x10,0xe2,0xc,0x0,0xd6,0x79,0xab,0x26,0x54,0x75,0xdd,0x4f,0x41,0x4,0x4a,0x33,0xc3,0x7c,0x3a,0x9d,0x6e,0xd,0x40,0x11,0x1,0x2,0x22,0xe3,0xc,0x88,0x38,0x66,0x10,0x2,0x19,0x88,0xfc,0xa3,0x81,0x0,0x88,0x9b,0x77,0x3f,0x9f,0x2,0x20,0xe2,0xb8,0x83,0x48,0x33,0xc6,0x19,0x68,0xcf,0x78,0xc7,0x42,0x5f,0xb7,0x45,0xb,0x54,0x5d,0x67,0x31,0xa0,0xae,0x7,0x2b,0xfd,0x6f,0x51,0xf7,0xd7,0x45,0xff,0x66,0xee,0xf3,0x18,0x30,0xa3,0x13,0x96,0x4c,0x50,0xb0,0xaf,0x80,0x56,0x88,0xc3,0x38,0xc5,0xfe,0xdc,0x4c,0x0,0xee,0x78,0x66,0xc1,0xdd,0x70,0x9f,0x7,0xa0,0x19,0xd,0xfd,0xee,0xc3,0x14,0x58,0x73,0x31,0x1d,0x6c,0xdc,0x66,0xe6,0x8a,0x59,0xae,0x7,0x77,0x6c,0x42,0x37,0xfb,0x32,0xdc,0x7f,0xfb,0x3e,0x45,0xee,0x66,0x37,0x18,0xf3,0x44,0xa8,0x6d,0x59,0x35,0x94,0xce,0x63,0xac,0x61,0xcd,0x4c,0x33,0xb,0x43,0x0,0x3b,0xe0,0x17,0x12,0xae,0x42,0x8c,0x55,0x4a,0x69,0x82,0x81,0xc6,0xb9,0xcd,0xe9,0x3c,0x0,0x4d,0x17,0x74,0xf7,0x5c,0x11,0xf2,0xa9,0xf,0xe0,0x37,0xf0,0xed,0xf3,0xe5,0xc5,0xeb,0x7,0xf7,0x1f,0x6e,0xd5,0xb4,0x62,0x44,0xb,0xab,0xd5,0x8a,0xc5,0x62,0x1,0x40,0x8c,0xf1,0x80,0x4e,0xa8,0xa8,0x2a,0xc0,0x47,0x90,0x57,0x5d,0x9f,0x0,0x56,0x47,0x3c,0x46,0xd7,0x40,0x3a,0xf6,0x31,0xda,0xe5,0x79,0x2,0x7e,0x1e,0xf8,0x1c,0x1f,0xf5,0x12,0x2,0xfc,0x1,0x80,0x59,0x58,0xd6,0x46,0x86,0xf,0x31,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x40,0xde,0x8d,0x6b,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x1,0x44,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3c,0x3a,0x44,0x56,0x53,0x61,0x2b,0x2b,0x31,0x2e,0x2e,0x34,0x56,0x52,0x60,0x2a,0x2a,0x30,0x47,0x44,0x52,0x22,0x22,0x27,0x33,0x31,0x39,0x47,0x44,0x50,0x24,0x24,0x28,0x24,0x24,0x29,0x52,0x50,0x5d,0x51,0x4f,0x5d,0x5d,0x5a,0x6a,0x2a,0x2a,0x31,0x2a,0x2a,0x30,0x2d,0x2d,0x34,0x2f,0x2f,0x36,0x2e,0x2e,0x35,0x2c,0x2c,0x32,0x46,0x42,0x4e,0x42,0x3e,0x4a,0x41,0x3e,0x49,0x51,0x4e,0x5b,0x26,0x26,0x2b,0x24,0x24,0x28,0x27,0x27,0x2d,0x29,0x29,0x2f,0x28,0x28,0x2e,0x25,0x25,0x2b,0x23,0x23,0x28,0x40,0x3e,0x48,0x50,0x4e,0x5a,0x26,0x26,0x2c,0x25,0x25,0x2a,0x2a,0x2a,0x2f,0x2b,0x2b,0x31,0x22,0x22,0x26,0x4f,0x4c,0x59,0x3f,0x3d,0x47,0x2d,0x2d,0x33,0x22,0x22,0x27,0x4e,0x4a,0x58,0x3e,0x3b,0x46,0x27,0x27,0x2b,0x2e,0x2e,0x34,0x2c,0x2c,0x31,0x29,0x29,0x2e,0x4b,0x49,0x55,0x3c,0x3a,0x44,0x4a,0x47,0x54,0x3b,0x39,0x43,0x24,0x24,0x2a,0x24,0x24,0x29,0x20,0x20,0x25,0x49,0x46,0x53,0x3a,0x38,0x42,0x28,0x28,0x2d,0x2b,0x2b,0x30,0x29,0x29,0x2d,0x20,0x20,0x23,0x47,0x45,0x50,0x39,0x37,0x40,0x22,0x22,0x28,0x27,0x27,0x2c,0x1e,0x1e,0x22,0x47,0x43,0x50,0x38,0x35,0x3f,0x46,0x42,0x4f,0x21,0x21,0x26,0x21,0x21,0x25,0x23,0x23,0x27,0x20,0x20,0x24,0x1d,0x1d,0x21,0x36,0x34,0x3e,0x44,0x41,0x4e,0x1f,0x1f,0x24,0x1f,0x1f,0x23,0x1e,0x1e,0x21,0x44,0x42,0x4d,0x44,0x41,0x4c,0x4e,0x4b,0x58,0xff,0xff,0xff,0xd7,0xc8,0xfe,0x88,0x0,0x0,0x0,0x24,0x74,0x52,0x4e,0x53,0x0,0x4,0xa,0x11,0x19,0x1f,0x22,0x24,0x1d,0x16,0xd,0x7,0x2,0x15,0x25,0x34,0x3f,0x46,0x47,0x48,0x43,0x3a,0x2d,0x1b,0x77,0xef,0xe6,0x49,0xef,0xe6,0xef,0xe7,0x77,0xef,0xe4,0x4a,0xba,0xea,0xc1,0xeb,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x6b,0x52,0x65,0xa5,0x98,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x1,0xe,0x49,0x44,0x41,0x54,0x28,0xcf,0x8d,0xd1,0xd7,0x56,0xc2,0x40,0x10,0x80,0x61,0x6a,0x50,0x54,0x5a,0xec,0xbd,0x43,0x14,0x85,0xdd,0x44,0xa2,0x6c,0x12,0x20,0x18,0xd,0x22,0x8,0x16,0x34,0x16,0xc0,0x5e,0xde,0xff,0x1,0x5c,0x36,0xb3,0x1c,0x8e,0x5e,0xe8,0x77,0xfd,0x9f,0xb3,0x33,0xb3,0x1e,0xaf,0xcf,0x1f,0x8,0xa,0x21,0x4a,0x18,0x1a,0xe,0x8f,0x8c,0x7a,0x7e,0xf2,0x8d,0x45,0xa2,0xb1,0x78,0x42,0x14,0xc5,0xf1,0x89,0xc9,0xa9,0xb0,0xf7,0x57,0xe0,0x8f,0x4c,0xcf,0xac,0x6f,0xb8,0x36,0x93,0x29,0x69,0xb,0x6c,0x4b,0xe9,0xd4,0xec,0x1c,0xd,0x2,0xd1,0xf9,0x9d,0xdd,0x8c,0x2b,0x8b,0xb0,0xac,0x80,0x3d,0x39,0xa7,0xaa,0xb,0x34,0x8,0xc6,0xb2,0x99,0x7d,0x70,0x90,0x27,0x5a,0x1a,0xe8,0x9a,0x4c,0xc,0x99,0x6,0x42,0xbc,0x50,0xe4,0xa,0x79,0x94,0x94,0x40,0x49,0x57,0x90,0xd9,0xb,0x42,0x89,0xf2,0x21,0x57,0xb6,0x90,0x7e,0x4,0x4a,0xc7,0x36,0x32,0xac,0x5e,0x20,0x56,0x4e,0xb8,0xca,0x60,0xa0,0xd3,0x0,0xb1,0xa0,0x7a,0xca,0x55,0x73,0x35,0x65,0x60,0x86,0xfa,0x19,0x61,0x4f,0x34,0x9a,0x5c,0x3,0xe3,0xf3,0xb,0xa0,0x5d,0x22,0xf5,0xa,0xb3,0x21,0x5b,0xd7,0x5c,0xeb,0xc6,0x74,0xfa,0x6b,0x3a,0x35,0xf3,0xd6,0x64,0x6b,0xde,0xdd,0x73,0xf,0xed,0xe,0x71,0x0,0x22,0xdd,0xc7,0x27,0x83,0x1d,0x6a,0xb1,0xf9,0xc,0x5e,0xda,0xaf,0x2a,0x1,0xf5,0x6e,0xe7,0xed,0x7d,0x89,0x9d,0x7a,0x79,0xe5,0xe3,0xd3,0xf5,0x85,0x90,0xdd,0x9f,0xc1,0xb6,0xf0,0xea,0xda,0x7f,0x3e,0xeb,0xaf,0xef,0xfe,0x6,0x1a,0x96,0x59,0x89,0x91,0xf7,0xf1,0x7b,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char option_button_pressed_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x77,0x0,0x7d,0x59,0x0,0x0,0xa,0x45,0x69,0x43,0x43,0x50,0x49,0x43,0x43,0x20,0x70,0x72,0x6f,0x66,0x69,0x6c,0x65,0x0,0x0,0x78,0xda,0x9d,0x53,0x67,0x54,0x53,0xe9,0x16,0x3d,0xf7,0xde,0xf4,0x42,0x4b,0x88,0x80,0x94,0x4b,0x6f,0x52,0x15,0x8,0x20,0x52,0x42,0x8b,0x80,0x14,0x91,0x26,0x2a,0x21,0x9,0x10,0x4a,0x88,0x21,0xa1,0xd9,0x15,0x51,0xc1,0x11,0x45,0x45,0x4,0x1b,0xc8,0xa0,0x88,0x3,0x8e,0x8e,0x80,0x8c,0x15,0x51,0x2c,0xc,0x8a,0xa,0xd8,0x7,0xe4,0x21,0xa2,0x8e,0x83,0xa3,0x88,0x8a,0xca,0xfb,0xe1,0x7b,0xa3,0x6b,0xd6,0xbc,0xf7,0xe6,0xcd,0xfe,0xb5,0xd7,0x3e,0xe7,0xac,0xf3,0x9d,0xb3,0xcf,0x7,0xc0,0x8,0xc,0x96,0x48,0x33,0x51,0x35,0x80,0xc,0xa9,0x42,0x1e,0x11,0xe0,0x83,0xc7,0xc4,0xc6,0xe1,0xe4,0x2e,0x40,0x81,0xa,0x24,0x70,0x0,0x10,0x8,0xb3,0x64,0x21,0x73,0xfd,0x23,0x1,0x0,0xf8,0x7e,0x3c,0x3c,0x2b,0x22,0xc0,0x7,0xbe,0x0,0x1,0x78,0xd3,0xb,0x8,0x0,0xc0,0x4d,0x9b,0xc0,0x30,0x1c,0x87,0xff,0xf,0xea,0x42,0x99,0x5c,0x1,0x80,0x84,0x1,0xc0,0x74,0x91,0x38,0x4b,0x8,0x80,0x14,0x0,0x40,0x7a,0x8e,0x42,0xa6,0x0,0x40,0x46,0x1,0x80,0x9d,0x98,0x26,0x53,0x0,0xa0,0x4,0x0,0x60,0xcb,0x63,0x62,0xe3,0x0,0x50,0x2d,0x0,0x60,0x27,0x7f,0xe6,0xd3,0x0,0x80,0x9d,0xf8,0x99,0x7b,0x1,0x0,0x5b,0x94,0x21,0x15,0x1,0xa0,0x91,0x0,0x20,0x13,0x65,0x88,0x44,0x0,0x68,0x3b,0x0,0xac,0xcf,0x56,0x8a,0x45,0x0,0x58,0x30,0x0,0x14,0x66,0x4b,0xc4,0x39,0x0,0xd8,0x2d,0x0,0x30,0x49,0x57,0x66,0x48,0x0,0xb0,0xb7,0x0,0xc0,0xce,0x10,0xb,0xb2,0x0,0x8,0xc,0x0,0x30,0x51,0x88,0x85,0x29,0x0,0x4,0x7b,0x0,0x60,0xc8,0x23,0x23,0x78,0x0,0x84,0x99,0x0,0x14,0x46,0xf2,0x57,0x3c,0xf1,0x2b,0xae,0x10,0xe7,0x2a,0x0,0x0,0x78,0x99,0xb2,0x3c,0xb9,0x24,0x39,0x45,0x81,0x5b,0x8,0x2d,0x71,0x7,0x57,0x57,0x2e,0x1e,0x28,0xce,0x49,0x17,0x2b,0x14,0x36,0x61,0x2,0x61,0x9a,0x40,0x2e,0xc2,0x79,0x99,0x19,0x32,0x81,0x34,0xf,0xe0,0xf3,0xcc,0x0,0x0,0xa0,0x91,0x15,0x11,0xe0,0x83,0xf3,0xfd,0x78,0xce,0xe,0xae,0xce,0xce,0x36,0x8e,0xb6,0xe,0x5f,0x2d,0xea,0xbf,0x6,0xff,0x22,0x62,0x62,0xe3,0xfe,0xe5,0xcf,0xab,0x70,0x40,0x0,0x0,0xe1,0x74,0x7e,0xd1,0xfe,0x2c,0x2f,0xb3,0x1a,0x80,0x3b,0x6,0x80,0x6d,0xfe,0xa2,0x25,0xee,0x4,0x68,0x5e,0xb,0xa0,0x75,0xf7,0x8b,0x66,0xb2,0xf,0x40,0xb5,0x0,0xa0,0xe9,0xda,0x57,0xf3,0x70,0xf8,0x7e,0x3c,0x3c,0x45,0xa1,0x90,0xb9,0xd9,0xd9,0xe5,0xe4,0xe4,0xd8,0x4a,0xc4,0x42,0x5b,0x61,0xca,0x57,0x7d,0xfe,0x67,0xc2,0x5f,0xc0,0x57,0xfd,0x6c,0xf9,0x7e,0x3c,0xfc,0xf7,0xf5,0xe0,0xbe,0xe2,0x24,0x81,0x32,0x5d,0x81,0x47,0x4,0xf8,0xe0,0xc2,0xcc,0xf4,0x4c,0xa5,0x1c,0xcf,0x92,0x9,0x84,0x62,0xdc,0xe6,0x8f,0x47,0xfc,0xb7,0xb,0xff,0xfc,0x1d,0xd3,0x22,0xc4,0x49,0x62,0xb9,0x58,0x2a,0x14,0xe3,0x51,0x12,0x71,0x8e,0x44,0x9a,0x8c,0xf3,0x32,0xa5,0x22,0x89,0x42,0x92,0x29,0xc5,0x25,0xd2,0xff,0x64,0xe2,0xdf,0x2c,0xfb,0x3,0x3e,0xdf,0x35,0x0,0xb0,0x6a,0x3e,0x1,0x7b,0x91,0x2d,0xa8,0x5d,0x63,0x3,0xf6,0x4b,0x27,0x10,0x58,0x74,0xc0,0xe2,0xf7,0x0,0x0,0xf2,0xbb,0x6f,0xc1,0xd4,0x28,0x8,0x3,0x80,0x68,0x83,0xe1,0xcf,0x77,0xff,0xef,0x3f,0xfd,0x47,0xa0,0x25,0x0,0x80,0x66,0x49,0x92,0x71,0x0,0x0,0x5e,0x44,0x24,0x2e,0x54,0xca,0xb3,0x3f,0xc7,0x8,0x0,0x0,0x44,0xa0,0x81,0x2a,0xb0,0x41,0x1b,0xf4,0xc1,0x18,0x2c,0xc0,0x6,0x1c,0xc1,0x5,0xdc,0xc1,0xb,0xfc,0x60,0x36,0x84,0x42,0x24,0xc4,0xc2,0x42,0x10,0x42,0xa,0x64,0x80,0x1c,0x72,0x60,0x29,0xac,0x82,0x42,0x28,0x86,0xcd,0xb0,0x1d,0x2a,0x60,0x2f,0xd4,0x40,0x1d,0x34,0xc0,0x51,0x68,0x86,0x93,0x70,0xe,0x2e,0xc2,0x55,0xb8,0xe,0x3d,0x70,0xf,0xfa,0x61,0x8,0x9e,0xc1,0x28,0xbc,0x81,0x9,0x4,0x41,0xc8,0x8,0x13,0x61,0x21,0xda,0x88,0x1,0x62,0x8a,0x58,0x23,0x8e,0x8,0x17,0x99,0x85,0xf8,0x21,0xc1,0x48,0x4,0x12,0x8b,0x24,0x20,0xc9,0x88,0x14,0x51,0x22,0x4b,0x91,0x35,0x48,0x31,0x52,0x8a,0x54,0x20,0x55,0x48,0x1d,0xf2,0x3d,0x72,0x2,0x39,0x87,0x5c,0x46,0xba,0x91,0x3b,0xc8,0x0,0x32,0x82,0xfc,0x86,0xbc,0x47,0x31,0x94,0x81,0xb2,0x51,0x3d,0xd4,0xc,0xb5,0x43,0xb9,0xa8,0x37,0x1a,0x84,0x46,0xa2,0xb,0xd0,0x64,0x74,0x31,0x9a,0x8f,0x16,0xa0,0x9b,0xd0,0x72,0xb4,0x1a,0x3d,0x8c,0x36,0xa1,0xe7,0xd0,0xab,0x68,0xf,0xda,0x8f,0x3e,0x43,0xc7,0x30,0xc0,0xe8,0x18,0x7,0x33,0xc4,0x6c,0x30,0x2e,0xc6,0xc3,0x42,0xb1,0x38,0x2c,0x9,0x93,0x63,0xcb,0xb1,0x22,0xac,0xc,0xab,0xc6,0x1a,0xb0,0x56,0xac,0x3,0xbb,0x89,0xf5,0x63,0xcf,0xb1,0x77,0x4,0x12,0x81,0x45,0xc0,0x9,0x36,0x4,0x77,0x42,0x20,0x61,0x1e,0x41,0x48,0x58,0x4c,0x58,0x4e,0xd8,0x48,0xa8,0x20,0x1c,0x24,0x34,0x11,0xda,0x9,0x37,0x9,0x3,0x84,0x51,0xc2,0x27,0x22,0x93,0xa8,0x4b,0xb4,0x26,0xba,0x11,0xf9,0xc4,0x18,0x62,0x32,0x31,0x87,0x58,0x48,0x2c,0x23,0xd6,0x12,0x8f,0x13,0x2f,0x10,0x7b,0x88,0x43,0xc4,0x37,0x24,0x12,0x89,0x43,0x32,0x27,0xb9,0x90,0x2,0x49,0xb1,0xa4,0x54,0xd2,0x12,0xd2,0x46,0xd2,0x6e,0x52,0x23,0xe9,0x2c,0xa9,0x9b,0x34,0x48,0x1a,0x23,0x93,0xc9,0xda,0x64,0x6b,0xb2,0x7,0x39,0x94,0x2c,0x20,0x2b,0xc8,0x85,0xe4,0x9d,0xe4,0xc3,0xe4,0x33,0xe4,0x1b,0xe4,0x21,0xf2,0x5b,0xa,0x9d,0x62,0x40,0x71,0xa4,0xf8,0x53,0xe2,0x28,0x52,0xca,0x6a,0x4a,0x19,0xe5,0x10,0xe5,0x34,0xe5,0x6,0x65,0x98,0x32,0x41,0x55,0xa3,0x9a,0x52,0xdd,0xa8,0xa1,0x54,0x11,0x35,0x8f,0x5a,0x42,0xad,0xa1,0xb6,0x52,0xaf,0x51,0x87,0xa8,0x13,0x34,0x75,0x9a,0x39,0xcd,0x83,0x16,0x49,0x4b,0xa5,0xad,0xa2,0x95,0xd3,0x1a,0x68,0x17,0x68,0xf7,0x69,0xaf,0xe8,0x74,0xba,0x11,0xdd,0x95,0x1e,0x4e,0x97,0xd0,0x57,0xd2,0xcb,0xe9,0x47,0xe8,0x97,0xe8,0x3,0xf4,0x77,0xc,0xd,0x86,0x15,0x83,0xc7,0x88,0x67,0x28,0x19,0x9b,0x18,0x7,0x18,0x67,0x19,0x77,0x18,0xaf,0x98,0x4c,0xa6,0x19,0xd3,0x8b,0x19,0xc7,0x54,0x30,0x37,0x31,0xeb,0x98,0xe7,0x99,0xf,0x99,0x6f,0x55,0x58,0x2a,0xb6,0x2a,0x7c,0x15,0x91,0xca,0xa,0x95,0x4a,0x95,0x26,0x95,0x1b,0x2a,0x2f,0x54,0xa9,0xaa,0xa6,0xaa,0xde,0xaa,0xb,0x55,0xf3,0x55,0xcb,0x54,0x8f,0xa9,0x5e,0x53,0x7d,0xae,0x46,0x55,0x33,0x53,0xe3,0xa9,0x9,0xd4,0x96,0xab,0x55,0xaa,0x9d,0x50,0xeb,0x53,0x1b,0x53,0x67,0xa9,0x3b,0xa8,0x87,0xaa,0x67,0xa8,0x6f,0x54,0x3f,0xa4,0x7e,0x59,0xfd,0x89,0x6,0x59,0xc3,0x4c,0xc3,0x4f,0x43,0xa4,0x51,0xa0,0xb1,0x5f,0xe3,0xbc,0xc6,0x20,0xb,0x63,0x19,0xb3,0x78,0x2c,0x21,0x6b,0xd,0xab,0x86,0x75,0x81,0x35,0xc4,0x26,0xb1,0xcd,0xd9,0x7c,0x76,0x2a,0xbb,0x98,0xfd,0x1d,0xbb,0x8b,0x3d,0xaa,0xa9,0xa1,0x39,0x43,0x33,0x4a,0x33,0x57,0xb3,0x52,0xf3,0x94,0x66,0x3f,0x7,0xe3,0x98,0x71,0xf8,0x9c,0x74,0x4e,0x9,0xe7,0x28,0xa7,0x97,0xf3,0x7e,0x8a,0xde,0x14,0xef,0x29,0xe2,0x29,0x1b,0xa6,0x34,0x4c,0xb9,0x31,0x65,0x5c,0x6b,0xaa,0x96,0x97,0x96,0x58,0xab,0x48,0xab,0x51,0xab,0x47,0xeb,0xbd,0x36,0xae,0xed,0xa7,0x9d,0xa6,0xbd,0x45,0xbb,0x59,0xfb,0x81,0xe,0x41,0xc7,0x4a,0x27,0x5c,0x27,0x47,0x67,0x8f,0xce,0x5,0x9d,0xe7,0x53,0xd9,0x53,0xdd,0xa7,0xa,0xa7,0x16,0x4d,0x3d,0x3a,0xf5,0xae,0x2e,0xaa,0x6b,0xa5,0x1b,0xa1,0xbb,0x44,0x77,0xbf,0x6e,0xa7,0xee,0x98,0x9e,0xbe,0x5e,0x80,0x9e,0x4c,0x6f,0xa7,0xde,0x79,0xbd,0xe7,0xfa,0x1c,0x7d,0x2f,0xfd,0x54,0xfd,0x6d,0xfa,0xa7,0xf5,0x47,0xc,0x58,0x6,0xb3,0xc,0x24,0x6,0xdb,0xc,0xce,0x18,0x3c,0xc5,0x35,0x71,0x6f,0x3c,0x1d,0x2f,0xc7,0xdb,0xf1,0x51,0x43,0x5d,0xc3,0x40,0x43,0xa5,0x61,0x95,0x61,0x97,0xe1,0x84,0x91,0xb9,0xd1,0x3c,0xa3,0xd5,0x46,0x8d,0x46,0xf,0x8c,0x69,0xc6,0x5c,0xe3,0x24,0xe3,0x6d,0xc6,0x6d,0xc6,0xa3,0x26,0x6,0x26,0x21,0x26,0x4b,0x4d,0xea,0x4d,0xee,0x9a,0x52,0x4d,0xb9,0xa6,0x29,0xa6,0x3b,0x4c,0x3b,0x4c,0xc7,0xcd,0xcc,0xcd,0xa2,0xcd,0xd6,0x99,0x35,0x9b,0x3d,0x31,0xd7,0x32,0xe7,0x9b,0xe7,0x9b,0xd7,0x9b,0xdf,0xb7,0x60,0x5a,0x78,0x5a,0x2c,0xb6,0xa8,0xb6,0xb8,0x65,0x49,0xb2,0xe4,0x5a,0xa6,0x59,0xee,0xb6,0xbc,0x6e,0x85,0x5a,0x39,0x59,0xa5,0x58,0x55,0x5a,0x5d,0xb3,0x46,0xad,0x9d,0xad,0x25,0xd6,0xbb,0xad,0xbb,0xa7,0x11,0xa7,0xb9,0x4e,0x93,0x4e,0xab,0x9e,0xd6,0x67,0xc3,0xb0,0xf1,0xb6,0xc9,0xb6,0xa9,0xb7,0x19,0xb0,0xe5,0xd8,0x6,0xdb,0xae,0xb6,0x6d,0xb6,0x7d,0x61,0x67,0x62,0x17,0x67,0xb7,0xc5,0xae,0xc3,0xee,0x93,0xbd,0x93,0x7d,0xba,0x7d,0x8d,0xfd,0x3d,0x7,0xd,0x87,0xd9,0xe,0xab,0x1d,0x5a,0x1d,0x7e,0x73,0xb4,0x72,0x14,0x3a,0x56,0x3a,0xde,0x9a,0xce,0x9c,0xee,0x3f,0x7d,0xc5,0xf4,0x96,0xe9,0x2f,0x67,0x58,0xcf,0x10,0xcf,0xd8,0x33,0xe3,0xb6,0x13,0xcb,0x29,0xc4,0x69,0x9d,0x53,0x9b,0xd3,0x47,0x67,0x17,0x67,0xb9,0x73,0x83,0xf3,0x88,0x8b,0x89,0x4b,0x82,0xcb,0x2e,0x97,0x3e,0x2e,0x9b,0x1b,0xc6,0xdd,0xc8,0xbd,0xe4,0x4a,0x74,0xf5,0x71,0x5d,0xe1,0x7a,0xd2,0xf5,0x9d,0x9b,0xb3,0x9b,0xc2,0xed,0xa8,0xdb,0xaf,0xee,0x36,0xee,0x69,0xee,0x87,0xdc,0x9f,0xcc,0x34,0x9f,0x29,0x9e,0x59,0x33,0x73,0xd0,0xc3,0xc8,0x43,0xe0,0x51,0xe5,0xd1,0x3f,0xb,0x9f,0x95,0x30,0x6b,0xdf,0xac,0x7e,0x4f,0x43,0x4f,0x81,0x67,0xb5,0xe7,0x23,0x2f,0x63,0x2f,0x91,0x57,0xad,0xd7,0xb0,0xb7,0xa5,0x77,0xaa,0xf7,0x61,0xef,0x17,0x3e,0xf6,0x3e,0x72,0x9f,0xe3,0x3e,0xe3,0x3c,0x37,0xde,0x32,0xde,0x59,0x5f,0xcc,0x37,0xc0,0xb7,0xc8,0xb7,0xcb,0x4f,0xc3,0x6f,0x9e,0x5f,0x85,0xdf,0x43,0x7f,0x23,0xff,0x64,0xff,0x7a,0xff,0xd1,0x0,0xa7,0x80,0x25,0x1,0x67,0x3,0x89,0x81,0x41,0x81,0x5b,0x2,0xfb,0xf8,0x7a,0x7c,0x21,0xbf,0x8e,0x3f,0x3a,0xdb,0x65,0xf6,0xb2,0xd9,0xed,0x41,0x8c,0xa0,0xb9,0x41,0x15,0x41,0x8f,0x82,0xad,0x82,0xe5,0xc1,0xad,0x21,0x68,0xc8,0xec,0x90,0xad,0x21,0xf7,0xe7,0x98,0xce,0x91,0xce,0x69,0xe,0x85,0x50,0x7e,0xe8,0xd6,0xd0,0x7,0x61,0xe6,0x61,0x8b,0xc3,0x7e,0xc,0x27,0x85,0x87,0x85,0x57,0x86,0x3f,0x8e,0x70,0x88,0x58,0x1a,0xd1,0x31,0x97,0x35,0x77,0xd1,0xdc,0x43,0x73,0xdf,0x44,0xfa,0x44,0x96,0x44,0xde,0x9b,0x67,0x31,0x4f,0x39,0xaf,0x2d,0x4a,0x35,0x2a,0x3e,0xaa,0x2e,0x6a,0x3c,0xda,0x37,0xba,0x34,0xba,0x3f,0xc6,0x2e,0x66,0x59,0xcc,0xd5,0x58,0x9d,0x58,0x49,0x6c,0x4b,0x1c,0x39,0x2e,0x2a,0xae,0x36,0x6e,0x6c,0xbe,0xdf,0xfc,0xed,0xf3,0x87,0xe2,0x9d,0xe2,0xb,0xe3,0x7b,0x17,0x98,0x2f,0xc8,0x5d,0x70,0x79,0xa1,0xce,0xc2,0xf4,0x85,0xa7,0x16,0xa9,0x2e,0x12,0x2c,0x3a,0x96,0x40,0x4c,0x88,0x4e,0x38,0x94,0xf0,0x41,0x10,0x2a,0xa8,0x16,0x8c,0x25,0xf2,0x13,0x77,0x25,0x8e,0xa,0x79,0xc2,0x1d,0xc2,0x67,0x22,0x2f,0xd1,0x36,0xd1,0x88,0xd8,0x43,0x5c,0x2a,0x1e,0x4e,0xf2,0x48,0x2a,0x4d,0x7a,0x92,0xec,0x91,0xbc,0x35,0x79,0x24,0xc5,0x33,0xa5,0x2c,0xe5,0xb9,0x84,0x27,0xa9,0x90,0xbc,0x4c,0xd,0x4c,0xdd,0x9b,0x3a,0x9e,0x16,0x9a,0x76,0x20,0x6d,0x32,0x3d,0x3a,0xbd,0x31,0x83,0x92,0x91,0x90,0x71,0x42,0xaa,0x21,0x4d,0x93,0xb6,0x67,0xea,0x67,0xe6,0x66,0x76,0xcb,0xac,0x65,0x85,0xb2,0xfe,0xc5,0x6e,0x8b,0xb7,0x2f,0x1e,0x95,0x7,0xc9,0x6b,0xb3,0x90,0xac,0x5,0x59,0x2d,0xa,0xb6,0x42,0xa6,0xe8,0x54,0x5a,0x28,0xd7,0x2a,0x7,0xb2,0x67,0x65,0x57,0x66,0xbf,0xcd,0x89,0xca,0x39,0x96,0xab,0x9e,0x2b,0xcd,0xed,0xcc,0xb3,0xca,0xdb,0x90,0x37,0x9c,0xef,0x9f,0xff,0xed,0x12,0xc2,0x12,0xe1,0x92,0xb6,0xa5,0x86,0x4b,0x57,0x2d,0x1d,0x58,0xe6,0xbd,0xac,0x6a,0x39,0xb2,0x3c,0x71,0x79,0xdb,0xa,0xe3,0x15,0x5,0x2b,0x86,0x56,0x6,0xac,0x3c,0xb8,0x8a,0xb6,0x2a,0x6d,0xd5,0x4f,0xab,0xed,0x57,0x97,0xae,0x7e,0xbd,0x26,0x7a,0x4d,0x6b,0x81,0x5e,0xc1,0xca,0x82,0xc1,0xb5,0x1,0x6b,0xeb,0xb,0x55,0xa,0xe5,0x85,0x7d,0xeb,0xdc,0xd7,0xed,0x5d,0x4f,0x58,0x2f,0x59,0xdf,0xb5,0x61,0xfa,0x86,0x9d,0x1b,0x3e,0x15,0x89,0x8a,0xae,0x14,0xdb,0x17,0x97,0x15,0x7f,0xd8,0x28,0xdc,0x78,0xe5,0x1b,0x87,0x6f,0xca,0xbf,0x99,0xdc,0x94,0xb4,0xa9,0xab,0xc4,0xb9,0x64,0xcf,0x66,0xd2,0x66,0xe9,0xe6,0xde,0x2d,0x9e,0x5b,0xe,0x96,0xaa,0x97,0xe6,0x97,0xe,0x6e,0xd,0xd9,0xda,0xb4,0xd,0xdf,0x56,0xb4,0xed,0xf5,0xf6,0x45,0xdb,0x2f,0x97,0xcd,0x28,0xdb,0xbb,0x83,0xb6,0x43,0xb9,0xa3,0xbf,0x3c,0xb8,0xbc,0x65,0xa7,0xc9,0xce,0xcd,0x3b,0x3f,0x54,0xa4,0x54,0xf4,0x54,0xfa,0x54,0x36,0xee,0xd2,0xdd,0xb5,0x61,0xd7,0xf8,0x6e,0xd1,0xee,0x1b,0x7b,0xbc,0xf6,0x34,0xec,0xd5,0xdb,0x5b,0xbc,0xf7,0xfd,0x3e,0xc9,0xbe,0xdb,0x55,0x1,0x55,0x4d,0xd5,0x66,0xd5,0x65,0xfb,0x49,0xfb,0xb3,0xf7,0x3f,0xae,0x89,0xaa,0xe9,0xf8,0x96,0xfb,0x6d,0x5d,0xad,0x4e,0x6d,0x71,0xed,0xc7,0x3,0xd2,0x3,0xfd,0x7,0x23,0xe,0xb6,0xd7,0xb9,0xd4,0xd5,0x1d,0xd2,0x3d,0x54,0x52,0x8f,0xd6,0x2b,0xeb,0x47,0xe,0xc7,0x1f,0xbe,0xfe,0x9d,0xef,0x77,0x2d,0xd,0x36,0xd,0x55,0x8d,0x9c,0xc6,0xe2,0x23,0x70,0x44,0x79,0xe4,0xe9,0xf7,0x9,0xdf,0xf7,0x1e,0xd,0x3a,0xda,0x76,0x8c,0x7b,0xac,0xe1,0x7,0xd3,0x1f,0x76,0x1d,0x67,0x1d,0x2f,0x6a,0x42,0x9a,0xf2,0x9a,0x46,0x9b,0x53,0x9a,0xfb,0x5b,0x62,0x5b,0xba,0x4f,0xcc,0x3e,0xd1,0xd6,0xea,0xde,0x7a,0xfc,0x47,0xdb,0x1f,0xf,0x9c,0x34,0x3c,0x59,0x79,0x4a,0xf3,0x54,0xc9,0x69,0xda,0xe9,0x82,0xd3,0x93,0x67,0xf2,0xcf,0x8c,0x9d,0x95,0x9d,0x7d,0x7e,0x2e,0xf9,0xdc,0x60,0xdb,0xa2,0xb6,0x7b,0xe7,0x63,0xce,0xdf,0x6a,0xf,0x6f,0xef,0xba,0x10,0x74,0xe1,0xd2,0x45,0xff,0x8b,0xe7,0x3b,0xbc,0x3b,0xce,0x5c,0xf2,0xb8,0x74,0xf2,0xb2,0xdb,0xe5,0x13,0x57,0xb8,0x57,0x9a,0xaf,0x3a,0x5f,0x6d,0xea,0x74,0xea,0x3c,0xfe,0x93,0xd3,0x4f,0xc7,0xbb,0x9c,0xbb,0x9a,0xae,0xb9,0x5c,0x6b,0xb9,0xee,0x7a,0xbd,0xb5,0x7b,0x66,0xf7,0xe9,0x1b,0x9e,0x37,0xce,0xdd,0xf4,0xbd,0x79,0xf1,0x16,0xff,0xd6,0xd5,0x9e,0x39,0x3d,0xdd,0xbd,0xf3,0x7a,0x6f,0xf7,0xc5,0xf7,0xf5,0xdf,0x16,0xdd,0x7e,0x72,0x27,0xfd,0xce,0xcb,0xbb,0xd9,0x77,0x27,0xee,0xad,0xbc,0x4f,0xbc,0x5f,0xf4,0x40,0xed,0x41,0xd9,0x43,0xdd,0x87,0xd5,0x3f,0x5b,0xfe,0xdc,0xd8,0xef,0xdc,0x7f,0x6a,0xc0,0x77,0xa0,0xf3,0xd1,0xdc,0x47,0xf7,0x6,0x85,0x83,0xcf,0xfe,0x91,0xf5,0x8f,0xf,0x43,0x5,0x8f,0x99,0x8f,0xcb,0x86,0xd,0x86,0xeb,0x9e,0x38,0x3e,0x39,0x39,0xe2,0x3f,0x72,0xfd,0xe9,0xfc,0xa7,0x43,0xcf,0x64,0xcf,0x26,0x9e,0x17,0xfe,0xa2,0xfe,0xcb,0xae,0x17,0x16,0x2f,0x7e,0xf8,0xd5,0xeb,0xd7,0xce,0xd1,0x98,0xd1,0xa1,0x97,0xf2,0x97,0x93,0xbf,0x6d,0x7c,0xa5,0xfd,0xea,0xc0,0xeb,0x19,0xaf,0xdb,0xc6,0xc2,0xc6,0x1e,0xbe,0xc9,0x78,0x33,0x31,0x5e,0xf4,0x56,0xfb,0xed,0xc1,0x77,0xdc,0x77,0x1d,0xef,0xa3,0xdf,0xf,0x4f,0xe4,0x7c,0x20,0x7f,0x28,0xff,0x68,0xf9,0xb1,0xf5,0x53,0xd0,0xa7,0xfb,0x93,0x19,0x93,0x93,0xff,0x4,0x3,0x98,0xf3,0xfc,0xef,0x35,0x94,0x82,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xa,0x14,0x3,0x2,0x33,0x35,0xd7,0x61,0xfe,0x0,0x0,0x1,0xdb,0x49,0x44,0x41,0x54,0x48,0xc7,0xad,0x95,0x4d,0x6e,0x14,0x31,0x10,0x85,0xbf,0xaa,0x9a,0x4e,0xf,0x19,0x44,0x7a,0x41,0x50,0x6,0xe,0x81,0x58,0x71,0xf,0xae,0x80,0xc4,0x19,0xe6,0x8,0x5c,0x82,0x73,0x70,0x9,0x56,0xd9,0x22,0x21,0xb1,0x0,0x66,0x85,0x8,0x9,0xa,0x99,0xd8,0x55,0x2c,0xda,0x3d,0x3f,0x81,0x74,0xf7,0x68,0xb0,0x54,0x6a,0x5b,0x6a,0xdb,0xcf,0xef,0xbd,0xaa,0x12,0x60,0x2,0x1c,0x1,0x35,0x30,0x2d,0x73,0x3,0x94,0xdd,0xe1,0xc0,0x2d,0x70,0x3,0x5c,0x3,0xab,0xb2,0x76,0xe,0x18,0xdd,0xe5,0x33,0xa0,0x1,0x4e,0xca,0xbc,0x6,0xa4,0x44,0x37,0x6e,0xcb,0xc5,0x97,0xc0,0x77,0xe0,0x27,0x90,0xff,0x7,0x80,0x1a,0x68,0x5e,0x3c,0x7f,0xf9,0xea,0xf4,0xf1,0xd9,0x22,0xe7,0xdc,0x4,0x71,0xef,0x86,0xe3,0x7,0x33,0x3e,0x7d,0xfe,0x8,0x4,0x66,0x13,0x54,0xb5,0xf7,0x82,0x88,0x28,0xe1,0xb8,0x3b,0x22,0xf2,0xcd,0xcc,0x5e,0x9f,0x9f,0x7f,0x78,0xdf,0x1,0x98,0x2,0x27,0x4f,0x4e,0xe7,0x8b,0xcb,0xab,0x8b,0x26,0xa5,0xd4,0x7b,0xa0,0x8a,0x90,0xd2,0xa,0xf7,0x8c,0x59,0x35,0x1a,0x80,0xbb,0xe3,0x9e,0x1,0xe6,0x75,0x3d,0x7d,0x7,0x3c,0xdd,0x91,0x20,0xbb,0x37,0x29,0xe5,0x3b,0xac,0xff,0x13,0x2,0x20,0x88,0x28,0x66,0x8a,0xaa,0x8d,0x0,0xd0,0xa9,0x14,0xe4,0x9c,0xc8,0x39,0xcf,0xb7,0x25,0x30,0xa0,0x56,0x4,0x15,0x19,0xd4,0xac,0xfb,0x47,0x44,0x0,0x45,0xa4,0x9f,0x1,0x91,0xc0,0x1d,0x54,0x29,0x40,0xe4,0x2f,0xf,0x28,0x20,0x62,0x82,0xe8,0x30,0x0,0x31,0x41,0x24,0x88,0x0,0x91,0x36,0xfa,0x19,0xe8,0xfe,0x89,0x35,0xb,0xdb,0xbe,0x9d,0x74,0xe7,0xaa,0xd8,0xe0,0x6b,0x5a,0x6,0x6c,0x6f,0xa7,0x47,0xdc,0xbf,0x9e,0x6c,0xa8,0x92,0x42,0xeb,0x0,0x3,0x22,0xb8,0xb3,0x36,0xd6,0xd0,0x9e,0x4d,0x6,0x74,0x46,0x6c,0x4d,0x79,0x17,0x40,0x88,0x8e,0x4,0xa0,0x42,0x44,0x2e,0x87,0x3b,0x11,0xe3,0x0,0xb4,0xd1,0xd2,0xbf,0x31,0x65,0xb,0xc0,0x81,0x30,0x31,0x74,0x84,0x4,0x26,0x86,0x7b,0xab,0x65,0xcb,0x42,0x8c,0x4c,0xc3,0xcd,0x77,0x7b,0xcf,0xa4,0x54,0xb3,0x1b,0x35,0x45,0x54,0xb7,0xcc,0xd2,0xc7,0x80,0x3,0x2d,0xa5,0xc3,0xfa,0x77,0x85,0x28,0xe3,0x9e,0xb,0xb,0xbb,0x0,0x56,0xc0,0xaf,0xaa,0xaa,0x7e,0x1c,0x55,0x55,0x93,0x52,0xa2,0xaf,0x12,0x76,0x99,0xd2,0x69,0x3a,0xe,0x40,0x5b,0x5,0x23,0xa2,0x64,0x84,0x2c,0xb7,0x1,0xfc,0x6,0x2e,0x96,0xcb,0xaf,0x6f,0xe7,0x67,0xcf,0x16,0x29,0xa5,0xde,0x52,0xfc,0x70,0xf6,0x88,0xaa,0xaa,0x5a,0x39,0xcc,0xf6,0xa8,0x84,0x99,0x9c,0x33,0xc0,0x17,0x90,0x37,0xeb,0x7,0x1,0xc7,0x7,0x34,0xa3,0x6b,0x20,0x1d,0xda,0x8c,0x56,0x65,0x9e,0x80,0xab,0x3d,0xdb,0xf1,0x41,0x9d,0x10,0xe0,0xf,0xcc,0xf9,0x14,0xcf,0xbc,0x12,0x3b,0xca,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x40,0xde,0x8d,0x6b,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x1,0x4d,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x31,0x2f,0x37,0x46,0x43,0x4f,0x2b,0x2b,0x31,0x2e,0x2e,0x34,0x47,0x44,0x50,0x2a,0x2a,0x30,0x55,0x52,0x5f,0x22,0x22,0x27,0x3d,0x3a,0x45,0x56,0x52,0x60,0x24,0x24,0x28,0x24,0x24,0x29,0x43,0x40,0x4c,0x42,0x40,0x4b,0x4c,0x49,0x56,0x2a,0x2a,0x31,0x2a,0x2a,0x30,0x2d,0x2d,0x34,0x2f,0x2f,0x36,0x2e,0x2e,0x35,0x2c,0x2c,0x32,0x3a,0x38,0x41,0x36,0x34,0x3d,0x44,0x41,0x4c,0x26,0x26,0x2b,0x24,0x24,0x28,0x27,0x27,0x2d,0x29,0x29,0x2f,0x28,0x28,0x2e,0x25,0x25,0x2b,0x23,0x23,0x28,0x44,0x42,0x4e,0x36,0x34,0x3e,0x44,0x41,0x4e,0x26,0x26,0x2c,0x25,0x25,0x2a,0x2a,0x2a,0x2f,0x2b,0x2b,0x31,0x22,0x22,0x26,0x46,0x42,0x4f,0x38,0x35,0x3f,0x2d,0x2d,0x33,0x22,0x22,0x27,0x47,0x45,0x50,0x39,0x37,0x40,0x27,0x27,0x2b,0x2e,0x2e,0x34,0x2c,0x2c,0x31,0x29,0x29,0x2e,0x49,0x46,0x53,0x3a,0x38,0x42,0x4a,0x47,0x54,0x3b,0x39,0x43,0x24,0x24,0x2a,0x24,0x24,0x29,0x20,0x20,0x25,0x4b,0x49,0x55,0x3c,0x3a,0x44,0x28,0x28,0x2d,0x2b,0x2b,0x30,0x29,0x29,0x2d,0x20,0x20,0x23,0x4e,0x4a,0x58,0x3e,0x3b,0x46,0x22,0x22,0x28,0x27,0x27,0x2c,0x1e,0x1e,0x22,0x50,0x4d,0x5a,0x3f,0x3d,0x48,0x3f,0x3d,0x47,0x4f,0x4c,0x59,0x21,0x21,0x26,0x21,0x21,0x25,0x23,0x23,0x27,0x20,0x20,0x24,0x1d,0x1d,0x21,0x45,0x42,0x4d,0x41,0x3e,0x49,0x40,0x3e,0x48,0x50,0x4e,0x5a,0x1f,0x1f,0x24,0x1f,0x1f,0x23,0x1e,0x1e,0x21,0x52,0x4e,0x5c,0x51,0x4e,0x5b,0x5d,0x59,0x69,0xff,0xff,0xff,0x2,0x4e,0xff,0xf1,0x0,0x0,0x0,0x24,0x74,0x52,0x4e,0x53,0x0,0x4,0xa,0x11,0x19,0x1f,0x22,0x24,0x1d,0x16,0xd,0x7,0x2,0x15,0x25,0x34,0x3f,0x46,0x47,0x48,0x43,0x3a,0x2d,0x1b,0x77,0xef,0xe6,0x49,0xef,0xe6,0xef,0xe7,0x77,0xef,0xe4,0x4a,0xba,0xea,0xc1,0xeb,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x6e,0x22,0xf,0x51,0x17,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x1,0xe,0x49,0x44,0x41,0x54,0x28,0xcf,0x8d,0xd1,0x57,0x53,0xc2,0x40,0x10,0xc0,0x71,0x6a,0x50,0x54,0x5a,0xec,0xbd,0x43,0x14,0xf5,0x2e,0x91,0xa8,0x5c,0x12,0x20,0x18,0xd,0x22,0x88,0xd,0x8d,0xd,0xb0,0xd7,0xef,0xff,0xea,0x71,0xd9,0x63,0x18,0x7d,0xd0,0xdf,0xf3,0x7f,0xe6,0x76,0xf7,0x3c,0x5e,0x9f,0x3f,0x10,0x14,0x42,0x94,0xd0,0xd3,0x1b,0xee,0xeb,0xf7,0xfc,0xe4,0x1b,0x88,0x44,0x63,0xf1,0x84,0x28,0x8a,0x83,0x43,0xc3,0x23,0x61,0xef,0xaf,0xc0,0x1f,0x19,0x1d,0x5b,0x5c,0x72,0x2d,0x27,0x53,0xd2,0xa,0x58,0x95,0xd2,0xa9,0xf1,0x9,0x1a,0x4,0xa2,0x93,0x6b,0xeb,0x60,0x3,0x61,0x59,0x1,0x9b,0x72,0x46,0x55,0xa7,0x68,0x10,0x8c,0x6d,0x6d,0x73,0x3b,0x59,0xa2,0xa5,0x81,0xae,0xc9,0xc4,0x90,0x69,0x20,0xc4,0x73,0x79,0x2e,0x97,0x45,0x49,0x9,0x14,0x74,0x5,0x99,0xed,0x20,0x94,0x28,0xee,0x72,0x45,0xb,0xe9,0x7b,0xa0,0xb0,0x6f,0x23,0xc3,0x6a,0x7,0x62,0xe9,0x80,0x2b,0x75,0x7,0x3a,0xd,0x10,0xb,0xca,0x87,0x5c,0x39,0x53,0x51,0xba,0x66,0xa8,0x1e,0x11,0xf6,0x44,0xed,0x98,0xab,0x61,0x7c,0x72,0xa,0xb4,0x33,0xa4,0x9e,0x63,0x36,0x64,0xfd,0x82,0xab,0x5f,0x9a,0x4e,0x67,0x4d,0xa7,0x62,0x5e,0x99,0x6c,0xcd,0xeb,0x9b,0x5b,0x70,0xd7,0x68,0x12,0x7,0x20,0xd2,0xba,0x7f,0x30,0xd8,0xa1,0xa6,0x1f,0x9f,0x9e,0x5d,0x2f,0x8d,0x57,0x95,0x80,0x6a,0xab,0xf9,0xf6,0x3e,0xc3,0x4e,0x3d,0x3b,0xf7,0xf1,0xe9,0xfa,0x42,0xc8,0xee,0xcc,0x60,0x5b,0x78,0x7e,0xe1,0x3f,0x9f,0xf5,0xd7,0x77,0x7f,0x3,0x1c,0x7f,0x59,0xc2,0x5e,0xdd,0xbf,0x43,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char panel_bg_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x8,0x6,0x0,0x0,0x0,0xc4,0xf,0xbe,0x8b,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x35,0x0,0x32,0x0,0x3b,0x6,0x66,0x54,0x53,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xa,0x15,0x2,0x31,0xf,0x57,0xad,0x75,0x1b,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x16,0x49,0x44,0x41,0x54,0x18,0xd3,0x63,0x54,0x55,0xd5,0xfa,0xcf,0x80,0x7,0x30,0x31,0x10,0x0,0xc3,0x43,0x1,0x0,0x83,0x6,0x1,0x83,0xc0,0x1f,0xe3,0x5,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x1,0x3,0x0,0x0,0x0,0xfe,0xc1,0x2c,0xc8,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x6,0x50,0x4c,0x54,0x45,0x25,0x25,0x2a,0x35,0x32,0x3b,0x4a,0x73,0x58,0x4a,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x1,0xff,0x2,0x2d,0xde,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0xb,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x40,0x5,0x0,0x0,0x10,0x0,0x1,0xa1,0xc5,0x21,0xc1,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char popup_bg_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0xa,0x45,0x69,0x43,0x43,0x50,0x49,0x43,0x43,0x20,0x70,0x72,0x6f,0x66,0x69,0x6c,0x65,0x0,0x0,0x78,0xda,0x9d,0x53,0x67,0x54,0x53,0xe9,0x16,0x3d,0xf7,0xde,0xf4,0x42,0x4b,0x88,0x80,0x94,0x4b,0x6f,0x52,0x15,0x8,0x20,0x52,0x42,0x8b,0x80,0x14,0x91,0x26,0x2a,0x21,0x9,0x10,0x4a,0x88,0x21,0xa1,0xd9,0x15,0x51,0xc1,0x11,0x45,0x45,0x4,0x1b,0xc8,0xa0,0x88,0x3,0x8e,0x8e,0x80,0x8c,0x15,0x51,0x2c,0xc,0x8a,0xa,0xd8,0x7,0xe4,0x21,0xa2,0x8e,0x83,0xa3,0x88,0x8a,0xca,0xfb,0xe1,0x7b,0xa3,0x6b,0xd6,0xbc,0xf7,0xe6,0xcd,0xfe,0xb5,0xd7,0x3e,0xe7,0xac,0xf3,0x9d,0xb3,0xcf,0x7,0xc0,0x8,0xc,0x96,0x48,0x33,0x51,0x35,0x80,0xc,0xa9,0x42,0x1e,0x11,0xe0,0x83,0xc7,0xc4,0xc6,0xe1,0xe4,0x2e,0x40,0x81,0xa,0x24,0x70,0x0,0x10,0x8,0xb3,0x64,0x21,0x73,0xfd,0x23,0x1,0x0,0xf8,0x7e,0x3c,0x3c,0x2b,0x22,0xc0,0x7,0xbe,0x0,0x1,0x78,0xd3,0xb,0x8,0x0,0xc0,0x4d,0x9b,0xc0,0x30,0x1c,0x87,0xff,0xf,0xea,0x42,0x99,0x5c,0x1,0x80,0x84,0x1,0xc0,0x74,0x91,0x38,0x4b,0x8,0x80,0x14,0x0,0x40,0x7a,0x8e,0x42,0xa6,0x0,0x40,0x46,0x1,0x80,0x9d,0x98,0x26,0x53,0x0,0xa0,0x4,0x0,0x60,0xcb,0x63,0x62,0xe3,0x0,0x50,0x2d,0x0,0x60,0x27,0x7f,0xe6,0xd3,0x0,0x80,0x9d,0xf8,0x99,0x7b,0x1,0x0,0x5b,0x94,0x21,0x15,0x1,0xa0,0x91,0x0,0x20,0x13,0x65,0x88,0x44,0x0,0x68,0x3b,0x0,0xac,0xcf,0x56,0x8a,0x45,0x0,0x58,0x30,0x0,0x14,0x66,0x4b,0xc4,0x39,0x0,0xd8,0x2d,0x0,0x30,0x49,0x57,0x66,0x48,0x0,0xb0,0xb7,0x0,0xc0,0xce,0x10,0xb,0xb2,0x0,0x8,0xc,0x0,0x30,0x51,0x88,0x85,0x29,0x0,0x4,0x7b,0x0,0x60,0xc8,0x23,0x23,0x78,0x0,0x84,0x99,0x0,0x14,0x46,0xf2,0x57,0x3c,0xf1,0x2b,0xae,0x10,0xe7,0x2a,0x0,0x0,0x78,0x99,0xb2,0x3c,0xb9,0x24,0x39,0x45,0x81,0x5b,0x8,0x2d,0x71,0x7,0x57,0x57,0x2e,0x1e,0x28,0xce,0x49,0x17,0x2b,0x14,0x36,0x61,0x2,0x61,0x9a,0x40,0x2e,0xc2,0x79,0x99,0x19,0x32,0x81,0x34,0xf,0xe0,0xf3,0xcc,0x0,0x0,0xa0,0x91,0x15,0x11,0xe0,0x83,0xf3,0xfd,0x78,0xce,0xe,0xae,0xce,0xce,0x36,0x8e,0xb6,0xe,0x5f,0x2d,0xea,0xbf,0x6,0xff,0x22,0x62,0x62,0xe3,0xfe,0xe5,0xcf,0xab,0x70,0x40,0x0,0x0,0xe1,0x74,0x7e,0xd1,0xfe,0x2c,0x2f,0xb3,0x1a,0x80,0x3b,0x6,0x80,0x6d,0xfe,0xa2,0x25,0xee,0x4,0x68,0x5e,0xb,0xa0,0x75,0xf7,0x8b,0x66,0xb2,0xf,0x40,0xb5,0x0,0xa0,0xe9,0xda,0x57,0xf3,0x70,0xf8,0x7e,0x3c,0x3c,0x45,0xa1,0x90,0xb9,0xd9,0xd9,0xe5,0xe4,0xe4,0xd8,0x4a,0xc4,0x42,0x5b,0x61,0xca,0x57,0x7d,0xfe,0x67,0xc2,0x5f,0xc0,0x57,0xfd,0x6c,0xf9,0x7e,0x3c,0xfc,0xf7,0xf5,0xe0,0xbe,0xe2,0x24,0x81,0x32,0x5d,0x81,0x47,0x4,0xf8,0xe0,0xc2,0xcc,0xf4,0x4c,0xa5,0x1c,0xcf,0x92,0x9,0x84,0x62,0xdc,0xe6,0x8f,0x47,0xfc,0xb7,0xb,0xff,0xfc,0x1d,0xd3,0x22,0xc4,0x49,0x62,0xb9,0x58,0x2a,0x14,0xe3,0x51,0x12,0x71,0x8e,0x44,0x9a,0x8c,0xf3,0x32,0xa5,0x22,0x89,0x42,0x92,0x29,0xc5,0x25,0xd2,0xff,0x64,0xe2,0xdf,0x2c,0xfb,0x3,0x3e,0xdf,0x35,0x0,0xb0,0x6a,0x3e,0x1,0x7b,0x91,0x2d,0xa8,0x5d,0x63,0x3,0xf6,0x4b,0x27,0x10,0x58,0x74,0xc0,0xe2,0xf7,0x0,0x0,0xf2,0xbb,0x6f,0xc1,0xd4,0x28,0x8,0x3,0x80,0x68,0x83,0xe1,0xcf,0x77,0xff,0xef,0x3f,0xfd,0x47,0xa0,0x25,0x0,0x80,0x66,0x49,0x92,0x71,0x0,0x0,0x5e,0x44,0x24,0x2e,0x54,0xca,0xb3,0x3f,0xc7,0x8,0x0,0x0,0x44,0xa0,0x81,0x2a,0xb0,0x41,0x1b,0xf4,0xc1,0x18,0x2c,0xc0,0x6,0x1c,0xc1,0x5,0xdc,0xc1,0xb,0xfc,0x60,0x36,0x84,0x42,0x24,0xc4,0xc2,0x42,0x10,0x42,0xa,0x64,0x80,0x1c,0x72,0x60,0x29,0xac,0x82,0x42,0x28,0x86,0xcd,0xb0,0x1d,0x2a,0x60,0x2f,0xd4,0x40,0x1d,0x34,0xc0,0x51,0x68,0x86,0x93,0x70,0xe,0x2e,0xc2,0x55,0xb8,0xe,0x3d,0x70,0xf,0xfa,0x61,0x8,0x9e,0xc1,0x28,0xbc,0x81,0x9,0x4,0x41,0xc8,0x8,0x13,0x61,0x21,0xda,0x88,0x1,0x62,0x8a,0x58,0x23,0x8e,0x8,0x17,0x99,0x85,0xf8,0x21,0xc1,0x48,0x4,0x12,0x8b,0x24,0x20,0xc9,0x88,0x14,0x51,0x22,0x4b,0x91,0x35,0x48,0x31,0x52,0x8a,0x54,0x20,0x55,0x48,0x1d,0xf2,0x3d,0x72,0x2,0x39,0x87,0x5c,0x46,0xba,0x91,0x3b,0xc8,0x0,0x32,0x82,0xfc,0x86,0xbc,0x47,0x31,0x94,0x81,0xb2,0x51,0x3d,0xd4,0xc,0xb5,0x43,0xb9,0xa8,0x37,0x1a,0x84,0x46,0xa2,0xb,0xd0,0x64,0x74,0x31,0x9a,0x8f,0x16,0xa0,0x9b,0xd0,0x72,0xb4,0x1a,0x3d,0x8c,0x36,0xa1,0xe7,0xd0,0xab,0x68,0xf,0xda,0x8f,0x3e,0x43,0xc7,0x30,0xc0,0xe8,0x18,0x7,0x33,0xc4,0x6c,0x30,0x2e,0xc6,0xc3,0x42,0xb1,0x38,0x2c,0x9,0x93,0x63,0xcb,0xb1,0x22,0xac,0xc,0xab,0xc6,0x1a,0xb0,0x56,0xac,0x3,0xbb,0x89,0xf5,0x63,0xcf,0xb1,0x77,0x4,0x12,0x81,0x45,0xc0,0x9,0x36,0x4,0x77,0x42,0x20,0x61,0x1e,0x41,0x48,0x58,0x4c,0x58,0x4e,0xd8,0x48,0xa8,0x20,0x1c,0x24,0x34,0x11,0xda,0x9,0x37,0x9,0x3,0x84,0x51,0xc2,0x27,0x22,0x93,0xa8,0x4b,0xb4,0x26,0xba,0x11,0xf9,0xc4,0x18,0x62,0x32,0x31,0x87,0x58,0x48,0x2c,0x23,0xd6,0x12,0x8f,0x13,0x2f,0x10,0x7b,0x88,0x43,0xc4,0x37,0x24,0x12,0x89,0x43,0x32,0x27,0xb9,0x90,0x2,0x49,0xb1,0xa4,0x54,0xd2,0x12,0xd2,0x46,0xd2,0x6e,0x52,0x23,0xe9,0x2c,0xa9,0x9b,0x34,0x48,0x1a,0x23,0x93,0xc9,0xda,0x64,0x6b,0xb2,0x7,0x39,0x94,0x2c,0x20,0x2b,0xc8,0x85,0xe4,0x9d,0xe4,0xc3,0xe4,0x33,0xe4,0x1b,0xe4,0x21,0xf2,0x5b,0xa,0x9d,0x62,0x40,0x71,0xa4,0xf8,0x53,0xe2,0x28,0x52,0xca,0x6a,0x4a,0x19,0xe5,0x10,0xe5,0x34,0xe5,0x6,0x65,0x98,0x32,0x41,0x55,0xa3,0x9a,0x52,0xdd,0xa8,0xa1,0x54,0x11,0x35,0x8f,0x5a,0x42,0xad,0xa1,0xb6,0x52,0xaf,0x51,0x87,0xa8,0x13,0x34,0x75,0x9a,0x39,0xcd,0x83,0x16,0x49,0x4b,0xa5,0xad,0xa2,0x95,0xd3,0x1a,0x68,0x17,0x68,0xf7,0x69,0xaf,0xe8,0x74,0xba,0x11,0xdd,0x95,0x1e,0x4e,0x97,0xd0,0x57,0xd2,0xcb,0xe9,0x47,0xe8,0x97,0xe8,0x3,0xf4,0x77,0xc,0xd,0x86,0x15,0x83,0xc7,0x88,0x67,0x28,0x19,0x9b,0x18,0x7,0x18,0x67,0x19,0x77,0x18,0xaf,0x98,0x4c,0xa6,0x19,0xd3,0x8b,0x19,0xc7,0x54,0x30,0x37,0x31,0xeb,0x98,0xe7,0x99,0xf,0x99,0x6f,0x55,0x58,0x2a,0xb6,0x2a,0x7c,0x15,0x91,0xca,0xa,0x95,0x4a,0x95,0x26,0x95,0x1b,0x2a,0x2f,0x54,0xa9,0xaa,0xa6,0xaa,0xde,0xaa,0xb,0x55,0xf3,0x55,0xcb,0x54,0x8f,0xa9,0x5e,0x53,0x7d,0xae,0x46,0x55,0x33,0x53,0xe3,0xa9,0x9,0xd4,0x96,0xab,0x55,0xaa,0x9d,0x50,0xeb,0x53,0x1b,0x53,0x67,0xa9,0x3b,0xa8,0x87,0xaa,0x67,0xa8,0x6f,0x54,0x3f,0xa4,0x7e,0x59,0xfd,0x89,0x6,0x59,0xc3,0x4c,0xc3,0x4f,0x43,0xa4,0x51,0xa0,0xb1,0x5f,0xe3,0xbc,0xc6,0x20,0xb,0x63,0x19,0xb3,0x78,0x2c,0x21,0x6b,0xd,0xab,0x86,0x75,0x81,0x35,0xc4,0x26,0xb1,0xcd,0xd9,0x7c,0x76,0x2a,0xbb,0x98,0xfd,0x1d,0xbb,0x8b,0x3d,0xaa,0xa9,0xa1,0x39,0x43,0x33,0x4a,0x33,0x57,0xb3,0x52,0xf3,0x94,0x66,0x3f,0x7,0xe3,0x98,0x71,0xf8,0x9c,0x74,0x4e,0x9,0xe7,0x28,0xa7,0x97,0xf3,0x7e,0x8a,0xde,0x14,0xef,0x29,0xe2,0x29,0x1b,0xa6,0x34,0x4c,0xb9,0x31,0x65,0x5c,0x6b,0xaa,0x96,0x97,0x96,0x58,0xab,0x48,0xab,0x51,0xab,0x47,0xeb,0xbd,0x36,0xae,0xed,0xa7,0x9d,0xa6,0xbd,0x45,0xbb,0x59,0xfb,0x81,0xe,0x41,0xc7,0x4a,0x27,0x5c,0x27,0x47,0x67,0x8f,0xce,0x5,0x9d,0xe7,0x53,0xd9,0x53,0xdd,0xa7,0xa,0xa7,0x16,0x4d,0x3d,0x3a,0xf5,0xae,0x2e,0xaa,0x6b,0xa5,0x1b,0xa1,0xbb,0x44,0x77,0xbf,0x6e,0xa7,0xee,0x98,0x9e,0xbe,0x5e,0x80,0x9e,0x4c,0x6f,0xa7,0xde,0x79,0xbd,0xe7,0xfa,0x1c,0x7d,0x2f,0xfd,0x54,0xfd,0x6d,0xfa,0xa7,0xf5,0x47,0xc,0x58,0x6,0xb3,0xc,0x24,0x6,0xdb,0xc,0xce,0x18,0x3c,0xc5,0x35,0x71,0x6f,0x3c,0x1d,0x2f,0xc7,0xdb,0xf1,0x51,0x43,0x5d,0xc3,0x40,0x43,0xa5,0x61,0x95,0x61,0x97,0xe1,0x84,0x91,0xb9,0xd1,0x3c,0xa3,0xd5,0x46,0x8d,0x46,0xf,0x8c,0x69,0xc6,0x5c,0xe3,0x24,0xe3,0x6d,0xc6,0x6d,0xc6,0xa3,0x26,0x6,0x26,0x21,0x26,0x4b,0x4d,0xea,0x4d,0xee,0x9a,0x52,0x4d,0xb9,0xa6,0x29,0xa6,0x3b,0x4c,0x3b,0x4c,0xc7,0xcd,0xcc,0xcd,0xa2,0xcd,0xd6,0x99,0x35,0x9b,0x3d,0x31,0xd7,0x32,0xe7,0x9b,0xe7,0x9b,0xd7,0x9b,0xdf,0xb7,0x60,0x5a,0x78,0x5a,0x2c,0xb6,0xa8,0xb6,0xb8,0x65,0x49,0xb2,0xe4,0x5a,0xa6,0x59,0xee,0xb6,0xbc,0x6e,0x85,0x5a,0x39,0x59,0xa5,0x58,0x55,0x5a,0x5d,0xb3,0x46,0xad,0x9d,0xad,0x25,0xd6,0xbb,0xad,0xbb,0xa7,0x11,0xa7,0xb9,0x4e,0x93,0x4e,0xab,0x9e,0xd6,0x67,0xc3,0xb0,0xf1,0xb6,0xc9,0xb6,0xa9,0xb7,0x19,0xb0,0xe5,0xd8,0x6,0xdb,0xae,0xb6,0x6d,0xb6,0x7d,0x61,0x67,0x62,0x17,0x67,0xb7,0xc5,0xae,0xc3,0xee,0x93,0xbd,0x93,0x7d,0xba,0x7d,0x8d,0xfd,0x3d,0x7,0xd,0x87,0xd9,0xe,0xab,0x1d,0x5a,0x1d,0x7e,0x73,0xb4,0x72,0x14,0x3a,0x56,0x3a,0xde,0x9a,0xce,0x9c,0xee,0x3f,0x7d,0xc5,0xf4,0x96,0xe9,0x2f,0x67,0x58,0xcf,0x10,0xcf,0xd8,0x33,0xe3,0xb6,0x13,0xcb,0x29,0xc4,0x69,0x9d,0x53,0x9b,0xd3,0x47,0x67,0x17,0x67,0xb9,0x73,0x83,0xf3,0x88,0x8b,0x89,0x4b,0x82,0xcb,0x2e,0x97,0x3e,0x2e,0x9b,0x1b,0xc6,0xdd,0xc8,0xbd,0xe4,0x4a,0x74,0xf5,0x71,0x5d,0xe1,0x7a,0xd2,0xf5,0x9d,0x9b,0xb3,0x9b,0xc2,0xed,0xa8,0xdb,0xaf,0xee,0x36,0xee,0x69,0xee,0x87,0xdc,0x9f,0xcc,0x34,0x9f,0x29,0x9e,0x59,0x33,0x73,0xd0,0xc3,0xc8,0x43,0xe0,0x51,0xe5,0xd1,0x3f,0xb,0x9f,0x95,0x30,0x6b,0xdf,0xac,0x7e,0x4f,0x43,0x4f,0x81,0x67,0xb5,0xe7,0x23,0x2f,0x63,0x2f,0x91,0x57,0xad,0xd7,0xb0,0xb7,0xa5,0x77,0xaa,0xf7,0x61,0xef,0x17,0x3e,0xf6,0x3e,0x72,0x9f,0xe3,0x3e,0xe3,0x3c,0x37,0xde,0x32,0xde,0x59,0x5f,0xcc,0x37,0xc0,0xb7,0xc8,0xb7,0xcb,0x4f,0xc3,0x6f,0x9e,0x5f,0x85,0xdf,0x43,0x7f,0x23,0xff,0x64,0xff,0x7a,0xff,0xd1,0x0,0xa7,0x80,0x25,0x1,0x67,0x3,0x89,0x81,0x41,0x81,0x5b,0x2,0xfb,0xf8,0x7a,0x7c,0x21,0xbf,0x8e,0x3f,0x3a,0xdb,0x65,0xf6,0xb2,0xd9,0xed,0x41,0x8c,0xa0,0xb9,0x41,0x15,0x41,0x8f,0x82,0xad,0x82,0xe5,0xc1,0xad,0x21,0x68,0xc8,0xec,0x90,0xad,0x21,0xf7,0xe7,0x98,0xce,0x91,0xce,0x69,0xe,0x85,0x50,0x7e,0xe8,0xd6,0xd0,0x7,0x61,0xe6,0x61,0x8b,0xc3,0x7e,0xc,0x27,0x85,0x87,0x85,0x57,0x86,0x3f,0x8e,0x70,0x88,0x58,0x1a,0xd1,0x31,0x97,0x35,0x77,0xd1,0xdc,0x43,0x73,0xdf,0x44,0xfa,0x44,0x96,0x44,0xde,0x9b,0x67,0x31,0x4f,0x39,0xaf,0x2d,0x4a,0x35,0x2a,0x3e,0xaa,0x2e,0x6a,0x3c,0xda,0x37,0xba,0x34,0xba,0x3f,0xc6,0x2e,0x66,0x59,0xcc,0xd5,0x58,0x9d,0x58,0x49,0x6c,0x4b,0x1c,0x39,0x2e,0x2a,0xae,0x36,0x6e,0x6c,0xbe,0xdf,0xfc,0xed,0xf3,0x87,0xe2,0x9d,0xe2,0xb,0xe3,0x7b,0x17,0x98,0x2f,0xc8,0x5d,0x70,0x79,0xa1,0xce,0xc2,0xf4,0x85,0xa7,0x16,0xa9,0x2e,0x12,0x2c,0x3a,0x96,0x40,0x4c,0x88,0x4e,0x38,0x94,0xf0,0x41,0x10,0x2a,0xa8,0x16,0x8c,0x25,0xf2,0x13,0x77,0x25,0x8e,0xa,0x79,0xc2,0x1d,0xc2,0x67,0x22,0x2f,0xd1,0x36,0xd1,0x88,0xd8,0x43,0x5c,0x2a,0x1e,0x4e,0xf2,0x48,0x2a,0x4d,0x7a,0x92,0xec,0x91,0xbc,0x35,0x79,0x24,0xc5,0x33,0xa5,0x2c,0xe5,0xb9,0x84,0x27,0xa9,0x90,0xbc,0x4c,0xd,0x4c,0xdd,0x9b,0x3a,0x9e,0x16,0x9a,0x76,0x20,0x6d,0x32,0x3d,0x3a,0xbd,0x31,0x83,0x92,0x91,0x90,0x71,0x42,0xaa,0x21,0x4d,0x93,0xb6,0x67,0xea,0x67,0xe6,0x66,0x76,0xcb,0xac,0x65,0x85,0xb2,0xfe,0xc5,0x6e,0x8b,0xb7,0x2f,0x1e,0x95,0x7,0xc9,0x6b,0xb3,0x90,0xac,0x5,0x59,0x2d,0xa,0xb6,0x42,0xa6,0xe8,0x54,0x5a,0x28,0xd7,0x2a,0x7,0xb2,0x67,0x65,0x57,0x66,0xbf,0xcd,0x89,0xca,0x39,0x96,0xab,0x9e,0x2b,0xcd,0xed,0xcc,0xb3,0xca,0xdb,0x90,0x37,0x9c,0xef,0x9f,0xff,0xed,0x12,0xc2,0x12,0xe1,0x92,0xb6,0xa5,0x86,0x4b,0x57,0x2d,0x1d,0x58,0xe6,0xbd,0xac,0x6a,0x39,0xb2,0x3c,0x71,0x79,0xdb,0xa,0xe3,0x15,0x5,0x2b,0x86,0x56,0x6,0xac,0x3c,0xb8,0x8a,0xb6,0x2a,0x6d,0xd5,0x4f,0xab,0xed,0x57,0x97,0xae,0x7e,0xbd,0x26,0x7a,0x4d,0x6b,0x81,0x5e,0xc1,0xca,0x82,0xc1,0xb5,0x1,0x6b,0xeb,0xb,0x55,0xa,0xe5,0x85,0x7d,0xeb,0xdc,0xd7,0xed,0x5d,0x4f,0x58,0x2f,0x59,0xdf,0xb5,0x61,0xfa,0x86,0x9d,0x1b,0x3e,0x15,0x89,0x8a,0xae,0x14,0xdb,0x17,0x97,0x15,0x7f,0xd8,0x28,0xdc,0x78,0xe5,0x1b,0x87,0x6f,0xca,0xbf,0x99,0xdc,0x94,0xb4,0xa9,0xab,0xc4,0xb9,0x64,0xcf,0x66,0xd2,0x66,0xe9,0xe6,0xde,0x2d,0x9e,0x5b,0xe,0x96,0xaa,0x97,0xe6,0x97,0xe,0x6e,0xd,0xd9,0xda,0xb4,0xd,0xdf,0x56,0xb4,0xed,0xf5,0xf6,0x45,0xdb,0x2f,0x97,0xcd,0x28,0xdb,0xbb,0x83,0xb6,0x43,0xb9,0xa3,0xbf,0x3c,0xb8,0xbc,0x65,0xa7,0xc9,0xce,0xcd,0x3b,0x3f,0x54,0xa4,0x54,0xf4,0x54,0xfa,0x54,0x36,0xee,0xd2,0xdd,0xb5,0x61,0xd7,0xf8,0x6e,0xd1,0xee,0x1b,0x7b,0xbc,0xf6,0x34,0xec,0xd5,0xdb,0x5b,0xbc,0xf7,0xfd,0x3e,0xc9,0xbe,0xdb,0x55,0x1,0x55,0x4d,0xd5,0x66,0xd5,0x65,0xfb,0x49,0xfb,0xb3,0xf7,0x3f,0xae,0x89,0xaa,0xe9,0xf8,0x96,0xfb,0x6d,0x5d,0xad,0x4e,0x6d,0x71,0xed,0xc7,0x3,0xd2,0x3,0xfd,0x7,0x23,0xe,0xb6,0xd7,0xb9,0xd4,0xd5,0x1d,0xd2,0x3d,0x54,0x52,0x8f,0xd6,0x2b,0xeb,0x47,0xe,0xc7,0x1f,0xbe,0xfe,0x9d,0xef,0x77,0x2d,0xd,0x36,0xd,0x55,0x8d,0x9c,0xc6,0xe2,0x23,0x70,0x44,0x79,0xe4,0xe9,0xf7,0x9,0xdf,0xf7,0x1e,0xd,0x3a,0xda,0x76,0x8c,0x7b,0xac,0xe1,0x7,0xd3,0x1f,0x76,0x1d,0x67,0x1d,0x2f,0x6a,0x42,0x9a,0xf2,0x9a,0x46,0x9b,0x53,0x9a,0xfb,0x5b,0x62,0x5b,0xba,0x4f,0xcc,0x3e,0xd1,0xd6,0xea,0xde,0x7a,0xfc,0x47,0xdb,0x1f,0xf,0x9c,0x34,0x3c,0x59,0x79,0x4a,0xf3,0x54,0xc9,0x69,0xda,0xe9,0x82,0xd3,0x93,0x67,0xf2,0xcf,0x8c,0x9d,0x95,0x9d,0x7d,0x7e,0x2e,0xf9,0xdc,0x60,0xdb,0xa2,0xb6,0x7b,0xe7,0x63,0xce,0xdf,0x6a,0xf,0x6f,0xef,0xba,0x10,0x74,0xe1,0xd2,0x45,0xff,0x8b,0xe7,0x3b,0xbc,0x3b,0xce,0x5c,0xf2,0xb8,0x74,0xf2,0xb2,0xdb,0xe5,0x13,0x57,0xb8,0x57,0x9a,0xaf,0x3a,0x5f,0x6d,0xea,0x74,0xea,0x3c,0xfe,0x93,0xd3,0x4f,0xc7,0xbb,0x9c,0xbb,0x9a,0xae,0xb9,0x5c,0x6b,0xb9,0xee,0x7a,0xbd,0xb5,0x7b,0x66,0xf7,0xe9,0x1b,0x9e,0x37,0xce,0xdd,0xf4,0xbd,0x79,0xf1,0x16,0xff,0xd6,0xd5,0x9e,0x39,0x3d,0xdd,0xbd,0xf3,0x7a,0x6f,0xf7,0xc5,0xf7,0xf5,0xdf,0x16,0xdd,0x7e,0x72,0x27,0xfd,0xce,0xcb,0xbb,0xd9,0x77,0x27,0xee,0xad,0xbc,0x4f,0xbc,0x5f,0xf4,0x40,0xed,0x41,0xd9,0x43,0xdd,0x87,0xd5,0x3f,0x5b,0xfe,0xdc,0xd8,0xef,0xdc,0x7f,0x6a,0xc0,0x77,0xa0,0xf3,0xd1,0xdc,0x47,0xf7,0x6,0x85,0x83,0xcf,0xfe,0x91,0xf5,0x8f,0xf,0x43,0x5,0x8f,0x99,0x8f,0xcb,0x86,0xd,0x86,0xeb,0x9e,0x38,0x3e,0x39,0x39,0xe2,0x3f,0x72,0xfd,0xe9,0xfc,0xa7,0x43,0xcf,0x64,0xcf,0x26,0x9e,0x17,0xfe,0xa2,0xfe,0xcb,0xae,0x17,0x16,0x2f,0x7e,0xf8,0xd5,0xeb,0xd7,0xce,0xd1,0x98,0xd1,0xa1,0x97,0xf2,0x97,0x93,0xbf,0x6d,0x7c,0xa5,0xfd,0xea,0xc0,0xeb,0x19,0xaf,0xdb,0xc6,0xc2,0xc6,0x1e,0xbe,0xc9,0x78,0x33,0x31,0x5e,0xf4,0x56,0xfb,0xed,0xc1,0x77,0xdc,0x77,0x1d,0xef,0xa3,0xdf,0xf,0x4f,0xe4,0x7c,0x20,0x7f,0x28,0xff,0x68,0xf9,0xb1,0xf5,0x53,0xd0,0xa7,0xfb,0x93,0x19,0x93,0x93,0xff,0x4,0x3,0x98,0xf3,0xfc,0xef,0x35,0x94,0x82,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x35,0x0,0x32,0x0,0x3b,0x6,0x66,0x54,0x53,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xa,0x15,0x2,0x2a,0x1d,0xd,0x22,0xcf,0xc9,0x0,0x0,0x1,0x42,0x49,0x44,0x41,0x54,0x38,0xcb,0xa5,0x93,0x4d,0x4e,0xc3,0x30,0x10,0x85,0x3f,0x3b,0x4e,0x42,0x5b,0xd4,0xaa,0x15,0xb7,0xe9,0x92,0x8b,0xd0,0x3,0x70,0x1a,0xe,0x40,0x39,0x8,0xcb,0x9e,0x6,0x55,0x48,0x15,0x85,0x24,0xfe,0x19,0x16,0x99,0x80,0x8b,0x42,0xbb,0xe8,0x48,0xa3,0x91,0x6c,0xcf,0xf3,0xb3,0xdf,0x1b,0x43,0x1f,0x6,0xb0,0x9a,0x85,0x56,0xc3,0x69,0x8,0x90,0x80,0xa8,0x35,0x1,0x62,0xf4,0x60,0x1,0x54,0xc0,0x44,0x6b,0xa5,0x6b,0x26,0x6b,0x8e,0x40,0xa7,0xf9,0xa5,0x35,0x3a,0xbd,0xad,0x2,0x6e,0x81,0x25,0x30,0x7,0xa6,0xba,0x96,0x3,0x74,0xc0,0x27,0x70,0x0,0xde,0x81,0xf,0xa0,0x1d,0x0,0x26,0xc0,0x72,0xbd,0xbe,0x7f,0xac,0xeb,0x9b,0x4d,0x8,0xa1,0x54,0x76,0x59,0x18,0x71,0xce,0xf9,0xb6,0x6d,0x9e,0x77,0xbb,0xd7,0x27,0x65,0xe4,0x5d,0x46,0x7f,0x5e,0x55,0xf5,0x66,0xbf,0x7f,0x9b,0xa6,0x14,0x19,0xb,0x6b,0x8b,0x72,0xb5,0xba,0xdb,0x0,0x2f,0xca,0xa4,0xc8,0x9f,0x30,0xb,0xc1,0xd7,0x29,0x45,0x44,0x64,0x14,0x20,0xa5,0x48,0x8,0xbe,0x6,0x66,0xda,0x63,0x5d,0xf6,0x89,0x65,0x4a,0x49,0x44,0xe4,0x5f,0x80,0x1e,0x24,0x9,0x50,0xe,0x9f,0xec,0x32,0x19,0x8d,0x88,0xd0,0xef,0x8f,0x3,0x88,0x30,0x80,0xf,0xea,0xe1,0x4e,0xd1,0x87,0xdb,0xcf,0x31,0x38,0xdd,0x73,0x99,0x4c,0x22,0x12,0x11,0x49,0x67,0x0,0xc,0x22,0xf1,0xe7,0xfc,0x0,0x30,0x98,0xc4,0x8b,0x88,0xb9,0xcc,0x20,0x19,0xc0,0x6b,0x8f,0x58,0xb5,0xa4,0x7,0x8e,0xd6,0x16,0xad,0xb5,0x26,0x7b,0xef,0x6f,0xf6,0x32,0x1a,0x8a,0xc2,0x75,0xc0,0x51,0x7b,0x92,0x53,0xa4,0x16,0x38,0xb4,0x6d,0xb3,0x5d,0x2c,0x56,0xf,0x21,0xf8,0x72,0x6c,0x16,0xca,0xd2,0x75,0x4d,0xd3,0x6c,0xd5,0x3,0x2d,0x10,0x7,0x9,0xeb,0x3f,0x56,0x9e,0xa9,0x54,0x17,0xad,0x7c,0xf5,0x30,0x99,0x6b,0xc7,0xf9,0x1b,0xc9,0xc8,0xb3,0xec,0x84,0x2f,0xf7,0x27,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0xa5,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3b,0x3b,0x43,0x42,0x42,0x4b,0x3e,0x3e,0x47,0x3e,0x3e,0x46,0x41,0x41,0x4a,0x0,0x0,0x0,0x3d,0x3d,0x45,0x3b,0x3b,0x43,0x3a,0x3a,0x42,0x38,0x38,0x41,0x37,0x37,0x3e,0x36,0x36,0x3d,0x35,0x35,0x3c,0x0,0x0,0x0,0x38,0x38,0x40,0x38,0x38,0x40,0x31,0x31,0x38,0x34,0x34,0x3b,0x34,0x34,0x3b,0x39,0x39,0x3f,0x31,0x31,0x38,0x2f,0x2f,0x36,0x2d,0x2d,0x33,0x2c,0x2c,0x32,0x2b,0x2b,0x31,0x2a,0x2a,0x31,0x2a,0x2a,0x30,0x29,0x29,0x30,0x29,0x29,0x2f,0x28,0x28,0x2e,0x28,0x28,0x2d,0x27,0x27,0x2d,0x27,0x27,0x2c,0x29,0x29,0x2e,0x26,0x26,0x2c,0x35,0x32,0x3b,0xf,0xeb,0x7f,0x60,0x0,0x0,0x0,0x28,0x74,0x52,0x4e,0x53,0x0,0x1,0x3,0x5,0x8,0xa,0xb,0x4,0x13,0x19,0x1f,0x22,0x23,0x16,0x27,0x35,0x3f,0x45,0x46,0x94,0xf5,0xfa,0xfb,0xf5,0x40,0xfc,0xfb,0xfb,0xfb,0xfb,0xfc,0xfc,0x1a,0xf5,0xf6,0x95,0xfa,0xfb,0xf4,0x94,0x71,0xda,0xac,0x92,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x36,0x47,0xbf,0x88,0xd1,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0xaf,0x49,0x44,0x41,0x54,0x18,0xd3,0x65,0xcf,0xc9,0x12,0x82,0x30,0x10,0x4,0xd0,0x1,0x12,0xb6,0x0,0x21,0x2c,0xb2,0xaa,0xa0,0xa8,0x80,0x88,0x8,0xf8,0xff,0xbf,0x66,0x98,0x93,0xa5,0xef,0xd8,0x55,0xd3,0xd5,0x3,0xa0,0xa8,0x1a,0xa1,0xba,0x44,0x89,0xa6,0x2a,0x0,0x8a,0x41,0x4d,0xcb,0x66,0x8e,0xc3,0x6c,0xcb,0xa4,0x86,0x2,0x2a,0x75,0x3d,0xee,0x8b,0x20,0x10,0x3e,0xf7,0x5c,0xaa,0x82,0x66,0x7a,0x61,0x14,0xef,0xa4,0x38,0xa,0x3d,0x53,0x3,0x62,0xf1,0xa4,0xed,0x50,0x9b,0x70,0x8b,0x0,0xb5,0xd3,0xac,0xeb,0x51,0x97,0xa5,0x36,0x5,0x9d,0x89,0xbc,0xbf,0xa3,0x3e,0x17,0x4c,0x7,0xdd,0x9,0x8a,0xe1,0x81,0x86,0x22,0x70,0x30,0x28,0xc7,0x27,0x1a,0x4b,0xc,0x98,0xd8,0x4f,0x2f,0x34,0xed,0xb7,0x13,0x59,0x7a,0x98,0x17,0x34,0x1f,0xb7,0x52,0x52,0xf1,0x7a,0x5d,0xde,0xd2,0xb2,0x9e,0x78,0x45,0xb6,0x61,0xe7,0xba,0xb9,0x48,0xcd,0xf5,0xb6,0xd,0xc3,0xe9,0xe9,0xd7,0xf4,0xbf,0xe7,0x7e,0xdf,0xff,0x0,0xda,0x19,0x15,0x34,0xd5,0xa4,0x90,0x50,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char popup_bg_disabled_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdb,0x3,0x1d,0x2,0x11,0x12,0xf2,0x1a,0x35,0xe8,0x0,0x0,0x1,0x98,0x49,0x44,0x41,0x54,0x38,0xcb,0x6d,0x93,0x31,0x72,0x13,0x41,0x10,0x45,0xdf,0xef,0xdd,0x22,0x21,0xf0,0xaa,0x4a,0x36,0x67,0xb0,0x62,0xa3,0x83,0x70,0x9,0x7c,0x5,0x6f,0x44,0x62,0x71,0x4,0xeb,0x30,0xc4,0xe,0x80,0xc8,0x1,0x8e,0xc8,0xa1,0xa8,0x92,0xac,0xc2,0x52,0x41,0xa1,0xe9,0x26,0x98,0xd9,0x95,0x46,0xd0,0x5b,0x1d,0x6c,0x4f,0xff,0x3f,0xff,0xf7,0xcc,0x28,0x88,0xe0,0x28,0xae,0xfb,0x5,0x81,0x30,0x51,0x85,0x7,0x88,0x60,0xb9,0xe8,0xab,0xba,0x6,0x82,0x1,0xb8,0x79,0xfc,0xc4,0x76,0xb3,0x46,0xaa,0x19,0x22,0x82,0x97,0x67,0x13,0xce,0x2e,0x5f,0x57,0x44,0xa,0x22,0xae,0xfb,0x5,0xeb,0x87,0x7b,0x76,0xbb,0x2d,0x32,0x41,0xf0,0x5f,0x2,0x4,0xe1,0x99,0xa8,0xbb,0xbc,0x62,0xb9,0xe8,0x31,0x80,0x40,0xec,0x76,0xdb,0xd2,0x9,0x66,0x86,0xa4,0x2a,0xcd,0xc,0x8a,0xd9,0xed,0x66,0xd,0x32,0x0,0x9a,0x6f,0xfd,0x8b,0x77,0x9b,0xc7,0xcf,0xfc,0xf9,0xfd,0xb,0x28,0x60,0x32,0xa8,0x91,0x30,0x9,0xc9,0xe,0xa,0xca,0xc8,0xfc,0xe7,0x8a,0xf,0x6f,0xbe,0x62,0x81,0x78,0x5e,0xaf,0xb2,0x1f,0x9,0x21,0xac,0x31,0xac,0x31,0x64,0x4d,0xc9,0x5c,0x13,0x45,0x9,0xf0,0xfc,0xb4,0x2,0x19,0xad,0x24,0x38,0x99,0x38,0x80,0x9,0xa4,0x6c,0x9,0x89,0xe4,0x79,0x3,0x77,0x3f,0x9c,0x80,0x54,0x66,0x10,0x31,0x4a,0xab,0xc8,0x64,0xa8,0x6d,0x89,0x8,0x86,0x8d,0x4e,0x87,0x6b,0xc7,0xa0,0xa8,0xaf,0x44,0xae,0xb9,0x23,0xe9,0x9f,0xb5,0xe1,0xbf,0x5,0xf0,0xe4,0x34,0x6d,0x33,0x2a,0x9,0xf,0x52,0x80,0xe1,0x63,0xb3,0x27,0xc7,0xc3,0x71,0xf7,0x4a,0x71,0x3b,0xdc,0x32,0xf6,0x9,0x33,0xcb,0x1e,0xd,0x14,0xaa,0x6c,0x5,0x91,0xc1,0x1e,0x15,0x91,0x11,0xce,0x64,0x7a,0x4e,0xc,0x5f,0xe4,0x46,0x8f,0x43,0xa6,0x94,0x48,0x29,0xe5,0xb5,0x2,0xee,0xa6,0x17,0x88,0xc0,0x96,0x8b,0x9e,0x6e,0x36,0x27,0x42,0x78,0x3a,0x34,0x1f,0xa7,0xa7,0xc,0x4a,0x29,0xe1,0x91,0x6d,0x75,0xb3,0x39,0x77,0xb7,0x37,0x65,0x88,0x45,0x85,0x7,0xa3,0x82,0x63,0x82,0x7d,0xda,0x67,0x5,0x4,0x11,0xa2,0x9b,0x5e,0x8c,0xf6,0xaa,0xc7,0x84,0x8c,0xa7,0x2f,0x1f,0x59,0xff,0xf8,0x5e,0x4e,0x51,0x85,0x3f,0x37,0x4f,0xce,0x5f,0xd1,0xcd,0xe6,0x88,0xe0,0xee,0xf6,0xa6,0x26,0x18,0xe2,0x6d,0xff,0x7e,0xbc,0xff,0xa7,0xc7,0x76,0xc,0x1c,0xe2,0x2f,0x12,0x84,0x2a,0xee,0x67,0x88,0x95,0xa0,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x7b,0x50,0x4c,0x54,0x45,0xff,0x0,0xff,0x67,0x7a,0x85,0x66,0x7a,0x86,0x68,0x7b,0x86,0x57,0x51,0x51,0x4c,0x42,0x40,0x4d,0x43,0x41,0x56,0x4c,0x4b,0x4d,0x44,0x41,0x4e,0x44,0x42,0x4f,0x45,0x43,0x67,0x7b,0x87,0x4f,0x44,0x43,0x50,0x45,0x44,0x52,0x46,0x44,0x51,0x46,0x45,0x4b,0x40,0x3f,0x51,0x47,0x45,0x52,0x48,0x46,0x53,0x48,0x47,0x4b,0x41,0x3f,0x54,0x49,0x46,0x55,0x4a,0x47,0x55,0x49,0x47,0x68,0x7c,0x88,0x4a,0x40,0x3e,0x55,0x4b,0x49,0x56,0x4d,0x4b,0x53,0x49,0x47,0x50,0x46,0x44,0x4a,0x41,0x3e,0x48,0x3e,0x3c,0x4b,0x42,0x3f,0x49,0x3f,0x3d,0x46,0x3d,0x3c,0x47,0x3d,0x3b,0x47,0x3e,0x3b,0x49,0x40,0x3d,0x45,0x3c,0x3b,0x46,0x3c,0x3a,0xff,0xff,0xff,0x2e,0x48,0xbd,0x3e,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x28,0xbd,0xb0,0xb5,0xb2,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0xb3,0x49,0x44,0x41,0x54,0x18,0xd3,0x2d,0x8f,0xdb,0x16,0x82,0x20,0x10,0x45,0x11,0x19,0x12,0x91,0x54,0x44,0x93,0xb2,0x48,0xa1,0xfc,0xff,0x3f,0xec,0xa0,0xed,0xb7,0xd9,0x73,0xd6,0x5c,0x18,0x3,0x5,0x2f,0x1,0x2f,0xd8,0x49,0xc1,0x5,0x49,0x40,0xe2,0x54,0xc5,0x85,0x2a,0xa9,0x80,0xac,0x48,0x64,0xc3,0x89,0x64,0x7d,0x20,0x89,0x34,0x2,0x82,0x48,0x35,0xe6,0x7a,0x6d,0x1b,0x45,0x39,0xc2,0x3b,0x92,0x4d,0x6f,0x87,0xc1,0xf6,0x30,0x4e,0x33,0xed,0xb2,0x18,0xa7,0xdb,0x64,0x8d,0x24,0x37,0x33,0xed,0x9d,0xac,0xfb,0xf1,0xfe,0x18,0x97,0xa7,0x3a,0xc4,0xcb,0x51,0x16,0xf7,0xc9,0x42,0x78,0x88,0xf0,0x76,0xca,0xb4,0xcb,0x62,0xd,0x2,0x2b,0xc4,0x16,0x7c,0x5e,0x63,0x9e,0x35,0x75,0x6b,0xd4,0x58,0x9b,0x3e,0x98,0x8b,0xbb,0xd0,0x8f,0xa2,0x64,0x88,0xc4,0xb0,0x7a,0xe7,0x3a,0x1f,0x12,0x2,0xf9,0xb2,0x6f,0x8c,0x31,0x84,0x18,0xd3,0x26,0xf8,0xf1,0x8c,0x16,0xfb,0x9e,0xd2,0xbe,0xb,0x5d,0xfe,0xff,0xe5,0x7a,0x6,0x67,0xf9,0x3,0x92,0x36,0xd,0x2d,0xc1,0xf2,0x6d,0x3c,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char popup_checked_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x8,0x6,0x0,0x0,0x0,0xc4,0xf,0xbe,0x8b,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0xa3,0x49,0x44,0x41,0x54,0x18,0x95,0x85,0xcd,0xa1,0xa,0xc2,0x50,0x0,0x85,0xe1,0xff,0xdc,0x5d,0xd8,0x14,0x4,0xab,0x69,0x37,0xac,0x98,0xd5,0x27,0xb0,0x89,0x16,0x8b,0xd5,0xf7,0xd0,0xec,0x73,0xf8,0x4,0x16,0x61,0x4d,0x10,0xc,0x16,0xa3,0x61,0x71,0xab,0x16,0xeb,0x84,0x3b,0xae,0x45,0x8b,0xa,0x9e,0x78,0xce,0x7,0x7,0xfe,0x44,0xbf,0xca,0xa2,0x28,0x3a,0x71,0x1c,0x1f,0x24,0x3d,0xcc,0xe7,0x18,0x42,0x50,0x92,0x24,0x5b,0x49,0x23,0xa0,0xfd,0x5,0xaa,0xaa,0x5a,0x1,0x73,0xe0,0x1e,0x45,0xd1,0x42,0x65,0x59,0x9e,0x80,0x96,0xf7,0x7e,0x62,0xad,0x1d,0x2,0xfb,0x97,0x9d,0x39,0xe7,0x72,0x1b,0x42,0x88,0x25,0xd,0xac,0xb5,0x47,0xa0,0x7,0x18,0x60,0xed,0x9c,0xcb,0x1,0x4c,0xd3,0x34,0x53,0xe0,0xa,0xf4,0x81,0x2e,0xb0,0x4b,0xd3,0x74,0xf3,0xbe,0x34,0x59,0x96,0xdd,0xbc,0xf7,0x63,0xe0,0x2,0x9c,0xeb,0xba,0x5e,0x4a,0xa,0x6f,0xf0,0x4,0x57,0x3d,0x2c,0x27,0x2b,0xe9,0x62,0x6b,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x8,0x4,0x0,0x0,0x0,0x6e,0x6,0x76,0x0,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x6c,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x40,0x3,0x8c,0x8,0xe6,0xd,0x5e,0xf6,0xbd,0x8c,0x3f,0x99,0x60,0xdc,0xff,0x8c,0x1c,0xb,0x18,0x4d,0x19,0xb8,0xe0,0xf2,0xf,0x6a,0x1e,0xfc,0x7f,0xf0,0xee,0xb1,0xa,0xe3,0x83,0xc3,0xc,0x9c,0x7f,0xbc,0x58,0x4c,0x18,0x36,0x33,0x30,0x30,0xf8,0x2a,0x6c,0x63,0xf9,0xcf,0xce,0x68,0xcc,0x72,0x80,0x41,0x92,0x81,0x89,0xa1,0x46,0x61,0x1b,0x3,0x3,0xc3,0x1d,0xb1,0x7,0x97,0x1f,0xfc,0x7f,0xf0,0xff,0xc1,0xda,0xff,0x8c,0x50,0x5b,0xee,0x88,0xb1,0x6c,0x65,0xf8,0xfd,0xc3,0x5d,0xe3,0x33,0x3,0x3,0x3,0x3,0x0,0x6a,0x54,0x21,0x0,0x96,0x26,0x52,0xa9,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xba,0x84,0x14,0xff,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xcb,0xd9,0xac,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char popup_hover_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdb,0x3,0x1d,0x2,0x11,0x15,0x6c,0x7e,0xa0,0x4b,0x0,0x0,0x0,0x56,0x49,0x44,0x41,0x54,0x38,0xcb,0x63,0xfc,0xcf,0xf0,0xff,0xbf,0xa2,0x9e,0x11,0x3,0x39,0xe0,0xfe,0xa5,0x73,0xc,0x2c,0x8a,0x7a,0x46,0xc,0xc9,0xd,0x6d,0x64,0x19,0xa0,0xd8,0x60,0xc4,0xc0,0x2,0xe3,0x18,0x68,0x69,0x91,0xa4,0xf9,0xc2,0xb5,0x6b,0xc,0xc,0xc,0xc,0x8,0x3,0xfe,0xfc,0xfd,0x4b,0x96,0x2b,0xe0,0x6,0xfc,0x1d,0x70,0x3,0xfe,0x8c,0xba,0x60,0x34,0x1a,0x19,0x18,0x18,0xbe,0x7d,0xff,0x4e,0x96,0x1,0x8c,0x94,0x66,0x67,0x0,0xa4,0xb1,0x35,0x6e,0x67,0x37,0x90,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x4,0x3,0x0,0x0,0x0,0xed,0xdd,0xe2,0x52,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x30,0x50,0x4c,0x54,0x45,0xff,0x0,0xff,0x20,0x2e,0x31,0x83,0xae,0xb7,0xb3,0xd8,0xe1,0xaf,0xd5,0xde,0xac,0xd2,0xdb,0xa9,0xcf,0xd8,0xa5,0xcc,0xd5,0xa2,0xc9,0xd2,0x9e,0xc6,0xcf,0x9b,0xc3,0xcc,0x97,0xc0,0xc9,0x94,0xbd,0xc6,0x91,0xba,0xc3,0x8d,0xb7,0xc0,0xff,0xff,0xff,0x73,0xd4,0x4e,0xcb,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0xf,0x18,0xba,0x0,0xd9,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x4c,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x14,0x4,0x3,0x1,0x6,0x21,0x25,0x30,0x50,0x64,0x10,0x32,0x6,0x3,0x20,0xc3,0x5,0xc,0x80,0x8c,0x50,0x30,0x0,0x32,0xd2,0xc0,0x0,0xc8,0x28,0x7,0x3,0x20,0xa3,0x3,0xc,0x80,0x8c,0x99,0x60,0x0,0x64,0xac,0x2,0x3,0x20,0x63,0x37,0x18,0x0,0x19,0x67,0xc0,0x0,0xc8,0xb8,0xb,0x6,0x40,0xc6,0x3b,0x30,0x50,0x44,0x58,0xa,0x73,0x6,0x0,0xe9,0xb4,0x2d,0xf5,0x51,0xd4,0xb8,0xa1,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char popup_unchecked_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x8,0x6,0x0,0x0,0x0,0xc4,0xf,0xbe,0x8b,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xd9,0xb,0x17,0x6,0xe,0x1a,0x24,0x97,0x11,0x36,0x0,0x0,0x0,0x15,0x49,0x44,0x41,0x54,0x18,0xd3,0x63,0xfc,0xcf,0xf0,0x9f,0x1,0x1f,0x60,0x62,0x20,0x0,0x86,0x87,0x2,0x0,0x13,0x5a,0x2,0xe,0x7,0x1c,0xa9,0x13,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x1,0x3,0x0,0x0,0x0,0xfe,0xc1,0x2c,0xc8,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x6,0x50,0x4c,0x54,0x45,0xff,0x0,0xff,0xff,0xff,0xff,0x9f,0x18,0x32,0xe0,0x0,0x0,0x0,0x1,0x74,0x52,0x4e,0x53,0x0,0x40,0xe6,0xd8,0x66,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x1,0xff,0x2,0x2d,0xde,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x0,0xb,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x40,0x5,0x0,0x0,0x10,0x0,0x1,0xa1,0xc5,0x21,0xc1,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char popup_window_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x2a,0x0,0x0,0x0,0x46,0x8,0x6,0x0,0x0,0x0,0xba,0xf5,0x6,0x7a,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x3,0x3,0xc,0x31,0x2b,0xec,0x7e,0x63,0x8a,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x2,0xdc,0x49,0x44,0x41,0x54,0x68,0xde,0xed,0x9a,0xdd,0x6a,0x13,0x41,0x14,0xc7,0x7f,0xf3,0x91,0x8d,0x95,0xd2,0xa2,0x6,0x5b,0x89,0xad,0xe2,0x85,0xbe,0x40,0x41,0xd0,0x7b,0xdf,0x42,0xa9,0xaf,0xa6,0x4f,0xd5,0x5e,0x48,0x3f,0xb4,0x58,0x48,0x91,0x96,0x62,0xdb,0x4d,0x66,0x8e,0x17,0x99,0xd8,0x2a,0x36,0x3b,0xdb,0xec,0x6c,0x36,0xb2,0x7,0x6,0xb2,0xb0,0x3b,0xf3,0x9f,0xff,0xf9,0x9c,0x39,0x81,0x56,0x5a,0x69,0xb6,0xa8,0xa2,0x17,0xbe,0x7f,0x3b,0xfd,0x4,0xbc,0x4f,0x8c,0xe3,0xf3,0x7a,0x7f,0xf5,0xc3,0xac,0x40,0xc5,0xb9,0x1c,0x2f,0x2e,0x9,0x42,0xad,0xc,0xc6,0x64,0xac,0xf7,0x57,0xa7,0x62,0xb1,0x31,0x93,0x8d,0xdc,0x28,0x19,0x95,0x9e,0x11,0xc6,0x64,0xc5,0x1b,0x5a,0x14,0x1b,0x8d,0x62,0x54,0x44,0x5a,0xa0,0x2d,0xd0,0x16,0x68,0x15,0x40,0xbd,0xf7,0x2d,0xa3,0xd5,0x32,0x3a,0x7f,0x9c,0x91,0x8c,0x2e,0x80,0xea,0x4d,0xd3,0x55,0x6f,0x80,0xec,0xd9,0xc6,0x8b,0x95,0x31,0xa3,0xcd,0xb6,0x51,0x33,0x1c,0xe5,0x4b,0x4d,0x67,0x74,0x19,0xe8,0x67,0x9d,0xee,0x56,0x53,0xc2,0x93,0x9e,0xa6,0x7a,0x11,0x7f,0x7f,0xc2,0x68,0xca,0x1,0xb0,0xf6,0xf8,0xc9,0x3b,0xe0,0x39,0xb0,0x54,0x86,0xd1,0x15,0x60,0x53,0x6b,0xf3,0x6,0xa0,0xe,0xc5,0x5b,0x6b,0x5f,0x3,0xe7,0xc0,0x19,0x70,0x51,0xc6,0x46,0xd5,0x84,0xf1,0x47,0xf,0x7b,0xc9,0x81,0x1a,0x6d,0x0,0x3a,0x65,0x6c,0xd4,0x84,0xf,0x1e,0x28,0xa5,0x9e,0x6e,0x7f,0xdc,0x26,0xcf,0x73,0xbc,0x4f,0x74,0x14,0xd1,0x86,0x2c,0xcb,0xd0,0xda,0xbc,0x5,0x76,0x81,0x2f,0xc0,0x29,0xe0,0x1a,0x59,0xe1,0x2b,0xa5,0x74,0xc0,0x63,0x9a,0x7e,0x14,0x31,0x1,0x8f,0x6e,0x34,0xd0,0xc0,0xa8,0x59,0x4,0x46,0xd5,0x34,0x3c,0x36,0x7a,0x9a,0x39,0x27,0xa7,0x62,0xa0,0x22,0x20,0x92,0xe,0x67,0x98,0x7f,0x26,0xa0,0x7e,0x32,0x4f,0x42,0x4a,0x25,0xac,0xe1,0x67,0x66,0x94,0x3f,0xd0,0xa6,0x61,0xb4,0xa,0xd5,0x4f,0x72,0x71,0x42,0xe5,0x47,0x55,0x67,0x7a,0xde,0x7e,0x24,0x95,0x39,0x53,0x50,0x8f,0x34,0x5a,0xf5,0x6e,0xac,0xf2,0xe4,0xce,0x84,0xfc,0x95,0xd9,0x4b,0x33,0xea,0x82,0xfd,0x24,0x74,0x26,0x26,0x35,0xa9,0xab,0xe2,0x5c,0x9f,0xce,0x99,0x62,0x4d,0x4a,0x47,0xec,0x37,0xb9,0x3b,0xc5,0x90,0x50,0xcc,0xa8,0xf,0x9a,0x4f,0xe5,0x4d,0x42,0x71,0xb4,0x2f,0x62,0xd4,0x31,0x31,0x4f,0x49,0xca,0x67,0x84,0x2f,0xc5,0xd8,0xa8,0xa4,0x67,0x94,0xa,0x2,0xbe,0xd4,0xc0,0x68,0xc,0x7,0x11,0x8c,0xfa,0x72,0xee,0x79,0x27,0xf1,0xb3,0x3,0xf5,0x21,0xce,0xa5,0x4b,0x4c,0x82,0xaf,0xc2,0xeb,0xa5,0x86,0x8c,0x1f,0x33,0xb3,0x8d,0xf2,0xa5,0x84,0xb9,0x5e,0x22,0x4b,0xc8,0xff,0x85,0x51,0xff,0xbb,0x6c,0x48,0x99,0xeb,0x63,0xa2,0x7e,0x61,0xf5,0x84,0xd4,0x90,0xeb,0x8b,0x6b,0x92,0x88,0xc2,0x39,0xf2,0xf0,0x35,0xd7,0xc3,0x5d,0x2d,0x65,0xbe,0x8a,0x7b,0xcd,0x46,0x6d,0x38,0xe1,0x99,0x49,0x22,0x73,0x89,0x8e,0x9a,0x2a,0xb5,0xea,0x91,0x8a,0x80,0x26,0x97,0x8a,0x6c,0x54,0x48,0x57,0x3d,0x49,0xa4,0x8d,0xea,0x5b,0x82,0x92,0x3,0xfc,0xe1,0xd1,0xde,0x7e,0x27,0xeb,0x26,0xbb,0xc4,0x5,0xf0,0xde,0xd1,0xc9,0xba,0x1c,0x1e,0xed,0xed,0x87,0x60,0xea,0xfe,0x15,0xac,0x16,0xe6,0xaf,0x1a,0x45,0x40,0xeb,0xec,0xdb,0xf8,0xbb,0x0,0xf5,0xc0,0x90,0x7a,0x2f,0x1b,0x25,0xac,0xe9,0xcb,0x0,0x75,0xc0,0x15,0x70,0xae,0x62,0x23,0xf2,0x4c,0x31,0x5f,0xc1,0xb8,0x75,0x73,0x75,0x5b,0x32,0xbd,0xd,0xe8,0x25,0xe3,0x7e,0xcf,0xc0,0x18,0x83,0xb5,0x36,0x19,0x48,0x6b,0x2d,0xc6,0x1a,0x80,0x41,0x58,0xf3,0xb2,0x4c,0x78,0xca,0xc3,0x87,0x7,0x83,0x93,0xe3,0x9d,0x5e,0x6f,0xed,0x95,0x1b,0xb9,0xca,0xb3,0x93,0x42,0x61,0x8c,0x61,0x30,0x38,0xde,0x1,0xe,0xc2,0x9a,0x79,0x99,0x4c,0xbb,0x4,0xf4,0x80,0xd,0xe0,0x25,0xb0,0x19,0x9e,0x97,0x29,0xb8,0x6b,0x2f,0xe1,0x38,0x12,0xd4,0x3d,0x8,0x20,0x77,0x81,0xc3,0xf0,0x7c,0x51,0x86,0xd1,0x1f,0xe1,0xf7,0x4f,0xe0,0x2b,0xe3,0xb6,0x63,0x97,0x29,0xdd,0xb5,0x92,0x32,0xc,0x36,0x79,0x16,0xc0,0x9d,0x84,0x35,0x4b,0x31,0xa,0xa1,0x71,0x7b,0x63,0xdc,0xe3,0xba,0x17,0x54,0x55,0x38,0x72,0xc1,0x26,0xf3,0x1b,0xc3,0xd1,0x4a,0x2b,0xd7,0xf2,0xb,0x3d,0xd,0xa0,0xd0,0x7a,0xcf,0xaf,0x5e,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x2a,0x0,0x0,0x0,0x46,0x8,0x3,0x0,0x0,0x0,0x8d,0x2b,0xf6,0x48,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x1,0x6e,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0xe8,0xe5,0xf1,0x0,0x0,0x0,0x0,0x0,0x0,0x1f,0x1d,0x22,0x0,0x0,0x0,0x1a,0x19,0x1c,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x1e,0x23,0x0,0x0,0x0,0x0,0x0,0x0,0x1f,0x1d,0x21,0x17,0x16,0x19,0x0,0x0,0x0,0x0,0x0,0x0,0x21,0x1f,0x24,0x1b,0x1a,0x1d,0x0,0x0,0x0,0x0,0x0,0x0,0x21,0x1f,0x24,0x1e,0x1c,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x22,0x20,0x25,0x20,0x1e,0x23,0x0,0x0,0x0,0x0,0x0,0x0,0x21,0x1f,0x24,0x0,0x0,0x0,0x21,0x1f,0x24,0x0,0x0,0x0,0x0,0x0,0x0,0x22,0x20,0x25,0x0,0x0,0x0,0x20,0x20,0x25,0x20,0x1d,0x25,0x20,0x1d,0x22,0x1d,0x1d,0x22,0x1d,0x1d,0x20,0x1d,0x1a,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x32,0x30,0x38,0xe8,0xe5,0xf1,0xe5,0xe2,0xeb,0xe3,0xe1,0xe8,0xe1,0xdf,0xe7,0xe0,0xde,0xe6,0xdf,0xdd,0xe5,0xde,0xdc,0xe4,0xdd,0xdb,0xe3,0xdc,0xda,0xe2,0xda,0xd8,0xe0,0xd9,0xd7,0xdf,0xd7,0xd6,0xdf,0xd6,0xd4,0xdd,0xd5,0xd3,0xdc,0xd4,0xd1,0xdb,0xd3,0xd0,0xda,0xd1,0xce,0xd8,0xd0,0xcd,0xd7,0xcf,0xcd,0xd7,0xe2,0xdf,0xeb,0x48,0x46,0x51,0x42,0x40,0x4b,0x40,0x3e,0x48,0x40,0x3d,0x48,0x48,0x45,0x50,0x42,0x3f,0x4a,0x3f,0x3d,0x48,0x47,0x44,0x50,0x41,0x3f,0x4a,0x3f,0x3d,0x47,0x41,0x3e,0x49,0x3f,0x3c,0x47,0x46,0x43,0x4f,0x3e,0x3c,0x46,0x40,0x3e,0x49,0x3d,0x3b,0x46,0x45,0x43,0x4e,0x3d,0x3b,0x45,0x44,0x42,0x4d,0x3d,0x3a,0x45,0x3e,0x3c,0x47,0x3c,0x3a,0x44,0x43,0x42,0x4c,0x43,0x40,0x4c,0x3e,0x3b,0x46,0x3b,0x39,0x43,0x43,0x3f,0x4c,0x43,0x3f,0x4b,0x3a,0x38,0x42,0x42,0x3e,0x4b,0x42,0x3e,0x49,0x3a,0x37,0x41,0x39,0x37,0x41,0x3f,0x3e,0x48,0x39,0x37,0x40,0x38,0x36,0x40,0x3e,0x3d,0x48,0x38,0x36,0x3f,0x3e,0x3d,0x47,0x3a,0x38,0x41,0x38,0x35,0x3f,0x37,0x35,0x3e,0x39,0x36,0x40,0x37,0x34,0x3e,0x3d,0x3a,0x46,0x36,0x34,0x3d,0x3d,0x3a,0x44,0x37,0x35,0x3f,0x35,0x33,0x3c,0x46,0x44,0x4f,0xff,0xff,0xff,0x7e,0xde,0x1d,0x81,0x0,0x0,0x0,0x33,0x74,0x52,0x4e,0x53,0x0,0xa2,0x3,0x9,0x17,0xc,0x20,0xf,0x2a,0x5e,0x12,0x30,0x68,0x46,0x20,0x4e,0xa2,0x7d,0x3a,0x4f,0xa4,0x7d,0x3f,0x25,0x60,0xc0,0xb8,0x57,0x1d,0xba,0x59,0xbd,0x5b,0x22,0xbf,0x5e,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xa1,0x9f,0x9e,0x52,0x92,0x15,0x44,0x7e,0xd8,0x5,0xc7,0xf4,0xac,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x79,0xa1,0xdc,0xd4,0xd0,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x1,0xe8,0x49,0x44,0x41,0x54,0x48,0xc7,0xd5,0xd6,0xd9,0x53,0xd3,0x60,0x14,0xc6,0xe1,0x92,0x5a,0xa3,0x44,0xa3,0xd6,0x85,0xa0,0xb1,0x5a,0xcb,0xda,0xbd,0x7c,0xb8,0xef,0x2b,0x69,0x21,0xd0,0xda,0x22,0x25,0xd,0x69,0x20,0x60,0x69,0x11,0x2a,0x22,0xcb,0x9f,0xef,0x78,0x97,0x7e,0xe7,0x3d,0x33,0x1d,0xbd,0x70,0xfc,0x5d,0x3f,0x77,0xe7,0xe2,0x3d,0x91,0xc8,0x7f,0xd8,0x88,0x60,0x1a,0x21,0x54,0xcc,0x3f,0x84,0xcd,0xb,0x4a,0x1f,0x31,0xfd,0x1d,0x7d,0xcc,0x4,0xe8,0x13,0x26,0x40,0x9f,0x32,0x1,0xfa,0x8c,0x9,0xd0,0xe7,0x4c,0x80,0xbe,0x60,0x2,0xf4,0x25,0x13,0xa0,0xaf,0x98,0x0,0x7d,0xcd,0x44,0xa8,0x22,0xde,0x30,0x49,0x54,0x89,0x9e,0x13,0x6f,0x99,0x64,0x1a,0x3b,0x2f,0xde,0x31,0x49,0x54,0xbd,0x70,0x51,0xbc,0x67,0x92,0xe8,0xa8,0x76,0x49,0x7c,0x60,0x12,0x97,0xf5,0x68,0x88,0xea,0x57,0xae,0x8a,0x8f,0x4c,0xe2,0x5a,0x7c,0x34,0x4c,0xaf,0xdf,0x10,0x9f,0x98,0xc4,0xcd,0x5b,0x21,0xaa,0x8c,0x19,0xe3,0xb,0x56,0x19,0x66,0x2d,0xdc,0xbe,0x63,0x2a,0x43,0xd2,0xbb,0x9,0x7d,0x58,0x7a,0xef,0x7e,0x72,0x58,0xfa,0x20,0x35,0x36,0x2c,0x1d,0x37,0x8,0xad,0xc0,0x0,0x5d,0x5c,0xb2,0x61,0x4b,0x8b,0x32,0x9d,0x58,0x5e,0xa9,0xc2,0x56,0x96,0x27,0x8,0xad,0x7d,0x86,0xd5,0x28,0xad,0xd7,0x1a,0xb0,0x5a,0x9d,0xd2,0x55,0x4c,0x57,0x1,0xad,0x7c,0x81,0x55,0x8,0x9d,0x5c,0xb3,0x9b,0x30,0x7b,0x6d,0x52,0xa2,0x53,0xeb,0x55,0x7,0x56,0x5d,0x9f,0x22,0xb4,0xe5,0xc2,0x5a,0x94,0x6e,0x34,0x30,0x6d,0x6c,0x10,0xea,0xb5,0x7d,0x58,0xdb,0x93,0xe9,0xf4,0x66,0x13,0xd3,0xe6,0xe6,0xb4,0x4c,0xb7,0x9c,0x0,0xe6,0x6c,0x11,0xba,0xed,0x62,0xea,0x6e,0x13,0xba,0xe3,0x7e,0x85,0xb9,0x3b,0x84,0x96,0xfd,0xe,0xcc,0x2f,0x13,0xba,0xeb,0x77,0x61,0xfe,0x2e,0xa1,0x76,0xd0,0x83,0x5,0x36,0xa1,0x7b,0xc1,0x37,0x58,0xb0,0x27,0xd3,0x99,0xfd,0x83,0x3e,0xec,0x60,0x7f,0x46,0xa2,0xb3,0xad,0xce,0x77,0x58,0xa7,0x35,0x2b,0xd3,0xf6,0x21,0xa6,0x87,0x6d,0x40,0x7f,0xc0,0x0,0x3d,0xea,0xfd,0x84,0xf5,0x8e,0x8,0x75,0xfa,0x98,0xf6,0x1d,0x42,0x8f,0x39,0x7a,0x4c,0xe9,0xc9,0x29,0xec,0x64,0x90,0x46,0x92,0xa9,0xb4,0x75,0xca,0x64,0xa5,0x53,0xc9,0xc8,0x1f,0xd2,0xc,0x4f,0x33,0x3,0x54,0x4f,0x64,0x79,0x9a,0x4d,0xe8,0x21,0x6a,0xe6,0xf2,0x1e,0x47,0xbd,0x7c,0xce,0xc,0xd1,0x42,0xb1,0x54,0xef,0x62,0xd9,0x3d,0x2b,0x15,0xb,0x21,0xaa,0x6a,0xc6,0xdc,0x99,0x67,0x81,0xbc,0xfa,0x9c,0xa1,0xa9,0x21,0x1a,0x35,0xe3,0x46,0x29,0x9f,0xcd,0xa4,0xa5,0x32,0xd9,0x7c,0xc9,0x88,0x9b,0xe1,0xe1,0x54,0x62,0xa6,0x56,0xcc,0x25,0x52,0xa4,0x44,0xae,0xa8,0x99,0xb1,0xd0,0x5,0x7e,0x3f,0x4,0x6a,0xc1,0xd4,0x93,0x24,0xdd,0x2c,0xa8,0xd1,0x1,0xf9,0xf,0xfb,0x5,0x66,0x6f,0x2a,0x9a,0xa8,0x51,0x81,0xce,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char progress_bar_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x27,0x0,0x27,0x0,0x27,0x12,0xaa,0xad,0x65,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x11,0x16,0x16,0x1b,0x8f,0x3,0x26,0x8d,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0xba,0x49,0x44,0x41,0x54,0x38,0x8d,0xed,0xd3,0x3b,0x4e,0x3,0x41,0x10,0x84,0xe1,0x6f,0x4c,0x4b,0x1e,0xaf,0x36,0x20,0xde,0x11,0x9c,0x80,0xc7,0xd9,0x38,0x9,0x67,0x33,0x76,0x4c,0x82,0xd6,0x31,0x1,0x82,0xb1,0x34,0xc8,0x4,0x6c,0xbc,0x6b,0xc9,0x9,0x1,0x1d,0xb6,0xba,0xfe,0x52,0x4b,0x55,0x9,0x1d,0xae,0xd1,0xe3,0xa,0xc9,0xfc,0x9c,0xf0,0x8d,0xf,0xbc,0xc7,0x24,0x7e,0xc0,0xd,0xf2,0x99,0x80,0x8a,0x37,0xbc,0xc4,0xe4,0x7c,0x7b,0x7f,0xf7,0xf8,0x5c,0x86,0xb2,0x89,0x88,0x59,0x40,0x6b,0xed,0x34,0x1e,0xc6,0xaf,0xdd,0x7e,0xfb,0x84,0xd7,0x40,0x60,0x5d,0x86,0xd2,0xd5,0x5a,0xd5,0x5a,0x67,0xed,0x73,0xce,0xa9,0xc,0xa5,0xdb,0xed,0xb7,0x6b,0xc4,0x6a,0xda,0xa7,0x88,0x58,0x14,0x43,0xad,0x55,0x44,0x30,0xbd,0xba,0x9a,0x3f,0x5f,0x9e,0x7f,0xc0,0x5f,0x2,0x9c,0x5a,0x6b,0x72,0xce,0x8b,0x82,0x9c,0xb3,0xd6,0x1a,0xbf,0x91,0x16,0x68,0x38,0x8e,0x87,0xf1,0xb3,0xc,0x65,0xd3,0xf7,0xfd,0x59,0x51,0xc6,0x11,0x2d,0x61,0x70,0x41,0x99,0x92,0xb,0xeb,0xfc,0x3,0x18,0xa7,0x44,0x3f,0xdc,0xad,0xd9,0x96,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x33,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2d,0x2c,0x2f,0x48,0x46,0x4a,0x4c,0x4a,0x4e,0x48,0x46,0x4a,0x40,0x3e,0x42,0x38,0x36,0x3a,0x27,0x27,0x27,0xe1,0x1d,0x66,0x4d,0x0,0x0,0x0,0xc,0x74,0x52,0x4e,0x53,0xa,0x1a,0x26,0x29,0x2a,0x48,0x65,0x6d,0x6e,0x66,0xf5,0xfe,0xb7,0x4a,0xbe,0x33,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x10,0x95,0xb2,0xd,0x2c,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x44,0x49,0x44,0x41,0x54,0x18,0xd3,0xc5,0xcf,0x31,0x16,0x0,0x10,0xc,0x44,0xc1,0x4d,0x84,0x4,0xc1,0xfd,0x6f,0xab,0xc9,0x53,0x70,0x0,0x53,0x6e,0xb5,0x1f,0x20,0x4e,0x12,0x12,0x13,0x40,0xb9,0xa8,0x5,0x2d,0x99,0xc0,0xb5,0x75,0xf,0xbd,0x55,0x86,0xe8,0x98,0x2b,0xcc,0xa1,0x2,0x31,0x5f,0x87,0xdb,0xbf,0xe1,0x3e,0xf6,0x5c,0x7f,0xe2,0xee,0xfc,0xd,0x60,0x3b,0xa,0x1d,0x9e,0x6a,0x29,0x33,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char progress_fill_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x26,0x0,0x26,0x0,0x26,0x59,0xf,0xde,0x74,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x14,0x15,0x1e,0x28,0xcd,0x92,0x83,0xf8,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x82,0x49,0x44,0x41,0x54,0x38,0x8d,0xed,0xd0,0x21,0xe,0xc3,0x30,0xc,0x5,0xd0,0xbf,0xc9,0x2c,0x3f,0xb4,0xbd,0xca,0x60,0x6e,0xd0,0xb3,0xe6,0x6,0x81,0x3b,0x4b,0x59,0x64,0x87,0x39,0xd2,0xc8,0x40,0xe7,0x4a,0x93,0xc6,0x6,0xfa,0xe1,0xb3,0xfd,0x81,0x81,0x2b,0xb7,0x8,0xa5,0x94,0x87,0xaa,0x56,0x33,0x5b,0x8e,0x4e,0x72,0xcf,0x39,0x6f,0xad,0xb5,0xe7,0xd1,0x25,0x16,0xa8,0x6a,0xed,0xbd,0x27,0x77,0xff,0xf0,0x39,0x67,0x2,0x50,0x1,0xac,0x5f,0xb,0xcc,0x6c,0x89,0xc7,0x0,0xe0,0xee,0xc9,0xcc,0x52,0xf4,0xfb,0x69,0xf3,0xc7,0xfc,0x61,0x1,0xc9,0x5d,0x44,0x46,0x74,0x11,0x19,0x24,0xf7,0x93,0x47,0xc8,0x39,0x6f,0x0,0x6a,0x7c,0x18,0xc9,0xf1,0x9e,0x5d,0x9,0x79,0x1,0x2e,0x56,0x2e,0xc3,0x70,0xd9,0xde,0xde,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x4,0x0,0x0,0x0,0xb5,0xfa,0x37,0xea,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0x26,0x78,0x80,0xa6,0xcf,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x0,0x60,0x49,0x44,0x41,0x54,0x28,0xcf,0x63,0x60,0x18,0x78,0xc0,0x8,0x63,0x38,0x58,0x7c,0xde,0xf8,0x45,0xc,0xc2,0xe6,0x79,0xc5,0xeb,0x7f,0xe0,0x4,0x9a,0x2,0xe3,0x97,0x1f,0xb9,0xff,0x70,0x43,0xd8,0x2c,0x5f,0xf9,0xbf,0x9e,0x15,0x87,0xb2,0x61,0xa,0xbe,0x88,0xfd,0x81,0x1b,0xfb,0x87,0xfb,0xb,0x37,0x8c,0xcd,0x44,0xc8,0xd,0x54,0x54,0xc0,0xf3,0x8a,0xe5,0x2b,0x8c,0xcd,0xf2,0x95,0xe7,0x15,0x86,0x2,0x5e,0x7f,0xfe,0xaf,0xec,0xc,0x10,0xc8,0xff,0x95,0xd7,0x9f,0xe6,0x1,0x4c,0x2,0x0,0x0,0x68,0x3f,0x16,0xd7,0xea,0x7c,0xdd,0x1a,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char radio_checked_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0x3,0x1,0x4,0x19,0x36,0x83,0x13,0x8d,0xb2,0x0,0x0,0x0,0x1d,0x69,0x54,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x0,0x0,0x0,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x64,0x2e,0x65,0x7,0x0,0x0,0x1,0x9d,0x49,0x44,0x41,0x54,0x38,0xcb,0xad,0x93,0x31,0x6b,0xdb,0x50,0x14,0x85,0x3f,0x59,0x8a,0x21,0xbb,0x17,0xd1,0x37,0xa4,0xa4,0xb5,0x10,0xb5,0x3,0xfa,0x7,0x5d,0x3a,0x74,0xf2,0x56,0x39,0x64,0x4d,0x97,0x42,0x9b,0xce,0x6d,0x7e,0x44,0xe3,0x8e,0xf5,0x60,0x4,0xc5,0x22,0x9b,0x27,0x63,0xe8,0xea,0xc5,0x43,0x4d,0x48,0x40,0x7a,0xe9,0xd0,0xe0,0xd4,0x68,0x32,0x18,0x3c,0x8,0x64,0xc3,0xed,0x50,0x59,0x34,0x71,0xa7,0x3a,0x7,0xde,0x72,0xef,0x79,0x87,0x7b,0xde,0x3d,0xf,0xb6,0x84,0x71,0xbf,0xe0,0x38,0xce,0x23,0xe0,0x2d,0xf0,0x12,0xa8,0xe6,0xe5,0x6b,0xa0,0xf,0x7c,0xd6,0x5a,0x4f,0xff,0x29,0x60,0x99,0x16,0xfb,0x4f,0xf6,0x8f,0x81,0x56,0xb3,0x79,0xb4,0x7b,0x78,0xf8,0xa,0xc3,0xf8,0xd3,0x16,0x11,0xba,0xdd,0x73,0xc2,0xf0,0x6b,0xa,0xbc,0x9b,0x4c,0x26,0xed,0x34,0x4d,0xef,0xa,0x38,0x8e,0x73,0xbc,0xb7,0xf7,0xf8,0xcb,0xd9,0xd9,0xa7,0xe2,0xe2,0x7d,0x88,0x8,0x27,0x27,0xef,0xb9,0xb9,0xf9,0xf9,0x5a,0x6b,0xdd,0x2e,0x4,0xf2,0xb1,0x7f,0xf4,0x7a,0xbd,0x5d,0xc3,0x30,0xc8,0xb2,0x8c,0xf1,0x78,0x4c,0x14,0x45,0x0,0xb8,0xae,0x8b,0xe7,0x79,0x94,0xcb,0x65,0x44,0x84,0x46,0xa3,0x91,0x2,0x4f,0xb5,0xd6,0x53,0x13,0xa0,0x52,0xa9,0x7c,0x6c,0x36,0x8f,0x9e,0x1f,0x1c,0xd4,0xc8,0xb2,0x8c,0x4e,0xa7,0x43,0xab,0xd5,0x62,0x30,0x18,0x30,0x1c,0xe,0x19,0x8d,0x46,0xac,0x56,0x2b,0xea,0xf5,0x3a,0x96,0x65,0x21,0x52,0xda,0xb9,0xba,0xba,0x5c,0xce,0x66,0xb3,0x6f,0xeb,0xf1,0x2f,0xe2,0x38,0x16,0xad,0xb5,0x4,0x41,0x20,0x4a,0x29,0x1,0xee,0x1c,0xa5,0x94,0x4,0x41,0x20,0x5a,0x6b,0x89,0xe3,0x58,0x1c,0xc7,0xb9,0x0,0x28,0xe5,0xf6,0xaa,0x6b,0xdf,0x51,0x14,0x91,0x24,0xc9,0x86,0xff,0x24,0x49,0xa,0x4b,0x39,0xb7,0xfa,0xb7,0xc0,0x7f,0x63,0x2d,0x70,0x2d,0x22,0xc5,0x83,0xd9,0xb6,0xbd,0x41,0xb4,0x6d,0x1b,0xd7,0x75,0x8b,0x6d,0xe4,0xd9,0x28,0x4,0xfa,0xdd,0xee,0x39,0x0,0x9e,0xe7,0xe1,0xfb,0x3e,0x4a,0x29,0x4c,0xd3,0xc4,0x34,0x4d,0x94,0x52,0xf8,0xbe,0x8f,0xe7,0x79,0x0,0xe4,0xdc,0xfe,0x83,0xac,0x71,0xeb,0x20,0x99,0xeb,0xe6,0x62,0xb1,0xf8,0x6e,0x18,0x4c,0xc3,0x30,0x7c,0x21,0x52,0xda,0xa9,0xd5,0x9e,0x6d,0x44,0xf9,0xf4,0xf4,0x43,0x3a,0x9f,0xcf,0xdf,0xdc,0xde,0xfe,0x6a,0x2f,0x97,0xcb,0x87,0xf9,0x4c,0x5b,0xe3,0x37,0x57,0xdf,0xd7,0x8,0xe6,0x62,0x7d,0xab,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x45,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x4,0x3,0x4,0x9,0x9,0x9,0x6,0x6,0x6,0xa,0xa,0xb,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x7f,0x7f,0x82,0xd8,0xd8,0xd8,0xd9,0xd9,0xd9,0x47,0x47,0x48,0xd3,0xd3,0xd3,0xa2,0xa2,0xa2,0x79,0x79,0x79,0x73,0x73,0x73,0x1c,0x1c,0x1c,0x3,0x3,0x3,0x0,0x0,0x0,0xff,0xff,0xff,0xa,0x69,0x4,0xd4,0x0,0x0,0x0,0xb,0x74,0x52,0x4e,0x53,0x0,0x0,0x0,0x0,0x0,0x1b,0x88,0xd1,0xf7,0x64,0xf6,0x2,0xb3,0xed,0xd7,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x16,0x7c,0xd1,0xa8,0x19,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x69,0x49,0x44,0x41,0x54,0x18,0xd3,0x6d,0x8f,0xdb,0xe,0xc0,0x20,0x8,0x43,0xdd,0xc5,0x3b,0x9d,0xa8,0xec,0xff,0x7f,0x75,0x6a,0x96,0x2c,0x8b,0xf6,0xad,0x27,0x14,0x8a,0x52,0x2b,0x69,0x63,0x9d,0xb3,0x46,0xbf,0x76,0xf3,0x21,0x12,0x40,0x31,0xf8,0x7d,0x0,0x7f,0x35,0xdb,0x45,0x97,0x1f,0xf3,0x81,0x90,0x38,0x67,0x4e,0xa0,0xd0,0x53,0x26,0x22,0x95,0x2a,0x52,0x4b,0x42,0x34,0xd,0x58,0x2,0xd7,0xbb,0xa9,0x32,0xc8,0x36,0xe0,0x80,0x2c,0x1d,0x48,0x6,0xdc,0xa,0x4c,0x91,0x69,0xe9,0x74,0x76,0x2a,0xa6,0x8e,0xaf,0xfa,0xb9,0x7e,0xee,0xaf,0x7,0xb9,0xfb,0x8,0xe7,0x90,0x1c,0x65,0x49,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char radio_unchecked_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0x3,0x1,0x4,0x1b,0x6,0x97,0xfc,0xdf,0x9c,0x0,0x0,0x0,0x1d,0x69,0x54,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x0,0x0,0x0,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x64,0x2e,0x65,0x7,0x0,0x0,0x1,0x9,0x49,0x44,0x41,0x54,0x38,0xcb,0xad,0x93,0xbd,0x72,0x82,0x40,0x14,0x85,0xf,0x68,0xa,0x9e,0x21,0x8d,0x8e,0x9,0xdb,0xc4,0xc7,0x48,0x41,0x43,0x2b,0xa3,0xad,0x69,0x32,0xc3,0xda,0xc7,0xa7,0x8,0x94,0xa1,0xd,0x68,0x4b,0xc3,0x5b,0xd8,0x5f,0x2d,0xe2,0x60,0xe8,0x99,0xa1,0xd8,0x82,0xc2,0x34,0x17,0x67,0x35,0x19,0x43,0x34,0xa7,0xbc,0x7b,0xee,0x37,0xf7,0x6f,0x81,0x2b,0x65,0x9c,0x6,0x84,0x10,0xb7,0x0,0x7c,0x0,0xe,0x0,0x9b,0xc3,0x6b,0x0,0x19,0x80,0x90,0x88,0x8a,0x1f,0x1,0xdd,0x4e,0x17,0x83,0xbb,0xc1,0x14,0x40,0xe0,0x79,0x13,0x6b,0x3c,0x1e,0x1d,0x81,0xe3,0x78,0x89,0xc5,0xe2,0x5d,0x1,0x90,0x79,0x9e,0x47,0x4a,0xa9,0x63,0x80,0x10,0x62,0xda,0xeb,0xf5,0xdf,0x82,0xe0,0xf5,0x6c,0xc9,0x52,0xce,0xb0,0xdd,0x7e,0x3c,0x11,0x51,0x74,0x0,0x70,0xd9,0x9b,0x34,0x4d,0xad,0x36,0x7d,0xbb,0xae,0xab,0x0,0xdc,0x13,0x51,0x61,0x72,0xcc,0xf7,0xbc,0x89,0xd5,0x76,0x70,0xec,0xf5,0x1,0xa0,0x1,0x38,0xa7,0x3d,0x9f,0x13,0x7b,0x1d,0x1d,0x60,0x5f,0xb0,0x41,0x5b,0x7,0x5c,0x2c,0x53,0xdb,0xf3,0x5f,0xb5,0xd6,0x1,0x59,0x1c,0x2f,0x5b,0x67,0xb2,0x37,0xd3,0x1,0x21,0x1f,0x49,0x2b,0xb1,0x37,0x3c,0x0,0xf8,0x3c,0xa5,0x94,0xb3,0x5f,0x93,0xd9,0x23,0x9b,0x93,0xee,0x34,0xf,0x55,0x55,0xad,0xc,0x3,0x45,0x92,0x24,0x8f,0xfb,0xbd,0x79,0x33,0x1c,0x3e,0x7c,0x2b,0x7b,0x3e,0x7f,0x51,0x65,0x59,0x3e,0xef,0x76,0x9f,0x51,0x5d,0xd7,0xff,0xf3,0x99,0xae,0xd6,0x17,0xf,0x97,0x66,0x8b,0x3d,0xf1,0x64,0x47,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x4,0x3,0x0,0x0,0x0,0xed,0xdd,0xe2,0x52,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2d,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x4,0x3,0x4,0x9,0x9,0x9,0x6,0x6,0x6,0xa,0xa,0xb,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x27,0x7f,0x7f,0x82,0xd9,0xd9,0xd9,0x47,0x47,0x48,0xff,0xff,0xff,0xbd,0x7d,0x89,0x66,0x0,0x0,0x0,0xb,0x74,0x52,0x4e,0x53,0x0,0x0,0x0,0x0,0x0,0x1b,0x88,0xd1,0xf7,0x64,0xf6,0x2,0xb3,0xed,0xd7,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0xe,0x6f,0xbd,0x30,0x4f,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x4a,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x40,0x80,0xb0,0x8a,0xf6,0x54,0x10,0x2d,0xb9,0xfa,0xcc,0x99,0x5d,0x93,0x80,0x8c,0xb9,0x67,0x80,0xe0,0x26,0x3,0x3,0xeb,0x1a,0x10,0xe3,0x54,0x0,0x3,0xdb,0x1e,0x10,0xe3,0x74,0x2,0x3,0xfb,0x19,0x30,0x28,0x60,0xe0,0x80,0x30,0x1a,0x10,0xc,0xb8,0x14,0x5c,0x31,0x5c,0x3b,0xdc,0x40,0x6,0x4b,0x90,0x15,0x53,0x90,0x2d,0x85,0x2,0x0,0x37,0xca,0x3d,0x81,0xc4,0xfc,0x38,0x7b,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char reference_border_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdb,0x7,0x9,0x11,0x2b,0x1a,0xed,0xf3,0x18,0x82,0x0,0x0,0x0,0x5b,0x49,0x44,0x41,0x54,0x38,0xcb,0x63,0xfc,0xbf,0x7d,0xfb,0x7f,0x6,0x6,0x6,0x6,0x86,0xae,0x2e,0x6,0x92,0x40,0x59,0x19,0x84,0x86,0x1b,0x40,0x6,0xf8,0xbf,0x7d,0xfb,0x7f,0xc6,0xff,0x8e,0x8e,0xff,0x19,0xf7,0xef,0x67,0xfc,0x7f,0xf1,0x22,0x49,0x9a,0x19,0xf5,0xf5,0x19,0xfe,0x3b,0x3a,0xfe,0x67,0x41,0x17,0x24,0xca,0x66,0x24,0xcb,0x98,0x18,0x28,0x4,0xa3,0x6,0x8c,0x1a,0xc0,0xc0,0xc0,0xc0,0xc0,0x82,0x2b,0x85,0x91,0x94,0x21,0x28,0xcb,0x4c,0x14,0x66,0x67,0x0,0x0,0x2b,0x27,0xc7,0x5e,0xa8,0x15,0xe4,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x4,0x3,0x0,0x0,0x0,0xed,0xdd,0xe2,0x52,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0xf,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0xff,0xd1,0xd1,0xff,0xb7,0xb7,0xff,0x41,0x41,0xff,0xff,0xff,0xd5,0xfa,0x24,0x40,0x0,0x0,0x0,0x2,0x74,0x52,0x4e,0x53,0x0,0x0,0x76,0x93,0xcd,0x38,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x4,0x8f,0x68,0xd9,0x51,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x27,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x50,0x32,0x6,0x3,0x25,0x6,0x5,0x6,0x30,0x60,0x62,0x30,0x10,0x4,0x3,0x66,0x6,0x3,0x1,0x90,0x0,0x23,0x2d,0x18,0x30,0x2b,0xe0,0x96,0xc2,0x9c,0x1,0x0,0x5,0x29,0x7,0xb,0xf6,0x43,0xc2,0xd4,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char scroll_bg_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x8,0x6,0x0,0x0,0x0,0x56,0x75,0x5c,0xe7,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x15,0x25,0x28,0x6d,0xad,0xf4,0x10,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x3c,0x49,0x44,0x41,0x54,0x28,0xcf,0x95,0x92,0x31,0x6e,0x13,0x61,0x10,0x46,0xdf,0xcc,0x44,0xd8,0xff,0x2e,0xb,0x34,0xb,0x92,0x23,0x4b,0x14,0xc8,0x5b,0xa5,0xe2,0x18,0x88,0x3,0x20,0x25,0x7,0x40,0xb4,0xb9,0x49,0x44,0x4d,0x81,0x14,0xe,0x80,0x38,0x6,0x7,0x20,0xa1,0x0,0x59,0xa4,0x60,0x85,0x8,0x59,0xbc,0xb,0xb6,0xff,0x19,0x8a,0xc5,0xd,0x28,0x45,0x9e,0xf4,0x15,0xdf,0xa7,0x27,0x4d,0x33,0x2,0xf0,0xf4,0xc9,0xb3,0x3d,0xa0,0x6,0x1a,0x60,0xe,0x24,0x46,0x6,0x60,0x9,0x7c,0x0,0xda,0xb7,0xef,0xde,0x6c,0xe5,0xaf,0xfc,0xa8,0xeb,0x7e,0xbc,0xf8,0xda,0x7e,0x39,0xea,0x87,0xd5,0x6d,0xf7,0x30,0x0,0x55,0xc9,0x45,0x2a,0x7f,0xde,0xaf,0xf7,0x5f,0x57,0xd5,0xdd,0x97,0xc0,0x47,0x6b,0x16,0x7,0xf,0xae,0xba,0xcb,0xe3,0x4f,0x9f,0xcf,0x9f,0x6f,0xb7,0xdb,0xa4,0x6a,0x6a,0xa6,0x98,0x29,0x22,0xaa,0xeb,0xcd,0x7a,0xfa,0xfd,0xf2,0xdb,0xe3,0x94,0x4a,0x9d,0x4c,0xa6,0xef,0x15,0x68,0xda,0xf6,0xe2,0x50,0x44,0xcc,0xcc,0x30,0x33,0x54,0xc7,0xec,0xba,0x88,0x58,0xdb,0x5e,0x1c,0x2,0xcd,0x1e,0x30,0xef,0x87,0x55,0x35,0x4a,0xca,0xbf,0xa8,0x2a,0x11,0x41,0x3f,0xac,0x2a,0x60,0xae,0x40,0xe1,0x1e,0x2a,0xc2,0xb5,0x88,0x80,0x7b,0x28,0x50,0x28,0x37,0x44,0x81,0x5e,0x55,0x3c,0xe2,0x7a,0x29,0x2,0x54,0xc5,0x81,0x5e,0x81,0x65,0x91,0xca,0xce,0xdd,0x71,0xf7,0xff,0xe4,0xdd,0x5e,0xa4,0xb2,0x3,0x96,0xa,0x9c,0xd5,0xf5,0xec,0x34,0x22,0x72,0xce,0x99,0x9c,0x33,0xee,0x63,0x76,0x3d,0x22,0x72,0x5d,0xcf,0x4e,0x81,0x33,0x6b,0x16,0x7,0xc3,0x64,0x32,0x3d,0x4f,0xa9,0xb4,0xcd,0xfa,0xd7,0x62,0xbd,0xf9,0x7d,0x2b,0x67,0x97,0xf1,0x5a,0x78,0x91,0xca,0xab,0xfd,0xd9,0xc3,0x57,0x77,0xaa,0x7b,0x27,0xc0,0x52,0x6e,0xfa,0x1a,0x7f,0x0,0x2,0xd3,0x92,0x1e,0xd2,0x75,0x7c,0x7f,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x8,0x3,0x0,0x0,0x0,0x61,0xab,0xac,0xd5,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x48,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x40,0x3e,0x4a,0x2a,0x29,0x2f,0x20,0x20,0x24,0x3f,0x3e,0x49,0x1f,0x1f,0x24,0x20,0x20,0x24,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x3f,0x3e,0x49,0x3f,0x3e,0x49,0x1e,0x1e,0x23,0x20,0x20,0x25,0x22,0x22,0x27,0x23,0x23,0x27,0x23,0x23,0x28,0x25,0x25,0x2a,0xff,0xff,0xff,0x34,0x3f,0xa6,0x65,0x0,0x0,0x0,0x11,0x74,0x52,0x4e,0x53,0x0,0x4,0x19,0x40,0x5d,0x66,0x28,0x93,0xf0,0xfc,0x94,0xfc,0xfd,0x67,0x1a,0x96,0x95,0x1c,0xf0,0x43,0x52,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x17,0xb,0xd6,0x98,0x8f,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x5c,0x49,0x44,0x41,0x54,0x8,0xd7,0x55,0x8e,0x49,0xe,0xc0,0x20,0xc,0x3,0x3,0x61,0x9,0x3b,0x61,0xfb,0xff,0x53,0x4b,0x5b,0x55,0x15,0x73,0x1b,0xc9,0xb2,0xd,0x20,0x24,0x2a,0xad,0x15,0x4a,0x1,0x20,0x8c,0x25,0xc7,0xec,0xc8,0x1a,0x1,0xd2,0x87,0xd6,0xc7,0xe8,0x2d,0x78,0x9,0x48,0x6d,0xae,0xcd,0x6c,0x84,0xa0,0x62,0x5f,0xf,0x3d,0x2a,0x48,0x3c,0x5e,0x19,0x9c,0x4e,0x39,0x62,0x47,0x41,0x2e,0x5f,0x75,0xc9,0x7b,0xb4,0x52,0x64,0x8e,0x54,0xcd,0x7d,0xe1,0xbf,0x73,0x1,0x30,0x2f,0x7,0x53,0x16,0x34,0xbd,0xfa,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char scroll_button_down_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x59,0x0,0x59,0x0,0x59,0xbd,0x9a,0xea,0xaa,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x11,0x13,0x19,0x1f,0x9,0x3d,0x3c,0xb0,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0xa3,0x49,0x44,0x41,0x54,0x38,0x8d,0xcd,0x93,0x31,0xa,0x2,0x31,0x10,0x45,0x7f,0xc2,0x14,0x3,0x6,0xab,0xad,0x32,0x57,0x50,0xbc,0x87,0x88,0x97,0x11,0xf1,0xc,0x22,0x1e,0x33,0x5b,0xa5,0xb1,0x59,0xa7,0x18,0x58,0x5b,0x89,0x9b,0x95,0x88,0xa0,0xbf,0x4c,0xfe,0xfb,0xf9,0x3,0x13,0xb7,0x5e,0x6d,0x58,0xa2,0xc,0x44,0xe4,0xd0,0x20,0x33,0x1b,0x53,0x9f,0x16,0x24,0x51,0xee,0xaa,0xa,0x55,0x6d,0xe1,0xc1,0xcc,0x4e,0xa2,0xc,0x9e,0x88,0x9a,0x61,0x0,0x50,0x55,0x10,0x11,0x7c,0x33,0x59,0xe8,0xf7,0x1,0x54,0x1e,0x5c,0xae,0xe7,0x59,0xe0,0x78,0x38,0x7d,0xb7,0xc1,0x4b,0x40,0xf9,0xc2,0xbb,0xbb,0xc9,0x6,0x53,0xc6,0x5a,0x70,0x75,0x84,0x67,0x60,0xae,0x95,0xdb,0x6d,0xf7,0x63,0xce,0xb9,0x6a,0x98,0x53,0xd7,0x75,0x7f,0xb0,0x7,0xde,0xcc,0xc0,0xcc,0xcd,0x20,0x33,0xc3,0xcc,0x40,0xa9,0x4f,0x4b,0x89,0x72,0xb,0x21,0x7c,0xf2,0x9d,0xe5,0x1,0xd1,0x91,0x38,0x2b,0x1d,0x55,0xcb,0xf6,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x4,0x3,0x0,0x0,0x0,0xed,0xdd,0xe2,0x52,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x21,0x50,0x4c,0x54,0x45,0x2d,0x2c,0x2f,0x48,0x46,0x4a,0x2d,0x2c,0x2f,0x2d,0x2c,0x2f,0x2d,0x2c,0x2f,0x4c,0x4a,0x4e,0x48,0x46,0x4a,0x40,0x3e,0x42,0x38,0x36,0x3a,0xc3,0xc3,0xc3,0x59,0x59,0x59,0xb3,0x52,0xf2,0x5,0x0,0x0,0x0,0x5,0x74,0x52,0x4e,0x53,0x8,0xfe,0x9,0xd,0x19,0x4a,0xb6,0xc1,0xe6,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0xa,0x68,0xd0,0xf4,0x56,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x0,0x33,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0xc,0x5,0x3,0x21,0x86,0xf4,0xe,0x30,0x28,0x63,0x88,0x80,0x30,0x5a,0xf1,0x33,0x66,0x2,0x1,0x2a,0xa3,0x73,0xe6,0xcc,0x19,0x10,0x35,0x40,0x1,0x8,0xa3,0x73,0x6,0x1,0x73,0xe0,0x96,0x1a,0x42,0x9c,0x21,0x2,0x0,0x5a,0xfa,0x3d,0xf9,0xfa,0xe2,0x64,0xe2,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char scroll_button_down_hl_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x59,0x0,0x59,0x0,0x59,0xbd,0x9a,0xea,0xaa,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x11,0x13,0x1a,0x0,0xaf,0x18,0x62,0x86,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x9c,0x49,0x44,0x41,0x54,0x38,0x8d,0xc5,0x93,0x41,0xa,0x2,0x31,0xc,0x45,0x7f,0x87,0x6,0x21,0x5,0xe7,0x6,0x2e,0x9a,0x63,0x88,0x78,0x30,0x11,0x4,0xf1,0x98,0x9d,0x4b,0x48,0xa3,0x90,0x85,0x6e,0xb5,0xce,0x8c,0xad,0xa,0xfe,0x65,0xd2,0xf7,0xf3,0x53,0x88,0xdb,0xac,0xb7,0xb,0x89,0x72,0x21,0x22,0x87,0x6,0x99,0xd9,0x2d,0xd,0x69,0xe9,0x25,0xca,0x55,0x55,0x91,0x55,0x5b,0x78,0x4,0x66,0x27,0x51,0xce,0x1d,0x11,0x35,0xc3,0x0,0x90,0x55,0x41,0x44,0xe8,0x9a,0xc9,0x42,0xff,0x37,0xf0,0x65,0xe1,0x78,0x3a,0xcc,0x2,0xfb,0xdd,0x73,0xff,0xf7,0x2b,0x94,0x13,0xde,0xf5,0x46,0x13,0x8c,0x3d,0x9c,0x32,0x9e,0x5c,0xe1,0x11,0x98,0x4b,0xf5,0xf2,0x89,0x35,0x53,0xab,0x12,0xd4,0xea,0x7b,0x3,0x33,0x43,0x60,0x6e,0x6,0x3,0x33,0xcc,0xc,0x3e,0xd,0x89,0x25,0x4a,0xee,0xfb,0xfe,0x93,0x73,0x5e,0xdd,0x1,0xb6,0x6d,0x35,0xa4,0xf0,0x42,0xdf,0x17,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x4,0x3,0x0,0x0,0x0,0xed,0xdd,0xe2,0x52,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x21,0x50,0x4c,0x54,0x45,0x3d,0x3b,0x3f,0x60,0x5d,0x62,0x3d,0x3b,0x3f,0x3d,0x3b,0x3f,0x3d,0x3b,0x3f,0x65,0x62,0x67,0x60,0x5d,0x62,0x56,0x53,0x58,0x4b,0x49,0x4e,0xce,0xce,0xce,0x59,0x59,0x59,0xb8,0xf5,0x6d,0x48,0x0,0x0,0x0,0x5,0x74,0x52,0x4e,0x53,0x7,0xfe,0xc,0x9,0x1c,0xda,0x2b,0xa5,0x57,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0xa,0x68,0xd0,0xf4,0x56,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x33,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0xc,0x5,0x3,0x21,0x86,0xf4,0xe,0x30,0x28,0x63,0x88,0x80,0x30,0x5a,0xf1,0x33,0x66,0x2,0x1,0x2a,0xa3,0x73,0xe6,0xcc,0x19,0x10,0x35,0x40,0x1,0x8,0xa3,0x73,0x6,0x1,0x73,0xe0,0x96,0x1a,0x42,0x9c,0x21,0x2,0x0,0x5a,0xfa,0x3d,0xf9,0xfa,0xe2,0x64,0xe2,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char scroll_button_left_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x59,0x0,0x59,0x0,0x59,0xbd,0x9a,0xea,0xaa,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x11,0x13,0x19,0x39,0xdb,0x30,0xb9,0x4d,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0xbb,0x49,0x44,0x41,0x54,0x38,0x8d,0xad,0x93,0x3d,0xe,0x82,0x40,0x10,0x85,0x1f,0x64,0x8a,0x49,0x24,0x56,0x54,0x3b,0x57,0xd0,0x78,0xf,0x63,0x3c,0x8e,0xbf,0x7,0x50,0x44,0x8e,0x9,0x15,0x8d,0xd,0x4e,0x31,0xc9,0x5a,0x61,0xa1,0x22,0x2c,0xfa,0x92,0xa9,0x36,0xdf,0xb7,0x6f,0x93,0x9d,0x68,0x3e,0x5b,0xb0,0x38,0x69,0x88,0x28,0x42,0x40,0xcc,0xcc,0x97,0x55,0x39,0x21,0x71,0x72,0x57,0x55,0xa8,0x6a,0x8,0xf,0x66,0x8e,0xc4,0x49,0x13,0x13,0x51,0x30,0xc,0x0,0xaa,0xa,0x22,0x42,0x1c,0x4c,0xbe,0xa4,0x57,0x90,0x17,0x19,0xf2,0x22,0xeb,0x3c,0xa7,0x6f,0xf0,0xe5,0x7a,0x86,0xf7,0x7e,0x5c,0x83,0x2c,0x3f,0xf5,0x95,0xeb,0x6e,0xd0,0xc2,0x7d,0xb7,0x77,0xa,0x86,0x80,0x6d,0x3e,0x3e,0x61,0xb7,0x39,0xfc,0x26,0x68,0x25,0xde,0xfb,0xe7,0x4,0xb,0x0,0x60,0xbf,0x3d,0xf6,0xa,0xa2,0xd5,0x72,0xed,0xeb,0xba,0x1e,0xd2,0xf6,0x2d,0x69,0x9a,0xfe,0xe1,0x27,0x9a,0x19,0x98,0x39,0x18,0x64,0x66,0x98,0x19,0xa8,0xac,0xca,0xa9,0x38,0xb9,0x25,0x49,0x32,0x66,0x9d,0xe5,0x1,0x80,0xd0,0x51,0x2e,0x9,0x63,0x6e,0xe0,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x4,0x3,0x0,0x0,0x0,0xed,0xdd,0xe2,0x52,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x30,0x50,0x4c,0x54,0x45,0x2d,0x2c,0x2f,0x48,0x46,0x4a,0x2d,0x2c,0x2f,0x2d,0x2c,0x2f,0x2d,0x2c,0x2f,0x4c,0x4a,0x4e,0x48,0x46,0x4a,0x40,0x3e,0x42,0x38,0x36,0x3a,0xc3,0xc3,0xc3,0xc2,0xc2,0xc2,0xc1,0xc1,0xc1,0xc0,0xc0,0xc0,0xbf,0xbf,0xbf,0xbe,0xbe,0xbe,0x59,0x59,0x59,0x8e,0x47,0x76,0xf1,0x0,0x0,0x0,0x5,0x74,0x52,0x4e,0x53,0x8,0xfe,0x9,0xd,0x19,0x4a,0xb6,0xc1,0xe6,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0xf,0x18,0xba,0x0,0xd9,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x3e,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0xc,0x5,0x3,0x21,0x86,0xf4,0xe,0x30,0x28,0x63,0x88,0x80,0x30,0x5a,0x51,0x19,0x33,0xa1,0x8c,0xae,0x55,0x50,0xc6,0x2e,0x28,0xa3,0x7b,0xf7,0x6e,0x8,0xa3,0xe7,0xcc,0x19,0xa8,0x14,0x9c,0xd1,0x7b,0x17,0xa6,0xfd,0x1d,0x86,0x81,0x60,0x6,0xdc,0x52,0x43,0x88,0x33,0x44,0x0,0xcc,0x4e,0x3f,0xd1,0x4,0x90,0xbf,0x60,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char scroll_button_left_hl_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x59,0x0,0x59,0x0,0x59,0xbd,0x9a,0xea,0xaa,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x11,0x13,0x19,0x35,0xd2,0x86,0xf5,0x66,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0xc3,0x49,0x44,0x41,0x54,0x38,0x8d,0x9d,0x93,0x4d,0xa,0x83,0x30,0x10,0x85,0x5f,0xc4,0xa1,0x10,0xa1,0xde,0xa0,0xb,0x73,0x8c,0x52,0x7a,0x2d,0xa9,0x68,0x5d,0xb4,0xf6,0xef,0x8c,0xf1,0x12,0xc5,0xb4,0x30,0x8b,0xe9,0x4e,0x8a,0x68,0x34,0xbe,0x6d,0x78,0xdf,0xbc,0x99,0x47,0xd4,0x61,0x7f,0xdc,0x98,0xcc,0x7c,0x88,0x48,0x21,0x40,0xcc,0x2c,0xb6,0xb5,0xdb,0xd8,0x64,0xe6,0xeb,0x9c,0x43,0xe7,0x5c,0x88,0x1f,0x89,0xd6,0xca,0x64,0xe6,0x1d,0x11,0x51,0xb0,0x19,0x0,0x3a,0xe7,0x40,0x44,0x88,0x82,0x9d,0x3,0xcd,0x2,0xaa,0xba,0x40,0x55,0x17,0x93,0xef,0xb1,0xcf,0x5c,0x9e,0x4f,0x10,0x11,0xef,0x80,0x49,0x40,0x51,0xe6,0x10,0x11,0x88,0x8,0x94,0x9a,0x2e,0x68,0x14,0x50,0x94,0x39,0x0,0xf4,0x80,0xe0,0x4,0x43,0x93,0xf,0x32,0x7a,0xc4,0xe6,0xf2,0xe8,0xa7,0xcf,0xa5,0x98,0x6c,0xe1,0x76,0x7d,0x2e,0x5a,0xc1,0x5b,0xe3,0xbd,0x79,0x1,0xf0,0xaf,0xe0,0xad,0xf1,0x1f,0xb2,0x2a,0xc1,0x12,0x45,0xcc,0x8c,0x44,0xeb,0x60,0x63,0xa2,0x35,0x98,0x19,0xb1,0x6d,0xad,0x36,0x99,0xe9,0xd2,0x34,0x5d,0xf3,0x9d,0x77,0x3f,0xd3,0x69,0x5f,0xde,0x59,0x55,0x4f,0x95,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x33,0x50,0x4c,0x54,0x45,0x3d,0x3b,0x3f,0x60,0x5d,0x62,0x3d,0x3b,0x3f,0x3d,0x3b,0x3f,0x3d,0x3b,0x3f,0x65,0x62,0x67,0x60,0x5d,0x62,0x56,0x53,0x58,0x4b,0x49,0x4e,0xc9,0xc9,0xc9,0xc8,0xc8,0xc8,0xc6,0xc6,0xc6,0xc7,0xc7,0xc7,0xc5,0xc5,0xc5,0xc4,0xc4,0xc4,0xc3,0xc3,0xc3,0x59,0x59,0x59,0x2a,0x13,0xff,0x12,0x0,0x0,0x0,0x5,0x74,0x52,0x4e,0x53,0x7,0xfe,0xc,0x9,0x1c,0xda,0x2b,0xa5,0x57,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x10,0x95,0xb2,0xd,0x2c,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x4c,0x49,0x44,0x41,0x54,0x18,0xd3,0x85,0xcf,0xcb,0xe,0x80,0x20,0xc,0x44,0xd1,0xa2,0x96,0x47,0x7,0xe4,0xff,0xff,0x16,0xdc,0x90,0xe,0xc6,0x78,0x97,0x27,0x69,0xd3,0x8a,0x4,0x75,0x85,0x43,0x62,0xca,0xae,0x14,0x45,0x33,0xa5,0xdf,0x50,0xa,0x83,0x99,0x11,0xa0,0xa2,0x7a,0x0,0xd0,0xe0,0xa1,0x3d,0xd1,0xc8,0x3d,0xe3,0xa5,0xbd,0x6f,0x30,0xe5,0xef,0xb0,0x5,0xaf,0xe7,0x4e,0x7e,0xff,0x1a,0xb,0x26,0x7,0xac,0xd9,0xa3,0x51,0xe3,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char scroll_button_right_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x59,0x0,0x59,0x0,0x59,0xbd,0x9a,0xea,0xaa,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x11,0x13,0x19,0x31,0xd5,0xeb,0x31,0x7f,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0xbb,0x49,0x44,0x41,0x54,0x38,0x8d,0xad,0x93,0x3d,0xe,0x82,0x40,0x10,0x85,0x1f,0x64,0x8a,0x49,0x24,0x56,0x54,0x3b,0x57,0xd0,0x78,0xf,0x63,0x3c,0x8e,0xbf,0x7,0x50,0x44,0x8e,0x9,0x15,0x8d,0xd,0x4e,0x31,0x61,0xad,0xb0,0x30,0x82,0x2c,0xf1,0x25,0x9b,0x6c,0xf1,0xbe,0x97,0x37,0x99,0xdd,0x68,0xb9,0x58,0xb1,0x38,0x69,0x88,0x28,0x42,0x80,0xcc,0xcc,0x97,0x55,0x39,0x23,0x71,0xf2,0x54,0x55,0xa8,0x6a,0x8,0xf,0x66,0x8e,0xc4,0x49,0x13,0x13,0x51,0x30,0xc,0x0,0xaa,0xa,0x22,0x42,0x1c,0x4c,0x7e,0xa8,0x37,0x20,0x2f,0x32,0xe4,0x45,0x36,0x3d,0x0,0x0,0xbc,0xf7,0xb8,0xdd,0xaf,0xd3,0x2,0xda,0xb6,0x7d,0xdf,0x87,0x42,0x7e,0x36,0xe8,0x4e,0x96,0x5f,0xbe,0x7a,0x68,0x8,0x1e,0xa3,0xd1,0x5b,0x38,0xec,0x4e,0xd3,0x1b,0x1c,0xf7,0xe7,0xf0,0x6,0xdd,0xec,0x43,0x30,0x0,0x44,0x9b,0xf5,0xd6,0xd7,0x75,0x3d,0x68,0xea,0x53,0x9a,0xa6,0x7f,0x78,0x89,0x66,0x6,0x66,0xe,0x6,0x99,0x19,0x66,0x6,0x2a,0xab,0x72,0x2e,0x4e,0x1e,0x49,0x92,0x4c,0xf9,0xce,0xf2,0x2,0x3d,0xd2,0x54,0x2c,0x85,0x2c,0xaa,0x56,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x4,0x3,0x0,0x0,0x0,0xed,0xdd,0xe2,0x52,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x30,0x50,0x4c,0x54,0x45,0x2d,0x2c,0x2f,0x48,0x46,0x4a,0x2d,0x2c,0x2f,0x2d,0x2c,0x2f,0x2d,0x2c,0x2f,0x4c,0x4a,0x4e,0x48,0x46,0x4a,0x40,0x3e,0x42,0x38,0x36,0x3a,0xc3,0xc3,0xc3,0xc2,0xc2,0xc2,0xc1,0xc1,0xc1,0xc0,0xc0,0xc0,0xbf,0xbf,0xbf,0xbe,0xbe,0xbe,0x59,0x59,0x59,0x8e,0x47,0x76,0xf1,0x0,0x0,0x0,0x5,0x74,0x52,0x4e,0x53,0x8,0xfe,0x9,0xd,0x19,0x4a,0xb6,0xc1,0xe6,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0xf,0x18,0xba,0x0,0xd9,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x40,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0xc,0x5,0x3,0x21,0x86,0xf4,0xe,0x30,0x28,0x63,0x88,0x80,0x30,0x5a,0x51,0x18,0x33,0x61,0x8c,0x59,0x2b,0xa0,0x8c,0x5d,0xab,0xa0,0x8c,0xdd,0xbb,0x77,0x40,0x18,0x67,0xce,0x9c,0x80,0x31,0xa0,0x52,0x77,0x6f,0x40,0x19,0xef,0x30,0xc,0x84,0x30,0xe0,0x96,0x1a,0x42,0x9c,0x21,0x2,0x0,0xfd,0x36,0x40,0x93,0xf1,0x83,0x5f,0xf2,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char scroll_button_right_hl_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x59,0x0,0x59,0x0,0x59,0xbd,0x9a,0xea,0xaa,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x11,0x13,0x19,0x2c,0xb6,0xed,0x5d,0xa6,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0xba,0x49,0x44,0x41,0x54,0x38,0x8d,0xa5,0x93,0x4d,0xa,0xc2,0x30,0x10,0x85,0x5f,0xa5,0x83,0x90,0x82,0xbd,0x81,0x8b,0xe4,0x18,0x22,0x5e,0x4b,0xad,0xad,0xdd,0x68,0xfd,0xbb,0x62,0x7a,0x9,0x69,0x14,0x6,0x32,0xae,0x4,0x91,0xb6,0x92,0xf8,0x56,0xb3,0x98,0xef,0xe3,0x2d,0x66,0x92,0xe5,0x62,0x35,0x35,0xda,0x3c,0x88,0x28,0x41,0x40,0x98,0x59,0x6c,0x6b,0x67,0xa9,0xd1,0xe6,0xe9,0x9c,0x43,0xe7,0x5c,0x8,0x8f,0x4c,0xa9,0xc4,0x68,0x73,0x9f,0x10,0x51,0x30,0xc,0x0,0x9d,0x73,0x20,0x22,0x4c,0x82,0xc9,0xaf,0xc,0xa,0xaa,0xba,0x40,0x55,0x17,0xf1,0x2,0x11,0x81,0x88,0xa0,0xdc,0x6f,0xe3,0x4,0xde,0x7b,0x88,0x8,0xbc,0xf7,0xd8,0x55,0x9b,0x70,0xc1,0x67,0xb,0x11,0x41,0x51,0xae,0x7b,0x77,0xd2,0x31,0xb8,0x6f,0x8e,0x12,0x0,0x40,0x73,0xb8,0xc4,0xb,0x4e,0xc7,0x6b,0x7c,0x83,0x73,0x73,0x1b,0x84,0x47,0x5,0xbf,0xc0,0x77,0xfe,0xbf,0x44,0x66,0x46,0xa6,0x54,0x30,0x98,0x29,0x5,0x66,0x46,0x6a,0x5b,0xab,0x8c,0x36,0x5d,0x9e,0xe7,0x31,0xef,0x3c,0x7f,0x1,0x85,0xa9,0x5c,0xe7,0x16,0x3f,0x9a,0xd3,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x36,0x50,0x4c,0x54,0x45,0x3d,0x3b,0x3f,0x60,0x5d,0x62,0x3d,0x3b,0x3f,0x3d,0x3b,0x3f,0x3d,0x3b,0x3f,0x65,0x62,0x67,0x60,0x5d,0x62,0x56,0x53,0x58,0x4b,0x49,0x4e,0xc9,0xc9,0xc9,0xc8,0xc8,0xc8,0xc6,0xc6,0xc6,0xc7,0xc7,0xc7,0xc5,0xc5,0xc5,0xc4,0xc4,0xc4,0xc3,0xc3,0xc3,0xc2,0xc2,0xc2,0x59,0x59,0x59,0x56,0xec,0x9e,0xdc,0x0,0x0,0x0,0x5,0x74,0x52,0x4e,0x53,0x7,0xfe,0xc,0x9,0x1c,0xda,0x2b,0xa5,0x57,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x11,0xe2,0xb5,0x3d,0xba,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x0,0x4c,0x49,0x44,0x41,0x54,0x18,0xd3,0x85,0xcf,0xcb,0xe,0x80,0x30,0x8,0x44,0x51,0xaa,0xd2,0x7,0xb4,0xd2,0xff,0xff,0xda,0xea,0x6e,0x46,0x63,0xbc,0xcb,0x93,0x40,0x40,0x24,0x29,0x94,0x36,0xc9,0xa5,0x42,0x25,0x8b,0x56,0x4a,0xbf,0xa0,0xb5,0x7,0x98,0x19,0x83,0x77,0xef,0xc,0x3e,0xdc,0x11,0xc6,0x1d,0xc2,0x79,0x45,0x23,0x11,0xc1,0x4b,0xe7,0xfc,0x3b,0xc,0xe0,0xf5,0xdc,0xce,0xef,0x1f,0xb,0xc,0x30,0x7,0xaf,0x1f,0x5b,0x76,0x12,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char scroll_button_up_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x59,0x0,0x59,0x0,0x59,0xbd,0x9a,0xea,0xaa,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x11,0x13,0x19,0x26,0x56,0x38,0xb4,0xb8,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x9a,0x49,0x44,0x41,0x54,0x38,0x8d,0xcd,0x93,0x31,0xa,0xc3,0x30,0xc,0x45,0xbf,0x83,0x6,0x41,0x4d,0x27,0x4f,0xd6,0x15,0x5a,0x7a,0x8f,0x52,0x7a,0xaf,0x10,0x72,0x4c,0x67,0xf2,0xd2,0x25,0xd5,0x20,0x48,0xd7,0x92,0xba,0xa1,0x76,0x29,0xf4,0xaf,0xe2,0x3d,0x81,0xd0,0x77,0xc7,0xc3,0x89,0x25,0xca,0x4c,0x44,0xe,0x15,0x31,0xb3,0x25,0x4d,0x69,0x47,0x12,0xe5,0xae,0xaa,0x50,0xd5,0x1a,0x1e,0xcc,0xec,0x24,0xca,0xdc,0x11,0x51,0x35,0xc,0x0,0xaa,0xa,0x22,0x42,0x57,0x4d,0xae,0xf2,0x5b,0xc1,0x30,0xf6,0x18,0xc6,0xbe,0x4d,0xf0,0xc,0x6e,0x49,0x8a,0x82,0x12,0xf0,0x4e,0xf2,0x22,0xd8,0xda,0x56,0x9a,0x7d,0x7d,0x44,0x77,0x39,0x5f,0x97,0x9c,0x73,0x13,0x1c,0x42,0xf8,0xf7,0x3f,0xf8,0x48,0x60,0x66,0x60,0xe6,0x6a,0x90,0x99,0x61,0x66,0xa0,0x34,0xa5,0xbd,0x44,0xb9,0x79,0xef,0x5b,0xea,0x2c,0xf,0x4,0x76,0x39,0xf7,0xc5,0x49,0xf5,0x9f,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x4,0x3,0x0,0x0,0x0,0xed,0xdd,0xe2,0x52,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x21,0x50,0x4c,0x54,0x45,0x2d,0x2c,0x2f,0x48,0x46,0x4a,0x2d,0x2c,0x2f,0x2d,0x2c,0x2f,0x2d,0x2c,0x2f,0x4c,0x4a,0x4e,0x48,0x46,0x4a,0x40,0x3e,0x42,0x38,0x36,0x3a,0xc3,0xc3,0xc3,0x59,0x59,0x59,0xb3,0x52,0xf2,0x5,0x0,0x0,0x0,0x5,0x74,0x52,0x4e,0x53,0x8,0xfe,0x9,0xd,0x19,0x4a,0xb6,0xc1,0xe6,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0xa,0x68,0xd0,0xf4,0x56,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x36,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0xc,0x5,0x3,0x21,0x86,0xf4,0xe,0x30,0x28,0x63,0x88,0x80,0x30,0x5a,0xb1,0x33,0x3a,0x67,0x40,0x19,0x33,0x67,0x42,0x18,0x9d,0x33,0x67,0xce,0x0,0x33,0x66,0x2,0x1,0x2a,0x3,0x9f,0x39,0x10,0x6,0xdc,0x52,0x43,0x88,0x33,0x44,0x0,0x59,0xc8,0x3d,0xf9,0xf,0x68,0xc5,0xa9,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char scroll_button_up_hl_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x59,0x0,0x59,0x0,0x59,0xbd,0x9a,0xea,0xaa,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x11,0x13,0x19,0x21,0xc8,0x5c,0x21,0x1b,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x9a,0x49,0x44,0x41,0x54,0x38,0x8d,0xcd,0x93,0x51,0xa,0xc2,0x30,0xc,0x86,0xff,0x8d,0x6,0x21,0x5,0x7b,0x3,0x1f,0x9a,0x63,0x88,0x78,0x30,0x11,0x6,0x63,0xc7,0xec,0x2e,0x21,0x8d,0x42,0x1e,0xf4,0x75,0xcc,0x6e,0xd8,0x89,0xe0,0xff,0x98,0xf2,0x7d,0x29,0x21,0x69,0x4e,0xc7,0xf3,0x4e,0xa2,0xdc,0x89,0xa8,0x41,0x45,0xcc,0xec,0x99,0xc6,0xb4,0x77,0x12,0xe5,0xa1,0xaa,0xc8,0xaa,0x35,0x3c,0x3c,0x73,0x23,0x51,0x6e,0x2d,0x11,0x55,0xc3,0x0,0x90,0x55,0x41,0x44,0x68,0xab,0xc9,0x59,0x7e,0x2b,0xe8,0x87,0xe,0xfd,0xd0,0x6d,0x13,0x4c,0xc1,0x35,0x49,0x51,0x50,0x2,0x96,0x24,0x6f,0x82,0xb5,0x6e,0xa5,0xb7,0xaf,0x87,0xe8,0xe6,0x85,0xeb,0x65,0xf9,0x7,0xa5,0xfc,0xf9,0x1e,0x7c,0x24,0x30,0x33,0x78,0xe6,0x6a,0xd0,0x33,0xc3,0xcc,0xe0,0xd2,0x98,0x58,0xa2,0xe4,0x10,0xc2,0x96,0x73,0x3e,0xbc,0x0,0x5f,0x36,0x36,0x12,0x78,0xeb,0xb3,0xc5,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x4,0x3,0x0,0x0,0x0,0xed,0xdd,0xe2,0x52,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x21,0x50,0x4c,0x54,0x45,0x3d,0x3b,0x3f,0x60,0x5d,0x62,0x3d,0x3b,0x3f,0x3d,0x3b,0x3f,0x3d,0x3b,0x3f,0x65,0x62,0x67,0x60,0x5d,0x62,0x56,0x53,0x58,0x4b,0x49,0x4e,0xce,0xce,0xce,0x59,0x59,0x59,0xb8,0xf5,0x6d,0x48,0x0,0x0,0x0,0x5,0x74,0x52,0x4e,0x53,0x7,0xfe,0xc,0x9,0x1c,0xda,0x2b,0xa5,0x57,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0xa,0x68,0xd0,0xf4,0x56,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x36,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0xc,0x5,0x3,0x21,0x86,0xf4,0xe,0x30,0x28,0x63,0x88,0x80,0x30,0x5a,0xb1,0x33,0x3a,0x67,0x40,0x19,0x33,0x67,0x42,0x18,0x9d,0x33,0x67,0xce,0x0,0x33,0x66,0x2,0x1,0x2a,0x3,0x9f,0x39,0x10,0x6,0xdc,0x52,0x43,0x88,0x33,0x44,0x0,0x59,0xc8,0x3d,0xf9,0xf,0x68,0xc5,0xa9,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char scroll_grabber_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x8,0x6,0x0,0x0,0x0,0x56,0x75,0x5c,0xe7,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x16,0x26,0x17,0xf2,0xa0,0x34,0xb7,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0xd4,0x49,0x44,0x41,0x54,0x28,0xcf,0xbd,0x8f,0x31,0x4a,0x3,0x61,0x10,0x85,0xdf,0xfb,0x67,0xb1,0x91,0x3d,0x80,0x6d,0xca,0x20,0x39,0xc1,0x7a,0xe,0x59,0x2c,0xc4,0x3b,0x8,0xb9,0x43,0xf0,0xe,0x62,0x11,0x82,0xa0,0x65,0x8a,0xd4,0xe6,0x4,0x31,0x24,0x67,0x48,0xbd,0xe5,0xbf,0x33,0x2f,0x8d,0xbf,0xae,0x6c,0xad,0xf,0x6,0x66,0x98,0xf7,0x31,0xf3,0x80,0xbf,0x16,0x87,0xc3,0x5d,0xfb,0x70,0xd,0xe0,0x49,0x52,0x3,0xe0,0x92,0xe4,0x6,0xc0,0xe3,0x72,0xf5,0xbc,0x1f,0x1,0xed,0xed,0xfd,0x8c,0xe4,0xb6,0xef,0xfb,0x3a,0x14,0x0,0x80,0xc4,0x84,0xaa,0xaa,0x3a,0x49,0xcd,0xea,0xf5,0x65,0x7,0x0,0xe9,0x9b,0x24,0x17,0x39,0xe7,0xda,0xdd,0xa1,0x10,0x14,0x82,0xbb,0x23,0xe7,0x5c,0x93,0x5c,0x14,0x5f,0x55,0x1a,0x8f,0x68,0x3c,0x2,0x90,0x7e,0xfd,0xec,0x11,0xb0,0x88,0x9b,0x11,0x20,0x9,0x92,0x46,0x40,0xd9,0x15,0xa5,0x41,0x98,0x2d,0x7,0x60,0xa9,0xaf,0x90,0x1f,0x23,0x20,0x22,0xe6,0x66,0xd6,0x91,0xfc,0xb9,0x46,0xc2,0xcc,0xba,0x88,0x98,0x17,0x9f,0x95,0xe6,0x70,0xfc,0x3c,0x4d,0xa7,0xb3,0xb5,0x99,0x4d,0x52,0x4a,0x57,0x66,0x76,0x61,0x66,0x1b,0x1,0xed,0xdb,0xfb,0x72,0x87,0x7f,0xd3,0x19,0xa9,0x1d,0x69,0xa0,0x52,0x76,0xa0,0x72,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x8,0x3,0x0,0x0,0x0,0x61,0xab,0xac,0xd5,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x60,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x5b,0x59,0x61,0x5b,0x59,0x61,0x5a,0x58,0x60,0x59,0x57,0x5f,0x5a,0x58,0x60,0x5a,0x58,0x60,0x57,0x56,0x5e,0x58,0x56,0x5e,0x56,0x55,0x5d,0x57,0x55,0x5d,0x57,0x55,0x5d,0x55,0x53,0x5b,0x55,0x53,0x5b,0x54,0x53,0x5b,0x55,0x54,0x5c,0x54,0x52,0x5a,0x55,0x53,0x5b,0x5a,0x58,0x60,0x56,0x54,0x5c,0x54,0x53,0x5a,0x55,0x53,0x5b,0x53,0x51,0x59,0x52,0x51,0x59,0x52,0x50,0x58,0x51,0x50,0x58,0x51,0x4f,0x57,0x50,0x4e,0x56,0x4f,0x4d,0x55,0x50,0x4f,0x57,0x54,0x52,0x5a,0xff,0xff,0xff,0xc7,0x51,0xc2,0xf2,0x0,0x0,0x0,0x12,0x74,0x52,0x4e,0x53,0x0,0x2c,0xb8,0xf4,0x2e,0xf2,0xb8,0xf4,0xf5,0xf4,0xf5,0xb8,0x2f,0xf2,0x2e,0xb8,0xf4,0xb8,0x66,0xf6,0xf7,0x12,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x1f,0x5,0xd,0x10,0xbd,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x50,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0xc0,0x7,0x18,0x99,0x98,0x85,0x98,0x18,0x21,0x6c,0x16,0x56,0x61,0x11,0x11,0x61,0x56,0x16,0x30,0x87,0x4d,0x54,0xc,0x8,0x44,0xd9,0xc0,0x1c,0x76,0x71,0x9,0x20,0x10,0xe7,0x0,0x73,0x38,0x25,0xa5,0x80,0x40,0x92,0xb,0xcc,0xe1,0x96,0x90,0x6,0x2,0x9,0x6e,0x30,0x87,0x87,0x57,0x4a,0x46,0x46,0x96,0x97,0x7,0x62,0x1c,0x1f,0xbf,0x80,0x9c,0x20,0x1f,0x5e,0xdb,0x1,0x23,0xfd,0x4,0x11,0x2d,0x48,0xcb,0xd2,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char scroll_grabber_hl_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x8,0x6,0x0,0x0,0x0,0x56,0x75,0x5c,0xe7,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x16,0xe,0x1f,0xa1,0x26,0x12,0x2f,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x3,0x49,0x44,0x41,0x54,0x28,0xcf,0xbd,0x90,0x3f,0x4b,0xc3,0x50,0x14,0xc5,0x4f,0xf2,0xf2,0xca,0x33,0x12,0xf3,0x10,0x44,0x3a,0x74,0x10,0x91,0xae,0x75,0x13,0xe7,0xea,0x17,0xe8,0xa7,0x10,0x67,0x41,0xec,0x1e,0x4,0x67,0xf1,0x5b,0xf4,0x3,0x88,0xb3,0xb8,0xd9,0xb5,0x88,0xb8,0x28,0x5,0xb5,0x35,0xf4,0xc5,0x90,0xe6,0xbe,0x3f,0x4e,0x29,0xd,0x75,0xd5,0x3,0x7,0xee,0xb9,0xf0,0xe3,0x1e,0x2e,0xf0,0xd7,0xf2,0x96,0xc3,0xcd,0xf0,0x65,0x8f,0xc8,0x5c,0xce,0xd2,0xa2,0x6b,0x1d,0x36,0xa4,0x14,0x3,0xde,0x60,0xe7,0x27,0x9d,0x9d,0xa7,0x15,0xe0,0x7a,0xf8,0xdc,0x9e,0x7e,0xe4,0xf,0xe3,0xb1,0x92,0x45,0xa1,0xe1,0xe0,0xb0,0x26,0x38,0x9a,0xcd,0x28,0xdd,0xdc,0xa,0xf,0x4e,0x3b,0xbb,0x23,0x0,0x8,0x2a,0x20,0x2f,0xca,0xe4,0xed,0xf5,0x4b,0x7e,0xab,0xf9,0xe2,0xa2,0x2a,0x4a,0x58,0xa3,0xa5,0x88,0x82,0x4,0x40,0xaf,0x6,0x4c,0x27,0x59,0x37,0x53,0x39,0x34,0xd9,0x5a,0xe7,0x4c,0x19,0x4c,0x3e,0xd5,0x71,0x95,0x17,0x40,0x49,0x1a,0x46,0x13,0xac,0x36,0x35,0xc0,0x78,0xc,0xb4,0xb4,0xf3,0xab,0x41,0x48,0x71,0xc7,0x98,0x83,0xa1,0x79,0xcd,0x8c,0x39,0x8,0x29,0x6e,0x57,0x0,0xcb,0xfd,0x7e,0xdc,0x8a,0x53,0xbe,0xce,0xe1,0x39,0x82,0xe7,0x8,0x41,0x18,0x20,0x6e,0xc5,0xa9,0xe5,0x7e,0xff,0xd7,0xb7,0x9e,0xdd,0x3f,0xb6,0x29,0xa7,0x24,0x7b,0x9f,0x1d,0xc1,0xd9,0x28,0xda,0x8e,0x7,0x41,0xd8,0xb8,0xb8,0x3a,0xdc,0x1f,0xe1,0xdf,0xf4,0x3,0x35,0xb3,0x71,0xac,0x4,0x64,0x3e,0xbb,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0xc,0x8,0x3,0x0,0x0,0x0,0x61,0xab,0xac,0xd5,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x6c,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x97,0xd0,0xdf,0x92,0xcb,0xdc,0x84,0xbb,0xd4,0x92,0xca,0xdc,0x95,0xd0,0xdd,0x83,0xbb,0xd3,0x8b,0xc8,0xd7,0x79,0xb5,0xcb,0x78,0xb4,0xca,0x73,0xb0,0xc7,0x73,0xb0,0xc7,0x7b,0xc0,0xcf,0x79,0xc5,0xd1,0x6b,0xae,0xc1,0x75,0xc6,0xcf,0x70,0xbc,0xca,0x64,0xa6,0xbc,0x71,0xbc,0xc9,0x82,0xba,0xd4,0x6a,0xa2,0xc6,0x62,0x9a,0xc2,0x61,0x9a,0xc1,0x68,0x9f,0xc2,0x5d,0x92,0xbb,0x5c,0x92,0xb8,0x58,0x8d,0xb6,0x59,0x8e,0xb3,0x56,0x89,0xb0,0x5c,0x91,0xb2,0x53,0x84,0xa9,0x58,0x8f,0xae,0x54,0x83,0xa4,0x57,0x8e,0xad,0x64,0xa5,0xba,0xff,0xff,0xff,0xbb,0x65,0x65,0x27,0x0,0x0,0x0,0x13,0x74,0x52,0x4e,0x53,0x0,0x25,0xad,0xf1,0xad,0x27,0xef,0xad,0xf1,0xf3,0xf1,0xf3,0xad,0x28,0xef,0x27,0xad,0xf2,0xad,0xcd,0x8a,0x27,0xfe,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x23,0x2a,0x62,0x6c,0x3a,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x50,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0xc0,0x7,0x18,0x99,0x98,0x85,0x59,0x18,0x21,0x6c,0x56,0x36,0x11,0x51,0x31,0x11,0x36,0x56,0x30,0x87,0x5d,0x5c,0x2,0x8,0xc4,0xd9,0xc1,0x1c,0xe,0x49,0x29,0x20,0x90,0xe4,0x4,0x73,0xb8,0xa4,0x65,0x80,0x40,0x9a,0x1b,0xcc,0xe1,0x91,0x95,0x3,0x2,0x59,0x1e,0x30,0x87,0x97,0x4f,0x5e,0x41,0x41,0x91,0x8f,0x17,0x62,0x1c,0xbf,0x80,0xa0,0x92,0x10,0x3f,0x5e,0xdb,0x1,0x41,0x87,0x4,0x7d,0x15,0xc4,0xfd,0x6a,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char selection_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x15,0x0,0x15,0x0,0x17,0xc8,0x7d,0x47,0xd1,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0x6,0x14,0x14,0x31,0x1a,0x5f,0x97,0xc4,0x56,0x0,0x0,0x0,0x1d,0x69,0x54,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x0,0x0,0x0,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x64,0x2e,0x65,0x7,0x0,0x0,0x0,0xa3,0x49,0x44,0x41,0x54,0x38,0xcb,0xed,0x93,0xbd,0xa,0xc2,0x40,0x10,0x84,0xbf,0xbb,0x6c,0x72,0x8,0x1,0x51,0x4b,0xdf,0x23,0xc9,0xfb,0x57,0x12,0x9f,0x43,0xb0,0x10,0x2c,0x14,0xe4,0x92,0xcb,0xc5,0x66,0x3,0x36,0x26,0x7,0x69,0x2c,0x9c,0x6e,0x60,0x67,0xf6,0x87,0x1d,0x3,0x14,0xc0,0x6,0x70,0x80,0x25,0xd,0x11,0xf0,0xc0,0x4b,0x54,0x7c,0x4,0x76,0x40,0x9e,0x68,0xd0,0x3,0x77,0xe0,0x22,0xda,0x79,0x3f,0xf4,0x63,0x4b,0xa0,0x56,0x3e,0x7,0x8f,0x70,0xce,0x72,0x53,0x1,0x37,0xd1,0xb1,0x85,0x40,0xc3,0xc8,0xc3,0x47,0xae,0x73,0x6a,0x67,0x29,0x9,0x34,0xaa,0xb3,0x9f,0x3b,0x17,0x3e,0xf2,0x5c,0x9a,0x5d,0x6b,0x8a,0x89,0xa7,0x1e,0xed,0x2b,0xfe,0x6,0xbf,0x66,0xd0,0x39,0x4b,0xb9,0x24,0xd0,0x9a,0x6e,0xe2,0xa2,0xc1,0x8,0x8,0x2d,0x81,0xda,0x65,0x1c,0x12,0x5e,0xf9,0x4,0x54,0x40,0x34,0xc0,0x76,0x4d,0x98,0xcc,0xda,0x38,0xbf,0x1,0xae,0x5a,0x2a,0xba,0xb8,0xa1,0xb8,0x4f,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x4,0x3,0x0,0x0,0x0,0xed,0xdd,0xe2,0x52,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2d,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfd,0xfb,0xff,0xfd,0xf7,0xff,0xfd,0xf7,0xff,0xfd,0xf7,0xff,0xfd,0xf6,0xff,0xf6,0xf4,0xff,0x15,0x15,0x17,0xff,0x70,0xc0,0x21,0x0,0x0,0x0,0xe,0x74,0x52,0x4e,0x53,0x6,0xf,0x16,0x18,0x2a,0x3b,0x40,0x3c,0x6,0x3d,0x44,0x3e,0x31,0x25,0x8,0x3d,0x16,0xb4,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0xe,0x6f,0xbd,0x30,0x4f,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x37,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x54,0x36,0x6,0x2,0x23,0x1,0x6,0x91,0xb0,0x34,0x20,0x48,0x75,0x64,0x50,0xef,0x5c,0x5,0x4,0x33,0x8a,0x18,0xcc,0xf6,0xdc,0x5,0x82,0xd3,0xc9,0xc,0x66,0x6b,0x41,0x8c,0x5b,0x94,0x33,0x60,0x6,0xc2,0xad,0x80,0x5b,0xa,0x73,0x6,0x0,0x45,0x34,0x48,0x41,0xa3,0xc5,0x91,0x23,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char selection_oof_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x15,0x0,0x15,0x0,0x17,0xc8,0x7d,0x47,0xd1,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0x6,0x14,0x14,0x32,0x15,0xe4,0x5,0x8a,0x4,0x0,0x0,0x0,0x1d,0x69,0x54,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x0,0x0,0x0,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x64,0x2e,0x65,0x7,0x0,0x0,0x0,0xa5,0x49,0x44,0x41,0x54,0x38,0xcb,0xed,0xd3,0x41,0x6a,0x2,0x51,0x10,0x4,0xd0,0xf7,0xe7,0xff,0xc1,0x30,0x4,0xe2,0x5a,0x18,0x4f,0x10,0x2,0x9e,0x29,0xe7,0xca,0x99,0x4,0xc9,0xda,0xcd,0x5c,0x20,0x8b,0x20,0x8a,0xfe,0x8c,0x9b,0x76,0xeb,0x8,0xb3,0xc9,0xc2,0x82,0xde,0x34,0x55,0xd5,0x34,0x54,0x25,0x74,0x58,0xe2,0x15,0x19,0xc9,0x7d,0x8c,0xa8,0xf8,0xc5,0x4f,0x9,0xf1,0x7,0x7a,0xbc,0x3c,0x68,0x70,0xc4,0x80,0x5d,0x89,0xcb,0x6b,0xef,0xcd,0x57,0xdd,0xd6,0x1e,0xed,0x84,0xc1,0x39,0x6f,0xf2,0xe0,0xfb,0xef,0x13,0xfb,0x82,0x82,0x45,0x88,0xf,0x31,0xf7,0xd0,0xd5,0x6d,0xed,0x73,0x9b,0x16,0x28,0x4d,0x2c,0x53,0x5c,0x9e,0x12,0xb,0x4e,0x7b,0x7b,0xb5,0x31,0x13,0x4f,0x83,0xff,0x64,0x30,0xe2,0x1c,0xbd,0x98,0x42,0x17,0xdc,0x51,0xa4,0xf0,0x82,0x53,0xde,0xe4,0x21,0xd2,0xf8,0xf6,0x50,0x94,0x39,0xe1,0x92,0xb0,0x9a,0x53,0xa6,0x34,0xb7,0xce,0x57,0x8f,0xdf,0x31,0x5b,0x17,0xde,0x59,0x7e,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x4,0x3,0x0,0x0,0x0,0xed,0xdd,0xe2,0x52,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x30,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2c,0x2,0xfd,0xfb,0xff,0xfd,0xfb,0xff,0xfd,0xfb,0xff,0xfd,0xfb,0xff,0x15,0x15,0x17,0xe9,0x54,0x1,0x21,0x0,0x0,0x0,0xf,0x74,0x52,0x4e,0x53,0xa,0x1a,0x26,0x29,0x2a,0x48,0x65,0x6d,0x6e,0x66,0x3,0x20,0x25,0x16,0xc,0x1f,0x74,0xbf,0x74,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0xf,0x18,0xba,0x0,0xd9,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x38,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x54,0x76,0x1,0x2,0x23,0x1,0x6,0xd1,0xf4,0xe,0x20,0x28,0xb,0x64,0xd0,0x5c,0x7d,0x6,0x8,0x76,0x4d,0x62,0x70,0xdf,0xfb,0xe,0x8,0x6e,0x97,0x30,0x78,0x9c,0x3,0x31,0xde,0xb4,0x50,0xca,0x80,0x1b,0x8,0xb7,0x2,0x6e,0x29,0xcc,0x19,0x0,0x1a,0x23,0x52,0x59,0xa4,0x2f,0x3d,0xa7,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char spinbox_updown_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0xcd,0x49,0x44,0x41,0x54,0x38,0x8d,0xe5,0x53,0x31,0xe,0x82,0x40,0x10,0x9c,0x5d,0x22,0x3e,0x80,0x86,0xc4,0x0,0xe1,0xf,0x16,0x5a,0x58,0xf9,0x5,0xe3,0x13,0xd0,0xc2,0xc4,0xcf,0xd8,0xf0,0x5,0xe3,0x1f,0x2c,0x2c,0x6c,0xf8,0x1,0xc5,0x72,0x85,0x9,0xd,0xf,0x10,0x43,0xce,0x86,0x82,0xe0,0xe9,0x19,0x8d,0x95,0x53,0xce,0xce,0x6e,0x26,0x99,0x59,0xe0,0x97,0x10,0x91,0x95,0x52,0x2a,0x79,0xa5,0xa1,0x67,0x83,0xa2,0x28,0xa6,0x0,0x8e,0x0,0x98,0x99,0xe7,0x61,0x18,0x9e,0xde,0x3e,0x20,0x22,0x3e,0x11,0x65,0x0,0x46,0x2d,0x55,0x3a,0x8e,0x33,0xe,0x82,0xe0,0xd2,0xd7,0x72,0x9f,0xc8,0xb2,0x6c,0x0,0x60,0xdf,0x59,0x6,0x0,0xbf,0x69,0x9a,0x43,0x9e,0xe7,0x43,0xeb,0x1,0xcf,0xf3,0x76,0x44,0x34,0x33,0x18,0x9b,0xb8,0xae,0x9b,0x9a,0x1c,0xff,0x3b,0x1e,0x62,0x14,0x91,0x94,0x88,0x8c,0xe5,0x21,0xa2,0x34,0x8a,0xa2,0x75,0x97,0x7b,0x48,0xa1,0xaa,0xaa,0x8d,0xd6,0xda,0x54,0x9a,0x73,0x5d,0xd7,0x5b,0xab,0x83,0xd6,0xc5,0xe7,0x45,0x2,0x80,0x38,0x8e,0x4b,0xad,0xf5,0x2,0xc0,0x15,0xc0,0x8d,0x99,0x97,0xa6,0x65,0x2b,0x94,0x52,0x89,0xed,0x99,0xbe,0xc6,0x1d,0x31,0x1f,0x40,0xdc,0x74,0x8a,0x5b,0xc1,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x4,0x0,0x0,0x0,0xb5,0xfa,0x37,0xea,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x76,0x49,0x44,0x41,0x54,0x28,0xcf,0x63,0x60,0x20,0xd,0xdc,0x4f,0x7f,0x98,0x86,0x47,0xfa,0x81,0xe5,0x83,0x1f,0xf,0x7e,0x3d,0xb2,0x45,0x16,0x63,0x44,0xd2,0x2d,0xc1,0x78,0x86,0x41,0x9a,0x81,0x81,0xe1,0x5,0xb3,0x89,0xec,0x53,0x98,0x28,0x13,0x8c,0x71,0x86,0x95,0x61,0x15,0x83,0x34,0x3,0x3,0x3,0x3,0x83,0xc4,0xdf,0x35,0xb7,0xd9,0x31,0x14,0x8,0x4f,0x61,0x44,0x18,0x6d,0xc1,0x36,0x93,0x44,0xc7,0xd3,0x7,0xdc,0x9f,0xf9,0xe0,0x3f,0x2,0x3e,0x9c,0x81,0xe1,0x8b,0xb7,0x39,0xff,0xf,0xc3,0x55,0x1f,0xff,0x95,0x4f,0x74,0x40,0xa1,0x5a,0x63,0x81,0x19,0xd4,0x68,0xe0,0x61,0x1a,0xde,0xc8,0xc2,0x6,0x0,0x74,0x4d,0x32,0x61,0xa3,0xda,0x8e,0xb3,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xba,0x84,0x14,0xff,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xcb,0xd9,0xac,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char submenu_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x8,0x6,0x0,0x0,0x0,0xc4,0xf,0xbe,0x8b,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x64,0x49,0x44,0x41,0x54,0x18,0x95,0x7d,0xca,0x21,0x12,0x80,0x20,0x14,0x45,0xd1,0xf7,0x2d,0x4,0x36,0x40,0x63,0xa8,0xba,0x1f,0xbb,0x9d,0xe5,0xb8,0x0,0xb3,0xfb,0xd1,0xc,0x8d,0xd,0x10,0x48,0xcf,0x22,0x6,0xc7,0xef,0x6d,0x77,0xe6,0x8,0x0,0xa4,0x94,0x88,0x3b,0x92,0x4b,0x8,0x61,0xeb,0x3f,0xe0,0x95,0x88,0xac,0x39,0xe7,0x49,0x5,0x0,0x2c,0xc9,0xbd,0x94,0x62,0x35,0x0,0x0,0x63,0x6b,0x6d,0xfd,0x3,0x4f,0x1a,0x38,0x8d,0x31,0x51,0x3,0x55,0x44,0x66,0xe7,0x5c,0xfd,0x4,0x24,0xa3,0xf7,0xfe,0xe8,0x7f,0x1,0xe,0xc2,0x1e,0x10,0xa,0xf0,0x33,0x4c,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x8,0x4,0x0,0x0,0x0,0x6e,0x6,0x76,0x0,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x0,0x4d,0x49,0x44,0x41,0x54,0x8,0xd7,0x55,0xc8,0xa1,0x19,0x40,0x40,0x18,0x0,0xd0,0x77,0x8a,0x60,0x1,0x4d,0xb7,0x80,0x4d,0x64,0x3,0x18,0xc7,0x14,0xf6,0xa1,0xba,0x68,0x81,0xb,0xd2,0x2f,0xf9,0xbe,0xf3,0xe2,0x43,0x8e,0x1c,0x39,0xae,0x5,0x48,0xe4,0x0,0x25,0x4d,0xc3,0x41,0xe3,0xd3,0xc5,0x7e,0x77,0x75,0x30,0x3e,0xdb,0x3f,0xf0,0x8f,0xb3,0x5d,0xeb,0x28,0x69,0xee,0x4b,0x15,0xb1,0xe,0x7,0xbc,0x18,0xe0,0x15,0x49,0xfb,0x84,0x18,0x58,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xba,0x84,0x14,0xff,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xcb,0xd9,0xac,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char tab_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x8,0x6,0x0,0x0,0x0,0xc4,0xf,0xbe,0x8b,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x0,0x0,0x0,0x0,0x0,0xf9,0x43,0xbb,0x7f,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdb,0xc,0x14,0x0,0x1,0xe,0x50,0x5,0x77,0xc3,0x0,0x0,0x0,0x24,0x49,0x44,0x41,0x54,0x18,0xd3,0x63,0x60,0x20,0x6,0xfc,0xff,0xff,0x3f,0xf2,0xff,0xff,0xff,0x22,0x50,0x1c,0x49,0x5d,0x45,0x4c,0xc,0xc4,0x2,0xbc,0x56,0x10,0x65,0x3f,0x2e,0x0,0x0,0x25,0x24,0x40,0x9,0xd4,0xd9,0x6,0x7e,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x8,0x4,0x0,0x0,0x0,0x6e,0x6,0x76,0x0,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0x0,0xaa,0x8d,0x23,0x32,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x1f,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0xc0,0x4,0xff,0x23,0xff,0x8b,0xfc,0x17,0xf9,0x1f,0x49,0xac,0x10,0x13,0x3,0x3,0x61,0x53,0xb0,0x98,0x80,0xc,0x0,0xa8,0x3e,0x18,0x31,0xbe,0x78,0xfc,0x7a,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char tab_behind_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x35,0x0,0x32,0x0,0x3b,0x6,0x66,0x54,0x53,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xa,0x15,0x0,0x20,0xc,0x9e,0xf9,0xd3,0xdf,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0xf2,0x49,0x44,0x41,0x54,0x38,0xcb,0xe5,0x92,0x41,0x4a,0x3,0x41,0x10,0x45,0x5f,0xf7,0x4c,0xa6,0x3,0x19,0xc8,0x30,0x3,0xc9,0x2d,0xc4,0x95,0x7,0xf1,0x34,0x59,0xb8,0xf4,0x3c,0xde,0xc0,0xb,0x64,0x15,0xbc,0x85,0x48,0xa2,0x81,0x28,0x76,0xba,0x26,0xed,0xc2,0xea,0xd0,0x86,0x84,0x28,0xba,0xf3,0x43,0x51,0x45,0xf3,0xff,0xa7,0x7e,0x77,0x1b,0x3e,0x61,0x0,0xab,0x55,0x68,0x37,0x5a,0x0,0x51,0x6b,0x7,0xf4,0xda,0x77,0x40,0x4c,0xa4,0x2,0xa8,0x0,0x7,0xc,0x75,0x4e,0x46,0x64,0xc2,0x2d,0xf0,0xe,0x78,0x9d,0xfb,0x52,0x49,0x15,0x30,0x2,0x1a,0x60,0xac,0xb3,0x3b,0xd8,0xc0,0x3,0xaf,0xc0,0x1a,0x78,0xd1,0x73,0x9f,0xc,0x1c,0xd0,0x5c,0x5e,0x5c,0x5d,0x77,0xed,0xf4,0x26,0xc8,0xb6,0x26,0x46,0xbe,0xc0,0x18,0x6,0x65,0xb5,0x59,0xae,0x1e,0x6f,0x17,0xf,0xf3,0x3b,0x40,0x80,0x90,0xc,0x86,0xc0,0xb8,0x6b,0x27,0xb3,0xd5,0xf3,0x53,0x2d,0x12,0x38,0x86,0xb2,0x1c,0xd4,0x5d,0x3b,0x99,0x1,0xf7,0xc0,0x6,0x78,0xb3,0x59,0xfe,0x91,0x48,0x68,0x4e,0x89,0x1,0x44,0x2,0x22,0xa1,0xd1,0x88,0x15,0x50,0xd8,0xec,0x12,0x5d,0x3c,0x5c,0xfb,0x8,0x94,0xe3,0x54,0x63,0x6c,0xf6,0x84,0x86,0xef,0x63,0xaf,0xb1,0xfc,0x12,0x36,0xfb,0x20,0xf1,0x7,0xba,0xbd,0x26,0x19,0xf4,0x80,0x37,0xe6,0x7c,0xa,0xe5,0x78,0xd5,0xc4,0x3f,0x89,0xf0,0xdf,0xd,0x3e,0x0,0xbd,0x2e,0x4c,0x5c,0x6d,0xbf,0x37,0x8b,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x5a,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30,0x2e,0x36,0x43,0x40,0x4d,0x0,0x0,0x0,0x43,0x40,0x4c,0x3e,0x3c,0x47,0x3e,0x3b,0x46,0x31,0x2f,0x38,0x2d,0x2b,0x33,0x3f,0x3c,0x47,0x35,0x32,0x3b,0x5b,0xb0,0x1,0xb7,0x0,0x0,0x0,0x18,0x74,0x52,0x4e,0x53,0x0,0x1,0x3,0x5,0x8,0xa,0xb,0xc,0x4,0x11,0x19,0x1f,0x22,0x24,0x15,0x25,0x34,0x3f,0x46,0x47,0x77,0xf3,0x7,0xef,0xd3,0x51,0x5e,0xca,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x1d,0xeb,0x3,0x71,0x91,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x6e,0x49,0x44,0x41,0x54,0x18,0xd3,0xb5,0xcc,0x49,0xe,0x80,0x20,0x10,0x44,0xd1,0x2,0x6c,0x90,0x49,0x26,0x27,0xd4,0xfb,0x9f,0x53,0x63,0x34,0x2e,0x58,0xfb,0x97,0x2f,0xa9,0x2,0x18,0x17,0x1d,0x49,0xa5,0x24,0x75,0x82,0x33,0x80,0xf5,0xa4,0x8d,0x75,0xde,0x3b,0x6b,0x34,0xf5,0xc,0x9c,0x86,0x10,0x53,0x2e,0x25,0xa7,0x18,0x6,0xe2,0x10,0x3a,0x8c,0xd3,0x5a,0xaf,0xd6,0x69,0xc,0x5a,0x60,0x36,0x71,0xd9,0xf6,0xbb,0x6d,0x89,0x66,0x6,0xd9,0x74,0xec,0x4f,0x47,0xb2,0x4,0xe9,0x72,0x7d,0xa1,0x66,0x27,0xa1,0x7c,0xf9,0xa0,0x78,0xd5,0x42,0x33,0x69,0x4e,0xff,0x80,0x13,0xce,0x8,0x12,0xa9,0x90,0xd8,0x47,0x93,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char tab_close_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0xfa,0x49,0x44,0x41,0x54,0x38,0x8d,0xcd,0x92,0x5f,0x4a,0xc4,0x30,0x10,0x87,0xbf,0xb1,0xb9,0xc2,0x16,0x7c,0x6b,0xc1,0xa2,0x85,0x7a,0x4,0x2d,0xfe,0x39,0xc4,0x9e,0x70,0x4f,0x61,0xc5,0x3d,0x83,0x5,0x95,0x4,0xd2,0x37,0x5,0x8f,0x90,0x94,0xf1,0xc5,0x4a,0x76,0xcd,0x22,0xf8,0xa2,0xf3,0x38,0xc3,0xef,0x9b,0xe4,0x4b,0xe0,0x5f,0x95,0xf7,0x7e,0xed,0x9c,0x2b,0xf,0xcd,0x9d,0x73,0xa5,0xf7,0x7e,0x9d,0xf6,0x8e,0xd2,0xb0,0x88,0x6c,0x8c,0x31,0x43,0xe,0xe2,0x9c,0x2b,0x8d,0x31,0x83,0x88,0x6c,0x52,0xc8,0x17,0x20,0xc6,0x38,0xa8,0xea,0x8,0x74,0xc6,0x98,0xed,0x34,0x4d,0xc7,0xcb,0xcc,0x5a,0xbb,0x2a,0x8a,0xe2,0xe,0xe8,0x80,0x17,0xe0,0x61,0x99,0x49,0xba,0xc5,0x5a,0xbb,0xfa,0xdc,0x72,0xe,0x3c,0x3,0xd7,0x21,0x84,0x98,0xf6,0x54,0xf5,0xaa,0xae,0xeb,0xb7,0x2c,0x60,0x1f,0x22,0x22,0x56,0x55,0x23,0xd0,0xe6,0xc2,0x59,0x40,0x2,0xd9,0x8a,0x48,0xbb,0x28,0x50,0xd5,0x8b,0xfd,0xf0,0x8e,0x83,0x9f,0x4a,0x44,0xb2,0xcb,0xbe,0x1,0x92,0x2b,0xb4,0xaa,0x6a,0x81,0x27,0xe0,0x4,0xb8,0x4f,0xc5,0x66,0x1,0x19,0x89,0x97,0x21,0x84,0x5e,0x55,0x1f,0x81,0xb3,0x1c,0x44,0xe,0x85,0x53,0x61,0xb9,0xd7,0xa9,0xaa,0xea,0x75,0xe7,0x4,0xc6,0x98,0x1b,0x11,0xe9,0x80,0x31,0xc6,0xd8,0xa7,0xc2,0x9a,0xa6,0x79,0x9f,0xe7,0xf9,0x16,0x18,0x81,0x53,0x55,0xed,0xb3,0xa2,0x7e,0xf3,0x95,0xff,0xbe,0x3e,0x0,0xbd,0x2c,0x93,0xec,0xb,0xe5,0x4f,0xb1,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x4,0x0,0x0,0x0,0xb5,0xfa,0x37,0xea,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0xb9,0x49,0x44,0x41,0x54,0x28,0xcf,0xad,0x90,0x5d,0xa,0x82,0x40,0x14,0x85,0xbf,0x31,0xb7,0xa0,0xd4,0x63,0x50,0x94,0x60,0x4b,0x28,0xe9,0x67,0x11,0x2e,0x36,0xa3,0xb6,0x90,0x82,0xc5,0x8,0xce,0x63,0xd0,0x12,0x34,0xa7,0x87,0xc9,0x1c,0x7b,0xa,0xea,0x3c,0xdd,0xcb,0xf9,0xe,0xf7,0x70,0xe1,0x4f,0x2a,0xe3,0xc2,0xb7,0xf7,0xc2,0x2f,0xe3,0x9e,0xad,0x1a,0x95,0x76,0x48,0xe1,0xab,0x54,0x35,0x6,0x71,0x0,0xea,0x44,0x67,0x84,0xee,0x49,0x8d,0x0,0xa4,0x37,0xd8,0x13,0x72,0xe5,0x8,0x20,0x4c,0x46,0x7a,0x6e,0x22,0x16,0x5c,0xd8,0x54,0xb5,0x99,0xf4,0x7a,0x7c,0xb3,0x80,0x16,0x11,0x52,0xd7,0x4,0x9d,0x6d,0x1,0x20,0x3d,0xf7,0x24,0x2,0xa0,0xd0,0xcb,0xd6,0x7e,0x75,0xf8,0x94,0xb0,0x62,0x4e,0xef,0x44,0xa0,0x25,0x39,0x13,0xe,0xa6,0xae,0x5,0xbc,0x4b,0xae,0xaa,0x48,0xa7,0xcc,0x6d,0x4,0x90,0x5e,0x79,0x56,0x5a,0xe5,0xe5,0xd0,0xde,0xc,0xe2,0x0,0xb8,0x5b,0x11,0x92,0xd5,0x91,0xa9,0x36,0xbd,0x3f,0x76,0x64,0xcc,0x74,0xf4,0xfd,0xab,0x7f,0xd2,0x13,0xed,0xc6,0x57,0xcd,0xb6,0x96,0x72,0x87,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xba,0x84,0x14,0xff,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xcb,0xd9,0xac,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char tab_container_bg_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0xa,0x45,0x69,0x43,0x43,0x50,0x49,0x43,0x43,0x20,0x70,0x72,0x6f,0x66,0x69,0x6c,0x65,0x0,0x0,0x78,0xda,0x9d,0x53,0x67,0x54,0x53,0xe9,0x16,0x3d,0xf7,0xde,0xf4,0x42,0x4b,0x88,0x80,0x94,0x4b,0x6f,0x52,0x15,0x8,0x20,0x52,0x42,0x8b,0x80,0x14,0x91,0x26,0x2a,0x21,0x9,0x10,0x4a,0x88,0x21,0xa1,0xd9,0x15,0x51,0xc1,0x11,0x45,0x45,0x4,0x1b,0xc8,0xa0,0x88,0x3,0x8e,0x8e,0x80,0x8c,0x15,0x51,0x2c,0xc,0x8a,0xa,0xd8,0x7,0xe4,0x21,0xa2,0x8e,0x83,0xa3,0x88,0x8a,0xca,0xfb,0xe1,0x7b,0xa3,0x6b,0xd6,0xbc,0xf7,0xe6,0xcd,0xfe,0xb5,0xd7,0x3e,0xe7,0xac,0xf3,0x9d,0xb3,0xcf,0x7,0xc0,0x8,0xc,0x96,0x48,0x33,0x51,0x35,0x80,0xc,0xa9,0x42,0x1e,0x11,0xe0,0x83,0xc7,0xc4,0xc6,0xe1,0xe4,0x2e,0x40,0x81,0xa,0x24,0x70,0x0,0x10,0x8,0xb3,0x64,0x21,0x73,0xfd,0x23,0x1,0x0,0xf8,0x7e,0x3c,0x3c,0x2b,0x22,0xc0,0x7,0xbe,0x0,0x1,0x78,0xd3,0xb,0x8,0x0,0xc0,0x4d,0x9b,0xc0,0x30,0x1c,0x87,0xff,0xf,0xea,0x42,0x99,0x5c,0x1,0x80,0x84,0x1,0xc0,0x74,0x91,0x38,0x4b,0x8,0x80,0x14,0x0,0x40,0x7a,0x8e,0x42,0xa6,0x0,0x40,0x46,0x1,0x80,0x9d,0x98,0x26,0x53,0x0,0xa0,0x4,0x0,0x60,0xcb,0x63,0x62,0xe3,0x0,0x50,0x2d,0x0,0x60,0x27,0x7f,0xe6,0xd3,0x0,0x80,0x9d,0xf8,0x99,0x7b,0x1,0x0,0x5b,0x94,0x21,0x15,0x1,0xa0,0x91,0x0,0x20,0x13,0x65,0x88,0x44,0x0,0x68,0x3b,0x0,0xac,0xcf,0x56,0x8a,0x45,0x0,0x58,0x30,0x0,0x14,0x66,0x4b,0xc4,0x39,0x0,0xd8,0x2d,0x0,0x30,0x49,0x57,0x66,0x48,0x0,0xb0,0xb7,0x0,0xc0,0xce,0x10,0xb,0xb2,0x0,0x8,0xc,0x0,0x30,0x51,0x88,0x85,0x29,0x0,0x4,0x7b,0x0,0x60,0xc8,0x23,0x23,0x78,0x0,0x84,0x99,0x0,0x14,0x46,0xf2,0x57,0x3c,0xf1,0x2b,0xae,0x10,0xe7,0x2a,0x0,0x0,0x78,0x99,0xb2,0x3c,0xb9,0x24,0x39,0x45,0x81,0x5b,0x8,0x2d,0x71,0x7,0x57,0x57,0x2e,0x1e,0x28,0xce,0x49,0x17,0x2b,0x14,0x36,0x61,0x2,0x61,0x9a,0x40,0x2e,0xc2,0x79,0x99,0x19,0x32,0x81,0x34,0xf,0xe0,0xf3,0xcc,0x0,0x0,0xa0,0x91,0x15,0x11,0xe0,0x83,0xf3,0xfd,0x78,0xce,0xe,0xae,0xce,0xce,0x36,0x8e,0xb6,0xe,0x5f,0x2d,0xea,0xbf,0x6,0xff,0x22,0x62,0x62,0xe3,0xfe,0xe5,0xcf,0xab,0x70,0x40,0x0,0x0,0xe1,0x74,0x7e,0xd1,0xfe,0x2c,0x2f,0xb3,0x1a,0x80,0x3b,0x6,0x80,0x6d,0xfe,0xa2,0x25,0xee,0x4,0x68,0x5e,0xb,0xa0,0x75,0xf7,0x8b,0x66,0xb2,0xf,0x40,0xb5,0x0,0xa0,0xe9,0xda,0x57,0xf3,0x70,0xf8,0x7e,0x3c,0x3c,0x45,0xa1,0x90,0xb9,0xd9,0xd9,0xe5,0xe4,0xe4,0xd8,0x4a,0xc4,0x42,0x5b,0x61,0xca,0x57,0x7d,0xfe,0x67,0xc2,0x5f,0xc0,0x57,0xfd,0x6c,0xf9,0x7e,0x3c,0xfc,0xf7,0xf5,0xe0,0xbe,0xe2,0x24,0x81,0x32,0x5d,0x81,0x47,0x4,0xf8,0xe0,0xc2,0xcc,0xf4,0x4c,0xa5,0x1c,0xcf,0x92,0x9,0x84,0x62,0xdc,0xe6,0x8f,0x47,0xfc,0xb7,0xb,0xff,0xfc,0x1d,0xd3,0x22,0xc4,0x49,0x62,0xb9,0x58,0x2a,0x14,0xe3,0x51,0x12,0x71,0x8e,0x44,0x9a,0x8c,0xf3,0x32,0xa5,0x22,0x89,0x42,0x92,0x29,0xc5,0x25,0xd2,0xff,0x64,0xe2,0xdf,0x2c,0xfb,0x3,0x3e,0xdf,0x35,0x0,0xb0,0x6a,0x3e,0x1,0x7b,0x91,0x2d,0xa8,0x5d,0x63,0x3,0xf6,0x4b,0x27,0x10,0x58,0x74,0xc0,0xe2,0xf7,0x0,0x0,0xf2,0xbb,0x6f,0xc1,0xd4,0x28,0x8,0x3,0x80,0x68,0x83,0xe1,0xcf,0x77,0xff,0xef,0x3f,0xfd,0x47,0xa0,0x25,0x0,0x80,0x66,0x49,0x92,0x71,0x0,0x0,0x5e,0x44,0x24,0x2e,0x54,0xca,0xb3,0x3f,0xc7,0x8,0x0,0x0,0x44,0xa0,0x81,0x2a,0xb0,0x41,0x1b,0xf4,0xc1,0x18,0x2c,0xc0,0x6,0x1c,0xc1,0x5,0xdc,0xc1,0xb,0xfc,0x60,0x36,0x84,0x42,0x24,0xc4,0xc2,0x42,0x10,0x42,0xa,0x64,0x80,0x1c,0x72,0x60,0x29,0xac,0x82,0x42,0x28,0x86,0xcd,0xb0,0x1d,0x2a,0x60,0x2f,0xd4,0x40,0x1d,0x34,0xc0,0x51,0x68,0x86,0x93,0x70,0xe,0x2e,0xc2,0x55,0xb8,0xe,0x3d,0x70,0xf,0xfa,0x61,0x8,0x9e,0xc1,0x28,0xbc,0x81,0x9,0x4,0x41,0xc8,0x8,0x13,0x61,0x21,0xda,0x88,0x1,0x62,0x8a,0x58,0x23,0x8e,0x8,0x17,0x99,0x85,0xf8,0x21,0xc1,0x48,0x4,0x12,0x8b,0x24,0x20,0xc9,0x88,0x14,0x51,0x22,0x4b,0x91,0x35,0x48,0x31,0x52,0x8a,0x54,0x20,0x55,0x48,0x1d,0xf2,0x3d,0x72,0x2,0x39,0x87,0x5c,0x46,0xba,0x91,0x3b,0xc8,0x0,0x32,0x82,0xfc,0x86,0xbc,0x47,0x31,0x94,0x81,0xb2,0x51,0x3d,0xd4,0xc,0xb5,0x43,0xb9,0xa8,0x37,0x1a,0x84,0x46,0xa2,0xb,0xd0,0x64,0x74,0x31,0x9a,0x8f,0x16,0xa0,0x9b,0xd0,0x72,0xb4,0x1a,0x3d,0x8c,0x36,0xa1,0xe7,0xd0,0xab,0x68,0xf,0xda,0x8f,0x3e,0x43,0xc7,0x30,0xc0,0xe8,0x18,0x7,0x33,0xc4,0x6c,0x30,0x2e,0xc6,0xc3,0x42,0xb1,0x38,0x2c,0x9,0x93,0x63,0xcb,0xb1,0x22,0xac,0xc,0xab,0xc6,0x1a,0xb0,0x56,0xac,0x3,0xbb,0x89,0xf5,0x63,0xcf,0xb1,0x77,0x4,0x12,0x81,0x45,0xc0,0x9,0x36,0x4,0x77,0x42,0x20,0x61,0x1e,0x41,0x48,0x58,0x4c,0x58,0x4e,0xd8,0x48,0xa8,0x20,0x1c,0x24,0x34,0x11,0xda,0x9,0x37,0x9,0x3,0x84,0x51,0xc2,0x27,0x22,0x93,0xa8,0x4b,0xb4,0x26,0xba,0x11,0xf9,0xc4,0x18,0x62,0x32,0x31,0x87,0x58,0x48,0x2c,0x23,0xd6,0x12,0x8f,0x13,0x2f,0x10,0x7b,0x88,0x43,0xc4,0x37,0x24,0x12,0x89,0x43,0x32,0x27,0xb9,0x90,0x2,0x49,0xb1,0xa4,0x54,0xd2,0x12,0xd2,0x46,0xd2,0x6e,0x52,0x23,0xe9,0x2c,0xa9,0x9b,0x34,0x48,0x1a,0x23,0x93,0xc9,0xda,0x64,0x6b,0xb2,0x7,0x39,0x94,0x2c,0x20,0x2b,0xc8,0x85,0xe4,0x9d,0xe4,0xc3,0xe4,0x33,0xe4,0x1b,0xe4,0x21,0xf2,0x5b,0xa,0x9d,0x62,0x40,0x71,0xa4,0xf8,0x53,0xe2,0x28,0x52,0xca,0x6a,0x4a,0x19,0xe5,0x10,0xe5,0x34,0xe5,0x6,0x65,0x98,0x32,0x41,0x55,0xa3,0x9a,0x52,0xdd,0xa8,0xa1,0x54,0x11,0x35,0x8f,0x5a,0x42,0xad,0xa1,0xb6,0x52,0xaf,0x51,0x87,0xa8,0x13,0x34,0x75,0x9a,0x39,0xcd,0x83,0x16,0x49,0x4b,0xa5,0xad,0xa2,0x95,0xd3,0x1a,0x68,0x17,0x68,0xf7,0x69,0xaf,0xe8,0x74,0xba,0x11,0xdd,0x95,0x1e,0x4e,0x97,0xd0,0x57,0xd2,0xcb,0xe9,0x47,0xe8,0x97,0xe8,0x3,0xf4,0x77,0xc,0xd,0x86,0x15,0x83,0xc7,0x88,0x67,0x28,0x19,0x9b,0x18,0x7,0x18,0x67,0x19,0x77,0x18,0xaf,0x98,0x4c,0xa6,0x19,0xd3,0x8b,0x19,0xc7,0x54,0x30,0x37,0x31,0xeb,0x98,0xe7,0x99,0xf,0x99,0x6f,0x55,0x58,0x2a,0xb6,0x2a,0x7c,0x15,0x91,0xca,0xa,0x95,0x4a,0x95,0x26,0x95,0x1b,0x2a,0x2f,0x54,0xa9,0xaa,0xa6,0xaa,0xde,0xaa,0xb,0x55,0xf3,0x55,0xcb,0x54,0x8f,0xa9,0x5e,0x53,0x7d,0xae,0x46,0x55,0x33,0x53,0xe3,0xa9,0x9,0xd4,0x96,0xab,0x55,0xaa,0x9d,0x50,0xeb,0x53,0x1b,0x53,0x67,0xa9,0x3b,0xa8,0x87,0xaa,0x67,0xa8,0x6f,0x54,0x3f,0xa4,0x7e,0x59,0xfd,0x89,0x6,0x59,0xc3,0x4c,0xc3,0x4f,0x43,0xa4,0x51,0xa0,0xb1,0x5f,0xe3,0xbc,0xc6,0x20,0xb,0x63,0x19,0xb3,0x78,0x2c,0x21,0x6b,0xd,0xab,0x86,0x75,0x81,0x35,0xc4,0x26,0xb1,0xcd,0xd9,0x7c,0x76,0x2a,0xbb,0x98,0xfd,0x1d,0xbb,0x8b,0x3d,0xaa,0xa9,0xa1,0x39,0x43,0x33,0x4a,0x33,0x57,0xb3,0x52,0xf3,0x94,0x66,0x3f,0x7,0xe3,0x98,0x71,0xf8,0x9c,0x74,0x4e,0x9,0xe7,0x28,0xa7,0x97,0xf3,0x7e,0x8a,0xde,0x14,0xef,0x29,0xe2,0x29,0x1b,0xa6,0x34,0x4c,0xb9,0x31,0x65,0x5c,0x6b,0xaa,0x96,0x97,0x96,0x58,0xab,0x48,0xab,0x51,0xab,0x47,0xeb,0xbd,0x36,0xae,0xed,0xa7,0x9d,0xa6,0xbd,0x45,0xbb,0x59,0xfb,0x81,0xe,0x41,0xc7,0x4a,0x27,0x5c,0x27,0x47,0x67,0x8f,0xce,0x5,0x9d,0xe7,0x53,0xd9,0x53,0xdd,0xa7,0xa,0xa7,0x16,0x4d,0x3d,0x3a,0xf5,0xae,0x2e,0xaa,0x6b,0xa5,0x1b,0xa1,0xbb,0x44,0x77,0xbf,0x6e,0xa7,0xee,0x98,0x9e,0xbe,0x5e,0x80,0x9e,0x4c,0x6f,0xa7,0xde,0x79,0xbd,0xe7,0xfa,0x1c,0x7d,0x2f,0xfd,0x54,0xfd,0x6d,0xfa,0xa7,0xf5,0x47,0xc,0x58,0x6,0xb3,0xc,0x24,0x6,0xdb,0xc,0xce,0x18,0x3c,0xc5,0x35,0x71,0x6f,0x3c,0x1d,0x2f,0xc7,0xdb,0xf1,0x51,0x43,0x5d,0xc3,0x40,0x43,0xa5,0x61,0x95,0x61,0x97,0xe1,0x84,0x91,0xb9,0xd1,0x3c,0xa3,0xd5,0x46,0x8d,0x46,0xf,0x8c,0x69,0xc6,0x5c,0xe3,0x24,0xe3,0x6d,0xc6,0x6d,0xc6,0xa3,0x26,0x6,0x26,0x21,0x26,0x4b,0x4d,0xea,0x4d,0xee,0x9a,0x52,0x4d,0xb9,0xa6,0x29,0xa6,0x3b,0x4c,0x3b,0x4c,0xc7,0xcd,0xcc,0xcd,0xa2,0xcd,0xd6,0x99,0x35,0x9b,0x3d,0x31,0xd7,0x32,0xe7,0x9b,0xe7,0x9b,0xd7,0x9b,0xdf,0xb7,0x60,0x5a,0x78,0x5a,0x2c,0xb6,0xa8,0xb6,0xb8,0x65,0x49,0xb2,0xe4,0x5a,0xa6,0x59,0xee,0xb6,0xbc,0x6e,0x85,0x5a,0x39,0x59,0xa5,0x58,0x55,0x5a,0x5d,0xb3,0x46,0xad,0x9d,0xad,0x25,0xd6,0xbb,0xad,0xbb,0xa7,0x11,0xa7,0xb9,0x4e,0x93,0x4e,0xab,0x9e,0xd6,0x67,0xc3,0xb0,0xf1,0xb6,0xc9,0xb6,0xa9,0xb7,0x19,0xb0,0xe5,0xd8,0x6,0xdb,0xae,0xb6,0x6d,0xb6,0x7d,0x61,0x67,0x62,0x17,0x67,0xb7,0xc5,0xae,0xc3,0xee,0x93,0xbd,0x93,0x7d,0xba,0x7d,0x8d,0xfd,0x3d,0x7,0xd,0x87,0xd9,0xe,0xab,0x1d,0x5a,0x1d,0x7e,0x73,0xb4,0x72,0x14,0x3a,0x56,0x3a,0xde,0x9a,0xce,0x9c,0xee,0x3f,0x7d,0xc5,0xf4,0x96,0xe9,0x2f,0x67,0x58,0xcf,0x10,0xcf,0xd8,0x33,0xe3,0xb6,0x13,0xcb,0x29,0xc4,0x69,0x9d,0x53,0x9b,0xd3,0x47,0x67,0x17,0x67,0xb9,0x73,0x83,0xf3,0x88,0x8b,0x89,0x4b,0x82,0xcb,0x2e,0x97,0x3e,0x2e,0x9b,0x1b,0xc6,0xdd,0xc8,0xbd,0xe4,0x4a,0x74,0xf5,0x71,0x5d,0xe1,0x7a,0xd2,0xf5,0x9d,0x9b,0xb3,0x9b,0xc2,0xed,0xa8,0xdb,0xaf,0xee,0x36,0xee,0x69,0xee,0x87,0xdc,0x9f,0xcc,0x34,0x9f,0x29,0x9e,0x59,0x33,0x73,0xd0,0xc3,0xc8,0x43,0xe0,0x51,0xe5,0xd1,0x3f,0xb,0x9f,0x95,0x30,0x6b,0xdf,0xac,0x7e,0x4f,0x43,0x4f,0x81,0x67,0xb5,0xe7,0x23,0x2f,0x63,0x2f,0x91,0x57,0xad,0xd7,0xb0,0xb7,0xa5,0x77,0xaa,0xf7,0x61,0xef,0x17,0x3e,0xf6,0x3e,0x72,0x9f,0xe3,0x3e,0xe3,0x3c,0x37,0xde,0x32,0xde,0x59,0x5f,0xcc,0x37,0xc0,0xb7,0xc8,0xb7,0xcb,0x4f,0xc3,0x6f,0x9e,0x5f,0x85,0xdf,0x43,0x7f,0x23,0xff,0x64,0xff,0x7a,0xff,0xd1,0x0,0xa7,0x80,0x25,0x1,0x67,0x3,0x89,0x81,0x41,0x81,0x5b,0x2,0xfb,0xf8,0x7a,0x7c,0x21,0xbf,0x8e,0x3f,0x3a,0xdb,0x65,0xf6,0xb2,0xd9,0xed,0x41,0x8c,0xa0,0xb9,0x41,0x15,0x41,0x8f,0x82,0xad,0x82,0xe5,0xc1,0xad,0x21,0x68,0xc8,0xec,0x90,0xad,0x21,0xf7,0xe7,0x98,0xce,0x91,0xce,0x69,0xe,0x85,0x50,0x7e,0xe8,0xd6,0xd0,0x7,0x61,0xe6,0x61,0x8b,0xc3,0x7e,0xc,0x27,0x85,0x87,0x85,0x57,0x86,0x3f,0x8e,0x70,0x88,0x58,0x1a,0xd1,0x31,0x97,0x35,0x77,0xd1,0xdc,0x43,0x73,0xdf,0x44,0xfa,0x44,0x96,0x44,0xde,0x9b,0x67,0x31,0x4f,0x39,0xaf,0x2d,0x4a,0x35,0x2a,0x3e,0xaa,0x2e,0x6a,0x3c,0xda,0x37,0xba,0x34,0xba,0x3f,0xc6,0x2e,0x66,0x59,0xcc,0xd5,0x58,0x9d,0x58,0x49,0x6c,0x4b,0x1c,0x39,0x2e,0x2a,0xae,0x36,0x6e,0x6c,0xbe,0xdf,0xfc,0xed,0xf3,0x87,0xe2,0x9d,0xe2,0xb,0xe3,0x7b,0x17,0x98,0x2f,0xc8,0x5d,0x70,0x79,0xa1,0xce,0xc2,0xf4,0x85,0xa7,0x16,0xa9,0x2e,0x12,0x2c,0x3a,0x96,0x40,0x4c,0x88,0x4e,0x38,0x94,0xf0,0x41,0x10,0x2a,0xa8,0x16,0x8c,0x25,0xf2,0x13,0x77,0x25,0x8e,0xa,0x79,0xc2,0x1d,0xc2,0x67,0x22,0x2f,0xd1,0x36,0xd1,0x88,0xd8,0x43,0x5c,0x2a,0x1e,0x4e,0xf2,0x48,0x2a,0x4d,0x7a,0x92,0xec,0x91,0xbc,0x35,0x79,0x24,0xc5,0x33,0xa5,0x2c,0xe5,0xb9,0x84,0x27,0xa9,0x90,0xbc,0x4c,0xd,0x4c,0xdd,0x9b,0x3a,0x9e,0x16,0x9a,0x76,0x20,0x6d,0x32,0x3d,0x3a,0xbd,0x31,0x83,0x92,0x91,0x90,0x71,0x42,0xaa,0x21,0x4d,0x93,0xb6,0x67,0xea,0x67,0xe6,0x66,0x76,0xcb,0xac,0x65,0x85,0xb2,0xfe,0xc5,0x6e,0x8b,0xb7,0x2f,0x1e,0x95,0x7,0xc9,0x6b,0xb3,0x90,0xac,0x5,0x59,0x2d,0xa,0xb6,0x42,0xa6,0xe8,0x54,0x5a,0x28,0xd7,0x2a,0x7,0xb2,0x67,0x65,0x57,0x66,0xbf,0xcd,0x89,0xca,0x39,0x96,0xab,0x9e,0x2b,0xcd,0xed,0xcc,0xb3,0xca,0xdb,0x90,0x37,0x9c,0xef,0x9f,0xff,0xed,0x12,0xc2,0x12,0xe1,0x92,0xb6,0xa5,0x86,0x4b,0x57,0x2d,0x1d,0x58,0xe6,0xbd,0xac,0x6a,0x39,0xb2,0x3c,0x71,0x79,0xdb,0xa,0xe3,0x15,0x5,0x2b,0x86,0x56,0x6,0xac,0x3c,0xb8,0x8a,0xb6,0x2a,0x6d,0xd5,0x4f,0xab,0xed,0x57,0x97,0xae,0x7e,0xbd,0x26,0x7a,0x4d,0x6b,0x81,0x5e,0xc1,0xca,0x82,0xc1,0xb5,0x1,0x6b,0xeb,0xb,0x55,0xa,0xe5,0x85,0x7d,0xeb,0xdc,0xd7,0xed,0x5d,0x4f,0x58,0x2f,0x59,0xdf,0xb5,0x61,0xfa,0x86,0x9d,0x1b,0x3e,0x15,0x89,0x8a,0xae,0x14,0xdb,0x17,0x97,0x15,0x7f,0xd8,0x28,0xdc,0x78,0xe5,0x1b,0x87,0x6f,0xca,0xbf,0x99,0xdc,0x94,0xb4,0xa9,0xab,0xc4,0xb9,0x64,0xcf,0x66,0xd2,0x66,0xe9,0xe6,0xde,0x2d,0x9e,0x5b,0xe,0x96,0xaa,0x97,0xe6,0x97,0xe,0x6e,0xd,0xd9,0xda,0xb4,0xd,0xdf,0x56,0xb4,0xed,0xf5,0xf6,0x45,0xdb,0x2f,0x97,0xcd,0x28,0xdb,0xbb,0x83,0xb6,0x43,0xb9,0xa3,0xbf,0x3c,0xb8,0xbc,0x65,0xa7,0xc9,0xce,0xcd,0x3b,0x3f,0x54,0xa4,0x54,0xf4,0x54,0xfa,0x54,0x36,0xee,0xd2,0xdd,0xb5,0x61,0xd7,0xf8,0x6e,0xd1,0xee,0x1b,0x7b,0xbc,0xf6,0x34,0xec,0xd5,0xdb,0x5b,0xbc,0xf7,0xfd,0x3e,0xc9,0xbe,0xdb,0x55,0x1,0x55,0x4d,0xd5,0x66,0xd5,0x65,0xfb,0x49,0xfb,0xb3,0xf7,0x3f,0xae,0x89,0xaa,0xe9,0xf8,0x96,0xfb,0x6d,0x5d,0xad,0x4e,0x6d,0x71,0xed,0xc7,0x3,0xd2,0x3,0xfd,0x7,0x23,0xe,0xb6,0xd7,0xb9,0xd4,0xd5,0x1d,0xd2,0x3d,0x54,0x52,0x8f,0xd6,0x2b,0xeb,0x47,0xe,0xc7,0x1f,0xbe,0xfe,0x9d,0xef,0x77,0x2d,0xd,0x36,0xd,0x55,0x8d,0x9c,0xc6,0xe2,0x23,0x70,0x44,0x79,0xe4,0xe9,0xf7,0x9,0xdf,0xf7,0x1e,0xd,0x3a,0xda,0x76,0x8c,0x7b,0xac,0xe1,0x7,0xd3,0x1f,0x76,0x1d,0x67,0x1d,0x2f,0x6a,0x42,0x9a,0xf2,0x9a,0x46,0x9b,0x53,0x9a,0xfb,0x5b,0x62,0x5b,0xba,0x4f,0xcc,0x3e,0xd1,0xd6,0xea,0xde,0x7a,0xfc,0x47,0xdb,0x1f,0xf,0x9c,0x34,0x3c,0x59,0x79,0x4a,0xf3,0x54,0xc9,0x69,0xda,0xe9,0x82,0xd3,0x93,0x67,0xf2,0xcf,0x8c,0x9d,0x95,0x9d,0x7d,0x7e,0x2e,0xf9,0xdc,0x60,0xdb,0xa2,0xb6,0x7b,0xe7,0x63,0xce,0xdf,0x6a,0xf,0x6f,0xef,0xba,0x10,0x74,0xe1,0xd2,0x45,0xff,0x8b,0xe7,0x3b,0xbc,0x3b,0xce,0x5c,0xf2,0xb8,0x74,0xf2,0xb2,0xdb,0xe5,0x13,0x57,0xb8,0x57,0x9a,0xaf,0x3a,0x5f,0x6d,0xea,0x74,0xea,0x3c,0xfe,0x93,0xd3,0x4f,0xc7,0xbb,0x9c,0xbb,0x9a,0xae,0xb9,0x5c,0x6b,0xb9,0xee,0x7a,0xbd,0xb5,0x7b,0x66,0xf7,0xe9,0x1b,0x9e,0x37,0xce,0xdd,0xf4,0xbd,0x79,0xf1,0x16,0xff,0xd6,0xd5,0x9e,0x39,0x3d,0xdd,0xbd,0xf3,0x7a,0x6f,0xf7,0xc5,0xf7,0xf5,0xdf,0x16,0xdd,0x7e,0x72,0x27,0xfd,0xce,0xcb,0xbb,0xd9,0x77,0x27,0xee,0xad,0xbc,0x4f,0xbc,0x5f,0xf4,0x40,0xed,0x41,0xd9,0x43,0xdd,0x87,0xd5,0x3f,0x5b,0xfe,0xdc,0xd8,0xef,0xdc,0x7f,0x6a,0xc0,0x77,0xa0,0xf3,0xd1,0xdc,0x47,0xf7,0x6,0x85,0x83,0xcf,0xfe,0x91,0xf5,0x8f,0xf,0x43,0x5,0x8f,0x99,0x8f,0xcb,0x86,0xd,0x86,0xeb,0x9e,0x38,0x3e,0x39,0x39,0xe2,0x3f,0x72,0xfd,0xe9,0xfc,0xa7,0x43,0xcf,0x64,0xcf,0x26,0x9e,0x17,0xfe,0xa2,0xfe,0xcb,0xae,0x17,0x16,0x2f,0x7e,0xf8,0xd5,0xeb,0xd7,0xce,0xd1,0x98,0xd1,0xa1,0x97,0xf2,0x97,0x93,0xbf,0x6d,0x7c,0xa5,0xfd,0xea,0xc0,0xeb,0x19,0xaf,0xdb,0xc6,0xc2,0xc6,0x1e,0xbe,0xc9,0x78,0x33,0x31,0x5e,0xf4,0x56,0xfb,0xed,0xc1,0x77,0xdc,0x77,0x1d,0xef,0xa3,0xdf,0xf,0x4f,0xe4,0x7c,0x20,0x7f,0x28,0xff,0x68,0xf9,0xb1,0xf5,0x53,0xd0,0xa7,0xfb,0x93,0x19,0x93,0x93,0xff,0x4,0x3,0x98,0xf3,0xfc,0xef,0x35,0x94,0x82,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xa,0x15,0x0,0x5,0x21,0x33,0xd5,0x5f,0x4d,0x0,0x0,0x1,0x3a,0x49,0x44,0x41,0x54,0x38,0xcb,0xa5,0x93,0x41,0x4a,0x3,0x51,0xc,0x86,0xbf,0x37,0xef,0xd1,0x11,0x5d,0x74,0x40,0xc1,0x5a,0xea,0x45,0xc4,0xa5,0x27,0xf0,0x34,0x73,0x84,0xe2,0x61,0x3c,0x81,0xee,0xc4,0x8b,0x8,0x76,0xd3,0xea,0x14,0x5a,0xe8,0x74,0xde,0x4b,0x5c,0x4c,0x46,0x2a,0xd4,0x3a,0xc5,0x40,0x20,0x8b,0xe4,0x4f,0xfe,0xf0,0xff,0xe,0x8,0xc0,0x0,0xc8,0x81,0x13,0xab,0x3d,0x90,0xf1,0x33,0x4,0x48,0xc0,0x16,0xd8,0x0,0x35,0xb0,0xed,0x86,0xcf,0x80,0x2,0x18,0x5a,0x9d,0x3,0xce,0x12,0x40,0x2d,0x6b,0x60,0xd,0x2c,0x81,0xa,0xdb,0x9e,0x3,0xc5,0xed,0xcd,0xdd,0xfd,0xf8,0xea,0xba,0x8c,0x29,0x16,0xaa,0xec,0xd,0xe7,0x20,0xf8,0x50,0xbd,0xcf,0xde,0xa6,0x2f,0xaf,0x4f,0x8f,0x40,0xc,0x76,0xf6,0x70,0x3c,0x9a,0x94,0xd5,0xe7,0xa2,0x88,0x31,0xa2,0xec,0x47,0x70,0x38,0x42,0x8,0xc5,0x78,0x34,0x29,0x81,0x67,0x60,0xf5,0x4d,0xa1,0x89,0x4d,0xd1,0xc4,0xe6,0xd7,0xe1,0x96,0x87,0xd2,0xc4,0x86,0x26,0x36,0x85,0x51,0x1d,0x4,0x7b,0x58,0x2e,0x22,0x88,0xa,0x7f,0x85,0xa2,0x88,0x8,0x46,0xdd,0x7,0xfb,0xb6,0x53,0x51,0x54,0x94,0x3e,0x61,0x7d,0xe,0xc8,0x42,0x47,0x2f,0x69,0xea,0x75,0x1,0x40,0xd2,0xd4,0x1,0x10,0x76,0x51,0x55,0x8f,0xba,0x80,0x5d,0x0,0x55,0x3d,0x2,0xa0,0xed,0xd3,0xe,0x40,0x5a,0xd0,0x84,0xf6,0xa4,0x20,0x2d,0x5,0x5,0x24,0x98,0x3c,0x6b,0x84,0xde,0x4f,0xa4,0xdd,0x53,0x3,0x29,0x33,0x6d,0xaf,0x71,0x59,0x95,0x79,0x8f,0xa8,0x1e,0xcc,0xcc,0x7b,0x70,0x59,0x65,0x92,0xde,0x6,0x33,0xc6,0x72,0xbe,0x98,0x4d,0x2f,0xce,0x2f,0xcb,0x24,0xa9,0xe0,0x80,0x96,0x7d,0x16,0x3e,0xe6,0x8b,0xd9,0x83,0xf9,0x61,0xe3,0x80,0xd3,0x7f,0x98,0x69,0x1d,0x8c,0x2,0x40,0x4,0x56,0xc7,0xda,0xf9,0xb,0x57,0x2d,0xbb,0xf5,0x2d,0xe4,0x89,0x1b,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x8a,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3c,0x3a,0x44,0x56,0x53,0x61,0x56,0x52,0x60,0x47,0x44,0x52,0x33,0x31,0x39,0x47,0x44,0x50,0x47,0x44,0x51,0x52,0x50,0x5d,0x51,0x4f,0x5d,0x46,0x42,0x4e,0x42,0x3e,0x4a,0x41,0x3e,0x49,0x51,0x4e,0x5b,0x40,0x3e,0x48,0x4f,0x4c,0x59,0x3f,0x3d,0x47,0x4e,0x4a,0x58,0x3e,0x3b,0x46,0x4b,0x49,0x55,0x3c,0x3a,0x44,0x4a,0x47,0x54,0x3b,0x39,0x43,0x49,0x46,0x53,0x3a,0x38,0x42,0x47,0x45,0x50,0x39,0x37,0x40,0x47,0x43,0x50,0x38,0x35,0x3f,0x36,0x34,0x3e,0x44,0x42,0x4d,0x44,0x41,0x4c,0xff,0xff,0xff,0xe5,0x37,0x10,0x78,0x0,0x0,0x0,0x15,0x74,0x52,0x4e,0x53,0x4,0xa,0x11,0x19,0x1f,0x22,0x24,0x15,0x25,0x34,0x3f,0x46,0x47,0x48,0x77,0xef,0xef,0xef,0x77,0xef,0xed,0xe8,0xff,0x76,0xed,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x2d,0xcd,0xda,0x41,0x3d,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x93,0x49,0x44,0x41,0x54,0x18,0xd3,0x65,0xcf,0x47,0x12,0x82,0x40,0x10,0x5,0xd0,0x9e,0xc8,0x44,0x92,0x22,0x41,0x54,0x44,0x40,0x14,0xef,0x7f,0x3e,0x7,0x8a,0xea,0x85,0xbe,0xe5,0xaf,0xea,0xf0,0x1,0x8,0x65,0x5c,0xc8,0x40,0x70,0x46,0x9,0x0,0x89,0x94,0x36,0xd6,0x79,0xef,0xac,0xd1,0x2a,0x22,0x40,0x55,0x9c,0x14,0xa7,0x4d,0x91,0xc4,0x8a,0x2,0xd3,0x69,0x59,0xd5,0x9b,0xaa,0x4c,0x35,0x3,0x6e,0x9a,0xfa,0xbc,0xab,0x1b,0xc3,0x41,0xd8,0xf6,0x82,0x5a,0x2b,0x40,0xba,0xeb,0xd,0x5d,0x9d,0x4,0xe9,0xbb,0x3b,0xea,0xfc,0x1a,0xf4,0xf,0xd4,0xaf,0x81,0x1b,0x46,0x34,0x84,0x11,0x61,0xa7,0x27,0x9a,0xc2,0x52,0x6e,0xe6,0x17,0x9a,0xc3,0x59,0xa6,0xb3,0xf1,0xbd,0x1b,0xb3,0xf0,0x18,0x55,0xf9,0x61,0xf9,0x6c,0x96,0x63,0x1e,0x5e,0xff,0x2b,0xf7,0x5b,0xff,0xb,0x69,0x5a,0x14,0xfa,0x84,0xf6,0xc2,0x8,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char tab_current_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0xa,0x45,0x69,0x43,0x43,0x50,0x49,0x43,0x43,0x20,0x70,0x72,0x6f,0x66,0x69,0x6c,0x65,0x0,0x0,0x78,0xda,0x9d,0x53,0x67,0x54,0x53,0xe9,0x16,0x3d,0xf7,0xde,0xf4,0x42,0x4b,0x88,0x80,0x94,0x4b,0x6f,0x52,0x15,0x8,0x20,0x52,0x42,0x8b,0x80,0x14,0x91,0x26,0x2a,0x21,0x9,0x10,0x4a,0x88,0x21,0xa1,0xd9,0x15,0x51,0xc1,0x11,0x45,0x45,0x4,0x1b,0xc8,0xa0,0x88,0x3,0x8e,0x8e,0x80,0x8c,0x15,0x51,0x2c,0xc,0x8a,0xa,0xd8,0x7,0xe4,0x21,0xa2,0x8e,0x83,0xa3,0x88,0x8a,0xca,0xfb,0xe1,0x7b,0xa3,0x6b,0xd6,0xbc,0xf7,0xe6,0xcd,0xfe,0xb5,0xd7,0x3e,0xe7,0xac,0xf3,0x9d,0xb3,0xcf,0x7,0xc0,0x8,0xc,0x96,0x48,0x33,0x51,0x35,0x80,0xc,0xa9,0x42,0x1e,0x11,0xe0,0x83,0xc7,0xc4,0xc6,0xe1,0xe4,0x2e,0x40,0x81,0xa,0x24,0x70,0x0,0x10,0x8,0xb3,0x64,0x21,0x73,0xfd,0x23,0x1,0x0,0xf8,0x7e,0x3c,0x3c,0x2b,0x22,0xc0,0x7,0xbe,0x0,0x1,0x78,0xd3,0xb,0x8,0x0,0xc0,0x4d,0x9b,0xc0,0x30,0x1c,0x87,0xff,0xf,0xea,0x42,0x99,0x5c,0x1,0x80,0x84,0x1,0xc0,0x74,0x91,0x38,0x4b,0x8,0x80,0x14,0x0,0x40,0x7a,0x8e,0x42,0xa6,0x0,0x40,0x46,0x1,0x80,0x9d,0x98,0x26,0x53,0x0,0xa0,0x4,0x0,0x60,0xcb,0x63,0x62,0xe3,0x0,0x50,0x2d,0x0,0x60,0x27,0x7f,0xe6,0xd3,0x0,0x80,0x9d,0xf8,0x99,0x7b,0x1,0x0,0x5b,0x94,0x21,0x15,0x1,0xa0,0x91,0x0,0x20,0x13,0x65,0x88,0x44,0x0,0x68,0x3b,0x0,0xac,0xcf,0x56,0x8a,0x45,0x0,0x58,0x30,0x0,0x14,0x66,0x4b,0xc4,0x39,0x0,0xd8,0x2d,0x0,0x30,0x49,0x57,0x66,0x48,0x0,0xb0,0xb7,0x0,0xc0,0xce,0x10,0xb,0xb2,0x0,0x8,0xc,0x0,0x30,0x51,0x88,0x85,0x29,0x0,0x4,0x7b,0x0,0x60,0xc8,0x23,0x23,0x78,0x0,0x84,0x99,0x0,0x14,0x46,0xf2,0x57,0x3c,0xf1,0x2b,0xae,0x10,0xe7,0x2a,0x0,0x0,0x78,0x99,0xb2,0x3c,0xb9,0x24,0x39,0x45,0x81,0x5b,0x8,0x2d,0x71,0x7,0x57,0x57,0x2e,0x1e,0x28,0xce,0x49,0x17,0x2b,0x14,0x36,0x61,0x2,0x61,0x9a,0x40,0x2e,0xc2,0x79,0x99,0x19,0x32,0x81,0x34,0xf,0xe0,0xf3,0xcc,0x0,0x0,0xa0,0x91,0x15,0x11,0xe0,0x83,0xf3,0xfd,0x78,0xce,0xe,0xae,0xce,0xce,0x36,0x8e,0xb6,0xe,0x5f,0x2d,0xea,0xbf,0x6,0xff,0x22,0x62,0x62,0xe3,0xfe,0xe5,0xcf,0xab,0x70,0x40,0x0,0x0,0xe1,0x74,0x7e,0xd1,0xfe,0x2c,0x2f,0xb3,0x1a,0x80,0x3b,0x6,0x80,0x6d,0xfe,0xa2,0x25,0xee,0x4,0x68,0x5e,0xb,0xa0,0x75,0xf7,0x8b,0x66,0xb2,0xf,0x40,0xb5,0x0,0xa0,0xe9,0xda,0x57,0xf3,0x70,0xf8,0x7e,0x3c,0x3c,0x45,0xa1,0x90,0xb9,0xd9,0xd9,0xe5,0xe4,0xe4,0xd8,0x4a,0xc4,0x42,0x5b,0x61,0xca,0x57,0x7d,0xfe,0x67,0xc2,0x5f,0xc0,0x57,0xfd,0x6c,0xf9,0x7e,0x3c,0xfc,0xf7,0xf5,0xe0,0xbe,0xe2,0x24,0x81,0x32,0x5d,0x81,0x47,0x4,0xf8,0xe0,0xc2,0xcc,0xf4,0x4c,0xa5,0x1c,0xcf,0x92,0x9,0x84,0x62,0xdc,0xe6,0x8f,0x47,0xfc,0xb7,0xb,0xff,0xfc,0x1d,0xd3,0x22,0xc4,0x49,0x62,0xb9,0x58,0x2a,0x14,0xe3,0x51,0x12,0x71,0x8e,0x44,0x9a,0x8c,0xf3,0x32,0xa5,0x22,0x89,0x42,0x92,0x29,0xc5,0x25,0xd2,0xff,0x64,0xe2,0xdf,0x2c,0xfb,0x3,0x3e,0xdf,0x35,0x0,0xb0,0x6a,0x3e,0x1,0x7b,0x91,0x2d,0xa8,0x5d,0x63,0x3,0xf6,0x4b,0x27,0x10,0x58,0x74,0xc0,0xe2,0xf7,0x0,0x0,0xf2,0xbb,0x6f,0xc1,0xd4,0x28,0x8,0x3,0x80,0x68,0x83,0xe1,0xcf,0x77,0xff,0xef,0x3f,0xfd,0x47,0xa0,0x25,0x0,0x80,0x66,0x49,0x92,0x71,0x0,0x0,0x5e,0x44,0x24,0x2e,0x54,0xca,0xb3,0x3f,0xc7,0x8,0x0,0x0,0x44,0xa0,0x81,0x2a,0xb0,0x41,0x1b,0xf4,0xc1,0x18,0x2c,0xc0,0x6,0x1c,0xc1,0x5,0xdc,0xc1,0xb,0xfc,0x60,0x36,0x84,0x42,0x24,0xc4,0xc2,0x42,0x10,0x42,0xa,0x64,0x80,0x1c,0x72,0x60,0x29,0xac,0x82,0x42,0x28,0x86,0xcd,0xb0,0x1d,0x2a,0x60,0x2f,0xd4,0x40,0x1d,0x34,0xc0,0x51,0x68,0x86,0x93,0x70,0xe,0x2e,0xc2,0x55,0xb8,0xe,0x3d,0x70,0xf,0xfa,0x61,0x8,0x9e,0xc1,0x28,0xbc,0x81,0x9,0x4,0x41,0xc8,0x8,0x13,0x61,0x21,0xda,0x88,0x1,0x62,0x8a,0x58,0x23,0x8e,0x8,0x17,0x99,0x85,0xf8,0x21,0xc1,0x48,0x4,0x12,0x8b,0x24,0x20,0xc9,0x88,0x14,0x51,0x22,0x4b,0x91,0x35,0x48,0x31,0x52,0x8a,0x54,0x20,0x55,0x48,0x1d,0xf2,0x3d,0x72,0x2,0x39,0x87,0x5c,0x46,0xba,0x91,0x3b,0xc8,0x0,0x32,0x82,0xfc,0x86,0xbc,0x47,0x31,0x94,0x81,0xb2,0x51,0x3d,0xd4,0xc,0xb5,0x43,0xb9,0xa8,0x37,0x1a,0x84,0x46,0xa2,0xb,0xd0,0x64,0x74,0x31,0x9a,0x8f,0x16,0xa0,0x9b,0xd0,0x72,0xb4,0x1a,0x3d,0x8c,0x36,0xa1,0xe7,0xd0,0xab,0x68,0xf,0xda,0x8f,0x3e,0x43,0xc7,0x30,0xc0,0xe8,0x18,0x7,0x33,0xc4,0x6c,0x30,0x2e,0xc6,0xc3,0x42,0xb1,0x38,0x2c,0x9,0x93,0x63,0xcb,0xb1,0x22,0xac,0xc,0xab,0xc6,0x1a,0xb0,0x56,0xac,0x3,0xbb,0x89,0xf5,0x63,0xcf,0xb1,0x77,0x4,0x12,0x81,0x45,0xc0,0x9,0x36,0x4,0x77,0x42,0x20,0x61,0x1e,0x41,0x48,0x58,0x4c,0x58,0x4e,0xd8,0x48,0xa8,0x20,0x1c,0x24,0x34,0x11,0xda,0x9,0x37,0x9,0x3,0x84,0x51,0xc2,0x27,0x22,0x93,0xa8,0x4b,0xb4,0x26,0xba,0x11,0xf9,0xc4,0x18,0x62,0x32,0x31,0x87,0x58,0x48,0x2c,0x23,0xd6,0x12,0x8f,0x13,0x2f,0x10,0x7b,0x88,0x43,0xc4,0x37,0x24,0x12,0x89,0x43,0x32,0x27,0xb9,0x90,0x2,0x49,0xb1,0xa4,0x54,0xd2,0x12,0xd2,0x46,0xd2,0x6e,0x52,0x23,0xe9,0x2c,0xa9,0x9b,0x34,0x48,0x1a,0x23,0x93,0xc9,0xda,0x64,0x6b,0xb2,0x7,0x39,0x94,0x2c,0x20,0x2b,0xc8,0x85,0xe4,0x9d,0xe4,0xc3,0xe4,0x33,0xe4,0x1b,0xe4,0x21,0xf2,0x5b,0xa,0x9d,0x62,0x40,0x71,0xa4,0xf8,0x53,0xe2,0x28,0x52,0xca,0x6a,0x4a,0x19,0xe5,0x10,0xe5,0x34,0xe5,0x6,0x65,0x98,0x32,0x41,0x55,0xa3,0x9a,0x52,0xdd,0xa8,0xa1,0x54,0x11,0x35,0x8f,0x5a,0x42,0xad,0xa1,0xb6,0x52,0xaf,0x51,0x87,0xa8,0x13,0x34,0x75,0x9a,0x39,0xcd,0x83,0x16,0x49,0x4b,0xa5,0xad,0xa2,0x95,0xd3,0x1a,0x68,0x17,0x68,0xf7,0x69,0xaf,0xe8,0x74,0xba,0x11,0xdd,0x95,0x1e,0x4e,0x97,0xd0,0x57,0xd2,0xcb,0xe9,0x47,0xe8,0x97,0xe8,0x3,0xf4,0x77,0xc,0xd,0x86,0x15,0x83,0xc7,0x88,0x67,0x28,0x19,0x9b,0x18,0x7,0x18,0x67,0x19,0x77,0x18,0xaf,0x98,0x4c,0xa6,0x19,0xd3,0x8b,0x19,0xc7,0x54,0x30,0x37,0x31,0xeb,0x98,0xe7,0x99,0xf,0x99,0x6f,0x55,0x58,0x2a,0xb6,0x2a,0x7c,0x15,0x91,0xca,0xa,0x95,0x4a,0x95,0x26,0x95,0x1b,0x2a,0x2f,0x54,0xa9,0xaa,0xa6,0xaa,0xde,0xaa,0xb,0x55,0xf3,0x55,0xcb,0x54,0x8f,0xa9,0x5e,0x53,0x7d,0xae,0x46,0x55,0x33,0x53,0xe3,0xa9,0x9,0xd4,0x96,0xab,0x55,0xaa,0x9d,0x50,0xeb,0x53,0x1b,0x53,0x67,0xa9,0x3b,0xa8,0x87,0xaa,0x67,0xa8,0x6f,0x54,0x3f,0xa4,0x7e,0x59,0xfd,0x89,0x6,0x59,0xc3,0x4c,0xc3,0x4f,0x43,0xa4,0x51,0xa0,0xb1,0x5f,0xe3,0xbc,0xc6,0x20,0xb,0x63,0x19,0xb3,0x78,0x2c,0x21,0x6b,0xd,0xab,0x86,0x75,0x81,0x35,0xc4,0x26,0xb1,0xcd,0xd9,0x7c,0x76,0x2a,0xbb,0x98,0xfd,0x1d,0xbb,0x8b,0x3d,0xaa,0xa9,0xa1,0x39,0x43,0x33,0x4a,0x33,0x57,0xb3,0x52,0xf3,0x94,0x66,0x3f,0x7,0xe3,0x98,0x71,0xf8,0x9c,0x74,0x4e,0x9,0xe7,0x28,0xa7,0x97,0xf3,0x7e,0x8a,0xde,0x14,0xef,0x29,0xe2,0x29,0x1b,0xa6,0x34,0x4c,0xb9,0x31,0x65,0x5c,0x6b,0xaa,0x96,0x97,0x96,0x58,0xab,0x48,0xab,0x51,0xab,0x47,0xeb,0xbd,0x36,0xae,0xed,0xa7,0x9d,0xa6,0xbd,0x45,0xbb,0x59,0xfb,0x81,0xe,0x41,0xc7,0x4a,0x27,0x5c,0x27,0x47,0x67,0x8f,0xce,0x5,0x9d,0xe7,0x53,0xd9,0x53,0xdd,0xa7,0xa,0xa7,0x16,0x4d,0x3d,0x3a,0xf5,0xae,0x2e,0xaa,0x6b,0xa5,0x1b,0xa1,0xbb,0x44,0x77,0xbf,0x6e,0xa7,0xee,0x98,0x9e,0xbe,0x5e,0x80,0x9e,0x4c,0x6f,0xa7,0xde,0x79,0xbd,0xe7,0xfa,0x1c,0x7d,0x2f,0xfd,0x54,0xfd,0x6d,0xfa,0xa7,0xf5,0x47,0xc,0x58,0x6,0xb3,0xc,0x24,0x6,0xdb,0xc,0xce,0x18,0x3c,0xc5,0x35,0x71,0x6f,0x3c,0x1d,0x2f,0xc7,0xdb,0xf1,0x51,0x43,0x5d,0xc3,0x40,0x43,0xa5,0x61,0x95,0x61,0x97,0xe1,0x84,0x91,0xb9,0xd1,0x3c,0xa3,0xd5,0x46,0x8d,0x46,0xf,0x8c,0x69,0xc6,0x5c,0xe3,0x24,0xe3,0x6d,0xc6,0x6d,0xc6,0xa3,0x26,0x6,0x26,0x21,0x26,0x4b,0x4d,0xea,0x4d,0xee,0x9a,0x52,0x4d,0xb9,0xa6,0x29,0xa6,0x3b,0x4c,0x3b,0x4c,0xc7,0xcd,0xcc,0xcd,0xa2,0xcd,0xd6,0x99,0x35,0x9b,0x3d,0x31,0xd7,0x32,0xe7,0x9b,0xe7,0x9b,0xd7,0x9b,0xdf,0xb7,0x60,0x5a,0x78,0x5a,0x2c,0xb6,0xa8,0xb6,0xb8,0x65,0x49,0xb2,0xe4,0x5a,0xa6,0x59,0xee,0xb6,0xbc,0x6e,0x85,0x5a,0x39,0x59,0xa5,0x58,0x55,0x5a,0x5d,0xb3,0x46,0xad,0x9d,0xad,0x25,0xd6,0xbb,0xad,0xbb,0xa7,0x11,0xa7,0xb9,0x4e,0x93,0x4e,0xab,0x9e,0xd6,0x67,0xc3,0xb0,0xf1,0xb6,0xc9,0xb6,0xa9,0xb7,0x19,0xb0,0xe5,0xd8,0x6,0xdb,0xae,0xb6,0x6d,0xb6,0x7d,0x61,0x67,0x62,0x17,0x67,0xb7,0xc5,0xae,0xc3,0xee,0x93,0xbd,0x93,0x7d,0xba,0x7d,0x8d,0xfd,0x3d,0x7,0xd,0x87,0xd9,0xe,0xab,0x1d,0x5a,0x1d,0x7e,0x73,0xb4,0x72,0x14,0x3a,0x56,0x3a,0xde,0x9a,0xce,0x9c,0xee,0x3f,0x7d,0xc5,0xf4,0x96,0xe9,0x2f,0x67,0x58,0xcf,0x10,0xcf,0xd8,0x33,0xe3,0xb6,0x13,0xcb,0x29,0xc4,0x69,0x9d,0x53,0x9b,0xd3,0x47,0x67,0x17,0x67,0xb9,0x73,0x83,0xf3,0x88,0x8b,0x89,0x4b,0x82,0xcb,0x2e,0x97,0x3e,0x2e,0x9b,0x1b,0xc6,0xdd,0xc8,0xbd,0xe4,0x4a,0x74,0xf5,0x71,0x5d,0xe1,0x7a,0xd2,0xf5,0x9d,0x9b,0xb3,0x9b,0xc2,0xed,0xa8,0xdb,0xaf,0xee,0x36,0xee,0x69,0xee,0x87,0xdc,0x9f,0xcc,0x34,0x9f,0x29,0x9e,0x59,0x33,0x73,0xd0,0xc3,0xc8,0x43,0xe0,0x51,0xe5,0xd1,0x3f,0xb,0x9f,0x95,0x30,0x6b,0xdf,0xac,0x7e,0x4f,0x43,0x4f,0x81,0x67,0xb5,0xe7,0x23,0x2f,0x63,0x2f,0x91,0x57,0xad,0xd7,0xb0,0xb7,0xa5,0x77,0xaa,0xf7,0x61,0xef,0x17,0x3e,0xf6,0x3e,0x72,0x9f,0xe3,0x3e,0xe3,0x3c,0x37,0xde,0x32,0xde,0x59,0x5f,0xcc,0x37,0xc0,0xb7,0xc8,0xb7,0xcb,0x4f,0xc3,0x6f,0x9e,0x5f,0x85,0xdf,0x43,0x7f,0x23,0xff,0x64,0xff,0x7a,0xff,0xd1,0x0,0xa7,0x80,0x25,0x1,0x67,0x3,0x89,0x81,0x41,0x81,0x5b,0x2,0xfb,0xf8,0x7a,0x7c,0x21,0xbf,0x8e,0x3f,0x3a,0xdb,0x65,0xf6,0xb2,0xd9,0xed,0x41,0x8c,0xa0,0xb9,0x41,0x15,0x41,0x8f,0x82,0xad,0x82,0xe5,0xc1,0xad,0x21,0x68,0xc8,0xec,0x90,0xad,0x21,0xf7,0xe7,0x98,0xce,0x91,0xce,0x69,0xe,0x85,0x50,0x7e,0xe8,0xd6,0xd0,0x7,0x61,0xe6,0x61,0x8b,0xc3,0x7e,0xc,0x27,0x85,0x87,0x85,0x57,0x86,0x3f,0x8e,0x70,0x88,0x58,0x1a,0xd1,0x31,0x97,0x35,0x77,0xd1,0xdc,0x43,0x73,0xdf,0x44,0xfa,0x44,0x96,0x44,0xde,0x9b,0x67,0x31,0x4f,0x39,0xaf,0x2d,0x4a,0x35,0x2a,0x3e,0xaa,0x2e,0x6a,0x3c,0xda,0x37,0xba,0x34,0xba,0x3f,0xc6,0x2e,0x66,0x59,0xcc,0xd5,0x58,0x9d,0x58,0x49,0x6c,0x4b,0x1c,0x39,0x2e,0x2a,0xae,0x36,0x6e,0x6c,0xbe,0xdf,0xfc,0xed,0xf3,0x87,0xe2,0x9d,0xe2,0xb,0xe3,0x7b,0x17,0x98,0x2f,0xc8,0x5d,0x70,0x79,0xa1,0xce,0xc2,0xf4,0x85,0xa7,0x16,0xa9,0x2e,0x12,0x2c,0x3a,0x96,0x40,0x4c,0x88,0x4e,0x38,0x94,0xf0,0x41,0x10,0x2a,0xa8,0x16,0x8c,0x25,0xf2,0x13,0x77,0x25,0x8e,0xa,0x79,0xc2,0x1d,0xc2,0x67,0x22,0x2f,0xd1,0x36,0xd1,0x88,0xd8,0x43,0x5c,0x2a,0x1e,0x4e,0xf2,0x48,0x2a,0x4d,0x7a,0x92,0xec,0x91,0xbc,0x35,0x79,0x24,0xc5,0x33,0xa5,0x2c,0xe5,0xb9,0x84,0x27,0xa9,0x90,0xbc,0x4c,0xd,0x4c,0xdd,0x9b,0x3a,0x9e,0x16,0x9a,0x76,0x20,0x6d,0x32,0x3d,0x3a,0xbd,0x31,0x83,0x92,0x91,0x90,0x71,0x42,0xaa,0x21,0x4d,0x93,0xb6,0x67,0xea,0x67,0xe6,0x66,0x76,0xcb,0xac,0x65,0x85,0xb2,0xfe,0xc5,0x6e,0x8b,0xb7,0x2f,0x1e,0x95,0x7,0xc9,0x6b,0xb3,0x90,0xac,0x5,0x59,0x2d,0xa,0xb6,0x42,0xa6,0xe8,0x54,0x5a,0x28,0xd7,0x2a,0x7,0xb2,0x67,0x65,0x57,0x66,0xbf,0xcd,0x89,0xca,0x39,0x96,0xab,0x9e,0x2b,0xcd,0xed,0xcc,0xb3,0xca,0xdb,0x90,0x37,0x9c,0xef,0x9f,0xff,0xed,0x12,0xc2,0x12,0xe1,0x92,0xb6,0xa5,0x86,0x4b,0x57,0x2d,0x1d,0x58,0xe6,0xbd,0xac,0x6a,0x39,0xb2,0x3c,0x71,0x79,0xdb,0xa,0xe3,0x15,0x5,0x2b,0x86,0x56,0x6,0xac,0x3c,0xb8,0x8a,0xb6,0x2a,0x6d,0xd5,0x4f,0xab,0xed,0x57,0x97,0xae,0x7e,0xbd,0x26,0x7a,0x4d,0x6b,0x81,0x5e,0xc1,0xca,0x82,0xc1,0xb5,0x1,0x6b,0xeb,0xb,0x55,0xa,0xe5,0x85,0x7d,0xeb,0xdc,0xd7,0xed,0x5d,0x4f,0x58,0x2f,0x59,0xdf,0xb5,0x61,0xfa,0x86,0x9d,0x1b,0x3e,0x15,0x89,0x8a,0xae,0x14,0xdb,0x17,0x97,0x15,0x7f,0xd8,0x28,0xdc,0x78,0xe5,0x1b,0x87,0x6f,0xca,0xbf,0x99,0xdc,0x94,0xb4,0xa9,0xab,0xc4,0xb9,0x64,0xcf,0x66,0xd2,0x66,0xe9,0xe6,0xde,0x2d,0x9e,0x5b,0xe,0x96,0xaa,0x97,0xe6,0x97,0xe,0x6e,0xd,0xd9,0xda,0xb4,0xd,0xdf,0x56,0xb4,0xed,0xf5,0xf6,0x45,0xdb,0x2f,0x97,0xcd,0x28,0xdb,0xbb,0x83,0xb6,0x43,0xb9,0xa3,0xbf,0x3c,0xb8,0xbc,0x65,0xa7,0xc9,0xce,0xcd,0x3b,0x3f,0x54,0xa4,0x54,0xf4,0x54,0xfa,0x54,0x36,0xee,0xd2,0xdd,0xb5,0x61,0xd7,0xf8,0x6e,0xd1,0xee,0x1b,0x7b,0xbc,0xf6,0x34,0xec,0xd5,0xdb,0x5b,0xbc,0xf7,0xfd,0x3e,0xc9,0xbe,0xdb,0x55,0x1,0x55,0x4d,0xd5,0x66,0xd5,0x65,0xfb,0x49,0xfb,0xb3,0xf7,0x3f,0xae,0x89,0xaa,0xe9,0xf8,0x96,0xfb,0x6d,0x5d,0xad,0x4e,0x6d,0x71,0xed,0xc7,0x3,0xd2,0x3,0xfd,0x7,0x23,0xe,0xb6,0xd7,0xb9,0xd4,0xd5,0x1d,0xd2,0x3d,0x54,0x52,0x8f,0xd6,0x2b,0xeb,0x47,0xe,0xc7,0x1f,0xbe,0xfe,0x9d,0xef,0x77,0x2d,0xd,0x36,0xd,0x55,0x8d,0x9c,0xc6,0xe2,0x23,0x70,0x44,0x79,0xe4,0xe9,0xf7,0x9,0xdf,0xf7,0x1e,0xd,0x3a,0xda,0x76,0x8c,0x7b,0xac,0xe1,0x7,0xd3,0x1f,0x76,0x1d,0x67,0x1d,0x2f,0x6a,0x42,0x9a,0xf2,0x9a,0x46,0x9b,0x53,0x9a,0xfb,0x5b,0x62,0x5b,0xba,0x4f,0xcc,0x3e,0xd1,0xd6,0xea,0xde,0x7a,0xfc,0x47,0xdb,0x1f,0xf,0x9c,0x34,0x3c,0x59,0x79,0x4a,0xf3,0x54,0xc9,0x69,0xda,0xe9,0x82,0xd3,0x93,0x67,0xf2,0xcf,0x8c,0x9d,0x95,0x9d,0x7d,0x7e,0x2e,0xf9,0xdc,0x60,0xdb,0xa2,0xb6,0x7b,0xe7,0x63,0xce,0xdf,0x6a,0xf,0x6f,0xef,0xba,0x10,0x74,0xe1,0xd2,0x45,0xff,0x8b,0xe7,0x3b,0xbc,0x3b,0xce,0x5c,0xf2,0xb8,0x74,0xf2,0xb2,0xdb,0xe5,0x13,0x57,0xb8,0x57,0x9a,0xaf,0x3a,0x5f,0x6d,0xea,0x74,0xea,0x3c,0xfe,0x93,0xd3,0x4f,0xc7,0xbb,0x9c,0xbb,0x9a,0xae,0xb9,0x5c,0x6b,0xb9,0xee,0x7a,0xbd,0xb5,0x7b,0x66,0xf7,0xe9,0x1b,0x9e,0x37,0xce,0xdd,0xf4,0xbd,0x79,0xf1,0x16,0xff,0xd6,0xd5,0x9e,0x39,0x3d,0xdd,0xbd,0xf3,0x7a,0x6f,0xf7,0xc5,0xf7,0xf5,0xdf,0x16,0xdd,0x7e,0x72,0x27,0xfd,0xce,0xcb,0xbb,0xd9,0x77,0x27,0xee,0xad,0xbc,0x4f,0xbc,0x5f,0xf4,0x40,0xed,0x41,0xd9,0x43,0xdd,0x87,0xd5,0x3f,0x5b,0xfe,0xdc,0xd8,0xef,0xdc,0x7f,0x6a,0xc0,0x77,0xa0,0xf3,0xd1,0xdc,0x47,0xf7,0x6,0x85,0x83,0xcf,0xfe,0x91,0xf5,0x8f,0xf,0x43,0x5,0x8f,0x99,0x8f,0xcb,0x86,0xd,0x86,0xeb,0x9e,0x38,0x3e,0x39,0x39,0xe2,0x3f,0x72,0xfd,0xe9,0xfc,0xa7,0x43,0xcf,0x64,0xcf,0x26,0x9e,0x17,0xfe,0xa2,0xfe,0xcb,0xae,0x17,0x16,0x2f,0x7e,0xf8,0xd5,0xeb,0xd7,0xce,0xd1,0x98,0xd1,0xa1,0x97,0xf2,0x97,0x93,0xbf,0x6d,0x7c,0xa5,0xfd,0xea,0xc0,0xeb,0x19,0xaf,0xdb,0xc6,0xc2,0xc6,0x1e,0xbe,0xc9,0x78,0x33,0x31,0x5e,0xf4,0x56,0xfb,0xed,0xc1,0x77,0xdc,0x77,0x1d,0xef,0xa3,0xdf,0xf,0x4f,0xe4,0x7c,0x20,0x7f,0x28,0xff,0x68,0xf9,0xb1,0xf5,0x53,0xd0,0xa7,0xfb,0x93,0x19,0x93,0x93,0xff,0x4,0x3,0x98,0xf3,0xfc,0xef,0x35,0x94,0x82,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x35,0x0,0x32,0x0,0x3b,0x6,0x66,0x54,0x53,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xa,0x15,0x0,0x1f,0x2d,0x8a,0x4e,0xe9,0xbd,0x0,0x0,0x1,0x2b,0x49,0x44,0x41,0x54,0x38,0xcb,0x95,0x92,0x31,0x4e,0x3,0x31,0x10,0x45,0x9f,0x37,0x26,0x8b,0x44,0x11,0xd7,0x21,0xe1,0x26,0x88,0x96,0x9a,0xd3,0xe4,0x8,0x9c,0x86,0x9a,0x86,0x2,0x71,0x13,0x4,0x1d,0x82,0x20,0x81,0x44,0xd6,0xde,0xf9,0x14,0xf6,0x26,0x59,0x48,0x60,0x33,0x92,0x25,0x6b,0xe4,0xff,0xfc,0xff,0x68,0x1c,0xe0,0x81,0x31,0x50,0x3,0xc7,0xe5,0x3e,0x2,0x2a,0xfa,0x65,0x40,0xb,0x34,0xc0,0x17,0xb0,0x2,0x9a,0x4e,0x7c,0x2,0x4,0x60,0x52,0xee,0x35,0xe0,0xca,0x1,0x50,0x39,0x2b,0xe0,0x13,0x78,0x7,0x96,0x94,0xdf,0x6b,0x20,0x5c,0x9c,0x5f,0x5e,0xcd,0x4e,0xcf,0x16,0x29,0xa5,0x60,0x62,0x67,0x55,0xe,0xbc,0xf7,0xcb,0xa7,0xe7,0xc7,0xeb,0xfb,0x87,0xdb,0x1b,0x20,0xf9,0x62,0x7b,0x32,0x9b,0xce,0x17,0x6f,0xaf,0x2f,0x21,0xc5,0x84,0xd8,0x4d,0x70,0x38,0xfc,0x91,0xf,0xb3,0xe9,0x7c,0x1,0xdc,0x1,0x1f,0xeb,0x8,0x4d,0x8c,0x21,0xc6,0xb8,0x57,0x9c,0x73,0x88,0x18,0x23,0x4d,0x8c,0xa1,0x44,0x1d,0xfb,0x32,0xb0,0xda,0xcc,0x30,0x19,0xff,0x95,0x10,0x66,0x46,0x89,0x3e,0xf2,0x65,0xda,0x4e,0x26,0xcc,0xc4,0x90,0x52,0x7e,0xe7,0x80,0xca,0x77,0xf1,0x5a,0xb5,0x83,0x1c,0x0,0xb4,0x6a,0x3b,0x0,0x7e,0x9b,0x2a,0x1d,0xe4,0x80,0x6d,0x80,0xa4,0x3,0x0,0xf9,0x9d,0x3a,0x80,0x65,0x68,0x42,0x3,0x23,0x98,0x52,0x7,0xb0,0xaa,0xac,0xe7,0x8a,0x61,0xda,0xcd,0x52,0xe7,0xad,0x6c,0xfd,0xe,0x6b,0x9d,0xbb,0xcd,0x26,0x77,0x8e,0x9d,0xfb,0xc5,0xea,0x3,0xcc,0x7a,0x52,0xa1,0xac,0x51,0x6e,0xc8,0x84,0xfb,0x13,0xb0,0x35,0x3,0x5b,0xf7,0xa,0x50,0xe,0x65,0xe4,0x7e,0x80,0x49,0xfc,0xb0,0xd0,0xdb,0x40,0x0,0xb9,0xfe,0xb0,0xbe,0x1,0x2c,0x3a,0x9d,0x31,0x64,0x70,0xaf,0x77,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x9c,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3f,0x3d,0x48,0x5b,0x58,0x66,0x5b,0x57,0x65,0x57,0x54,0x62,0x55,0x53,0x62,0x4a,0x46,0x52,0x46,0x41,0x4e,0x45,0x41,0x4d,0x55,0x52,0x60,0x44,0x41,0x4c,0x53,0x50,0x5e,0x43,0x40,0x4b,0x52,0x4e,0x5d,0x41,0x3e,0x4a,0x4f,0x4d,0x5a,0x3f,0x3d,0x48,0x4e,0x4b,0x59,0x3e,0x3c,0x47,0x4d,0x4a,0x58,0x3d,0x3b,0x46,0x4b,0x49,0x54,0x3c,0x3a,0x44,0x4b,0x47,0x54,0x3b,0x39,0x43,0x3b,0x39,0x42,0x3b,0x38,0x43,0x3b,0x38,0x42,0x3a,0x37,0x41,0x39,0x37,0x41,0x3a,0x38,0x41,0x39,0x36,0x3f,0x38,0x36,0x3f,0x39,0x36,0x40,0x38,0x36,0x40,0x37,0x35,0x3e,0x37,0x34,0x3e,0x36,0x35,0x3d,0x35,0x32,0x3b,0x59,0xdd,0xd3,0xff,0x0,0x0,0x0,0x11,0x74,0x52,0x4e,0x53,0x4,0xa,0x11,0x19,0x1f,0x22,0x24,0x15,0x25,0x34,0x3f,0x46,0x47,0x48,0x77,0xef,0xef,0xa3,0x31,0x6b,0xc2,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x33,0x37,0xd5,0x7c,0x5e,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0xa2,0x49,0x44,0x41,0x54,0x18,0xd3,0x45,0xcd,0xd9,0x12,0x82,0x30,0xc,0x40,0xd1,0x0,0x2d,0x4b,0x5b,0x36,0x59,0x44,0x44,0x44,0xa4,0x68,0x59,0x54,0xfc,0xff,0x8f,0x33,0x30,0x4c,0x3d,0x93,0xa7,0x3b,0x93,0x4,0xc0,0x30,0x2d,0x42,0x6d,0x44,0x89,0x65,0x1a,0x0,0x86,0xe3,0x7a,0x8c,0xb,0xdf,0x17,0x9c,0x79,0xae,0x63,0x80,0xe9,0x6,0x61,0x7c,0xd8,0xc4,0x61,0xe0,0x9a,0x60,0x79,0x51,0x92,0x66,0x9b,0x34,0x89,0x3c,0xb,0x8,0xcb,0xb3,0xe3,0x2e,0xcb,0x19,0x1,0xca,0x8b,0x93,0x56,0x70,0xa,0xb6,0x28,0xcf,0x5a,0x29,0x6c,0xb0,0xfd,0xea,0xa2,0x55,0xfe,0x1a,0xea,0xab,0x56,0xaf,0x41,0x34,0x37,0xad,0xc1,0x15,0xca,0xdb,0xbb,0xd6,0xe2,0x51,0xc2,0xba,0x7f,0xe8,0xf0,0x2d,0x6,0x29,0xfb,0x5e,0xca,0xc7,0x53,0xca,0x3d,0xa8,0x61,0x50,0xc3,0xa8,0xc6,0x41,0xed,0x61,0x9a,0xa6,0x19,0xbd,0xe6,0xf7,0x1e,0x3e,0xcb,0x82,0x83,0xbe,0x18,0x7e,0xa1,0xe5,0x17,0x1f,0xcf,0x5d,0x82,0x6b,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char tab_menu_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x6f,0x49,0x44,0x41,0x54,0x38,0x8d,0x63,0x60,0x18,0x5,0xa3,0x80,0x81,0x81,0x11,0x5d,0xe0,0xc1,0x83,0x7,0xff,0xf1,0x69,0x50,0x50,0x50,0x40,0xd1,0xc3,0x44,0xa9,0xb,0xa8,0x6f,0x0,0x23,0x23,0x63,0x3c,0x3,0x3,0xc3,0x57,0x2c,0x6a,0xbf,0x33,0x32,0x32,0xa6,0x63,0xa8,0xc7,0x66,0xea,0xfd,0xfb,0xf7,0x35,0x18,0x18,0x18,0x56,0x31,0x32,0x32,0xea,0x42,0x85,0x6e,0x30,0x33,0x33,0x87,0xc9,0xca,0xca,0x5e,0x26,0xca,0x0,0x6,0x6,0x6,0x86,0x17,0x2f,0x5e,0x70,0xff,0xfc,0xf9,0x73,0xa,0x3,0x3,0x3,0x3,0x3b,0x3b,0x7b,0x8e,0x84,0x84,0x4,0x36,0x57,0xd,0x2,0x0,0x0,0x67,0xf2,0x14,0xc2,0xc2,0xbe,0xf5,0xb5,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x4,0x0,0x0,0x0,0xb5,0xfa,0x37,0xea,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x4c,0x49,0x44,0x41,0x54,0x28,0xcf,0x63,0x60,0x18,0x5,0xc,0xc,0xc,0xc,0x8c,0x30,0xc6,0x83,0xff,0xa8,0x12,0xa,0x50,0x19,0x26,0x42,0x26,0x10,0xaf,0x80,0x31,0x9e,0xe1,0x2b,0x5c,0xf4,0x3b,0x63,0x3a,0x16,0xb5,0xf7,0x35,0xee,0x5f,0x7a,0xf0,0xff,0xc1,0xff,0x7,0xd7,0x1f,0xeb,0x62,0x71,0x24,0x3,0x3,0x3,0xc3,0xb,0xee,0x9f,0x53,0x18,0x18,0xd8,0x73,0x24,0xbe,0x32,0x50,0x11,0x0,0x0,0x6,0x9b,0x11,0xfa,0xe0,0x26,0x3d,0x9f,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xba,0x84,0x14,0xff,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xcb,0xd9,0xac,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char tab_menu_hl_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x6f,0x49,0x44,0x41,0x54,0x38,0x8d,0x63,0x60,0x18,0x5,0xa3,0x80,0x81,0x81,0x11,0x5d,0xe0,0xc1,0x83,0x7,0xff,0xf1,0x69,0x50,0x50,0x50,0x40,0xd1,0xc3,0x44,0xa9,0xb,0xa8,0x6f,0x0,0x23,0x23,0x63,0x3c,0x3,0x3,0xc3,0x57,0x2c,0x6a,0xbf,0x33,0x32,0x32,0xa6,0x63,0xa8,0xc7,0x66,0xea,0xfd,0xfb,0xf7,0x35,0x18,0x18,0x18,0x56,0x31,0x32,0x32,0xea,0x42,0x85,0x6e,0x30,0x33,0x33,0x87,0xc9,0xca,0xca,0x5e,0x26,0xca,0x0,0x6,0x6,0x6,0x86,0x17,0x2f,0x5e,0x70,0xff,0xfc,0xf9,0x73,0xa,0x3,0x3,0x3,0x3,0x3b,0x3b,0x7b,0x8e,0x84,0x84,0x4,0x36,0x57,0xd,0x2,0x0,0x0,0x67,0xf2,0x14,0xc2,0xc2,0xbe,0xf5,0xb5,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x4,0x0,0x0,0x0,0xb5,0xfa,0x37,0xea,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x4c,0x49,0x44,0x41,0x54,0x28,0xcf,0x63,0x60,0x18,0x5,0xc,0xc,0xc,0xc,0x8c,0x30,0xc6,0x83,0xff,0xa8,0x12,0xa,0x50,0x19,0x26,0x42,0x26,0x10,0xaf,0x80,0x31,0x9e,0xe1,0x2b,0x5c,0xf4,0x3b,0x63,0x3a,0x16,0xb5,0xf7,0x35,0xee,0x5f,0x7a,0xf0,0xff,0xc1,0xff,0x7,0xd7,0x1f,0xeb,0x62,0x71,0x24,0x3,0x3,0x3,0xc3,0xb,0xee,0x9f,0x53,0x18,0x18,0xd8,0x73,0x24,0xbe,0x32,0x50,0x11,0x0,0x0,0x6,0x9b,0x11,0xfa,0xe0,0x26,0x3d,0x9f,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xba,0x84,0x14,0xff,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xcb,0xd9,0xac,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char toggle_off_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x20,0x8,0x6,0x0,0x0,0x0,0xa2,0x9d,0x7e,0x84,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x15,0x16,0x28,0x99,0xc6,0x91,0x20,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x5,0xb5,0x49,0x44,0x41,0x54,0x68,0xde,0xed,0x99,0xdb,0x6f,0x54,0x55,0x14,0xc6,0x7f,0xfb,0xdc,0xe6,0x72,0x66,0x3a,0x9d,0x76,0x5a,0xa0,0x3,0xe5,0xd2,0xc4,0xb4,0x21,0x26,0x46,0x2,0x31,0xbe,0x11,0xc0,0x17,0x62,0x14,0xe2,0xe5,0xc1,0xc4,0x77,0xc2,0xe5,0xf,0x30,0x31,0xd1,0x18,0x8,0xbc,0x5a,0x2,0xaf,0x3e,0x90,0x80,0xa8,0x28,0x1a,0x5f,0x4,0x9,0x8f,0x62,0x42,0x88,0x1a,0x9c,0x82,0x5c,0x14,0x68,0x11,0x5a,0x3a,0xed,0xdc,0x3b,0xe7,0xb2,0x7d,0x70,0x77,0x98,0xe,0x67,0x86,0x96,0xe,0x97,0x4,0x56,0xb2,0x33,0x33,0xeb,0x5c,0xe6,0xac,0x6f,0x7f,0x7b,0x9d,0xb5,0xbe,0xd,0x2f,0xec,0xf9,0x36,0xb1,0xc0,0x73,0x45,0xdd,0x35,0xe2,0x19,0x89,0x41,0xd6,0x7d,0xca,0xba,0xdf,0x6d,0x3,0x40,0x53,0xc3,0xac,0x1b,0xba,0xf2,0x89,0x67,0x20,0x78,0x1f,0xf0,0x0,0xa7,0x6e,0xf8,0x6a,0x2c,0xa,0x0,0xa1,0x2,0xb5,0x80,0x18,0xd0,0xa9,0x46,0x7,0x10,0x51,0x40,0x3c,0x4d,0x10,0x66,0x83,0x77,0x80,0x32,0x90,0x3,0xa6,0xd4,0x28,0x0,0x55,0x5,0x8c,0x7c,0x14,0x0,0x34,0xc0,0x50,0x81,0xf7,0x0,0xcb,0x53,0xa9,0x25,0xef,0xc6,0x62,0x1d,0x6f,0x1a,0x86,0xde,0x3,0xc2,0x0,0x84,0x10,0x4f,0x97,0x0,0x52,0x4a,0x5,0x84,0x74,0x5d,0xd7,0x1b,0x2f,0x14,0x72,0x3f,0x4c,0x4c,0xdc,0xf9,0xa,0xb8,0x5,0x8c,0x2b,0x20,0xdc,0x56,0x6c,0x10,0x4d,0x82,0xb7,0x80,0x4,0xd0,0xdf,0xd9,0xd9,0xbd,0xad,0xab,0x2b,0xb5,0x5b,0xd3,0x44,0xec,0x7e,0xbc,0x62,0x1e,0x18,0xca,0x26,0x3e,0xa1,0x9e,0xa7,0xfd,0xe4,0x91,0x52,0xe2,0xfb,0x7e,0x61,0x72,0x72,0x62,0x78,0x6a,0xea,0xde,0xb7,0xc0,0xd,0x60,0x5a,0xb1,0xc1,0x9f,0xf,0x0,0x42,0x5,0x9f,0x4,0xd6,0x2c,0x5b,0xb6,0xfc,0x23,0xdb,0x8e,0x6d,0x15,0x2,0xc2,0xc2,0x60,0x95,0x69,0xd3,0x6b,0x84,0xb1,0x35,0x3,0xbd,0xc5,0xec,0x3b,0xd2,0x67,0xd4,0x29,0x73,0xa5,0x9a,0xa7,0x22,0xfd,0x0,0x50,0x7c,0xf5,0x57,0xda,0x63,0x63,0x46,0xb1,0x98,0xff,0xf1,0xf6,0xed,0x5b,0xfb,0x80,0x6b,0x40,0x56,0x81,0x20,0x5b,0x1,0x30,0xbb,0xe6,0x13,0xc0,0x40,0x5f,0xdf,0x8a,0xcf,0xa2,0x51,0xfb,0xd,0x21,0x4,0x6b,0xcc,0x18,0x2b,0x2d,0x9b,0xdb,0x4e,0x85,0x51,0xa7,0x44,0x41,0xba,0x81,0xf3,0x2b,0x80,0x30,0x1a,0x1d,0xba,0x49,0xaf,0x11,0xa6,0xd7,0x8,0x71,0xbd,0x5a,0xe4,0x6f,0xa7,0x18,0x0,0xbf,0x7c,0xac,0xe9,0x43,0x4a,0x49,0xa9,0x54,0xf8,0x69,0x6c,0xec,0xe6,0xc7,0xc0,0x55,0xc5,0x84,0x7,0x72,0x82,0xde,0x40,0xfd,0x30,0xb0,0x2c,0x99,0x4c,0x7d,0x90,0x48,0x74,0x7e,0x28,0x84,0x60,0x6d,0x28,0x41,0x4a,0xf,0xf1,0x47,0x65,0x9a,0x5b,0x6e,0x99,0xea,0x43,0x92,0xab,0x8b,0xa4,0x28,0x3d,0xee,0x7a,0x33,0xe4,0x3c,0x87,0x95,0x96,0x4d,0x87,0x6e,0x72,0xcf,0x9b,0x69,0x0,0xed,0xf1,0xe6,0xf,0x21,0x4,0xa6,0x69,0xd,0x0,0xd3,0xe5,0x72,0xe9,0x12,0x50,0x54,0xf9,0x40,0x36,0xae,0xf7,0xfa,0xef,0x31,0x60,0x79,0x57,0x57,0xf7,0x2e,0x21,0xa0,0xdf,0xb4,0x49,0xe8,0x16,0x17,0xca,0x59,0xa6,0x7c,0x67,0xc1,0xf,0x71,0xcf,0xaf,0xf2,0x5b,0x39,0x4b,0x42,0xb7,0x58,0x61,0x46,0x9f,0xf8,0xeb,0x42,0x8,0x41,0x32,0xd9,0xbd,0x13,0x58,0xa1,0x62,0xd3,0x1b,0x91,0xd7,0xea,0xa6,0xc3,0x4,0x12,0x3d,0x3d,0x4b,0xdf,0xd7,0x34,0x11,0xb1,0x84,0xc1,0x6a,0xd3,0x26,0x53,0xc9,0x51,0x9e,0xdf,0x2b,0x35,0xd0,0x4a,0xf8,0x8c,0x54,0x72,0xac,0x31,0x63,0x58,0x42,0x7b,0xe2,0x6f,0xa,0x4d,0xd3,0x23,0x3d,0x3d,0x4b,0xdf,0x53,0x4b,0xdb,0x8,0xca,0xf8,0xf5,0x0,0x74,0xda,0x76,0x7c,0x2b,0x40,0xda,0x88,0x30,0xe9,0x55,0xc9,0xfa,0xd5,0x45,0x3f,0xc4,0xa4,0x5f,0xe5,0x9e,0x37,0x43,0x9f,0x11,0x69,0x79,0x5e,0x3a,0xdd,0xc7,0xfe,0xfd,0x7b,0xb9,0x7c,0xf9,0x22,0xe7,0xcf,0xff,0xc2,0xf6,0xed,0x6f,0x3,0xb0,0x61,0xc3,0x7a,0x2e,0x5f,0xbe,0x38,0x67,0x4,0xf9,0xe2,0xf1,0x78,0xe0,0x7d,0x6d,0x3b,0xb6,0x55,0x25,0x76,0xab,0x91,0x1,0x46,0x3,0x0,0x1d,0x86,0xa1,0xa7,0x40,0xb0,0xc4,0x8,0xf3,0x8f,0x53,0x6c,0xdb,0x4c,0x8c,0x7b,0x33,0xac,0x34,0x6d,0xae,0xb7,0xb8,0xe7,0x81,0x3,0xfb,0xc8,0xe5,0xf2,0x6c,0xdc,0xb8,0x85,0xa1,0xa1,0x41,0xe,0x1d,0x1a,0xe6,0xdc,0xb9,0x5f,0x6b,0xc7,0xd7,0xad,0x7b,0x8d,0x7c,0x3e,0x5f,0x3,0xa5,0xd1,0xd7,0xcc,0xc,0xc3,0xe8,0x51,0x5,0x9c,0xd1,0xc,0x80,0xd9,0x84,0x18,0x9e,0xf5,0xc5,0x34,0x83,0x69,0xcf,0x69,0x1b,0x0,0xd3,0x9e,0x43,0x2c,0x64,0xb4,0x9c,0xfd,0xd,0x1b,0xd6,0xd7,0x2,0x1a,0x1d,0x1d,0xe3,0xf4,0xe9,0x33,0x6c,0xde,0xbc,0x89,0x4c,0x66,0x84,0x4c,0x66,0xe4,0x81,0x6b,0x82,0x7c,0x4d,0xb2,0x81,0xa1,0xaa,0xd7,0xa6,0x39,0xa0,0xfe,0x35,0x28,0x0,0x4c,0xa1,0x51,0x96,0x5e,0xdb,0x0,0x28,0x4b,0xf,0xb3,0x45,0xe,0x48,0xa7,0xd3,0x64,0x32,0x23,0x73,0x66,0x33,0x93,0xc9,0x30,0x34,0x34,0x8,0x40,0x3e,0x9f,0xe7,0xf0,0xe1,0x61,0x8e,0x1c,0xf9,0xa2,0x46,0xf5,0x20,0x5f,0xb3,0x64,0xd8,0xac,0xf2,0x32,0x2,0x6a,0xeb,0x5a,0x31,0x13,0x11,0x3a,0xa5,0x36,0x81,0x10,0x11,0x3a,0x8e,0x6c,0x9e,0x4c,0x33,0x99,0x11,0x86,0x86,0x6,0x89,0xc7,0xe3,0x35,0x10,0xd2,0xe9,0xf4,0x1c,0x40,0x76,0xec,0xd8,0xfd,0x0,0xdd,0x83,0x7c,0x4d,0x4a,0x66,0x3f,0xa8,0x10,0xaa,0x9f,0x12,0xef,0xff,0xa6,0x42,0xba,0x20,0x29,0xf8,0x2e,0x9,0xdd,0x6c,0x1b,0x3,0x12,0xba,0x49,0xc1,0x77,0x9b,0x1e,0xcf,0xe7,0xf3,0x64,0x32,0x23,0xb5,0xc4,0x17,0x8f,0xc7,0xd9,0xb2,0x65,0xd3,0x2,0x68,0xde,0x12,0x2,0x57,0x35,0x4c,0x5e,0xb3,0x3a,0x40,0xaa,0xae,0x2a,0xef,0xba,0xfe,0x38,0xc0,0x1d,0xb7,0x42,0x4a,0xf,0xb5,0xd,0x80,0x1e,0x3d,0xc4,0x1d,0xb7,0xd2,0xf2,0x9c,0xbd,0x7b,0xf7,0xb3,0x67,0xcf,0x4e,0x4e,0x9e,0xfc,0x86,0xb3,0x67,0x4f,0x71,0xea,0xd4,0xcf,0x9c,0x38,0xf1,0xdd,0xa2,0xff,0xdb,0x75,0xdd,0x71,0xd5,0x2d,0xba,0xf,0xab,0x4,0x2d,0xd3,0xb4,0x7a,0xc3,0xe1,0xf0,0xab,0x25,0xe9,0xf3,0x92,0x15,0x27,0xe7,0xb9,0x54,0x16,0xb9,0xc,0xba,0x34,0x8b,0xd5,0x56,0x8c,0x3f,0xab,0x39,0xbc,0x16,0xdd,0xe9,0xe8,0xe8,0x18,0x47,0x8f,0x7e,0x9,0xc0,0xf0,0xf0,0x21,0x8e,0x1d,0x3b,0x3e,0x87,0x21,0xd7,0xae,0x5d,0xa7,0x5a,0xad,0xb6,0xf4,0x5,0xb3,0x6b,0xfa,0x78,0xa9,0x54,0x38,0x3,0x4c,0x2a,0x10,0x2,0xeb,0x51,0x3,0xe8,0x6,0x5e,0x1e,0x18,0x18,0xfc,0x5e,0xd3,0x44,0xa4,0xdf,0xb4,0x59,0x6e,0x46,0xb9,0x50,0x9a,0x7c,0xe4,0x62,0x28,0x8a,0xc6,0x2b,0xd1,0x2e,0x46,0x9d,0x12,0x37,0x9c,0xd2,0xc2,0xe4,0x9a,0x36,0x98,0xef,0x7b,0xe5,0xab,0x57,0x2f,0xbd,0x5,0xfc,0x5e,0x7,0x80,0xc,0x62,0x40,0xad,0x43,0x11,0x2,0x37,0x12,0x89,0xbe,0x9e,0xf3,0x1d,0x3a,0x34,0x93,0x55,0x96,0x4d,0xde,0x77,0x1b,0x3a,0xbb,0x87,0x5b,0xb7,0x66,0xb1,0x36,0x9c,0x20,0xe7,0x3b,0x5c,0xad,0x16,0x9e,0x78,0xf0,0x52,0x4a,0xb2,0xd9,0x89,0xcf,0xcb,0xe5,0xd2,0x59,0x60,0x22,0xa8,0x23,0x6c,0x4,0xc0,0x7,0xbc,0x72,0xb9,0x74,0x3b,0x1c,0x8e,0xac,0x34,0x4d,0x73,0x60,0xdc,0x9b,0xc1,0x14,0x1a,0x83,0xe1,0xe,0xc2,0x42,0x67,0xc6,0xf7,0x70,0x9a,0xb0,0x41,0x0,0x11,0x34,0xba,0x75,0x8b,0x35,0x56,0x8c,0x81,0x50,0x8c,0x51,0xb7,0xc2,0x5f,0xd5,0xfc,0x22,0x8a,0xe9,0xc5,0x75,0x83,0x77,0xef,0xfe,0x7b,0x50,0x9,0x24,0xc5,0x20,0x4d,0xa0,0x95,0x1e,0x30,0xd0,0xd7,0xd7,0xff,0x49,0x34,0x1a,0xdd,0x2c,0x4,0x84,0x84,0xce,0x6a,0x33,0xb6,0x48,0x3d,0xe0,0x49,0x6,0x5f,0x3c,0x3d,0x36,0x76,0xe3,0x53,0xe0,0xca,0x7c,0xf5,0x80,0x46,0x45,0xa8,0x13,0xe8,0x4f,0x26,0xbb,0xb7,0x25,0x93,0xdd,0xbb,0x74,0x5d,0x8b,0xdd,0xef,0xe1,0x9b,0x9,0xc3,0xf,0x23,0xf9,0xec,0xf5,0x8d,0xf7,0x69,0x9f,0x79,0x9e,0x57,0xc8,0x66,0x27,0xe,0x66,0xb3,0x35,0x45,0x68,0x6a,0x21,0x8a,0x50,0x3d,0x8,0xa6,0x6a,0x21,0x53,0xc0,0x8a,0x54,0x6a,0xc9,0x3b,0x4a,0x13,0xec,0x5,0x61,0x3c,0x6d,0x3d,0x70,0x6e,0x91,0x23,0x5d,0xd7,0xf5,0xee,0x2a,0x4d,0xf0,0x6b,0xe0,0xa6,0x5a,0xf3,0x85,0x3a,0x95,0xf8,0x91,0x55,0xe1,0x10,0x60,0x2b,0x46,0x24,0x3,0x54,0xe1,0xa7,0x69,0x8d,0xaa,0x70,0x56,0xcd,0x78,0x11,0x98,0x59,0x8c,0x2a,0x5c,0x7f,0x7c,0x16,0x8,0x43,0x2d,0xd,0xb3,0xae,0x67,0x78,0x16,0xf6,0x5,0x24,0xf7,0xf7,0x5,0xaa,0xea,0x35,0xe7,0x31,0xcf,0x4d,0x92,0x47,0xdd,0x19,0x7a,0x56,0x76,0x85,0x1a,0x81,0x58,0xf0,0xce,0xd0,0xb,0x7b,0x61,0xcf,0xb9,0xfd,0x7,0xde,0xc4,0x73,0xf5,0xe8,0x6c,0xed,0xda,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x20,0x8,0x3,0x0,0x0,0x0,0x95,0x43,0x8e,0xb6,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x1,0x7a,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14,0x14,0x17,0x20,0x20,0x25,0x24,0x24,0x28,0x24,0x24,0x29,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x10,0x13,0x22,0x22,0x27,0x0,0x0,0x0,0x0,0x0,0x0,0x19,0x19,0x1c,0x1a,0x1a,0x1d,0x0,0x0,0x0,0x0,0x0,0x0,0x11,0x11,0x14,0x12,0x12,0x14,0x23,0x23,0x27,0x0,0x0,0x0,0x0,0x0,0x0,0x15,0x15,0x18,0x20,0x20,0x25,0x20,0x20,0x24,0x0,0x0,0x0,0x0,0x0,0x0,0x24,0x24,0x28,0x0,0x0,0x0,0x24,0x24,0x28,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x24,0x24,0x27,0x15,0x15,0x18,0x23,0x23,0x28,0x12,0x12,0x14,0x0,0x0,0x0,0x1a,0x1a,0x1e,0x0,0x0,0x0,0x11,0x11,0x13,0x22,0x22,0x26,0x0,0x0,0x0,0x0,0x0,0x0,0x24,0x24,0x29,0x25,0x25,0x2a,0x24,0x24,0x28,0x25,0x25,0x28,0x25,0x25,0x29,0x25,0x25,0x27,0x2d,0x26,0x2c,0x4d,0x2b,0x37,0x63,0x2f,0x3f,0x6e,0x31,0x43,0x71,0x32,0x44,0x6c,0x31,0x42,0x51,0x2c,0x39,0x47,0x2a,0x35,0x66,0x30,0x40,0x4d,0x2b,0x38,0x32,0x26,0x2e,0x26,0x25,0x2a,0x2e,0x25,0x2c,0x3c,0x28,0x31,0x52,0x2c,0x39,0x68,0x30,0x40,0x27,0x25,0x2a,0x50,0x2c,0x38,0x5f,0x2e,0x3d,0x35,0x27,0x2f,0x38,0x27,0x30,0x5e,0x2e,0x3d,0x43,0x2a,0x34,0x5f,0x2f,0x3e,0x2f,0x25,0x2c,0x44,0x2a,0x34,0x2b,0x26,0x2c,0x64,0x2f,0x3f,0x36,0x27,0x30,0x37,0x27,0x30,0x66,0x2f,0x40,0x2c,0x26,0x2c,0x46,0x2a,0x35,0x53,0x2c,0x39,0x40,0x40,0x44,0xad,0xad,0xaf,0xff,0xff,0xff,0xf2,0xf2,0xf2,0x77,0x77,0x7a,0x5b,0x5b,0x5f,0x32,0x32,0x37,0x5d,0x2e,0x3d,0x3e,0x29,0x32,0xc9,0xc9,0xca,0xbb,0xbb,0xbd,0x69,0x69,0x6c,0x69,0x30,0x41,0x2f,0x26,0x2d,0x84,0x84,0x87,0xd6,0xd6,0xd7,0x92,0x92,0x94,0xa0,0xa0,0xa2,0x4e,0x4e,0x52,0x48,0x2b,0x36,0x2c,0x26,0x2b,0x97,0xb0,0x86,0xb4,0x0,0x0,0x0,0x41,0x74,0x52,0x4e,0x53,0x0,0x1,0x2,0x3,0x4,0x9,0xe,0x13,0x16,0x18,0x19,0xa,0x26,0x36,0x44,0x4d,0x52,0x54,0x55,0x6,0x12,0x27,0x43,0x98,0xe5,0xfa,0xfe,0x8,0x17,0x35,0x86,0xf3,0x7,0x3a,0xb4,0xb9,0xb,0x28,0x8a,0x8b,0xf6,0x45,0x5,0x9b,0xe6,0xe6,0x37,0xf,0xfb,0x4c,0xfe,0x4e,0x4f,0x50,0xfb,0x9c,0xf6,0x8c,0x3b,0xbb,0x3c,0x87,0xf3,0x53,0x14,0xe5,0x7c,0xf3,0x66,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x6b,0x52,0x65,0xa5,0x98,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x2,0x47,0x49,0x44,0x41,0x54,0x48,0xc7,0xd5,0x55,0xfb,0x5b,0x93,0x50,0x18,0x96,0x3,0xc,0x48,0x60,0xde,0x70,0x9b,0x43,0x37,0x75,0xa6,0x9b,0xb5,0xad,0x56,0x59,0x99,0xe9,0xc6,0x39,0xb3,0x56,0x59,0xcd,0x4c,0xbb,0xd9,0x3d,0xdb,0xd,0x74,0xa6,0xa3,0xdb,0xff,0x1e,0x70,0x68,0x6e,0xc0,0xe0,0xe9,0xe9,0x97,0x7a,0x79,0x9e,0x3,0xf,0x7c,0xdf,0xcb,0x7b,0xbe,0xf3,0x5d,0x86,0x86,0xfe,0x21,0x10,0x80,0x24,0xa9,0x40,0x90,0x24,0x20,0x3c,0xdd,0x1,0x45,0x87,0x18,0x96,0x3b,0x17,0x0,0x8e,0x65,0x42,0x34,0x5,0xdc,0x7f,0xa7,0x86,0x59,0x5e,0x10,0xc3,0x23,0xa3,0x63,0xbe,0x18,0x1d,0x9,0x8b,0x2,0xcf,0xe,0x53,0xe,0x15,0x60,0x7c,0x42,0x9a,0x8c,0x44,0x63,0x53,0xc5,0x52,0x0,0x8a,0x53,0xb1,0x68,0x64,0x52,0x9a,0x18,0xef,0x13,0x1,0xe2,0xf2,0xf4,0x4c,0x42,0x81,0x10,0x21,0x84,0xed,0x90,0x9,0x88,0xca,0xc8,0x93,0x24,0x31,0x33,0x2d,0xc7,0x7b,0x18,0x88,0x24,0x37,0x3b,0xa7,0xc0,0xcd,0x3b,0x77,0x2b,0xf7,0x30,0xee,0x3f,0xd8,0xb4,0x58,0xca,0x70,0x80,0x8e,0xb9,0x59,0x2e,0x49,0x9c,0xed,0x9f,0x11,0xe6,0x15,0xb4,0xf5,0xf0,0xd1,0xe3,0xaa,0xf5,0xb9,0xba,0xfd,0x64,0xe7,0xe9,0xd6,0xae,0xa5,0x64,0xd0,0x4e,0xe6,0x5,0xa6,0x1b,0x7,0x90,0x5a,0x38,0xaf,0xa0,0xbd,0x67,0xcf,0x7b,0x2d,0x5e,0xbc,0xdc,0xdb,0xf5,0x8d,0xc5,0xe2,0x42,0xea,0xf7,0x26,0x28,0x59,0x5c,0x82,0xaf,0xf6,0xb7,0xfb,0x2d,0x5e,0xef,0xbf,0xa9,0xfa,0x31,0x2c,0xa5,0xe5,0xc,0x96,0x40,0xd0,0xfc,0x32,0x7c,0xfb,0xee,0xbd,0xd3,0xe2,0xc3,0xc7,0x4f,0xbe,0xe7,0xb1,0xcc,0xd3,0x98,0x0,0x84,0x84,0xb,0xf0,0x60,0xc7,0x6d,0xf1,0xf9,0xc0,0x7e,0xa8,0xd5,0x1b,0xcd,0x56,0x49,0x6d,0x18,0xb0,0x16,0xcd,0x7a,0x7b,0x31,0x9b,0xc3,0x7b,0x20,0x19,0x31,0x86,0xe,0x8f,0xdc,0x4,0x47,0x87,0xf6,0x43,0xfb,0xb8,0xf6,0xa5,0x51,0x53,0x4d,0x47,0xd5,0xf6,0x36,0x90,0x4f,0x33,0x24,0x26,0x60,0x2f,0x5d,0x46,0x27,0xa7,0x6e,0x82,0xd3,0x13,0x5b,0x80,0xe9,0x74,0xdc,0x51,0x75,0x93,0x40,0xef,0x12,0x14,0xb,0x2c,0x85,0x9,0xe4,0x2b,0xa,0xaa,0x78,0x4,0xac,0x5a,0xc1,0x77,0x55,0x37,0x96,0xaf,0x75,0xb5,0xdd,0x6e,0x6b,0xd6,0x62,0x7f,0xbf,0x2a,0xdb,0x4,0x6c,0x58,0xf1,0x55,0xa0,0x99,0xa,0xea,0xdf,0x54,0xd3,0x53,0x6d,0x7b,0x28,0x60,0xc4,0x6b,0xd0,0x37,0x6,0x7a,0xa7,0xa4,0x35,0x5b,0x4e,0x82,0x6e,0xc,0x40,0x28,0x1b,0x70,0xa,0x6a,0x53,0x6f,0xd6,0x4b,0x4e,0x82,0xee,0x29,0x18,0x79,0xb0,0x12,0x90,0x7,0x5a,0xe7,0xbb,0x11,0xcb,0x96,0x66,0x2f,0x18,0x2b,0x92,0x9d,0x7,0x66,0x26,0x5e,0x47,0x7f,0x91,0x89,0x66,0x2d,0x2c,0xfe,0x79,0x2d,0xdc,0x38,0xab,0x5,0xef,0x6a,0xfc,0xe1,0xef,0xdf,0x5b,0x8d,0x66,0x3f,0xb8,0xb9,0xaa,0xc0,0x9f,0xce,0x7e,0xe0,0xe3,0xbf,0x7a,0xab,0xa7,0x1f,0x98,0x1d,0x89,0x13,0xd6,0x6e,0xc3,0x32,0xc4,0xd,0x9,0xd9,0x80,0xc6,0xe5,0xe9,0x9f,0x58,0x13,0xb8,0x78,0x7f,0x4f,0x4b,0x32,0x92,0x18,0x89,0xe6,0x3,0x5b,0xa2,0xf1,0xf3,0x7c,0x34,0x22,0x4a,0x4c,0xd2,0xd1,0x98,0x9,0x2a,0xc5,0xf2,0xd9,0x74,0x61,0x7d,0x2c,0x0,0xeb,0x85,0x74,0x96,0x67,0x53,0x94,0x6b,0x36,0x10,0x20,0x43,0xe7,0x36,0xe4,0xe0,0xb9,0x20,0x6f,0xe4,0xe8,0x8c,0xf7,0x6c,0x31,0x26,0x53,0xf0,0x60,0x32,0x46,0xd3,0x80,0xc9,0xf4,0xff,0xe2,0x17,0x82,0xde,0x40,0xde,0x2d,0xc3,0x2a,0xca,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char toggle_on_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x20,0x8,0x6,0x0,0x0,0x0,0xa2,0x9d,0x7e,0x84,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x15,0xc,0x32,0xd4,0x89,0x92,0x81,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x5,0xba,0x49,0x44,0x41,0x54,0x68,0xde,0xed,0x99,0x5d,0x6c,0x93,0x55,0x18,0xc7,0x7f,0xe7,0xbc,0xdd,0xdb,0x8e,0xf6,0xed,0xba,0x76,0x8d,0x8e,0x7d,0xf0,0x31,0x15,0x88,0x9a,0x11,0x95,0x85,0x18,0x24,0x12,0x21,0xde,0x1a,0xae,0x4d,0x8c,0xd1,0xe0,0x85,0x89,0x37,0x5e,0x68,0xe4,0xca,0xb,0xcc,0x48,0xbc,0x23,0x7a,0x41,0xd4,0xa0,0x21,0x41,0x4d,0x20,0x70,0x69,0xc0,0x8f,0xe0,0x47,0xc,0x86,0x44,0x8c,0xda,0x39,0x1,0x27,0x6c,0x40,0xe8,0xe7,0xf6,0xb6,0x5b,0xfb,0xb6,0xef,0x7b,0xbc,0xe8,0x59,0xa9,0xa5,0xd4,0x32,0x96,0x6d,0x6,0x4e,0x72,0xd2,0xf4,0xeb,0xbc,0xf9,0xff,0x9f,0xff,0x79,0xce,0xf3,0xfc,0xf,0xdc,0x1b,0x77,0xf7,0x10,0xb7,0xf9,0x5b,0x51,0xf7,0x1f,0xb1,0x42,0x30,0xa8,0xba,0x57,0x55,0xf7,0x7e,0xd1,0x8,0x90,0x7a,0x76,0xd4,0x4d,0x43,0x7f,0x26,0x56,0x0,0x78,0xf,0x70,0x81,0x72,0xdd,0xf4,0xf4,0xbc,0x23,0x2,0x84,0x6,0x6a,0x2,0x21,0x20,0xa2,0x67,0x18,0xe8,0xd4,0x44,0x2c,0x27,0x9,0xf3,0xe0,0xcb,0xc0,0x1c,0x30,0x3,0xe4,0xf4,0xcc,0x3,0x8e,0x26,0x46,0x2d,0x84,0x0,0x9,0xf8,0x34,0xf0,0x38,0xd0,0x6f,0x59,0x5d,0x4f,0x59,0x56,0xd7,0x2e,0xd3,0x34,0xd7,0x4b,0x69,0x84,0xa5,0x94,0x9d,0x42,0x88,0x65,0x55,0x80,0x52,0x4a,0x79,0x9e,0x37,0xe7,0x79,0xee,0x8c,0xe3,0x38,0x17,0x6d,0x7b,0xfa,0xa4,0x6d,0x4f,0x7f,0xb,0x4c,0x2,0x49,0x4d,0x44,0xa5,0x95,0x1a,0xc4,0x2d,0xc0,0x9b,0x40,0x17,0x30,0xb8,0x6a,0x55,0x68,0x7b,0x2c,0x16,0xdf,0xe3,0xf7,0x7,0x1e,0x5a,0x66,0xbc,0xed,0x10,0x42,0xa9,0x54,0x1c,0x4f,0xa7,0x93,0x7,0x67,0x67,0xf3,0xa7,0x81,0x4b,0xc0,0xb4,0x56,0x83,0xd7,0xe,0x1,0x42,0x83,0xef,0x6,0xd6,0x77,0x77,0xf7,0x3c,0x1f,0x8d,0xf6,0xbc,0x24,0xa5,0x34,0x97,0x1c,0x8d,0x3f,0x84,0x1c,0x18,0x46,0xf6,0xac,0x45,0x74,0x46,0x40,0xfa,0x6e,0xd,0xbc,0x52,0x42,0x5d,0xfb,0x3,0x77,0xe2,0x27,0x28,0xe5,0xf1,0x3c,0xcf,0xc9,0x64,0x52,0x1f,0x66,0xb3,0xa9,0xc3,0xc0,0x45,0x20,0xab,0x49,0x50,0xad,0x8,0x98,0xdf,0xf3,0x5d,0xc0,0x50,0x34,0x1a,0x7f,0x39,0x1a,0xed,0x79,0x79,0xc9,0x65,0x2e,0xd,0x64,0xff,0x30,0xb2,0xff,0x51,0xbc,0xeb,0x17,0xf0,0xae,0x8e,0xc1,0x6c,0x16,0x54,0x93,0x0,0xa,0x1,0xfe,0x10,0x58,0x3d,0xc8,0xd8,0x1a,0x64,0x6c,0x1d,0xde,0xe4,0xcf,0x78,0x97,0xcf,0xa1,0xdc,0x8a,0xca,0x64,0x52,0x1f,0x64,0x32,0xc9,0xf,0x80,0xb,0x5a,0x9,0x37,0xe5,0x4,0xa3,0x41,0xfa,0x1,0xa0,0x37,0x18,0xb4,0x9e,0x8d,0xc7,0xef,0x7b,0x5d,0x4a,0x69,0x2c,0x39,0xf8,0x7,0xb6,0x21,0xa2,0x3,0xb8,0x63,0x5f,0xa3,0xae,0xfe,0xe,0xe5,0xd9,0x16,0x79,0x4c,0x41,0xa5,0x4,0xb3,0x59,0x54,0x6a,0x2,0xcf,0xbe,0x8e,0xec,0x1f,0x46,0x84,0x62,0x90,0x9b,0x14,0x1,0xbf,0x7f,0xd8,0x71,0x4a,0x7f,0x95,0xcb,0xce,0x65,0xa0,0xa0,0xf3,0xc1,0x2d,0x9,0x30,0x74,0x96,0x7f,0xb0,0xb7,0xb7,0xff,0xed,0x8e,0x8e,0x8e,0xd8,0xd2,0x56,0x24,0x2,0xb9,0xfa,0x61,0x44,0xcf,0x1a,0xdc,0x5f,0xbf,0x80,0x42,0xfa,0xf6,0xd7,0x28,0xda,0xa8,0xec,0x24,0x72,0x60,0x18,0x21,0x4,0xe4,0x53,0xd2,0x34,0xcd,0xa1,0xe9,0xe9,0xec,0x69,0xbd,0xd,0x4a,0x8d,0x4,0xc8,0x3a,0xf9,0x77,0x0,0x5d,0xe1,0x70,0x64,0xbb,0xdf,0x1f,0x58,0xb7,0xe4,0x7b,0xde,0x17,0x40,0xe,0x6c,0xc6,0xfd,0xf3,0x7b,0x28,0xce,0x2c,0x7c,0x9d,0xe2,0xc,0xee,0xf9,0x1f,0x90,0x83,0x8f,0x41,0x47,0x27,0x7e,0x7f,0x60,0x5d,0x38,0x1c,0x79,0x4a,0x6f,0x6d,0x5f,0xb3,0x8c,0x5f,0x4f,0x40,0x24,0x14,0xa,0xef,0x6c,0xf7,0x59,0x7d,0x7d,0xab,0x19,0x1d,0xdd,0xc7,0xf8,0xf8,0x6f,0x9c,0x3d,0xfb,0x23,0xbb,0x77,0x3f,0x7,0xc0,0xc8,0xc8,0x16,0xc6,0xc7,0x7f,0x63,0xd3,0xa6,0x8d,0xb5,0xf7,0x87,0xf,0x1f,0x6a,0xad,0xfe,0xde,0x8d,0x78,0xb9,0x29,0x98,0xbe,0x72,0xe7,0x64,0xe6,0xa6,0xf0,0xb2,0x93,0xc8,0xfb,0x37,0x0,0x10,0xa,0x59,0x3b,0x75,0x62,0x37,0x1b,0x13,0x7f,0x23,0x1,0x61,0xd3,0x34,0xdb,0x8e,0xfe,0xfe,0xfd,0xef,0x10,0xe,0x87,0xd9,0xb1,0x63,0x17,0x6f,0xbc,0xf1,0x16,0xa3,0xa3,0xfb,0xe8,0xeb,0x5b,0x5d,0xfb,0x7e,0xef,0xde,0x37,0xdb,0xdf,0x1,0xb1,0xb5,0xa8,0xcc,0xa5,0xc5,0x3b,0x12,0x53,0x7f,0x23,0x62,0x6b,0x1,0x30,0x4d,0xff,0x90,0x2e,0xe0,0x7c,0x8d,0x4,0xf8,0x1a,0x72,0x40,0x40,0x4a,0x23,0xdc,0x6e,0xf4,0x47,0x46,0xb6,0xf0,0xf8,0xe3,0x5b,0xb1,0x6d,0x9b,0xa9,0xa9,0x2b,0x9c,0x3a,0xf5,0x15,0x3b,0x77,0x3e,0x43,0x22,0x31,0x46,0x22,0x31,0xc6,0xa6,0x4d,0x1b,0x19,0x19,0xd9,0xd2,0x1e,0x1,0xc1,0x28,0xca,0x4e,0x2e,0x1e,0x1,0xf9,0x24,0x22,0x18,0xad,0x2,0x33,0x7c,0x11,0x5d,0xbd,0x1a,0xb7,0x52,0x40,0xed,0x18,0x94,0x52,0x76,0xb6,0x47,0x40,0x1f,0x89,0xc4,0x18,0xb6,0x6d,0xd7,0x3e,0x4b,0x24,0x12,0x35,0xd9,0xdb,0xb6,0xcd,0xa1,0x43,0x9f,0xb4,0xad,0x2,0xd1,0x11,0x80,0x62,0x7e,0xf1,0x72,0x4a,0x31,0x5f,0x5d,0x13,0xd0,0x75,0x4c,0xd3,0xb2,0x5d,0x36,0xd6,0xd6,0x4a,0xa9,0x72,0x3b,0xeb,0xcf,0x47,0xd8,0xb2,0xac,0x7f,0x91,0x52,0x4f,0xc8,0x81,0x3,0xef,0x13,0xe,0x87,0x6b,0xb9,0xa1,0x65,0xc4,0xca,0x45,0x8,0x84,0x16,0x8f,0x80,0x40,0xa8,0xba,0x26,0xe0,0x79,0xde,0x7c,0x25,0xa8,0x5a,0x11,0xe0,0x2,0x73,0xae,0x5b,0xc9,0xb5,0xb3,0xbe,0x6d,0xdb,0x24,0x12,0x63,0x35,0x70,0x96,0x65,0xb1,0x6b,0x57,0x55,0xfe,0xf5,0xe3,0xc0,0x81,0xf7,0xda,0x23,0xa0,0x90,0x41,0x58,0xf1,0xc5,0x3b,0x55,0x43,0x71,0x54,0x21,0x53,0x5,0x56,0xc5,0x34,0xd7,0xac,0x10,0x92,0x75,0xd1,0x2f,0x3,0xb6,0xe3,0x38,0x17,0xda,0x7d,0xc8,0xbe,0x7d,0xa3,0xbc,0xf6,0xda,0xab,0x9c,0x38,0x71,0x94,0x6f,0xbe,0x39,0xc9,0xc9,0x93,0x5f,0x72,0xec,0xd8,0xf1,0x7f,0xfd,0xe6,0xd8,0xb1,0xe3,0x37,0x91,0xd2,0x94,0x80,0xf4,0x4,0x22,0x3a,0xb8,0x78,0x4,0xf4,0xac,0x41,0xa5,0x27,0x0,0x70,0x9c,0xd2,0x5,0xdd,0x2d,0x56,0xfe,0xab,0x12,0x34,0x85,0x10,0x56,0x28,0x64,0x6d,0x6f,0xe7,0x21,0x53,0x53,0x57,0x38,0x72,0xe4,0xb3,0x9a,0xdc,0x3f,0xfd,0xf4,0xf3,0x9b,0x14,0x2,0x70,0xee,0xdc,0x2f,0xa4,0x52,0xa9,0x96,0x44,0xa8,0xd9,0x69,0x8c,0xf5,0x5b,0xf1,0xec,0x14,0x94,0xec,0x3b,0x43,0x1f,0xe9,0xc3,0x18,0xdc,0x8c,0x3b,0x7e,0x1a,0xdc,0x32,0xd9,0x6c,0xfa,0xe3,0x52,0xa9,0x78,0x6,0xc8,0x68,0x12,0x9a,0xf6,0x2,0x3e,0x20,0x6,0x3c,0x3a,0x38,0xb8,0xfe,0xe0,0x92,0x17,0x43,0x42,0x20,0x57,0x3f,0x82,0xe8,0xdd,0x58,0xad,0x4,0x17,0x5a,0xc,0x5,0xc2,0x18,0x8f,0x3c,0x8b,0xba,0x36,0x86,0x37,0xf5,0x2b,0xa5,0xe2,0xdc,0x5f,0x97,0x2e,0x5d,0x7c,0x5,0xf8,0xa5,0x8e,0x0,0xd5,0x4c,0x1,0xf3,0x5b,0x41,0x54,0x2a,0x95,0x7c,0x30,0x68,0x3d,0x2d,0x84,0x90,0x4b,0xda,0xce,0x16,0xd2,0x88,0x60,0xc,0x39,0x30,0x8c,0x2a,0x64,0xa1,0x94,0xbf,0xfd,0xc8,0x6f,0xd8,0x81,0xb2,0xaf,0xe3,0xfd,0x7d,0x16,0xcf,0xad,0x54,0x92,0xc9,0x6b,0xef,0x96,0xcb,0xce,0x19,0x20,0xd5,0xac,0x23,0x6c,0x24,0xc0,0x3,0xdc,0x72,0xd9,0x99,0x16,0x42,0xc8,0xce,0xce,0x55,0x8f,0x2d,0x69,0x37,0xa8,0x14,0x2a,0x3b,0x89,0xf0,0x99,0x18,0x43,0x4f,0x82,0xdf,0x42,0x95,0x66,0xab,0xd,0xcf,0x4d,0xb6,0xa4,0x0,0x21,0x21,0x60,0x41,0x77,0x1f,0x72,0x70,0x33,0xc6,0x9a,0x27,0xaa,0x91,0x9f,0x38,0x83,0x72,0x2b,0x2a,0x9b,0x4d,0x7f,0x34,0x33,0x93,0x3d,0xaa,0xd,0x92,0x42,0x33,0x4f,0xa0,0x95,0x1f,0x30,0x14,0x8b,0xc5,0x5f,0x8c,0x44,0x62,0x2f,0x48,0xd9,0xa2,0x19,0x5f,0x99,0x7e,0x40,0x25,0x97,0x4b,0x7f,0x9c,0x4e,0x27,0xf,0x1,0xe7,0xdb,0xf5,0x3,0x1a,0x1d,0xa1,0x8,0x30,0x18,0xc,0x86,0xb6,0x47,0xa3,0xf1,0x3d,0x81,0x40,0xe7,0x83,0xff,0x7,0x9b,0xbb,0x58,0x9c,0xfb,0x33,0x93,0x49,0x1e,0x2c,0x14,0x6a,0x8e,0x50,0xee,0x76,0x1c,0xa1,0x7a,0x12,0x3a,0xb4,0x27,0xd8,0x3,0xc,0x58,0x56,0xd7,0x36,0xed,0x9,0x3e,0x60,0x18,0xbe,0xc8,0xb2,0xb8,0x44,0x4d,0x86,0xe7,0x79,0x8e,0xeb,0x56,0x72,0x8e,0xe3,0x9c,0xd7,0x9e,0xe0,0x77,0xc0,0x65,0xbd,0xe7,0xf3,0x75,0x2e,0xf1,0x82,0x5d,0x61,0x3f,0x10,0xd4,0x8a,0xe8,0x6e,0xe2,0xa,0x2f,0x2b,0xfe,0x6,0x57,0x38,0xab,0x23,0x5e,0xd0,0xbd,0xff,0x82,0x5d,0x61,0x1a,0xb2,0x8e,0xa1,0x8f,0x49,0x93,0x1b,0xf7,0x2,0x82,0x95,0x71,0x2f,0xa0,0xb8,0x71,0x2f,0xe0,0xe8,0x63,0xce,0xa5,0xcd,0x4b,0x92,0x85,0xde,0xc,0xad,0x34,0x7b,0x58,0xb1,0xc0,0x9b,0xa1,0x7b,0xe3,0xde,0xb8,0xcb,0xc7,0x3f,0xd2,0xdb,0x54,0x98,0x63,0x18,0x87,0x7d,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x20,0x8,0x3,0x0,0x0,0x0,0x95,0x43,0x8e,0xb6,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x1,0x74,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xd,0xd,0xf,0x1a,0x1a,0x1e,0x20,0x20,0x24,0x22,0x22,0x27,0x24,0x24,0x29,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa,0xa,0xc,0x1d,0x1d,0x21,0x0,0x0,0x0,0x0,0x0,0x0,0x11,0x11,0x14,0x23,0x23,0x28,0x12,0x12,0x15,0x0,0x0,0x0,0x0,0x0,0x0,0xb,0xb,0xd,0x23,0x23,0x28,0xb,0xb,0xd,0x1e,0x1e,0x22,0x0,0x0,0x0,0x0,0x0,0x0,0xe,0xe,0x10,0x1a,0x1a,0x1e,0x1a,0x1a,0x1d,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x20,0x24,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe,0xe,0x10,0xb,0xb,0xd,0x0,0x0,0x0,0x13,0x13,0x15,0x0,0x0,0x0,0xb,0xb,0xc,0x1d,0x1d,0x21,0x0,0x0,0x0,0x0,0x0,0x0,0x25,0x25,0x2a,0x24,0x24,0x29,0x25,0x2c,0x36,0x27,0x49,0x65,0x29,0x5d,0x85,0x2a,0x66,0x95,0x2a,0x68,0x99,0x29,0x64,0x92,0x28,0x4c,0x6b,0x25,0x27,0x2d,0x27,0x43,0x5c,0x29,0x5f,0x89,0x27,0x49,0x66,0x25,0x30,0x3e,0x25,0x26,0x2d,0x25,0x25,0x2b,0x25,0x26,0x2c,0x25,0x2d,0x38,0x25,0x3a,0x4c,0x27,0x4d,0x6b,0x29,0x60,0x8c,0x27,0x44,0x5c,0x27,0x4b,0x69,0x28,0x59,0x7f,0x25,0x34,0x43,0x25,0x35,0x45,0x28,0x58,0x7f,0x25,0x26,0x2b,0x27,0x40,0x57,0x27,0x41,0x57,0x25,0x2a,0x33,0x29,0x5d,0x87,0x25,0x34,0x44,0x25,0x2b,0x34,0x40,0x40,0x44,0xad,0xad,0xaf,0xff,0xff,0xff,0xf2,0xf2,0xf2,0x77,0x77,0x7a,0x5b,0x5b,0x5f,0x4e,0x4e,0x52,0xc9,0xc9,0xca,0x27,0x43,0x5b,0x27,0x4d,0x6c,0x27,0x4e,0x6d,0xbb,0xbb,0xbd,0x69,0x69,0x6c,0x28,0x56,0x7b,0x26,0x3b,0x4e,0x26,0x3a,0x4e,0x32,0x32,0x37,0x84,0x84,0x87,0xd6,0xd6,0xd7,0x29,0x61,0x8d,0x25,0x2e,0x39,0x92,0x92,0x94,0xa0,0xa0,0xa2,0xe4,0xe4,0xe5,0x27,0x44,0x5d,0xdd,0xc9,0xf2,0x7e,0x0,0x0,0x0,0x41,0x74,0x52,0x4e,0x53,0x0,0x1,0x2,0x3,0x4,0x9,0xe,0x13,0x16,0x18,0x19,0xa,0x26,0x36,0x44,0x4d,0x52,0x54,0x55,0x6,0x12,0x27,0x43,0x80,0xc5,0xe7,0xf5,0xfe,0x8,0x17,0x35,0x73,0xd9,0x7,0x3a,0x96,0xf9,0x9a,0xb,0x28,0x76,0xfb,0x77,0xde,0x45,0x5,0x82,0xc6,0xc6,0x37,0xf,0xe9,0x4c,0x4e,0x4f,0x50,0x83,0x78,0x3b,0x9c,0x3c,0x74,0xda,0x53,0x14,0x37,0x21,0x5a,0x6c,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x65,0xb5,0xdd,0x88,0x9f,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x2,0x28,0x49,0x44,0x41,0x54,0x48,0xc7,0xd5,0x55,0x69,0x57,0xd3,0x40,0x14,0x25,0x93,0xa4,0x49,0x24,0x49,0xd9,0x42,0xd7,0x0,0x85,0x50,0x2c,0xb4,0x68,0x5b,0xab,0x28,0xb2,0xc,0x4b,0x95,0x82,0x56,0xab,0x42,0x45,0x5c,0x9b,0xad,0x45,0x11,0x6d,0x3,0xa8,0x7f,0xde,0xc4,0x94,0x26,0x69,0x30,0x89,0xc7,0x2f,0x7a,0x3f,0xe4,0x9c,0xcc,0x3b,0xef,0xce,0x7d,0x6f,0xde,0x32,0x30,0xf0,0xf,0x1,0x1,0x28,0x8a,0xf9,0x2,0x45,0x1,0x72,0xa5,0x3b,0xc0,0xf0,0x10,0x41,0x52,0xd7,0x7c,0x40,0x91,0x44,0x8,0xc7,0x80,0xfb,0x76,0x6c,0x90,0xa4,0x19,0x36,0x3c,0x34,0x3c,0xe2,0x89,0xe1,0xa1,0x30,0xcb,0xd0,0xe4,0x20,0xd6,0xa7,0x2,0x8c,0x8e,0x71,0xe3,0x91,0x68,0x2c,0x9e,0x80,0x3e,0x48,0xc4,0x63,0xd1,0xc8,0x38,0x37,0x36,0xea,0x10,0x1,0x92,0xfc,0xc4,0xe4,0xd4,0x86,0x9f,0xf3,0x25,0x36,0xa6,0x26,0x27,0xf8,0xa4,0x8d,0x1,0x49,0x51,0xd3,0x33,0x82,0xa7,0xcf,0xe6,0xd6,0x76,0xf9,0x81,0x89,0x87,0x3b,0x9b,0x50,0x98,0x99,0xa6,0x52,0x88,0x15,0x3f,0xc1,0xcc,0x7a,0x6a,0xaf,0xec,0xee,0x3d,0x7a,0x5c,0x7d,0x62,0xe0,0x69,0xed,0xd9,0xf3,0x17,0xfb,0x95,0xc4,0x2c,0x43,0xf4,0xf2,0x0,0xd2,0x73,0xd7,0x33,0x9e,0xfe,0x7,0xf5,0x97,0xf6,0xff,0xc3,0x57,0x7,0x95,0xcc,0xfc,0x5c,0xfa,0x32,0x8,0x8c,0x67,0x17,0xbc,0xfc,0x8f,0x5e,0xd7,0x6b,0xce,0x93,0x5a,0xfd,0xcd,0xd1,0x42,0x96,0xcf,0x99,0x12,0x10,0x9c,0x5e,0xf4,0x8c,0xff,0xed,0xbb,0xf7,0xfd,0x47,0x87,0x7b,0x1f,0xe0,0x22,0x8d,0x9b,0x4,0x20,0xc4,0xdc,0xb0,0x4c,0xd,0x51,0x92,0x15,0xa8,0x4a,0x4d,0xa8,0xb6,0xba,0x47,0xc7,0x1f,0xdd,0xa4,0x9f,0x8e,0xe1,0xcd,0x7c,0xc1,0x8c,0x1,0x25,0xd8,0x98,0x65,0x69,0x9d,0x34,0x3e,0x4b,0xd,0x55,0x6a,0x59,0x4,0xa7,0x5f,0xdc,0x4,0x5f,0x4f,0x61,0x31,0x4b,0xa0,0x26,0x1,0x79,0x2b,0x6e,0x9,0x90,0xda,0x10,0x9e,0x74,0x54,0x4d,0x56,0x7b,0x4,0x67,0xe7,0x6e,0x82,0xf3,0x33,0x28,0x94,0x48,0xcc,0x24,0xe0,0x6f,0x5b,0x6f,0xa8,0x6a,0xfa,0xe7,0x42,0x54,0x5b,0x17,0x5a,0x8f,0xa0,0x5c,0x75,0x13,0x54,0xcb,0x10,0xde,0xe1,0xbb,0x4,0x64,0xd8,0x2a,0xa2,0xb6,0xa1,0x40,0xfc,0xa6,0x3b,0x7f,0x17,0x3,0x2b,0x20,0xd8,0xa2,0x65,0xd1,0x3a,0xb0,0x2d,0x2b,0x3a,0x81,0x22,0x5,0xcd,0x1,0x8,0xe5,0x6d,0xaf,0xa0,0xca,0x9a,0x2c,0xfe,0x4a,0xa0,0x16,0xf4,0x15,0xf4,0x3a,0x58,0xb2,0x99,0xda,0x9d,0xa6,0x9e,0x4b,0x5,0xc2,0xa6,0xe2,0x5d,0x7,0x4b,0x5c,0xb7,0xe,0xfe,0xba,0x12,0x8d,0x5e,0x98,0xff,0xf3,0x5e,0xb8,0x6b,0xf5,0x42,0x80,0x6e,0xdc,0x77,0x76,0xe3,0xf,0x67,0x37,0x1a,0xf3,0xe0,0xde,0xb2,0xa7,0x86,0xfe,0x79,0x90,0x59,0xbe,0x6f,0x9b,0x7,0xc6,0x44,0xa2,0x98,0x95,0x55,0x18,0x18,0xab,0x2b,0xc,0x95,0x74,0xce,0xb4,0x14,0xc1,0xb1,0x91,0x68,0x51,0xf0,0x77,0x16,0x8a,0xd1,0x8,0xcb,0x11,0xa9,0xbe,0xc1,0x8c,0x60,0x69,0x92,0xce,0x67,0x4b,0x6b,0x23,0x3e,0x58,0x2b,0x65,0xf3,0x34,0x99,0xc6,0x5c,0xbb,0x1,0x1,0x39,0xbc,0xb0,0xce,0xfb,0xef,0x5,0x7e,0xbd,0x80,0xe7,0xae,0xde,0x2d,0xfa,0x66,0xf2,0x5f,0x4c,0xfa,0x6a,0xfa,0xcd,0x66,0xfa,0x7f,0xf1,0x13,0xb7,0x71,0x36,0xc6,0x87,0x41,0xd4,0x5,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char tool_button_pressed_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x72,0x0,0x96,0x0,0xa5,0x25,0x73,0x9b,0xf5,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xda,0x3,0x15,0xf,0x22,0xd,0x8d,0x49,0x35,0x34,0x0,0x0,0x1,0xdd,0x49,0x44,0x41,0x54,0x38,0xcb,0xa5,0x93,0x3b,0xae,0x5c,0x37,0x10,0x44,0x4f,0x35,0x7f,0x17,0xf6,0xc3,0x83,0x2,0xed,0x40,0x91,0x13,0x2d,0x40,0x91,0x96,0xa0,0x55,0x38,0xf5,0x22,0xbd,0xf,0x87,0x2,0xc,0x8c,0x81,0x27,0x68,0x2c,0xcd,0x8c,0xc8,0x2e,0x7,0xbc,0xb2,0x73,0x8b,0x4c,0x48,0xa0,0x59,0xac,0x53,0x6c,0xea,0x97,0x77,0xef,0x7f,0xe7,0x7,0x46,0xad,0xb5,0x72,0xff,0xf2,0xf5,0x4d,0x92,0x9f,0xbc,0x7c,0x35,0xbe,0x1,0x13,0xdb,0x8,0xff,0x57,0xaa,0x0,0xaa,0xd0,0xa1,0xa2,0xa7,0xa0,0x3c,0x8f,0x9f,0x8e,0x3f,0x6a,0xeb,0x7,0xf7,0x2f,0x7f,0x7f,0xf2,0x5a,0x7f,0xe6,0xca,0x4b,0xe6,0xbc,0x62,0x3f,0xb0,0xd3,0xd2,0x3e,0x8a,0xb7,0x80,0xd4,0x23,0xea,0x53,0x10,0xaf,0x29,0xd0,0xfa,0x41,0xad,0xa3,0x63,0xfb,0xba,0x72,0x5e,0xe6,0xb7,0xf9,0xd1,0x6b,0xbe,0x78,0xcd,0x7b,0x9a,0xa5,0xf3,0x6e,0x3,0x12,0x85,0x52,0x46,0x29,0xf9,0xaa,0xba,0x12,0xc4,0xcf,0x75,0x74,0x6a,0xef,0x83,0x4c,0xdf,0x3c,0x7d,0xcd,0xb9,0x5e,0xd6,0xb7,0xc7,0x5f,0x39,0xd7,0xcd,0x66,0x7d,0x47,0xb0,0x51,0x4,0x25,0x4a,0x1e,0x6a,0xc2,0x51,0x9e,0x13,0xdf,0x7a,0x1f,0xd4,0xda,0x7,0xe0,0x9,0x3c,0x44,0xde,0x9c,0xbe,0xd9,0xf3,0x6b,0x26,0x8b,0x38,0x33,0x48,0x64,0x53,0xac,0x40,0x3b,0xa3,0x7,0x78,0xd6,0x3e,0x6a,0x6d,0x63,0x60,0x29,0x15,0xa4,0xa5,0xb4,0x62,0xa1,0x58,0x4,0x13,0x4e,0x88,0xf0,0x89,0xa2,0x65,0xf8,0xb7,0xb6,0x8d,0x41,0xed,0xbd,0x23,0x4,0x12,0x92,0x88,0x12,0xb6,0xab,0x1,0x22,0x64,0x80,0xcc,0x94,0xc0,0x51,0x8a,0x23,0x8a,0x39,0xc3,0xed,0xbd,0x53,0x6b,0x3f,0x76,0xd2,0x12,0x11,0x41,0xa8,0xe0,0xba,0x93,0x8b,0x88,0xf3,0x5,0x13,0xe1,0xbd,0x97,0xf8,0x3e,0x6b,0x3f,0xa8,0xad,0xf,0xb6,0x1,0x21,0x5,0x2a,0x20,0xb,0x1,0x52,0x9c,0x4a,0xda,0x14,0xa,0x14,0x81,0x24,0x10,0xb4,0x3e,0xa8,0x6d,0x74,0x36,0xab,0x50,0x84,0x23,0xf6,0xda,0xa7,0xe0,0x36,0x90,0x88,0xc4,0xe,0x42,0xdb,0x5,0x88,0x36,0x3a,0xb5,0xf5,0x3,0x89,0x4c,0x47,0x4a,0xc5,0x2a,0x6,0x2,0x45,0xd9,0xae,0x80,0x5c,0x9,0xac,0x6d,0x3c,0xb0,0xad,0xc,0x91,0x6d,0x23,0x74,0x4,0xf,0xc2,0xd3,0xc6,0x51,0x64,0x28,0xa8,0x14,0x14,0xb1,0xbb,0x28,0x26,0xa4,0x6c,0xa7,0xd,0x29,0x31,0x5,0x8f,0xd6,0xfb,0x51,0xeb,0x18,0xd8,0x5c,0x6d,0xee,0x48,0x33,0x14,0x56,0x84,0x5d,0x1a,0x25,0xca,0x16,0x58,0x2,0x4d,0x56,0x62,0x9b,0xe5,0xf4,0xdd,0x8b,0x6b,0x1d,0xe3,0x39,0x5a,0x1f,0xe4,0x5a,0x17,0x27,0x9f,0x25,0x3d,0xac,0x58,0x8a,0x4a,0x44,0x21,0x5a,0x27,0x5a,0x3b,0x71,0xa,0x52,0x2c,0xc1,0xc3,0xe6,0xf3,0xf2,0xba,0xb4,0x3e,0x76,0x2b,0x7f,0xf8,0xf5,0xb7,0xb7,0xff,0xf7,0x3b,0xff,0x3,0xc,0xa4,0xfa,0xf0,0xa0,0xdd,0xcf,0x79,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x2,0x1,0x50,0x4c,0x54,0x45,0x29,0x3a,0x40,0x2d,0x3e,0x44,0x26,0x34,0x3b,0x24,0x34,0x39,0x23,0x31,0x38,0x22,0x31,0x37,0x22,0x31,0x37,0x22,0x30,0x36,0x22,0x31,0x36,0x26,0x34,0x3c,0x32,0x44,0x4c,0x26,0x34,0x39,0x23,0x31,0x36,0x21,0x2e,0x34,0x1f,0x2c,0x30,0x1f,0x2b,0x2f,0x1f,0x2a,0x2e,0x1e,0x2b,0x2f,0x1f,0x2b,0x2e,0x36,0x4b,0x52,0x25,0x33,0x38,0x20,0x2f,0x32,0x1c,0x29,0x2e,0x1b,0x26,0x2a,0x1a,0x23,0x26,0x18,0x22,0x26,0x19,0x22,0x26,0x19,0x23,0x26,0x19,0x26,0x29,0x20,0x2d,0x32,0x25,0x31,0x38,0x3c,0x51,0x59,0x23,0x31,0x37,0x1f,0x2b,0x31,0x1a,0x25,0x2b,0x17,0x20,0x24,0x15,0x1c,0x21,0x14,0x1b,0x21,0x14,0x1c,0x21,0x13,0x1b,0x21,0x15,0x1d,0x21,0x1a,0x25,0x2a,0x40,0x57,0x60,0x23,0x31,0x36,0x1f,0x2b,0x31,0x1b,0x25,0x29,0x16,0x1e,0x23,0x14,0x1b,0x1d,0x12,0x19,0x1d,0x12,0x1b,0x1d,0x14,0x1a,0x1d,0x45,0x5e,0x67,0x22,0x32,0x37,0x20,0x2d,0x31,0x1a,0x26,0x2a,0x15,0x1f,0x25,0x14,0x1c,0x1f,0x12,0x1b,0x1f,0x12,0x1b,0x20,0x14,0x1b,0x1f,0x15,0x1e,0x24,0x1a,0x25,0x29,0x4b,0x64,0x6d,0x23,0x32,0x38,0x20,0x2e,0x32,0x1b,0x27,0x2b,0x17,0x22,0x27,0x16,0x1e,0x23,0x14,0x1e,0x23,0x16,0x20,0x24,0x14,0x1e,0x22,0x15,0x1e,0x22,0x17,0x21,0x27,0x1c,0x27,0x2c,0x4f,0x6a,0x75,0x21,0x2f,0x33,0x1d,0x29,0x2d,0x19,0x23,0x2a,0x18,0x22,0x27,0x16,0x21,0x27,0x18,0x23,0x29,0x17,0x21,0x26,0x19,0x23,0x29,0x1c,0x28,0x2d,0x21,0x2e,0x33,0x54,0x70,0x7c,0x23,0x33,0x38,0x22,0x30,0x34,0x1e,0x2a,0x2f,0x1a,0x26,0x2d,0x1a,0x25,0x2b,0x19,0x25,0x2b,0x1a,0x26,0x2d,0x1a,0x26,0x2c,0x18,0x25,0x2a,0x1a,0x24,0x2a,0x1a,0x25,0x2c,0x1d,0x2a,0x2f,0x22,0x2f,0x34,0x59,0x77,0x82,0x23,0x33,0x39,0x22,0x30,0x35,0x1f,0x2c,0x31,0x1c,0x28,0x30,0x1c,0x28,0x2e,0x1b,0x29,0x2f,0x1c,0x2a,0x31,0x1b,0x28,0x2f,0x1c,0x28,0x2d,0x1b,0x27,0x2f,0x1f,0x2b,0x31,0x5e,0x7d,0x8a,0x24,0x34,0x39,0x21,0x2f,0x37,0x20,0x2d,0x34,0x1d,0x2b,0x33,0x1d,0x2b,0x32,0x1d,0x2d,0x35,0x1e,0x2e,0x36,0x1f,0x2e,0x36,0x1d,0x2b,0x34,0x1d,0x2b,0x31,0x1d,0x2b,0x32,0x20,0x2d,0x32,0x21,0x2f,0x36,0x63,0x83,0x90,0x25,0x34,0x39,0x21,0x31,0x36,0x1f,0x2e,0x34,0x1f,0x2e,0x34,0x1f,0x2e,0x36,0x20,0x31,0x39,0x21,0x33,0x3b,0x21,0x32,0x3b,0x1f,0x30,0x37,0x1f,0x2e,0x35,0x1e,0x2d,0x33,0x1f,0x2d,0x33,0x21,0x30,0x36,0x67,0x8a,0x97,0x24,0x33,0x39,0x20,0x30,0x36,0x1f,0x2f,0x35,0x21,0x30,0x37,0x22,0x32,0x39,0x21,0x35,0x3e,0x24,0x37,0x41,0x24,0x36,0x41,0x21,0x33,0x3c,0x21,0x31,0x38,0x1e,0x2f,0x35,0x1e,0x2e,0x35,0x20,0x2e,0x35,0x24,0x31,0x39,0x6c,0x90,0x9e,0x22,0x30,0x36,0x1f,0x2e,0x36,0x20,0x30,0x36,0x20,0x31,0x39,0x23,0x34,0x3d,0x23,0x37,0x41,0x26,0x3c,0x47,0x26,0x3b,0x46,0x22,0x35,0x3f,0x22,0x32,0x3b,0x1f,0x30,0x37,0x1f,0x2e,0x35,0x1f,0x2d,0x35,0x21,0x30,0x36,0x72,0x96,0xa5,0x72,0x96,0xa5,0xe8,0x14,0xaa,0x3f,0x0,0x0,0x0,0xaa,0x74,0x52,0x4e,0x53,0xc3,0xc3,0xe6,0xd7,0xcb,0xc3,0xbf,0xbe,0xbd,0xe5,0xc3,0xd7,0xc0,0xac,0xa0,0x9a,0x98,0x98,0x98,0xc3,0xcb,0xac,0x92,0x82,0x7b,0x78,0x78,0x7b,0x82,0xac,0xcb,0xc3,0xc3,0xa0,0x82,0x6f,0x67,0x64,0x63,0x64,0x67,0x82,0xc3,0xbf,0x9a,0x7a,0x67,0x5e,0x5b,0x5a,0x5e,0xc3,0xbd,0x98,0x78,0x64,0x5b,0x57,0x57,0x5b,0x64,0x78,0xc3,0xbd,0x98,0x78,0x63,0x5a,0x57,0x56,0x57,0x5a,0x63,0x77,0xc3,0x98,0x78,0x63,0x5a,0x57,0x56,0x5a,0x63,0x77,0x98,0xc3,0xbd,0x98,0x78,0x63,0x5a,0x57,0x56,0x56,0x57,0x5a,0x63,0x77,0x98,0xc3,0xbd,0x98,0x77,0x63,0x5a,0x57,0x56,0x57,0x5a,0x63,0x77,0xc3,0xbb,0x96,0x76,0x63,0x5a,0x57,0x56,0x56,0x57,0x5a,0x63,0x76,0x96,0xc3,0xb5,0x92,0x75,0x62,0x5a,0x57,0x56,0x56,0x57,0x59,0x62,0x74,0x92,0xc3,0xa9,0x8b,0x71,0x61,0x59,0x57,0x56,0x56,0x57,0x59,0x61,0x71,0x8b,0xa9,0xc3,0x95,0x7e,0x6b,0x5e,0x59,0x57,0x56,0x56,0x57,0x59,0x5e,0x6b,0x7e,0x95,0xc3,0x4f,0x78,0x99,0x30,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0xa9,0x27,0xf,0x6,0x4,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0xff,0x49,0x44,0x41,0x54,0x18,0xd3,0x63,0x60,0x40,0x7,0x8c,0x4c,0xcc,0x2c,0xac,0x6c,0xec,0x1c,0x1c,0x1c,0x6c,0xac,0x2c,0xcc,0x9c,0x8c,0xc,0x5c,0xdc,0x3c,0xbc,0x7c,0xfc,0x2,0x82,0x82,0x42,0xfc,0x7c,0xbc,0x3c,0xdc,0x5c,0xc,0xc2,0x22,0xa2,0x62,0xe2,0x12,0x92,0x52,0x52,0x92,0xd2,0x32,0x62,0xb2,0x72,0xc2,0xc,0xf2,0xa,0x8a,0x4a,0xca,0x2a,0xaa,0x6a,0x6a,0xea,0x1a,0xca,0x9a,0x8a,0xa,0xf2,0xc,0x5a,0xda,0x3a,0xba,0x7a,0xfa,0x6,0x86,0x86,0x6,0x46,0x7a,0xba,0x3a,0xda,0x5a,0xc,0xc6,0x26,0xa6,0x66,0xe6,0x16,0x96,0x56,0x56,0x96,0xd6,0x36,0xb6,0xa6,0x26,0xc6,0xc,0x76,0xf6,0xe,0x8e,0x4e,0xce,0x2e,0xae,0xae,0x6e,0xee,0x1e,0x9e,0xe,0x26,0x76,0xc,0x5e,0xf6,0xde,0x3e,0xbe,0x7e,0xfe,0x1,0x1,0xfe,0x81,0x41,0xc1,0x21,0xf6,0x5e,0xc,0xa1,0x61,0xe1,0x11,0x91,0x51,0xd1,0x31,0xb1,0x71,0xf1,0x9,0x89,0x49,0x61,0xa1,0xc,0xc9,0x29,0xa9,0x69,0xe9,0x19,0x99,0x59,0x59,0xd9,0x39,0xb9,0x79,0xa9,0x29,0xc9,0xc,0xf9,0x5,0x85,0x45,0xc5,0x25,0xa5,0x65,0xe5,0x15,0x95,0x55,0xd5,0x35,0x5,0xf9,0xc,0xb5,0x75,0xf5,0xd,0x8d,0x4d,0xcd,0x2d,0xad,0x6d,0xed,0x1d,0x9d,0x5d,0x75,0xb5,0xc,0xdd,0x3d,0xbd,0x7d,0xfd,0x13,0x26,0x4e,0x9a,0x3c,0x65,0xea,0xb4,0xe9,0x33,0x66,0x76,0x33,0xcc,0x9a,0x3d,0x67,0xee,0xbc,0xf9,0xb,0x16,0x2e,0x5a,0xbc,0x64,0xe9,0xb2,0xe5,0x2b,0x66,0x31,0xac,0x44,0x3,0x0,0xa4,0xd7,0x4d,0x73,0x12,0x21,0x19,0xde,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char tooltip_bg_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xdd,0x0,0xdd,0x0,0xdd,0xf5,0x15,0x8,0x9d,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x14,0xf,0xd,0x2d,0xcd,0xa6,0x10,0x43,0x0,0x0,0x0,0xd2,0x49,0x44,0x41,0x54,0x38,0x8d,0xed,0x93,0x3d,0x6a,0xc3,0x40,0x10,0x85,0xbf,0x55,0x6,0x2c,0x9,0x17,0xa9,0x77,0xb1,0x4f,0xe0,0x9f,0x42,0x27,0x12,0x42,0x65,0x8,0x3e,0x49,0xe,0x20,0x8c,0x4f,0xe4,0xc2,0x3f,0x75,0x9a,0xb0,0xaa,0x53,0x84,0x48,0x82,0x31,0x4a,0x11,0xa5,0x5d,0x5,0xd4,0xb8,0xf0,0x2b,0x87,0x79,0xdf,0x30,0xf0,0x9e,0x1,0x52,0xe0,0x19,0x98,0x3,0x4f,0x80,0x21,0xac,0x1e,0xb8,0x1,0x5f,0xc0,0xa7,0xc,0xe6,0xd,0xb0,0x0,0xe2,0x7f,0x2,0x5a,0xe0,0x3,0x38,0xcb,0x70,0x79,0xb9,0x5e,0x6d,0xdf,0x9c,0x75,0x89,0x88,0x4,0x1,0xaa,0xda,0xfb,0xda,0x37,0x97,0xeb,0x69,0x7,0xbc,0xb,0x20,0xc0,0xcc,0x59,0x97,0xb6,0x6d,0xcb,0xfe,0x50,0x1d,0x43,0x80,0x22,0x2f,0x33,0x67,0x5d,0x7a,0xb9,0x9e,0x66,0x80,0x44,0xc3,0xdc,0x88,0xc8,0xa8,0x19,0x60,0x7f,0xa8,0x8e,0x22,0xc2,0xdf,0xab,0x51,0x78,0x7d,0x5c,0xf,0xc0,0x3d,0x1,0x7a,0x55,0xa5,0xc8,0xcb,0x6c,0xcc,0x50,0xe4,0x65,0xa6,0xaa,0xf0,0x1b,0x69,0x4,0x50,0xa0,0xf3,0xb5,0xff,0x76,0xd6,0x25,0xaf,0x2f,0xbb,0x20,0x24,0x8e,0xe3,0xde,0xd7,0xbe,0x1,0x3a,0x40,0xd,0x60,0x99,0x50,0x26,0xc3,0xc4,0x3a,0xff,0x0,0x26,0xe4,0x45,0xbd,0xbe,0xa2,0xc,0xd0,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x33,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2d,0x2c,0x2f,0x48,0x46,0x4a,0xdd,0xdd,0xdd,0x4c,0x4a,0x4e,0x48,0x46,0x4a,0x40,0x3e,0x42,0xdd,0xdd,0xdd,0xfe,0x3f,0x83,0xa9,0x0,0x0,0x0,0xd,0x74,0x52,0x4e,0x53,0xa,0x1a,0x26,0x29,0x2a,0x48,0x65,0x6d,0x6e,0x66,0xf5,0xfe,0xcc,0xff,0xb7,0x4a,0xbe,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0xc,0x81,0xb3,0x51,0x63,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x44,0x49,0x44,0x41,0x54,0x18,0xd3,0xc5,0xcf,0xbb,0x15,0x0,0x20,0x8,0x43,0xd1,0x80,0x28,0xf8,0x41,0xf7,0xdf,0xd6,0x86,0x63,0xa1,0x3,0x78,0xcb,0x54,0x79,0x0,0x71,0x92,0x90,0x98,0x0,0xca,0x45,0x2d,0x68,0xc9,0x4,0xae,0xad,0x7b,0xe8,0xad,0x32,0x44,0xe7,0x1a,0x61,0x4d,0x15,0x88,0xf9,0x38,0xdc,0xfe,0xd,0xf7,0xb1,0xe7,0xfa,0x13,0x77,0xe7,0x6f,0xdc,0x6c,0x9,0x25,0x82,0x67,0x68,0x78,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char tree_bg_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xa,0x0,0x0,0x0,0xa,0x8,0x6,0x0,0x0,0x0,0x8d,0x32,0xcf,0xbd,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xa,0x14,0x3,0x19,0x39,0x7c,0x34,0x43,0x7a,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x9d,0x49,0x44,0x41,0x54,0x18,0xd3,0xb5,0x90,0x31,0xe,0xc2,0x40,0x10,0x3,0xed,0xbb,0xd5,0x25,0xa1,0xa1,0x3,0x9,0x41,0xc1,0x33,0x78,0x15,0x5f,0xc8,0x93,0x41,0x14,0x49,0x2e,0xbb,0xb7,0x29,0x2,0x52,0x20,0x14,0x34,0x58,0x72,0x63,0x4f,0x61,0x99,0xfb,0xdd,0xe1,0x9a,0x52,0xd5,0xc6,0x10,0x6b,0x92,0x58,0xca,0xdd,0x61,0xc5,0xfa,0x9c,0x87,0x96,0xa7,0xe3,0xf9,0x56,0xa5,0x7a,0x2b,0x22,0x0,0xde,0x41,0xc0,0xa1,0xaa,0x18,0x72,0x7f,0x97,0x18,0x62,0x23,0x22,0x88,0x22,0xe0,0x7,0xe8,0x70,0x0,0x80,0x6a,0x6c,0x2,0xc9,0x2,0x70,0x5,0x1,0x78,0x66,0x4,0xc9,0x12,0xf0,0xa3,0xfe,0x0,0xba,0x7b,0x98,0x67,0xfb,0xaa,0x9c,0x33,0x87,0xbb,0x7,0xb1,0x62,0x9d,0xaa,0xa6,0xd7,0xfc,0x6f,0xf7,0x58,0xb1,0x3e,0x36,0xf5,0xa6,0x3,0x70,0x29,0x66,0x30,0x53,0x5d,0x5a,0x75,0xd4,0x51,0xc7,0x47,0xce,0x43,0x3b,0x1,0xc,0x2e,0x55,0x5d,0x5f,0x72,0xb6,0x33,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xa,0x0,0x0,0x0,0xa,0x4,0x3,0x0,0x0,0x0,0x7f,0x1c,0xd2,0x8e,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2a,0x50,0x4c,0x54,0x45,0x17,0x16,0x1a,0x1d,0x1c,0x21,0x20,0x1e,0x24,0x21,0x1f,0x25,0x1d,0x1c,0x21,0x20,0x1e,0x24,0x1d,0x1c,0x21,0x1d,0x1c,0x21,0x24,0x22,0x29,0x28,0x26,0x2d,0x28,0x26,0x2e,0x2b,0x2a,0x31,0x2c,0x2a,0x32,0xff,0xff,0xff,0xb9,0x11,0x56,0x3e,0x0,0x0,0x0,0x8,0x74,0x52,0x4e,0x53,0x6f,0xef,0xf7,0xf7,0xf0,0xf9,0xf1,0xee,0xcf,0x21,0xd2,0xdf,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0xd,0xf6,0xb4,0x61,0xf5,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x2d,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x54,0x36,0x36,0x12,0x60,0xf0,0x98,0xb5,0x6a,0x65,0xb,0x43,0xe4,0x9e,0x33,0xa7,0xa7,0x32,0x58,0x9d,0x39,0x73,0x66,0x31,0x16,0x12,0x22,0xb,0x52,0xd9,0xc6,0xc0,0x2,0xd4,0x55,0x0,0x0,0xc,0x14,0x1a,0x90,0x55,0x1a,0xec,0xdb,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char tree_bg_focus_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x20,0x8,0x6,0x0,0x0,0x0,0x73,0x7a,0x7a,0xf4,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdb,0xb,0x4,0x12,0x2d,0x3a,0xb5,0x1b,0x14,0x49,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x2,0xc5,0x49,0x44,0x41,0x54,0x58,0xc3,0xc5,0x57,0x31,0x8e,0x14,0x31,0x10,0xac,0xea,0x3d,0x11,0x91,0xef,0x49,0xf7,0xf,0x78,0x1,0xf,0x40,0x84,0x44,0x10,0xf2,0x20,0x42,0x62,0x12,0xc4,0x3,0x78,0x1,0xff,0x21,0x42,0xb8,0x8a,0xc0,0x1e,0x8f,0xed,0xb1,0xe7,0x58,0xa4,0xd3,0xcd,0x6a,0xb5,0x33,0xb2,0xb7,0xbb,0xba,0xaa,0xbb,0xdd,0xc3,0x87,0xeb,0xfd,0x2b,0x0,0x3f,0xf1,0x3c,0xd7,0x6b,0x3e,0x5c,0xef,0xfd,0xed,0xed,0xef,0x67,0xf1,0xfe,0xee,0xfb,0xb,0xdc,0x6d,0xf,0x2f,0x3f,0xfd,0x0,0x49,0x44,0x5c,0x40,0x12,0x24,0x1,0x0,0xc1,0xe6,0x1f,0xdb,0xbd,0xbb,0x9f,0x6e,0x9,0xfd,0x16,0xd8,0x6,0x40,0xd8,0x86,0x6d,0x48,0x9,0xb6,0xf1,0xeb,0xf3,0x1b,0x0,0xd8,0x1,0x80,0xc8,0x0,0x48,0x44,0x10,0x8c,0xc8,0x40,0x70,0x2b,0x0,0x1f,0x22,0xb5,0x1,0x49,0x90,0x0,0x90,0x50,0xb3,0xe7,0x6e,0x37,0xc0,0xc2,0x0,0x71,0xb9,0x4,0x18,0x1,0x14,0x40,0xdb,0xba,0xe7,0x38,0x16,0xc,0x78,0x67,0xc0,0x46,0x36,0x23,0xd8,0x4,0xcd,0x19,0x0,0x74,0xd1,0x5f,0xe2,0x92,0xef,0xc9,0xa5,0x86,0x67,0x0,0xd0,0x48,0x20,0x65,0x38,0x51,0x98,0x68,0xaf,0x46,0x82,0xec,0x38,0x36,0xe7,0x97,0x7c,0x5f,0x19,0xe0,0x6d,0xc,0xc8,0xaa,0x0,0x48,0x1,0x88,0xcc,0x44,0x10,0xd0,0xc,0x80,0xdd,0x90,0x5c,0xd8,0x28,0xc9,0xc8,0x2a,0xc3,0xfa,0x1a,0xd7,0x82,0x51,0x12,0x30,0x7,0x37,0xb2,0x72,0x0,0x60,0x64,0xaa,0x0,0x83,0x74,0x89,0xcf,0xb,0x37,0xbe,0xb9,0xe4,0x32,0x6,0x77,0xce,0x91,0x79,0xd9,0x51,0x8d,0xdf,0x19,0xe2,0x11,0xe,0x57,0xcc,0xd8,0x75,0xad,0xb3,0xe9,0x3e,0xb0,0x4e,0x2,0xd4,0x8d,0xbd,0x63,0x92,0x3,0x88,0x7f,0x63,0xa0,0xd,0x24,0x9b,0x3f,0x6,0xb7,0x4b,0x60,0xc1,0x4d,0xe2,0xe4,0x67,0xc,0x31,0x9e,0x64,0x81,0x8f,0x5b,0x76,0x87,0xc5,0xb6,0xb1,0x6,0x0,0x8f,0x32,0x14,0xb6,0x9a,0x68,0xb9,0xf6,0xd5,0x11,0x59,0xd7,0x3a,0x56,0x1b,0x9,0xa6,0x0,0xba,0x50,0xda,0x2f,0x8f,0xb9,0xc0,0x89,0x10,0x83,0x2a,0x66,0x4e,0x6c,0xc3,0x4d,0x3e,0xbb,0x36,0xa8,0x89,0x4,0x65,0xfb,0x19,0x3,0x7e,0x42,0x6,0xb2,0x4e,0x84,0x25,0x98,0xda,0x73,0xc0,0x9c,0x44,0xec,0x3d,0x4c,0xc,0xb7,0xc6,0x34,0xe9,0xea,0x61,0xe4,0xad,0xdc,0x67,0xc,0xb4,0x8,0x7,0xa4,0xad,0x13,0x36,0x99,0xbd,0xac,0x8b,0x9,0x0,0xe0,0xac,0xa,0xc6,0x8f,0xbd,0xac,0x7f,0xcf,0x8e,0xc3,0x69,0x2a,0xb5,0x75,0xff,0xa8,0x4,0x8d,0x5e,0x58,0x94,0xa1,0x17,0x40,0x9a,0xfc,0x98,0xf5,0x1,0x5b,0x30,0x4,0x49,0x5d,0xb9,0x9f,0x34,0xa2,0x73,0x6,0xa6,0xb4,0xf3,0x71,0x9,0xda,0x20,0x27,0xc,0xb4,0x6c,0x35,0x54,0xf1,0xec,0xe8,0x99,0x25,0x1,0xf,0x92,0xb6,0xc7,0x8a,0x7,0xe6,0x9a,0x3e,0x20,0xc0,0x71,0x23,0x3,0x5e,0x32,0xd0,0xdb,0xd9,0xa8,0xdf,0x25,0x5e,0x56,0x81,0x24,0x44,0x3,0xe4,0x8c,0xfc,0x79,0x23,0x72,0x93,0x83,0x43,0x9,0x4a,0x67,0x67,0x81,0x2b,0x4a,0x94,0xcd,0x64,0xee,0x1,0x79,0xa8,0xe0,0xa1,0x11,0x9d,0x34,0xc2,0xdd,0x49,0x19,0x44,0x61,0x4d,0xcb,0xfb,0x90,0x3,0x23,0xe2,0x6d,0x56,0x74,0x39,0x5e,0x57,0x43,0x29,0x38,0x74,0x4b,0x62,0x9e,0x80,0x43,0x33,0xde,0x1,0x48,0x70,0x4,0x64,0x21,0xa5,0x54,0x3d,0xd1,0xb1,0x4f,0x44,0x3,0x5,0x6e,0x85,0x2f,0x6b,0x33,0x0,0x92,0x91,0x52,0x82,0x9c,0x32,0xcb,0x4a,0xf3,0x32,0xb4,0x4,0x8b,0x10,0x3,0xc1,0x4,0x39,0xaa,0xd3,0x2c,0x87,0xa7,0x19,0x3f,0x3b,0x28,0xf6,0xa9,0xb8,0x4,0xa7,0xcd,0xbe,0xe6,0x12,0xc8,0x2,0x4c,0x50,0x4,0xf8,0x7,0x40,0x20,0x42,0x20,0x63,0x39,0xfb,0xfb,0x74,0x4a,0xec,0xa7,0xe2,0xa4,0x4,0xcb,0x48,0xca,0xcf,0x9c,0x26,0xa1,0x84,0xc4,0x9d,0x91,0x24,0x54,0x0,0x4,0x6f,0x2,0x30,0xbe,0x17,0x48,0xe5,0xad,0xa8,0x54,0x2,0x8f,0xc,0x18,0x90,0x2a,0x6d,0xa1,0x42,0x7b,0x33,0x43,0xff,0xf,0x3,0x95,0x85,0x62,0x5f,0x12,0x64,0xd7,0x61,0xb4,0x2,0xb8,0xfb,0xfa,0xbe,0x33,0x9f,0x9e,0xe8,0x85,0x34,0xda,0x49,0x18,0x0,0x1f,0xae,0xf7,0x1f,0x0,0x7c,0x79,0xa6,0xd7,0xf3,0x8f,0x7f,0x1,0x3,0x74,0x35,0xa7,0x13,0x7b,0xfb,0xc3,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x20,0x8,0x6,0x0,0x0,0x0,0x73,0x7a,0x7a,0xf4,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdb,0xb,0x4,0x12,0x2d,0x3a,0xb5,0x1b,0x14,0x49,0x0,0x0,0x2,0xd9,0x49,0x44,0x41,0x54,0x58,0xc3,0xc5,0x57,0x31,0x8e,0x14,0x31,0x10,0xac,0xea,0x3d,0x11,0x91,0xdf,0x49,0xf7,0xf,0x78,0x1,0xf,0x40,0x84,0x44,0x10,0xf2,0x20,0x42,0x62,0x12,0xc4,0x3,0x78,0x1,0xff,0x21,0x42,0xb8,0x8a,0xc0,0x1e,0x4f,0xdb,0xe3,0xb9,0xbb,0x45,0x20,0x7c,0x1a,0xdd,0x8c,0xec,0xed,0xae,0xae,0xea,0xee,0xe9,0xe1,0xfd,0xed,0xdd,0xb,0x0,0xdf,0xf1,0x7f,0xd6,0x4b,0xde,0xdf,0xde,0xf9,0xcb,0xeb,0x9f,0xff,0xc5,0xfb,0x9b,0xaf,0xcf,0x70,0xb3,0x3d,0x3c,0xff,0xf0,0xd,0x24,0x11,0x71,0x1,0x49,0x90,0x4,0x0,0x4,0xd3,0x2f,0xb6,0x7b,0xf,0xff,0x86,0x2d,0x8c,0x47,0x60,0x1b,0x0,0x61,0x1b,0xb6,0x21,0x15,0xd8,0xc6,0x8f,0x8f,0xaf,0x0,0x60,0x7,0x0,0xa2,0x2,0x20,0x11,0x41,0x30,0xa2,0x2,0xc1,0xb5,0x0,0x8c,0x79,0xd9,0x80,0x24,0x48,0x0,0x48,0x28,0x9d,0xb9,0xd9,0xd,0xb0,0x31,0x40,0x5c,0x2e,0x1,0x46,0x0,0xd,0xd0,0xb6,0xef,0x35,0x8e,0x13,0x6,0xbc,0x33,0x60,0xa3,0x9a,0x11,0x6c,0x82,0xe6,0xa,0x0,0x86,0xe8,0x2f,0x71,0xa9,0xf7,0x9c,0x4d,0x1f,0x69,0x5e,0x1,0xd8,0xa3,0x37,0xa4,0xa,0x27,0x1a,0x13,0x79,0x25,0x9,0xaa,0xe3,0xd8,0x9c,0x5f,0xea,0x7d,0x67,0x80,0xd7,0x31,0x20,0xab,0x3,0x20,0x5,0x20,0x2a,0x13,0x41,0x40,0x2b,0x0,0x76,0x22,0xb9,0xb1,0xd1,0x92,0x91,0x5d,0x86,0xf3,0x35,0xef,0x5,0xa3,0x25,0x60,0xd,0x6e,0x66,0xe5,0x0,0xc0,0xa8,0x54,0x1,0x6,0xe9,0x16,0x9f,0x4f,0xdc,0x1c,0x13,0xed,0xb1,0x55,0x31,0x78,0x70,0x8e,0xca,0xcb,0x8e,0x6a,0xbe,0x56,0x88,0x67,0x38,0xdb,0x75,0x58,0x76,0xdf,0x1b,0x6c,0x7a,0xc,0x6c,0x90,0x0,0xfd,0xe0,0xe8,0x98,0xe4,0x4,0xe2,0x69,0xc,0xe4,0x40,0xaa,0xf9,0x63,0x70,0xbb,0x4,0x16,0x9c,0x12,0xa7,0x3e,0xe7,0x38,0xb3,0x4,0x2b,0x6f,0xc7,0x23,0xbb,0xc3,0x66,0xdb,0x38,0x7,0x0,0xcf,0x32,0x34,0xb6,0x52,0xb4,0x3c,0xf7,0x35,0x10,0xd9,0xf7,0x6,0x56,0x93,0x4,0x4b,0x0,0x43,0x28,0xf9,0x4a,0x3d,0x6e,0xb0,0x3e,0x9,0x31,0xa9,0x62,0xd6,0xc4,0x36,0x9c,0xf2,0xd9,0xbd,0x41,0x2d,0x24,0x68,0xc7,0x1f,0x62,0x60,0x6a,0xc1,0x7f,0x95,0x81,0xaa,0x13,0x61,0x9,0xa6,0xf6,0x1c,0x30,0x17,0x11,0x6f,0x48,0x12,0x3b,0xf3,0x7b,0xc2,0xeb,0xca,0x92,0xb7,0x72,0x5f,0x31,0x90,0x11,0x4e,0x48,0xb3,0x13,0xa6,0xcc,0x3e,0x51,0x60,0x91,0x53,0x55,0x87,0xf3,0x2a,0x98,0xff,0x7c,0x6c,0x1a,0xf9,0xec,0xda,0xeb,0x94,0x13,0x43,0xdd,0x3f,0x2a,0x41,0xd2,0xb,0x27,0x65,0xe8,0x13,0x20,0x29,0x3f,0xc6,0x7c,0x48,0x65,0x8,0x41,0xda,0xa4,0xd5,0x11,0xc0,0x2a,0x61,0xce,0x18,0x58,0xd2,0xbe,0x98,0x48,0x96,0xdd,0xf5,0xbc,0x11,0x65,0xb6,0x12,0x55,0xcb,0xde,0xb3,0x78,0x27,0x78,0xdc,0xcb,0x72,0xe6,0xd7,0x8a,0x27,0xe6,0x52,0x1f,0x10,0xe0,0xb8,0x92,0x81,0xb4,0x3f,0x1,0x1d,0xed,0x6c,0xd4,0xef,0x12,0x2f,0x73,0xa0,0xe,0xf,0x42,0x24,0x20,0xf,0x91,0xbf,0x6e,0x44,0xfb,0xde,0xa1,0x4,0xa5,0x7,0xaa,0xa0,0x23,0xad,0xd4,0x4b,0xaa,0x73,0x0,0xb7,0xa1,0x82,0x87,0x46,0x74,0x9a,0xf,0x48,0x5d,0xb3,0xd,0xa2,0xb0,0x96,0xe5,0x7d,0xc8,0x81,0x19,0xf1,0x36,0x2b,0xba,0xbd,0x5e,0xb3,0xb7,0x55,0x12,0x76,0x90,0xc4,0x3a,0x1,0xa7,0x66,0xbc,0x3,0x90,0xe0,0x8,0xc8,0x42,0x29,0xa5,0x7b,0xa2,0x63,0x9f,0x88,0x26,0xa,0x9c,0x85,0x6f,0x7b,0x2b,0x0,0x92,0x51,0x4a,0x81,0x5c,0x2a,0xcb,0x2a,0x47,0x0,0xb0,0x2b,0x8,0x11,0x62,0x20,0x58,0x20,0x47,0x77,0x5a,0xe5,0x98,0x43,0x3f,0x2,0xd8,0xc1,0xa5,0x39,0x40,0x82,0xb5,0xd9,0xd7,0x5a,0x2,0x59,0x80,0x9,0x8a,0x0,0x7f,0x1,0x8,0x44,0x8,0x64,0xe0,0xe8,0x6e,0x4b,0xb4,0x87,0xa6,0xc4,0x3d,0x17,0x24,0xa3,0xa8,0xc0,0x32,0x8a,0xea,0x33,0x67,0x0,0x6e,0xc,0x94,0x5e,0xe2,0x46,0x11,0x3a,0x0,0x82,0x57,0x1,0x98,0xbf,0xb,0xa4,0xf6,0x55,0xd4,0x2a,0xe1,0x0,0x40,0xf5,0xf3,0xa5,0xd3,0x16,0x6a,0xb4,0xa7,0x19,0xfa,0x4f,0x18,0xe8,0x2c,0x34,0xfb,0x92,0x20,0xbb,0xf,0xa3,0x1d,0xc0,0xcd,0xe7,0xb7,0x83,0xf9,0xf2,0x24,0xd3,0xd7,0xaf,0x40,0x9a,0x84,0x1,0xf0,0xfe,0xf6,0xee,0x1d,0x80,0x4f,0xff,0xc8,0xdf,0x63,0xeb,0xfd,0x6f,0x3,0x74,0x35,0xa7,0x2a,0xf0,0x17,0xed,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char tree_cursor_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xe,0x0,0x0,0x0,0xe,0x8,0x6,0x0,0x0,0x0,0x1f,0x48,0x2d,0xd1,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x0,0x0,0x0,0x0,0x0,0xf9,0x43,0xbb,0x7f,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdb,0xb,0x4,0x4,0x6,0x11,0x77,0x7c,0xcf,0xa2,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x2a,0x49,0x44,0x41,0x54,0x28,0xcf,0x9d,0x92,0xb1,0x75,0x1b,0x41,0xc,0x44,0x3f,0x6,0xb8,0xa3,0x44,0x95,0xe1,0x12,0xec,0xcc,0x15,0xb9,0x8,0xd7,0xa5,0xd0,0x91,0x23,0xd7,0xe0,0x32,0x44,0x59,0x47,0xde,0xc0,0xc1,0xf2,0xa8,0xe3,0x73,0xe0,0xf7,0x84,0x64,0xb1,0xc0,0x62,0x6,0x33,0x6f,0xe3,0xf9,0xfb,0xb7,0xe6,0x3,0x51,0xcb,0xb2,0xf0,0xe9,0xcb,0xd7,0xcf,0xdd,0xbd,0xee,0x1b,0x11,0x11,0xdd,0x9d,0xf7,0xb5,0x9e,0x8,0x3d,0xfc,0xfe,0xf5,0xf3,0x47,0x9d,0x2f,0x6f,0x44,0x4d,0x44,0x5c,0xbb,0xd,0xd8,0x20,0x45,0xd8,0x90,0x1a,0x43,0xeb,0xa,0xe0,0xce,0xfc,0x73,0xbe,0xbc,0x51,0xcb,0x69,0x41,0x52,0x83,0xae,0xb0,0x80,0x18,0x30,0xda,0xb8,0xc,0x55,0x0,0x6b,0xe0,0x5e,0x4e,0xb,0x75,0xb2,0x9,0xa5,0x91,0x36,0x26,0x64,0xb7,0xa5,0x96,0xdd,0x6,0xa1,0x29,0x64,0x63,0x9,0x1c,0x3e,0xd9,0xd4,0xeb,0x79,0x25,0x6b,0x1a,0xc0,0x4a,0x3a,0x2,0x12,0xb2,0x9b,0xce,0xea,0xec,0x5e,0x7,0x73,0x46,0x7a,0xbc,0x79,0x3d,0xaf,0xd4,0x8b,0x1b,0x65,0x41,0xec,0x5c,0x10,0x8c,0xd,0xb6,0x4d,0xd,0xa5,0xe6,0x62,0x10,0xbc,0xb8,0x29,0x0,0x1d,0x66,0x68,0xf,0x63,0x36,0x9d,0x21,0x8,0x8f,0xd3,0x1e,0xb5,0xd2,0x0,0x4,0xea,0x49,0x81,0xa4,0xbd,0x13,0xd7,0xdc,0xef,0xb5,0xaa,0x9b,0x7e,0x6c,0x9e,0x14,0xd4,0xe3,0x94,0xc4,0xa6,0x71,0x17,0x6d,0x11,0x8a,0x6b,0xde,0x44,0xe5,0xcd,0x87,0xc7,0x29,0xa9,0xa3,0x84,0xaa,0xe8,0x6e,0x22,0xe2,0x5f,0x0,0x2,0xd1,0x77,0xfd,0xa3,0x44,0xcd,0xc7,0x79,0x98,0xb3,0xdf,0xf0,0x3f,0x31,0x1f,0x67,0x6a,0xaa,0x3,0xca,0x4a,0x60,0xbd,0xd,0xc7,0x1d,0xe5,0xfb,0xfd,0x2a,0x7b,0xaa,0x3,0xf1,0xd1,0x4f,0xfe,0x17,0x16,0xcf,0x7d,0xff,0x6c,0x22,0x76,0x28,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xe,0x0,0x0,0x0,0xe,0x8,0x3,0x0,0x0,0x0,0x28,0x96,0xdd,0xe3,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0xc6,0x50,0x4c,0x54,0x45,0xd4,0xab,0x9e,0xd3,0xaa,0x9d,0xd4,0xab,0x9e,0xd3,0xaa,0x9d,0xd4,0xab,0x9c,0xd4,0xac,0x9e,0xd5,0xaf,0xa3,0xd5,0xb0,0xa3,0xd5,0xaf,0xa3,0xd5,0xad,0xa1,0xd5,0xaf,0xa3,0xd5,0xad,0xa1,0xd5,0xb0,0xa3,0xd6,0xad,0xa0,0xd6,0xad,0xa0,0xd5,0xb0,0xa3,0xd7,0xb1,0xa5,0xd7,0xb1,0xa7,0xd7,0xb1,0xa7,0xd7,0xb1,0xa7,0xd7,0xb1,0xa7,0xd7,0xb1,0xa5,0xd7,0xb1,0xa5,0xd8,0xb3,0xa8,0xd8,0xb5,0xaa,0xda,0xb3,0xa8,0xda,0xb3,0xa8,0xd8,0xb3,0xa8,0xd8,0xb5,0xaa,0xda,0xb3,0xa8,0xd8,0xb3,0xa8,0xdb,0xb7,0xad,0xda,0xb8,0xae,0xdb,0xb9,0xad,0xdb,0xb9,0xad,0xdb,0xb7,0xad,0xdd,0xba,0xb1,0xdd,0xbb,0xb1,0xdd,0xbd,0xb1,0xdd,0xbf,0xb3,0xdd,0xbd,0xb3,0xdf,0xc1,0xb7,0xdf,0xc0,0xb5,0xdf,0xbf,0xb5,0xe1,0xc3,0xb9,0xe1,0xc3,0xbb,0xe1,0xc5,0xbb,0xe2,0xc7,0xbe,0xe1,0xc5,0xbd,0xe4,0xcb,0xc2,0xe3,0xca,0xc1,0xe3,0xcb,0xc3,0xe6,0xce,0xc6,0xe6,0xd0,0xc6,0xe8,0xd1,0xca,0xe8,0xd1,0xca,0xe8,0xd0,0xca,0xe8,0xcf,0xca,0xb7,0x7d,0x69,0xb1,0x77,0x63,0xac,0x73,0x5c,0xa6,0x69,0x56,0x9c,0x67,0x54,0x93,0x62,0x51,0x88,0x60,0x50,0x0,0x0,0x0,0x39,0x76,0x1d,0xc2,0x0,0x0,0x0,0x3a,0x74,0x52,0x4e,0x53,0x32,0x2f,0x30,0x33,0x38,0x40,0x32,0x2f,0x2f,0x2f,0x31,0x33,0x33,0x33,0x36,0x38,0x31,0x2f,0x30,0x31,0x33,0x33,0x35,0x2f,0x2f,0x2f,0x30,0x32,0x33,0x33,0x33,0x2f,0x2f,0x2f,0x30,0x30,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x32,0x2f,0x2f,0x2f,0xb8,0xf,0x95,0x41,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x41,0x89,0xde,0x6c,0x4e,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x0,0x9e,0x49,0x44,0x41,0x54,0x8,0xd7,0x55,0xcf,0x5b,0x17,0x81,0x40,0x14,0x5,0xe0,0xe3,0x9a,0x4b,0x2e,0x31,0x14,0x62,0x22,0x53,0x4d,0x83,0x44,0xc,0xa6,0xa9,0xf9,0xff,0xbf,0xca,0xd4,0x5a,0x1e,0x7c,0xfb,0xec,0xb5,0x9f,0xf,0x7c,0xfe,0x80,0x80,0x86,0xd6,0x6c,0x69,0xed,0x8e,0x80,0xbc,0x6b,0x18,0xbd,0xfe,0x60,0x68,0x9a,0xa3,0xf1,0x24,0x7,0x39,0xb5,0x2c,0x6b,0x36,0x47,0x68,0x81,0xd0,0x52,0x42,0x61,0x3b,0xb6,0xb3,0x72,0xd6,0x1b,0x77,0xeb,0xee,0xa,0x28,0x31,0xc6,0x9e,0x87,0x3d,0xbc,0x3f,0xf8,0x7e,0x9,0xea,0x48,0x8,0x9,0xc2,0x28,0x22,0x21,0x9,0x14,0x28,0x1a,0x33,0x16,0xd3,0x98,0xb2,0x98,0x51,0x5,0xe5,0x49,0x3b,0xeb,0x5e,0x74,0x4a,0x28,0x92,0xca,0xb5,0xbe,0xa4,0x0,0x99,0xde,0xd2,0xca,0xbd,0x5a,0x9,0x79,0x96,0x3d,0xb2,0x9f,0x1c,0xc4,0x93,0xf3,0x17,0xaf,0xfb,0xe6,0x2,0xfe,0x5f,0xf8,0x2,0x30,0xbc,0x1f,0xb4,0x2b,0xfc,0x80,0xca,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char tree_cursor_unfocus_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xe,0x0,0x0,0x0,0xe,0x8,0x6,0x0,0x0,0x0,0x1f,0x48,0x2d,0xd1,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x0,0x0,0x0,0x0,0x0,0xf9,0x43,0xbb,0x7f,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdb,0xb,0x4,0x4,0x7,0xa,0xe4,0x2,0x37,0xf,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0xef,0x49,0x44,0x41,0x54,0x28,0xcf,0x9d,0x51,0x4b,0x4e,0xc5,0x40,0xc,0xb3,0x67,0x32,0x29,0x87,0x61,0x81,0xe0,0x8e,0x6c,0xb8,0x1,0xb7,0x40,0x62,0x8b,0x38,0x1,0x88,0x5,0x87,0x61,0xd2,0xd7,0xf1,0x5b,0xf4,0x43,0x5b,0xa,0x2,0x22,0x65,0x33,0x8e,0x1d,0xc7,0xc3,0xfb,0xbb,0x5b,0xe1,0x1f,0x65,0x11,0x81,0xcb,0xab,0xeb,0x1b,0x49,0xc3,0x1a,0x20,0x49,0x49,0x79,0x33,0x4d,0x14,0x82,0x17,0xef,0x6f,0xaf,0xcf,0x16,0x7d,0x20,0xe7,0x2d,0x2e,0x69,0x26,0x82,0xe4,0xf2,0x6,0xa0,0x91,0xfc,0x88,0x3e,0x60,0x51,0x3,0x29,0x25,0x21,0xa5,0xad,0xf6,0xba,0x5a,0xc3,0x84,0xf,0x68,0x4d,0x51,0x3,0x56,0x4f,0x3d,0x98,0x73,0x23,0x89,0xd5,0x6,0xcd,0x2d,0x29,0xd1,0x6c,0x11,0x12,0xd9,0xea,0xa9,0x87,0xd5,0xe8,0x61,0x66,0xdf,0x65,0x20,0x0,0xc3,0xde,0x45,0x8d,0x89,0xb8,0xbf,0x11,0x0,0x36,0xd6,0x47,0xab,0x42,0x6b,0x9f,0x44,0x0,0xc8,0xa5,0xcc,0xc7,0xaf,0x53,0x5d,0xac,0x6b,0x16,0x49,0x69,0x9,0xcb,0x3a,0x2f,0x48,0xdb,0x60,0x40,0x10,0x82,0x8e,0x45,0x24,0x74,0x5e,0x46,0x62,0x4e,0x5f,0xad,0xee,0xbf,0x62,0x11,0x27,0x26,0xa2,0x15,0x24,0xb3,0xcd,0xe0,0x61,0x4a,0x2b,0xbc,0xb3,0x2,0xf3,0xce,0x8f,0xc3,0xf9,0xa1,0xbc,0x73,0x98,0x17,0x47,0x1e,0x99,0xc3,0xaf,0x89,0xc5,0x61,0xee,0x8e,0xa7,0xc7,0x87,0x97,0x3f,0x6d,0x74,0xc7,0x19,0x62,0xf7,0x73,0x46,0x67,0x9a,0x95,0xf3,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xe,0x0,0x0,0x0,0xe,0x8,0x3,0x0,0x0,0x0,0x28,0x96,0xdd,0xe3,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x99,0x50,0x4c,0x54,0x45,0xc0,0xb5,0xb2,0xbf,0xb4,0xb1,0xc0,0xb5,0xb2,0xbf,0xb4,0xb1,0xbf,0xb5,0xb1,0xc0,0xb5,0xb2,0xc3,0xb8,0xb5,0xc3,0xb8,0xb5,0xc2,0xb7,0xb4,0xc3,0xb8,0xb5,0xc2,0xb7,0xb4,0xc3,0xb8,0xb5,0xc2,0xb7,0xb4,0xc3,0xb8,0xb5,0xc5,0xba,0xb7,0xc5,0xbc,0xb9,0xc5,0xbc,0xb9,0xc5,0xbc,0xb9,0xc5,0xbc,0xb9,0xc5,0xba,0xb7,0xc5,0xba,0xb7,0xc6,0xbd,0xba,0xc7,0xbe,0xbb,0xc7,0xbe,0xbb,0xc6,0xbd,0xba,0xc7,0xbe,0xbb,0xc6,0xbd,0xba,0xca,0xc1,0xbe,0xca,0xc1,0xbe,0xcd,0xc4,0xc1,0xcd,0xc6,0xc3,0xd0,0xc9,0xc6,0xcf,0xc8,0xc5,0xd2,0xcb,0xc8,0xd3,0xcb,0xc9,0xd3,0xcc,0xc9,0xd5,0xcd,0xcb,0xd4,0xcc,0xca,0xd7,0xd1,0xcf,0xd6,0xd0,0xce,0xda,0xd4,0xd2,0xdd,0xd7,0xd5,0xdd,0xd7,0xd5,0x9a,0x8b,0x86,0x94,0x85,0x80,0x8e,0x80,0x7a,0x88,0x79,0x74,0x81,0x75,0x6f,0x7a,0x6f,0x6a,0x73,0x69,0x65,0x0,0x0,0x0,0xfb,0x87,0x71,0x8e,0x0,0x0,0x0,0x2b,0x74,0x52,0x4e,0x53,0x32,0x2f,0x30,0x33,0x38,0x40,0x32,0x2f,0x2f,0x31,0x33,0x33,0x36,0x38,0x31,0x2f,0x30,0x31,0x33,0x33,0x35,0x2f,0x2f,0x30,0x32,0x33,0x33,0x2f,0x30,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x2f,0x32,0x2f,0x82,0xd8,0x8a,0x2f,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x32,0x40,0xd2,0x4c,0xc8,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x0,0x82,0x49,0x44,0x41,0x54,0x8,0xd7,0x55,0xcf,0xe9,0x16,0xc1,0x30,0x14,0x4,0xe0,0xb1,0x96,0x16,0x25,0x34,0x84,0x26,0x2d,0xaa,0xb6,0xac,0xef,0xff,0x72,0x6e,0x38,0xe,0xfd,0xe6,0xce,0x99,0xdf,0x17,0xcf,0xe,0x68,0xf4,0x48,0x7f,0x40,0x86,0x23,0xd,0x33,0x4e,0x92,0x64,0x32,0x4d,0xb3,0x2c,0x9d,0xcd,0xd,0xec,0x22,0xcf,0xf3,0xe5,0x8a,0xb1,0x35,0x63,0x1b,0xb,0x57,0xf0,0x82,0x73,0xbe,0xdd,0x9,0x21,0xf6,0xe,0xfe,0xf0,0x55,0x96,0xa5,0x47,0x90,0x91,0x52,0x4a,0x2a,0x29,0x3,0x42,0x55,0x93,0xaa,0x8e,0x53,0x5,0xf8,0x23,0x39,0x51,0xcf,0x14,0xf,0xd7,0x44,0x97,0xf7,0x35,0xe,0xb6,0xbd,0xb6,0x1f,0xb4,0x16,0xe6,0xf6,0xc7,0x40,0xdf,0x1f,0x3f,0x1a,0xdd,0x17,0x5e,0xc0,0x36,0x18,0x83,0x7f,0x54,0x76,0x87,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char tree_title_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x4c,0x0,0x4a,0x0,0x4e,0x88,0x29,0x6a,0xb6,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x10,0x14,0x11,0x9,0x88,0xc3,0x72,0x9,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x1d,0x49,0x44,0x41,0x54,0x38,0x8d,0x63,0x54,0x55,0x56,0xfd,0xcf,0x40,0x1,0x60,0xa2,0x44,0xf3,0xa8,0x1,0xa3,0x6,0x8c,0x1a,0x30,0x98,0xc,0x0,0x0,0x7,0x54,0x1,0x8c,0x3f,0xc3,0xfb,0x99,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x1,0x3,0x0,0x0,0x0,0x25,0x3d,0x6d,0x22,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x6,0x50,0x4c,0x54,0x45,0x25,0x23,0x25,0x4c,0x4a,0x4e,0x1,0xf9,0x98,0x2e,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x1,0xff,0x2,0x2d,0xde,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0xc,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x20,0xd,0x0,0x0,0x0,0x30,0x0,0x1,0xc7,0xaa,0x85,0x8e,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char tree_title_pressed_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0x4c,0x0,0x4a,0x0,0x4e,0x88,0x29,0x6a,0xb6,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x10,0x14,0x11,0x5,0x81,0x75,0x3e,0x22,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x1d,0x49,0x44,0x41,0x54,0x38,0x8d,0x63,0x34,0x33,0x31,0xfb,0xcf,0x40,0x1,0x60,0xa2,0x44,0xf3,0xa8,0x1,0xa3,0x6,0x8c,0x1a,0x30,0x98,0xc,0x0,0x0,0xd6,0x1e,0x1,0xbf,0x4c,0xf9,0x63,0xb6,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x1,0x3,0x0,0x0,0x0,0x25,0x3d,0x6d,0x22,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x6,0x50,0x4c,0x54,0x45,0x36,0x34,0x36,0x4c,0x4a,0x4e,0x14,0xd7,0x5b,0xf8,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x1,0xff,0x2,0x2d,0xde,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0xc,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x20,0xd,0x0,0x0,0x0,0x30,0x0,0x1,0xc7,0xaa,0x85,0x8e,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char unchecked_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x16,0x2f,0x23,0x2,0xd6,0x7b,0x4b,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0xe9,0x49,0x44,0x41,0x54,0x38,0xcb,0xed,0x93,0x4d,0x4e,0xc3,0x30,0x10,0x85,0x3f,0x4f,0x6c,0x71,0x1,0x1c,0x12,0x29,0x8b,0x6e,0x73,0x91,0x6e,0x10,0x7,0xe0,0x1c,0x3d,0x7,0x37,0x60,0xcf,0x1,0x10,0x8b,0xf6,0x22,0x15,0xbb,0x2e,0x2a,0xf5,0x7,0x2e,0x80,0xec,0x8e,0xd9,0x38,0x69,0x91,0x48,0x5a,0x4,0x4b,0x9e,0x34,0x2b,0xbf,0x19,0xbf,0x37,0x3f,0xf0,0x4b,0x18,0x80,0xbb,0xdb,0xfb,0x2b,0x60,0x2,0xb4,0x40,0x9,0xc8,0x0,0x5f,0x81,0x3d,0xb0,0x4,0x56,0xcf,0x2f,0x4f,0x1f,0x36,0x3f,0x4c,0xde,0xde,0x37,0xf,0xdb,0xdd,0x7a,0xaa,0xaa,0xce,0x18,0xf3,0x6d,0x76,0x4a,0x9,0x11,0x9,0xd5,0x4d,0xb3,0xf0,0xd7,0xf5,0xc,0x78,0xed,0x7e,0x6a,0xb7,0xbb,0xf5,0x14,0x70,0xd6,0x3a,0xc6,0x2,0x70,0x99,0xdb,0x2,0x74,0xa,0x4a,0x55,0x75,0xd6,0x3a,0x8a,0xa2,0x38,0xeb,0x3b,0xc6,0xe0,0xb2,0xd5,0xde,0xab,0x18,0x63,0x18,0x92,0xfe,0xa5,0x69,0x47,0x9e,0x30,0xd2,0xac,0x8b,0xf1,0x5f,0xe0,0x58,0x40,0x53,0x4a,0xa4,0x94,0xce,0x26,0x9c,0xf0,0xf4,0x74,0xf,0xf6,0x22,0x12,0x54,0xf,0xae,0x1b,0xd5,0x50,0xb2,0xea,0x1,0x11,0x89,0x79,0xa5,0x7b,0x5,0xcb,0xaa,0x6c,0x16,0x40,0x8c,0x31,0x30,0x16,0x60,0x42,0x55,0x36,0xf3,0x7c,0xf,0xbd,0x82,0x95,0xf7,0xf5,0xcc,0xfb,0xfa,0xf1,0x27,0xc7,0xc4,0x5f,0xe0,0x13,0xe5,0xc4,0x63,0x4f,0x20,0x8a,0x2e,0x80,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x36,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x38,0x37,0x40,0x20,0x20,0x24,0x20,0x20,0x24,0x38,0x36,0x40,0x20,0x20,0x25,0x1e,0x1e,0x22,0x1f,0x1f,0x23,0x20,0x20,0x24,0x22,0x22,0x27,0x23,0x23,0x28,0x25,0x25,0x2a,0xff,0xff,0xff,0xf7,0x93,0x46,0x7a,0x0,0x0,0x0,0xb,0x74,0x52,0x4e,0x53,0x0,0x7,0x27,0x50,0x66,0x68,0xb4,0xfa,0xfb,0xb4,0xfa,0xa4,0x7f,0xe1,0x5a,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x11,0xe2,0xb5,0x3d,0xba,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x53,0x49,0x44,0x41,0x54,0x18,0xd3,0xb5,0xcf,0xc1,0x12,0x80,0x20,0x8,0x45,0x51,0x5,0x14,0xd,0x5,0xff,0xff,0x6b,0x23,0x27,0x67,0x9a,0x6c,0xdb,0x5d,0x9e,0xd,0x8f,0x10,0xb6,0x22,0x20,0xa5,0x19,0x21,0x44,0x7,0xc8,0x2c,0x6d,0x26,0x9c,0xc1,0x1,0xb9,0xab,0xcd,0xb4,0x33,0x3a,0x90,0xe8,0xb8,0x53,0x21,0x87,0xd4,0x6c,0x81,0xb5,0xf4,0x17,0x6c,0x67,0x9f,0xc3,0xca,0x35,0xc,0x6a,0x59,0xd3,0x8f,0xa,0x5f,0xcf,0xbd,0x3a,0x1,0x93,0xe2,0x8,0xa4,0xb1,0xeb,0xd3,0x56,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char updown_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x2b,0x8a,0x3e,0x7d,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0xa6,0x49,0x44,0x41,0x54,0x28,0x91,0xa5,0x90,0x21,0xe,0xc2,0x50,0x10,0x44,0xdf,0x27,0x9b,0x10,0x2e,0xc0,0x9,0xd6,0x81,0xe3,0x6,0xe0,0xa0,0xd7,0x2d,0xae,0x18,0x24,0x95,0xc5,0x7d,0x51,0xdd,0xb,0x60,0xf6,0x67,0x31,0xfb,0x49,0xc1,0x20,0x3a,0x6a,0x93,0x99,0x9d,0xcc,0xc,0x2c,0x45,0xaa,0x47,0xce,0x79,0x2b,0x22,0x2d,0x80,0x99,0x5d,0x54,0x75,0xfa,0x8,0x82,0xec,0x80,0x7d,0xe8,0x7,0x33,0x3b,0xa9,0xea,0x94,0x82,0xbc,0x1,0x3b,0x60,0x8,0xc1,0x1e,0x78,0x9a,0xd9,0x51,0xc2,0x76,0x57,0xbf,0x0,0xaa,0x9b,0x88,0xb4,0x2b,0x77,0x7f,0x1,0x7d,0xb5,0x54,0xd5,0x29,0x84,0x7d,0x70,0x4b,0x6b,0x8e,0xe3,0x78,0x7,0x36,0x66,0x76,0xae,0xd5,0x22,0xf8,0x15,0x78,0x89,0xbb,0xaf,0x53,0x4a,0x7,0x11,0xe9,0x72,0xce,0x5f,0x21,0xdd,0xfd,0x21,0xa5,0x94,0x66,0x96,0xba,0x9b,0xd5,0x1c,0x4a,0x29,0xcd,0xff,0xa1,0x7e,0xa6,0xbe,0xc6,0xd4,0x9f,0x3c,0xcb,0xf1,0x6,0x8e,0x4e,0x65,0x44,0x6f,0x74,0x5c,0xa1,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x10,0x8,0x4,0x0,0x0,0x0,0x81,0x83,0xf6,0xf6,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x4,0x4e,0x1d,0x2,0xaf,0x0,0x0,0x0,0x86,0x49,0x44,0x41,0x54,0x18,0xd3,0x85,0x8e,0x21,0x12,0xc2,0x30,0x10,0x45,0x5f,0x98,0x9d,0xe9,0x70,0x81,0x3d,0x41,0x1c,0x75,0xe5,0x4,0xc4,0xc1,0x79,0xa9,0xb,0x6,0x49,0x5d,0x8b,0x5b,0x11,0x9d,0xb,0xd4,0xec,0x4c,0x10,0xad,0x43,0xf4,0xb9,0x6f,0xfe,0x7b,0x70,0x44,0x0,0x30,0x95,0x27,0xf8,0x23,0x56,0xb6,0x59,0xe6,0xd2,0x4a,0x2b,0xb3,0x29,0x4,0x53,0x79,0x71,0x61,0x1,0x7a,0xbe,0x7e,0xb,0xe5,0xc3,0x95,0xc5,0x13,0x48,0xa6,0x67,0x3a,0xb5,0x95,0xc9,0x53,0xac,0xb1,0x7a,0x62,0x6a,0xeb,0xa1,0x95,0x50,0xde,0x9c,0xfd,0x1e,0x2b,0x98,0xca,0xc8,0x7a,0x6a,0x1d,0x83,0x64,0x53,0x53,0xc9,0xc,0xad,0xb,0xa6,0x92,0xe9,0x77,0xed,0xe2,0xe9,0x3f,0x6c,0x4f,0x1f,0x61,0x7b,0x3a,0xe6,0x7,0x73,0x18,0x40,0x43,0x76,0xe2,0x28,0x4e,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xba,0x84,0x14,0xff,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x35,0x3a,0x35,0x30,0x2b,0x30,0x32,0x3a,0x30,0x30,0xcb,0xd9,0xac,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char vseparator_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x8,0x6,0x0,0x0,0x0,0xc4,0xf,0xbe,0x8b,0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xda,0x3,0x15,0x11,0x5,0xf,0xaf,0x3a,0x68,0x7,0x0,0x0,0x0,0x1d,0x49,0x44,0x41,0x54,0x18,0xd3,0x63,0x60,0xa0,0x39,0x60,0x2c,0x9e,0xbd,0x6a,0x73,0xb4,0xa3,0x39,0x56,0xc9,0xa5,0xfb,0x4f,0x32,0xc,0x6,0x0,0x0,0x33,0x26,0x5,0x6d,0xfc,0xee,0xf3,0x6,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x2,0x3,0x0,0x0,0x0,0xb9,0x61,0x56,0x18,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0xc,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x73,0x9b,0xaa,0xce,0xdc,0xe1,0xff,0xff,0xff,0x64,0x6c,0x1,0xd2,0x0,0x0,0x0,0x3,0x74,0x52,0x4e,0x53,0x0,0xb3,0xb3,0x67,0xf6,0xdb,0x93,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x3,0x11,0xc,0x4c,0xf2,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x10,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x80,0x81,0xac,0x95,0xc,0x48,0x0,0x0,0xe,0x79,0x1,0x14,0xa1,0xc9,0x59,0x2,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char vslider_bg_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x16,0x2c,0x30,0xad,0x45,0x69,0x56,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x87,0x49,0x44,0x41,0x54,0x38,0xcb,0xcd,0x93,0xcf,0x4e,0x13,0x51,0x14,0xc6,0x7f,0xf7,0xdc,0xc6,0x3b,0xd3,0xb1,0xc0,0x66,0x48,0x5b,0x42,0xea,0xc2,0xb4,0x2b,0x9f,0x81,0x7,0x30,0x3c,0x80,0x12,0x57,0x24,0xc6,0xc4,0xc8,0xd3,0xe0,0x12,0x37,0x68,0x7c,0x0,0xe3,0x3,0xf0,0xe,0x6e,0xb0,0x2c,0x68,0x50,0x20,0xce,0x6,0x3b,0x74,0xa6,0x3,0xce,0x3d,0x6c,0x4a,0x9d,0xd2,0x62,0xa2,0x2b,0xbf,0xe4,0x2c,0xee,0x9f,0xef,0x97,0x9c,0x2f,0xe7,0x18,0x2a,0xda,0x7c,0xfa,0xc,0xa0,0x6,0xac,0x2,0x5d,0x60,0x7d,0xf2,0x74,0x2,0x1c,0x2,0x9,0xf0,0xeb,0xd3,0xe7,0x8f,0x53,0x8f,0x59,0x60,0x7e,0x3c,0x4c,0x2f,0x76,0x92,0xe4,0xf4,0x79,0x96,0x8f,0x1a,0x0,0xf5,0x30,0x4a,0xe3,0xb8,0xfd,0x7e,0xa9,0xb1,0xb2,0xb,0x1c,0x55,0x21,0xc2,0xac,0xe2,0x61,0x7a,0xf1,0xe6,0x78,0xd0,0x7f,0x99,0xe5,0xd9,0xb2,0x88,0x15,0x11,0x2b,0x59,0x9e,0x2d,0x1f,0xf,0xfa,0xaf,0xd2,0xf4,0xe7,0x6b,0x20,0xae,0x1a,0xee,0x2,0x7a,0x49,0x72,0xba,0x65,0x8c,0xb1,0xd6,0x5a,0xaa,0x65,0x8c,0xb1,0x3f,0x92,0xef,0x2f,0x80,0x5e,0xd5,0x50,0xbb,0x3,0x58,0xcf,0xf2,0x51,0x43,0xc4,0x22,0xf2,0x9b,0x2d,0x22,0xa8,0x2a,0x59,0x3e,0x7a,0x58,0xc9,0x65,0x16,0x70,0x76,0x3e,0x0,0xd8,0xf6,0x5e,0xc5,0x5a,0xe6,0x64,0xc,0x78,0xaf,0xf6,0xec,0x7c,0xb0,0xd,0xec,0xcf,0x1,0x8a,0x62,0xc,0xb0,0x61,0xcc,0x4c,0xb6,0x55,0x4,0xc6,0x40,0x51,0x8c,0x37,0xfe,0x94,0xc1,0x5f,0xeb,0x3f,0x2,0x38,0x17,0xe0,0x5c,0x70,0xa0,0xa,0xa0,0xb,0xbe,0x2a,0xaa,0xe0,0x5c,0x70,0xe0,0x5c,0x30,0xf,0x68,0x35,0x3b,0xb4,0x9a,0x9d,0x3d,0x11,0xe3,0x75,0x81,0x5f,0x15,0x44,0x4c,0xd9,0x6a,0x76,0xf6,0x5a,0xcd,0xce,0xbd,0x2d,0x9c,0xd4,0xc3,0x28,0xf5,0xde,0xe3,0xbd,0x9f,0x5e,0xde,0x9e,0xeb,0x61,0x74,0x39,0xd9,0x8b,0x7b,0x1,0x87,0x71,0xdc,0xfe,0xa0,0xaa,0x65,0x59,0x96,0x54,0x4b,0x55,0xcb,0xd5,0x78,0x6d,0x7f,0xb2,0x54,0x53,0x4d,0x47,0xa6,0xd7,0x7d,0x2,0x30,0x76,0x2e,0x38,0xa,0xc3,0xa8,0x76,0x7d,0x35,0xee,0x5e,0x5d,0x17,0xf,0x54,0x55,0xeb,0x61,0x34,0x5c,0x6b,0x3f,0x7a,0xb7,0xd4,0x58,0x79,0xb,0x7c,0x3,0xfc,0xd7,0xfe,0x17,0xe6,0x26,0xe6,0x5f,0xd6,0xf9,0x6,0xaa,0x73,0x9f,0xf0,0x6d,0xf0,0x57,0x1b,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x54,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x4d,0x4b,0x59,0x34,0x33,0x3a,0x2d,0x2c,0x32,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x4d,0x4b,0x59,0x3f,0x3e,0x49,0x2a,0x29,0x2f,0x20,0x20,0x24,0x3f,0x3e,0x49,0x3f,0x3e,0x49,0x1f,0x1f,0x24,0x40,0x3e,0x4a,0x20,0x20,0x24,0x34,0x33,0x3a,0x20,0x20,0x25,0x22,0x22,0x27,0x23,0x23,0x28,0x25,0x25,0x2a,0x1e,0x1e,0x23,0x23,0x23,0x27,0x2d,0x2c,0x32,0x1f,0x1f,0x23,0xff,0xff,0xff,0x3,0x35,0xf1,0x5f,0x0,0x0,0x0,0x13,0x74,0x52,0x4e,0x53,0x0,0x0,0x0,0x0,0x4,0x1a,0x40,0x5d,0x19,0x28,0x96,0xf0,0xfd,0x94,0x95,0xfc,0x93,0xfc,0xc0,0x0,0xb4,0xa,0x5f,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x1b,0x2,0x60,0xd4,0xa4,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x64,0x49,0x44,0x41,0x54,0x18,0xd3,0x9d,0xcf,0x39,0x2,0x80,0x20,0x10,0x3,0xc0,0xe5,0x90,0x43,0x50,0x94,0x1b,0xfe,0xff,0x50,0x5,0x69,0x94,0xce,0x94,0x53,0xec,0x26,0x0,0x0,0x88,0x2e,0x8c,0x73,0x26,0x28,0x82,0x1e,0x44,0xe5,0xaa,0xb4,0x56,0x9b,0x1c,0x82,0xc4,0x6e,0x9c,0xf7,0xce,0x1c,0x62,0x0,0x53,0x2e,0xc4,0x18,0x9c,0x62,0x3,0xb8,0xf6,0xf1,0x8e,0x3f,0xf9,0x3,0xd8,0xa6,0xdc,0x20,0x27,0x8b,0x3b,0x90,0x52,0x43,0x83,0x50,0xb,0xf9,0xb,0xd3,0xd1,0xe9,0xed,0x5c,0x6c,0xaa,0xfe,0x1d,0xf7,0x9e,0x7f,0x1,0x89,0x5c,0xa,0x6b,0x1f,0xe5,0xca,0x60,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char vslider_grabber_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x15,0x1b,0x38,0x31,0xdf,0xff,0x9,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x7d,0x49,0x44,0x41,0x54,0x38,0xcb,0xdd,0x92,0x3d,0x6b,0x53,0x61,0x14,0x80,0x9f,0xf7,0x43,0xdf,0xfb,0x11,0x6f,0x9b,0x86,0x1a,0x84,0x3a,0x84,0x98,0x25,0x29,0xd,0x11,0x87,0x40,0x3b,0x64,0x70,0x89,0x6b,0x97,0x6c,0xa5,0x7b,0x6,0xc9,0x3f,0xe8,0xe2,0xe4,0x2f,0xb8,0x8b,0x6b,0x17,0x9d,0x1d,0xb2,0x25,0x43,0x29,0x4,0x41,0x42,0x21,0x43,0x20,0x1d,0x3b,0x8,0x49,0x24,0x2f,0x5c,0xc3,0xbd,0xaf,0x4b,0xb,0xb6,0xb6,0xe,0x6e,0xfa,0x2c,0x7,0xe,0x9c,0xf,0xce,0x73,0xe0,0x9f,0x47,0x3c,0x90,0x93,0x80,0x1,0x9e,0x0,0x21,0xf0,0x18,0x70,0xc0,0xa,0x58,0x0,0x16,0x48,0xef,0x6b,0xf0,0x8,0xd8,0x28,0x95,0x4a,0xcf,0x1b,0x8d,0xc6,0xab,0x7a,0xbd,0xfe,0x26,0x8a,0xa2,0x5d,0x63,0xcc,0xb6,0x94,0xd2,0x2d,0x16,0x8b,0xaf,0xd3,0xe9,0xf4,0x63,0x1c,0xc7,0xa7,0xc0,0x37,0x20,0x15,0xbf,0x4c,0xd,0x72,0xb9,0x5c,0xa9,0xdb,0xed,0xbe,0x2d,0x16,0x8b,0xaf,0x8d,0x31,0x3b,0x49,0x92,0xa8,0xf5,0x7a,0x4d,0x9a,0xa6,0x0,0x18,0x63,0xd0,0x5a,0x5f,0x8d,0xc7,0xe3,0x77,0x71,0x1c,0x7f,0x0,0xbe,0x6b,0x40,0x3,0x9b,0xcd,0x66,0x73,0xbf,0xd3,0xe9,0xbc,0x57,0x4a,0xbd,0xb0,0xd6,0x62,0xad,0x25,0xcb,0xb2,0x5b,0xeb,0xa5,0x69,0x4a,0x10,0x4,0xc5,0x72,0xb9,0x7c,0x8,0x7c,0xba,0x69,0x60,0x7a,0xbd,0xde,0x51,0xb5,0x5a,0x3d,0x99,0xcf,0xe7,0xe1,0x6a,0xb5,0xfa,0xad,0xf0,0x6,0xe7,0x1c,0x49,0x92,0x90,0xcf,0xe7,0xf7,0xae,0x6f,0x83,0x4,0x84,0xe7,0x79,0x1,0xa0,0xfe,0xc6,0x82,0x2,0xb2,0xc1,0x60,0x70,0xb1,0x5c,0x2e,0xbf,0xd4,0x6a,0xb5,0x97,0x9e,0xe7,0x6d,0x65,0x59,0x86,0x73,0xe,0xe7,0xdc,0x6d,0x3d,0x42,0xe0,0xfb,0x3e,0xd6,0xda,0xf3,0x7e,0xbf,0x7f,0xa,0x2c,0x15,0x90,0x1,0x76,0x36,0x9b,0x5d,0xe,0x87,0xc3,0xcf,0x95,0x4a,0x85,0x42,0xa1,0xf0,0x34,0xc,0xc3,0xd,0x21,0x84,0x0,0x90,0x52,0x22,0xa5,0xc4,0xf7,0x7d,0xb4,0xd6,0x57,0x93,0xc9,0x24,0x1e,0x8d,0x46,0x67,0xc0,0x8f,0xfb,0x34,0x46,0x5a,0xeb,0xed,0x76,0xbb,0x7d,0xd0,0x6a,0xb5,0x8e,0x85,0x10,0xcf,0x8c,0x31,0x5b,0x4a,0xa9,0x3f,0x6a,0xbc,0x8b,0x4,0x2,0x20,0xba,0x8e,0xfa,0xa1,0x47,0xfa,0xf,0xf8,0x9,0xc2,0x2d,0x88,0xfe,0x7,0xd8,0xc3,0x3a,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x4,0x0,0x0,0x0,0xb5,0xfa,0x37,0xea,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0xf8,0x49,0x44,0x41,0x54,0x28,0xcf,0xbd,0x90,0xaf,0x4b,0x43,0x51,0x18,0x86,0x9f,0xf3,0x43,0xcf,0x76,0xae,0xde,0xb9,0xc9,0x1c,0x82,0x86,0xa1,0x16,0x15,0x87,0xc3,0x20,0x68,0x30,0x58,0xb4,0x5a,0x6c,0x62,0x37,0x88,0xff,0x81,0xc5,0xe4,0x5f,0x70,0x8b,0x75,0x45,0xb3,0xc1,0xa6,0x41,0x4,0x19,0xc,0x19,0x18,0x4,0x8d,0xb,0x82,0xdb,0xd8,0x81,0x29,0xf7,0x1e,0x8b,0x6e,0x43,0x30,0xea,0x93,0x5e,0xf8,0x5e,0x5e,0x78,0x3e,0xf8,0x73,0xc4,0x40,0x92,0x18,0x46,0x9,0x18,0xc6,0xd3,0xa1,0x89,0x23,0xee,0x17,0x86,0xc8,0x14,0xa7,0x97,0x57,0x4a,0xdb,0xe1,0xa2,0xc9,0x4b,0xdf,0xac,0x3d,0x9d,0x47,0x15,0x5e,0x89,0x5,0x20,0xb0,0x23,0xc5,0x83,0xc3,0xc2,0xa6,0x99,0xea,0xaa,0xf,0x62,0xc0,0xa0,0x1b,0xf,0x27,0xd1,0x19,0x6d,0x8d,0x66,0x6c,0x75,0x6d,0xf7,0x54,0xcd,0x3a,0x1c,0xc9,0xd7,0x60,0x8c,0x2d,0xcc,0xec,0x70,0x41,0x5b,0x63,0x8e,0xf6,0xe6,0x8f,0xdf,0x82,0x4e,0xef,0x8,0xe0,0xe9,0x92,0x5d,0x22,0x0,0x89,0x48,0x59,0xd4,0xef,0x16,0x8a,0xe4,0xba,0xde,0xaa,0x2e,0x94,0x53,0xb9,0x4,0x8f,0xef,0x29,0xa5,0x71,0x77,0x57,0x15,0x5a,0x8a,0x4,0xf7,0xfc,0x72,0x73,0x39,0xc7,0xf8,0x44,0x90,0x11,0x2,0x24,0x92,0x34,0xba,0xf1,0x18,0xdd,0xdf,0xf2,0xde,0xd7,0xc,0x75,0x7e,0x6b,0x7d,0x63,0x5f,0x4c,0x9a,0x9c,0xfa,0xa1,0xf9,0x8d,0xc4,0x12,0x62,0xd1,0x83,0x8f,0xfa,0x7,0x3e,0x1,0x87,0xd0,0x4a,0x12,0xcf,0xee,0xfb,0xd8,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char vslider_grabber_hl_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x6,0x0,0x0,0x0,0x1f,0xf3,0xff,0x61,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xdf,0xb,0xd,0x15,0x1c,0x11,0x3c,0x2c,0xf1,0xa2,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x1,0x93,0x49,0x44,0x41,0x54,0x38,0xcb,0xdd,0x92,0x3f,0x4c,0x13,0x71,0x14,0xc7,0x3f,0xef,0x77,0x7f,0x5a,0xae,0xde,0x1d,0x57,0x3,0x47,0x13,0x19,0x1a,0x48,0x14,0x2,0xc,0xe2,0x62,0x80,0xc8,0x40,0x22,0x31,0x71,0x20,0xec,0x18,0x77,0x7,0x27,0xb6,0xe,0x2e,0x2e,0x32,0xe1,0xc6,0xc2,0x5a,0x7,0x9,0x21,0xe,0xdd,0x88,0x9b,0x61,0x91,0x34,0x6a,0x17,0x63,0xe2,0x60,0x28,0x10,0x4c,0x28,0x96,0x96,0xbb,0xde,0xfd,0x5c,0x20,0x51,0xfe,0x98,0x38,0xea,0x67,0x79,0xc9,0x4b,0xde,0xf7,0xbd,0x7c,0xbf,0xf,0xfe,0x79,0xe4,0x8a,0x9e,0x2,0x32,0x80,0xb,0xe4,0x0,0x1b,0xd0,0x40,0x13,0x38,0x4,0x8e,0x81,0xe4,0x32,0x1,0xb,0xf0,0xc3,0xe1,0xa1,0xfe,0x81,0x7b,0xd3,0x77,0x8a,0x53,0x93,0xf,0x6c,0x37,0x1c,0x51,0xe6,0xb5,0x1e,0x65,0x2a,0x1d,0xff,0xd8,0xa9,0xd6,0x3f,0x54,0x5f,0x57,0x4a,0xa5,0x32,0x70,0x0,0x24,0xf2,0xcb,0x56,0x27,0xeb,0xfb,0xc5,0x87,0x4b,0x2f,0x9e,0xe6,0xc2,0x81,0x99,0x54,0x77,0xdf,0x68,0x35,0x62,0x23,0x6a,0x76,0xe8,0xc4,0x29,0x22,0x90,0xf5,0x6c,0xdc,0x20,0xda,0xdd,0xd9,0x7e,0xfb,0xbc,0x52,0x2a,0xad,0x2,0x47,0x26,0x60,0x2,0xdd,0x37,0x67,0xef,0x4f,0x4c,0x3c,0x59,0x5c,0x6a,0xb7,0xbc,0xc1,0xef,0xdf,0x4e,0x88,0xdb,0x47,0xa4,0x89,0xfe,0xed,0xbc,0x4e,0xd4,0x6,0xb2,0x61,0xdf,0xc8,0xd8,0x3c,0xb0,0x76,0x26,0x90,0x99,0x7b,0xb9,0xfc,0x28,0x1c,0x9d,0x7a,0xb6,0xf7,0xa5,0x95,0x6b,0x1d,0x36,0x2f,0xc,0x9e,0xa1,0x53,0x4d,0xbb,0x11,0x11,0x14,0xa,0x63,0xa7,0xde,0xa0,0x0,0xb1,0x1c,0xc7,0x41,0x30,0xb4,0xfe,0xfb,0x14,0xc,0x20,0xfd,0xb8,0xb1,0xf1,0xe9,0xa4,0xb1,0xff,0x7e,0x70,0x7a,0xfc,0xb6,0xd9,0xe5,0xe6,0xd3,0x58,0xa3,0x53,0xcd,0x79,0x41,0x51,0x82,0x13,0x64,0x30,0xa5,0xbe,0xb5,0xfd,0xaa,0x5c,0x6,0x1a,0x6,0x90,0x2,0xc7,0x7b,0xb5,0xda,0xd7,0xda,0x9b,0xf5,0x4a,0xf1,0xee,0x2d,0xf2,0xfd,0xd7,0x7b,0xbb,0x7c,0xcf,0x17,0x11,0x41,0x40,0x44,0x30,0x2c,0x85,0x13,0x64,0x70,0x83,0x68,0xb7,0x5e,0xdd,0x5a,0xf9,0xbc,0xb9,0xf9,0xe,0x88,0x2e,0x8b,0xd1,0x33,0x2c,0xab,0x67,0x7c,0x61,0x61,0x72,0x74,0x6e,0xfe,0x71,0x92,0xd8,0x5,0xc3,0xce,0xe5,0x95,0x69,0xfc,0x31,0xc6,0xf3,0x28,0xc0,0x1,0xbc,0xd3,0x6a,0x5e,0xf5,0x48,0xff,0x1,0x3f,0x1,0xa3,0x8a,0x90,0x14,0xe9,0x66,0x95,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x8,0x3,0x0,0x0,0x0,0x28,0x2d,0xf,0x53,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0xc6,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x17,0x2a,0x29,0x3a,0x69,0x69,0x5b,0xa6,0xa5,0x61,0xb3,0xbc,0x63,0xb7,0xc8,0x65,0xbb,0xca,0x60,0xaf,0xb1,0x48,0x83,0x83,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0xf,0xf,0x55,0x9b,0x9a,0x60,0xb2,0xbd,0x5e,0xb1,0xcd,0x61,0xb3,0xc2,0x0,0x0,0x0,0x27,0x48,0x47,0x62,0xb4,0xbd,0x51,0x93,0x92,0x68,0xc0,0xcf,0x0,0x0,0x0,0x56,0x9d,0x9c,0x68,0xc1,0xcf,0x2d,0x52,0x52,0x63,0xb7,0xbf,0x52,0x96,0x95,0x62,0xb3,0xbf,0x5e,0xb0,0xcd,0x0,0x0,0x0,0x3,0x5,0x5,0x36,0x63,0x63,0x63,0xb4,0xb6,0x60,0xb1,0xbc,0x63,0xb7,0xc7,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x55,0xa3,0xc8,0x4f,0x98,0xc4,0x4b,0x93,0xc2,0x4c,0x94,0xc2,0x54,0xa2,0xc8,0x5a,0xab,0xcb,0x4e,0x97,0xc4,0x49,0x8f,0xc0,0x47,0x8c,0xbf,0x48,0x8e,0xc0,0x52,0x9e,0xc6,0x51,0x9d,0xc6,0x5a,0xac,0xcc,0x53,0x9f,0xc7,0x4d,0x96,0xc3,0x4b,0x92,0xc2,0xff,0xff,0xff,0xec,0x37,0x7,0xf6,0x0,0x0,0x0,0x31,0x74,0x52,0x4e,0x53,0x0,0x1,0x3,0xa,0x17,0x22,0x28,0x27,0x1c,0xd,0x5,0x14,0x31,0x65,0xaf,0xdb,0xf0,0xef,0xc1,0x6e,0x16,0xb,0x2c,0x9c,0xe0,0xfc,0xe8,0x4,0x4f,0xdb,0x73,0xf4,0xc,0x7d,0xf7,0x55,0xdc,0x95,0xe0,0xfe,0x13,0x28,0x64,0xc5,0xde,0xf0,0x2,0x1a,0x24,0x77,0x58,0x79,0x88,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x41,0x89,0xde,0x6c,0x4e,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x7d,0x49,0x44,0x41,0x54,0x18,0xd3,0x63,0x60,0x20,0xf,0x30,0x32,0x31,0xb3,0xb0,0xb2,0xb1,0x73,0x70,0x32,0x41,0xf8,0x5c,0xdc,0x3c,0xbc,0x7c,0xfc,0x2,0x82,0x42,0xc2,0x22,0x20,0x11,0x46,0x51,0x31,0x71,0x9,0x49,0x43,0x23,0x63,0x13,0x53,0x29,0x61,0x4e,0x6,0x6,0x69,0x6e,0x19,0x59,0x33,0x73,0xb,0x4b,0x20,0xb0,0x32,0x15,0xe2,0x60,0x60,0x10,0x95,0x93,0xb7,0x6,0x73,0x81,0xc0,0x44,0x90,0x9d,0x81,0x41,0x41,0x51,0xc9,0x6,0x45,0x40,0x5a,0x44,0x59,0xc5,0x16,0x59,0xb,0x3,0xa3,0x82,0x98,0xaa,0x9a,0xba,0x9d,0xbd,0x3,0xd4,0x50,0x90,0xb5,0x1a,0x9a,0x5a,0xda,0x3a,0xba,0x30,0x6b,0x41,0x40,0x4f,0x41,0xdf,0x0,0xc9,0x61,0x24,0x2,0x0,0x9d,0x96,0x10,0xf9,0x6,0xb2,0x58,0x28,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char vslider_tick_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x4,0x8,0x6,0x0,0x0,0x0,0x87,0xb4,0xbf,0xec,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0xf,0x14,0x28,0x1f,0x7a,0xe9,0xd,0x2b,0x0,0x0,0x0,0x46,0x49,0x44,0x41,0x54,0x18,0x95,0x63,0x60,0xa0,0x10,0x30,0x36,0x35,0x35,0x55,0x72,0x73,0x73,0x33,0x70,0x73,0x73,0x33,0xbc,0xe4,0x12,0x6d,0xe7,0xe6,0xe2,0x66,0x28,0x9,0xf1,0xc0,0xaa,0xd8,0x22,0x34,0x9e,0x41,0xec,0xe7,0x7b,0x43,0x13,0x13,0x13,0xf,0x98,0x1e,0x96,0x33,0x67,0xce,0xec,0x80,0x29,0x78,0xc5,0x2e,0x48,0x8c,0xa5,0xaf,0x91,0xf5,0x50,0xc,0x0,0x36,0xc,0x11,0x6c,0x6d,0xa6,0x47,0xcd,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x4,0x4,0x3,0x0,0x0,0x0,0x75,0x9a,0xa2,0xdf,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x1e,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x81,0xa2,0xad,0x8c,0xac,0xb8,0x38,0x55,0x5f,0x82,0x82,0x82,0x8d,0x8d,0x8d,0x98,0x98,0x98,0x4e,0x4e,0x4e,0x4e,0x4e,0x4e,0xff,0xff,0xff,0xe1,0x56,0x59,0xc8,0x0,0x0,0x0,0x9,0x74,0x52,0x4e,0x53,0x0,0x0,0x0,0x0,0x79,0x79,0x79,0x31,0x1c,0x18,0xed,0xfe,0x2b,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x9,0xf1,0xd9,0xa5,0xec,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x1d,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x80,0x1,0xd7,0x44,0x5,0x6,0x6,0xe6,0x92,0x30,0x86,0xf2,0x62,0x3,0x20,0xa3,0xbd,0x1c,0x2e,0x3,0x0,0x3f,0xce,0x3,0xaf,0xf9,0x94,0x50,0x96,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char vsplit_bg_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x8,0x6,0x0,0x0,0x0,0xc4,0xf,0xbe,0x8b,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0x14,0xd,0x13,0x1b,0xd5,0xd9,0x6e,0x6b,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x15,0x49,0x44,0x41,0x54,0x18,0x95,0x63,0x54,0x57,0xd7,0xfc,0xcf,0x80,0x7,0x30,0xe1,0x93,0x1c,0x3e,0xa,0x0,0x86,0x1b,0x1,0x86,0x56,0xb4,0xba,0xe,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x8,0x1,0x3,0x0,0x0,0x0,0xfe,0xc1,0x2c,0xc8,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x6,0x50,0x4c,0x54,0x45,0x27,0x27,0x29,0xff,0xff,0xff,0x11,0xab,0xb9,0xf3,0x0,0x0,0x0,0x1,0x62,0x4b,0x47,0x44,0x1,0xff,0x2,0x2d,0xde,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0xb,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x40,0x5,0x0,0x0,0x10,0x0,0x1,0xa1,0xc5,0x21,0xc1,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
 static const unsigned char vsplitter_png[]={
-0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x8,0x8,0x6,0x0,0x0,0x0,0x49,0x62,0xf9,0xdf,0x0,0x0,0x0,0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xde,0x9,0xf,0x14,0x27,0x31,0x21,0xa7,0x1c,0x2b,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x38,0x49,0x44,0x41,0x54,0x48,0x89,0x63,0x60,0x18,0x5,0xc,0xc,0xb,0x16,0x2c,0xf8,0x9f,0x9a,0x9a,0xfa,0x7f,0x24,0xf2,0x99,0x18,0x18,0x18,0x18,0x8e,0x1e,0x3d,0xca,0x70,0xed,0xda,0x35,0x78,0x80,0x8c,0x34,0xfe,0x28,0x18,0xf1,0x60,0x30,0xe5,0x49,0x7a,0xf3,0x47,0xcb,0x80,0x91,0xe,0x0,0x53,0x40,0x3b,0xd4,0x11,0xa7,0x10,0x39,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x8,0x8,0x0,0x0,0x0,0x0,0x6c,0x9,0xa6,0x3,0x0,0x0,0x0,0x4,0x67,0x41,0x4d,0x41,0x0,0x0,0xb1,0x8f,0xb,0xfc,0x61,0x5,0x0,0x0,0x0,0x20,0x63,0x48,0x52,0x4d,0x0,0x0,0x7a,0x26,0x0,0x0,0x80,0x84,0x0,0x0,0xfa,0x0,0x0,0x0,0x80,0xe8,0x0,0x0,0x75,0x30,0x0,0x0,0xea,0x60,0x0,0x0,0x3a,0x98,0x0,0x0,0x17,0x70,0x9c,0xba,0x51,0x3c,0x0,0x0,0x0,0x2,0x74,0x52,0x4e,0x53,0x0,0x0,0x76,0x93,0xcd,0x38,0x0,0x0,0x0,0x2,0x62,0x4b,0x47,0x44,0x0,0xff,0x87,0x8f,0xcc,0xbf,0x0,0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xe0,0x6,0x16,0x12,0x2b,0x5,0x39,0x1a,0x32,0x39,0x0,0x0,0x0,0x1f,0x49,0x44,0x41,0x54,0x28,0xcf,0x63,0x60,0xa0,0x10,0x30,0x33,0x2c,0x10,0x3d,0x47,0x9,0x66,0x66,0x10,0xbd,0xf6,0x98,0x22,0x3c,0xe0,0x60,0x18,0x84,0x1,0x0,0x59,0x34,0x6a,0x2d,0x64,0xeb,0x72,0x24,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x63,0x72,0x65,0x61,0x74,0x65,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xc9,0xad,0xc8,0x52,0x0,0x0,0x0,0x25,0x74,0x45,0x58,0x74,0x64,0x61,0x74,0x65,0x3a,0x6d,0x6f,0x64,0x69,0x66,0x79,0x0,0x32,0x30,0x31,0x36,0x2d,0x30,0x36,0x2d,0x32,0x32,0x54,0x32,0x30,0x3a,0x33,0x39,0x3a,0x32,0x36,0x2b,0x30,0x32,0x3a,0x30,0x30,0xb8,0xf0,0x70,0xee,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
 
diff --git a/scene/resources/default_theme/toggle_off.png b/scene/resources/default_theme/toggle_off.png
index aa1c96e5a0..71cd64b001 100644
--- a/scene/resources/default_theme/toggle_off.png
+++ b/scene/resources/default_theme/toggle_off.png
diff --git a/scene/resources/default_theme/toggle_on.png b/scene/resources/default_theme/toggle_on.png
index 0a69d36ae8..6ea1b589c7 100644
--- a/scene/resources/default_theme/toggle_on.png
+++ b/scene/resources/default_theme/toggle_on.png
diff --git a/scene/resources/default_theme/tool_button_pressed.png b/scene/resources/default_theme/tool_button_pressed.png
index 192aae24bf..bcf70b486d 100644
--- a/scene/resources/default_theme/tool_button_pressed.png
+++ b/scene/resources/default_theme/tool_button_pressed.png
diff --git a/scene/resources/default_theme/tooltip_bg.png b/scene/resources/default_theme/tooltip_bg.png
index c5eb502ace..eca0675a98 100644
--- a/scene/resources/default_theme/tooltip_bg.png
+++ b/scene/resources/default_theme/tooltip_bg.png
diff --git a/scene/resources/default_theme/tree_bg.png b/scene/resources/default_theme/tree_bg.png
index e1c42a39ec..839a6a272a 100644
--- a/scene/resources/default_theme/tree_bg.png
+++ b/scene/resources/default_theme/tree_bg.png
diff --git a/scene/resources/default_theme/tree_bg_focus.png b/scene/resources/default_theme/tree_bg_focus.png
index a002ad8fa5..692cf71926 100644
--- a/scene/resources/default_theme/tree_bg_focus.png
+++ b/scene/resources/default_theme/tree_bg_focus.png
diff --git a/scene/resources/default_theme/tree_cursor.png b/scene/resources/default_theme/tree_cursor.png
index 9c430e4028..94d2a08818 100644
--- a/scene/resources/default_theme/tree_cursor.png
+++ b/scene/resources/default_theme/tree_cursor.png
diff --git a/scene/resources/default_theme/tree_cursor_unfocus.png b/scene/resources/default_theme/tree_cursor_unfocus.png
index cf3abfaa72..3f023bbabe 100644
--- a/scene/resources/default_theme/tree_cursor_unfocus.png
+++ b/scene/resources/default_theme/tree_cursor_unfocus.png
diff --git a/scene/resources/default_theme/tree_title.png b/scene/resources/default_theme/tree_title.png
index e7a158b961..b0ddcffbbe 100644
--- a/scene/resources/default_theme/tree_title.png
+++ b/scene/resources/default_theme/tree_title.png
diff --git a/scene/resources/default_theme/tree_title_pressed.png b/scene/resources/default_theme/tree_title_pressed.png
index 82b49cdd2f..746d10039e 100644
--- a/scene/resources/default_theme/tree_title_pressed.png
+++ b/scene/resources/default_theme/tree_title_pressed.png
diff --git a/scene/resources/default_theme/unchecked.png b/scene/resources/default_theme/unchecked.png
index f8710d03df..d6f790cbc2 100644
--- a/scene/resources/default_theme/unchecked.png
+++ b/scene/resources/default_theme/unchecked.png
diff --git a/scene/resources/default_theme/vseparator.png b/scene/resources/default_theme/vseparator.png
index e8a162c469..498768c05b 100644
--- a/scene/resources/default_theme/vseparator.png
+++ b/scene/resources/default_theme/vseparator.png
diff --git a/scene/resources/default_theme/vslider_bg.png b/scene/resources/default_theme/vslider_bg.png
index d58d4b1659..8d9ead3c5a 100644
--- a/scene/resources/default_theme/vslider_bg.png
+++ b/scene/resources/default_theme/vslider_bg.png
diff --git a/scene/resources/default_theme/vslider_grabber.png b/scene/resources/default_theme/vslider_grabber.png
index 50ef5680da..a61a6a57c9 100644
--- a/scene/resources/default_theme/vslider_grabber.png
+++ b/scene/resources/default_theme/vslider_grabber.png
diff --git a/scene/resources/default_theme/vslider_grabber_hl.png b/scene/resources/default_theme/vslider_grabber_hl.png
index 93eba4b174..548dbbbff8 100644
--- a/scene/resources/default_theme/vslider_grabber_hl.png
+++ b/scene/resources/default_theme/vslider_grabber_hl.png
diff --git a/scene/resources/default_theme/vslider_tick.png b/scene/resources/default_theme/vslider_tick.png
index 76c5870dbc..873ebb00d8 100644
--- a/scene/resources/default_theme/vslider_tick.png
+++ b/scene/resources/default_theme/vslider_tick.png
diff --git a/scene/resources/default_theme/vsplit_bg.png b/scene/resources/default_theme/vsplit_bg.png
index f4e1715447..7dd1d48b29 100644
--- a/scene/resources/default_theme/vsplit_bg.png
+++ b/scene/resources/default_theme/vsplit_bg.png
diff --git a/scene/resources/default_theme/vsplitter.png b/scene/resources/default_theme/vsplitter.png
index 4a9904a3ec..ec5542bf69 100644
--- a/scene/resources/default_theme/vsplitter.png
+++ b/scene/resources/default_theme/vsplitter.png
diff --git a/scene/resources/dynamic_font.cpp b/scene/resources/dynamic_font.cpp
index bb40c5ed93..67587a8f8b 100644
--- a/scene/resources/dynamic_font.cpp
+++ b/scene/resources/dynamic_font.cpp
@@ -271,7 +271,7 @@ Size2 DynamicFontAtSize::get_char_size(CharType p_char,CharType p_next,const Vec
 }
 
 
-float DynamicFontAtSize::draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next,const Color& p_modulate,const Vector<Ref<DynamicFontAtSize> >& p_fallbacks) const {
+float DynamicFontAtSize::draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char,CharType p_next,const Color& p_modulate,const Vector<Ref<DynamicFontAtSize> >& p_fallbacks) const {
 
 	if (!valid)
 		return 0;
@@ -434,7 +434,7 @@ void DynamicFontAtSize::_update_char(CharType p_char) {
 
 	int w = slot->bitmap.width;
 	int h = slot->bitmap.rows;
-	int p = slot->bitmap.pitch;
+	//int p = slot->bitmap.pitch;
 	int yofs=slot->bitmap_top;
 	int xofs=slot->bitmap_left;
 	int advance=slot->advance.x>>6;
@@ -686,7 +686,7 @@ bool DynamicFont::is_distance_field_hint() const{
 	return false;
 }
 
-float DynamicFont::draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next,const Color& p_modulate) const {
+float DynamicFont::draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char,CharType p_next,const Color& p_modulate) const {
 
 	if (!data_at_size.is_valid())
 		return 0;
diff --git a/scene/resources/dynamic_font.h b/scene/resources/dynamic_font.h
index 508d630218..9ad1b4edbf 100644
--- a/scene/resources/dynamic_font.h
+++ b/scene/resources/dynamic_font.h
@@ -143,7 +143,7 @@ public:
 
 	Size2 get_char_size(CharType p_char,CharType p_next,const Vector<Ref<DynamicFontAtSize> >& p_fallbacks) const;
 
-	float draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next,const Color& p_modulate,const Vector<Ref<DynamicFontAtSize> >& p_fallbacks) const;
+	float draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char,CharType p_next,const Color& p_modulate,const Vector<Ref<DynamicFontAtSize> >& p_fallbacks) const;
 
 
 
@@ -199,7 +199,7 @@ public:
 
 	virtual bool is_distance_field_hint() const;
 
-	virtual float draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next=0,const Color& p_modulate=Color(1,1,1)) const;
+	virtual float draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char,CharType p_next=0,const Color& p_modulate=Color(1,1,1)) const;
 
 	DynamicFont();
 	~DynamicFont();
diff --git a/scene/resources/dynamic_font_stb.cpp b/scene/resources/dynamic_font_stb.cpp
index 0b9f95da4f..456e6a5ee7 100644
--- a/scene/resources/dynamic_font_stb.cpp
+++ b/scene/resources/dynamic_font_stb.cpp
@@ -142,7 +142,7 @@ Size2 DynamicFontAtSize::get_char_size(CharType p_char,CharType p_next) const {
 }
 
 
-float DynamicFontAtSize::draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next,const Color& p_modulate) const {
+float DynamicFontAtSize::draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char,CharType p_next,const Color& p_modulate) const {
 
 	const_cast<DynamicFontAtSize*>(this)->_update_char(p_char);
 
@@ -455,7 +455,7 @@ bool DynamicFont::is_distance_field_hint() const{
 	return false;
 }
 
-float DynamicFont::draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next,const Color& p_modulate) const {
+float DynamicFont::draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char,CharType p_next,const Color& p_modulate) const {
 
 	if (!data_at_size.is_valid())
 		return 0;
diff --git a/scene/resources/dynamic_font_stb.h b/scene/resources/dynamic_font_stb.h
index 6b72fb3703..136edff2fc 100644
--- a/scene/resources/dynamic_font_stb.h
+++ b/scene/resources/dynamic_font_stb.h
@@ -112,7 +112,7 @@ public:
 
 	Size2 get_char_size(CharType p_char,CharType p_next=0) const;
 
-	float draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next=0,const Color& p_modulate=Color(1,1,1)) const;
+	float draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char,CharType p_next=0,const Color& p_modulate=Color(1,1,1)) const;
 
 
 
@@ -152,7 +152,7 @@ public:
 
 	virtual bool is_distance_field_hint() const;
 
-	virtual float draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next=0,const Color& p_modulate=Color(1,1,1)) const;
+	virtual float draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char,CharType p_next=0,const Color& p_modulate=Color(1,1,1)) const;
 
 	DynamicFont();
 	~DynamicFont();
diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp
index 0d8d224037..6ad8a95565 100644
--- a/scene/resources/font.cpp
+++ b/scene/resources/font.cpp
@@ -506,7 +506,7 @@ Ref<BitmapFont> BitmapFont::get_fallback() const{
 	return fallback;
 }
 
-float BitmapFont::draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next,const Color& p_modulate) const {
+float BitmapFont::draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char, CharType p_next, const Color& p_modulate) const {
 
 	const Character * c = char_map.getptr(p_char);
 
diff --git a/scene/resources/font.h b/scene/resources/font.h
index 91f4874932..67836564cd 100644
--- a/scene/resources/font.h
+++ b/scene/resources/font.h
@@ -59,7 +59,7 @@ public:
 
 	void draw(RID p_canvas_item, const Point2& p_pos, const String& p_text,const Color& p_modulate=Color(1,1,1),int p_clip_w=-1) const;
 	void draw_halign(RID p_canvas_item, const Point2& p_pos, HAlign p_align,float p_width,const String& p_text,const Color& p_modulate=Color(1,1,1)) const;
-	virtual float draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next=0,const Color& p_modulate=Color(1,1,1)) const=0;
+	virtual float draw_char(RID p_canvas_item, const Point2& p_pos,  CharType p_char, CharType p_next=0,const Color& p_modulate=Color(1,1,1)) const=0;
 
 	Font();
 
@@ -155,7 +155,7 @@ public:
 	void set_distance_field_hint(bool p_distance_field);
 	bool is_distance_field_hint() const;
 
-	float draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_char,const CharType& p_next=0,const Color& p_modulate=Color(1,1,1)) const;
+	float draw_char(RID p_canvas_item, const Point2& p_pos, CharType p_char,CharType p_next=0,const Color& p_modulate=Color(1,1,1)) const;
 
 	BitmapFont();
 	~BitmapFont();
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp
index e56314c1f8..f6213f74e8 100644
--- a/scene/resources/material.cpp
+++ b/scene/resources/material.cpp
@@ -406,10 +406,10 @@ void FixedMaterial::_bind_methods() {
 	BIND_CONSTANT( PARAM_SHADE_PARAM );
 	BIND_CONSTANT( PARAM_MAX );
 
-	BIND_CONSTANT( TEXCOORD_SPHERE );
 	BIND_CONSTANT( TEXCOORD_UV );
 	BIND_CONSTANT( TEXCOORD_UV_TRANSFORM );
 	BIND_CONSTANT( TEXCOORD_UV2 );
+	BIND_CONSTANT( TEXCOORD_SPHERE );
 
 	BIND_CONSTANT( FLAG_USE_ALPHA );
 	BIND_CONSTANT( FLAG_USE_COLOR_ARRAY );
diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp
index a1a1f0a935..921466585d 100644
--- a/scene/resources/mesh.cpp
+++ b/scene/resources/mesh.cpp
@@ -30,7 +30,8 @@
 #include "scene/resources/concave_polygon_shape.h"
 #include "scene/resources/convex_polygon_shape.h"
 #include "surface_tool.h"
-static const char*_array_name[]={
+
+static const char* _array_name[]={
 	"vertex_array",
 	"normal_array",
 	"tangent_array",
@@ -847,7 +848,6 @@ Ref<Mesh> Mesh::create_outline(float p_margin) const {
 	}
 
 	{
-		int tc=0;
 		DVector<int>::Write ir;
 		DVector<int> indices =arrays[ARRAY_INDEX];
 		bool has_indices=false;
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp
index ac528e6659..c36480420b 100644
--- a/scene/resources/packed_scene.cpp
+++ b/scene/resources/packed_scene.cpp
@@ -375,7 +375,7 @@ Error SceneState::_parse_node(Node *p_owner,Node *p_node,int p_parent_idx, Map<S
 						PackState ps;
 						ps.node=node;
 						ps.state=state;
-						pack_state_stack.push_front(ps);
+						pack_state_stack.push_back(ps);
 						instanced_by_owner=false;
 					}
 				}
@@ -471,7 +471,6 @@ Error SceneState::_parse_node(Node *p_owner,Node *p_node,int p_parent_idx, Map<S
 		}
 	}
 #endif
-	int subscene_prop_search_from=0;
 
 	// all setup, we then proceed to check all properties for the node
 	// and save the ones that are worth saving
@@ -479,8 +478,6 @@ Error SceneState::_parse_node(Node *p_owner,Node *p_node,int p_parent_idx, Map<S
 	List<PropertyInfo> plist;
 	p_node->get_property_list(&plist);
 
-	bool saved_script=false;
-
 	for (List<PropertyInfo>::Element *E=plist.front();E;E=E->next()) {
 
 
@@ -528,23 +525,8 @@ Error SceneState::_parse_node(Node *p_owner,Node *p_node,int p_parent_idx, Map<S
 					break;
 				}
 			}
-#if 0
-// this workaround ended up causing problems:
-https://github.com/godotengine/godot/issues/3127
-			if (saved_script && exists && p_node->get_script_instance()) {
-				//if this is an overriden value by another script, save it anyway
-				//as the script change will erase it
-				//https://github.com/godotengine/godot/issues/2958
-
-				bool valid=false;
-				p_node->get_script_instance()->get_property_type(name,&valid);
-				if (valid) {
-					exists=false;
-					isdefault=false;
-				}
-			}
 
-#endif
+
 			if (exists) {
 
 				//check if already exists and did not change
@@ -556,6 +538,7 @@ https://github.com/godotengine/godot/issues/3127
 					if (Math::abs(a-b)<CMP_EPSILON)
 						continue;
 				} else if (bool(Variant::evaluate(Variant::OP_EQUAL,value,original))) {
+
 					continue;
 				}
 			}
@@ -575,9 +558,6 @@ https://github.com/godotengine/godot/issues/3127
 			}
 		}
 
-		if (name=="script/script")
-			saved_script=true;
-
 		NodeData::Property prop;
 		prop.name=_nm_get_string( name,name_map);
 		prop.value=_vm_get_variant( value, variant_map);
@@ -729,6 +709,7 @@ Error SceneState::_parse_connections(Node *p_owner,Node *p_node, Map<StringName,
 
 	List<MethodInfo> _signals;
 	p_node->get_signal_list(&_signals);
+	_signals.sort();
 
 	//ERR_FAIL_COND_V( !node_map.has(p_node), ERR_BUG);
 	//NodeData &nd = nodes[node_map[p_node]];
@@ -738,6 +719,9 @@ Error SceneState::_parse_connections(Node *p_owner,Node *p_node, Map<StringName,
 
 		List<Node::Connection> conns;
 		p_node->get_signal_connection_list(E->get().name,&conns);
+
+		conns.sort();
+
 		for(List<Node::Connection>::Element *F=conns.front();F;F=F->next()) {
 
 			const Node::Connection &c = F->get();
diff --git a/scene/resources/packed_scene.h b/scene/resources/packed_scene.h
index 6bde508d72..3b6c0898e0 100644
--- a/scene/resources/packed_scene.h
+++ b/scene/resources/packed_scene.h
@@ -196,6 +196,7 @@ class PackedScene : public Resource {
 
 protected:
 
+	virtual bool editor_can_reload_from_file() { return false; } // this is handled by editor better
 	static void _bind_methods();
 public:
 
diff --git a/scene/resources/room.cpp b/scene/resources/room.cpp
index d1fc614c90..f28220531b 100644
--- a/scene/resources/room.cpp
+++ b/scene/resources/room.cpp
@@ -52,7 +52,7 @@ void RoomBounds::set_geometry_hint(const DVector<Face3>& p_geometry_hint) {
 	geometry_hint=p_geometry_hint;
 }
 
-const DVector<Face3>& RoomBounds::get_geometry_hint() const {
+DVector<Face3> RoomBounds::get_geometry_hint() const {
 
 	return geometry_hint;
 }
diff --git a/scene/resources/room.h b/scene/resources/room.h
index 3ed41a3e61..dc5e284838 100644
--- a/scene/resources/room.h
+++ b/scene/resources/room.h
@@ -56,7 +56,7 @@ public:
 	BSP_Tree get_bounds() const;
 
 	void set_geometry_hint(const DVector<Face3>& geometry_hint);
-	const DVector<Face3>& get_geometry_hint() const;
+	DVector<Face3> get_geometry_hint() const;
 
 	RoomBounds();
 	~RoomBounds();
diff --git a/scene/resources/sample.cpp b/scene/resources/sample.cpp
index 87fcfc425d..aae4e85a27 100644
--- a/scene/resources/sample.cpp
+++ b/scene/resources/sample.cpp
@@ -187,6 +187,8 @@ RID Sample::get_rid() const {
 	return sample;
 }
 
+
+
 void Sample::_bind_methods(){
 
 
diff --git a/scene/resources/sample.h b/scene/resources/sample.h
index 0a88167233..18672e41c0 100644
--- a/scene/resources/sample.h
+++ b/scene/resources/sample.h
@@ -75,6 +75,7 @@ protected:
 
 public:
 
+
 	void create(Format p_format, bool p_stereo, int p_length);
 
 	Format get_format() const;
diff --git a/scene/resources/sample_library.cpp b/scene/resources/sample_library.cpp
index 5b70ee0e11..67481f267d 100644
--- a/scene/resources/sample_library.cpp
+++ b/scene/resources/sample_library.cpp
@@ -106,9 +106,9 @@ void SampleLibrary::remove_sample(const StringName& p_name) {
 	sample_map.erase(p_name);
 }
 
-void SampleLibrary::get_sample_list(List<StringName> *p_samples) {
+void SampleLibrary::get_sample_list(List<StringName> *p_samples) const {
 
-	for(Map<StringName,SampleData >::Element *E=sample_map.front();E;E=E->next()) {
+	for(const Map<StringName,SampleData >::Element *E=sample_map.front();E;E=E->next()) {
 
 		p_samples->push_back(E->key());
 	}
@@ -122,9 +122,17 @@ bool SampleLibrary::has_sample(const StringName& p_name) const {
 
 void SampleLibrary::_get_property_list(List<PropertyInfo> *p_list) const {
 
+
+	List<PropertyInfo> tpl;
 	for(Map<StringName,SampleData>::Element *E=sample_map.front();E;E=E->next()) {
 
-		p_list->push_back( PropertyInfo( Variant::DICTIONARY, "samples/"+E->key(),PROPERTY_HINT_RESOURCE_TYPE,"Sample",PROPERTY_USAGE_NOEDITOR ) );
+		tpl.push_back( PropertyInfo( Variant::DICTIONARY, "samples/"+E->key(),PROPERTY_HINT_RESOURCE_TYPE,"Sample",PROPERTY_USAGE_NOEDITOR ) );
+	}
+
+	tpl.sort();
+	//sort so order is kept
+	for(List<PropertyInfo>::Element *E=tpl.front();E;E=E->next()) {
+		p_list->push_back(E->get());
 	}
 }
 
@@ -169,7 +177,20 @@ float SampleLibrary::sample_get_pitch_scale(const StringName& p_name) const{
 	return sample_map[p_name].pitch_scale;
 }
 
+Array SampleLibrary::_get_sample_list() const {
 
+	List<StringName> snames;
+	get_sample_list(&snames);
+
+	snames.sort_custom<StringName::AlphCompare>();
+
+	Array ret;
+	for (List<StringName>::Element *E=snames.front();E;E=E->next()) {
+		ret.push_back(E->get());
+	}
+
+	return ret;
+}
 
 void SampleLibrary::_bind_methods() {
 
@@ -178,6 +199,8 @@ void SampleLibrary::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("has_sample","name"),&SampleLibrary::has_sample );
 	ObjectTypeDB::bind_method(_MD("remove_sample","name"),&SampleLibrary::remove_sample );
 
+	ObjectTypeDB::bind_method(_MD("get_sample_list"),&SampleLibrary::_get_sample_list );
+
 	ObjectTypeDB::bind_method(_MD("sample_set_volume_db","name","db"),&SampleLibrary::sample_set_volume_db );
 	ObjectTypeDB::bind_method(_MD("sample_get_volume_db","name"),&SampleLibrary::sample_get_volume_db );
 
diff --git a/scene/resources/sample_library.h b/scene/resources/sample_library.h
index 8377967106..e572aa215a 100644
--- a/scene/resources/sample_library.h
+++ b/scene/resources/sample_library.h
@@ -47,6 +47,8 @@ class SampleLibrary : public Resource {
 	};
 
 	Map<StringName,SampleData > sample_map;
+
+	Array _get_sample_list() const;
 protected:
 
 	bool _set(const StringName& p_name, const Variant& p_value);
@@ -66,7 +68,7 @@ public:
 	void sample_set_pitch_scale(const StringName& p_name, float p_pitch);
 	float sample_get_pitch_scale(const StringName& p_name) const;
 	Ref<Sample> get_sample(const StringName& p_name) const;
-	void get_sample_list(List<StringName> *p_samples);
+	void get_sample_list(List<StringName> *p_samples) const;
 	void remove_sample(const StringName& p_name);
 	StringName get_sample_idx(int p_idx) const;
 
diff --git a/scene/resources/scene_format_text.cpp b/scene/resources/scene_format_text.cpp
index c7e2fc4e73..95645107d4 100644
--- a/scene/resources/scene_format_text.cpp
+++ b/scene/resources/scene_format_text.cpp
@@ -67,12 +67,17 @@ Error ResourceInteractiveLoaderText::_parse_sub_resource(VariantParser::Stream*
 
 	String path = local_path+"::"+itos(index);
 
-	if (!ResourceCache::has(path)) {
-		r_err_str="Can't load cached sub-resource: "+path;
-		return ERR_PARSE_ERROR;
-	}
+	if (!ignore_resource_parsing) {
 
-	r_res=RES(ResourceCache::get(path));
+		if (!ResourceCache::has(path)) {
+			r_err_str="Can't load cached sub-resource: "+path;
+			return ERR_PARSE_ERROR;
+		}
+
+		r_res=RES(ResourceCache::get(path));
+	} else {
+		r_res=RES();
+	}
 
 	VariantParser::get_token(p_stream,token,line,r_err_str);
 	if (token.type!=VariantParser::TK_PARENTHESIS_CLOSE) {
@@ -95,25 +100,29 @@ Error ResourceInteractiveLoaderText::_parse_ext_resource(VariantParser::Stream*
 
 	int id = token.value;
 
+	if (!ignore_resource_parsing) {
 
-	if (!ext_resources.has(id)) {
-		r_err_str="Can't load cached ext-resource #"+itos(id);
-		return ERR_PARSE_ERROR;
-	}
+		if (!ext_resources.has(id)) {
+			r_err_str="Can't load cached ext-resource #"+itos(id);
+			return ERR_PARSE_ERROR;
+		}
 
-	String path = ext_resources[id].path;
-	String type = ext_resources[id].type;
+		String path = ext_resources[id].path;
+		String type = ext_resources[id].type;
 
-	if (path.find("://")==-1 && path.is_rel_path()) {
-		// path is relative to file being loaded, so convert to a resource path
-		path=Globals::get_singleton()->localize_path(res_path.get_base_dir().plus_file(path));
+		if (path.find("://")==-1 && path.is_rel_path()) {
+			// path is relative to file being loaded, so convert to a resource path
+			path=Globals::get_singleton()->localize_path(res_path.get_base_dir().plus_file(path));
 
-	}
+		}
 
-	r_res=ResourceLoader::load(path,type);
+		r_res=ResourceLoader::load(path,type);
 
-	if (r_res.is_null()) {
-		WARN_PRINT(String("Couldn't load external resource: "+path).utf8().get_data());
+		if (r_res.is_null()) {
+			WARN_PRINT(String("Couldn't load external resource: "+path).utf8().get_data());
+		}
+	} else {
+		r_res=RES();
 	}
 
 	VariantParser::get_token(p_stream,token,line,r_err_str);
@@ -625,6 +634,7 @@ void ResourceInteractiveLoaderText::get_dependencies(FileAccess *f,List<String>
 
 
 	open(f);
+	ignore_resource_parsing=true;
 	ERR_FAIL_COND(error!=OK);
 
 	while(next_tag.name=="ext_resource") {
@@ -662,6 +672,7 @@ void ResourceInteractiveLoaderText::get_dependencies(FileAccess *f,List<String>
 		Error err = VariantParser::parse_tag(&stream,lines,error_text,next_tag,&rp);
 
 		if (err) {
+			print_line(error_text+" - "+itos(lines));
 			error_text="Unexpected end of file";
 			_printerr();
 			error=ERR_FILE_CORRUPT;
@@ -676,7 +687,7 @@ Error ResourceInteractiveLoaderText::rename_dependencies(FileAccess *p_f, const
 
 	open(p_f,true);
 	ERR_FAIL_COND_V(error!=OK,error);
-
+	ignore_resource_parsing=true;
 	//FileAccess
 
 	FileAccess *fw = NULL;
@@ -794,7 +805,7 @@ void ResourceInteractiveLoaderText::open(FileAccess *p_f,bool p_skip_first_tag)
 
 	stream.f=f;
 	is_scene=false;
-
+	ignore_resource_parsing=false;
 	resource_current=0;
 
 
@@ -879,6 +890,8 @@ String ResourceInteractiveLoaderText::recognize(FileAccess *p_f) {
 
 	stream.f=f;
 
+	ignore_resource_parsing=true;
+
 
 	VariantParser::Tag tag;
 	Error err = VariantParser::parse_tag(&stream,lines,error_text,tag);
@@ -1296,7 +1309,7 @@ Error ResourceFormatSaverTextInstance::save(const String &p_path,const RES& p_re
 				if ((PE->get().usage&PROPERTY_USAGE_STORE_IF_NONZERO && value.is_zero())||(PE->get().usage&PROPERTY_USAGE_STORE_IF_NONONE && value.is_one()) )
 					continue;
 
-				if (PE->get().type==Variant::OBJECT && value.is_zero() && (!PE->get().usage&PROPERTY_USAGE_STORE_IF_NULL))
+				if (PE->get().type==Variant::OBJECT && value.is_zero() && !(PE->get().usage&PROPERTY_USAGE_STORE_IF_NULL))
 					continue;
 
 				String vars;
diff --git a/scene/resources/scene_format_text.h b/scene/resources/scene_format_text.h
index 8dbfbfda48..6122a1f9d8 100644
--- a/scene/resources/scene_format_text.h
+++ b/scene/resources/scene_format_text.h
@@ -56,7 +56,7 @@ class ResourceInteractiveLoaderText : public ResourceInteractiveLoader {
 	bool is_scene;
 	String res_type;
 
-
+	bool ignore_resource_parsing;
 
 //	Map<String,String> remaps;
 
diff --git a/scene/resources/style_box.cpp b/scene/resources/style_box.cpp
index a61ffe8e97..8580ffdc5a 100644
--- a/scene/resources/style_box.cpp
+++ b/scene/resources/style_box.cpp
@@ -104,7 +104,10 @@ StyleBox::StyleBox() {
 
 void StyleBoxTexture::set_texture(RES p_texture) {
 
+	if (texture==p_texture)
+		return;
 	texture=p_texture;
+	emit_signal("texture_changed");
 	emit_changed();
 
 }
@@ -207,6 +210,8 @@ void StyleBoxTexture::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("set_draw_center","enable"),&StyleBoxTexture::set_draw_center);
 	ObjectTypeDB::bind_method(_MD("get_draw_center"),&StyleBoxTexture::get_draw_center);
 
+	ADD_SIGNAL(MethodInfo("texture_changed"));
+
 	ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture" ), _SCS("set_texture"),_SCS("get_texture") );
 	ADD_PROPERTYNZ( PropertyInfo( Variant::RECT2, "region_rect"), _SCS("set_region_rect"),_SCS("get_region_rect"));
 	ADD_PROPERTYI( PropertyInfo( Variant::REAL, "margin/left", PROPERTY_HINT_RANGE,"0,2048,1" ), _SCS("set_margin_size"),_SCS("get_margin_size"), MARGIN_LEFT );
diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp
index 1893bfe524..726b1938c4 100644
--- a/scene/resources/texture.cpp
+++ b/scene/resources/texture.cpp
@@ -98,10 +98,6 @@ Texture::Texture() {
 
 
 
-bool ImageTexture::can_reload_from_file() {
-
-	return true;
-}
 
 void ImageTexture::reload_from_file() {
 
@@ -526,8 +522,11 @@ uint32_t AtlasTexture::get_flags() const{
 
 void AtlasTexture::set_atlas(const Ref<Texture>& p_atlas){
 
+	if (atlas==p_atlas)
+		return;
 	atlas=p_atlas;
 	emit_changed();
+	emit_signal("atlas_changed");
 }
 Ref<Texture> AtlasTexture::get_atlas() const{
 
@@ -569,6 +568,8 @@ void AtlasTexture::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("set_margin","margin"),&AtlasTexture::set_margin);
 	ObjectTypeDB::bind_method(_MD("get_margin"),&AtlasTexture::get_margin);
 
+	ADD_SIGNAL(MethodInfo("atlas_changed"));
+
 	ADD_PROPERTY( PropertyInfo( Variant::OBJECT, "atlas", PROPERTY_HINT_RESOURCE_TYPE,"Texture"), _SCS("set_atlas"),_SCS("get_atlas") );
 	ADD_PROPERTY( PropertyInfo( Variant::RECT2, "region"), _SCS("set_region"),_SCS("get_region") );
 	ADD_PROPERTY( PropertyInfo( Variant::RECT2, "margin"), _SCS("set_margin"),_SCS("get_margin") );
diff --git a/scene/resources/texture.h b/scene/resources/texture.h
index 103b425cd8..05ea833978 100644
--- a/scene/resources/texture.h
+++ b/scene/resources/texture.h
@@ -103,7 +103,6 @@ private:
 	float lossy_storage_quality;
 
 protected:
-	virtual bool can_reload_from_file();
 	virtual void reload_from_file();
 
 	bool _set(const StringName& p_name, const Variant& p_value);
diff --git a/servers/audio/audio_mixer_sw.cpp b/servers/audio/audio_mixer_sw.cpp
index 64369182b1..17f8c36c9a 100644
--- a/servers/audio/audio_mixer_sw.cpp
+++ b/servers/audio/audio_mixer_sw.cpp
@@ -75,7 +75,7 @@ void AudioMixerSW::do_resample(const Depth* p_src, int32_t *p_dst, ResamplerStat
 				for(int i=0;i<(is_stereo?2:1);i++) {
 
 
-					int16_t nibble,signed_nibble,diff,step;
+					int16_t nibble,diff,step;
 
 					p_state->ima_adpcm[i].last_nibble++;
 					const uint8_t *src_ptr=p_state->ima_adpcm[i].ptr;
@@ -92,10 +92,6 @@ void AudioMixerSW::do_resample(const Depth* p_src, int32_t *p_dst, ResamplerStat
 					if (p_state->ima_adpcm[i].step_index>88)
 						p_state->ima_adpcm[i].step_index=88;
 
-					/*
-					signed_nibble = (nibble&7) * ((nibble&8)?-1:1);
-					diff = (2 * signed_nibble + 1) * step / 4; */
-
 					diff = step >> 3 ;
 					if (nibble & 1)
 						diff += step >> 2 ;
diff --git a/servers/audio/audio_server_sw.cpp b/servers/audio/audio_server_sw.cpp
index 8b5b5e4f46..853714be2a 100644
--- a/servers/audio/audio_server_sw.cpp
+++ b/servers/audio/audio_server_sw.cpp
@@ -388,7 +388,7 @@ void AudioServerSW::sample_set_data(RID p_sample, const DVector<uint8_t>& p_buff
 	AUDIO_LOCK
 	sample_manager->sample_set_data(p_sample,p_buffer);
 }
-const DVector<uint8_t> AudioServerSW::sample_get_data(RID p_sample) const {
+DVector<uint8_t> AudioServerSW::sample_get_data(RID p_sample) const {
 	AUDIO_LOCK
 	return sample_manager->sample_get_data(p_sample);
 }
diff --git a/servers/audio/audio_server_sw.h b/servers/audio/audio_server_sw.h
index 8d3d992e2b..fda952fa94 100644
--- a/servers/audio/audio_server_sw.h
+++ b/servers/audio/audio_server_sw.h
@@ -126,7 +126,7 @@ public:
 	const void* sample_get_data_ptr(RID p_sample) const;
 
 	virtual void sample_set_data(RID p_sample, const DVector<uint8_t>& p_buffer);
-	virtual const DVector<uint8_t> sample_get_data(RID p_sample) const;
+	virtual DVector<uint8_t> sample_get_data(RID p_sample) const;
 
 	virtual void sample_set_mix_rate(RID p_sample,int p_rate);
 	virtual int sample_get_mix_rate(RID p_sample) const;
diff --git a/servers/audio_server.h b/servers/audio_server.h
index c56820dcbb..50194af4a5 100644
--- a/servers/audio_server.h
+++ b/servers/audio_server.h
@@ -169,7 +169,7 @@ public:
 
 	virtual void sample_set_signed_data(RID p_sample, const DVector<float>& p_buffer);
 	virtual void sample_set_data(RID p_sample, const DVector<uint8_t>& p_buffer)=0;
-	virtual const DVector<uint8_t> sample_get_data(RID p_sample) const=0;
+	virtual DVector<uint8_t> sample_get_data(RID p_sample) const=0;
 
 	virtual void sample_set_mix_rate(RID p_sample,int p_rate)=0;
 	virtual int sample_get_mix_rate(RID p_sample) const=0;
diff --git a/servers/physics/body_pair_sw.cpp b/servers/physics/body_pair_sw.cpp
index 40e906c36c..3202e52abb 100644
--- a/servers/physics/body_pair_sw.cpp
+++ b/servers/physics/body_pair_sw.cpp
@@ -307,10 +307,6 @@ bool BodyPairSW::setup(float p_step) {
 		}
 #endif
 
-
-		int gather_A = A->can_report_contacts();
-		int gather_B = B->can_report_contacts();
-
 		c.rA = global_A;
 		c.rB = global_B-offset_B;
 
diff --git a/servers/physics/collision_solver_sat.cpp b/servers/physics/collision_solver_sat.cpp
index 8789663f63..3e7719e5eb 100644
--- a/servers/physics/collision_solver_sat.cpp
+++ b/servers/physics/collision_solver_sat.cpp
@@ -1230,7 +1230,6 @@ static void _collision_capsule_convex_polygon(const ShapeSW *p_a,const Transform
 	const Geometry::MeshData::Edge *edges = mesh.edges.ptr();
 	int edge_count = mesh.edges.size();
 	const Vector3 *vertices = mesh.vertices.ptr();
-	int vertex_count = mesh.vertices.size();
 
 	// faces of B
 	for (int i=0;i<face_count;i++) {
diff --git a/servers/physics/shape_sw.cpp b/servers/physics/shape_sw.cpp
index 5923f89120..1d4914c945 100644
--- a/servers/physics/shape_sw.cpp
+++ b/servers/physics/shape_sw.cpp
@@ -766,7 +766,6 @@ bool ConvexPolygonShapeSW::intersect_segment(const Vector3& p_begin,const Vector
 	int fc = mesh.faces.size();
 
 	const Vector3 *vertices = mesh.vertices.ptr();
-	int vc = mesh.vertices.size();
 
 	Vector3 n = p_end-p_begin;
 	float min = 1e20;
@@ -873,14 +872,11 @@ void FaceShapeSW::project_range(const Vector3& p_normal, const Transform& p_tran
 Vector3 FaceShapeSW::get_support(const Vector3& p_normal) const {
 
 
-	Vector3 n=p_normal;
-
 	int vert_support_idx=-1;
 	float support_max;
 
 	for (int i=0;i<3;i++) {
 
-		//float d=n.dot(vertex[i]);
 		float d=p_normal.dot(vertex[i]);
 
 		if (i==0 || d > support_max) {
diff --git a/servers/physics/space_sw.cpp b/servers/physics/space_sw.cpp
index 1e6f42aa02..7077146420 100644
--- a/servers/physics/space_sw.cpp
+++ b/servers/physics/space_sw.cpp
@@ -150,7 +150,6 @@ int PhysicsDirectSpaceStateSW::intersect_shape(const RID& p_shape, const Transfo
 
 	int amount = space->broadphase->cull_aabb(aabb,space->intersection_query_results,SpaceSW::INTERSECTION_QUERY_MAX,space->intersection_query_subindex_results);
 
-	bool collided=false;
 	int cc=0;
 
 	//Transform ai = p_xform.affine_inverse();
@@ -269,7 +268,6 @@ bool PhysicsDirectSpaceStateSW::cast_motion(const RID& p_shape, const Transform&
 
 		for(int i=0;i<8;i++) { //steps should be customizable..
 
-			Transform xfa = p_xform;
 			float ofs = (low+hi)*0.5;
 
 			Vector3 sep=mnormal; //important optimization for this to work fast enough
@@ -337,7 +335,6 @@ bool PhysicsDirectSpaceStateSW::collide_shape(RID p_shape, const Transform& p_sh
 	int amount = space->broadphase->cull_aabb(aabb,space->intersection_query_results,SpaceSW::INTERSECTION_QUERY_MAX,space->intersection_query_subindex_results);
 
 	bool collided=false;
-	int cc=0;
 	r_result_count=0;
 
 	PhysicsServerSW::CollCbkData cbk;
@@ -457,7 +454,6 @@ bool PhysicsDirectSpaceStateSW::rest_info(RID p_shape, const Transform& p_shape_
 	if (rcd.best_object->get_type()==CollisionObjectSW::TYPE_BODY) {
 
 		const BodySW *body = static_cast<const BodySW*>(rcd.best_object);
-		Vector3 rel_vec = r_info->point-body->get_transform().get_origin();
 		r_info->linear_velocity = body->get_linear_velocity() +
 				(body->get_angular_velocity()).cross(body->get_transform().origin-rcd.best_contact);// * mPos);
 
diff --git a/servers/physics_2d/shape_2d_sw.cpp b/servers/physics_2d/shape_2d_sw.cpp
index 8b583dd3c6..9291aa6c17 100644
--- a/servers/physics_2d/shape_2d_sw.cpp
+++ b/servers/physics_2d/shape_2d_sw.cpp
@@ -243,7 +243,6 @@ bool SegmentShape2DSW::intersect_segment(const Vector2& p_begin,const Vector2& p
 	if (!Geometry::segment_intersects_segment_2d(p_begin,p_end,a,b,&r_point))
 		return false;
 
-	Vector2 d = p_end-p_begin;
 	if (n.dot(p_begin) > n.dot(a)) {
 		r_normal=n;
 	} else {
@@ -825,7 +824,6 @@ bool ConcavePolygonShape2DSW::intersect_segment(const Vector2& p_begin,const Vec
 	const Segment *segmentptr=&segments[0];
 	const Vector2 *pointptr=&points[0];
 	const BVH *bvhptr = &bvh[0];
-	int pos=bvh.size()-1;
 
 
 	stack[0]=0;
@@ -1088,7 +1086,6 @@ void ConcavePolygonShape2DSW::cull(const Rect2& p_local_aabb,Callback p_callback
 	const Segment *segmentptr=&segments[0];
 	const Vector2 *pointptr=&points[0];
 	const BVH *bvhptr = &bvh[0];
-	int pos=bvh.size()-1;
 
 
 	stack[0]=0;
diff --git a/servers/physics_2d/space_2d_sw.cpp b/servers/physics_2d/space_2d_sw.cpp
index ddef5fc86b..5fde6f567b 100644
--- a/servers/physics_2d/space_2d_sw.cpp
+++ b/servers/physics_2d/space_2d_sw.cpp
@@ -200,7 +200,6 @@ int Physics2DDirectSpaceStateSW::intersect_shape(const RID& p_shape, const Matri
 
 	int amount = space->broadphase->cull_aabb(aabb,space->intersection_query_results,p_result_max,space->intersection_query_subindex_results);
 
-	bool collided=false;
 	int cc=0;
 
 	for(int i=0;i<amount;i++) {
@@ -307,7 +306,6 @@ bool Physics2DDirectSpaceStateSW::cast_motion(const RID& p_shape, const Matrix32
 
 		for(int i=0;i<8;i++) { //steps should be customizable..
 
-			Matrix32 xfa = p_xform;
 			float ofs = (low+hi)*0.5;
 
 			Vector2 sep=mnormal; //important optimization for this to work fast enough
@@ -377,7 +375,6 @@ bool Physics2DDirectSpaceStateSW::collide_shape(RID p_shape, const Matrix32& p_s
 	int amount = space->broadphase->cull_aabb(aabb,space->intersection_query_results,Space2DSW::INTERSECTION_QUERY_MAX,space->intersection_query_subindex_results);
 
 	bool collided=false;
-	int cc=0;
 	r_result_count=0;
 
 	Physics2DServerSW::CollCbkData cbk;
@@ -768,7 +765,6 @@ bool Space2DSW::test_body_motion(Body2DSW *p_body,const Vector2&p_motion,float p
 
 				for(int i=0;i<8;i++) { //steps should be customizable..
 
-					//Matrix32 xfa = p_xform;
 					float ofs = (low+hi)*0.5;
 
 					Vector2 sep=mnormal; //important optimization for this to work fast enough
diff --git a/servers/spatial_sound_2d/spatial_sound_2d_server_sw.cpp b/servers/spatial_sound_2d/spatial_sound_2d_server_sw.cpp
index d27b322c21..6c42c2f527 100644
--- a/servers/spatial_sound_2d/spatial_sound_2d_server_sw.cpp
+++ b/servers/spatial_sound_2d/spatial_sound_2d_server_sw.cpp
@@ -851,23 +851,6 @@ void SpatialSound2DServerSW::update(float p_delta) {
 		//this could be optimized at some point... am not sure
 		Space *space=space_owner.get(source->space);
 		Room *room=room_owner.get(space->default_room);
-		int max_level=-0x80000000;
-		/*
-		int rooms_culled = space->octree.cull_point(source->transform.origin,cull_rooms,MAX_CULL_ROOMS);
-		for(int i=0;i<rooms_culled;i++) {
-
-			Room *r=cull_rooms[i];
-			ERR_CONTINUE( r->bounds.is_empty() ); // how did this happen??
-			if (r->level<=max_level) //ignore optimization (level too low)
-				continue;
-			Vector2 local_point = r->inverse_transform.xform(source->transform.origin);
-			if (!r->bounds.point_is_inside(local_point))
-				continue;
-			room=r;
-			max_level=r->level;
-
-		}
-		*/
 
 		//compute mixing weights (support for multiple listeners in the same output)
 		float total_distance=0;
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp
index 0b2a282c04..09b3ada509 100644
--- a/servers/visual/shader_language.cpp
+++ b/servers/visual/shader_language.cpp
@@ -2539,8 +2539,6 @@ Error ShaderLanguage::parse_block(Parser& parser,BlockNode *p_block) {
 Error ShaderLanguage::parse(const Vector<Token>& p_tokens,ShaderType p_type,CompileFunc p_compile_func,void *p_userdata,String *r_error,int *r_err_line,int *r_err_column) {
 
 
-	uint64_t t = OS::get_singleton()->get_ticks_usec();
-
 	Parser parser(p_tokens);
 	parser.program = parser.create_node<ProgramNode>(NULL);
 	parser.program->body = parser.create_node<BlockNode>(parser.program);
@@ -2605,18 +2603,10 @@ Error ShaderLanguage::parse(const Vector<Token>& p_tokens,ShaderType p_type,Comp
 		return err;
 	}
 
-	double tf = (OS::get_singleton()->get_ticks_usec()-t)/1000.0;
-	//print_line("parse time: "+rtos(tf));
-
-	t = OS::get_singleton()->get_ticks_usec();
-
 	if (p_compile_func) {
 		err = p_compile_func(p_userdata,parser.program);
 	}
 
-	tf = (OS::get_singleton()->get_ticks_usec()-t)/1000.0;
-	//print_line("compile time: "+rtos(tf));
-
 	//clean up nodes created
 	while(parser.nodegc.size()) {
 
@@ -2633,22 +2623,16 @@ Error ShaderLanguage::compile(const String& p_code,ShaderType p_type,CompileFunc
 	*r_err_column=0;
 	Vector<Token> tokens;
 
-	uint64_t t = OS::get_singleton()->get_ticks_usec();
-
 	Error err = tokenize(p_code,&tokens,r_error,r_err_line,r_err_column);
 	if (err!=OK) {
 		print_line("tokenizer error!");
 	}
 
-	double tf = (OS::get_singleton()->get_ticks_usec()-t)/1000.0;
-	//print_line("tokenize time: "+rtos(tf));
-
 	if (err!=OK) {
 		return err;
 	}
 	err = parse(tokens,p_type,p_compile_func,p_userdata,r_error,r_err_line,r_err_column);
 	if (err!=OK) {
-		//print_line("LDEBUG: "+lex_debug(p_code));
 		return err;
 	}
 	return OK;
diff --git a/servers/visual/visual_server_raster.cpp b/servers/visual/visual_server_raster.cpp
index 532247d94c..d89ea887fa 100644
--- a/servers/visual/visual_server_raster.cpp
+++ b/servers/visual/visual_server_raster.cpp
@@ -4448,12 +4448,13 @@ void VisualServerRaster::cursor_set_rotation(float p_rotation, int p_cursor) {
 	cursors[p_cursor].rot = p_rotation;
 };
 
-void VisualServerRaster::cursor_set_texture(RID p_texture, const Point2 &p_center_offset, int p_cursor) {
+void VisualServerRaster::cursor_set_texture(RID p_texture, const Point2 &p_center_offset, int p_cursor, const Rect2 &p_region) {
 	VS_CHANGED;
 	ERR_FAIL_INDEX(p_cursor, MAX_CURSORS);
 
 	cursors[p_cursor].texture = p_texture;
 	cursors[p_cursor].center = p_center_offset;
+	cursors[p_cursor].region = p_region;
 };
 
 void VisualServerRaster::cursor_set_visible(bool p_visible, int p_cursor) {
@@ -4843,11 +4844,6 @@ void VisualServerRaster::_instance_draw(Instance *p_instance) {
 	switch(p_instance->base_type) {
 
 		case INSTANCE_MESH: {
-			const float *morphs = NULL;
-			if (!p_instance->data.morph_values.empty()) {
-				morphs=&p_instance->data.morph_values[0];
-			}
-
 			rasterizer->add_mesh(p_instance->base_rid, &p_instance->data);
 		} break;
 		case INSTANCE_MULTIMESH: {
@@ -5227,8 +5223,6 @@ void VisualServerRaster::_light_instance_update_lispsm_shadow(Instance *p_light,
 
 	Vector3 light_vec = -p_light->data.transform.basis.get_axis(2);
 	Vector3 view_vec = -p_camera->transform.basis.get_axis(2);
-	float viewdot = light_vec.normalized().dot(view_vec.normalized());
-
 
 	float near_dist=1;
 
@@ -6466,7 +6460,6 @@ void VisualServerRaster::_render_no_camera(Viewport *p_viewport,Camera *p_camera
 void VisualServerRaster::_render_camera(Viewport *p_viewport,Camera *p_camera, Scenario *p_scenario) {
 
 
-	uint64_t t = OS::get_singleton()->get_ticks_usec();
 	render_pass++;
 	uint32_t camera_layer_mask=p_camera->visible_layers;
 
@@ -7538,8 +7531,13 @@ void VisualServerRaster::_draw_cursors_and_margins() {
 
 		RID tex = cursors[i].texture?cursors[i].texture:default_cursor_texture;
 		ERR_CONTINUE( !tex );
-		Point2 size(texture_get_width(tex), texture_get_height(tex));
-		rasterizer->canvas_draw_rect(Rect2(cursors[i].pos, size), 0, Rect2(), tex, Color(1, 1, 1, 1));
+		if (cursors[i].region.has_no_area()) {
+			Point2 size(texture_get_width(tex), texture_get_height(tex));
+			rasterizer->canvas_draw_rect(Rect2(cursors[i].pos, size), 0, Rect2(), tex, Color(1, 1, 1, 1));
+		} else {
+			Point2 size = cursors[i].region.size;
+			rasterizer->canvas_draw_rect(Rect2(cursors[i].pos, size), Rasterizer::CANVAS_RECT_REGION, cursors[i].region, tex, Color(1, 1, 1, 1));
+		}
 	};
 
 
diff --git a/servers/visual/visual_server_raster.h b/servers/visual/visual_server_raster.h
index 0480d9f5cb..228a4a7c44 100644
--- a/servers/visual/visual_server_raster.h
+++ b/servers/visual/visual_server_raster.h
@@ -544,10 +544,12 @@ class VisualServerRaster : public VisualServer {
 		RID texture;
 		Point2 center;
 		bool visible;
+		Rect2 region;
 		Cursor() {
 
 			rot = 0;
 			visible = false;
+			region = Rect2();
 		};
 	};
 
@@ -1240,7 +1242,7 @@ public:
 
 	/* CURSOR */
 	virtual void cursor_set_rotation(float p_rotation, int p_cursor = 0); // radians
-	virtual void cursor_set_texture(RID p_texture, const Point2 &p_center_offset, int p_cursor=0);
+	virtual void cursor_set_texture(RID p_texture, const Point2 &p_center_offset, int p_cursor=0, const Rect2 &p_region=Rect2());
 	virtual void cursor_set_visible(bool p_visible, int p_cursor = 0);
 	virtual void cursor_set_pos(const Point2& p_pos, int p_cursor = 0);
 
diff --git a/servers/visual/visual_server_wrap_mt.h b/servers/visual/visual_server_wrap_mt.h
index a97b232c03..8c39b0bea1 100644
--- a/servers/visual/visual_server_wrap_mt.h
+++ b/servers/visual/visual_server_wrap_mt.h
@@ -680,7 +680,7 @@ public:
 
 	/* CURSOR */
 	FUNC2(cursor_set_rotation,float , int ); // radians
-	FUNC3(cursor_set_texture,RID , const Point2 &, int );
+	FUNC4(cursor_set_texture,RID , const Point2 &, int, const Rect2 &);
 	FUNC2(cursor_set_visible,bool , int );
 	FUNC2(cursor_set_pos,const Point2& , int );
 
diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp
index fafc09f554..9ec02f5071 100644
--- a/servers/visual_server.cpp
+++ b/servers/visual_server.cpp
@@ -757,7 +757,6 @@ void VisualServer::mesh_add_surface_from_mesh_data( RID p_mesh, const Geometry::
 		}
 	}
 
-	int s = mesh_get_surface_count(p_mesh);
 	Array d;
 	d.resize(VS::ARRAY_MAX);
 	d[ARRAY_VERTEX]=vertices;
diff --git a/servers/visual_server.h b/servers/visual_server.h
index f330a6faee..64318dfd72 100644
--- a/servers/visual_server.h
+++ b/servers/visual_server.h
@@ -1110,7 +1110,7 @@ public:
 
 	/* CURSOR */
 	virtual void cursor_set_rotation(float p_rotation, int p_cursor = 0)=0; // radians
-	virtual void cursor_set_texture(RID p_texture, const Point2 &p_center_offset = Point2(0, 0), int p_cursor=0)=0;
+	virtual void cursor_set_texture(RID p_texture, const Point2 &p_center_offset = Point2(0, 0), int p_cursor=0, const Rect2 &p_region=Rect2())=0;
 	virtual void cursor_set_visible(bool p_visible, int p_cursor = 0)=0;
 	virtual void cursor_set_pos(const Point2& p_pos, int p_cursor = 0)=0;
 
diff --git a/tools/collada/collada.cpp b/tools/collada/collada.cpp
index 11a0e1726b..268d42a613 100644
--- a/tools/collada/collada.cpp
+++ b/tools/collada/collada.cpp
@@ -681,9 +681,6 @@ void Collada::_parse_effect_material(XMLParser& parser,Effect &effect,String &id
 											} else {
 												String uri = effect.params[surface];
 
-												int channel=0;
-												//if (parser.has_attribute("texcoord"))
-
 
 												if (what=="diffuse") {
 													effect.diffuse.texture=uri;
@@ -759,9 +756,6 @@ void Collada::_parse_effect_material(XMLParser& parser,Effect &effect,String &id
 								} else {
 									String uri = effect.params[surface];
 
-									int channel=0;
-									//if (parser.has_attribute("texcoord"))
-
 									if (parser.has_attribute("bumptype") && parser.get_attribute_value("bumptype")!="NORMALMAP") {
 										WARN_PRINT("'bump' texture type is not NORMALMAP, only NORMALMAP is supported.")
 									}
@@ -2636,7 +2630,6 @@ void Collada::_find_morph_nodes(VisualScene *p_vscene,Node *p_node) {
 					base=sk.base;
 				} else if (state.morph_controller_data_map.has(base)) {
 
-					MorphControllerData &sk = state.morph_controller_data_map[base];
 					state.morph_ownership_map[base]=nj->id;
 					break;
 				} else {
diff --git a/tools/doc/doc_data.cpp b/tools/doc/doc_data.cpp
index 0c4751979c..398267937b 100644
--- a/tools/doc/doc_data.cpp
+++ b/tools/doc/doc_data.cpp
@@ -440,6 +440,12 @@ void DocData::generate(bool p_basic_types) {
 	}
 
 
+	{
+		//so it can be documented that it does not exist
+		class_list["Variant"]=ClassDoc();
+		class_list["Variant"].name="Variant";
+	}
+
 	if (!p_basic_types)
 		return;
 
@@ -934,14 +940,16 @@ Error DocData::save(const String& p_path) {
 		_write_string(f,0,header);
 		_write_string(f,1,"<brief_description>");
 		if (c.brief_description!="")
-			_write_string(f,1,c.brief_description.xml_escape());
+			_write_string(f,2,c.brief_description.xml_escape());
 		_write_string(f,1,"</brief_description>");
 		_write_string(f,1,"<description>");
 		if (c.description!="")
-			_write_string(f,1,c.description.xml_escape());
+			_write_string(f,2,c.description.xml_escape());
 		_write_string(f,1,"</description>");
 		_write_string(f,1,"<methods>");
 
+		c.methods.sort();
+
 		for(int i=0;i<c.methods.size();i++) {
 
 			MethodDoc &m=c.methods[i];
@@ -972,7 +980,7 @@ Error DocData::save(const String& p_path) {
 
 			_write_string(f,3,"<description>");
 			if (m.description!="")
-				_write_string(f,3,m.description.xml_escape());
+				_write_string(f,4,m.description.xml_escape());
 			_write_string(f,3,"</description>");
 
 			_write_string(f,2,"</method>");
@@ -984,6 +992,8 @@ Error DocData::save(const String& p_path) {
 		if (c.properties.size()) {
 			_write_string(f,1,"<members>");
 
+			c.properties.sort();
+
 			for(int i=0;i<c.properties.size();i++) {
 
 
@@ -999,6 +1009,8 @@ Error DocData::save(const String& p_path) {
 
 		if (c.signals.size()) {
 
+			c.signals.sort();
+
 			_write_string(f,1,"<signals>");
 			for(int i=0;i<c.signals.size();i++) {
 
@@ -1014,7 +1026,7 @@ Error DocData::save(const String& p_path) {
 
 				_write_string(f,3,"<description>");
 				if (m.description!="")
-					_write_string(f,3,m.description.xml_escape());
+					_write_string(f,4,m.description.xml_escape());
 				_write_string(f,3,"</description>");
 
 				_write_string(f,2,"</signal>");
@@ -1025,6 +1037,7 @@ Error DocData::save(const String& p_path) {
 
 		_write_string(f,1,"<constants>");
 
+
 		for(int i=0;i<c.constants.size();i++) {
 
 			ConstantDoc &k=c.constants[i];
@@ -1037,6 +1050,9 @@ Error DocData::save(const String& p_path) {
 		_write_string(f,1,"</constants>");
 
 		if (c.theme_properties.size()) {
+
+			c.theme_properties.sort();
+
 			_write_string(f,1,"<theme_items>");
 			for(int i=0;i<c.theme_properties.size();i++) {
 
diff --git a/tools/doc/doc_data.h b/tools/doc/doc_data.h
index d1aebff4ce..7996071c74 100644
--- a/tools/doc/doc_data.h
+++ b/tools/doc/doc_data.h
@@ -67,6 +67,9 @@ public:
 		String name;
 		String type;
 		String description;
+		bool operator<(const PropertyDoc& p_prop) const {
+			return name<p_prop.name;
+		}
 	};
 
 	struct ClassDoc  {
diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp
index dd3c3fee32..c7b78b980f 100644
--- a/tools/editor/animation_editor.cpp
+++ b/tools/editor/animation_editor.cpp
@@ -85,7 +85,6 @@ private:
 			int points = 48;
 			if (mode==MODE_MULTIPLE) {
 
-				int max_draw = 16;
 				Color mcolor=color;
 				mcolor.a*=0.3;
 
@@ -1356,7 +1355,6 @@ void AnimationKeyEditor::_track_editor_draw() {
 		}
 	}
 
-	Color sep_color=color;
 	color.a*=0.5;
 
 	for(int i=0;i<fit;i++) {
@@ -1806,8 +1804,6 @@ void AnimationKeyEditor::_track_editor_input_event(const InputEvent& p_input) {
 	Ref<Font> font = te->get_font("font","Tree");
 	int sep = get_constant("vseparation","Tree");
 	int hsep = get_constant("hseparation","Tree");
-	Color color = get_color("font_color","Tree");
-	Color sepcolor = get_color("guide_color","Tree");
 	Ref<Texture> remove_icon = get_icon("Remove","EditorIcons");
 	Ref<Texture> move_up_icon = get_icon("MoveUp","EditorIcons");
 	Ref<Texture> move_down_icon = get_icon("MoveDown","EditorIcons");
@@ -2922,7 +2918,6 @@ void AnimationKeyEditor::_notification(int p_what) {
 				edit_button->connect("pressed",this,"_toggle_edit_curves");
 
 				loop->set_icon(get_icon("Loop","EditorIcons"));
-				loop_interpolation->set_icon(get_icon("LoopInterpolation","EditorIcons"));
 				curve_edit->connect("transition_changed",this,"_curve_transition_changed");
 
 				//edit_button->add_color_override("font_color",get_color("font_color","Tree"));
@@ -3008,12 +3003,10 @@ void AnimationKeyEditor::_update_menu() {
 
 	updating=true;
 
-	bool empty= !animation.is_valid();
 	if (animation.is_valid()) {
 
 		length->set_val(animation->get_length());
 		loop->set_pressed(animation->has_loop());
-		loop_interpolation->set_pressed(animation->has_loop_interpolation());
 		step->set_val(animation->get_step());
 	}
 
@@ -3469,21 +3462,6 @@ void AnimationKeyEditor::_animation_loop_changed() {
 
 }
 
-void AnimationKeyEditor::_animation_loop_interpolation_changed() {
-
-	if (updating)
-		return;
-
-	if (!animation.is_null()) {
-
-		undo_redo->create_action(TTR("Change Anim Loop Interpolation"));
-		undo_redo->add_do_method(animation.ptr(),"set_loop_interpolation",loop_interpolation->is_pressed());
-		undo_redo->add_undo_method(animation.ptr(),"set_loop_interpolation",!loop_interpolation->is_pressed());
-		undo_redo->commit_action();
-	}
-
-}
-
 
 void AnimationKeyEditor::_create_value_item(int p_type) {
 
@@ -3769,7 +3747,6 @@ void AnimationKeyEditor::_bind_methods() {
 
 
 	ObjectTypeDB::bind_method(_MD("_animation_loop_changed"),&AnimationKeyEditor::_animation_loop_changed);
-	ObjectTypeDB::bind_method(_MD("_animation_loop_interpolation_changed"),&AnimationKeyEditor::_animation_loop_interpolation_changed);
 	ObjectTypeDB::bind_method(_MD("_animation_len_changed"),&AnimationKeyEditor::_animation_len_changed);
 	ObjectTypeDB::bind_method(_MD("_create_value_item"),&AnimationKeyEditor::_create_value_item);
 	ObjectTypeDB::bind_method(_MD("_pane_drag"),&AnimationKeyEditor::_pane_drag);
@@ -3880,12 +3857,6 @@ AnimationKeyEditor::AnimationKeyEditor() {
 	hb->add_child(loop);
 	loop->set_tooltip(TTR("Enable/Disable looping in animation."));
 
-	loop_interpolation = memnew( ToolButton );
-	loop_interpolation->set_toggle_mode(true);
-	loop_interpolation->connect("pressed",this,"_animation_loop_interpolation_changed");
-	hb->add_child(loop_interpolation);
-	loop_interpolation->set_tooltip(TTR("Enable/Disable interpolation when looping animation."));
-
 	hb->add_child( memnew( VSeparator ) );
 
 	menu_add_track = memnew( MenuButton );
diff --git a/tools/editor/animation_editor.h b/tools/editor/animation_editor.h
index c8de1d87c1..413c73b4b9 100644
--- a/tools/editor/animation_editor.h
+++ b/tools/editor/animation_editor.h
@@ -173,7 +173,6 @@ class AnimationKeyEditor : public VBoxContainer  {
 	//MenuButton *menu;
 	SpinBox *length;
 	Button *loop;
-	Button *loop_interpolation;
 	bool keying;
 	ToolButton *edit_button;
 	ToolButton *move_up_button;
@@ -239,7 +238,6 @@ class AnimationKeyEditor : public VBoxContainer  {
 
 	void _animation_len_changed(float p_len);
 	void _animation_loop_changed();
-	void _animation_loop_interpolation_changed();
 	void _step_changed(float p_len);
 
 	struct InsertData {
diff --git a/tools/editor/asset_library_editor_plugin.cpp b/tools/editor/asset_library_editor_plugin.cpp
index a2448921d7..ee535310bc 100644
--- a/tools/editor/asset_library_editor_plugin.cpp
+++ b/tools/editor/asset_library_editor_plugin.cpp
@@ -1366,7 +1366,7 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) {
 	repository = memnew( OptionButton );
 
 	repository->add_item("Godot");
-	repository->set_item_metadata(0, "http://godotengine.org/asset-library/api");
+	repository->set_item_metadata(0, "https://godotengine.org/asset-library/api");
 	repository->add_item("Localhost"); // TODO: Maybe remove?
 	repository->set_item_metadata(1, "http://127.0.0.1/asset-library/api");
 	repository->connect("item_selected",this,"_repository_changed");
diff --git a/tools/editor/code_editor.cpp b/tools/editor/code_editor.cpp
index 644478923c..21de122cee 100644
--- a/tools/editor/code_editor.cpp
+++ b/tools/editor/code_editor.cpp
@@ -32,6 +32,7 @@
 #include "scene/gui/separator.h"
 #include "scene/resources/dynamic_font.h"
 #include "os/keyboard.h"
+#include "tools/editor/editor_scale.h"
 
 void GotoLineDialog::popup_find_line(TextEdit *p_edit) {
 
@@ -1198,6 +1199,10 @@ CodeTextEditor::CodeTextEditor() {
 	line_col = memnew( Label );
 	status_bar->add_child(line_col);
 	line_col->set_valign(Label::VALIGN_CENTER);
+	line_col->set_autowrap(true);
+	line_col->set_v_size_flags(SIZE_FILL);
+	line_col->set_custom_minimum_size(Size2(100,1)*EDSCALE);
+	status_bar->add_child( memnew( Label ) ); //to keep the height if the other labels are not visible
 
 
 	text_editor->connect("input_event", this,"_text_editor_input_event");
diff --git a/tools/editor/create_dialog.cpp b/tools/editor/create_dialog.cpp
index 5275e1beeb..210b799f3d 100644
--- a/tools/editor/create_dialog.cpp
+++ b/tools/editor/create_dialog.cpp
@@ -42,12 +42,13 @@
 
 void CreateDialog::popup(bool p_dontclear) {
 
-	popup_centered_ratio(0.6);
+	popup_centered_ratio();
 	if (p_dontclear)
 		search_box->select_all();
 	else
 		search_box->clear();
 	search_box->grab_focus();
+
 	_update_search();
 
 
@@ -165,9 +166,10 @@ void CreateDialog::_update_search() {
 
 		if (!ObjectTypeDB::can_instance(type))
 			continue; // cant create what can't be instanced
-		if (search_box->get_text()=="")
+
+		if (search_box->get_text()=="") {
 			add_type(type,types,root,&to_select);
-		else {
+		} else {
 
 			bool found=false;
 			String type=I->get();
@@ -186,7 +188,7 @@ void CreateDialog::_update_search() {
 				add_type(I->get(),types,root,&to_select);
 		}
 
-		if (EditorNode::get_editor_data().get_custom_types().has(type)) {
+		if (EditorNode::get_editor_data().get_custom_types().has(type) && ObjectTypeDB::is_type(type, base_type)) {
 			//there are custom types based on this... cool.
 			//print_line("there are custom types");
 
@@ -198,6 +200,7 @@ void CreateDialog::_update_search() {
 
 				if (!show)
 					continue;
+
 				if (!types.has(type))
 					add_type(type,types,root,&to_select);
 
@@ -216,7 +219,7 @@ void CreateDialog::_update_search() {
 
 				}
 
-				if (!to_select && (search_box->get_text()=="" || ct[i].name.findn(search_box->get_text())!=-1)) {
+				if (!to_select) {
 					to_select=item;
 				}
 
@@ -246,7 +249,6 @@ void CreateDialog::_notification(int p_what) {
 	if (p_what==NOTIFICATION_ENTER_TREE) {
 
 		connect("confirmed",this,"_confirmed");
-		_update_search();
 	}
 	if (p_what==NOTIFICATION_EXIT_TREE) {
 
diff --git a/tools/editor/dependency_editor.cpp b/tools/editor/dependency_editor.cpp
index ad2eb57f00..049bcefc75 100644
--- a/tools/editor/dependency_editor.cpp
+++ b/tools/editor/dependency_editor.cpp
@@ -80,8 +80,6 @@ void DependencyEditor::_fix_and_find(EditorFileSystemDirectory *efsd, Map<String
 			continue;
 
 		String path = efsd->get_file_path(i);
-		Map<String,String> &ss = candidates[file];
-
 
 		for(Map<String,String>::Element *E=candidates[file].front();E;E=E->next()) {
 
@@ -420,7 +418,7 @@ void DependencyRemoveDialog::show(const Vector<String> &to_erase) {
 	exist=false;
 	owners->clear();
 	files.clear();
-	TreeItem *root=owners->create_item();
+	owners->create_item(); // root
 	for(int i=0;i<to_erase.size();i++) {
 		files[to_erase[i]]=NULL;
 	}
diff --git a/tools/editor/editor_autoload_settings.cpp b/tools/editor/editor_autoload_settings.cpp
new file mode 100644
index 0000000000..1cf0090e7e
--- /dev/null
+++ b/tools/editor/editor_autoload_settings.cpp
@@ -0,0 +1,618 @@
+/*************************************************************************/
+/*  editor_autoload_settings.cpp                                         */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "editor_autoload_settings.h"
+
+#include "globals.h"
+#include "global_constants.h"
+
+#include "editor_node.h"
+
+#define PREVIEW_LIST_MAX_SIZE 10
+
+StringName EditorAutoloadSettings::autoload_changed = StringName();
+
+void EditorAutoloadSettings::_notification(int p_what) {
+
+	if (p_what == NOTIFICATION_ENTER_TREE) {
+
+		List<String> afn;
+		ResourceLoader::get_recognized_extensions_for_type("Script", &afn);
+		ResourceLoader::get_recognized_extensions_for_type("PackedScene", &afn);
+
+		EditorFileDialog *file_dialog = autoload_add_path->get_file_dialog();
+
+		for (List<String>::Element *E = afn.front(); E; E = E->next()) {
+
+			file_dialog->add_filter("*." + E->get());
+		}
+	}
+}
+
+bool EditorAutoloadSettings::_autoload_name_is_valid(const String& p_name, String* r_error) {
+
+	if (!p_name.is_valid_identifier()) {
+		if (r_error)
+			*r_error = TTR("Invalid name.") + "\n" + TTR("Valid characters:")+" a-z, A-Z, 0-9 or _";
+
+		return false;
+	}
+
+	if (ObjectTypeDB::type_exists(p_name)) {
+		if (r_error)
+			*r_error = TTR("Invalid name. Must not collide with an existing engine class name.");
+
+		return false;
+	}
+
+	for (int i = 0; i < Variant::VARIANT_MAX; i++) {
+		if (Variant::get_type_name( Variant::Type(i) ) == p_name) {
+			if (r_error)
+				*r_error = TTR("Invalid name. Must not collide with an existing buit-in type name.");
+
+			return false;
+		}
+	}
+
+	for (int i = 0; i < GlobalConstants::get_global_constant_count(); i++) {
+		if (GlobalConstants::get_global_constant_name(i) == p_name) {
+			if (r_error)
+				*r_error = TTR("Invalid name. Must not collide with an existing global constant name.");
+
+			return false;
+		}
+	}
+
+	return true;
+}
+
+void EditorAutoloadSettings::_autoload_add() {
+
+	String name = autoload_add_name->get_text();
+
+	String error;
+	if (!_autoload_name_is_valid(name, &error)) {
+		EditorNode::get_singleton()->show_warning(error);
+		return;
+	}
+
+	String path = autoload_add_path->get_line_edit()->get_text();
+	if (!FileAccess::exists(path)) {
+		EditorNode::get_singleton()->show_warning(TTR("Invalid Path.") + "\n" + TTR("File does not exist."));
+		return;
+	}
+
+	if (!path.begins_with("res://")) {
+		EditorNode::get_singleton()->show_warning(TTR("Invalid Path.") + "\n"+ TTR("Not in resource path."));
+		return;
+	}
+
+	name = "autoload/" + name;
+
+	UndoRedo* undo_redo = EditorNode::get_singleton()->get_undo_redo();
+
+	undo_redo->create_action(TTR("Add AutoLoad"));
+	undo_redo->add_do_property(Globals::get_singleton(), name, "*" + path);
+	undo_redo->add_do_method(Globals::get_singleton(), "set_persisting", name, true);
+
+	if (Globals::get_singleton()->has(name)) {
+		undo_redo->add_undo_property(Globals::get_singleton(), name, Globals::get_singleton()->get(name));
+	} else {
+		undo_redo->add_undo_property(Globals::get_singleton(), name, Variant());
+	}
+
+	undo_redo->add_do_method(this, "update_autoload");
+	undo_redo->add_undo_method(this, "update_autoload");
+
+	undo_redo->add_do_method(this, "emit_signal", autoload_changed);
+	undo_redo->add_undo_method(this, "emit_signal", autoload_changed);
+
+	undo_redo->commit_action();
+
+	autoload_add_path->get_line_edit()->set_text("");
+	autoload_add_name->set_text("");
+}
+
+void EditorAutoloadSettings::_autoload_selected() {
+
+	TreeItem *ti = tree->get_selected();
+
+	if (!ti)
+		return;
+
+	selected_autoload = "autoload/" + ti->get_text(0);
+}
+
+void EditorAutoloadSettings::_autoload_edited() {
+
+	if (updating_autoload)
+		return;
+
+	TreeItem *ti = tree->get_edited();
+	int column = tree->get_edited_column();
+
+	UndoRedo *undo_redo = EditorNode::get_undo_redo();
+
+	if (column == 0) {
+		String name = ti->get_text(0);
+		String old_name = selected_autoload.get_slice("/", 1);
+
+		if (name == old_name)
+			return;
+
+		String error;
+		if (!_autoload_name_is_valid(name, &error)) {
+			ti->set_text(0, old_name);
+			EditorNode::get_singleton()->show_warning(error);
+			return;
+		}
+
+		if (Globals::get_singleton()->has("autoload/" + name)) {
+			ti->set_text(0, old_name);
+			EditorNode::get_singleton()->show_warning(vformat(TTR("Autoload '%s' already exists!"), name));
+			return;
+		}
+
+		updating_autoload = true;
+
+		name = "autoload/" + name;
+
+		bool persisting = Globals::get_singleton()->get(selected_autoload);
+		int order = Globals::get_singleton()->get(selected_autoload);
+		String path = Globals::get_singleton()->get(selected_autoload);
+
+		undo_redo->create_action(TTR("Rename Autoload"));
+
+		undo_redo->add_do_property(Globals::get_singleton(), name, path);
+		undo_redo->add_do_method(Globals::get_singleton(), "set_persisting", name, persisting);
+		undo_redo->add_do_method(Globals::get_singleton(), "set_order", name, order);
+		undo_redo->add_do_method(Globals::get_singleton(), "clear", selected_autoload);
+
+		undo_redo->add_undo_property(Globals::get_singleton(), selected_autoload, path);
+		undo_redo->add_undo_method(Globals::get_singleton(), "set_persisting", selected_autoload, persisting);
+		undo_redo->add_undo_method(Globals::get_singleton(), "set_order", selected_autoload, order);
+		undo_redo->add_undo_method(Globals::get_singleton(), "clear", name);
+
+		undo_redo->add_do_method(this, "update_autoload");
+		undo_redo->add_undo_method(this, "update_autoload");
+
+		undo_redo->add_do_method(this, "emit_signal", autoload_changed);
+		undo_redo->add_undo_method(this, "emit_signal", autoload_changed);
+
+		undo_redo->commit_action();
+
+		selected_autoload = name;
+	} else if (column == 2) {
+		updating_autoload = true;
+
+		bool checked = ti->is_checked(2);
+		String base = "autoload/" + ti->get_text(0);
+
+		int order = Globals::get_singleton()->get_order(base);
+		String path = Globals::get_singleton()->get(base);
+
+		if (path.begins_with("*"))
+			path = path.substr(1, path.length());
+
+		if (checked)
+			path = "*" + path;
+
+		undo_redo->create_action(TTR("Toggle AutoLoad Globals"));
+
+		undo_redo->add_do_property(Globals::get_singleton(), base, path);
+		undo_redo->add_undo_property(Globals::get_singleton(), base, Globals::get_singleton()->get(base));
+
+		undo_redo->add_do_method(Globals::get_singleton(),"set_order", base, order);
+		undo_redo->add_undo_method(Globals::get_singleton(),"set_order", base, order);
+
+		undo_redo->add_do_method(this, "update_autoload");
+		undo_redo->add_undo_method(this, "update_autoload");
+
+		undo_redo->add_do_method(this, "emit_signal", autoload_changed);
+		undo_redo->add_undo_method(this, "emit_signal", autoload_changed);
+
+		undo_redo->commit_action();
+	}
+
+	updating_autoload = false;
+}
+
+void EditorAutoloadSettings::_autoload_button_pressed(Object *p_item, int p_column, int p_button) {
+
+	TreeItem *ti = p_item->cast_to<TreeItem>();
+
+	String name = "autoload/" + ti->get_text(0);
+
+	UndoRedo *undo_redo = EditorNode::get_undo_redo();
+
+	switch (p_button) {
+
+		case BUTTON_MOVE_UP: 
+		case BUTTON_MOVE_DOWN: {
+
+			TreeItem *swap = NULL;
+
+			if (p_button == BUTTON_MOVE_UP) {
+				swap = ti->get_prev();
+			} else {
+				swap = ti->get_next();
+			}
+
+			if (!swap)
+				return;
+
+			String swap_name = "autoload/" + swap->get_text(0);
+
+			int order = Globals::get_singleton()->get_order(name);
+			int swap_order = Globals::get_singleton()->get_order(swap_name);
+
+			undo_redo->create_action(TTR("Move Autoload"));
+
+			undo_redo->add_do_method(Globals::get_singleton(), "set_order", name, swap_order);
+			undo_redo->add_undo_method(Globals::get_singleton(), "set_order", name, order);
+
+			undo_redo->add_do_method(Globals::get_singleton(), "set_order", swap_name, order);
+			undo_redo->add_undo_method(Globals::get_singleton(), "set_order", swap_name, swap_order);
+
+			undo_redo->add_do_method(this, "update_autoload");
+			undo_redo->add_undo_method(this, "update_autoload");
+
+			undo_redo->add_do_method(this, "emit_signal", autoload_changed);
+			undo_redo->add_undo_method(this, "emit_signal", autoload_changed);
+
+			undo_redo->commit_action();
+		} break;
+		case BUTTON_DELETE: {
+
+			int order = Globals::get_singleton()->get_order(name);
+
+			undo_redo->create_action(TTR("Remove Autoload"));
+
+			undo_redo->add_do_property(Globals::get_singleton(), name, Variant());
+
+			undo_redo->add_undo_property(Globals::get_singleton(), name, Globals::get_singleton()->get(name));
+			undo_redo->add_undo_method(Globals::get_singleton(), "set_persisting", name, true);
+			undo_redo->add_undo_method(Globals::get_singleton(), "set_order", order);
+
+			undo_redo->add_do_method(this, "update_autoload");
+			undo_redo->add_undo_method(this, "update_autoload");
+
+			undo_redo->add_do_method(this, "emit_signal", autoload_changed);
+			undo_redo->add_undo_method(this, "emit_signal", autoload_changed);
+
+			undo_redo->commit_action();
+		} break;
+	}
+}
+
+void EditorAutoloadSettings::_autoload_file_callback(const String& p_path) {
+
+	autoload_add_name->set_text(p_path.get_file().basename());
+}
+
+void EditorAutoloadSettings::update_autoload() {
+
+	if (updating_autoload)
+		return;
+
+	updating_autoload = true;
+
+	autoload_cache.clear();
+
+	tree->clear();
+	TreeItem *root = tree->create_item();
+
+	List<PropertyInfo> props;
+	Globals::get_singleton()->get_property_list(&props);
+
+	for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
+
+		const PropertyInfo &pi = E->get();
+
+		if (!pi.name.begins_with("autoload/"))
+			continue;
+
+		String name = pi.name.get_slice("/", 1);
+		String path = Globals::get_singleton()->get(pi.name);
+
+		if (name.empty())
+			continue;
+
+		AutoLoadInfo info;
+		info.name = pi.name;
+		info.order = Globals::get_singleton()->get_order(pi.name);
+
+		autoload_cache.push_back(info);
+
+		bool global = false;
+
+		if (path.begins_with("*")) {
+			global = true;
+			path = path.substr(1, path.length());
+		}
+
+		TreeItem *item = tree->create_item(root);
+		item->set_text(0, name);
+		item->set_editable(0, true);
+
+		item->set_text(1, path);
+		item->set_selectable(1, false);
+
+		item->set_cell_mode(2, TreeItem::CELL_MODE_CHECK);
+		item->set_editable(2, true);
+		item->set_text(2, TTR("Enable"));
+		item->set_checked(2, global);
+
+		item->add_button(3, get_icon("MoveUp","EditorIcons"), BUTTON_MOVE_UP);
+		item->add_button(3, get_icon("MoveDown","EditorIcons"), BUTTON_MOVE_DOWN);
+		item->add_button(3, get_icon("Del","EditorIcons"), BUTTON_DELETE);
+		item->set_selectable(3, false);
+	}
+
+	updating_autoload = false;
+}
+
+Variant EditorAutoloadSettings::get_drag_data_fw(const Point2& p_point, Control *p_control) {
+
+	if (autoload_cache.size() <= 1)
+		return false;
+
+	StringArray autoloads;
+
+	TreeItem *next = tree->get_next_selected(NULL);
+
+	while (next) {
+		autoloads.push_back(next->get_text(0));
+		next = tree->get_next_selected(next);
+	}
+
+	if (autoloads.size() == 0 || autoloads.size() == autoload_cache.size())
+		return Variant();
+
+	VBoxContainer *preview = memnew( VBoxContainer );
+
+	int max_size = MIN(PREVIEW_LIST_MAX_SIZE, autoloads.size());
+
+	for (int i = 0; i < max_size; i++) {
+		Label *label = memnew( Label(autoloads[i]) );
+		label->set_self_opacity(Math::lerp(1, 0, float(i)/PREVIEW_LIST_MAX_SIZE));
+
+		preview->add_child(label);
+	}
+
+	tree->set_drop_mode_flags(Tree::DROP_MODE_INBETWEEN);
+	tree->set_drag_preview(preview);
+
+	Dictionary drop_data;
+	drop_data["type"] = "autoload";
+	drop_data["autoloads"] = autoloads;
+
+	return drop_data;
+}
+
+bool EditorAutoloadSettings::can_drop_data_fw(const Point2& p_point, const Variant& p_data, Control *p_control) const {
+	if (updating_autoload)
+		return false;
+
+	Dictionary drop_data = p_data;
+
+	if (!drop_data.has("type"))
+		return false;
+
+	if (drop_data.has("type")) {
+		TreeItem *ti = tree->get_item_at_pos(p_point);
+
+		if (!ti)
+			return false;
+
+		int section = tree->get_drop_section_at_pos(p_point);
+
+		if (section < -1)
+			return false;
+
+		return true;
+	}
+
+	return false;
+}
+
+void EditorAutoloadSettings::drop_data_fw(const Point2& p_point, const Variant& p_data, Control *p_control) {
+
+	TreeItem *ti = tree->get_item_at_pos(p_point);
+
+	if (!ti)
+		return;
+
+	int section = tree->get_drop_section_at_pos(p_point);
+
+	if (section < -1)
+		return;
+
+	String name;
+	bool move_to_back = false;
+
+	if (section < 0) {
+		name = ti->get_text(0);
+	} else if (ti->get_next()) {
+		name = ti->get_next()->get_text(0);
+	} else {
+		name = ti->get_text(0);
+		move_to_back = true;
+	}
+
+	int order = Globals::get_singleton()->get_order("autoload/" + name);
+
+	AutoLoadInfo aux;
+	List<AutoLoadInfo>::Element *E = NULL;
+
+	if (!move_to_back) {
+		aux.order = order;
+		E = autoload_cache.find(aux);
+	}
+
+	Dictionary drop_data = p_data;
+	StringArray autoloads = drop_data["autoloads"];
+
+	Vector<int> orders;
+	orders.resize(autoload_cache.size());
+
+	for (int i = 0; i < autoloads.size(); i++) {
+		aux.order = Globals::get_singleton()->get_order("autoload/" + autoloads[i]);
+
+		List<AutoLoadInfo>::Element *I = autoload_cache.find(aux);
+
+		if (move_to_back) {
+			autoload_cache.move_to_back(I);
+		} else if (E != I) {
+			autoload_cache.move_before(I, E);
+		} else if (E->next()) {
+			E = E->next();
+		} else {
+			break;
+		}
+	}
+
+	int i = 0;
+
+	for (List<AutoLoadInfo>::Element *E = autoload_cache.front(); E; E = E->next()) {
+		orders[i++] = E->get().order;
+	}
+
+	orders.sort();
+
+	UndoRedo *undo_redo = EditorNode::get_undo_redo();
+
+	undo_redo->create_action(TTR("Rearrange Autoloads"));
+
+	i = 0;
+
+	for (List<AutoLoadInfo>::Element *E = autoload_cache.front(); E; E = E->next()) {
+		undo_redo->add_do_method(Globals::get_singleton(), "set_order", E->get().name, orders[i++]);
+		undo_redo->add_undo_method(Globals::get_singleton(), "set_order", E->get().name, E->get().order);
+	}
+
+	orders.clear();
+
+	undo_redo->add_do_method(this, "update_autoload");
+	undo_redo->add_undo_method(this, "update_autoload");
+
+	undo_redo->add_do_method(this, "emit_signal", autoload_changed);
+	undo_redo->add_undo_method(this, "emit_signal", autoload_changed);
+
+	undo_redo->commit_action();
+}
+
+void EditorAutoloadSettings::_bind_methods() {
+
+	ObjectTypeDB::bind_method("_autoload_add", &EditorAutoloadSettings::_autoload_add);
+	ObjectTypeDB::bind_method("_autoload_selected", &EditorAutoloadSettings::_autoload_selected);
+	ObjectTypeDB::bind_method("_autoload_edited", &EditorAutoloadSettings::_autoload_edited);
+	ObjectTypeDB::bind_method("_autoload_button_pressed", &EditorAutoloadSettings::_autoload_button_pressed);
+	ObjectTypeDB::bind_method("_autoload_file_callback", &EditorAutoloadSettings::_autoload_file_callback);
+
+	ObjectTypeDB::bind_method("get_drag_data_fw", &EditorAutoloadSettings::get_drag_data_fw);
+	ObjectTypeDB::bind_method("can_drop_data_fw", &EditorAutoloadSettings::can_drop_data_fw);
+	ObjectTypeDB::bind_method("drop_data_fw", &EditorAutoloadSettings::drop_data_fw);
+
+	ObjectTypeDB::bind_method("update_autoload", &EditorAutoloadSettings::update_autoload);
+
+	ADD_SIGNAL(MethodInfo("autoload_changed"));
+}
+
+EditorAutoloadSettings::EditorAutoloadSettings() {
+
+	autoload_changed = "autoload_changed";
+
+	updating_autoload = false;
+	selected_autoload = "";
+
+	HBoxContainer *hbc = memnew( HBoxContainer );
+	add_child(hbc);
+
+	VBoxContainer *vbc_path = memnew( VBoxContainer );
+	vbc_path->set_h_size_flags(SIZE_EXPAND_FILL);
+
+	autoload_add_path = memnew( EditorLineEditFileChooser );
+	autoload_add_path->set_h_size_flags(SIZE_EXPAND_FILL);
+
+	autoload_add_path->get_file_dialog()->set_mode(EditorFileDialog::MODE_OPEN_FILE);
+	autoload_add_path->get_file_dialog()->connect("file_selected", this, "_autoload_file_callback");
+
+	vbc_path->add_margin_child(TTR("Path:"), autoload_add_path);
+	hbc->add_child(vbc_path);
+
+	VBoxContainer *vbc_name = memnew( VBoxContainer );
+	vbc_name->set_h_size_flags(SIZE_EXPAND_FILL);
+
+	HBoxContainer *hbc_name = memnew( HBoxContainer );
+
+	autoload_add_name = memnew( LineEdit );
+	autoload_add_name->set_h_size_flags(SIZE_EXPAND_FILL);
+	hbc_name->add_child(autoload_add_name);
+
+	Button *add_autoload = memnew( Button );
+	add_autoload->set_text(TTR("Add"));
+	hbc_name->add_child(add_autoload);
+	add_autoload->connect("pressed", this, "_autoload_add");
+
+	vbc_name->add_margin_child(TTR("Node Name:"), hbc_name);
+	hbc->add_child(vbc_name);
+
+	tree = memnew( Tree );
+	tree->set_hide_root(true);
+	tree->set_select_mode(Tree::SELECT_MULTI);
+	tree->set_single_select_cell_editing_only_when_already_selected(true);
+
+	tree->set_drag_forwarding(this);
+
+	tree->set_columns(4);
+	tree->set_column_titles_visible(true);
+
+	tree->set_column_title(0,TTR("Name"));
+	tree->set_column_expand(0,true);
+	tree->set_column_min_width(0,100);
+
+	tree->set_column_title(1,TTR("Path"));
+	tree->set_column_expand(1,true);
+	tree->set_column_min_width(1,100);
+
+	tree->set_column_title(2,TTR("Singleton"));
+	tree->set_column_expand(2,false);
+	tree->set_column_min_width(2,80);
+
+	tree->set_column_expand(3,false);
+	tree->set_column_min_width(3,80);
+
+	tree->connect("cell_selected", this, "_autoload_selected");
+	tree->connect("item_edited", this, "_autoload_edited");
+	tree->connect("button_pressed", this, "_autoload_button_pressed");
+
+	add_margin_child(TTR("List:"), tree, true);
+}
+
diff --git a/tools/editor/editor_autoload_settings.h b/tools/editor/editor_autoload_settings.h
new file mode 100644
index 0000000000..b8825f807c
--- /dev/null
+++ b/tools/editor/editor_autoload_settings.h
@@ -0,0 +1,94 @@
+/*************************************************************************/
+/*  editor_autoload_settings.h                                           */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef EDITOR_AUTOLOAD_SETTINGS_H
+#define EDITOR_AUTOLOAD_SETTINGS_H
+
+#include "scene/gui/tree.h"
+
+#include "editor_file_dialog.h"
+
+class EditorAutoloadSettings : public VBoxContainer {
+
+	OBJ_TYPE( EditorAutoloadSettings, VBoxContainer );
+
+	enum {
+		BUTTON_MOVE_UP,
+		BUTTON_MOVE_DOWN,
+		BUTTON_DELETE
+	};
+
+	static StringName autoload_changed;
+
+	struct AutoLoadInfo {
+		String name;
+		int order;
+
+		bool operator==(const AutoLoadInfo& p_info) {
+			return order == p_info.order;
+		}
+	};
+
+	List<AutoLoadInfo> autoload_cache;
+
+	bool updating_autoload;
+	int number_of_autoloads;
+	String selected_autoload;
+
+	Tree *tree;
+	EditorLineEditFileChooser *autoload_add_path;
+	LineEdit *autoload_add_name;
+
+	bool _autoload_name_is_valid(const String& p_string, String *r_error = NULL);
+
+	void _autoload_add();
+	void _autoload_selected();
+	void _autoload_edited();
+	void _autoload_button_pressed(Object *p_item, int p_column, int p_button);
+	void _autoload_file_callback(const String& p_path);
+
+	Variant get_drag_data_fw(const Point2& p_point, Control *p_from);
+	bool can_drop_data_fw(const Point2& p_point, const Variant& p_data, Control *p_from) const;
+	void drop_data_fw(const Point2& p_point, const Variant& p_data, Control *p_from);
+
+protected:
+
+	void _notification(int p_what);
+	static void _bind_methods();
+
+public:
+
+	void update_autoload();
+
+	EditorAutoloadSettings();
+
+};
+
+#endif
+
diff --git a/tools/editor/editor_data.cpp b/tools/editor/editor_data.cpp
index 4c4fecdd83..0f10041034 100644
--- a/tools/editor/editor_data.cpp
+++ b/tools/editor/editor_data.cpp
@@ -565,6 +565,8 @@ bool EditorData::check_and_update_scene(int p_idx) {
 
 	bool must_reload = _find_updated_instances(edited_scene[p_idx].root,edited_scene[p_idx].root,checked_scenes);
 
+	print_line("MUST RELOAD? "+itos(must_reload));
+
 	if (must_reload) {
 		Ref<PackedScene> pscene;
 		pscene.instance();
@@ -762,6 +764,8 @@ Ref<ResourceImportMetadata> EditorData::get_edited_scene_import_metadata() const
 	return edited_scene[current_edited_scene].medatata;
 }
 
+
+
 void EditorData::clear_edited_scenes() {
 
 	for(int i=0;i<edited_scene.size();i++) {
diff --git a/tools/editor/editor_dir_dialog.cpp b/tools/editor/editor_dir_dialog.cpp
index a6e231cf18..f6ce7bf3f8 100644
--- a/tools/editor/editor_dir_dialog.cpp
+++ b/tools/editor/editor_dir_dialog.cpp
@@ -99,8 +99,14 @@ void EditorDirDialog::_notification(int p_what) {
 
 	if (p_what==NOTIFICATION_ENTER_TREE) {
 		reload();
-		tree->connect("item_collapsed",this,"_item_collapsed",varray(),CONNECT_DEFERRED);
-		EditorFileSystem::get_singleton()->connect("filesystem_changed",this,"reload");
+
+		if (!tree->is_connected("item_collapsed",this,"_item_collapsed")) {
+			tree->connect("item_collapsed",this,"_item_collapsed",varray(),CONNECT_DEFERRED);
+		}
+
+		if (!EditorFileSystem::get_singleton()->is_connected("filesystem_changed",this,"reload")) {
+			EditorFileSystem::get_singleton()->connect("filesystem_changed",this,"reload");
+		}
 
 	}
 
@@ -185,10 +191,14 @@ void EditorDirDialog::ok_pressed() {
 void EditorDirDialog::_make_dir() {
 
 	TreeItem *ti=tree->get_selected();
-	if (!ti)
+	if (!ti) {
+		mkdirerr->set_text("Please select a base directory first");
+		mkdirerr->popup_centered_minsize();
 		return;
+	}
 
 	makedialog->popup_centered_minsize(Size2(250,80));
+	makedirname->grab_focus();
 }
 
 void EditorDirDialog::_make_dir_confirm() {
@@ -198,9 +208,11 @@ void EditorDirDialog::_make_dir_confirm() {
 		return;
 
 	String dir = ti->get_metadata(0);
+
 	DirAccess *d = DirAccess::open(dir);
 	ERR_FAIL_COND(!d);
 	Error err = d->make_dir(makedirname->get_text());
+
 	if (err!=OK) {
 		mkdirerr->popup_centered_minsize(Size2(250,80));
 	} else {
diff --git a/tools/editor/editor_file_dialog.cpp b/tools/editor/editor_file_dialog.cpp
index 97feaa80a5..b8abd1d32c 100644
--- a/tools/editor/editor_file_dialog.cpp
+++ b/tools/editor/editor_file_dialog.cpp
@@ -98,35 +98,64 @@ void EditorFileDialog::_unhandled_input(const InputEvent& p_event) {
 
 	if (p_event.type==InputEvent::KEY && is_window_modal_on_top()) {
 
-		const InputEventKey &k=p_event.key;
+		if (p_event.key.pressed) {
 
-		if (k.pressed) {
+			bool handled=false;
 
-			bool handled=true;
-
-			switch (k.scancode) {
-
-				case KEY_H: {
-
-					if (k.mod.command) {
-
-						bool show=!show_hidden_files;
-						set_show_hidden_files(show);
-						EditorSettings::get_singleton()->set("file_dialog/show_hidden_files",show);
-					} else {
-						handled=false;
-					}
-
-				} break;
-				case KEY_F5: {
-
-					invalidate();
-				} break;
-				default: { handled=false; }
+			if (ED_IS_SHORTCUT("file_dialog/go_back", p_event)) {
+				_go_back();
+				handled=true;
+			}
+			if (ED_IS_SHORTCUT("file_dialog/go_forward", p_event)) {
+				_go_forward();
+				handled=true;
+			}
+			if (ED_IS_SHORTCUT("file_dialog/go_up", p_event)) {
+				_go_up();
+				handled=true;
+			}
+			if (ED_IS_SHORTCUT("file_dialog/refresh", p_event)) {
+				invalidate();
+				handled=true;
+			}
+			if (ED_IS_SHORTCUT("file_dialog/toggle_hidden_files", p_event)) {
+				bool show=!show_hidden_files;
+				set_show_hidden_files(show);
+				EditorSettings::get_singleton()->set("file_dialog/show_hidden_files",show);
+				handled=true;
+			}
+			if (ED_IS_SHORTCUT("file_dialog/toggle_favorite", p_event)) {
+				_favorite_toggled(favorite->is_pressed());
+				handled=true;
+			}
+			if (ED_IS_SHORTCUT("file_dialog/toggle_mode", p_event)) {
+				if (mode_thumbnails->is_pressed()) {
+					set_display_mode(DISPLAY_LIST);
+				} else {
+					set_display_mode(DISPLAY_THUMBNAILS);
+				}
+				handled=true;
+			}
+			if (ED_IS_SHORTCUT("file_dialog/create_folder", p_event)) {
+				_make_dir();
+				handled=true;
+			}
+			if (ED_IS_SHORTCUT("file_dialog/focus_path", p_event)) {
+				dir->grab_focus();
+				handled=true;
+			}
+			if (ED_IS_SHORTCUT("file_dialog/move_favorite_up", p_event)) {
+				_favorite_move_up();
+				handled=true;
+			}
+			if (ED_IS_SHORTCUT("file_dialog/move_favorite_down", p_event)) {
+				_favorite_move_down();
+				handled=true;
 			}
 
-			if (handled)
+			if (handled) {
 				accept_event();
+			}
 		}
 	}
 }
@@ -437,10 +466,7 @@ void EditorFileDialog::_item_dc_selected(int p_item) {
 
 	if (d["dir"]) {
 
-		//print_line("change dir: "+String(d["name"]));
 		dir_access->change_dir(d["name"]);
-		if (mode==MODE_OPEN_FILE || mode==MODE_OPEN_FILES || mode==MODE_OPEN_DIR || MODE_OPEN_ANY)
-			file->set_text("");
 		call_deferred("_update_file_list");
 		call_deferred("_update_dir");
 
@@ -1261,6 +1287,18 @@ EditorFileDialog::EditorFileDialog() {
 	mode=MODE_SAVE_FILE;
 	set_title(TTR("Save a File"));
 
+	ED_SHORTCUT("file_dialog/go_back", TTR("Go Back"), KEY_MASK_ALT|KEY_LEFT);
+	ED_SHORTCUT("file_dialog/go_forward", TTR("Go Forward"), KEY_MASK_ALT|KEY_RIGHT);
+	ED_SHORTCUT("file_dialog/go_up", TTR("Go Up"), KEY_MASK_ALT|KEY_UP);
+	ED_SHORTCUT("file_dialog/refresh", TTR("Refresh"), KEY_F5);
+	ED_SHORTCUT("file_dialog/toggle_hidden_files", TTR("Toggle Hidden Files"), KEY_MASK_CMD|KEY_H);
+	ED_SHORTCUT("file_dialog/toggle_favorite", TTR("Toggle Favorite"), KEY_MASK_ALT|KEY_F);
+	ED_SHORTCUT("file_dialog/toggle_mode", TTR("Toggle Mode"), KEY_MASK_ALT|KEY_V);
+	ED_SHORTCUT("file_dialog/create_folder", TTR("Create Folder"), KEY_MASK_CMD|KEY_N);
+	ED_SHORTCUT("file_dialog/focus_path", TTR("Focus Path"), KEY_MASK_CMD|KEY_D);
+	ED_SHORTCUT("file_dialog/move_favorite_up", TTR("Move Favorite Up"), KEY_MASK_CMD|KEY_UP);
+	ED_SHORTCUT("file_dialog/move_favorite_down", TTR("Move Favorite Down"), KEY_MASK_CMD|KEY_DOWN);
+
 	HBoxContainer *pathhb = memnew( HBoxContainer );
 
 	dir_prev = memnew( ToolButton );
diff --git a/tools/editor/editor_file_system.cpp b/tools/editor/editor_file_system.cpp
index c5c92b5228..cb7cefea26 100644
--- a/tools/editor/editor_file_system.cpp
+++ b/tools/editor/editor_file_system.cpp
@@ -34,6 +34,7 @@
 #include "editor_node.h"
 #include "io/resource_saver.h"
 #include "editor_settings.h"
+#include "editor_resource_preview.h"
 
 EditorFileSystem *EditorFileSystem::singleton=NULL;
 
@@ -621,31 +622,40 @@ void EditorFileSystem::_scan_new_dir(EditorFileSystemDirectory *p_dir,DirAccess
 	int total = dirs.size()+files.size();
 	int idx=0;
 
+
 	for (List<String>::Element *E=dirs.front();E;E=E->next(),idx++) {
 
 		if (da->change_dir(E->get())==OK) {
 
-			EditorFileSystemDirectory *efd = memnew( EditorFileSystemDirectory );
+			String d = da->get_current_dir();
 
-			efd->parent=p_dir;
-			efd->name=E->get();
+			if (d==cd || !d.begins_with(cd)) {
+				da->change_dir(cd); //avoid recursion
+			} else {
 
-			_scan_new_dir(efd,da,p_progress.get_sub(idx,total));
 
-			int idx=0;
-			for(int i=0;i<p_dir->subdirs.size();i++) {
+				EditorFileSystemDirectory *efd = memnew( EditorFileSystemDirectory );
 
-				if (efd->name<p_dir->subdirs[i]->name)
-					break;
-				idx++;
-			}
-			if (idx==p_dir->subdirs.size()) {
-				p_dir->subdirs.push_back(efd);
-			} else {
-				p_dir->subdirs.insert(idx,efd);
-			}
+				efd->parent=p_dir;
+				efd->name=E->get();
+
+				_scan_new_dir(efd,da,p_progress.get_sub(idx,total));
+
+				int idx=0;
+				for(int i=0;i<p_dir->subdirs.size();i++) {
+
+					if (efd->name<p_dir->subdirs[i]->name)
+						break;
+					idx++;
+				}
+				if (idx==p_dir->subdirs.size()) {
+					p_dir->subdirs.push_back(efd);
+				} else {
+					p_dir->subdirs.insert(idx,efd);
+				}
 
-			da->change_dir("..");
+				da->change_dir("..");
+			}
 		} else {
 			ERR_PRINTS(TTR("Cannot go into subdir:")+" "+E->get());
 		}
@@ -821,12 +831,10 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir,const S
 			}
 
 		}
+
 		da->list_dir_end();
 		memdelete(da);
 
-
-
-
 	}
 
 	for(int i=0;i<p_dir->files.size();i++) {
@@ -841,6 +849,7 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir,const S
 			continue;
 
 		}
+
 		if (_check_meta_sources(p_dir->files[i]->meta)) {
 			ItemAction ia;
 			ia.action=ItemAction::ACTION_FILE_SOURCES_CHANGED;
@@ -851,6 +860,8 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir,const S
 		} else {
 			p_dir->files[i]->meta.sources_changed=false;
 		}
+
+		EditorResourcePreview::get_singleton()->check_for_invalidation(p_dir->get_file_path(i));
 	}
 
 	for(int i=0;i<p_dir->subdirs.size();i++) {
@@ -1321,6 +1332,7 @@ void EditorFileSystem::update_file(const String& p_file) {
 	fs->files[cpos]->modified_time=FileAccess::get_modified_time(p_file);
 	fs->files[cpos]->meta=_get_meta(p_file);
 
+	EditorResourcePreview::get_singleton()->call_deferred("check_for_invalidation",p_file);
 	call_deferred("emit_signal","filesystem_changed"); //update later
 
 }
@@ -1334,6 +1346,8 @@ void EditorFileSystem::_bind_methods() {
 
 }
 
+
+
 EditorFileSystem::EditorFileSystem() {
 
 
diff --git a/tools/editor/editor_file_system.h b/tools/editor/editor_file_system.h
index b96e947569..fb768fb358 100644
--- a/tools/editor/editor_file_system.h
+++ b/tools/editor/editor_file_system.h
@@ -236,6 +236,7 @@ public:
 	EditorFileSystemDirectory *get_path(const String& p_path);
 	String get_file_type(const String& p_file) const;
 	EditorFileSystemDirectory* find_file(const String& p_file,int* r_index) const;
+
 	EditorFileSystem();
 	~EditorFileSystem();
 };
diff --git a/tools/editor/editor_help.cpp b/tools/editor/editor_help.cpp
index 0b60db5ee3..1fc157098c 100644
--- a/tools/editor/editor_help.cpp
+++ b/tools/editor/editor_help.cpp
@@ -332,7 +332,7 @@ EditorHelpSearch::EditorHelpSearch() {
 	register_text_enter(search_box);
 	set_hide_on_ok(false);
 	search_options->connect("item_activated",this,"_confirmed");
-	set_title(TTR("Search Classes"));
+	set_title(TTR("Search Help"));
 
 //	search_options->set_hide_root(true);
 
@@ -526,6 +526,7 @@ EditorHelpIndex::EditorHelpIndex() {
 	class_list->connect("item_activated",this,"_tree_item_selected");
 
 	get_ok()->set_text(TTR("Open"));
+	set_title(TTR("Search Classes"));
 }
 
 
diff --git a/tools/editor/editor_import_export.cpp b/tools/editor/editor_import_export.cpp
index f9b9c0b41c..357d139c04 100644
--- a/tools/editor/editor_import_export.cpp
+++ b/tools/editor/editor_import_export.cpp
@@ -861,9 +861,11 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func
 			Ref<ResourceImportMetadata> imd = memnew( ResourceImportMetadata );
 			//imd->set_editor();
 
+
 			for (List<StringName>::Element *F=atlas_images.front();F;F=F->next()) {
 
 				imd->add_source(EditorImportPlugin::validate_source_path(F->get()),FileAccess::get_md5(F->get()));
+
 			}
 
 
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 5a3e3069e4..c0887d7b71 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -168,6 +168,10 @@ void EditorNode::_update_title() {
 
 void EditorNode::_unhandled_input(const InputEvent& p_event) {
 
+	if (Node::get_viewport()->get_modal_stack_top())
+		return; //ignore because of modal window
+
+
 	if (p_event.type==InputEvent::KEY && p_event.key.pressed && !p_event.key.echo && !gui_base->get_viewport()->gui_has_modal_stack()) {
 
 
@@ -182,6 +186,16 @@ void EditorNode::_unhandled_input(const InputEvent& p_event) {
 		if (ED_IS_SHORTCUT("editor/distraction_free_mode", p_event)) {
 			set_distraction_free_mode(!get_distraction_free_mode());
 		}
+		if (ED_IS_SHORTCUT("editor/next_tab", p_event)) {
+			int next_tab = editor_data.get_edited_scene() + 1;
+			next_tab %= editor_data.get_edited_scene_count();
+			_scene_tab_changed(next_tab);
+		}
+		if (ED_IS_SHORTCUT("editor/prev_tab", p_event)) {
+			int next_tab = editor_data.get_edited_scene() - 1;
+			next_tab = next_tab >= 0 ? next_tab : editor_data.get_edited_scene_count() - 1;
+			_scene_tab_changed(next_tab);
+		}
 
 		switch(p_event.key.scancode) {
 
@@ -205,18 +219,7 @@ void EditorNode::_unhandled_input(const InputEvent& p_event) {
 			case KEY_F6: _menu_option_confirm(RUN_PLAY_SCENE,true); break;
 			//case KEY_F7: _menu_option_confirm(RUN_PAUSE,true); break;
 			case KEY_F8: _menu_option_confirm(RUN_STOP,true); break;*/
-			case KEY_TAB:
-				if (p_event.key.mod.command) {
-					int current_tab = editor_data.get_edited_scene();
-					int tab_offset = 1;
-					if (p_event.key.mod.shift)
-						tab_offset = -1;
-					int next_tab = current_tab + tab_offset;
-					next_tab = next_tab >= 0 ? next_tab : editor_data.get_edited_scene_count() - 1;
-					next_tab %= editor_data.get_edited_scene_count();
-					_scene_tab_changed(next_tab);
-				}
-			break;
+
 		}
 
 	}
@@ -505,8 +508,6 @@ void EditorNode::_rebuild_import_menu()
 	for (int i = 0; i < editor_import_export->get_import_plugin_count(); i++) {
 		p->add_item(editor_import_export->get_import_plugin(i)->get_visible_name(), IMPORT_PLUGIN_BASE + i);
 	}
-	//p->add_separator();
-	//p->add_item(TTR("Re-Import.."), SETTINGS_IMPORT);
 }
 
 void EditorNode::_node_renamed() {
@@ -594,7 +595,6 @@ void EditorNode::save_resource(const Ref<Resource>& p_resource) {
 void EditorNode::save_resource_as(const Ref<Resource>& p_resource,const String& p_at_path) {
 
 	file->set_mode(EditorFileDialog::MODE_SAVE_FILE);
-	bool relpaths =  (p_resource->has_meta("__editor_relpaths__") && p_resource->get_meta("__editor_relpaths__").operator bool());
 
 	current_option=RESOURCE_SAVE_AS;
 	List<String> extensions;
@@ -1162,7 +1162,11 @@ void EditorNode::_dialog_action(String p_file) {
 
 			load_scene(p_file);
 		} break;
+		case SETTINGS_PICK_MAIN_SCENE: {
 
+			Globals::get_singleton()->set("application/main_scene",p_file);
+			//would be nice to show the project manager opened with the hilighted field..
+		} break;
 		case FILE_SAVE_OPTIMIZED: {
 
 
@@ -1544,9 +1548,10 @@ void EditorNode::_property_editor_back() {
 
 void EditorNode::_imported(Node *p_node) {
 
-	Node *scene = editor_data.get_edited_scene_root();
-//	add_edited_scene(p_node);
 /*
+	Node *scene = editor_data.get_edited_scene_root();
+	add_edited_scene(p_node);
+
 	if (scene) {
 		String path = scene->get_filename();
 		p_node->set_filename(path);
@@ -1606,6 +1611,7 @@ void EditorNode::_edit_current() {
 	object_menu->set_disabled(true);
 
 	bool is_resource = current_obj->is_type("Resource");
+	bool is_node = current_obj->is_type("Node");
 	resource_save_button->set_disabled(!is_resource);
 
 	if (is_resource) {
@@ -1622,7 +1628,7 @@ void EditorNode::_edit_current() {
 
 
 		//top_pallete->set_current_tab(1);
-	} else if (current_obj->is_type("Node")) {
+	} else if (is_node) {
 
 		Node * current_node = current_obj->cast_to<Node>();
 		ERR_FAIL_COND(!current_node);
@@ -1718,10 +1724,14 @@ void EditorNode::_edit_current() {
 		p->add_shortcut(ED_SHORTCUT("property_editor/copy_resource",TTR("Copy Resource")),RESOURCE_COPY);
 		p->add_shortcut(ED_SHORTCUT("property_editor/unref_resource",TTR("Make Built-In")),RESOURCE_UNREF);
 	}
-	p->add_separator();
-	p->add_shortcut(ED_SHORTCUT("property_editor/make_subresources_unique",TTR("Make Sub-Resources Unique")),OBJECT_UNIQUE_RESOURCES);
-	p->add_separator();
-	p->add_icon_shortcut(gui_base->get_icon("Help","EditorIcons"),ED_SHORTCUT("property_editor/open_help",TTR("Open in Help")),OBJECT_REQUEST_HELP);
+
+	if (is_resource || is_node) {
+		p->add_separator();
+		p->add_shortcut(ED_SHORTCUT("property_editor/make_subresources_unique",TTR("Make Sub-Resources Unique")),OBJECT_UNIQUE_RESOURCES);
+		p->add_separator();
+		p->add_icon_shortcut(gui_base->get_icon("Help","EditorIcons"),ED_SHORTCUT("property_editor/open_help",TTR("Open in Help")),OBJECT_REQUEST_HELP);
+	}
+
 	List<MethodInfo> methods;
 	current_obj->get_method_list(&methods);
 
@@ -1851,10 +1861,29 @@ void EditorNode::_run(bool p_current,const String& p_custom) {
 
 			current_option=-1;
 			//accept->get_cancel()->hide();
-			accept->get_ok()->set_text(TTR("I see.."));
-			accept->set_text(TTR("No main scene has ever been defined.\nSelect one from \"Project Settings\" under the 'application' category."));
-			accept->popup_centered_minsize();
+			pick_main_scene->set_text(TTR("No main scene has ever been defined, select one?\nYou can change it later in later in \"Project Settings\" under the 'application' category."));
+			pick_main_scene->popup_centered_minsize();
+			return;
+		}
+
+		if (!FileAccess::exists(run_filename)) {
+
+			current_option=-1;
+			//accept->get_cancel()->hide();
+			pick_main_scene->set_text(vformat(TTR("Selected scene '%s' does not exist, select a valid one?\nYou can change it later in \"Project Settings\" under the 'application' category."), run_filename));
+			pick_main_scene->popup_centered_minsize();
 			return;
+
+		}
+
+		if (ResourceLoader::get_resource_type(run_filename)!="PackedScene") {
+
+			current_option=-1;
+			//accept->get_cancel()->hide();
+			pick_main_scene->set_text(vformat(TTR("Selected scene '%s' is not a scene file, select a valid one?\nYou can change it later in \"Project Settings\" under the 'application' category."), run_filename));
+			pick_main_scene->popup_centered_minsize();
+			return;
+
 		}
 
 	}
@@ -2103,7 +2132,6 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 			}
 
 			file->set_mode(EditorFileDialog::MODE_SAVE_FILE);
-			bool relpaths = (scene->has_meta("__editor_relpaths__") && scene->get_meta("__editor_relpaths__").operator bool());
 
 
 			List<String> extensions;
@@ -2184,8 +2212,6 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 
 			}
 
-			bool relpaths = (scene->has_meta("__editor_relpaths__") && scene->get_meta("__editor_relpaths__").operator bool());
-
 			file->set_mode(EditorFileDialog::MODE_SAVE_FILE);
 
 			file->set_current_path(cpath);
@@ -2194,8 +2220,8 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 
 		} break;
 		case FILE_SAVE_OPTIMIZED: {
-			Node *scene = editor_data.get_edited_scene_root();
 #if 0
+			Node *scene = editor_data.get_edited_scene_root();
 			if (!scene) {
 
 				current_option=-1;
@@ -2468,7 +2494,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 #endif
 		case RESOURCE_NEW: {
 
-			create_dialog->popup_centered_ratio();
+			create_dialog->popup(true);
 		} break;
 		case RESOURCE_LOAD: {
 
@@ -2756,10 +2782,6 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 
 			settings_config_dialog->popup_edit_settings();
 		} break;
-		case SETTINGS_IMPORT: {
-
-			import_settings->popup_import_settings();
-		} break;
 		case SETTINGS_OPTIMIZED_PRESETS: {
 
 			//optimized_presets->popup_centered_ratio();
@@ -2770,6 +2792,30 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 			file_templates->popup_centered_ratio();
 
 		} break;
+		case SETTINGS_PICK_MAIN_SCENE: {
+
+
+			//print_tree();
+			file->set_mode(EditorFileDialog::MODE_OPEN_FILE);
+			//not for now?
+			List<String> extensions;
+			ResourceLoader::get_recognized_extensions_for_type("PackedScene",&extensions);
+			file->clear_filters();
+			for(int i=0;i<extensions.size();i++) {
+
+				file->add_filter("*."+extensions[i]+" ; "+extensions[i].to_upper());
+			}
+
+
+			//file->set_current_path(current_path);
+			Node *scene = editor_data.get_edited_scene_root();
+			if (scene) {
+				file->set_current_path(scene->get_filename());
+			};
+			file->set_title(TTR("Pick a Main Scene"));
+			file->popup_centered_ratio();
+
+		} break;
 		case SETTINGS_ABOUT: {
 
 			about->popup_centered(Size2(500,130)*EDSCALE);
@@ -2783,10 +2829,12 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 
 			List<Ref<Resource> > cached;
 			ResourceCache::get_cached_resources(&cached);
-
+			//this should probably be done in a thread..
 			for(List<Ref<Resource> >::Element *E=cached.front();E;E=E->next()) {
 
-				if (!E->get()->can_reload_from_file())
+				if (!E->get()->editor_can_reload_from_file())
+					continue;
+				if (!E->get()->get_path().is_resource_file() && !E->get()->get_path().is_abs_path())
 					continue;
 				if (!FileAccess::exists(E->get()->get_path()))
 					continue;
@@ -2794,6 +2842,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 				if (mt!=E->get()->get_last_modified_time()) {
 					E->get()->reload_from_file();
 				}
+
 			}
 
 
@@ -2952,6 +3001,9 @@ void EditorNode::remove_editor_plugin(EditorPlugin *p_editor) {
 		//singleton->main_editor_tabs->add_tab(p_editor->get_name());
 		singleton->editor_table.erase(p_editor);
 	}
+	p_editor->make_visible(false);
+	p_editor->clear();
+	singleton->editor_plugins_over->get_plugins_list().erase(p_editor);
 	singleton->remove_child(p_editor);
 	singleton->editor_data.remove_editor_plugin( p_editor );
 
@@ -3004,7 +3056,7 @@ void EditorNode::set_addon_plugin_enabled(const String& p_addon,bool p_enabled)
 	if (!p_enabled) {
 
 		EditorPlugin *addon = plugin_addons[p_addon];
-		editor_data.remove_editor_plugin( addon );
+		remove_editor_plugin(addon);
 		memdelete(addon); //bye
 		plugin_addons.erase(p_addon);
 		_update_addon_config();
@@ -3077,6 +3129,11 @@ void EditorNode::_remove_edited_scene() {
 		new_index=1;
 	}
 
+
+
+	if (editor_data.get_scene_path(old_index)!=String()) {
+		ScriptEditor::get_singleton()->close_builtin_scripts_from_scene(editor_data.get_scene_path(old_index));
+	}
 	_scene_tab_changed(new_index);
 	editor_data.remove_scene(old_index);
 	editor_data.get_undo_redo().clear_history();
@@ -3374,7 +3431,10 @@ Dictionary EditorNode::_get_main_scene_state() {
 	return state;
 }
 
-void EditorNode::_set_main_scene_state(Dictionary p_state) {
+void EditorNode::_set_main_scene_state(Dictionary p_state,Node* p_for_scene) {
+
+	if (get_edited_scene()!=p_for_scene && p_for_scene!=NULL)
+		return; //not for this scene
 
 	//print_line("set current 7 ");
 	changing_scene=false;
@@ -3518,7 +3578,7 @@ void EditorNode::set_current_scene(int p_idx) {
 	}*/
 	//_set_main_scene_state(state);
 
-	call_deferred("_set_main_scene_state",state); //do after everything else is done setting up
+	call_deferred("_set_main_scene_state",state,get_edited_scene()); //do after everything else is done setting up
 	//print_line("set current 6 ");
 
 
@@ -3538,7 +3598,7 @@ void EditorNode::fix_dependencies(const String& p_for_file) {
 	dependency_fixer->edit(p_for_file);
 }
 
-Error EditorNode::load_scene(const String& p_scene, bool p_ignore_broken_deps,bool p_set_inherited) {
+Error EditorNode::load_scene(const String& p_scene, bool p_ignore_broken_deps,bool p_set_inherited,bool p_clear_errors) {
 
 	if (!is_inside_tree()) {
 		defer_load_scene = p_scene;
@@ -3557,7 +3617,9 @@ Error EditorNode::load_scene(const String& p_scene, bool p_ignore_broken_deps,bo
 	}
 
 
-	load_errors->clear();
+	if (p_clear_errors)
+		load_errors->clear();
+
 	String lpath = Globals::get_singleton()->localize_path(p_scene);
 
 	if (!lpath.begins_with("res://")) {
@@ -3994,15 +4056,17 @@ bool EditorNode::_find_editing_changed_scene(Node *p_from) {
 
 
 void EditorNode::add_io_error(const String& p_error) {
-	CharString err_ut = p_error.utf8();
-	ERR_PRINT(err_ut.get_data());
+	//CharString err_ut = p_error.utf8();
+	//ERR_PRINT(!err_ut.get_data());
 	_load_error_notify(singleton,p_error);
 }
 
 void EditorNode::_load_error_notify(void* p_ud,const String& p_text) {
 
+
 	EditorNode*en=(EditorNode*)p_ud;
-	en->load_errors->set_text(en->load_errors->get_text()+p_text+"\n");
+	en->load_errors->add_image(en->gui_base->get_icon("Error","EditorIcons"));
+	en->load_errors->add_text(p_text+"\n");
 	en->load_error_dialog->popup_centered_ratio(0.5);
 
 }
@@ -5056,6 +5120,78 @@ void EditorNode::_file_access_close_error_notify(const String& p_str) {
 	add_io_error("Unable to write to file '"+p_str+"', file in use, locked or lacking permissions.");
 }
 
+
+void EditorNode::reload_scene(const String& p_path) {
+
+
+	//first of all, reload textures as they might have changed on disk
+
+	List<Ref<Resource> > cached;
+	ResourceCache::get_cached_resources(&cached);
+	List<Ref<Resource> > to_clear; //clear internal resources from previous scene from being used
+	for(List<Ref<Resource> >::Element *E=cached.front();E;E=E->next()) {
+
+		if (E->get()->get_path().begins_with(p_path+"::")) //subresources of existing scene
+			to_clear.push_back(E->get());
+
+		if (!E->get()->cast_to<Texture>())
+			continue;
+		if (!E->get()->get_path().is_resource_file() && !E->get()->get_path().is_abs_path())
+			continue;
+		if (!FileAccess::exists(E->get()->get_path()))
+			continue;
+		uint64_t mt = FileAccess::get_modified_time(E->get()->get_path());
+		if (mt!=E->get()->get_last_modified_time()) {
+			E->get()->reload_from_file();
+		}
+	}
+
+	//so reload reloads everything, clear subresources of previous scene
+	while(to_clear.front()) {
+		to_clear.front()->get()->set_path("");
+		to_clear.pop_front();
+	}
+
+	int scene_idx=-1;
+	for(int i=0;i<editor_data.get_edited_scene_count();i++) {
+
+		if (editor_data.get_scene_path(i)==p_path) {
+			scene_idx=i;
+			break;
+		}
+	}
+
+	int current_tab = editor_data.get_edited_scene();
+
+
+	if (scene_idx==-1) {
+		if (get_edited_scene()) {
+			//scene is not open, so at it might be instanced, just refresh, set tab to itself and it will reload
+			set_current_scene(current_tab);
+			editor_data.get_undo_redo().clear_history();
+		}
+		return;
+	}
+
+
+	if (current_tab==scene_idx) {
+		editor_data.apply_changes_in_editors();
+		_set_scene_metadata(p_path);
+
+	}
+	//remove scene
+	_remove_scene(scene_idx);
+	//reload scene
+	load_scene(p_path);
+	//adjust index so tab is back a the previous position
+	editor_data.move_edited_scene_to_index(scene_idx);
+	get_undo_redo()->clear_history();
+	//recover the tab
+	scene_tabs->set_current_tab(current_tab);
+	_scene_tab_changed(current_tab);
+}
+
+
 void EditorNode::_bind_methods() {
 
 
@@ -5499,7 +5635,10 @@ EditorNode::EditorNode() {
 	ED_SHORTCUT("editor/fullscreen_mode",TTR("Fullscreen Mode"),KEY_MASK_SHIFT|KEY_F11);
 	ED_SHORTCUT("editor/distraction_free_mode",TTR("Distraction Free Mode"),KEY_MASK_CMD|KEY_MASK_SHIFT|KEY_F11);
 
-	Separator *vs=NULL;
+
+	ED_SHORTCUT("editor/next_tab", TTR("Next tab"), KEY_MASK_CMD+KEY_TAB);
+	ED_SHORTCUT("editor/prev_tab", TTR("Previous tab"), KEY_MASK_CMD+KEY_MASK_SHIFT+KEY_TAB);
+
 
 	file_menu->set_tooltip(TTR("Operations with scene files."));
 	p=file_menu->get_popup();
@@ -6149,8 +6288,6 @@ EditorNode::EditorNode() {
 	open_recent_confirmation->connect("confirmed",this,"_open_recent_scene_confirm");
 
 
-	import_settings= memnew(ImportSettingsDialog(this));
-	gui_base->add_child(import_settings);
 	run_settings_dialog = memnew( RunSettingsDialog );
 	gui_base->add_child( run_settings_dialog );
 
@@ -6414,13 +6551,14 @@ EditorNode::EditorNode() {
 	set_process_unhandled_input(true);
 	_playing_edited=false;
 
-	load_errors = memnew( TextEdit );
-	load_errors->set_readonly(true);
+//	Panel *errors = memnew( Panel );
+	load_errors = memnew( RichTextLabel );
+//	load_errors->set_readonly(true);
 	load_error_dialog = memnew( AcceptDialog );
 	load_error_dialog->add_child(load_errors);
 	load_error_dialog->set_title(TTR("Load Errors"));
 	load_error_dialog->set_child_rect(load_errors);
-	add_child(load_error_dialog);
+	gui_base->add_child(load_error_dialog);
 
 	//EditorImport::add_importer( Ref<EditorImporterCollada>( memnew(EditorImporterCollada )));
 
@@ -6445,7 +6583,10 @@ EditorNode::EditorNode() {
 	Node::set_human_readable_collision_renaming(true);
 
 
-
+	pick_main_scene = memnew( ConfirmationDialog );
+	gui_base->add_child(pick_main_scene);
+	pick_main_scene->get_ok()->set_text("Select");
+	pick_main_scene->connect("confirmed",this,"_menu_option",varray(SETTINGS_PICK_MAIN_SCENE));
 
 //	Ref<ImageTexture> it = gui_base->get_icon("logo","Icons");
 //	OS::get_singleton()->set_icon( it->get_data() );
diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h
index bea973a357..c4414d5c36 100644
--- a/tools/editor/editor_node.h
+++ b/tools/editor/editor_node.h
@@ -74,7 +74,6 @@
 #include "tools/editor/editor_sub_scene.h"
 #include "editor_import_export.h"
 #include "editor_reimport_dialog.h"
-#include "import_settings.h"
 #include "tools/editor/editor_plugin.h"
 #include "tools/editor/editor_name_dialog.h"
 
@@ -177,7 +176,6 @@ private:
 		RUN_RELOAD_SCRIPTS,
 		SETTINGS_UPDATE_ALWAYS,
 		SETTINGS_UPDATE_CHANGES,
-		SETTINGS_IMPORT,
 		SETTINGS_EXPORT_PREFERENCES,
 		SETTINGS_PREFERENCES,
 		SETTINGS_OPTIMIZED_PRESETS,
@@ -185,6 +183,7 @@ private:
 		SETTINGS_LAYOUT_DELETE,
 		SETTINGS_LAYOUT_DEFAULT,
 		SETTINGS_LOAD_EXPORT_TEMPLATES,
+		SETTINGS_PICK_MAIN_SCENE,
 		SETTINGS_HELP,
 		SETTINGS_ABOUT,
 		SOURCES_REIMPORT,
@@ -261,7 +260,7 @@ private:
 	TextureProgress *audio_vu;
 	//MenuButton *fileserver_menu;
 
-	TextEdit *load_errors;
+	RichTextLabel *load_errors;
 	AcceptDialog *load_error_dialog;
 
 	//Control *scene_root_base;
@@ -287,6 +286,7 @@ private:
 	ConfirmationDialog *confirmation;
 	ConfirmationDialog *import_confirmation;
 	ConfirmationDialog *open_recent_confirmation;
+	ConfirmationDialog *pick_main_scene;
 	AcceptDialog *accept;
 	AcceptDialog *about;
 	AcceptDialog *warning;
@@ -336,7 +336,6 @@ private:
 	Vector<EditorPlugin*> editor_table;
 
 	EditorReImportDialog *reimport_dialog;
-	ImportSettingsDialog *import_settings;
 
 	ProgressDialog *progress_dialog;
 	BackgroundProgress *progress_hb;
@@ -553,7 +552,7 @@ private:
 	void _scene_tab_script_edited(int p_tab);
 
 	Dictionary _get_main_scene_state();
-	void _set_main_scene_state(Dictionary p_state);
+	void _set_main_scene_state(Dictionary p_state,Node* p_for_scene);
 
 	int _get_current_main_editor();
 
@@ -652,7 +651,7 @@ public:
 
 	void fix_dependencies(const String& p_for_file);
 	void clear_scene() { _cleanup_scene(); }
-	Error load_scene(const String& p_scene, bool p_ignore_broken_deps=false, bool p_set_inherited=false);
+	Error load_scene(const String& p_scene, bool p_ignore_broken_deps=false, bool p_set_inherited=false, bool p_clear_errors=true);
 	Error load_resource(const String& p_scene);
 
 	bool is_scene_open(const String& p_path);
@@ -714,6 +713,8 @@ public:
 
 	void update_keying();
 
+	void reload_scene(const String& p_path);
+
 	bool is_exiting() const { return exiting; }
 
 	ToolButton *get_pause_button() { return pause_button; }
@@ -758,7 +759,7 @@ public:
 		plugins_list = p_plugins_list;
 	}
 
-	Vector<EditorPlugin*> get_plugins_list() {
+	Vector<EditorPlugin*>& get_plugins_list() {
 		return plugins_list;
 	}
 
diff --git a/tools/editor/editor_path.cpp b/tools/editor/editor_path.cpp
index 4cf98e832c..6b804b6a24 100644
--- a/tools/editor/editor_path.cpp
+++ b/tools/editor/editor_path.cpp
@@ -38,7 +38,6 @@ void EditorPath::_notification(int p_what) {
 
 			RID ci=get_canvas_item();
 			Ref<Font> label_font = get_font("font","Label");
-			Color label_color = get_color("font_color","Label");
 			Size2i size = get_size();
 			Ref<Texture> sn = get_icon("SmallNext","EditorIcons");
 
diff --git a/tools/editor/editor_plugin.cpp b/tools/editor/editor_plugin.cpp
index 138e532ce8..01e6b613c0 100644
--- a/tools/editor/editor_plugin.cpp
+++ b/tools/editor/editor_plugin.cpp
@@ -27,6 +27,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "editor_plugin.h"
+#include "scene/3d/camera.h"
 #include "plugins/canvas_item_editor_plugin.h"
 #include "plugins/spatial_editor_plugin.h"
 #include "tools/editor/editor_node.h"
diff --git a/tools/editor/editor_resource_preview.cpp b/tools/editor/editor_resource_preview.cpp
index 8975c0ec35..a02fe2a531 100644
--- a/tools/editor/editor_resource_preview.cpp
+++ b/tools/editor/editor_resource_preview.cpp
@@ -33,6 +33,7 @@
 #include "io/resource_saver.h"
 #include "globals.h"
 #include "editor_scale.h"
+#include "message_queue.h"
 
 Ref<Texture> EditorResourcePreviewGenerator::generate_from_path(const String& p_path) {
 
@@ -66,25 +67,27 @@ void EditorResourcePreview::_preview_ready(const String& p_str,const Ref<Texture
 
 	String path = p_str;
 	uint32_t hash=0;
+	uint64_t modified_time=0;
 
 	if (p_str.begins_with("ID:")) {
 		hash=p_str.get_slicec(':',2).to_int();
 		path="ID:"+p_str.get_slicec(':',1);
+	} else {
+		modified_time = FileAccess::get_modified_time(path);
 	}
 
 	Item item;
 	item.order=order++;
 	item.preview=p_texture;
 	item.last_hash=hash;
+	item.modified_time=modified_time;
 
 	cache[path]=item;
 
-	Object *recv = ObjectDB::get_instance(id);
-	if (recv) {
-		recv->call_deferred(p_func,path,p_texture,p_ud);
-	}
-
 	preview_mutex->unlock();
+
+	MessageQueue::get_singleton()->push_call(id,p_func,path,p_texture,p_ud);
+
 }
 
 Ref<Texture> EditorResourcePreview::_generate_preview(const QueueItem& p_item,const String& cache_base) {
@@ -103,6 +106,7 @@ Ref<Texture> EditorResourcePreview::_generate_preview(const QueueItem& p_item,co
 	Ref<Texture> generated;
 
 	for(int i=0;i<preview_generators.size();i++) {
+
 		if (!preview_generators[i]->handles(type))
 			continue;
 		if (p_item.resource.is_valid()) {
@@ -153,99 +157,107 @@ void EditorResourcePreview::_thread() {
 
 			QueueItem item = queue.front()->get();
 			queue.pop_front();
-			preview_mutex->unlock();
-
-			Ref<Texture> texture;
-
-			//print_line("pop from queue "+item.path);
-
-			int thumbnail_size = EditorSettings::get_singleton()->get("file_dialog/thumbnail_size");
-			thumbnail_size*=EDSCALE;
 
 			if (cache.has(item.path)) {
 				//already has it because someone loaded it, just let it know it's ready
 				if (item.resource.is_valid()) {
 					item.path+=":"+itos(cache[item.path].last_hash); //keep last hash (see description of what this is in condition below)
 				}
-				call_deferred("_preview_ready",item.path,cache[item.path].preview,item.id,item.function,item.userdata);
-
-			} else if (item.resource.is_valid()){
 
-				texture=_generate_preview(item,String());
-				//adding hash to the end of path (should be ID:<objid>:<hash>) because of 5 argument limit to call_deferred
-				call_deferred("_preview_ready",item.path+":"+itos(item.resource->hash_edited_version()),texture,item.id,item.function,item.userdata);
+				_preview_ready(item.path,cache[item.path].preview,item.id,item.function,item.userdata);
 
+				preview_mutex->unlock();
 			} else {
+				preview_mutex->unlock();
 
 
-				String temp_path=EditorSettings::get_singleton()->get_settings_path().plus_file("tmp");
-				String cache_base = Globals::get_singleton()->globalize_path(item.path).md5_text();
-				cache_base = temp_path.plus_file("resthumb-"+cache_base);
+				Ref<Texture> texture;
 
-				//does not have it, try to load a cached thumbnail
+				//print_line("pop from queue "+item.path);
 
-				String file = cache_base+".txt";
-				//print_line("cachetxt at "+file);
-				FileAccess *f=FileAccess::open(file,FileAccess::READ);
-				if (!f) {
+				int thumbnail_size = EditorSettings::get_singleton()->get("file_dialog/thumbnail_size");
+				thumbnail_size*=EDSCALE;
 
-					//print_line("generate because not cached");
 
-					//generate
-					texture=_generate_preview(item,cache_base);
+				if (item.resource.is_valid()){
+
+					texture=_generate_preview(item,String());
+					//adding hash to the end of path (should be ID:<objid>:<hash>) because of 5 argument limit to call_deferred
+					_preview_ready(item.path+":"+itos(item.resource->hash_edited_version()),texture,item.id,item.function,item.userdata);
+
 				} else {
 
-					uint64_t modtime = FileAccess::get_modified_time(item.path);
-					int tsize = f->get_line().to_int64();
-					uint64_t last_modtime = f->get_line().to_int64();
 
-					bool cache_valid = true;
+					String temp_path=EditorSettings::get_singleton()->get_settings_path().plus_file("tmp");
+					String cache_base = Globals::get_singleton()->globalize_path(item.path).md5_text();
+					cache_base = temp_path.plus_file("resthumb-"+cache_base);
 
-					if (tsize!=thumbnail_size) {
-						cache_valid=false;
-						memdelete(f);
-					} else if (last_modtime!=modtime) {
+					//does not have it, try to load a cached thumbnail
 
-						String last_md5 = f->get_line();
-						String md5 = FileAccess::get_md5(item.path);
-						memdelete(f);
+					String file = cache_base+".txt";
+					//print_line("cachetxt at "+file);
+					FileAccess *f=FileAccess::open(file,FileAccess::READ);
+					if (!f) {
 
-						if (last_md5!=md5) {
+						//print_line("generate because not cached");
 
+						//generate
+						texture=_generate_preview(item,cache_base);
+					} else {
+
+						uint64_t modtime = FileAccess::get_modified_time(item.path);
+						int tsize = f->get_line().to_int64();
+						uint64_t last_modtime = f->get_line().to_int64();
+
+						bool cache_valid = true;
+
+						if (tsize!=thumbnail_size) {
 							cache_valid=false;
-						} else {
-							//update modified time
+							memdelete(f);
+						} else if (last_modtime!=modtime) {
+
+							String last_md5 = f->get_line();
+							String md5 = FileAccess::get_md5(item.path);
+							memdelete(f);
+
+							if (last_md5!=md5) {
 
-							f=FileAccess::open(file,FileAccess::WRITE);
-							f->store_line(itos(modtime));
-							f->store_line(md5);
+								cache_valid=false;
+							} else {
+								//update modified time
+
+								f=FileAccess::open(file,FileAccess::WRITE);
+								f->store_line(itos(modtime));
+								f->store_line(md5);
+								memdelete(f);
+							}
+						} else {
 							memdelete(f);
 						}
-					} else {
-						memdelete(f);
-					}
 
-					if (cache_valid) {
+						if (cache_valid) {
 
-						texture = ResourceLoader::load(cache_base+".png","ImageTexture",true);
-						if (!texture.is_valid()) {
-							//well fuck
-							cache_valid=false;
+							texture = ResourceLoader::load(cache_base+".png","ImageTexture",true);
+							if (!texture.is_valid()) {
+								//well fuck
+								cache_valid=false;
+							}
 						}
-					}
 
-					if (!cache_valid) {
+						if (!cache_valid) {
 
-						texture=_generate_preview(item,cache_base);
-					}
+							texture=_generate_preview(item,cache_base);
+						}
 
-				}
+					}
 
-				//print_line("notify of preview ready");
-				call_deferred("_preview_ready",item.path,texture,item.id,item.function,item.userdata);
+					//print_line("notify of preview ready");
+					_preview_ready(item.path,texture,item.id,item.function,item.userdata);
 
+				}
 			}
 
+
 		} else {
 			preview_mutex->unlock();
 		}
@@ -263,6 +275,8 @@ void EditorResourcePreview::queue_edited_resource_preview(const Ref<Resource>& p
 	preview_mutex->lock();
 
 	String path_id = "ID:"+itos(p_res->get_instance_ID());
+
+
 	if (cache.has(path_id) && cache[path_id].last_hash==p_res->hash_edited_version()) {
 
 		cache[path_id].order=order++;
@@ -272,6 +286,8 @@ void EditorResourcePreview::queue_edited_resource_preview(const Ref<Resource>& p
 
 	}
 
+	cache.erase(path_id); //erase if exists, since it will be regen
+
 	//print_line("send to thread "+p_path);
 	QueueItem item;
 	item.function=p_receiver_func;
@@ -322,6 +338,34 @@ EditorResourcePreview* EditorResourcePreview::get_singleton() {
 void EditorResourcePreview::_bind_methods() {
 
 	ObjectTypeDB::bind_method("_preview_ready",&EditorResourcePreview::_preview_ready);
+	ObjectTypeDB::bind_method(_MD("check_for_invalidation","path"),&EditorResourcePreview::check_for_invalidation);
+
+
+	ADD_SIGNAL(MethodInfo("preview_invalidated",PropertyInfo(Variant::STRING,"path")));
+}
+
+void EditorResourcePreview::check_for_invalidation(const String& p_path) {
+
+	preview_mutex->lock();
+
+	bool call_invalidated=false;
+	if (cache.has(p_path)) {
+
+		uint64_t modified_time = FileAccess::get_modified_time(p_path);
+		if (modified_time!=cache[p_path].modified_time) {
+			cache.erase(p_path);
+			call_invalidated=true;
+		}
+	}
+
+	preview_mutex->unlock();
+
+	if (call_invalidated) {//do outside mutex
+		call_deferred("emit_signal","preview_invalidated",p_path);
+	}
+
+
+
 }
 
 EditorResourcePreview::EditorResourcePreview() {
diff --git a/tools/editor/editor_resource_preview.h b/tools/editor/editor_resource_preview.h
index 63dc5c3dd3..51a00965eb 100644
--- a/tools/editor/editor_resource_preview.h
+++ b/tools/editor/editor_resource_preview.h
@@ -93,6 +93,7 @@ class EditorResourcePreview : public Node {
 		Ref<Texture> preview;
 		int order;
 		uint32_t last_hash;
+		uint64_t modified_time;
 	};
 
 	int order;
@@ -106,6 +107,8 @@ class EditorResourcePreview : public Node {
 	void _thread();
 
 	Vector<Ref<EditorResourcePreviewGenerator> > preview_generators;
+
+
 protected:
 
 	static void _bind_methods();
@@ -118,6 +121,7 @@ public:
 	void queue_edited_resource_preview(const Ref<Resource>& p_path, Object* p_receiver, const StringName& p_receiver_func, const Variant& p_userdata);
 
 	void add_preview_generator(const Ref<EditorResourcePreviewGenerator>& p_generator);
+	void check_for_invalidation(const String& p_path);
 
 	EditorResourcePreview();
 	~EditorResourcePreview();
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp
index 49a1158ec6..2ce9502293 100644
--- a/tools/editor/editor_settings.cpp
+++ b/tools/editor/editor_settings.cpp
@@ -104,12 +104,18 @@ bool EditorSettings::_get(const StringName& p_name,Variant &r_ret) const {
 		for (const Map<String,Ref<ShortCut> >::Element *E=shortcuts.front();E;E=E->next()) {
 
 			Ref<ShortCut> sc=E->get();
-			if (!sc->has_meta("original"))
-				continue; //this came from settings but is not any longer used
 
-			InputEvent original = sc->get_meta("original");
-			if (sc->is_shortcut(original) || (original.type==InputEvent::NONE && sc->get_shortcut().type==InputEvent::NONE))
-				continue; //not changed from default, don't save
+			if (optimize_save) {
+				if (!sc->has_meta("original")) {
+					continue; //this came from settings but is not any longer used
+				}
+
+				InputEvent original = sc->get_meta("original");
+				if (sc->is_shortcut(original) || (original.type==InputEvent::NONE && sc->get_shortcut().type==InputEvent::NONE))
+					continue; //not changed from default, don't save
+			}
+
+			print_line("SAVING: "+E->key());
 			arr.push_back(E->key());
 			arr.push_back(sc->get_shortcut());
 		}
@@ -161,7 +167,7 @@ void EditorSettings::_get_property_list(List<PropertyInfo> *p_list) const {
 	for(Set<_EVCSort>::Element *E=vclist.front();E;E=E->next()) {
 
 		int pinfo = 0;
-		if (E->get().save) {
+		if (E->get().save || !optimize_save) {
 			pinfo|=PROPERTY_USAGE_STORAGE;
 		}
 
@@ -423,7 +429,7 @@ void EditorSettings::setup_network() {
 		if (ip=="127.0.0.1")
 			continue;
 
-		if (lip!="")
+		if (lip=="")
 			lip=ip;
 		if (ip==current)
 			lip=current; //so it saves
@@ -674,6 +680,9 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 
 void EditorSettings::_load_default_text_editor_theme() {
 	set("text_editor/background_color",Color::html("3b000000"));
+	set("text_editor/completion_background_color", Color::html("2C2A32"));
+	set("text_editor/completion_selected_color", Color::html("434244"));
+	set("text_editor/completion_existing_color", Color::html("21dfdfdf"));
 	set("text_editor/caret_color",Color::html("aaaaaa"));
 	set("text_editor/line_number_color",Color::html("66aaaaaa"));
 	set("text_editor/text_color",Color::html("aaaaaa"));
@@ -906,6 +915,9 @@ bool EditorSettings::_save_text_editor_theme(String p_file) {
 	String theme_section = "color_theme";
 	Ref<ConfigFile> cf = memnew( ConfigFile );	// hex is better?
 	cf->set_value(theme_section, "background_color", ((Color)get("text_editor/background_color")).to_html());
+	cf->set_value(theme_section, "completion_background_color", ((Color)get("text_editor/completion_background_color")).to_html());
+	cf->set_value(theme_section, "completion_selected_color", ((Color)get("text_editor/completion_selected_color")).to_html());
+	cf->set_value(theme_section, "completion_existing_color", ((Color)get("text_editor/completion_existing_color")).to_html());
 	cf->set_value(theme_section, "caret_color", ((Color)get("text_editor/caret_color")).to_html());
 	cf->set_value(theme_section, "line_number_color", ((Color)get("text_editor/line_number_color")).to_html());
 	cf->set_value(theme_section, "text_color", ((Color)get("text_editor/text_color")).to_html());
@@ -970,6 +982,10 @@ void EditorSettings::get_shortcut_list(List<String> *r_shortcuts) {
 	}
 }
 
+void EditorSettings::set_optimize_save(bool p_optimize) {
+
+	optimize_save=p_optimize;
+}
 
 void EditorSettings::_bind_methods() {
 
@@ -992,6 +1008,7 @@ EditorSettings::EditorSettings() {
 
 	//singleton=this;
 	last_order=0;
+	optimize_save=true;
 	save_changed_setting=true;
 
 	EditorTranslationList *etl=_editor_translations;
diff --git a/tools/editor/editor_settings.h b/tools/editor/editor_settings.h
index d975a7ef86..937956a366 100644
--- a/tools/editor/editor_settings.h
+++ b/tools/editor/editor_settings.h
@@ -88,6 +88,7 @@ private:
 
 	bool save_changed_setting;
 
+	bool optimize_save; //do not save stuff that came from config but was not set from engine
 
 	void _load_defaults(Ref<ConfigFile> p_extra_config = NULL);
 	void _load_default_text_editor_theme();
@@ -155,6 +156,8 @@ public:
 	Ref<ShortCut> get_shortcut(const String&p_name) const;
 	void get_shortcut_list(List<String> *r_shortcuts);
 
+	void set_optimize_save(bool p_optimize);
+
 	EditorSettings();
 	~EditorSettings();
 
diff --git a/tools/editor/groups_editor.cpp b/tools/editor/groups_editor.cpp
index 898e1e115e..5b7bc1da78 100644
--- a/tools/editor/groups_editor.cpp
+++ b/tools/editor/groups_editor.cpp
@@ -31,7 +31,7 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/label.h"
 #include "editor_node.h"
-
+#include "scene/resources/packed_scene.h"
 void GroupsEditor::_add_group(const String& p_group) {
 
 	if (!node)
@@ -107,9 +107,35 @@ void GroupsEditor::update_tree() {
 		if (!gi.persistent)
 			continue;
 
+		Node *n = node;
+		bool can_be_deleted=true;
+
+		while(n) {
+
+			Ref<SceneState> ss = (n==EditorNode::get_singleton()->get_edited_scene()) ? n->get_scene_inherited_state() : n->get_scene_instance_state();
+
+			if (ss.is_valid()) {
+
+				int path = ss->find_node_by_path(n->get_path_to(node));
+				if (path!=-1) {
+					if (ss->is_node_in_group(path,gi.name)) {
+						can_be_deleted=false;
+					}
+				}
+			}
+
+			n=n->get_owner();
+		}
+
+
 		TreeItem *item=tree->create_item(root);
 		item->set_text(0, gi.name);
-		item->add_button(0, get_icon("Remove", "EditorIcons"), 0);
+		if (can_be_deleted) {
+			item->add_button(0, get_icon("Remove", "EditorIcons"), 0);
+		} else {
+			item->set_selectable(0,false);
+		}
+
 	}
 }
 
diff --git a/tools/editor/icons/2x/icon_gizmo_directional_light.png b/tools/editor/icons/2x/icon_gizmo_directional_light.png
index 5f812845df..0d02788040 100644
--- a/tools/editor/icons/2x/icon_gizmo_directional_light.png
+++ b/tools/editor/icons/2x/icon_gizmo_directional_light.png
diff --git a/tools/editor/icons/2x/icon_gizmo_light.png b/tools/editor/icons/2x/icon_gizmo_light.png
index 3b1b15f4b6..2ba9689107 100644
--- a/tools/editor/icons/2x/icon_gizmo_light.png
+++ b/tools/editor/icons/2x/icon_gizmo_light.png
diff --git a/tools/editor/icons/2x/icon_gizmo_listener.png b/tools/editor/icons/2x/icon_gizmo_listener.png
index 9fbf16c015..bc2908824d 100644
--- a/tools/editor/icons/2x/icon_gizmo_listener.png
+++ b/tools/editor/icons/2x/icon_gizmo_listener.png
diff --git a/tools/editor/icons/2x/icon_gizmo_spatial_sample_player.png b/tools/editor/icons/2x/icon_gizmo_spatial_sample_player.png
index f67beb14c5..78a88c55c1 100644
--- a/tools/editor/icons/2x/icon_gizmo_spatial_sample_player.png
+++ b/tools/editor/icons/2x/icon_gizmo_spatial_sample_player.png
diff --git a/tools/editor/icons/2x/icon_gizmo_spatial_stream_player.png b/tools/editor/icons/2x/icon_gizmo_spatial_stream_player.png
index feed191fc1..631f03e874 100644
--- a/tools/editor/icons/2x/icon_gizmo_spatial_stream_player.png
+++ b/tools/editor/icons/2x/icon_gizmo_spatial_stream_player.png
diff --git a/tools/editor/icons/2x/icon_zoom_less.png b/tools/editor/icons/2x/icon_zoom_less.png
new file mode 100644
index 0000000000..d483db55ce
--- /dev/null
+++ b/tools/editor/icons/2x/icon_zoom_less.png
diff --git a/tools/editor/icons/2x/icon_zoom_more.png b/tools/editor/icons/2x/icon_zoom_more.png
new file mode 100644
index 0000000000..8f9ef77849
--- /dev/null
+++ b/tools/editor/icons/2x/icon_zoom_more.png
diff --git a/tools/editor/icons/2x/icon_zoom_reset.png b/tools/editor/icons/2x/icon_zoom_reset.png
new file mode 100644
index 0000000000..092215b3e2
--- /dev/null
+++ b/tools/editor/icons/2x/icon_zoom_reset.png
diff --git a/tools/editor/icons/icon_gizmo_directional_light.png b/tools/editor/icons/icon_gizmo_directional_light.png
index a716930687..bdeb120b43 100644
--- a/tools/editor/icons/icon_gizmo_directional_light.png
+++ b/tools/editor/icons/icon_gizmo_directional_light.png
diff --git a/tools/editor/icons/icon_gizmo_light.png b/tools/editor/icons/icon_gizmo_light.png
index 396ae8615d..be9903f8c2 100644
--- a/tools/editor/icons/icon_gizmo_light.png
+++ b/tools/editor/icons/icon_gizmo_light.png
diff --git a/tools/editor/icons/icon_gizmo_listener.png b/tools/editor/icons/icon_gizmo_listener.png
index 218736e491..47e978be61 100644
--- a/tools/editor/icons/icon_gizmo_listener.png
+++ b/tools/editor/icons/icon_gizmo_listener.png
diff --git a/tools/editor/icons/icon_gizmo_spatial_sample_player.png b/tools/editor/icons/icon_gizmo_spatial_sample_player.png
index 71e4f13f1c..0119dbc433 100644
--- a/tools/editor/icons/icon_gizmo_spatial_sample_player.png
+++ b/tools/editor/icons/icon_gizmo_spatial_sample_player.png
diff --git a/tools/editor/icons/icon_gizmo_spatial_stream_player.png b/tools/editor/icons/icon_gizmo_spatial_stream_player.png
index 04144aec26..6a4f85d550 100644
--- a/tools/editor/icons/icon_gizmo_spatial_stream_player.png
+++ b/tools/editor/icons/icon_gizmo_spatial_stream_player.png
diff --git a/tools/editor/icons/icon_loop_interpolation.png b/tools/editor/icons/icon_loop_interpolation.png
deleted file mode 100644
index 488b33316e..0000000000
--- a/tools/editor/icons/icon_loop_interpolation.png
+++ /dev/null
diff --git a/tools/editor/icons/icon_zoom_less.png b/tools/editor/icons/icon_zoom_less.png
new file mode 100644
index 0000000000..fd8ef9075e
--- /dev/null
+++ b/tools/editor/icons/icon_zoom_less.png
diff --git a/tools/editor/icons/icon_zoom_more.png b/tools/editor/icons/icon_zoom_more.png
new file mode 100644
index 0000000000..8e818db1ee
--- /dev/null
+++ b/tools/editor/icons/icon_zoom_more.png
diff --git a/tools/editor/icons/icon_zoom_reset.png b/tools/editor/icons/icon_zoom_reset.png
new file mode 100644
index 0000000000..fa8a9d197e
--- /dev/null
+++ b/tools/editor/icons/icon_zoom_reset.png
diff --git a/tools/editor/icons/source/icon_gizmo_directional_light.svg b/tools/editor/icons/source/icon_gizmo_directional_light.svg
index 0682c270ac..65202877a0 100644
--- a/tools/editor/icons/source/icon_gizmo_directional_light.svg
+++ b/tools/editor/icons/source/icon_gizmo_directional_light.svg
@@ -9,15 +9,15 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   viewBox="0 0 32 32"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
-   inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_dependency_changed_hl.png"
-   inkscape:export-xdpi="45"
-   inkscape:export-ydpi="45"
+   inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_gizmo_directional_light.png"
+   inkscape:export-xdpi="360"
+   inkscape:export-ydpi="360"
    sodipodi:docname="icon_gizmo_directional_light.svg">
   <defs
      id="defs4" />
@@ -28,9 +28,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="13.90442"
-     inkscape:cy="22.349302"
+     inkscape:zoom="4"
+     inkscape:cx="69.526732"
+     inkscape:cy="53.07939"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -68,106 +68,65 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1020.3622)">
+     transform="translate(0,-924.3622)">
     <circle
        style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path4156"
-       cx="16"
-       cy="1036.3622"
-       r="7.0000172" />
-    <rect
+       cx="64"
+       cy="988.36218"
+       r="24.000017" />
+    <path
        style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 64,4 a 8.0000172,8.0000172 0 0 0 -8,8 l 0,12 a 7.9999828,7.9999828 0 0 0 8,8 7.9999828,7.9999828 0 0 0 8,-8 L 72,12 A 8.0000172,8.0000172 0 0 0 64,4 Z"
+       transform="translate(0,924.3622)"
        id="rect4169"
-       width="4"
-       height="5.0000172"
-       x="14"
-       y="1021.3622"
-       rx="0"
-       ry="0"
-       inkscape:transform-center-y="-12.500009" />
-    <rect
-       inkscape:transform-center-y="-8.8388501"
-       ry="0"
-       rx="0"
-       y="706.505"
-       x="742.13245"
-       height="5.0000172"
-       width="4"
-       id="rect4171"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-y="-46" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4148"
+       d="m 124,988.3622 a 8.0000172,8.0000172 0 0 0 -8,-8 l -12,0 a 7.9999828,7.9999828 0 0 0 -8,8 7.9999828,7.9999828 0 0 0 8,8 l 12,0 a 8.0000172,8.0000172 0 0 0 8,-8 z"
        style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
-       inkscape:transform-center-x="-8.8388459" />
-    <rect
-       inkscape:transform-center-x="-12.500018"
-       transform="matrix(0,1,-1,0,0,0)"
+       inkscape:transform-center-x="-46" />
+    <path
        style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect4173"
-       width="4"
-       height="5.0000172"
-       x="1034.3622"
-       y="-31.000027"
-       rx="0"
-       ry="0"
-       inkscape:transform-center-y="-1.754751e-05" />
-    <rect
-       inkscape:transform-center-y="8.8388073"
-       ry="0"
-       rx="0"
-       y="-759.13245"
-       x="719.505"
-       height="5.0000172"
-       width="4"
-       id="rect4175"
+       d="m 64,1048.3622 a 8.0000172,8.0000172 0 0 0 8,-8 l 0,-12 a 7.9999828,7.9999828 0 0 0 -8,-8 7.9999828,7.9999828 0 0 0 -8,8 l 0,12 a 8.0000172,8.0000172 0 0 0 8,8 z"
+       id="path4150"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-y="46" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4152"
+       d="m 4,988.3622 a 8.0000172,8.0000172 0 0 0 8,8 l 12,0 a 7.9999828,7.9999828 0 0 0 8,-8 7.9999828,7.9999828 0 0 0 -8,-8 l -12,0 a 8.0000172,8.0000172 0 0 0 -8,8 z"
        style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)"
-       inkscape:transform-center-x="-8.8388458" />
-    <rect
-       inkscape:transform-center-x="-2.6589615e-05"
-       transform="scale(-1,-1)"
+       inkscape:transform-center-x="46" />
+    <path
+       inkscape:transform-center-y="-32.526909"
+       inkscape:connector-curvature="0"
+       id="path4154"
+       d="m 106.42641,945.93579 a 8.0000172,8.0000172 0 0 0 -11.313712,0 l -8.485281,8.48528 a 7.9999828,7.9999828 0 0 0 0,11.31371 7.9999828,7.9999828 0 0 0 11.313708,0 l 8.485285,-8.48528 a 8.0000172,8.0000172 0 0 0 0,-11.31371 z"
        style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect4177"
-       width="4"
-       height="5.0000172"
-       x="-18.000027"
-       y="-1051.3622"
-       rx="0"
-       ry="0"
-       inkscape:transform-center-y="12.499974" />
-    <rect
-       inkscape:transform-center-y="8.8388074"
-       ry="0"
-       rx="0"
-       y="-736.505"
-       x="-746.13245"
-       height="5.0000172"
-       width="4"
-       id="rect4179"
+       inkscape:transform-center-x="-32.526906" />
+    <path
+       inkscape:transform-center-x="-32.526906"
        style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)"
-       inkscape:transform-center-x="8.8388116" />
-    <rect
-       inkscape:transform-center-x="12.499964"
-       transform="matrix(0,-1,1,0,0,0)"
+       d="m 106.42641,1030.7886 a 8.0000172,8.0000172 0 0 0 0,-11.3137 l -8.485285,-8.4853 a 7.9999828,7.9999828 0 0 0 -11.313708,0 7.9999828,7.9999828 0 0 0 0,11.3137 l 8.485281,8.4853 a 8.0000172,8.0000172 0 0 0 11.313712,0 z"
+       id="path4157"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-y="32.526894" />
+    <path
+       inkscape:transform-center-y="32.526893"
+       inkscape:connector-curvature="0"
+       id="path4159"
+       d="m 21.573593,1030.7886 a 8.0000172,8.0000172 0 0 0 11.313709,0 l 8.485281,-8.4853 a 7.9999828,7.9999828 0 0 0 0,-11.3137 7.9999828,7.9999828 0 0 0 -11.313708,0 l -8.485282,8.4853 a 8.0000172,8.0000172 0 0 0 0,11.3137 z"
        style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect4181"
-       width="4"
-       height="5.0000172"
-       x="-1038.3622"
-       y="1.0000273"
-       rx="0"
-       ry="0"
-       inkscape:transform-center-y="-1.7409218e-05" />
-    <rect
-       inkscape:transform-center-y="-8.83885"
-       ry="0"
-       rx="0"
-       y="729.13245"
-       x="-723.505"
-       height="5.0000172"
-       width="4"
-       id="rect4183"
+       inkscape:transform-center-x="32.526905" />
+    <path
+       inkscape:transform-center-x="32.526905"
        style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
-       inkscape:transform-center-x="8.8388113" />
+       d="m 21.573593,945.93579 a 8.0000172,8.0000172 0 0 0 0,11.31371 l 8.485282,8.48528 a 7.9999828,7.9999828 0 0 0 11.313708,0 7.9999828,7.9999828 0 0 0 0,-11.31371 l -8.485281,-8.48528 a 8.0000172,8.0000172 0 0 0 -11.313709,0 z"
+       id="path4161"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-y="-32.526908" />
   </g>
 </svg>
diff --git a/tools/editor/icons/source/icon_gizmo_light.svg b/tools/editor/icons/source/icon_gizmo_light.svg
index c9ce60273a..c42d6e1f76 100644
--- a/tools/editor/icons/source/icon_gizmo_light.svg
+++ b/tools/editor/icons/source/icon_gizmo_light.svg
@@ -9,9 +9,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   viewBox="0 0 32 32"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
@@ -28,9 +28,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="18.311796"
-     inkscape:cy="18.635805"
+     inkscape:zoom="3.9999998"
+     inkscape:cx="47.738891"
+     inkscape:cy="58.814006"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -68,23 +68,23 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1020.3622)">
+     transform="translate(0,-924.3622)">
     <path
        style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 16 1 A 10.000017 10.000017 0 0 0 6 11 A 10.000017 10.000017 0 0 0 16 21 A 10.000017 10.000017 0 0 0 26 11 A 10.000017 10.000017 0 0 0 16 1 z M 16 4 A 7 7 0 0 1 23 11 A 7 7 0 0 1 16 18 A 7 7 0 0 1 9 11 A 7 7 0 0 1 16 4 z "
-       transform="translate(0,1020.3622)"
-       id="path4162" />
+       d="m 64,930.3622 a 40.000068,40.000068 0 0 0 -40,40 40.000068,40.000068 0 0 0 40,40 40.000068,40.000068 0 0 0 40,-40 40.000068,40.000068 0 0 0 -40,-40 z m 0,12 a 28,28 0 0 1 28,28 28,28 0 0 1 -28,28 28,28 0 0 1 -28,-28 28,28 0 0 1 28,-28 z"
+       id="path4162"
+       inkscape:connector-curvature="0" />
     <path
        style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 12 19 L 12 24 A 2 2 0 0 0 14 26 L 18 26 A 2 2 0 0 0 20 24 L 20 19 L 12 19 z "
-       transform="translate(0,1020.3622)"
-       id="rect4164" />
+       d="m 48,1002.3622 0,20 a 8,8 0 0 0 8,8 l 16,0 a 8,8 0 0 0 8,-8 l 0,-20 -32,0 z"
+       id="rect4164"
+       inkscape:connector-curvature="0" />
     <rect
        style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect4168"
-       width="4"
-       height="2.0000174"
-       x="14"
-       y="1048.3622" />
+       width="16"
+       height="8.0000696"
+       x="56"
+       y="1038.3622" />
   </g>
 </svg>
diff --git a/tools/editor/icons/source/icon_gizmo_listener.svg b/tools/editor/icons/source/icon_gizmo_listener.svg
index a53b08af44..3667cbc69b 100644
--- a/tools/editor/icons/source/icon_gizmo_listener.svg
+++ b/tools/editor/icons/source/icon_gizmo_listener.svg
@@ -9,9 +9,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   viewBox="0 0 32 32"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
@@ -28,9 +28,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="4.4071843"
-     inkscape:cy="17.118049"
+     inkscape:zoom="3.9999998"
+     inkscape:cx="53.348444"
+     inkscape:cy="75.110194"
      inkscape:document-units="px"
      inkscape:current-layer="g4175"
      showgrid="true"
@@ -60,7 +60,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -68,33 +68,33 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1020.3622)">
+     transform="translate(0,-924.3622)">
     <g
        id="g4175"
        transform="matrix(2,0,0,2,-16,-1040.3622)">
       <path
          inkscape:connector-curvature="0"
          id="path4274"
-         d="m 21.928203,1032.3622 -1.738281,1.0039 a 6,6 0 0 1 0.810547,2.9961 6,6 0 0 1 -0.808594,2.998 l 1.736328,1.002 a 8,8 0 0 0 0,-8 z"
+         d="m 63.712867,990.36221 -6.953133,4.0152 a 24.000031,23.999015 0 0 1 3.242193,11.98399 24.000031,23.999015 0 0 1 -3.234381,11.9917 l 6.945321,4.0076 a 32.000041,31.998687 0 0 0 0,-31.99849 z"
          style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <rect
-         y="1043.3622"
-         x="11"
-         height="2"
-         width="1"
+         y="1034.3602"
+         x="19.999998"
+         height="7.9996719"
+         width="4.0000052"
          id="rect4147"
          style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
          id="path4149"
-         d="m 14,1031.3622 a 5,5 0 0 0 -5,5 l 2,0 a 3,3 0 0 1 3,-3 3,3 0 0 1 3,3 l 2,0 a 5,5 0 0 0 -5,-5 z"
+         d="m 32.000015,986.3622 a 20.000026,19.999179 0 0 0 -20.000026,19.9992 l 8.00001,0 a 12.000015,11.999507 0 0 1 12.000016,-11.99959 12.000015,11.999507 0 0 1 12.000015,11.99959 l 8.00001,0 A 20.000026,19.999179 0 0 0 32.000015,986.3622 Z"
          style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          inkscape:connector-curvature="0" />
       <path
          sodipodi:nodetypes="csc"
          inkscape:connector-curvature="0"
          id="path4155"
-         d="m 18,1036.3622 c 0,4 -3,4 -3,5 0,3 -2,3 -3,3"
-         style="fill:none;fill-rule:evenodd;stroke:#f7f5cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         d="m 48.000035,1006.3614 c 0,15.9993 -12.000015,15.9993 -12.000015,19.9993 0,11.9992 -8.00001,11.9992 -12.000016,11.9992"
+         style="fill:none;fill-rule:evenodd;stroke:#f7f5cf;stroke-width:7.99984121;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/tools/editor/icons/source/icon_gizmo_spatial_sample_player.svg b/tools/editor/icons/source/icon_gizmo_spatial_sample_player.svg
index 68375f9487..a734095268 100644
--- a/tools/editor/icons/source/icon_gizmo_spatial_sample_player.svg
+++ b/tools/editor/icons/source/icon_gizmo_spatial_sample_player.svg
@@ -9,9 +9,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   viewBox="0 0 32 32"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
@@ -28,9 +28,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="18.414591"
-     inkscape:cy="16.81826"
+     inkscape:zoom="2"
+     inkscape:cx="7.8244495"
+     inkscape:cy="69.465609"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -71,26 +71,50 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1020.3622)">
+     transform="translate(0,-924.3622)">
     <path
-       style="fill:#f7f5cf;fill-opacity:1;fill-rule:evenodd;stroke:#f7f5cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 16,1024.3622 0,24 -8,-8 -4,0 0,-8 4,0 z"
+       style="fill:#f7f5cf;fill-opacity:1;fill-rule:evenodd;stroke:#f7f5cf;stroke-width:8;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 64.000015,940.3622 0,96.0012 -31.999993,-32.0004 -15.999996,0 0,-32.00043 15.999996,0 z"
        id="path4143"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccccc" />
     <rect
        style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99607843"
        id="rect4145"
-       width="3"
-       height="8.0000172"
-       x="20"
-       y="1032.3622" />
+       width="11.999997"
+       height="32.000439"
+       x="80.000008"
+       y="972.36255" />
     <rect
-       y="1026.3622"
-       x="26"
-       height="19.999949"
-       width="3"
+       y="948.36224"
+       x="104"
+       height="80.000717"
+       width="11.999997"
        id="rect4147"
        style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.99607843" />
+    <circle
+       style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path4137"
+       cx="86"
+       cy="972.36218"
+       r="6" />
+    <circle
+       r="6"
+       cy="1002.3622"
+       cx="86"
+       id="circle4139"
+       style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <circle
+       style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="circle4141"
+       cx="110"
+       cy="1028.3622"
+       r="6" />
+    <circle
+       r="6"
+       cy="948.36218"
+       cx="110"
+       id="circle4143"
+       style="opacity:1;fill:#f7f5cf;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/tools/editor/icons/source/icon_gizmo_spatial_stream_player.svg b/tools/editor/icons/source/icon_gizmo_spatial_stream_player.svg
index 5acff1ec76..c333641249 100644
--- a/tools/editor/icons/source/icon_gizmo_spatial_stream_player.svg
+++ b/tools/editor/icons/source/icon_gizmo_spatial_stream_player.svg
@@ -9,9 +9,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   viewBox="0 0 32 32"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
    id="svg2"
    version="1.1"
    inkscape:version="0.91 r13725"
@@ -28,9 +28,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="15.999999"
-     inkscape:cx="18.768034"
-     inkscape:cy="16.106066"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="102.18566"
+     inkscape:cy="68.674719"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -71,11 +71,11 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1020.3622)">
+     transform="translate(0,-924.3622)">
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f7f5cf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       d="M 23.941406 2.0019531 A 2.0002 2.0002 0 0 0 23.451172 2.0761719 L 9.4511719 6.0761719 A 2.0002 2.0002 0 0 0 8 8 L 8 20.029297 A 4.5000086 4.5000086 0 0 0 7.5 20 A 4.5000086 4.5000086 0 0 0 3 24.5 A 4.5000086 4.5000086 0 0 0 7.5 29 A 4.5000086 4.5000086 0 0 0 11.96875 25 L 12 25 L 12 24.5 L 12 9.5097656 L 22 6.6523438 L 22 16.03125 A 4.5 4.5 0 0 0 21.5 16 A 4.5 4.5 0 0 0 17 20.5 A 4.5 4.5 0 0 0 21.5 25 A 4.5 4.5 0 0 0 25.96875 21 L 26 21 L 26 20.5 L 26 4 A 2.0002 2.0002 0 0 0 23.941406 2.0019531 z "
-       transform="translate(0,1020.3622)"
-       id="path4187" />
+       d="m 99.765624,934.3602 a 8.0008,8.001126 0 0 0 -1.960936,0.296 l -56,16.0004 A 8.0008,8.001126 0 0 0 36,958.353 l 0,48.1192 a 18.000034,18.000768 0 0 0 -2,-0.116 18.000034,18.000768 0 0 0 -18,18.0008 18.000034,18.000768 0 0 0 18,18.0008 18.000034,18.000768 0 0 0 17.875,-16.0008 l 0.125,0 0,-2 0,-59.9632 40,-11.4304 0,37.5172 a 18,18.000734 0 0 0 -2,-0.124 18,18.000734 0 0 0 -18,18.0008 18,18.000734 0 0 0 18,18.0004 18,18.000734 0 0 0 17.875,-16.0004 l 0.125,0 0,-2 0,-66.0028 a 8.0008,8.001126 0 0 0 -8.234376,-7.9924 z"
+       id="path4187"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/tools/editor/icons/source/icon_zoom_more.svg b/tools/editor/icons/source/icon_zoom_more.svg
new file mode 100644
index 0000000000..87acdfb021
--- /dev/null
+++ b/tools/editor/icons/source/icon_zoom_more.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_zoom.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:docname="icon_zoom_more.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="3.7772222"
+     inkscape:cy="13.690414"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3336" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       id="layer1-6"
+       inkscape:label="Capa 1"
+       transform="translate(-201.5751,205.0256)">
+      <g
+         inkscape:label="Layer 1"
+         id="layer1-0-4"
+         transform="matrix(48.459085,0,0,53.967813,-126.63031,-55835.691)">
+        <g
+           transform="translate(0.51853114,-0.01988754)"
+           id="g4182-8">
+          <rect
+             style="fill:#e0e0e0;fill-opacity:0.99607843"
+             id="rect4167"
+             width="0.042994563"
+             height="0.26204652"
+             x="6.3978949"
+             y="1050.0524"
+             rx="0"
+             ry="0" />
+          <rect
+             ry="0"
+             rx="0"
+             y="1050.165"
+             x="6.2806396"
+             height="0.040943757"
+             width="0.28011176"
+             id="rect4169-6"
+             style="fill:#e0e0e0;fill-opacity:0.99607843" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/tools/editor/import_settings.cpp b/tools/editor/import_settings.cpp
deleted file mode 100644
index dfaeca03db..0000000000
--- a/tools/editor/import_settings.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-/*************************************************************************/
-/*  import_settings.cpp                                                  */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                    http://www.godotengine.org                         */
-/*************************************************************************/
-/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-#include "import_settings.h"
-#include "os/os.h"
-#include "editor_node.h"
-
-void ImportSettingsDialog::_item_pressed(int p_idx) {
-
-	if (!edited)
-		return;
-
-	String p=edited->get_metadata(0);
-#if 0
-	if (EditorImportDB::get_singleton()->is_image(p)) {
-
-		uint32_t flags = EditorImportDB::get_singleton()->get_image_flags(p);
-		bool pressed = !popup->is_item_checked(p_idx);
-		if (pressed)
-			flags|=(1<<p_idx);
-		else
-			flags&=~(1<<p_idx);
-
-
-		EditorImportDB::get_singleton()->set_image_flags(p,flags);
-		edited->set_text(2,_str_from_flags(flags));
-	}
-#endif
-}
-
-void ImportSettingsDialog::_item_edited() {
-
-	if (updating)
-		return;
-	TreeItem *it=tree->get_selected();
-	int ec=tree->get_edited_column();
-
-	String p=it->get_metadata(0);
-#if 0
-	if (EditorImportDB::get_singleton()->is_image(p)) {
-
-		if (ec==1) {
-
-
-			EditorImportDB::get_singleton()->set_image_format(p,EditorImport::ImageFormat(int(it->get_range(1))));
-
-		} else if (ec==2) {
-
-
-			int flags = EditorImportDB::get_singleton()->get_image_flags(p);
-			for(int i=0;i<popup->get_item_count();i++) {
-
-				popup->set_item_checked(i,flags&(1<<i));
-			}
-
-			Rect2 r = tree->get_custom_popup_rect();
-			popup->set_size(Size2(r.size.width,1));
-			popup->set_pos(/*tree->get_global_pos()+*/r.pos+Point2(0,r.size.height));
-			popup->popup();
-		}
-
-		edited=it;
-
-	}
-#endif
-
-
-}
-
-
-void ImportSettingsDialog::_button_pressed(Object *p_button, int p_col, int p_id) {
-
-	TreeItem *ti=p_button->cast_to<TreeItem>();
-	if (!ti)
-		return;
-	String path = ti->get_metadata(0);
-	print_line("PATH: "+path);
-	Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(path);
-	ERR_FAIL_COND(rimd.is_null());
-	Ref<EditorImportPlugin> rimp = EditorImportExport::get_singleton()->get_import_plugin_by_name(rimd->get_editor());
-	ERR_FAIL_COND(!rimp.is_valid());
-	rimp->import_dialog(path);
-	hide();
-}
-
-bool ImportSettingsDialog::_generate_fs(TreeItem *p_parent,EditorFileSystemDirectory *p_dir) {
-
-	bool valid=false;
-
-
-	for(int i=0;i<p_dir->get_subdir_count();i++) {
-
-		EditorFileSystemDirectory *sd=p_dir->get_subdir(i);
-		TreeItem *ti = tree->create_item(p_parent);
-		ti->set_text(0,sd->get_name()+"/");
-		ti->set_icon(0,get_icon("Folder","EditorIcons"));
-
-		if (!_generate_fs(ti,sd)) {
-			memdelete(ti);
-		} else {
-			valid=true;
-		}
-	}
-
-
-	for(int i=0;i<p_dir->get_file_count();i++) {
-
-		String path=p_dir->get_file_path(i);
-		if (!p_dir->get_file_meta(i))
-			continue;
-
-		valid=true;
-
-		String f = p_dir->get_file(i);
-		TreeItem *ti = tree->create_item(p_parent);
-		String type = p_dir->get_file_type(i);
-		Ref<Texture> t;
-		if (has_icon(type,"EditorIcons"))
-			t = get_icon(type,"EditorIcons");
-		else
-			t = get_icon("Object","EditorIcons");
-
-
-		ti->set_icon(0,t);
-		ti->set_text(0,f);
-//		ti->add_button(0,get_icon("Reload","EditorIcons"));
-		ti->set_metadata(0,p_dir->get_file_path(i));
-		String tt = p_dir->get_file_path(i);
-
-		if (p_dir->is_missing_sources(i)) {
-			ti->set_icon(1,get_icon("ImportFail","EditorIcons"));
-			Vector<String> missing = p_dir->get_missing_sources(i);
-			for(int j=0;j<missing.size();j++) {
-				tt+="\nmissing: "+missing[j];
-			}
-
-		} else
-			ti->set_icon(1,get_icon("ImportCheck","EditorIcons"));
-
-		ti->set_tooltip(0,tt);
-		ti->set_tooltip(1,tt);
-
-	}
-
-#if 0
-		if (!EditorImportDB::get_singleton()->is_image(path) && !EditorImportDB::get_singleton()->is_scene(path))
-			continue;
-
-		String f = p_dir->get_file(i);
-		TreeItem *ti = tree->create_item(p_parent);
-		ti->set_text(0,f);
-		String type = p_dir->get_file_type(i);
-		Ref<Texture> icon = get_icon( (has_icon(type,"EditorIcons")?type:String("Object")),"EditorIcons");
-
-
-		if (EditorImportDB::get_singleton()->is_image(path)) {
-
-
-			ti->set_tooltip(0,"Type: Image\nSource: "+EditorImportDB::get_singleton()->get_file_source(path)+"\nSource MD5: "+EditorImportDB::get_singleton()->get_file_md5(path));
-			ti->set_cell_mode(1,TreeItem::CELL_MODE_RANGE);
-			ti->set_editable(1,true);
-			ti->set_range_config(1,0,3,1);
-			ti->set_range(1,EditorImportDB::get_singleton()->get_image_format(path));
-			ti->set_text(1,texformat);
-			ti->set_cell_mode(2,TreeItem::CELL_MODE_CUSTOM);
-			ti->set_editable(2,true);
-			ti->set_metadata(0,path);
-
-			String txt;
-			uint32_t flags=EditorImportDB::get_singleton()->get_image_flags(path);
-			txt=_str_from_flags(flags);
-
-			ti->set_text(2,txt);
-		}
-
-		ti->set_icon(0, icon);
-		valid=true;
-#endif
-
-
-	return valid;
-}
-
-void ImportSettingsDialog::update_tree() {
-
-	updating=true;
-	tree->clear();
-	edited=NULL;
-
-
-	TreeItem *root = tree->create_item();
-	EditorFileSystemDirectory *fs = EditorFileSystem::get_singleton()->get_filesystem();
-
-	_generate_fs(root,fs);
-	updating=false;
-
-
-}
-
-void ImportSettingsDialog::_notification(int p_what) {
-
-	if (p_what==NOTIFICATION_ENTER_TREE) {
-
-		EditorFileSystem::get_singleton()->connect("filesystem_changed",this,"update_tree");
-	}
-}
-
-
-void ImportSettingsDialog::_bind_methods() {
-
-	ObjectTypeDB::bind_method("update_tree",&ImportSettingsDialog::update_tree);
-	ObjectTypeDB::bind_method("_item_edited",&ImportSettingsDialog::_item_edited);
-	ObjectTypeDB::bind_method("_item_pressed",&ImportSettingsDialog::_item_pressed);
-	ObjectTypeDB::bind_method("_button_pressed",&ImportSettingsDialog::_button_pressed);
-
-
-}
-
-
-void ImportSettingsDialog::popup_import_settings() {
-
-	update_tree();
-	popup_centered_ratio();
-}
-
-void ImportSettingsDialog::ok_pressed() {
-
-
-	TreeItem *ti = tree->get_selected();
-	if (!ti)
-		return;
-
-	String path = ti->get_metadata(0);
-	print_line("PATH: "+path);
-	Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(path);
-	ERR_FAIL_COND(rimd.is_null());
-	Ref<EditorImportPlugin> rimp = EditorImportExport::get_singleton()->get_import_plugin_by_name(rimd->get_editor());
-	ERR_FAIL_COND(!rimp.is_valid());
-	rimp->import_dialog(path);
-	hide();
-
-
-}
-
-ImportSettingsDialog::ImportSettingsDialog(EditorNode *p_editor) {
-
-	editor=p_editor;
-
-	get_ok()->set_text(TTR("Close"));
-
-	tree = memnew( Tree );
-	add_child(tree);
-	set_child_rect(tree);
-	set_title(TTR("Imported Resources"));
-
-//	texformat="Keep,None,Disk,VRAM";
-
-	tree->set_hide_root(true);
-	tree->set_columns(2);
-	tree->set_column_expand(1,false);
-	tree->set_column_min_width(1,20);
-
-	tree->connect("item_edited",this,"_item_edited");
-	tree->connect("button_pressed",this,"_button_pressed");
-
-//	add_button("Re-Import","reimport");
-	get_ok()->set_text(TTR("Re-Import"));
-	get_cancel()->set_text(TTR("Close"));
-
-	updating=false;
-	edited=NULL;
-	set_hide_on_ok(false);
-
-
-}
-
diff --git a/tools/editor/io_plugins/editor_atlas.cpp b/tools/editor/io_plugins/editor_atlas.cpp
index f894e7e8b2..f69e383fb0 100644
--- a/tools/editor/io_plugins/editor_atlas.cpp
+++ b/tools/editor/io_plugins/editor_atlas.cpp
@@ -82,7 +82,6 @@ void EditorAtlas::fit(const Vector<Size2i>& p_rects,Vector<Point2i>& r_result, S
 
 		//place them
 		int ofs=0;
-		int limit_h=0;
 
 		for(int j=0;j<wrects.size();j++) {
 
@@ -106,8 +105,6 @@ void EditorAtlas::fit(const Vector<Size2i>& p_rects,Vector<Point2i>& r_result, S
 
 			int end_h = from_y+wrects[j].s.height;
 			int end_w = ofs+wrects[j].s.width;
-			if (ofs==0)
-				limit_h=end_h;
 
 			for(int k=0;k<wrects[j].s.width;k++) {
 
@@ -120,8 +117,7 @@ void EditorAtlas::fit(const Vector<Size2i>& p_rects,Vector<Point2i>& r_result, S
 			if (end_w > max_w)
 				max_w=end_w;
 
-			//if (ofs==0 || end_h>limit_h ) //while h limit not reched, keep stacking
-				ofs+=wrects[j].s.width;
+			ofs+=wrects[j].s.width;
 
 		}
 
diff --git a/tools/editor/io_plugins/editor_import_collada.cpp b/tools/editor/io_plugins/editor_import_collada.cpp
index 363cba3678..fc45b51a98 100644
--- a/tools/editor/io_plugins/editor_import_collada.cpp
+++ b/tools/editor/io_plugins/editor_import_collada.cpp
@@ -2278,12 +2278,6 @@ void ColladaImport::create_animation(int p_clip, bool p_make_tracks_in_all_bones
 		NodeMap &nm = node_map[at.target];
 		String path = scene->get_path_to(nm.node);
 
-		Collada::Node *cn = collada.state.scene_map[at.target];
-		//if (cn->ignore_anim) {
-		//	print_line("warning, ignoring property animation on node: "+nm.path);
-			//continue;
-		//}
-
 		animation->add_track(Animation::TYPE_VALUE);
 		int track = animation->get_track_count() -1;
 
diff --git a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp b/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
index 095c56a373..2c3ed2afd6 100644
--- a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
@@ -520,7 +520,7 @@ Error EditorMeshImportPlugin::import(const String& p_path, const Ref<ResourceImp
 				//new object/surface
 				if (generate_normals || force_smooth)
 					surf_tool->generate_normals();
-				if (uvs.size() && (normals.size() || generate_normals))
+				if (uvs.size() && (normals.size() || generate_normals) && generate_tangents)
 					surf_tool->generate_tangents();
 
 				surf_tool->index();
diff --git a/tools/editor/io_plugins/editor_scene_import_plugin.cpp b/tools/editor/io_plugins/editor_scene_import_plugin.cpp
index c7d92a9658..e24412d4ef 100644
--- a/tools/editor/io_plugins/editor_scene_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -822,7 +822,7 @@ void EditorSceneImportDialog::_import(bool p_and_open) {
 			return;
 		}
 		if (wip_open)
-			EditorNode::get_singleton()->load_scene(save_file);
+			EditorNode::get_singleton()->load_scene(save_file,false,false,false);
 
 	}
 
@@ -867,7 +867,7 @@ void EditorSceneImportDialog::_import_confirm() {
 	}
 
 	if (wip_open)
-		EditorNode::get_singleton()->load_scene(wip_save_file);
+		EditorNode::get_singleton()->load_scene(wip_save_file,false,false,false);
 	wip_open=false;
 	wip_save_file="";
 
@@ -2459,7 +2459,7 @@ void EditorSceneImportPlugin::_optimize_animations(Node *scene, float p_max_lin_
 
 void EditorSceneImportPlugin::_find_resources_to_merge(Node *scene, Node *node, bool p_merge_material, Map<String, Ref<Material> > &materials, bool p_merge_anims, Map<String,Ref<Animation> >& merged_anims,Set<Ref<Mesh> > &tested_meshes) {
 
-	if (node->get_owner()!=scene)
+	if (node!=scene && node->get_owner()!=scene)
 		return;
 
 	String path = scene->get_path_to(node);
@@ -2507,11 +2507,43 @@ void EditorSceneImportPlugin::_find_resources_to_merge(Node *scene, Node *node,
 
 			for(int i=0;i<mesh->get_surface_count();i++) {
 				Ref<Material> material = mesh->surface_get_material(i);
-				materials[mesh->get_name()+":surf:"+mesh->surface_get_name(i)]=material;
+
+				if (material.is_valid()) {
+
+					String sname = mesh->surface_get_name(i);
+					if (sname=="")
+						sname="surf_"+itos(i);
+
+					sname=mesh->get_name()+":surf:"+sname;
+					materials[sname]=material;
+				}
 			}
 
 			tested_meshes.insert(mesh);
 		}
+
+		if (mesh.is_valid()) {
+
+			for(int i=0;i<mesh->get_surface_count();i++) {
+				Ref<Material> material = mi->get_surface_material(i);
+				if (material.is_valid()) {
+					String sname = mesh->surface_get_name(i);
+					if (sname=="")
+						sname="surf_"+itos(i);
+
+					sname=path+":inst_surf:"+sname;
+					materials[sname]=material;
+				}
+			}
+
+		}
+
+		Ref<Material> override = mi->get_material_override();
+
+		if (override.is_valid()) {
+
+			materials[path+":override"]=override;
+		}
 	}
 
 
@@ -2525,11 +2557,13 @@ void EditorSceneImportPlugin::_find_resources_to_merge(Node *scene, Node *node,
 
 void EditorSceneImportPlugin::_merge_found_resources(Node *scene, Node *node, bool p_merge_material, const Map<String, Ref<Material> > &materials, bool p_merge_anims, const Map<String,Ref<Animation> >& merged_anims, Set<Ref<Mesh> > &tested_meshes) {
 
-	if (node->get_owner()!=scene)
+	if (node!=scene && node->get_owner()!=scene)
 		return;
 
 	String path = scene->get_path_to(node);
 
+	print_line("at path: "+path);
+
 	if (node->cast_to<AnimationPlayer>()) {
 
 		AnimationPlayer *ap = node->cast_to<AnimationPlayer>();
@@ -2570,15 +2604,48 @@ void EditorSceneImportPlugin::_merge_found_resources(Node *scene, Node *node, bo
 		if (mesh.is_valid() && mesh->get_name()!=String() && !tested_meshes.has(mesh)) {
 
 			for(int i=0;i<mesh->get_surface_count();i++) {
-				String sname = mesh->get_name()+":surf:"+mesh->surface_get_name(i);
+
+				String sname = mesh->surface_get_name(i);
+				if (sname=="")
+					sname="surf_"+itos(i);
+
+				sname=mesh->get_name()+":surf:"+sname;
+
 
 				if (materials.has(sname)) {
+
 					mesh->surface_set_material(i,materials[sname]);
 				}
 			}
 
 			tested_meshes.insert(mesh);
 		}
+
+		if (mesh.is_valid()) {
+
+			for(int i=0;i<mesh->get_surface_count();i++) {
+
+				String sname = mesh->surface_get_name(i);
+				if (sname=="")
+					sname="surf_"+itos(i);
+
+				sname=path+":inst_surf:"+sname;
+
+
+				if (materials.has(sname)) {
+
+					mi->set_surface_material(i,materials[sname]);
+				}
+			}
+
+		}
+
+
+		String opath = path+":override";
+		if (materials.has(opath)) {
+			mi->set_material_override(materials[opath]);
+		}
+
 	}
 
 
@@ -2613,12 +2680,6 @@ Error EditorSceneImportPlugin::import2(Node *scene, const String& p_dest_path, c
 	progress.step(TTR("Importing Scene.."),2);
 
 
-	bool reimport = bool(from->get_option("reimport"));
-	int this_time_action = from->get_option("import_this_time");
-	int next_time_action = from->get_option("import_next_time");
-
-	int import_action = reimport?this_time_action:next_time_action;
-
 	from->set_source_md5(0,FileAccess::get_md5(src_path));
 	from->set_editor(get_name());
 
@@ -2627,8 +2688,6 @@ Error EditorSceneImportPlugin::import2(Node *scene, const String& p_dest_path, c
 
 	Map<Ref<Mesh>,Ref<Shape> > collision_map;
 
-	Ref<ResourceImportMetadata> imd = memnew(ResourceImportMetadata);
-
 	Map< Ref<ImageTexture>,TextureRole > imagemap;
 
 	scene=_fix_node(scene,scene,collision_map,scene_flags,imagemap);
@@ -2643,6 +2702,7 @@ Error EditorSceneImportPlugin::import2(Node *scene, const String& p_dest_path, c
 	if (scene_flags&(SCENE_FLAG_MERGE_KEEP_MATERIALS|SCENE_FLAG_MERGE_KEEP_EXTRA_ANIM_TRACKS) && FileAccess::exists(p_dest_path)) {
 		//must merge!
 
+		print_line("MUST MERGE");
 		Ref<PackedScene> pscene = ResourceLoader::load(p_dest_path,"PackedScene",true);
 		if (pscene.is_valid()) {
 
@@ -2653,8 +2713,9 @@ Error EditorSceneImportPlugin::import2(Node *scene, const String& p_dest_path, c
 				Set<Ref<Mesh> > tested_meshes;
 
 				_find_resources_to_merge(instance,instance,scene_flags&SCENE_FLAG_MERGE_KEEP_MATERIALS,merged_materials,scene_flags&SCENE_FLAG_MERGE_KEEP_EXTRA_ANIM_TRACKS,merged_anims,tested_meshes);
+
 				tested_meshes.clear();
-				_merge_found_resources(instance,instance,scene_flags&SCENE_FLAG_MERGE_KEEP_MATERIALS,merged_materials,scene_flags&SCENE_FLAG_MERGE_KEEP_EXTRA_ANIM_TRACKS,merged_anims,tested_meshes);
+				_merge_found_resources(scene,scene,scene_flags&SCENE_FLAG_MERGE_KEEP_MATERIALS,merged_materials,scene_flags&SCENE_FLAG_MERGE_KEEP_EXTRA_ANIM_TRACKS,merged_anims,tested_meshes);
 
 				memdelete(instance);
 			}
@@ -2680,8 +2741,9 @@ Error EditorSceneImportPlugin::import2(Node *scene, const String& p_dest_path, c
 			post_import_script = Ref<EditorScenePostImport>( memnew( EditorScenePostImport ) );
 			post_import_script->set_script(scr.get_ref_ptr());
 			if (!post_import_script->get_script_instance()) {
-				EditorNode::add_io_error(TTR("Invalid/broken script for post-import:")+" "+post_import_script_path);
+				EditorNode::add_io_error(TTR("Invalid/broken script for post-import (check console):")+" "+post_import_script_path);
 				post_import_script.unref();
+				return ERR_CANT_CREATE;
 			}
 		}
 	}
@@ -2741,7 +2803,7 @@ Error EditorSceneImportPlugin::import2(Node *scene, const String& p_dest_path, c
 			target_path=target_path.basename()+".tex";
 
 			Ref<ResourceImportMetadata> imd = memnew( ResourceImportMetadata );
-			print_line("flags: "+itos(image_flags));
+
 			uint32_t flags = image_flags;
 			if (E->get()==TEXTURE_ROLE_DIFFUSE && scene_flags&SCENE_FLAG_LINEARIZE_DIFFUSE_TEXTURES)
 				flags|=EditorTextureImportPlugin::IMAGE_FLAG_CONVERT_TO_LINEAR;
@@ -2789,15 +2851,16 @@ Error EditorSceneImportPlugin::import2(Node *scene, const String& p_dest_path, c
 
 	Ref<PackedScene> packer = memnew( PackedScene );
 	packer->pack(scene);
-	packer->set_path(p_dest_path);
+	//packer->set_path(p_dest_path); do not take over, let the changed files reload themselves
 	packer->set_import_metadata(from);
 
 	print_line("SAVING TO: "+p_dest_path);
-	err = ResourceSaver::save(p_dest_path,packer,ResourceSaver::FLAG_REPLACE_SUBRESOURCE_PATHS);
+	err = ResourceSaver::save(p_dest_path,packer); //do not take over, let the changed files reload themselves
 
 	//EditorFileSystem::get_singleton()->update_resource(packer);
 
 	memdelete(scene);
+
 	/*
 	scene->set_filename(p_dest_path);
 	if (r_scene) {
@@ -2817,6 +2880,7 @@ Error EditorSceneImportPlugin::import2(Node *scene, const String& p_dest_path, c
 
 	*/
 
+	EditorNode::get_singleton()->reload_scene(p_dest_path);
 
 	return err;
 
diff --git a/tools/editor/io_plugins/editor_texture_import_plugin.cpp b/tools/editor/io_plugins/editor_texture_import_plugin.cpp
index 1fa7a50515..1d8319d460 100644
--- a/tools/editor/io_plugins/editor_texture_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_texture_import_plugin.cpp
@@ -1192,8 +1192,6 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 		}
 		ep.step(TTR("Converting Images"),sources.size());
 
-		int base_index=0;
-
 
 		Map<uint64_t,int> source_md5;
 		Map<int,List<int> > source_map;
@@ -1312,21 +1310,30 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 			ERR_CONTINUE( !source_map.has(i) );
 			for (List<int>::Element *E=source_map[i].front();E;E=E->next()) {
 
-				String apath = p_path.get_base_dir().plus_file(from->get_source_path(E->get()).get_file().basename()+".atex");
+				String apath;
+				String spath = from->get_source_path(E->get()).get_file();
+
+				if (p_external) {
+					apath = p_path.get_base_dir().plus_file(spath.basename()+"."+from->get_source_path(E->get()).md5_text()+".atex");
+				} else {
+					apath = p_path.get_base_dir().plus_file(spath.basename()+".atex");
+				}
 
 				Ref<AtlasTexture> at;
 
 				if (ResourceCache::has(apath)) {
+
 					at = Ref<AtlasTexture>( ResourceCache::get(apath)->cast_to<AtlasTexture>() );
 				} else {
 
 					at = Ref<AtlasTexture>( memnew( AtlasTexture ) );
+
 				}
 				at->set_region(region);
 				at->set_margin(margin);
 				at->set_path(apath);
 				atlases[E->get()]=at;
-				print_line("Atlas Tex: "+apath);
+
 			}
 		}
 		if (ResourceCache::has(p_path)) {
@@ -1751,7 +1758,6 @@ void EditorTextureImportPlugin::reimport_multiple_files(const Vector<String>& p_
 	Vector<String> valid;
 
 
-	bool warning=false;
 	for(int i=0;i<p_list.size();i++) {
 
 		Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(p_list[i]);
@@ -1759,7 +1765,6 @@ void EditorTextureImportPlugin::reimport_multiple_files(const Vector<String>& p_
 		if (type=="texture" || type.begins_with("texture_")) {
 
 			if ((rimd->has_option("atlas") && rimd->get_option("atlas")) || (rimd->has_option("large") && rimd->get_option("large"))) {
-				warning=true;
 				continue;
 			}
 
diff --git a/tools/editor/io_plugins/editor_translation_import_plugin.cpp b/tools/editor/io_plugins/editor_translation_import_plugin.cpp
index aa36fefdb7..9ee3e98486 100644
--- a/tools/editor/io_plugins/editor_translation_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_translation_import_plugin.cpp
@@ -425,7 +425,6 @@ Error EditorTranslationImportPlugin::import(const String& p_path, const Ref<Reso
 
 	ERR_FAIL_COND_V( !f, ERR_INVALID_PARAMETER );
 
-	bool first=false;
 	bool skip_first = from->get_option("skip_first");
 	int index = from->get_option("index");
 	index+=1;
@@ -439,7 +438,6 @@ Error EditorTranslationImportPlugin::import(const String& p_path, const Ref<Reso
 
 	while(line.size()>1) {
 
-
 		if (!skip_first) {
 			ERR_FAIL_INDEX_V(index,line.size(),ERR_INVALID_DATA );
 			translation->add_message(line[0].strip_edges(),line[index]);
diff --git a/tools/editor/output_strings.cpp b/tools/editor/output_strings.cpp
index f1b49d2326..a6126466c4 100644
--- a/tools/editor/output_strings.cpp
+++ b/tools/editor/output_strings.cpp
@@ -32,7 +32,6 @@
 
 void OutputStrings::update_scrollbars() {
 
-	Size2 size = get_size();
 	Size2 hmin = h_scroll->get_combined_minimum_size();
 	Size2 vmin = v_scroll->get_combined_minimum_size();
 
diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp
index 10c7bf79a3..98ba25b482 100644
--- a/tools/editor/plugins/animation_player_editor_plugin.cpp
+++ b/tools/editor/plugins/animation_player_editor_plugin.cpp
@@ -407,7 +407,6 @@ void AnimationPlayerEditor::_animation_save(const Ref<Resource>& p_resource) {
 void AnimationPlayerEditor::_animation_save_as(const Ref<Resource>& p_resource) {
 
 	file->set_mode(EditorFileDialog::MODE_SAVE_FILE);
-	bool relpaths = (p_resource->has_meta("__editor_relpaths__") && p_resource->get_meta("__editor_relpaths__").operator bool());
 
 	List<String> extensions;
 	ResourceSaver::get_recognized_extensions(p_resource, &extensions);
@@ -1404,6 +1403,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) {
 	hb->add_child(animation);
 	animation->set_h_size_flags(SIZE_EXPAND_FILL);
 	animation->set_tooltip(TTR("Display list of animations in player."));
+	animation->set_clip_text(true);
 
 	autoplay = memnew( ToolButton );
 	hb->add_child(autoplay);
diff --git a/tools/editor/plugins/animation_tree_editor_plugin.cpp b/tools/editor/plugins/animation_tree_editor_plugin.cpp
index a381ec4678..24914e4bc5 100644
--- a/tools/editor/plugins/animation_tree_editor_plugin.cpp
+++ b/tools/editor/plugins/animation_tree_editor_plugin.cpp
@@ -90,7 +90,6 @@ Size2 AnimationTreeEditor::get_node_size(const StringName& p_node) const {
 
 	Ref<StyleBox> style = get_stylebox("panel","PopupMenu");
 	Ref<Font> font = get_font("font","PopupMenu");
-	Color font_color = get_color("font_color","PopupMenu");
 
 	Size2 size = style->get_minimum_size();
 
@@ -633,7 +632,6 @@ AnimationTreeEditor::ClickType AnimationTreeEditor::_locate_click(const Point2&
 
 	Ref<StyleBox> style = get_stylebox("panel","PopupMenu");
 	Ref<Font> font = get_font("font","PopupMenu");
-	Color font_color = get_color("font_color","PopupMenu");
 
 	float h = (font->get_height()+get_constant("vseparation","PopupMenu"));
 
diff --git a/tools/editor/plugins/baked_light_baker.cpp b/tools/editor/plugins/baked_light_baker.cpp
index 1962f81e87..6a88ba4cbe 100644
--- a/tools/editor/plugins/baked_light_baker.cpp
+++ b/tools/editor/plugins/baked_light_baker.cpp
@@ -645,7 +645,6 @@ void BakedLightBaker::_octree_insert(int p_octant,Triangle* p_triangle, int p_de
 					leaf_list=child_idx;
 					cell_count++;
 
-					int lz = lights.size();
 					for(int ci=0;ci<8;ci++) {
 						child->light_accum[ci][0]=0;
 						child->light_accum[ci][1]=0;
@@ -1016,8 +1015,6 @@ float BakedLightBaker::_throw_ray(ThreadStack& thread_stack,bool p_bake_direct,c
 	//ray_aabb.expand_to(p_end);
 
 
-	const BVH *bvhptr = bvh;
-
 	bstack[0]=bvh;
 	stack[0]=TEST_AABB_BIT;
 
@@ -1693,7 +1690,7 @@ void BakedLightBaker::throw_rays(ThreadStack& thread_stack,int p_amount) {
 					Vector3 from = dl.pos;
 
 					double r1 = double(rand())/RAND_MAX;
-					double r2 = double(rand())/RAND_MAX;
+					//double r2 = double(rand())/RAND_MAX;
 					double r3 = double(rand())/RAND_MAX;
 
 					float d=Math::tan(Math::deg2rad(dl.spot_angle));
@@ -1994,7 +1991,6 @@ void BakedLightBaker::update_octree_images(DVector<uint8_t> &p_octree,DVector<ui
 	const double *normptr=norm_arr.ptr();
 */
 	double norm = 1.0/double(total_rays);
-	int lz=lights.size();
 	mult/=multiplier;
 	double saturation = baked_light->get_saturation();
 
@@ -2261,8 +2257,6 @@ void BakedLightBaker::_plot_pixel_to_lightmap(int x, int y, int width, int heigh
 					continue;
 				n/=len;
 
-				const BVH *bvhptr = bvh;
-
 				bstack[0]=bvh;
 				stack[0]=TEST_RAY_BIT;
 
@@ -2404,8 +2398,6 @@ Error BakedLightBaker::transfer_to_lightmaps() {
 	float gamma = baked_light->get_gamma_adjust();
 	float mult = baked_light->get_energy_multiplier();
 
-
-	const double *normptr=norm_arr.ptr();
 	for(int i=0;i<triangles.size();i++) {
 
 		if (i%200==0) {
@@ -2538,7 +2530,6 @@ Error BakedLightBaker::transfer_to_lightmaps() {
 
 			Vector<uint8_t> copy_data=bt.data;
 			uint8_t *data=bt.data.ptr();
-			uint8_t *src_data=copy_data.ptr();
 			const int max_radius=8;
 			const int shadow_radius=2;
 			const int max_dist=0x7FFFFFFF;
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp
index 0cbc867b47..db500cdcdf 100644
--- a/tools/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp
@@ -1382,6 +1382,8 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent& p_event) {
 				se->undo_state=canvas_item->edit_get_state();
 				if (canvas_item->cast_to<Node2D>())
 					se->undo_pivot=canvas_item->cast_to<Node2D>()->edit_get_pivot();
+				if (canvas_item->cast_to<Control>())
+					se->undo_pivot=Vector2();
 				return;
 			}
 
@@ -1566,14 +1568,34 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent& p_event) {
 			if (drag==DRAG_ROTATE) {
 
 				Vector2 center = canvas_item->get_global_transform_with_canvas().get_origin();
-				if (Node2D *node = canvas_item->cast_to<Node2D>()) {
-					Matrix32 rot;
-					rot.elements[1] = (dfrom - center).normalized();
-					rot.elements[0] = rot.elements[1].tangent();
-					node->set_rot(snap_angle(rot.xform_inv(dto-center).angle() + node->get_rot(), node->get_rot()));
-					display_rotate_to = dto;
-					display_rotate_from = center;
-					viewport->update();
+				{
+					Node2D *node = canvas_item->cast_to<Node2D>();
+
+
+					if (node) {
+						Matrix32 rot;
+						rot.elements[1] = (dfrom - center).normalized();
+						rot.elements[0] = rot.elements[1].tangent();
+						node->set_rot(snap_angle(rot.xform_inv(dto-center).angle() + node->get_rot(), node->get_rot()));
+						display_rotate_to = dto;
+						display_rotate_from = center;
+						viewport->update();
+					}
+				}
+
+				{
+					Control *node = canvas_item->cast_to<Control>();
+
+
+					if (node) {
+						Matrix32 rot;
+						rot.elements[1] = (dfrom - center).normalized();
+						rot.elements[0] = rot.elements[1].tangent();
+						node->set_rotation(snap_angle(rot.xform_inv(dto-center).angle() + node->get_rotation(), node->get_rotation()));
+						display_rotate_to = dto;
+						display_rotate_from = center;
+						viewport->update();
+					}
 				}
 
 				continue;
@@ -1918,8 +1940,6 @@ void CanvasItemEditor::_viewport_draw() {
 
 	Map<Node*,Object*> &selection = editor_selection->get_selection();
 
-	CanvasItem *single_item=NULL;
-
 	bool pivot_found=false;
 
 	for(Map<Node*,Object*>::Element *E=selection.front();E;E=E->next()) {
@@ -1939,15 +1959,6 @@ void CanvasItemEditor::_viewport_draw() {
 
 		Matrix32 xform=transform * canvas_item->get_global_transform_with_canvas();
 		VisualServer::get_singleton()->canvas_item_add_set_transform(ci,xform);
-		Point2 ofs=Point2();//get_global_pos();
-		Rect2 draw_rect=rect;
-		Color light_edit_color=Color(1.0,0.8,0.8);
-		Color dark_edit_color=Color(0.4,0.1,0.1);
-		Size2 handle_size=Size2(handle_len,handle_len);
-
-		//select_sb->draw(ci,draw_rect.grow(2));
-		//DRAW_EMPTY_RECT( draw_rect.grow(2), light_edit_color );
-		//DRAW_EMPTY_RECT( draw_rect.grow(1), dark_edit_color );
 
 		Vector2 endpoints[4]={
 
@@ -3352,25 +3363,25 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 
 	PopupMenu *p;
 	p = edit_menu->get_popup();
-	p->add_check_item(TTR("Use Snap"),SNAP_USE);
-	p->add_check_item(TTR("Show Grid"),SNAP_SHOW_GRID);
-	p->add_check_item(TTR("Use Rotation Snap"),SNAP_USE_ROTATION);
-	p->add_check_item(TTR("Snap Relative"),SNAP_RELATIVE);
-	p->add_item(TTR("Configure Snap.."),SNAP_CONFIGURE);
+	p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/use_snap", TTR("Use Snap")), SNAP_USE);
+	p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/show_grid", TTR("Show Grid")), SNAP_SHOW_GRID);
+	p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/use_rotation_snap", TTR("Use Rotation Snap")), SNAP_USE_ROTATION);
+	p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/snap_relative", TTR("Snap Relative")), SNAP_RELATIVE);
+	p->add_shortcut(ED_SHORTCUT("canvas_item_editor/configure_snap", TTR("Configure Snap..")), SNAP_CONFIGURE);
 	p->add_separator();
-	p->add_check_item(TTR("Use Pixel Snap"),SNAP_USE_PIXEL);
+	p->add_check_shortcut(ED_SHORTCUT("canvas_item_editor/use_pixel_snap", TTR("Use Pixel Snap")), SNAP_USE_PIXEL);
 	p->add_separator();
-	p->add_item(TTR("Expand to Parent"),EXPAND_TO_PARENT,KEY_MASK_CMD|KEY_P);
+	p->add_shortcut(ED_SHORTCUT("canvas_item_editor/expand_to_parent", TTR("Expand to Parent"), KEY_MASK_CMD | KEY_P), EXPAND_TO_PARENT);
 	p->add_separator();
 	p->add_submenu_item(TTR("Skeleton.."),"skeleton");
 	PopupMenu *p2 = memnew(PopupMenu);
 	p->add_child(p2);
 	p2->set_name("skeleton");
-	p2->add_item(TTR("Make Bones"),SKELETON_MAKE_BONES,KEY_MASK_CMD|KEY_MASK_SHIFT|KEY_B);
-	p2->add_item(TTR("Clear Bones"),SKELETON_CLEAR_BONES);
+	p2->add_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_make_bones", TTR("Make Bones"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_B ),SKELETON_MAKE_BONES);
+	p2->add_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_clear_bones", TTR("Clear Bones")), SKELETON_CLEAR_BONES);
 	p2->add_separator();
-	p2->add_item(TTR("Make IK Chain"),SKELETON_SET_IK_CHAIN);
-	p2->add_item(TTR("Clear IK Chain"),SKELETON_CLEAR_IK_CHAIN);
+	p2->add_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_set_ik_chain", TTR("Make IK Chain")), SKELETON_SET_IK_CHAIN);
+	p2->add_shortcut(ED_SHORTCUT("canvas_item_editor/skeleton_clear_ik_chain", TTR("Clear IK Chain")), SKELETON_CLEAR_IK_CHAIN);
 	p2->connect("item_pressed", this,"_popup_callback");
 
 
@@ -3387,13 +3398,13 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 
 	p = view_menu->get_popup();
 
-	p->add_item(TTR("Zoom In"),ZOOM_IN);
-	p->add_item(TTR("Zoom Out"),ZOOM_OUT);
-	p->add_item(TTR("Zoom Reset"),ZOOM_RESET);
-	p->add_item(TTR("Zoom Set.."),ZOOM_SET);
+	p->add_shortcut(ED_SHORTCUT("canvas_item_editor/zoom_in", TTR("Zoom In")), ZOOM_IN);
+	p->add_shortcut(ED_SHORTCUT("canvas_item_editor/zoom_out", TTR("Zoom Out")), ZOOM_OUT);
+	p->add_shortcut(ED_SHORTCUT("canvas_item_editor/zoom_reset", TTR("Zoom Reset")), ZOOM_RESET);
+	p->add_shortcut(ED_SHORTCUT("canvas_item_editor/zoom_set", TTR("Zoom Set..")), ZOOM_SET);
 	p->add_separator();
-	p->add_item(TTR("Center Selection"), VIEW_CENTER_TO_SELECTION, KEY_F);
-	p->add_item(TTR("Frame Selection"), VIEW_FRAME_TO_SELECTION, KEY_MASK_CMD|KEY_F);
+	p->add_shortcut(ED_SHORTCUT("canvas_item_editor/center_selection", TTR("Center Selection"), KEY_F), VIEW_CENTER_TO_SELECTION);
+	p->add_shortcut(ED_SHORTCUT("canvas_item_editor/frame_selection", TTR("Frame Selection"), KEY_MASK_CMD | KEY_F), VIEW_FRAME_TO_SELECTION);
 
 	anchor_menu = memnew( MenuButton );
 	anchor_menu->set_text(TTR("Anchor"));
@@ -3436,7 +3447,8 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 	key_insert_button = memnew( Button );
 	key_insert_button->set_focus_mode(FOCUS_NONE);
 	key_insert_button->connect("pressed",this,"_popup_callback",varray(ANIM_INSERT_KEY));
-	key_insert_button->set_tooltip(TTR("Insert Keys (Ins)"));
+	key_insert_button->set_tooltip(TTR("Insert Keys"));
+	key_insert_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/anim_insert_key", TTR("Insert Key"), KEY_INSERT));
 
 	animation_hb->add_child(key_insert_button);
 
@@ -3447,12 +3459,12 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 
 	p = animation_menu->get_popup();
 
-	p->add_item(TTR("Insert Key"),ANIM_INSERT_KEY,KEY_INSERT);
-	p->add_item(TTR("Insert Key (Existing Tracks)"),ANIM_INSERT_KEY_EXISTING,KEY_MASK_CMD+KEY_INSERT);
+	p->add_shortcut(ED_GET_SHORTCUT("canvas_item_editor/anim_insert_key"), ANIM_INSERT_KEY);
+	p->add_shortcut(ED_SHORTCUT("canvas_item_editor/anim_insert_key_existing_tracks", TTR("Insert Key (Existing Tracks)"), KEY_MASK_CMD+KEY_INSERT), ANIM_INSERT_KEY_EXISTING);
 	p->add_separator();
-	p->add_item(TTR("Copy Pose"),ANIM_COPY_POSE);
-	p->add_item(TTR("Paste Pose"),ANIM_PASTE_POSE);
-	p->add_item(TTR("Clear Pose"),ANIM_CLEAR_POSE,KEY_MASK_SHIFT|KEY_K);
+	p->add_shortcut(ED_SHORTCUT("canvas_item_editor/anim_copy_pose", TTR("Copy Pose")), ANIM_COPY_POSE);
+	p->add_shortcut(ED_SHORTCUT("canvas_item_editor/anim_paste_pose", TTR("Paste Pose")), ANIM_PASTE_POSE);
+	p->add_shortcut(ED_SHORTCUT("canvas_item_editor/anim_clear_pose", TTR("Clear Pose"), KEY_MASK_SHIFT | KEY_K), ANIM_CLEAR_POSE);
 
 	snap_dialog = memnew( SnapDialog );
 	snap_dialog->connect("confirmed",this,"_snap_changed");
diff --git a/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp b/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp
index 5ed9f8ab5f..95364e8921 100644
--- a/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp
+++ b/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp
@@ -349,8 +349,6 @@ void CollisionPolygon2DEditor::_canvas_draw() {
 	Matrix32 xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
 	Ref<Texture> handle= get_icon("EditorHandle","EditorIcons");
 
-	int len = poly.size();
-
 	for(int i=0;i<poly.size();i++) {
 
 
diff --git a/tools/editor/plugins/collision_polygon_editor_plugin.cpp b/tools/editor/plugins/collision_polygon_editor_plugin.cpp
index b18afe7838..0b06b3ba21 100644
--- a/tools/editor/plugins/collision_polygon_editor_plugin.cpp
+++ b/tools/editor/plugins/collision_polygon_editor_plugin.cpp
@@ -381,8 +381,6 @@ void CollisionPolygonEditor::_polygon_draw() {
 		poly=node->get_polygon();
 
 
-
-	int len = poly.size();
 	float depth = node->get_depth()*0.5;
 
 	imgeom->clear();
@@ -586,7 +584,7 @@ CollisionPolygonEditor::CollisionPolygonEditor(EditorNode *p_editor) {
 	handle_material->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(1,1,1));
 	handle_material->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);
 	handle_material->set_fixed_flag(FixedMaterial::FLAG_USE_COLOR_ARRAY, false);
-	Ref<Texture> handle= SpatialEditor::get_singleton()->get_icon("Editor3DHandle","EditorIcons");
+	Ref<Texture> handle=editor->get_gui_base()->get_icon("Editor3DHandle","EditorIcons");
 	handle_material->set_point_size(handle->get_width());
 	handle_material->set_texture(FixedMaterial::PARAM_DIFFUSE,handle);
 
diff --git a/tools/editor/plugins/editor_preview_plugins.cpp b/tools/editor/plugins/editor_preview_plugins.cpp
index a057e6c2a1..b1bce60484 100644
--- a/tools/editor/plugins/editor_preview_plugins.cpp
+++ b/tools/editor/plugins/editor_preview_plugins.cpp
@@ -36,6 +36,7 @@
 #include "scene/resources/mesh.h"
 #include "scene/resources/bit_mask.h"
 #include "tools/editor/editor_scale.h"
+
 bool EditorTexturePreviewPlugin::handles(const String& p_type) const {
 
 	return (ObjectTypeDB::is_type(p_type,"ImageTexture") || ObjectTypeDB::is_type(p_type, "AtlasTexture"));
@@ -442,7 +443,6 @@ Ref<Texture> EditorScriptPreviewPlugin::generate(const RES& p_from) {
 	Color keyword_color = EditorSettings::get_singleton()->get("text_editor/keyword_color");
 	Color text_color = EditorSettings::get_singleton()->get("text_editor/text_color");
 	Color symbol_color = EditorSettings::get_singleton()->get("text_editor/symbol_color");
-	Color comment_color = EditorSettings::get_singleton()->get("text_editor/comment_color");
 
 
 	for(int i=0;i<thumbnail_size;i++) {
@@ -607,7 +607,7 @@ Ref<Texture> EditorSamplePreviewPlugin::generate(const RES& p_from) {
 						-1, -1, -1, -1, 2, 4, 6, 8
 					};
 
-					int16_t nibble,signed_nibble,diff,step;
+					int16_t nibble,diff,step;
 
 					ima_adpcm.last_nibble++;
 					const uint8_t *src_ptr=sdata;
@@ -628,10 +628,6 @@ Ref<Texture> EditorSamplePreviewPlugin::generate(const RES& p_from) {
 					if (ima_adpcm.step_index>88)
 						ima_adpcm.step_index=88;
 
-					/*
-					signed_nibble = (nibble&7) * ((nibble&8)?-1:1);
-					diff = (2 * signed_nibble + 1) * step / 4; */
-
 					diff = step >> 3 ;
 					if (nibble & 1)
 						diff += step >> 2 ;
@@ -748,15 +744,13 @@ Ref<Texture> EditorSamplePreviewPlugin::generate(const RES& p_from) {
 
 				for(int j=0;j<h;j++) {
 
-					int half,ofs;
+					int half;
 					float v;
 					if (j<(h/2)) {
 						half=0;
-						ofs=0;
 						v = (j/(float)(h/2)) * 2.0 - 1.0;
 					} else {
 						half=1;
-						ofs=h/2;
 						if( (float)(h/2) != 0 ) {
 							v = ((j-(h/2))/(float)(h/2)) * 2.0 - 1.0;
 						} else {
diff --git a/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp b/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
index 14e7b14fc3..56e58bc983 100644
--- a/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+++ b/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
@@ -364,8 +364,6 @@ void LightOccluder2DEditor::_canvas_draw() {
 	Matrix32 xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
 	Ref<Texture> handle= get_icon("EditorHandle","EditorIcons");
 
-	int len = poly.size();
-
 	for(int i=0;i<poly.size();i++) {
 
 
diff --git a/tools/editor/plugins/navigation_polygon_editor_plugin.cpp b/tools/editor/plugins/navigation_polygon_editor_plugin.cpp
index 5a8cd8791e..22546c72f3 100644
--- a/tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+++ b/tools/editor/plugins/navigation_polygon_editor_plugin.cpp
@@ -427,8 +427,6 @@ void NavigationPolygonEditor::_canvas_draw() {
 			poly = Variant(node->get_navigation_polygon()->get_outline(j));
 		}
 
-		int len = poly.size();
-
 		for(int i=0;i<poly.size();i++) {
 
 
diff --git a/tools/editor/plugins/particles_editor_plugin.cpp b/tools/editor/plugins/particles_editor_plugin.cpp
index 93e2fb2f38..7e20cc3f54 100644
--- a/tools/editor/plugins/particles_editor_plugin.cpp
+++ b/tools/editor/plugins/particles_editor_plugin.cpp
@@ -283,7 +283,6 @@ void ParticlesEditor::_generate_emission_points() {
 				ofs=(Vector3(1,1,1)-dir)*Vector3(Math::randf(),Math::randf(),Math::randf())*aabb.size;
 				ofs+=aabb.pos;
 
-				Vector3 dirv = -dir;
 				Vector3 ofsv = ofs + aabb.size * dir;
 
 				//space it a little
diff --git a/tools/editor/plugins/polygon_2d_editor_plugin.cpp b/tools/editor/plugins/polygon_2d_editor_plugin.cpp
index d78508c429..19d1ccc06f 100644
--- a/tools/editor/plugins/polygon_2d_editor_plugin.cpp
+++ b/tools/editor/plugins/polygon_2d_editor_plugin.cpp
@@ -466,8 +466,6 @@ void Polygon2DEditor::_canvas_draw() {
 	Matrix32 xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
 	Ref<Texture> handle= get_icon("EditorHandle","EditorIcons");
 
-	int len = poly.size();
-
 	for(int i=0;i<poly.size();i++) {
 
 
diff --git a/tools/editor/plugins/sample_editor_plugin.cpp b/tools/editor/plugins/sample_editor_plugin.cpp
index b094184a29..7965fa54ae 100644
--- a/tools/editor/plugins/sample_editor_plugin.cpp
+++ b/tools/editor/plugins/sample_editor_plugin.cpp
@@ -151,7 +151,7 @@ void SampleEditor::generate_preview_texture(const Ref<Sample>& p_sample,Ref<Imag
 						-1, -1, -1, -1, 2, 4, 6, 8
 					};
 
-					int16_t nibble,signed_nibble,diff,step;
+					int16_t nibble,diff,step;
 
 					ima_adpcm.last_nibble++;
 					const uint8_t *src_ptr=sdata;
@@ -172,10 +172,6 @@ void SampleEditor::generate_preview_texture(const Ref<Sample>& p_sample,Ref<Imag
 					if (ima_adpcm.step_index>88)
 						ima_adpcm.step_index=88;
 
-					/*
-					signed_nibble = (nibble&7) * ((nibble&8)?-1:1);
-					diff = (2 * signed_nibble + 1) * step / 4; */
-
 					diff = step >> 3 ;
 					if (nibble & 1)
 						diff += step >> 2 ;
@@ -285,15 +281,13 @@ void SampleEditor::generate_preview_texture(const Ref<Sample>& p_sample,Ref<Imag
 
 				for(int j=0;j<h;j++) {
 
-					int half,ofs;
+					int half;
 					float v;
 					if (j<(h/2)) {
 						half=0;
-						ofs=0;
 						v = (j/(float)(h/2)) * 2.0 - 1.0;
 					} else {
 						half=1;
-						ofs=h/2;
 						v = ((j-(h/2))/(float)(h/2)) * 2.0 - 1.0;
 					}
 
@@ -324,12 +318,13 @@ void SampleEditor::generate_preview_texture(const Ref<Sample>& p_sample,Ref<Imag
 void SampleEditor::_update_sample() {
 
 	player->stop_all();
-	if (sample->get_format()==Sample::FORMAT_IMA_ADPCM)
-		return; //bye or unsupported
 
 	generate_preview_texture(sample,peakdisplay);
 	info_label->set_text(TTR("Length:")+" "+String::num(sample->get_length()/(float)sample->get_mix_rate(),2)+"s");
 
+	if (library->has_sample("default"))
+		library->remove_sample("default");
+
 	library->add_sample("default",sample);
 }
 
diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp
index 7de80e767b..3b095d15f9 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/tools/editor/plugins/script_editor_plugin.cpp
@@ -43,6 +43,28 @@
 /*** SCRIPT EDITOR ****/
 
 
+static bool _can_open_in_editor(Script* p_script) {
+
+	String path = p_script->get_path();
+
+	if (path.find("::")!=-1) {
+		//refuse handling this if it can't be edited
+
+		bool valid=false;
+		for(int i=0;i<EditorNode::get_singleton()->get_editor_data().get_edited_scene_count();i++) {
+			if (path.begins_with(EditorNode::get_singleton()->get_editor_data().get_scene_path(i))) {
+				valid=true;
+				break;
+			}
+		}
+
+		return valid;
+	}
+
+	return true;
+}
+
+
 class EditorScriptCodeCompletionCache : public ScriptCodeCompletionCache {
 
 
@@ -287,6 +309,9 @@ void ScriptTextEditor::_load_theme_settings() {
 
 
 	get_text_edit()->set_custom_bg_color(EDITOR_DEF("text_editor/background_color",Color(0,0,0,0)));
+	get_text_edit()->add_color_override("completion_background_color", EDITOR_DEF("text_editor/completion_background_color", Color(0,0,0,0)));
+	get_text_edit()->add_color_override("completion_selected_color", EDITOR_DEF("text_editor/completion_selected_color", Color::html("434244")));
+	get_text_edit()->add_color_override("completion_existing_color", EDITOR_DEF("text_editor/completion_existing_color", Color::html("21dfdfdf")));
 	get_text_edit()->add_color_override("font_color",EDITOR_DEF("text_editor/text_color",Color(0,0,0)));
 	get_text_edit()->add_color_override("line_number_color",EDITOR_DEF("text_editor/line_number_color",Color(0,0,0)));
 	get_text_edit()->add_color_override("caret_color",EDITOR_DEF("text_editor/caret_color",Color(0,0,0)));
@@ -582,7 +607,6 @@ void ScriptTextEditor::_code_complete_script(const String& p_code, List<String>*
 	Error err = script->get_language()->complete_code(p_code,script->get_path().get_base_dir(),base,r_options,hint);
 	if (hint!="") {
 		get_text_edit()->set_code_hint(hint);
-		print_line("hint: "+hint.replace(String::chr(0xFFFF),"|"));
 	}
 
 }
@@ -745,9 +769,9 @@ void ScriptEditor::_go_to_tab(int p_idx) {
 	_update_script_colors();
 }
 
-void ScriptEditor::_close_current_tab() {
+void ScriptEditor::_close_tab(int p_idx) {
 
-	int selected = tab_container->get_current_tab();
+	int selected = p_idx;
 	if (selected<0 || selected>=tab_container->get_child_count())
 		return;
 
@@ -793,6 +817,11 @@ void ScriptEditor::_close_current_tab() {
 
 	_update_script_names();
 	EditorNode::get_singleton()->save_layout();
+}
+
+void ScriptEditor::_close_current_tab() {
+
+	_close_tab(tab_container->get_current_tab());
 
 }
 
@@ -845,6 +874,15 @@ void ScriptEditor::_reload_scripts(){
 		}
 
 
+		uint64_t last_date = script->get_last_modified_time();
+		uint64_t date = FileAccess::get_modified_time(script->get_path());
+
+		//printf("last date: %lli vs date: %lli\n",last_date,date);
+		if (last_date==date) {
+			continue;
+		}
+
+
 		Ref<Script> rel_script = ResourceLoader::load(script->get_path(),script->get_type(),true);
 		ERR_CONTINUE(!rel_script.is_valid());
 		script->set_source_code( rel_script->get_source_code() );
@@ -1135,6 +1173,7 @@ void ScriptEditor::_menu_option(int p_option) {
 				if (trim_trailing_whitespace_on_save) {
 					_trim_trailing_whitespace(current->get_text_edit());
 				}
+				editor->push_item(current->get_edited_script()->cast_to<Object>());
 				editor->save_resource_as( current->get_edited_script() );
 
 			} break;
@@ -1678,6 +1717,33 @@ void ScriptEditor::_notification(int p_what) {
 
 }
 
+
+void ScriptEditor::close_builtin_scripts_from_scene(const String& p_scene) {
+
+
+
+	for(int i=0;i<tab_container->get_child_count();i++) {
+
+		ScriptTextEditor *ste = tab_container->get_child(i)->cast_to<ScriptTextEditor>();
+
+		if (ste) {
+
+			Ref<Script> script = ste->get_edited_script();
+			if (!script.is_valid())
+				continue;
+
+			if (script->get_path().find("::")!=-1 && script->get_path().begins_with(p_scene)) { //is an internal script and belongs to scene being closed
+				_close_tab(i);
+				i--;
+
+			}
+		}
+
+	}
+
+
+}
+
 void ScriptEditor::edited_scene_changed() {
 
 	_update_modified_scripts_for_external_editor();
@@ -2056,11 +2122,18 @@ void ScriptEditor::_update_script_names() {
 
 }
 
+
+
 void ScriptEditor::edit(const Ref<Script>& p_script) {
 
 	if (p_script.is_null())
 		return;
 
+	// refuse to open built-in if scene is not loaded
+
+
+
+
 	// see if already has it
 
 	bool open_dominant = EditorSettings::get_singleton()->get("text_editor/open_dominant_script_on_scene_change");
@@ -2312,6 +2385,22 @@ void ScriptEditor::_script_split_dragged(float) {
 	EditorNode::get_singleton()->save_layout();
 }
 
+void ScriptEditor::_unhandled_input(const InputEvent& p_event) {
+	if (p_event.key.pressed || !is_visible()) return;
+	if (ED_IS_SHORTCUT("script_editor/next_script", p_event)) {
+		int next_tab = script_list->get_current() + 1;
+		next_tab %= script_list->get_item_count();
+		_go_to_tab(script_list->get_item_metadata(next_tab));
+		_update_script_names();
+	}
+	if (ED_IS_SHORTCUT("script_editor/prev_script", p_event)) {
+		int next_tab = script_list->get_current() - 1;
+		next_tab = next_tab >= 0 ? next_tab : script_list->get_item_count() - 1;
+		_go_to_tab(script_list->get_item_metadata(next_tab));
+		_update_script_names();
+	}
+}
+
 void ScriptEditor::set_window_layout(Ref<ConfigFile> p_layout) {
 
 	if (!bool(EDITOR_DEF("text_editor/restore_scripts_on_load",true))) {
@@ -2331,6 +2420,8 @@ void ScriptEditor::set_window_layout(Ref<ConfigFile> p_layout) {
 	for(int i=0;i<scripts.size();i++) {
 
 		String path = scripts[i];
+		if (!FileAccess::exists(path))
+			continue;
 		Ref<Script> scr = ResourceLoader::load(path);
 		if (scr.is_valid()) {
 			edit(scr);
@@ -2508,7 +2599,7 @@ void ScriptEditor::set_scene_root_script( Ref<Script> p_script ) {
 	if (bool(EditorSettings::get_singleton()->get("external_editor/use_external_editor")))
 		return;
 
-	if (open_dominant && p_script.is_valid()) {
+	if (open_dominant && p_script.is_valid() && _can_open_in_editor(p_script.ptr())) {
 		edit(p_script);
 	}
 }
@@ -2594,6 +2685,7 @@ void ScriptEditor::_bind_methods() {
 	ObjectTypeDB::bind_method("_history_forward",&ScriptEditor::_history_forward);
 	ObjectTypeDB::bind_method("_history_back",&ScriptEditor::_history_back);
 	ObjectTypeDB::bind_method("_live_auto_reload_running_scripts",&ScriptEditor::_live_auto_reload_running_scripts);
+	ObjectTypeDB::bind_method("_unhandled_input",&ScriptEditor::_unhandled_input);
 
 }
 
@@ -2627,6 +2719,10 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
 
 	tab_container->set_h_size_flags(SIZE_EXPAND_FILL);
 
+	ED_SHORTCUT("script_editor/next_script", TTR("Next script"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_GREATER);
+	ED_SHORTCUT("script_editor/prev_script", TTR("Previous script"), KEY_MASK_CMD | KEY_LESS);
+	set_process_unhandled_input(true);
+
 	file_menu = memnew( MenuButton );
 	menu_hb->add_child(file_menu);
 	file_menu->set_text(TTR("File"));
@@ -2891,6 +2987,16 @@ void ScriptEditorPlugin::edit(Object *p_object) {
 
 bool ScriptEditorPlugin::handles(Object *p_object) const {
 
+	if (p_object->cast_to<Script>()) {
+
+		bool valid = _can_open_in_editor(p_object->cast_to<Script>());
+
+		if (!valid) { //user tried to open it by clicking
+			EditorNode::get_singleton()->show_warning(TTR("Built-in scripts can only be edited when the scene they belong to is loaded"));
+		}
+		return valid;
+	}
+
 	return p_object->is_type("Script");
 }
 
diff --git a/tools/editor/plugins/script_editor_plugin.h b/tools/editor/plugins/script_editor_plugin.h
index 0636190a41..2e6e2c035c 100644
--- a/tools/editor/plugins/script_editor_plugin.h
+++ b/tools/editor/plugins/script_editor_plugin.h
@@ -234,6 +234,8 @@ class ScriptEditor : public VBoxContainer {
 
 	bool _test_script_times_on_disk(Ref<Script> p_for_script=Ref<Script>());
 
+	void _close_tab(int p_idx);
+
 	void _close_current_tab();
 
 	bool grab_focus_block;
@@ -279,6 +281,8 @@ class ScriptEditor : public VBoxContainer {
 
 	void _script_split_dragged(float);
 
+	void _unhandled_input(const InputEvent& p_event);
+
 
 	void _history_forward();
 	void _history_back();
@@ -329,6 +333,8 @@ public:
 
 	virtual void edited_scene_changed();
 
+	void close_builtin_scripts_from_scene(const String& p_scene);
+
 	ScriptEditorDebugger *get_debugger() { return debugger; }
 	void set_live_auto_reload_running_scripts(bool p_enabled);
 
diff --git a/tools/editor/plugins/shader_editor_plugin.cpp b/tools/editor/plugins/shader_editor_plugin.cpp
index 83db650952..864df42b6e 100644
--- a/tools/editor/plugins/shader_editor_plugin.cpp
+++ b/tools/editor/plugins/shader_editor_plugin.cpp
@@ -78,6 +78,9 @@ void ShaderTextEditor::_load_theme_settings() {
 	/* keyword color */
 
 	get_text_edit()->set_custom_bg_color(EDITOR_DEF("text_editor/background_color",Color(0,0,0,0)));
+	get_text_edit()->add_color_override("completion_background_color", EDITOR_DEF("text_editor/completion_background_color", Color(0,0,0,0)));
+	get_text_edit()->add_color_override("completion_selected_color", EDITOR_DEF("text_editor/completion_selected_color", Color::html("434244")));
+	get_text_edit()->add_color_override("completion_existing_color", EDITOR_DEF("text_editor/completion_existing_color", Color::html("21dfdfdf")));
 	get_text_edit()->add_color_override("font_color",EDITOR_DEF("text_editor/text_color",Color(0,0,0)));
 	get_text_edit()->add_color_override("line_number_color",EDITOR_DEF("text_editor/line_number_color",Color(0,0,0)));
 	get_text_edit()->add_color_override("caret_color",EDITOR_DEF("text_editor/caret_color",Color(0,0,0)));
@@ -115,9 +118,10 @@ void ShaderTextEditor::_load_theme_settings() {
 
 	get_text_edit()->add_color_region("/*","*/",comment_color,false);
 	get_text_edit()->add_color_region("//","",comment_color,false);
-	//colorize strings
+
+	/*//colorize strings
 	Color string_color = EDITOR_DEF("text_editor/string_color",Color::hex(0x6b6f00ff));
-	/*
+
 	List<String> strings;
 	shader->get_shader_mode()->get_string_delimiters(&strings);
 
@@ -496,7 +500,7 @@ ShaderEditor::ShaderEditor() {
 	edit_menu->set_pos(Point2(5,-1));
 	edit_menu->set_text(TTR("Edit"));
 	edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/undo", TTR("Undo"), KEY_MASK_CMD|KEY_Z), EDIT_UNDO);
-	edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/redo", TTR("Redo"), KEY_MASK_CMD|KEY_MASK_SHIFT|KEY_Z), EDIT_REDO);
+	edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/redo", TTR("Redo"), KEY_MASK_CMD|KEY_Y), EDIT_REDO);
 	edit_menu->get_popup()->add_separator();
 	edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/cut", TTR("Cut"), KEY_MASK_CMD|KEY_X), EDIT_CUT);
 	edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/copy", TTR("Copy"), KEY_MASK_CMD|KEY_C), EDIT_COPY);
@@ -516,7 +520,7 @@ ShaderEditor::ShaderEditor() {
 	search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/replace", TTR("Replace.."), KEY_MASK_CMD|KEY_R), SEARCH_REPLACE);
 	search_menu->get_popup()->add_separator();
 //	search_menu->get_popup()->add_item("Locate Symbol..",SEARCH_LOCATE_SYMBOL,KEY_MASK_CMD|KEY_K);
-	search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/goto_line", TTR("Goto Line.."), KEY_MASK_CMD|KEY_G), SEARCH_GOTO_LINE);
+	search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/goto_line", TTR("Goto Line.."), KEY_MASK_CMD|KEY_L), SEARCH_GOTO_LINE);
 	search_menu->get_popup()->connect("item_pressed", this,"_menu_option");
 
 
diff --git a/tools/editor/plugins/shader_graph_editor_plugin.cpp b/tools/editor/plugins/shader_graph_editor_plugin.cpp
index d567c8e9b3..375220051c 100644
--- a/tools/editor/plugins/shader_graph_editor_plugin.cpp
+++ b/tools/editor/plugins/shader_graph_editor_plugin.cpp
@@ -176,7 +176,9 @@ void GraphColorRampEdit::_input_event(const InputEvent& p_event) {
 void GraphColorRampEdit::_notification(int p_what){
 
 	if (p_what==NOTIFICATION_ENTER_TREE) {
-		picker->connect("color_changed",this,"_color_changed");
+		if (!picker->is_connected("color_changed",this,"_color_changed")) {
+			picker->connect("color_changed",this,"_color_changed");
+		}
 	}
 	if (p_what==NOTIFICATION_DRAW) {
 
@@ -184,9 +186,8 @@ void GraphColorRampEdit::_notification(int p_what){
 		Point prev;
 		prev.offset=0;
 		prev.color=Color(0,0,0);
-		int w = get_size().x;
-		int h = get_size().y;
 
+		int h = get_size().y;
 		int total_w = get_size().width-get_size().height-3;
 
 		for(int i=-1;i<points.size();i++) {
diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp
index 8d72178f23..a70df78697 100644
--- a/tools/editor/plugins/spatial_editor_plugin.cpp
+++ b/tools/editor/plugins/spatial_editor_plugin.cpp
@@ -53,8 +53,6 @@
 
 void SpatialEditorViewport::_update_camera() {
 	if (orthogonal) {
-		Size2 size = get_size();
-		Size2 vpsize = Point2(cursor.distance*size.get_aspect(), cursor.distance / size.get_aspect());
 		//camera->set_orthogonal(size.width*cursor.distance,get_znear(),get_zfar());
 		camera->set_orthogonal(2 * cursor.distance, 0.1, 8192);
 	}
@@ -79,21 +77,30 @@ void SpatialEditorViewport::_update_camera() {
 
 String SpatialEditorGizmo::get_handle_name(int p_idx) const {
 
+	if (get_script_instance() && get_script_instance()->has_method("get_handle_name"))
+		return get_script_instance()->call("get_handle_name", p_idx);
+
 	return "";
 }
 
 Variant SpatialEditorGizmo::get_handle_value(int p_idx) const{
 
+	if (get_script_instance() && get_script_instance()->has_method("get_handle_value"))
+		return get_script_instance()->call("get_handle_value", p_idx);
+
 	return Variant();
 }
 
 void SpatialEditorGizmo::set_handle(int p_idx,Camera *p_camera, const Point2& p_point) {
 
+	if (get_script_instance() && get_script_instance()->has_method("set_handle"))
+		get_script_instance()->call("set_handle", p_idx, p_camera, p_point);
 }
 
 void SpatialEditorGizmo::commit_handle(int p_idx,const Variant& p_restore,bool p_cancel){
 
-
+	if (get_script_instance() && get_script_instance()->has_method("commit_handle"))
+		get_script_instance()->call("commit_handle", p_idx, p_restore, p_cancel);
 }
 
 bool SpatialEditorGizmo::intersect_frustum(const Camera *p_camera,const Vector<Plane> &p_frustum) {
@@ -276,10 +283,6 @@ ObjectID SpatialEditorViewport::_select_ray(const Point2& p_pos, bool p_append,b
 	r_includes_current=false;
 
 	List<_RayResult> results;
-	Vector3 cn=_get_camera_normal();
-	Plane cplane(pos,cn.normalized());
-
-	float min_d=1e20;
 
 	for (int i=0;i<instances.size();i++) {
 
@@ -649,21 +652,8 @@ bool SpatialEditorViewport::_gizmo_select(const Vector2& p_screenpos,bool p_hili
 	Vector3 ray_pos=_get_ray_pos( Vector2( p_screenpos.x, p_screenpos.y ) );
 	Vector3 ray=_get_ray( Vector2( p_screenpos.x, p_screenpos.y ) );
 
-	Vector3 cn=_get_camera_normal();
-	Plane cplane(ray_pos,cn.normalized());
-
 	Transform gt = spatial_editor->get_gizmo_transform();
 	float gs=gizmo_scale;
-	/*
-	if (orthogonal) {
-		gs= cursor.distance/surface->get_size().get_aspect();
-
-	} else {
-		gs = cplane.distance_to(gt.origin);
-	}
-
-	gs*=GIZMO_SCALE_DEFAULT;
-*/
 
 	if (spatial_editor->get_tool_mode()==SpatialEditor::TOOL_MODE_SELECT || spatial_editor->get_tool_mode()==SpatialEditor::TOOL_MODE_MOVE) {
 
@@ -1268,16 +1258,6 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
 
 			if (_edit.gizmo.is_valid()) {
 
-				Plane plane=Plane(_edit.gizmo_initial_pos,_get_camera_normal());
-
-
-				Vector3 ray_pos=_get_ray_pos( Vector2( m.x, m.y ) );
-				Vector3 ray=_get_ray( Vector2( m.x, m.y ) );
-
-				//Vector3 intersection;
-				//if (!plane.intersects_ray(ray_pos,ray,&intersection))
-				//	break;
-
 				_edit.gizmo->set_handle(_edit.gizmo_handle,camera,Vector2(m.x,m.y));
 				Variant v = _edit.gizmo->get_handle_value(_edit.gizmo_handle);
 				String n = _edit.gizmo->get_handle_name(_edit.gizmo_handle);
@@ -1658,136 +1638,89 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
 				default: {}
 			}
 		} break;
-
 		case InputEvent::KEY: {
-
 			const InputEventKey &k = p_event.key;
 			if (!k.pressed)
 				break;
-			switch(k.scancode) {
-
-				case KEY_S: {
-
-					if (_edit.mode!=TRANSFORM_NONE) {
-
-						_edit.snap=true;
-					}
-				} break;
-				case KEY_7:
-				case KEY_KP_7: {
-					bool emulate_numpad = EditorSettings::get_singleton()->get("3d_editor/emulate_numpad");
-					if (!emulate_numpad && k.scancode==KEY_7)
-						return;
-					cursor.y_rot=0;
-					if (k.mod.shift) {
-						cursor.x_rot=-Math_PI/2.0;
-						set_message(TTR("Bottom View."),2);
-						name=TTR("Bottom");
-						_update_name();
-
-					} else {
-						cursor.x_rot=Math_PI/2.0;
-						set_message(TTR("Top View."),2);
-						name=TTR("Top");
-						_update_name();
-					}
-				} break;
-				case KEY_1:
-				case KEY_KP_1: {
-					bool emulate_numpad = EditorSettings::get_singleton()->get("3d_editor/emulate_numpad");
-					if (!emulate_numpad && k.scancode==KEY_1)
-						return;
-					cursor.x_rot=0;
-					if (k.mod.shift) {
-						cursor.y_rot=Math_PI;
-						set_message(TTR("Rear View."),2);
-						name=TTR("Rear");
-						_update_name();
-
-					} else {
-						cursor.y_rot=0;
-						set_message(TTR("Front View."),2);
-						name=TTR("Front");
-						_update_name();
-					}
-
-				} break;
-				case KEY_3:
-				case KEY_KP_3: {
-					bool emulate_numpad = EditorSettings::get_singleton()->get("3d_editor/emulate_numpad");
-					if (!emulate_numpad && k.scancode==KEY_3)
-						return;
-					cursor.x_rot=0;
-					if (k.mod.shift) {
-						cursor.y_rot=Math_PI/2.0;
-						set_message(TTR("Left View."),2);
-						name=TTR("Left");
-						_update_name();
-					} else {
-						cursor.y_rot=-Math_PI/2.0;
-						set_message(TTR("Right View."),2);
-						name=TTR("Right");
-						_update_name();
-					}
-
-				} break;
-				case KEY_5:
-				case KEY_KP_5: {
-					bool emulate_numpad = EditorSettings::get_singleton()->get("3d_editor/emulate_numpad");
-					if (!emulate_numpad && k.scancode==KEY_5)
-						return;
-
-					//orthogonal = !orthogonal;
-					_menu_option(orthogonal?VIEW_PERSPECTIVE:VIEW_ORTHOGONAL);
-					_update_name();
-
-
-				} break;
-				case KEY_K: {
-
-					if (!get_selected_count() || _edit.mode!=TRANSFORM_NONE)
-						break;
-
-					if (!AnimationPlayerEditor::singleton->get_key_editor()->has_keying()) {
-						set_message(TTR("Keying is disabled (no key inserted)."));
-						break;
-					}
-
-					List<Node*> &selection = editor_selection->get_selected_node_list();
-
-					for(List<Node*>::Element *E=selection.front();E;E=E->next()) {
-
-						Spatial *sp = E->get()->cast_to<Spatial>();
-						if (!sp)
-							continue;
-
-						emit_signal("transform_key_request",sp,"",sp->get_transform());
-					}
-
-
-					set_message(TTR("Animation Key Inserted."));
 
+			if (ED_IS_SHORTCUT("spatial_editor/snap", p_event)) {
+				if (_edit.mode != TRANSFORM_NONE) {
+					_edit.snap=true;
+				}
+			}
+			if (ED_IS_SHORTCUT("spatial_editor/bottom_view", p_event)) {
+				cursor.y_rot = 0;
+				cursor.x_rot = -Math_PI/2.0;
+				set_message(TTR("Bottom View."),2);
+				name = TTR("Bottom");
+				_update_name();
+			}
+			if (ED_IS_SHORTCUT("spatial_editor/top_view", p_event)) {
+				cursor.y_rot = 0;
+				cursor.x_rot = Math_PI/2.0;
+				set_message(TTR("Top View."),2);
+				name = TTR("Top");
+				_update_name();
+			}
+			if (ED_IS_SHORTCUT("spatial_editor/rear_view", p_event)) {
+				cursor.x_rot = 0;
+				cursor.y_rot = Math_PI;
+				set_message(TTR("Rear View."),2);
+				name = TTR("Rear");
+				_update_name();
+			}
+			if (ED_IS_SHORTCUT("spatial_editor/front_view", p_event)) {
+				cursor.x_rot = 0;
+				cursor.y_rot=0;
+				set_message(TTR("Front View."),2);
+				name=TTR("Front");
+				_update_name();
+			}
+			if (ED_IS_SHORTCUT("spatial_editor/left_view", p_event)) {
+				cursor.x_rot=0;
+				cursor.y_rot = Math_PI/2.0;
+				set_message(TTR("Left View."),2);
+				name = TTR("Left");
+				_update_name();
+			}
+			if (ED_IS_SHORTCUT("spatial_editor/right_view", p_event)) {
+				cursor.x_rot=0;
+				cursor.y_rot = -Math_PI/2.0;
+				set_message(TTR("Right View."),2);
+				name = TTR("Right");
+				_update_name();
+			}
+			if (ED_IS_SHORTCUT("spatial_editor/switch_perspective_orthogonal", p_event)) {
+				_menu_option(orthogonal?VIEW_PERSPECTIVE:VIEW_ORTHOGONAL);
+				_update_name();
+			}
+			if (ED_IS_SHORTCUT("spatial_editor/insert_anim_key", p_event)) {
+				if (!get_selected_count() || _edit.mode!=TRANSFORM_NONE)
+					break;
 
+				if (!AnimationPlayerEditor::singleton->get_key_editor()->has_keying()) {
+					set_message(TTR("Keying is disabled (no key inserted)."));
+					break;
+				}
 
-				} break;
+				List<Node*> &selection = editor_selection->get_selected_node_list();
 
-				case KEY_F: {
+				for(List<Node*>::Element *E=selection.front();E;E=E->next()) {
 
-					if (k.pressed && k.mod.shift && k.mod.control) {
-						_menu_option(VIEW_ALIGN_SELECTION_WITH_VIEW);
-					} else if (k.pressed) {
-						_menu_option(VIEW_CENTER_TO_SELECTION);
-					}
+					Spatial *sp = E->get()->cast_to<Spatial>();
+					if (!sp)
+						continue;
 
-				} break;
+					emit_signal("transform_key_request",sp,"",sp->get_transform());
+				}
 
-				case KEY_SPACE: {
-					if (!k.pressed)
-						emit_signal("toggle_maximize_view", this);
-				} break;
 
+				set_message(TTR("Animation Key Inserted."));
 			}
 
+			if (k.scancode == KEY_SPACE) {
+				if (!k.pressed) emit_signal("toggle_maximize_view", this);
+			}
 
 		} break;
 
@@ -1855,16 +1788,6 @@ void SpatialEditorViewport::_notification(int p_what) {
 				continue;
 
 
-			/*
-			  ??
-			if (!se->poly_instance.is_valid())
-				continue;
-			if (!ObjectDB::get_instance( E->key() )) {
-				VisualServer::get_singleton()->free( se->poly_instance );
-				se->poly_instance=RID();
-				continue;
-			}
-			*/
 			VisualInstance *vi=sp->cast_to<VisualInstance>();
 
 
@@ -1902,35 +1825,6 @@ void SpatialEditorViewport::_notification(int p_what) {
 				surface->update();
 		}
 
-		//grid
-		Vector3 grid_cam_axis=_get_camera_normal();
-		/*
-		for(int i=0;i<3;i++) {
-
-
-			Vector3 axis;
-			axis[i]=1;
-
-			bool should_be_visible= grid_enabled && (grid_enable[i] || (Math::abs(grid_cam_axis.dot(axis))>0.99 && orthogonal));
-
-			if (should_be_visible!=grid_visible[i]) {
-
-				VisualServer::get_singleton()->instance_geometry_set_flag(grid_instance[i],VS::INSTANCE_FLAG_VISIBLE,should_be_visible);
-				grid_visible[i]=should_be_visible;
-			}
-		}
-
-		if (last_grid_snap!=spatial_editor->get_translate_snap()) {
-
-
-			last_grid_snap=spatial_editor->get_translate_snap()
-			Transform gridt;
-			gridt.basis.scale(Vector3(last_grid_snap,last_grid_snap,last_grid_snap));
-			for(int i=0;i<3;i++)
-				VisualServer::get_singleton()->instance_set_transform(grid_instance[i],gridt);
-
-		}*/
-
 	}
 
 	if (p_what==NOTIFICATION_ENTER_TREE) {
@@ -2470,29 +2364,28 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed
 	surface->add_child(view_menu);
 	view_menu->set_pos( Point2(4,4));
 	view_menu->set_self_opacity(0.5);
-
-	view_menu->get_popup()->add_item(TTR("Top (Num7)"),VIEW_TOP);
-	view_menu->get_popup()->add_item(TTR("Bottom (Shift+Num7)"),VIEW_BOTTOM);
-	view_menu->get_popup()->add_item(TTR("Left (Num3)"),VIEW_LEFT);
-	view_menu->get_popup()->add_item(TTR("Right (Shift+Num3)"),VIEW_RIGHT);
-	view_menu->get_popup()->add_item(TTR("Front (Num1)"),VIEW_FRONT);
-	view_menu->get_popup()->add_item(TTR("Rear (Shift+Num1)"),VIEW_REAR);
+	view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/top_view"), VIEW_TOP);
+	view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/bottom_view"), VIEW_BOTTOM);
+	view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/left_view"), VIEW_LEFT);
+	view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/right_view"), VIEW_RIGHT);
+	view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/front_view"), VIEW_FRONT);
+	view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/rear_view"), VIEW_REAR);
 	view_menu->get_popup()->add_separator();
-	view_menu->get_popup()->add_check_item(TTR("Perspective (Num5)"),VIEW_PERSPECTIVE);
-	view_menu->get_popup()->add_check_item(TTR("Orthogonal (Num5)"),VIEW_ORTHOGONAL);
+	view_menu->get_popup()->add_check_item(TTR("Perspective") + " (" + ED_GET_SHORTCUT("spatial_editor/switch_perspective_orthogonal")->get_as_text() + ")", VIEW_PERSPECTIVE);
+	view_menu->get_popup()->add_check_item(TTR("Orthogonal") + " (" + ED_GET_SHORTCUT("spatial_editor/switch_perspective_orthogonal")->get_as_text() + ")", VIEW_ORTHOGONAL);
 	view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_PERSPECTIVE),true);
 	view_menu->get_popup()->add_separator();
-	view_menu->get_popup()->add_check_item(TTR("Environment"),VIEW_ENVIRONMENT);
+	view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_environment", TTR("Environment")), VIEW_ENVIRONMENT);
 	view_menu->get_popup()->set_item_checked( view_menu->get_popup()->get_item_index(VIEW_ENVIRONMENT),true);
 	view_menu->get_popup()->add_separator();
-	view_menu->get_popup()->add_check_item(TTR("Audio Listener"),VIEW_AUDIO_LISTENER);
+	view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_audio_listener", TTR("Audio Listener")), VIEW_AUDIO_LISTENER);
 	view_menu->get_popup()->add_separator();
-	view_menu->get_popup()->add_check_item(TTR("Gizmos"),VIEW_GIZMOS);
+	view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_gizmos", TTR("Gizmos")),VIEW_GIZMOS);
 	view_menu->get_popup()->set_item_checked( view_menu->get_popup()->get_item_index(VIEW_GIZMOS),true);
 
 	view_menu->get_popup()->add_separator();
-	view_menu->get_popup()->add_item(TTR("Selection (F)"),VIEW_CENTER_TO_SELECTION);
-	view_menu->get_popup()->add_item(TTR("Align with view (Ctrl+Shift+F)"),VIEW_ALIGN_SELECTION_WITH_VIEW);
+	view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/focus_selection"), VIEW_CENTER_TO_SELECTION);
+	view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/align_selection_with_view"), VIEW_ALIGN_SELECTION_WITH_VIEW);
 	view_menu->get_popup()->connect("item_pressed",this,"_menu_option");
 
 	preview_camera = memnew( Button );
@@ -2613,16 +2506,9 @@ Object *SpatialEditor::_get_editor_data(Object *p_what) {
 	si->sbox_instance=VisualServer::get_singleton()->instance_create2(selection_box->get_rid(),sp->get_world()->get_scenario());
 	VS::get_singleton()->instance_geometry_set_cast_shadows_setting(si->sbox_instance, VS::SHADOW_CASTING_SETTING_OFF);
 
-	RID inst = sp->call("_get_visual_instance_rid");
-
-//	if (inst.is_valid())
-//		si->aabb = VisualServer::get_singleton()->instance_get_base_aabb(inst);
-
-
 	if (get_tree()->is_editor_hint())
 		editor->call("edit_node",sp);
 
-
 	return si;
 }
 
@@ -3951,6 +3837,19 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) {
 	hbc_menu->add_child(vs);
 
 
+	ED_SHORTCUT("spatial_editor/bottom_view", TTR("Bottom View"), KEY_MASK_ALT+KEY_KP_7);
+	ED_SHORTCUT("spatial_editor/top_view", TTR("Top View"), KEY_KP_7);
+	ED_SHORTCUT("spatial_editor/rear_view", TTR("Rear View"), KEY_MASK_ALT+KEY_KP_1);
+	ED_SHORTCUT("spatial_editor/front_view", TTR("Front View"), KEY_KP_1);
+	ED_SHORTCUT("spatial_editor/left_view", TTR("Left View"), KEY_MASK_ALT+KEY_KP_3);
+	ED_SHORTCUT("spatial_editor/right_view", TTR("Right View"), KEY_KP_3);
+	ED_SHORTCUT("spatial_editor/switch_perspective_orthogonal", TTR("Switch Perspective/Orthogonal view"), KEY_KP_5);
+	ED_SHORTCUT("spatial_editor/snap", TTR("Snap"), KEY_S);
+	ED_SHORTCUT("spatial_editor/insert_anim_key", TTR("Insert Animation Key"), KEY_K);
+	ED_SHORTCUT("spatial_editor/focus_selection", TTR("Focus Selection"), KEY_F);
+	ED_SHORTCUT("spatial_editor/align_selection_with_view", TTR("Align Selection With View"), KEY_MASK_ALT+KEY_MASK_CMD+KEY_F);
+
+
 	PopupMenu *p;
 
 	transform_menu = memnew( MenuButton );
@@ -3958,13 +3857,13 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) {
 	hbc_menu->add_child( transform_menu );
 
 	p = transform_menu->get_popup();
-	p->add_check_item(TTR("Use Snap"),MENU_TRANSFORM_USE_SNAP);
-	p->add_item(TTR("Configure Snap.."),MENU_TRANSFORM_CONFIGURE_SNAP);
+	p->add_check_shortcut(ED_SHORTCUT("spatial_editor/use_snap", TTR("Use Snap")), MENU_TRANSFORM_USE_SNAP);
+	p->add_shortcut(ED_SHORTCUT("spatial_editor/configure_snap", TTR("Configure Snap..")), MENU_TRANSFORM_CONFIGURE_SNAP);
 	p->add_separator();
-	p->add_check_item(TTR("Local Coords"),MENU_TRANSFORM_LOCAL_COORDS);
+	p->add_check_shortcut(ED_SHORTCUT("spatial_editor/local_coords", TTR("Local Coords")), MENU_TRANSFORM_LOCAL_COORDS);
 	//p->set_item_checked(p->get_item_count()-1,true);
 	p->add_separator();
-	p->add_item(TTR("Transform Dialog.."),MENU_TRANSFORM_DIALOG);
+	p->add_shortcut(ED_SHORTCUT("spatial_editor/transform_dialog", TTR("Transform Dialog..")), MENU_TRANSFORM_DIALOG);
 
 	p->connect("item_pressed", this,"_menu_item_pressed");
 
@@ -3975,27 +3874,27 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) {
 
 	p = view_menu->get_popup();
 
-	p->add_check_item(TTR("Use Default Light"),MENU_VIEW_USE_DEFAULT_LIGHT);
-	p->add_check_item(TTR("Use Default sRGB"),MENU_VIEW_USE_DEFAULT_SRGB);
+	p->add_check_shortcut(ED_SHORTCUT("spatial_editor/use_default_light", TTR("Use Default Light")), MENU_VIEW_USE_DEFAULT_LIGHT);
+	p->add_check_shortcut(ED_SHORTCUT("spatial_editor/use_default_srgb", TTR("Use Default sRGB")), MENU_VIEW_USE_DEFAULT_SRGB);
 	p->add_separator();
 
-	p->add_check_item(TTR("1 Viewport"),MENU_VIEW_USE_1_VIEWPORT,KEY_MASK_CMD+KEY_1);
-	p->add_check_item(TTR("2 Viewports"),MENU_VIEW_USE_2_VIEWPORTS,KEY_MASK_CMD+KEY_2);
-	p->add_check_item(TTR("2 Viewports (Alt)"),MENU_VIEW_USE_2_VIEWPORTS_ALT,KEY_MASK_SHIFT+KEY_MASK_CMD+KEY_2);
-	p->add_check_item(TTR("3 Viewports"),MENU_VIEW_USE_3_VIEWPORTS,KEY_MASK_CMD+KEY_3);
-	p->add_check_item(TTR("3 Viewports (Alt)"),MENU_VIEW_USE_3_VIEWPORTS_ALT,KEY_MASK_SHIFT+KEY_MASK_CMD+KEY_3);
-	p->add_check_item(TTR("4 Viewports"),MENU_VIEW_USE_4_VIEWPORTS,KEY_MASK_CMD+KEY_4);
+	p->add_check_shortcut(ED_SHORTCUT("spatial_editor/1_viewport", TTR("1 Viewport"), KEY_MASK_CMD+KEY_1), MENU_VIEW_USE_1_VIEWPORT);
+	p->add_check_shortcut(ED_SHORTCUT("spatial_editor/2_viewports", TTR("2 Viewports"), KEY_MASK_CMD+KEY_2), MENU_VIEW_USE_2_VIEWPORTS);
+	p->add_check_shortcut(ED_SHORTCUT("spatial_editor/2_viewports_alt", TTR("2 Viewports (Alt)"), KEY_MASK_ALT+KEY_MASK_CMD+KEY_2), MENU_VIEW_USE_2_VIEWPORTS_ALT);
+	p->add_check_shortcut(ED_SHORTCUT("spatial_editor/3_viewports", TTR("3 Viewports"),KEY_MASK_CMD+KEY_3), MENU_VIEW_USE_3_VIEWPORTS);
+	p->add_check_shortcut(ED_SHORTCUT("spatial_editor/3_viewports_alt", TTR("3 Viewports (Alt)"), KEY_MASK_ALT+KEY_MASK_CMD+KEY_3), MENU_VIEW_USE_3_VIEWPORTS_ALT);
+	p->add_check_shortcut(ED_SHORTCUT("spatial_editor/4_viewports", TTR("4 Viewports"), KEY_MASK_CMD+KEY_4), MENU_VIEW_USE_4_VIEWPORTS);
 	p->add_separator();
 
-	p->add_check_item(TTR("Display Normal"),MENU_VIEW_DISPLAY_NORMAL);
-	p->add_check_item(TTR("Display Wireframe"),MENU_VIEW_DISPLAY_WIREFRAME);
-	p->add_check_item(TTR("Display Overdraw"),MENU_VIEW_DISPLAY_OVERDRAW);
-	p->add_check_item(TTR("Display Shadeless"),MENU_VIEW_DISPLAY_SHADELESS);
+	p->add_check_shortcut(ED_SHORTCUT("spatial_editor/display_normal", TTR("Display Normal")), MENU_VIEW_DISPLAY_NORMAL);
+	p->add_check_shortcut(ED_SHORTCUT("spatial_editor/display_wireframe", TTR("Display Wireframe")), MENU_VIEW_DISPLAY_WIREFRAME);
+	p->add_check_shortcut(ED_SHORTCUT("spatial_editor/display_overdraw", TTR("Display Overdraw")), MENU_VIEW_DISPLAY_OVERDRAW);
+	p->add_check_shortcut(ED_SHORTCUT("spatial_editor/display_shadeless", TTR("Display Shadeless")), MENU_VIEW_DISPLAY_SHADELESS);
 	p->add_separator();
-	p->add_check_item(TTR("View Origin"),MENU_VIEW_ORIGIN);
-	p->add_check_item(TTR("View Grid"),MENU_VIEW_GRID);
+	p->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_origin", TTR("View Origin")), MENU_VIEW_ORIGIN);
+	p->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_grid", TTR("View Grid")), MENU_VIEW_GRID);
 	p->add_separator();
-	p->add_item(TTR("Settings"),MENU_VIEW_CAMERA_SETTINGS);
+	p->add_shortcut(ED_SHORTCUT("spatial_editor/settings", TTR("Settings")), MENU_VIEW_CAMERA_SETTINGS);
 
 
 	p->set_item_checked( p->get_item_index(MENU_VIEW_USE_DEFAULT_LIGHT), true );
diff --git a/tools/editor/plugins/sprite_frames_editor_plugin.cpp b/tools/editor/plugins/sprite_frames_editor_plugin.cpp
index 4f59287994..e29a0c8d52 100644
--- a/tools/editor/plugins/sprite_frames_editor_plugin.cpp
+++ b/tools/editor/plugins/sprite_frames_editor_plugin.cpp
@@ -31,7 +31,7 @@
 #include "io/resource_loader.h"
 #include "globals.h"
 #include "tools/editor/editor_settings.h"
-
+#include "scene/3d/sprite_3d.h"
 
 
 
@@ -355,6 +355,35 @@ void SpriteFramesEditor::_animation_select() {
 
 }
 
+
+static void _find_anim_sprites(Node* p_node,List<Node*> *r_nodes,Ref<SpriteFrames> p_sfames) {
+
+	Node *edited = EditorNode::get_singleton()->get_edited_scene();
+	if (!edited)
+		return;
+	if (p_node!=edited && p_node->get_owner()!=edited)
+		return;
+
+	{
+		AnimatedSprite *as = p_node->cast_to<AnimatedSprite>();
+		if (as && as->get_sprite_frames()==p_sfames) {
+			r_nodes->push_back(p_node);
+		}
+	}
+
+	{
+		AnimatedSprite3D *as = p_node->cast_to<AnimatedSprite3D>();
+		if (as && as->get_sprite_frames()==p_sfames) {
+			r_nodes->push_back(p_node);
+		}
+	}
+
+	for(int i=0;i<p_node->get_child_count();i++) {
+		_find_anim_sprites(p_node->get_child(i),r_nodes,p_sfames);
+	}
+
+}
+
 void SpriteFramesEditor::_animation_name_edited(){
 
 	if (updating)
@@ -381,9 +410,24 @@ void SpriteFramesEditor::_animation_name_edited(){
 		name=new_name+" "+itos(counter);
 	}
 
+	List<Node*> nodes;
+	_find_anim_sprites(EditorNode::get_singleton()->get_edited_scene(),&nodes,Ref<SpriteFrames>(frames));
+
 	undo_redo->create_action(TTR("Rename Animation"));
 	undo_redo->add_do_method(frames,"rename_animation",edited_anim,name);
 	undo_redo->add_undo_method(frames,"rename_animation",name,edited_anim);
+
+	for(List<Node*>::Element *E=nodes.front();E;E=E->next()) {
+
+		String current = E->get()->call("get_animation");
+		if (current!=edited_anim)
+			continue;
+
+		undo_redo->add_do_method(E->get(),"set_animation",name);
+		undo_redo->add_undo_method(E->get(),"set_animation",edited_anim);
+
+	}
+
 	undo_redo->add_do_method(this,"_update_library");
 	undo_redo->add_undo_method(this,"_update_library");
 
@@ -406,12 +450,28 @@ void SpriteFramesEditor::_animation_add(){
 		name=new_name+" "+itos(counter);
 	}
 
+	List<Node*> nodes;
+	_find_anim_sprites(EditorNode::get_singleton()->get_edited_scene(),&nodes,Ref<SpriteFrames>(frames));
+
+
 	undo_redo->create_action(TTR("Add Animation"));
 	undo_redo->add_do_method(frames,"add_animation",name);
 	undo_redo->add_undo_method(frames,"remove_animation",name);
 	undo_redo->add_do_method(this,"_update_library");
 	undo_redo->add_undo_method(this,"_update_library");
 
+
+	for(List<Node*>::Element *E=nodes.front();E;E=E->next()) {
+
+		String current = E->get()->call("get_animation");
+		if (frames->has_animation(current))
+			continue;
+
+		undo_redo->add_do_method(E->get(),"set_animation",name);
+		undo_redo->add_undo_method(E->get(),"set_animation",current);
+
+	}
+
 	edited_anim=new_name;
 
 	undo_redo->commit_action();
@@ -426,6 +486,7 @@ void SpriteFramesEditor::_animation_remove(){
 	if (!frames->has_animation(edited_anim))
 		return;
 
+
 	undo_redo->create_action(TTR("Remove Animation"));
 	undo_redo->add_do_method(frames,"remove_animation",edited_anim);
 	undo_redo->add_undo_method(frames,"add_animation",edited_anim);
diff --git a/tools/editor/plugins/texture_region_editor_plugin.cpp b/tools/editor/plugins/texture_region_editor_plugin.cpp
index 57db19b736..63d8e2e1cf 100644
--- a/tools/editor/plugins/texture_region_editor_plugin.cpp
+++ b/tools/editor/plugins/texture_region_editor_plugin.cpp
@@ -29,21 +29,30 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#include "core/core_string_names.h"
 #include "texture_region_editor_plugin.h"
 #include "scene/gui/check_box.h"
 #include "os/input.h"
 #include "os/keyboard.h"
 
+void draw_margin_line(Control *edit_draw, Vector2 from, Vector2 to){
+	Vector2 line = (to-from).normalized() * 10;
+	while ((to - from).length_squared() > 200) {
+		edit_draw->draw_line(from, from + line,Color(0.97, 0.2, 0.2),2);
+		from += line*2;
+	}
+}
+
 void TextureRegionEditor::_region_draw()
 {
 	Ref<Texture> base_tex = NULL;
-	if(node_type == "Sprite" && node_sprite)
+	if(node_sprite)
 		base_tex = node_sprite->get_texture();
-	else if(node_type == "Patch9Frame" && node_patch9)
+	else if(node_patch9)
 		base_tex = node_patch9->get_texture();
-	else if(node_type == "StyleBoxTexture" && obj_styleBox)
+	else if(obj_styleBox.is_valid())
 		base_tex = obj_styleBox->get_texture();
-	else if(node_type == "AtlasTexture" && atlas_tex)
+	else if(atlas_tex.is_valid())
 		base_tex = atlas_tex->get_atlas();
 	if (base_tex.is_null())
 		return;
@@ -57,29 +66,63 @@ void TextureRegionEditor::_region_draw()
 	edit_draw->draw_texture(base_tex,Point2());
 	VS::get_singleton()->canvas_item_add_set_transform(edit_draw->get_canvas_item(),Matrix32());
 
-	if (snap_show_grid) {
+	if (snap_mode == SNAP_GRID) {
 		Size2 s = edit_draw->get_size();
 		int last_cell;
 
 		if (snap_step.x!=0) {
-			for(int i=0;i<s.width;i++) {
-				int cell = Math::fast_ftoi(Math::floor((mtx.affine_inverse().xform(Vector2(i,0)).x-snap_offset.x)/snap_step.x));
-				if (i==0)
+			if (snap_separation.x == 0)
+				for(int i=0;i<s.width;i++) {
+					int cell = Math::fast_ftoi(Math::floor((mtx.affine_inverse().xform(Vector2(i,0)).x-snap_offset.x)/snap_step.x));
+					if (i==0)
+						last_cell=cell;
+					if (last_cell!=cell)
+						edit_draw->draw_line(Point2(i,0),Point2(i,s.height),Color(0.3,0.7,1,0.3));
 					last_cell=cell;
-				if (last_cell!=cell)
-					edit_draw->draw_line(Point2(i,0),Point2(i,s.height),Color(0.3,0.7,1,0.3));
-				last_cell=cell;
-			}
+				}
+			else
+				for(int i=0;i<s.width;i++) {
+					int cell = Math::fast_ftoi(Math::floor((mtx.affine_inverse().xform(Vector2(i,0)).x-snap_offset.x)/(snap_step.x+snap_separation.x)));
+					if (i==0)
+						last_cell=cell;
+					if (last_cell!=cell)
+						edit_draw->draw_rect(Rect2(i-snap_separation.x*draw_zoom,0,snap_separation.x*draw_zoom,s.height),Color(0.3,0.7,1,0.3));
+					last_cell=cell;
+				}
 		}
 
 		if (snap_step.y!=0) {
-			for(int i=0;i<s.height;i++) {
-				int cell = Math::fast_ftoi(Math::floor((mtx.affine_inverse().xform(Vector2(0,i)).y-snap_offset.y)/snap_step.y));
-				if (i==0)
+			if (snap_separation.y == 0)
+				for(int i=0;i<s.height;i++) {
+					int cell = Math::fast_ftoi(Math::floor((mtx.affine_inverse().xform(Vector2(0,i)).y-snap_offset.y)/snap_step.y));
+					if (i==0)
+						last_cell=cell;
+					if (last_cell!=cell)
+						edit_draw->draw_line(Point2(0,i),Point2(s.width,i),Color(0.3,0.7,1,0.3));
 					last_cell=cell;
-				if (last_cell!=cell)
-					edit_draw->draw_line(Point2(0,i),Point2(s.width,i),Color(0.3,0.7,1,0.3));
-				last_cell=cell;
+				}
+			else
+				for(int i=0;i<s.height;i++) {
+					int cell = Math::fast_ftoi(Math::floor((mtx.affine_inverse().xform(Vector2(0,i)).y-snap_offset.y)/(snap_step.y+snap_separation.y)));
+					if (i==0)
+						last_cell=cell;
+					if (last_cell!=cell)
+						edit_draw->draw_rect(Rect2(0,i-snap_separation.y*draw_zoom,s.width,snap_separation.y*draw_zoom),Color(0.3,0.7,1,0.3));
+					last_cell=cell;
+				}
+		}
+	} else if (snap_mode == SNAP_AUTOSLICE) {
+		for (List<Rect2>::Element *E = autoslice_cache.front();E;E=E->next()) {
+			Rect2 r = E->get();
+			Vector2 endpoints[4]={
+				mtx.basis_xform(r.pos),
+				mtx.basis_xform(r.pos+Vector2(r.size.x,0)),
+				mtx.basis_xform(r.pos+r.size),
+				mtx.basis_xform(r.pos+Vector2(0,r.size.y))
+			};
+			for(int i=0;i<4;i++) {
+				int next = (i+1)%4;
+				edit_draw->draw_line(endpoints[i]-draw_ofs, endpoints[next]-draw_ofs, Color(0.3,0.7,1,1) , 2);
 			}
 		}
 	}
@@ -96,8 +139,6 @@ void TextureRegionEditor::_region_draw()
 		mtx.basis_xform(rect.pos+Vector2(0,rect.size.y))
 	};
 	Color color(0.9,0.5,0.5);
-	if(this->editing_region == REGION_PATCH_MARGIN)
-		color = Color(0.21, 0.79, 0.31);
 	for(int i=0;i<4;i++) {
 
 		int prev = (i+3)%4;
@@ -108,12 +149,14 @@ void TextureRegionEditor::_region_draw()
 
 		edit_draw->draw_line(endpoints[i]-draw_ofs, endpoints[next]-draw_ofs, color , 2);
 
-		edit_draw->draw_texture(select_handle,(endpoints[i]+ofs-(select_handle->get_size()/2)).floor()-draw_ofs);
+		if (snap_mode != SNAP_AUTOSLICE)
+			edit_draw->draw_texture(select_handle,(endpoints[i]+ofs-(select_handle->get_size()/2)).floor()-draw_ofs);
 
 		ofs = (endpoints[next]-endpoints[i])/2;
 		ofs += (endpoints[next]-endpoints[i]).tangent().normalized()*(select_handle->get_size().width/2);
 
-		edit_draw->draw_texture(select_handle,(endpoints[i]+ofs-(select_handle->get_size()/2)).floor()-draw_ofs);
+		if (snap_mode != SNAP_AUTOSLICE)
+			edit_draw->draw_texture(select_handle,(endpoints[i]+ofs-(select_handle->get_size()/2)).floor()-draw_ofs);
 
 		scroll_rect.expand_to(endpoints[i]);
 	}
@@ -132,6 +175,31 @@ void TextureRegionEditor::_region_draw()
 	vscroll->set_val(draw_ofs.y);
 	vscroll->set_step(0.001);
 	updating_scroll=false;
+
+	float margins[4];
+	if (node_patch9 || obj_styleBox.is_valid()) {
+		if (node_patch9) {
+			margins[0] = node_patch9->get_patch_margin(MARGIN_TOP);
+			margins[1] = node_patch9->get_patch_margin(MARGIN_BOTTOM);
+			margins[2] = node_patch9->get_patch_margin(MARGIN_LEFT);
+			margins[3] = node_patch9->get_patch_margin(MARGIN_RIGHT);
+		} else if (obj_styleBox.is_valid()) {
+			margins[0] = obj_styleBox->get_margin_size(MARGIN_TOP);
+			margins[1] = obj_styleBox->get_margin_size(MARGIN_BOTTOM);
+			margins[2] = obj_styleBox->get_margin_size(MARGIN_LEFT);
+			margins[3] = obj_styleBox->get_margin_size(MARGIN_RIGHT);
+		}
+		Vector2 pos[4] = {
+			mtx.basis_xform(Vector2(0,margins[0]))+Vector2(0,endpoints[0].y-draw_ofs.y),
+			-mtx.basis_xform(Vector2(0,margins[1]))+Vector2(0,endpoints[2].y-draw_ofs.y),
+			mtx.basis_xform(Vector2(margins[2],0))+Vector2(endpoints[0].x-draw_ofs.x,0),
+			-mtx.basis_xform(Vector2(margins[3],0))+Vector2(endpoints[2].x-draw_ofs.x,0)};
+
+		draw_margin_line(edit_draw,pos[0],pos[0]+Vector2(edit_draw->get_size().x,0));
+		draw_margin_line(edit_draw,pos[1],pos[1]+Vector2(edit_draw->get_size().x,0));
+		draw_margin_line(edit_draw,pos[2],pos[2]+Vector2(0,edit_draw->get_size().y));
+		draw_margin_line(edit_draw,pos[3],pos[3]+Vector2(0,edit_draw->get_size().y));
+	}
 }
 
 void TextureRegionEditor::_region_input(const InputEvent& p_input)
@@ -153,84 +221,174 @@ void TextureRegionEditor::_region_input(const InputEvent& p_input)
 
 	if (p_input.type==InputEvent::MOUSE_BUTTON) {
 
-
 		const InputEventMouseButton &mb=p_input.mouse_button;
 
 		if (mb.button_index==BUTTON_LEFT) {
 
-
 			if (mb.pressed) {
-
-				drag_from=mtx.affine_inverse().xform(Vector2(mb.x,mb.y));
-				drag_from=snap_point(drag_from);
-				drag=true;
-				if(node_type == "Sprite" && node_sprite )
-					rect_prev=node_sprite->get_region_rect();
-				else if(node_type == "AtlasTexture" && atlas_tex)
-					rect_prev=atlas_tex->get_region();
-				else if(node_type == "Patch9Frame" && node_patch9)
-					rect_prev=node_patch9->get_region_rect();
-				else if(node_type == "StyleBoxTexture" && obj_styleBox)
-					rect_prev=obj_styleBox->get_region_rect();
-
-				drag_index=-1;
-				for(int i=0;i<8;i++) {
-
-					Vector2 tuv=endpoints[i];
-					if (tuv.distance_to(Vector2(mb.x,mb.y))<8) {
-						drag_index=i;
-						creating = false;
+				if (node_patch9 || obj_styleBox.is_valid()) {
+					edited_margin = -1;
+					float margins[4];
+					if (node_patch9) {
+						margins[0] = node_patch9->get_patch_margin(MARGIN_TOP);
+						margins[1] = node_patch9->get_patch_margin(MARGIN_BOTTOM);
+						margins[2] = node_patch9->get_patch_margin(MARGIN_LEFT);
+						margins[3] = node_patch9->get_patch_margin(MARGIN_RIGHT);
+					} else if (obj_styleBox.is_valid()) {
+						margins[0] = obj_styleBox->get_margin_size(MARGIN_TOP);
+						margins[1] = obj_styleBox->get_margin_size(MARGIN_BOTTOM);
+						margins[2] = obj_styleBox->get_margin_size(MARGIN_LEFT);
+						margins[3] = obj_styleBox->get_margin_size(MARGIN_RIGHT);
+					}
+					Vector2 pos[4] = {
+						mtx.basis_xform(rect.pos+Vector2(0,margins[0]))-draw_ofs,
+						mtx.basis_xform(rect.pos+rect.size-Vector2(0,margins[1]))-draw_ofs,
+						mtx.basis_xform(rect.pos+Vector2(margins[2],0))-draw_ofs,
+						mtx.basis_xform(rect.pos+rect.size-Vector2(margins[3],0))-draw_ofs};
+					if (Math::abs(mb.y - pos[0].y) < 8) {
+						edited_margin = 0;
+						prev_margin = margins[0];
+					} else if (Math::abs(mb.y - pos[1].y) < 8) {
+						edited_margin = 1;
+						prev_margin = margins[1];
+					} else if (Math::abs(mb.x - pos[2].x) < 8) {
+						edited_margin = 2;
+						prev_margin = margins[2];
+					} else if (Math::abs(mb.x - pos[3].x) < 8) {
+						edited_margin = 3;
+						prev_margin = margins[3];
+					}
+					if (edited_margin >= 0) {
+						drag_from=Vector2(mb.x,mb.y);
+						drag=true;
 					}
 				}
+				if ( edited_margin < 0 && snap_mode == SNAP_AUTOSLICE) {
+					Vector2 point = mtx.affine_inverse().xform(Vector2(mb.x,mb.y));
+					for (List<Rect2>::Element *E=autoslice_cache.front();E;E=E->next()) {
+						if (E->get().has_point(point)) {
+							rect = E->get();
+							if (Input::get_singleton()->is_key_pressed(KEY_CONTROL)&&!(Input::get_singleton()->is_key_pressed(KEY_SHIFT|KEY_ALT))) {
+								Rect2 r;
+								if(node_sprite )
+									r=node_sprite->get_region_rect();
+								else if(node_patch9)
+									r=node_patch9->get_region_rect();
+								else if(obj_styleBox.is_valid())
+									r=obj_styleBox->get_region_rect();
+								else if(atlas_tex.is_valid())
+									r =atlas_tex->get_region();
+								rect.expand_to(r.pos);
+								rect.expand_to(r.pos+r.size);
+							}
+							undo_redo->create_action("Set Region Rect");
+							if(node_sprite){
+								undo_redo->add_do_method(node_sprite ,"set_region_rect",rect);
+								undo_redo->add_undo_method(node_sprite,"set_region_rect",node_sprite->get_region_rect());
+							} else if(node_patch9){
+								undo_redo->add_do_method(node_patch9 ,"set_region_rect",rect);
+								undo_redo->add_undo_method(node_patch9,"set_region_rect",node_patch9->get_region_rect());
+							} else if (obj_styleBox.is_valid()) {
+								undo_redo->add_do_method(obj_styleBox.ptr(),"set_region_rect",rect);
+								undo_redo->add_undo_method(obj_styleBox.ptr(),"set_region_rect",obj_styleBox->get_region_rect());
+							} else if (atlas_tex.is_valid()) {
+								undo_redo->add_do_method(atlas_tex.ptr(),"set_region",rect);
+								undo_redo->add_undo_method(atlas_tex.ptr(),"set_region",atlas_tex->get_region());
+							}
+							undo_redo->add_do_method(edit_draw,"update");
+							undo_redo->add_undo_method(edit_draw,"update");
+							undo_redo->commit_action();
+							break;
+						}
+					}
+				} else if (edited_margin < 0) {
+					drag_from=mtx.affine_inverse().xform(Vector2(mb.x,mb.y));
+					if (snap_mode == SNAP_PIXEL)
+						drag_from = drag_from.snapped(Vector2(1,1));
+					else if (snap_mode == SNAP_GRID)
+						drag_from=snap_point(drag_from);
+					drag=true;
+					if(node_sprite )
+						rect_prev=node_sprite->get_region_rect();
+					else if(node_patch9)
+						rect_prev=node_patch9->get_region_rect();
+					else if(obj_styleBox.is_valid())
+						rect_prev=obj_styleBox->get_region_rect();
+					else if(atlas_tex.is_valid())
+						rect_prev=atlas_tex->get_region();
+
+					for (int i=0; i<8;i++) {
+						Vector2 tuv=endpoints[i];
+						if (tuv.distance_to(Vector2(mb.x,mb.y))<8) {
+							drag_index=i;
+						}
+					}
 
-				if (drag_index==-1) {
-					creating = true;
-					rect = Rect2(drag_from,Size2());
+					if (drag_index==-1) {
+						creating = true;
+						rect = Rect2(drag_from,Size2());
+					}
 				}
 
 			} else if (drag) {
-				if(editing_region == REGION_TEXTURE_REGION) {
-					undo_redo->create_action("Set region_rect");
-					if(node_type == "Sprite" && node_sprite ){
+				if (edited_margin >= 0) {
+					undo_redo->create_action("Set Margin");
+					static Margin  m[4] = {MARGIN_TOP,MARGIN_BOTTOM,MARGIN_LEFT,MARGIN_RIGHT};
+					if (node_patch9) {
+						undo_redo->add_do_method(node_patch9 ,"set_patch_margin",m[edited_margin],node_patch9->get_patch_margin(m[edited_margin]));
+						undo_redo->add_undo_method(node_patch9,"set_patch_margin",m[edited_margin],prev_margin);
+					} else if (obj_styleBox.is_valid()) {
+						undo_redo->add_do_method(obj_styleBox.ptr() ,"set_margin_size",m[edited_margin],obj_styleBox->get_margin_size(m[edited_margin]));
+						undo_redo->add_undo_method(obj_styleBox.ptr(),"set_margin_size",m[edited_margin],prev_margin);
+						obj_styleBox->emit_signal(CoreStringNames::get_singleton()->changed);
+					}
+					edited_margin = -1;
+				} else {
+					undo_redo->create_action("Set Region Rect");
+					if(node_sprite){
 						undo_redo->add_do_method(node_sprite ,"set_region_rect",node_sprite->get_region_rect());
 						undo_redo->add_undo_method(node_sprite,"set_region_rect",rect_prev);
 					}
-					else if(node_type == "AtlasTexture" && atlas_tex ){
-						undo_redo->add_do_method(atlas_tex ,"set_region",atlas_tex->get_region());
-						undo_redo->add_undo_method(atlas_tex,"set_region",rect_prev);
+					else if(atlas_tex.is_valid()){
+						undo_redo->add_do_method(atlas_tex.ptr() ,"set_region",atlas_tex->get_region());
+						undo_redo->add_undo_method(atlas_tex.ptr(),"set_region",rect_prev);
 					}
-					else if(node_type == "Patch9Frame" && node_patch9){
+					else if(node_patch9){
+					} else if(node_patch9){
 						undo_redo->add_do_method(node_patch9 ,"set_region_rect",node_patch9->get_region_rect());
 						undo_redo->add_undo_method(node_patch9,"set_region_rect",rect_prev);
+					} else if (obj_styleBox.is_valid()) {
+						undo_redo->add_do_method(obj_styleBox.ptr() ,"set_region_rect",obj_styleBox->get_region_rect());
+						undo_redo->add_undo_method(obj_styleBox.ptr(),"set_region_rect",rect_prev);
 					}
-					else if(node_type == "StyleBoxTexture" && obj_styleBox){
-						undo_redo->add_do_method(obj_styleBox ,"set_region_rect",obj_styleBox->get_region_rect());
-						undo_redo->add_undo_method(obj_styleBox,"set_region_rect",rect_prev);
-					}
-					undo_redo->add_do_method(edit_draw,"update");
-					undo_redo->add_undo_method(edit_draw,"update");
-					undo_redo->commit_action();
+					drag_index = -1;
 				}
+				undo_redo->add_do_method(edit_draw,"update");
+				undo_redo->add_undo_method(edit_draw,"update");
+				undo_redo->commit_action();
 				drag=false;
+				creating = false;
 			}
 
 		} else if (mb.button_index==BUTTON_RIGHT && mb.pressed) {
 
 			if (drag) {
 				drag=false;
-				apply_rect(rect_prev);
-				rect=rect_prev;
-				edit_draw->update();
+				if (edited_margin >= 0) {
+					static Margin  m[4] = {MARGIN_TOP,MARGIN_BOTTOM,MARGIN_LEFT,MARGIN_RIGHT};
+					if (node_patch9)
+						node_patch9->set_patch_margin(m[edited_margin],prev_margin);
+					if (obj_styleBox.is_valid())
+						obj_styleBox->set_margin_size(m[edited_margin],prev_margin);
+					edited_margin = -1;
+				} else {
+					apply_rect(rect_prev);
+					rect=rect_prev;
+					edit_draw->update();
+					drag_index = -1;
+				}
 			}
-
-		} else if (mb.button_index==BUTTON_WHEEL_UP && mb.pressed) {
-
-			zoom->set_val( zoom->get_val()/0.9 );
-		} else if (mb.button_index==BUTTON_WHEEL_DOWN && mb.pressed) {
-
-			zoom->set_val( zoom->get_val()*0.9);
 		}
-
 	} else if (p_input.type==InputEvent::MOUSE_MOTION) {
 
 		const InputEventMouseMotion &mm=p_input.mouse_motion;
@@ -243,67 +401,89 @@ void TextureRegionEditor::_region_input(const InputEvent& p_input)
 
 		} else if (drag) {
 
-			Vector2 new_pos = mtx.affine_inverse().xform(Vector2(mm.x,mm.y));
-			new_pos = snap_point(new_pos);
-
-			if (creating) {
-				rect = Rect2(drag_from,Size2());
-				rect.expand_to(new_pos);
-				apply_rect(rect);
-				edit_draw->update();
-				return;
-			}
-
-			switch(drag_index) {
-			case 0: {
-					Vector2 p=rect_prev.pos+rect_prev.size;
-					rect = Rect2(p,Size2());
-					rect.expand_to(new_pos);
-					apply_rect(rect);
-				} break;
-			case 1: {
-					Vector2 p=rect_prev.pos+Vector2(0,rect_prev.size.y);
-					rect = Rect2(p,Size2(rect_prev.size.x,0));
-					rect.expand_to(new_pos);
-					apply_rect(rect);
-				} break;
-			case 2: {
-					Vector2 p=rect_prev.pos+Vector2(0,rect_prev.size.y);
-					rect = Rect2(p,Size2());
-					rect.expand_to(new_pos);
-					apply_rect(rect);
-				} break;
-			case 3: {
-					Vector2 p=rect_prev.pos;
-					rect = Rect2(p,Size2(0,rect_prev.size.y));
-					rect.expand_to(new_pos);
-					apply_rect(rect);
-				} break;
-			case 4: {
-					Vector2 p=rect_prev.pos;
-					rect = Rect2(p,Size2());
-					rect.expand_to(new_pos);
-					apply_rect(rect);
-				} break;
-			case 5: {
-					Vector2 p=rect_prev.pos;
-					rect = Rect2(p,Size2(rect_prev.size.x,0));
-					rect.expand_to(new_pos);
-					apply_rect(rect);
-				} break;
-			case 6: {
-					Vector2 p=rect_prev.pos+Vector2(rect_prev.size.x,0);
-					rect = Rect2(p,Size2());
-					rect.expand_to(new_pos);
-					apply_rect(rect);
-				} break;
-			case 7: {
-					Vector2 p=rect_prev.pos+Vector2(rect_prev.size.x,0);
-					rect = Rect2(p,Size2(0,rect_prev.size.y));
+			if (edited_margin >= 0) {
+				float new_margin;
+				if (edited_margin == 0)
+					new_margin = prev_margin + (mm.y-drag_from.y) / draw_zoom;
+				else if (edited_margin == 1)
+					new_margin = prev_margin - (mm.y-drag_from.y) / draw_zoom;
+				else if (edited_margin == 2)
+					new_margin = prev_margin + (mm.x-drag_from.x) / draw_zoom;
+				else if (edited_margin == 3)
+					new_margin = prev_margin - (mm.x-drag_from.x) / draw_zoom;
+				if (new_margin < 0)
+					new_margin = 0;
+				static Margin  m[4] = {MARGIN_TOP,MARGIN_BOTTOM,MARGIN_LEFT,MARGIN_RIGHT};
+				if (node_patch9)
+					node_patch9->set_patch_margin(m[edited_margin],new_margin);
+				if (obj_styleBox.is_valid())
+					obj_styleBox->set_margin_size(m[edited_margin],new_margin);
+			} else {
+				Vector2 new_pos = mtx.affine_inverse().xform(Vector2(mm.x,mm.y));
+				if (snap_mode == SNAP_PIXEL)
+					new_pos = new_pos.snapped(Vector2(1,1));
+				else if (snap_mode == SNAP_GRID)
+					new_pos=snap_point(new_pos);
+
+				if (creating) {
+					rect = Rect2(drag_from,Size2());
 					rect.expand_to(new_pos);
 					apply_rect(rect);
-				} break;
+					edit_draw->update();
+					return;
+				}
 
+				switch(drag_index) {
+				case 0: {
+						Vector2 p=rect_prev.pos+rect_prev.size;
+						rect = Rect2(p,Size2());
+						rect.expand_to(new_pos);
+						apply_rect(rect);
+					} break;
+				case 1: {
+						Vector2 p=rect_prev.pos+Vector2(0,rect_prev.size.y);
+						rect = Rect2(p,Size2(rect_prev.size.x,0));
+						rect.expand_to(new_pos);
+						apply_rect(rect);
+					} break;
+				case 2: {
+						Vector2 p=rect_prev.pos+Vector2(0,rect_prev.size.y);
+						rect = Rect2(p,Size2());
+						rect.expand_to(new_pos);
+						apply_rect(rect);
+					} break;
+				case 3: {
+						Vector2 p=rect_prev.pos;
+						rect = Rect2(p,Size2(0,rect_prev.size.y));
+						rect.expand_to(new_pos);
+						apply_rect(rect);
+					} break;
+				case 4: {
+						Vector2 p=rect_prev.pos;
+						rect = Rect2(p,Size2());
+						rect.expand_to(new_pos);
+						apply_rect(rect);
+					} break;
+				case 5: {
+						Vector2 p=rect_prev.pos;
+						rect = Rect2(p,Size2(rect_prev.size.x,0));
+						rect.expand_to(new_pos);
+						apply_rect(rect);
+					} break;
+				case 6: {
+						Vector2 p=rect_prev.pos+Vector2(rect_prev.size.x,0);
+						rect = Rect2(p,Size2());
+						rect.expand_to(new_pos);
+						apply_rect(rect);
+					} break;
+				case 7: {
+						Vector2 p=rect_prev.pos+Vector2(rect_prev.size.x,0);
+						rect = Rect2(p,Size2(0,rect_prev.size.y));
+						rect.expand_to(new_pos);
+						apply_rect(rect);
+					} break;
+
+				}
 			}
 			edit_draw->update();
 		}
@@ -318,19 +498,21 @@ void TextureRegionEditor::_scroll_changed(float)
 
 	draw_ofs.x=hscroll->get_val();
 	draw_ofs.y=vscroll->get_val();
-	draw_zoom=zoom->get_val();
-	print_line("_scroll_changed");
 	edit_draw->update();
 }
 
-void TextureRegionEditor::_set_use_snap(bool p_use)
+void TextureRegionEditor::_set_snap_mode(int p_mode)
 {
-	use_snap=p_use;
-}
+	snap_mode_button->get_popup()->set_item_checked(snap_mode,false);
+	snap_mode = p_mode;
+	snap_mode_button->set_text(snap_mode_button->get_popup()->get_item_text(p_mode));
+	snap_mode_button->get_popup()->set_item_checked(snap_mode,true);
+
+	if (snap_mode == SNAP_GRID)
+		hb_grid->show();
+	else
+		hb_grid->hide();
 
-void TextureRegionEditor::_set_show_grid(bool p_show)
-{
-	snap_show_grid=p_show;
 	edit_draw->update();
 }
 
@@ -358,42 +540,59 @@ void TextureRegionEditor::_set_snap_step_y(float p_val)
 	edit_draw->update();
 }
 
-void TextureRegionEditor::apply_rect(const Rect2& rect){
+void TextureRegionEditor::_set_snap_sep_x(float p_val)
+{
+	snap_separation.x = p_val;
+	edit_draw->update();
+}
 
-	if(this->editing_region == REGION_TEXTURE_REGION) {
-		if(node_sprite)
-			node_sprite->set_region_rect(rect);
-		else if(node_patch9)
-			node_patch9->set_region_rect(rect);
-		else if(obj_styleBox)
-			obj_styleBox->set_region_rect(rect);
-		else if(atlas_tex)
-			atlas_tex->set_region(rect);
+void TextureRegionEditor::_set_snap_sep_y(float p_val)
+{
+	snap_separation.y = p_val;
+	edit_draw->update();
+}
+
+void TextureRegionEditor::_zoom_in()
+{
+	if (draw_zoom < 8) {
+		draw_zoom *= 2;
+		edit_draw->update();
 	}
-	else if(this->editing_region == REGION_PATCH_MARGIN) {
-		if(node_patch9) {
-			node_patch9->set_patch_margin(MARGIN_LEFT, rect.pos.x - tex_region.pos.x);
-			node_patch9->set_patch_margin(MARGIN_RIGHT, tex_region.pos.x+tex_region.size.width-(rect.pos.x+rect.size.width));
-			node_patch9->set_patch_margin(MARGIN_TOP, rect.pos.y - tex_region.pos.y);
-			node_patch9->set_patch_margin(MARGIN_BOTTOM, tex_region.pos.y+tex_region.size.height-(rect.pos.y+rect.size.height));
-		}
-		else if(obj_styleBox) {
-			obj_styleBox->set_margin_size(MARGIN_LEFT, rect.pos.x - tex_region.pos.x);
-			obj_styleBox->set_margin_size(MARGIN_RIGHT, tex_region.pos.x+tex_region.size.width-(rect.pos.x+rect.size.width));
-			obj_styleBox->set_margin_size(MARGIN_TOP, rect.pos.y - tex_region.pos.y);
-			obj_styleBox->set_margin_size(MARGIN_BOTTOM, tex_region.pos.y+tex_region.size.height-(rect.pos.y+rect.size.height));
-		}
+}
+
+void TextureRegionEditor::_zoom_reset()
+{
+	if (draw_zoom == 1) return;
+	draw_zoom = 1;
+	edit_draw->update();
+}
+
+void TextureRegionEditor::_zoom_out()
+{
+	if (draw_zoom > 0.25) {
+		draw_zoom /= 2;
+		edit_draw->update();
 	}
 }
 
+void TextureRegionEditor::apply_rect(const Rect2& rect){
+	if(node_sprite)
+		node_sprite->set_region_rect(rect);
+	else if(node_patch9)
+		node_patch9->set_region_rect(rect);
+	else if(obj_styleBox.is_valid())
+		obj_styleBox->set_region_rect(rect);
+	else if(atlas_tex.is_valid())
+		atlas_tex->set_region(rect);
+}
+
 void TextureRegionEditor::_notification(int p_what)
 {
 	switch(p_what) {
 	case NOTIFICATION_READY: {
-			region_button->set_icon( get_icon("RegionEdit","EditorIcons"));
-			margin_button->set_icon( get_icon("Patch9Frame", "EditorIcons"));
-			b_snap_grid->set_icon( get_icon("Grid", "EditorIcons"));
-			b_snap_enable->set_icon( get_icon("Snap", "EditorIcons"));
+			zoom_out->set_icon(get_icon("ZoomLess", "EditorIcons"));
+			zoom_reset->set_icon(get_icon("ZoomReset", "EditorIcons"));
+			zoom_in->set_icon(get_icon("ZoomMore", "EditorIcons"));
 			icon_zoom->set_texture( get_icon("Zoom", "EditorIcons"));
 		} break;
 	}
@@ -401,149 +600,165 @@ void TextureRegionEditor::_notification(int p_what)
 
 void TextureRegionEditor::_node_removed(Object *p_obj)
 {
-	if(p_obj == node_sprite || p_obj == node_patch9 || p_obj == obj_styleBox || p_obj == atlas_tex) {
-		node_patch9  = NULL;
-		node_sprite  = NULL;
-		obj_styleBox = NULL;
-		atlas_tex    = NULL;
+	if(p_obj == node_sprite || p_obj == node_patch9 || p_obj == obj_styleBox.ptr() || p_obj == atlas_tex.ptr()) {
+		node_patch9 = NULL;
+		node_sprite = NULL;
+		obj_styleBox = Ref<StyleBox>(NULL);
+		atlas_tex = Ref<AtlasTexture>(NULL);
 		hide();
 	}
 }
 
 void TextureRegionEditor::_bind_methods()
 {
-	ObjectTypeDB::bind_method(_MD("_edit_node"),&TextureRegionEditor::_edit_node);
 	ObjectTypeDB::bind_method(_MD("_edit_region"),&TextureRegionEditor::_edit_region);
-	ObjectTypeDB::bind_method(_MD("_edit_margin"),&TextureRegionEditor::_edit_margin);
 	ObjectTypeDB::bind_method(_MD("_region_draw"),&TextureRegionEditor::_region_draw);
 	ObjectTypeDB::bind_method(_MD("_region_input"),&TextureRegionEditor::_region_input);
 	ObjectTypeDB::bind_method(_MD("_scroll_changed"),&TextureRegionEditor::_scroll_changed);
 	ObjectTypeDB::bind_method(_MD("_node_removed"),&TextureRegionEditor::_node_removed);
-	ObjectTypeDB::bind_method(_MD("_set_use_snap"),&TextureRegionEditor::_set_use_snap);
-	ObjectTypeDB::bind_method(_MD("_set_show_grid"),&TextureRegionEditor::_set_show_grid);
+	ObjectTypeDB::bind_method(_MD("_set_snap_mode"),&TextureRegionEditor::_set_snap_mode);
 	ObjectTypeDB::bind_method(_MD("_set_snap_off_x"),&TextureRegionEditor::_set_snap_off_x);
 	ObjectTypeDB::bind_method(_MD("_set_snap_off_y"),&TextureRegionEditor::_set_snap_off_y);
 	ObjectTypeDB::bind_method(_MD("_set_snap_step_x"),&TextureRegionEditor::_set_snap_step_x);
 	ObjectTypeDB::bind_method(_MD("_set_snap_step_y"),&TextureRegionEditor::_set_snap_step_y);
+	ObjectTypeDB::bind_method(_MD("_set_snap_sep_x"),&TextureRegionEditor::_set_snap_sep_x);
+	ObjectTypeDB::bind_method(_MD("_set_snap_sep_y"),&TextureRegionEditor::_set_snap_sep_y);
+	ObjectTypeDB::bind_method(_MD("_zoom_in"),&TextureRegionEditor::_zoom_in);
+	ObjectTypeDB::bind_method(_MD("_zoom_reset"),&TextureRegionEditor::_zoom_reset);
+	ObjectTypeDB::bind_method(_MD("_zoom_out"),&TextureRegionEditor::_zoom_out);
 }
 
 void TextureRegionEditor::edit(Object *p_obj)
 {
+	if (node_sprite && node_sprite->is_connected("texture_changed",this,"_edit_region"))
+		node_sprite->disconnect("texture_changed",this,"_edit_region");
+	if (node_patch9 && node_patch9->is_connected("texture_changed",this,"_edit_region"))
+		node_patch9->disconnect("texture_changed",this,"_edit_region");
+	if (obj_styleBox.is_valid() && obj_styleBox->is_connected("texture_changed",this,"_edit_region"))
+		obj_styleBox->disconnect("texture_changed",this,"_edit_region");
+	if (atlas_tex.is_valid() && atlas_tex->is_connected("atlas_changed",this,"_edit_region"))
+		atlas_tex->disconnect("atlas_changed",this,"_edit_region");
 	if (p_obj) {
-		margin_button->hide();
-		node_type = p_obj->get_type();
-		if(node_type == "Sprite"){
-			node_sprite = p_obj->cast_to<Sprite>();
-			node_patch9 = NULL;
-			obj_styleBox = NULL;
-			atlas_tex   = NULL;
-		}
-		else if(node_type == "AtlasTexture") {
-			atlas_tex   = p_obj->cast_to<AtlasTexture>();
-			node_sprite = NULL;
-			node_patch9 = NULL;
-			obj_styleBox = NULL;
-		}
-		else if(node_type == "Patch9Frame") {
-			node_patch9 = p_obj->cast_to<Patch9Frame>();
-			node_sprite = NULL;
-			obj_styleBox = NULL;
-			atlas_tex = NULL;
-			margin_button->show();
-		}
-		else if(node_type == "StyleBoxTexture") {
-			obj_styleBox = p_obj->cast_to<StyleBoxTexture>();
-			node_sprite = NULL;
-			node_patch9 = NULL;
-			atlas_tex = NULL;
-			margin_button->show();
+		node_sprite = p_obj->cast_to<Sprite>();
+		node_patch9 = p_obj->cast_to<Patch9Frame>();
+		if (p_obj->cast_to<StyleBoxTexture>())
+			obj_styleBox = Ref<StyleBoxTexture>(p_obj->cast_to<StyleBoxTexture>());
+		if (p_obj->cast_to<AtlasTexture>()) {
+			atlas_tex = Ref<AtlasTexture>(p_obj->cast_to<AtlasTexture>());
+			atlas_tex->connect("atlas_changed",this,"_edit_region");
+		} else {
+			p_obj->connect("texture_changed",this,"_edit_region");
 		}
 		p_obj->connect("exit_tree",this,"_node_removed",varray(p_obj),CONNECT_ONESHOT);
+		_edit_region();
 	} else {
 		if(node_sprite)
 			node_sprite->disconnect("exit_tree",this,"_node_removed");
-		else if(atlas_tex)
-			atlas_tex->disconnect("exit_tree",this,"_node_removed");
 		else if(node_patch9)
 			node_patch9->disconnect("exit_tree",this,"_node_removed");
-		else if(obj_styleBox)
+		else if(obj_styleBox.is_valid())
 			obj_styleBox->disconnect("exit_tree",this,"_node_removed");
-		node_sprite  = NULL;
-		node_patch9  = NULL;
-		obj_styleBox = NULL;
-		atlas_tex    = NULL;
+		else if(atlas_tex.is_valid())
+			atlas_tex->disconnect("exit_tree",this,"_node_removed");
+
+		node_sprite = NULL;
+		node_patch9 = NULL;
+		obj_styleBox = Ref<StyleBoxTexture>(NULL);
+		atlas_tex = Ref<AtlasTexture>(NULL);
 	}
+	edit_draw->update();
 }
 
 void TextureRegionEditor::_edit_region()
 {
-	this->_edit_node(REGION_TEXTURE_REGION);
-	dlg_editor->set_title(TTR("Texture Region Editor"));
-}
-
-void TextureRegionEditor::_edit_margin()
-{
-	this->_edit_node(REGION_PATCH_MARGIN);
-	dlg_editor->set_title(TTR("Scale Region Editor"));
-}
-
-void TextureRegionEditor::_edit_node(int region)
-{
 	Ref<Texture> texture = NULL;
-	if(node_type == "Sprite" && node_sprite )
+	if(node_sprite )
 		texture = node_sprite->get_texture();
-	else if(node_type == "Patch9Frame" && node_patch9 )
+	else if(node_patch9 )
 		texture = node_patch9->get_texture();
-	else if(node_type == "StyleBoxTexture" && obj_styleBox)
+	else if(obj_styleBox.is_valid())
 		texture = obj_styleBox->get_texture();
-	else if(node_type == "AtlasTexture" && atlas_tex)
+	else if(atlas_tex.is_valid())
 		texture = atlas_tex->get_atlas();
 
 	if (texture.is_null()) {
-		error->set_text(TTR("No texture in this node.\nSet a texture to be able to edit region."));
-		error->popup_centered_minsize();
 		return;
 	}
 
-	if(node_type == "Sprite" && node_sprite )
-		tex_region = node_sprite->get_region_rect();
-	else if(node_type == "Patch9Frame" && node_patch9 )
-		tex_region = node_patch9->get_region_rect();
-	else if(node_type == "StyleBoxTexture" && obj_styleBox)
-		tex_region = obj_styleBox->get_region_rect();
-	else if(node_type == "AtlasTexture" && atlas_tex)
-		tex_region = atlas_tex->get_region();
-	rect = tex_region;
-
-	if(region == REGION_PATCH_MARGIN) {
-		if(node_patch9){
-			Patch9Frame *node = node_patch9;
-			rect.pos += Point2(node->get_patch_margin(MARGIN_LEFT),node->get_patch_margin(MARGIN_TOP));
-			rect.size -= Size2(node->get_patch_margin(MARGIN_RIGHT)+node->get_patch_margin(MARGIN_LEFT), node->get_patch_margin(MARGIN_BOTTOM)+node->get_patch_margin(MARGIN_TOP));
-		}
-		else if(obj_styleBox) {
-			StyleBoxTexture * node = obj_styleBox;
-			rect.pos += Point2(node->get_margin_size(MARGIN_LEFT),node->get_margin_size(MARGIN_TOP));
-			rect.size -= Size2(node->get_margin_size(MARGIN_RIGHT)+node->get_margin_size(MARGIN_LEFT), node->get_margin_size(MARGIN_BOTTOM)+node->get_margin_size(MARGIN_TOP));
+	autoslice_cache.clear();
+	Image i;
+	if (i.load(texture->get_path()) == OK) {
+		BitMap bm;
+		bm.create_from_image_alpha(i);
+		for (int y = 0; y < i.get_height(); y++) {
+			for (int x = 0; x < i.get_width(); x++) {
+				if (bm.get_bit(Point2(x,y))) {
+					bool found = false;
+					for (List<Rect2>::Element *E = autoslice_cache.front(); E; E=E->next()) {
+						Rect2 grown = E->get().grow(1.5);
+						if (grown.has_point(Point2(x,y))) {
+							E->get().expand_to(Point2(x,y));
+							E->get().expand_to(Point2(x+1,y+1));
+							x = E->get().pos.x+E->get().size.x-1;
+							bool merged = true;
+							while (merged) {
+								merged = false;
+								for (List<Rect2>::Element *F = autoslice_cache.front(); F; F=F->next()) {
+									if (F==E)
+										continue;
+									if (E->get().grow(1).intersects(F->get())) {
+										E->get().expand_to(F->get().pos);
+										E->get().expand_to(F->get().pos+F->get().size);
+										F=F->prev();
+										autoslice_cache.erase(F->next());
+										merged = true;
+									}
+								}
+							}
+							found = true;
+							break;
+						}
+					}
+					if (!found) {
+						Rect2 new_rect(x,y,1,1);
+						autoslice_cache.push_back(new_rect);
+					}
+				}
+			}
 		}
 	}
 
-	dlg_editor->popup_centered_ratio(0.85);
-	dlg_editor->get_ok()->release_focus();
 
-	editing_region = region;
+	if(node_sprite )
+		rect = node_sprite->get_region_rect();
+	else if(node_patch9 )
+		rect = node_patch9->get_region_rect();
+	else if(obj_styleBox.is_valid())
+		rect = obj_styleBox->get_region_rect();
+	else if (atlas_tex.is_valid())
+		rect = atlas_tex->get_region();
+
+	edit_draw->update();
 }
 
-inline float _snap_scalar(float p_offset, float p_step, float p_target) {
-	return p_step != 0 ? Math::stepify(p_target - p_offset, p_step) + p_offset : p_target;
+inline float _snap_scalar(float p_offset, float p_step, float separation, float p_target) {
+	if (p_step != 0) {
+		float a = Math::stepify(p_target - p_offset, p_step+separation) + p_offset;
+		float b = a;
+		if (p_target >= 0)
+			b -= separation;
+		else
+			b += p_step;
+		return (Math::abs(p_target-a) < Math::abs(p_target-b)) ? a : b;
+	}
+	return p_target;
 }
 
 Vector2 TextureRegionEditor::snap_point(Vector2 p_target) const {
-	if (use_snap) {
-		p_target.x = _snap_scalar(snap_offset.x, snap_step.x, p_target.x);
-		p_target.y = _snap_scalar(snap_offset.y, snap_step.y, p_target.y);
+	if (snap_mode == SNAP_GRID) {
+		p_target.x = _snap_scalar(snap_offset.x, snap_step.x, snap_separation.x, p_target.x);
+		p_target.y = _snap_scalar(snap_offset.y, snap_step.y, snap_separation.y, p_target.y);
 	}
-	p_target = p_target.snapped(Size2(1, 1));
 
 	return p_target;
 }
@@ -552,56 +767,42 @@ TextureRegionEditor::TextureRegionEditor(EditorNode* p_editor)
 {
 	node_sprite = NULL;
 	node_patch9 = NULL;
-	atlas_tex   = NULL;
+	obj_styleBox = Ref<StyleBoxTexture>(NULL);
+	atlas_tex = Ref<AtlasTexture>(NULL);
 	editor=p_editor;
 	undo_redo = editor->get_undo_redo();
 
 	snap_step=Vector2(10,10);
-	use_snap=false;
-	snap_show_grid=false;
+	snap_separation = Vector2(0,0);
+	edited_margin = -1;
+	drag_index = -1;
 	drag=false;
 
-	add_child( memnew( VSeparator ));
-	region_button = memnew( ToolButton );
-	add_child(region_button);
-	region_button->set_tooltip(TTR("Texture Region Editor"));
-	region_button->connect("pressed",this,"_edit_region");
-
-	margin_button = memnew( ToolButton );
-	add_child(margin_button);
-	margin_button->set_tooltip(TTR("Scale Region Editor"));
-	margin_button->connect("pressed",this,"_edit_margin");
-
-	dlg_editor = memnew( AcceptDialog );
-	add_child(dlg_editor);
-	dlg_editor->set_self_opacity(0.9);
-
 	VBoxContainer *main_vb = memnew( VBoxContainer );
-	dlg_editor->add_child(main_vb);
-	dlg_editor->set_child_rect(main_vb);
+	add_child(main_vb);
+	main_vb->set_area_as_parent_rect(0);
 	HBoxContainer *hb_tools = memnew( HBoxContainer );
 	main_vb->add_child(hb_tools);
 
-	b_snap_enable = memnew( ToolButton );
-	hb_tools->add_child(b_snap_enable);
-	b_snap_enable->set_text(TTR("Snap"));
-	b_snap_enable->set_focus_mode(FOCUS_NONE);
-	b_snap_enable->set_toggle_mode(true);
-	b_snap_enable->set_pressed(use_snap);
-	b_snap_enable->set_tooltip(TTR("Enable Snap"));
-	b_snap_enable->connect("toggled",this,"_set_use_snap");
-
-	b_snap_grid = memnew( ToolButton );
-	hb_tools->add_child(b_snap_grid);
-	b_snap_grid->set_text(TTR("Grid"));
-	b_snap_grid->set_focus_mode(FOCUS_NONE);
-	b_snap_grid->set_toggle_mode(true);
-	b_snap_grid->set_pressed(snap_show_grid);
-	b_snap_grid->set_tooltip(TTR("Show Grid"));
-	b_snap_grid->connect("toggled",this,"_set_show_grid");
-
-	hb_tools->add_child( memnew( VSeparator ));
-	hb_tools->add_child( memnew( Label(TTR("Grid Offset:")) ) );
+	hb_tools->add_child(memnew( Label(TTR("Snap Mode:")) ));
+
+	snap_mode_button = memnew( MenuButton );
+	hb_tools->add_child(snap_mode_button);
+	snap_mode_button->set_text(TTR("<None>"));
+	PopupMenu *p = snap_mode_button->get_popup();
+	p->add_item(TTR("<None>"),0);
+	p->add_item(TTR("Pixel Snap"),1);
+	p->add_item(TTR("Grid Snap"),2);
+	p->add_item(TTR("Auto Slice"),3);
+	for (int i = 0; i < 4; i++)
+		p->set_item_as_checkable(i,true);
+	p->set_item_checked(0,true);
+	p->connect("item_pressed", this, "_set_snap_mode");
+	hb_grid = memnew( HBoxContainer );
+	hb_tools->add_child(hb_grid);
+	hb_grid->add_child( memnew( VSeparator ));
+
+	hb_grid->add_child( memnew( Label(TTR("Offset:")) ) );
 
 	sb_off_x = memnew( SpinBox );
 	sb_off_x->set_min(-256);
@@ -610,7 +811,7 @@ TextureRegionEditor::TextureRegionEditor(EditorNode* p_editor)
 	sb_off_x->set_val(snap_offset.x);
 	sb_off_x->set_suffix("px");
 	sb_off_x->connect("value_changed", this, "_set_snap_off_x");
-	hb_tools->add_child(sb_off_x);
+	hb_grid->add_child(sb_off_x);
 
 	sb_off_y = memnew( SpinBox );
 	sb_off_y->set_min(-256);
@@ -619,10 +820,10 @@ TextureRegionEditor::TextureRegionEditor(EditorNode* p_editor)
 	sb_off_y->set_val(snap_offset.y);
 	sb_off_y->set_suffix("px");
 	sb_off_y->connect("value_changed", this, "_set_snap_off_y");
-	hb_tools->add_child(sb_off_y);
+	hb_grid->add_child(sb_off_y);
 
-	hb_tools->add_child( memnew( VSeparator ));
-	hb_tools->add_child( memnew( Label(TTR("Grid Step:")) ) );
+	hb_grid->add_child( memnew( VSeparator ));
+	hb_grid->add_child( memnew( Label(TTR("Step:")) ) );
 
 	sb_step_x = memnew( SpinBox );
 	sb_step_x->set_min(-256);
@@ -631,7 +832,7 @@ TextureRegionEditor::TextureRegionEditor(EditorNode* p_editor)
 	sb_step_x->set_val(snap_step.x);
 	sb_step_x->set_suffix("px");
 	sb_step_x->connect("value_changed", this, "_set_snap_step_x");
-	hb_tools->add_child(sb_step_x);
+	hb_grid->add_child(sb_step_x);
 
 	sb_step_y = memnew( SpinBox );
 	sb_step_y->set_min(-256);
@@ -640,7 +841,30 @@ TextureRegionEditor::TextureRegionEditor(EditorNode* p_editor)
 	sb_step_y->set_val(snap_step.y);
 	sb_step_y->set_suffix("px");
 	sb_step_y->connect("value_changed", this, "_set_snap_step_y");
-	hb_tools->add_child(sb_step_y);
+	hb_grid->add_child(sb_step_y);
+
+	hb_grid->add_child( memnew( VSeparator ));
+	hb_grid->add_child( memnew( Label(TTR("Separation:")) ) );
+
+	sb_sep_x = memnew( SpinBox );
+	sb_sep_x->set_min(0);
+	sb_sep_x->set_max(256);
+	sb_sep_x->set_step(1);
+	sb_sep_x->set_val(snap_separation.x);
+	sb_sep_x->set_suffix("px");
+	sb_sep_x->connect("value_changed", this, "_set_snap_sep_x");
+	hb_grid->add_child(sb_sep_x);
+
+	sb_sep_y = memnew( SpinBox );
+	sb_sep_y->set_min(0);
+	sb_sep_y->set_max(256);
+	sb_sep_y->set_step(1);
+	sb_sep_y->set_val(snap_separation.y);
+	sb_sep_y->set_suffix("px");
+	sb_sep_y->connect("value_changed", this, "_set_snap_sep_y");
+	hb_grid->add_child(sb_sep_y);
+
+	hb_grid->hide();
 
 	HBoxContainer *main_hb = memnew( HBoxContainer );
 	main_vb->add_child(main_hb);
@@ -649,25 +873,24 @@ TextureRegionEditor::TextureRegionEditor(EditorNode* p_editor)
 	main_hb->set_v_size_flags(SIZE_EXPAND_FILL);
 	edit_draw->set_h_size_flags(SIZE_EXPAND_FILL);
 
+	Control * separator = memnew( Control );
+	separator->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	hb_tools->add_child(separator);
 
-	hb_tools->add_child( memnew( VSeparator ));
 	icon_zoom = memnew( TextureFrame );
 	hb_tools->add_child(icon_zoom);
 
-	zoom = memnew( HSlider );
-	zoom->set_min(0.01);
-	zoom->set_max(4);
-	zoom->set_val(1);
-	zoom->set_step(0.01);
-	hb_tools->add_child(zoom);
-	zoom->set_custom_minimum_size(Size2(200,0));
-	zoom_value = memnew( SpinBox );
-	zoom->share(zoom_value);
-	zoom_value->set_custom_minimum_size(Size2(50,0));
-	hb_tools->add_child(zoom_value);
-	zoom->connect("value_changed",this,"_scroll_changed");
+	zoom_out = memnew( ToolButton );
+	zoom_out->connect("pressed", this, "_zoom_out");
+	hb_tools->add_child(zoom_out);
 
+	zoom_reset = memnew( ToolButton );
+	zoom_reset->connect("pressed", this, "_zoom_reset");
+	hb_tools->add_child(zoom_reset);
 
+	zoom_in = memnew( ToolButton );
+	zoom_in->connect("pressed", this, "_zoom_in");
+	hb_tools->add_child(zoom_in);
 
 	vscroll = memnew( VScrollBar);
 	main_hb->add_child(vscroll);
@@ -681,9 +904,6 @@ TextureRegionEditor::TextureRegionEditor(EditorNode* p_editor)
 	draw_zoom=1.0;
 	updating_scroll=false;
 
-	error = memnew( AcceptDialog);
-	add_child(error);
-
 }
 
 void TextureRegionEditorPlugin::edit(Object *p_node)
@@ -699,10 +919,13 @@ bool TextureRegionEditorPlugin::handles(Object *p_obj) const
 void TextureRegionEditorPlugin::make_visible(bool p_visible)
 {
 	if (p_visible) {
-		region_editor->show();
+		region_button->show();
+		if (region_button->is_pressed())
+			region_editor->show();
 	} else {
-		region_editor->hide();
+		region_button->hide();
 		region_editor->edit(NULL);
+		region_editor->hide();
 	}
 }
 
@@ -710,11 +933,11 @@ void TextureRegionEditorPlugin::make_visible(bool p_visible)
 Dictionary TextureRegionEditorPlugin::get_state() const {
 
 	Dictionary state;
-	state["zoom"]=region_editor->zoom->get_val();
+	state["zoom"]=region_editor->draw_zoom;
 	state["snap_offset"]=region_editor->snap_offset;
 	state["snap_step"]=region_editor->snap_step;
-	state["use_snap"]=region_editor->use_snap;
-	state["snap_show_grid"]=region_editor->snap_show_grid;
+	state["snap_separation"]=region_editor->snap_separation;
+	state["snap_mode"]=region_editor->snap_mode;
 	return state;
 }
 
@@ -722,7 +945,7 @@ void TextureRegionEditorPlugin::set_state(const Dictionary& p_state){
 
 	Dictionary state=p_state;
 	if (state.has("zoom")) {
-		region_editor->zoom->set_val(p_state["zoom"]);
+		region_editor->draw_zoom = p_state["zoom"];
 	}
 
 	if (state.has("snap_step")) {
@@ -739,22 +962,28 @@ void TextureRegionEditorPlugin::set_state(const Dictionary& p_state){
 		region_editor->snap_offset = ofs;
 	}
 
-	if (state.has("use_snap")) {
-		region_editor->use_snap=state["use_snap"];
-		region_editor->b_snap_enable->set_pressed(state["use_snap"]);
+	if (state.has("snap_separation")) {
+		Vector2 sep = state["snap_separation"];
+		region_editor->sb_sep_x->set_val(sep.x);
+		region_editor->sb_sep_y->set_val(sep.y);
+		region_editor->snap_separation = sep;
 	}
 
-	if (state.has("snap_show_grid")) {
-		region_editor->snap_show_grid=state["snap_show_grid"];
-		region_editor->b_snap_grid->set_pressed(state["snap_show_grid"]);
+	if (state.has("snap_mode")) {
+		region_editor->_set_snap_mode(state["snap_mode"]);
 	}
+
 }
 
 TextureRegionEditorPlugin::TextureRegionEditorPlugin(EditorNode *p_node)
 {
 	editor = p_node;
-	region_editor= memnew ( TextureRegionEditor(p_node) );
-	CanvasItemEditor::get_singleton()->add_control_to_menu_panel(region_editor);
+	region_editor = memnew ( TextureRegionEditor(p_node) );
+
+	region_button = p_node->add_bottom_panel_item(TTR("Texture Region"), region_editor);
+	region_button->set_tooltip(TTR("Texture Region Editor"));
 
+	region_editor->set_custom_minimum_size(Size2(0,200));
 	region_editor->hide();
+	region_button->hide();
 }
diff --git a/tools/editor/plugins/texture_region_editor_plugin.h b/tools/editor/plugins/texture_region_editor_plugin.h
index 1e4888b06d..3658a38f11 100644
--- a/tools/editor/plugins/texture_region_editor_plugin.h
+++ b/tools/editor/plugins/texture_region_editor_plugin.h
@@ -40,69 +40,73 @@
 #include "scene/resources/style_box.h"
 #include "scene/resources/texture.h"
 
-class TextureRegionEditor : public HBoxContainer {
+class TextureRegionEditor : public Control {
 
-	OBJ_TYPE(TextureRegionEditor, HBoxContainer );
-	enum RegionType {
-		REGION_TEXTURE_REGION,
-		REGION_PATCH_MARGIN
+	OBJ_TYPE(TextureRegionEditor, Control );
+
+	enum SnapMode {
+		SNAP_NONE,
+		SNAP_PIXEL,
+		SNAP_GRID,
+		SNAP_AUTOSLICE
 	};
 
 	friend class TextureRegionEditorPlugin;
-	ToolButton *region_button;
-	ToolButton *margin_button;
-	ToolButton *b_snap_enable;
-	ToolButton *b_snap_grid;
+	MenuButton *snap_mode_button;
 	TextureFrame *icon_zoom;
-	HSlider *zoom;
-	SpinBox *zoom_value;
+	ToolButton *zoom_in;
+	ToolButton *zoom_reset;
+	ToolButton *zoom_out;
+	HBoxContainer * hb_grid; //For showing/hiding the grid controls when changing the SnapMode
 	SpinBox *sb_step_y;
 	SpinBox *sb_step_x;
 	SpinBox *sb_off_y;
 	SpinBox *sb_off_x;
+	SpinBox *sb_sep_y;
+	SpinBox *sb_sep_x;
 	Control *edit_draw;
 
 	VScrollBar *vscroll;
 	HScrollBar *hscroll;
 
 	EditorNode *editor;
-	AcceptDialog *dlg_editor;
 	UndoRedo* undo_redo;
 
 	Vector2 draw_ofs;
 	float draw_zoom;
 	bool updating_scroll;
 
-	bool use_snap;
-	bool snap_show_grid;
+	int snap_mode;
 	Vector2 snap_offset;
 	Vector2 snap_step;
+	Vector2 snap_separation;
 
-
-	String node_type;
 	Patch9Frame *node_patch9;
 	Sprite *node_sprite;
-	StyleBoxTexture *obj_styleBox;
-	AtlasTexture *atlas_tex;
+	Ref<StyleBoxTexture> obj_styleBox;
+	Ref<AtlasTexture> atlas_tex;
 
-	int editing_region;
 	Rect2 rect;
 	Rect2 rect_prev;
-	Rect2 tex_region;
+	float prev_margin;
+	int edited_margin;
+	List<Rect2> autoslice_cache;
 
 	bool drag;
 	bool creating;
 	Vector2 drag_from;
 	int drag_index;
 
-	AcceptDialog *error;
-
-	void _set_use_snap(bool p_use);
-	void _set_show_grid(bool p_show);
+	void _set_snap_mode(int p_mode);
 	void _set_snap_off_x(float p_val);
 	void _set_snap_off_y(float p_val);
 	void _set_snap_step_x(float p_val);
 	void _set_snap_step_y(float p_val);
+	void _set_snap_sep_x(float p_val);
+	void _set_snap_sep_y(float p_val);
+	void _zoom_in();
+	void _zoom_reset();
+	void _zoom_out();
 	void apply_rect(const Rect2& rect);
 protected:
 
@@ -114,9 +118,7 @@ protected:
 
 public:
 
-	void _edit_node(int tex_region);
 	void _edit_region();
-	void _edit_margin();
 	void _region_draw();
 	void _region_input(const InputEvent &p_input);
 	void _scroll_changed(float);
@@ -130,11 +132,12 @@ class TextureRegionEditorPlugin : public EditorPlugin
 {
 	OBJ_TYPE( TextureRegionEditorPlugin, EditorPlugin );
 
+	Button *region_button;
 	TextureRegionEditor *region_editor;
 	EditorNode *editor;
 public:
 
-	virtual String get_name() const { return "SpriteRegion"; }
+	virtual String get_name() const { return "TextureRegion"; }
 	bool has_main_screen() const { return false; }
 	virtual void edit(Object *p_node);
 	virtual bool handles(Object *p_node) const;
diff --git a/tools/editor/plugins/tile_map_editor_plugin.cpp b/tools/editor/plugins/tile_map_editor_plugin.cpp
index d5f85d3333..9d27ac8aa3 100644
--- a/tools/editor/plugins/tile_map_editor_plugin.cpp
+++ b/tools/editor/plugins/tile_map_editor_plugin.cpp
@@ -223,7 +223,7 @@ void TileMapEditor::_update_palette() {
 		String name;
 
 		if (tileset->tile_get_name(E->get())!="") {
-			name = tileset->tile_get_name(E->get());
+			name = itos(E->get())+" - "+tileset->tile_get_name(E->get());
 		} else {
 			name = "#"+itos(E->get());
 		}
diff --git a/tools/editor/plugins/tile_set_editor_plugin.cpp b/tools/editor/plugins/tile_set_editor_plugin.cpp
index a2c7147bf3..39a15189e7 100644
--- a/tools/editor/plugins/tile_set_editor_plugin.cpp
+++ b/tools/editor/plugins/tile_set_editor_plugin.cpp
@@ -73,24 +73,24 @@ void TileSetEditor::_import_scene(Node *scene, Ref<TileSet> p_library, bool p_me
 			p_library->tile_set_name(id,mi->get_name());
 		}
 
-
-
 		p_library->tile_set_texture(id,texture);
 		p_library->tile_set_material(id,material);
 
 		Vector2 phys_offset;
+		Size2 s;
 
-		if (mi->is_centered()) {
-			Size2 s;
-			if (mi->is_region()) {
-				s=mi->get_region_rect().size;
-			} else {
-				s=texture->get_size();
-			}
-			phys_offset+=-s/2;
-		}
 		if (mi->is_region()) {
+			s=mi->get_region_rect().size;
 			p_library->tile_set_region(id,mi->get_region_rect());
+		} else {
+			const int frame = mi->get_frame();
+			const int hframes = mi->get_hframes();
+			s=texture->get_size()/Size2(hframes,mi->get_vframes());
+			p_library->tile_set_region(id,Rect2(Vector2(frame%hframes,frame/hframes)*s,s));
+		}
+		
+		if (mi->is_centered()) {
+			phys_offset+=-s/2;
 		}
 
 		Vector<Ref<Shape2D> >collisions;
diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp
index 3f82199fc3..103962716b 100644
--- a/tools/editor/project_export.cpp
+++ b/tools/editor/project_export.cpp
@@ -431,7 +431,6 @@ void ProjectExportDialog::_validate_platform() {
 
 void ProjectExportDialog::_export_mode_changed(int p_idx) {
 
-	bool do_all = p_idx==0;
 	if (EditorImportExport::get_singleton()->get_export_filter()==p_idx)
 		return;
 	EditorImportExport::get_singleton()->set_export_filter(EditorImportExport::ExportFilter(p_idx));
diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp
index d8814fd50e..52f6d1dd9c 100644
--- a/tools/editor/project_manager.cpp
+++ b/tools/editor/project_manager.cpp
@@ -46,7 +46,7 @@
 #include "io/resource_saver.h"
 
 #include "editor_themes.h"
-
+#include "editor_initialize_ssl.h"
 #include "editor_scale.h"
 
 class NewProjectDialog : public ConfirmationDialog {
@@ -823,13 +823,13 @@ void ProjectManager::_bind_methods() {
 
 ProjectManager::ProjectManager() {
 
-	int margin = get_constant("margin","Dialogs");
-	int button_margin = get_constant("button_margin","Dialogs");
-
 	// load settings
 	if (!EditorSettings::get_singleton())
 		EditorSettings::create();
 
+
+	EditorSettings::get_singleton()->set_optimize_save(false); //just write settings as they came
+
 	{
 		int dpi_mode = EditorSettings::get_singleton()->get("global/hidpi_mode");
 		if (dpi_mode==0) {
@@ -871,9 +871,6 @@ ProjectManager::ProjectManager() {
 
 	HBoxContainer *top_hb = memnew( HBoxContainer);
 	vb->add_child(top_hb);
-	TextureFrame *logo = memnew( TextureFrame );
-	logo->set_texture(theme->get_icon("LogoSmall","EditorIcons"));
-	//top_hb->add_child( logo );
 	CenterContainer *ccl = memnew( CenterContainer );
 	Label *l = memnew( Label );
 	l->set_text(_MKSTR(VERSION_NAME)+String(" - ")+TTR("Project Manager"));
@@ -1103,6 +1100,8 @@ void ProjectListFilter::_bind_methods() {
 
 ProjectListFilter::ProjectListFilter() {
 
+	editor_initialize_certificates(); //for asset sharing
+
 	_current_filter = FILTER_NAME;
 
 	filter_option = memnew(OptionButton);
diff --git a/tools/editor/project_settings.cpp b/tools/editor/project_settings.cpp
index 6822e50b73..6be1abf52f 100644
--- a/tools/editor/project_settings.cpp
+++ b/tools/editor/project_settings.cpp
@@ -100,16 +100,6 @@ void ProjectSettings::_notification(int p_what) {
 			translation_res_file_open->add_filter("*."+E->get());
 			translation_res_option_file_open->add_filter("*."+E->get());
 		}
-
-		List<String> afn;
-		ResourceLoader::get_recognized_extensions_for_type("Script",&afn);
-		ResourceLoader::get_recognized_extensions_for_type("PackedScene",&afn);
-
-		for (List<String>::Element *E=afn.front();E;E=E->next()) {
-
-			autoload_file_open->add_filter("*."+E->get());
-		}
-
 	}
 }
 
@@ -564,7 +554,7 @@ void ProjectSettings::popup_project_settings() {
 	popup_centered_ratio();
 	globals_editor->update_category_list();
 	_update_translations();
-	_update_autoload();
+	autoload_settings->update_autoload();
 	plugin_settings->update_plugins();
 }
 
@@ -616,10 +606,26 @@ void ProjectSettings::_item_add() {
 
 	String name = catname!="" ? catname+"/"+propname : propname;
 
-	Globals::get_singleton()->set(name,value);
+	undo_redo->create_action("Add Global Property");
+
+	undo_redo->add_do_property(Globals::get_singleton(), name, value);
+	undo_redo->add_do_method(Globals::get_singleton(), "set_persisting", name, true);
+
+	if (Globals::get_singleton()->has(name)) {
+		undo_redo->add_undo_property(Globals::get_singleton(), name, Globals::get_singleton()->get(name));
+	} else {
+		undo_redo->add_undo_property(Globals::get_singleton(), name, Variant());
+	}
+
+	undo_redo->add_do_method(globals_editor, "update_category_list");
+	undo_redo->add_undo_method(globals_editor, "update_category_list");
+
+	undo_redo->add_do_method(this, "_settings_changed");
+	undo_redo->add_undo_method(this, "_settings_changed");
+
+	undo_redo->commit_action();
 
 	globals_editor->set_current_section(catname);
-	globals_editor->update_category_list();
 
 	_settings_changed();
 }
@@ -633,10 +639,20 @@ void ProjectSettings::_item_del() {
 
 	String name = catname!="" ? catname+"/"+propname : propname;
 
-	Globals::get_singleton()->set(name,Variant());
+	undo_redo->create_action("Delete Global Property");
 
-	globals_editor->set_current_section(catname);
-	globals_editor->update_category_list();
+	undo_redo->add_do_property(Globals::get_singleton(), name, Variant());
+
+	undo_redo->add_undo_property(Globals::get_singleton(), name, Globals::get_singleton()->get(name));
+	undo_redo->add_undo_method(Globals::get_singleton(), "set_persisting", name, Globals::get_singleton()->is_persisting(name));
+
+	undo_redo->add_do_method(globals_editor, "update_category_list");
+	undo_redo->add_undo_method(globals_editor, "update_category_list");
+
+	undo_redo->add_do_method(this, "_settings_changed");
+	undo_redo->add_undo_method(this, "_settings_changed");
+
+	undo_redo->commit_action();
 
 	_settings_changed();
 }
@@ -811,263 +827,6 @@ void ProjectSettings::_translation_file_open() {
 	translation_file_open->popup_centered_ratio();
 }
 
-
-void ProjectSettings::_autoload_file_callback(const String& p_path) {
-
-	autoload_add_path->set_text(p_path);
-	//if (autoload_add_name->get_text().strip_edges()==String()) {
-
-		autoload_add_name->set_text( p_path.get_file().basename() );
-	//}
-
-	//_translation_add(p_translation);
-}
-
-void ProjectSettings::_autoload_file_open() {
-
-	autoload_file_open->popup_centered_ratio();
-}
-
-void ProjectSettings::_autoload_edited() {
-
-	if (updating_autoload)
-		return;
-
-	TreeItem *ti = autoload_list->get_edited();
-	int column = autoload_list->get_edited_column();
-
-	if (!ti || (column != 0 && column != 2))
-		return;
-
-	if (column == 0) {
-		String name = ti->get_text(0);
-		String old_name = selected_autoload.substr(selected_autoload.find("/")+1,selected_autoload.length());
-
-		if (!name.is_valid_identifier()) {
-			ti->set_text(0,old_name);
-			message->set_text(TTR("Invalid name.")+"\n"+TTR("Valid characters:")+" a-z, A-Z, 0-9 or _");
-			message->popup_centered(Size2(300,100));
-			return;
-		}
-
-		if (ObjectTypeDB::type_exists(name)) {
-			ti->set_text(0,old_name);
-			message->set_text(TTR("Invalid name. Must not collide with an existing engine class name."));
-			message->popup_centered(Size2(400,100));
-			return;
-		}
-
-		for(int i=0;i<Variant::VARIANT_MAX;i++) {
-			if (Variant::get_type_name(Variant::Type(i))==name) {
-				ti->set_text(0,old_name);
-				message->set_text(TTR("Invalid name. Must not collide with an existing buit-in type name."));
-				message->popup_centered(Size2(400,100));
-				return;
-			}
-		}
-
-		for(int i=0;i<GlobalConstants::get_global_constant_count();i++) {
-			if (GlobalConstants::get_global_constant_name(i)==name) {
-				ti->set_text(0,old_name);
-				message->set_text(TTR("Invalid name. Must not collide with an existing global constant name."));
-				message->popup_centered(Size2(400,100));
-				return;
-			}
-		}
-
-		if (Globals::get_singleton()->has("autoload/"+name)) {
-			ti->set_text(0,old_name);
-			message->set_text(vformat(TTR("Autoload '%s' already exists!"),name));
-			message->popup_centered(Size2(300,100));
-			return;
-		}
-
-		updating_autoload = true;
-
-		name = "autoload/"+name;
-		String path = Globals::get_singleton()->get(selected_autoload);
-		bool is_persisting = Globals::get_singleton()->is_persisting(selected_autoload);
-		int order = Globals::get_singleton()->get_order(selected_autoload);
-
-		undo_redo->create_action(TTR("Rename Autoload"));
-		undo_redo->add_do_property(Globals::get_singleton(),name,path);
-		undo_redo->add_do_method(Globals::get_singleton(),"set_persisting",name,is_persisting);
-		undo_redo->add_do_method(Globals::get_singleton(),"set_order",name,order);
-		undo_redo->add_do_method(Globals::get_singleton(),"clear",selected_autoload);
-		undo_redo->add_undo_property(Globals::get_singleton(),selected_autoload,path);
-		undo_redo->add_undo_method(Globals::get_singleton(),"set_persisting",selected_autoload,is_persisting);
-		undo_redo->add_undo_method(Globals::get_singleton(),"set_order",selected_autoload,order);
-		undo_redo->add_undo_method(Globals::get_singleton(),"clear",name);
-		undo_redo->add_do_method(this,"_update_autoload");
-		undo_redo->add_undo_method(this,"_update_autoload");
-		undo_redo->add_do_method(this,"_settings_changed");
-		undo_redo->add_undo_method(this,"_settings_changed");
-		undo_redo->commit_action();
-
-		selected_autoload = name;
-	} else if (column == 2) {
-		updating_autoload = true;
-
-		bool checked = ti->is_checked(2);
-		String base = "autoload/"+ti->get_text(0);
-		String path = Globals::get_singleton()->get(base);
-		int order = Globals::get_singleton()->get_order(base);
-
-		if (path.begins_with("*"))
-			path = path.substr(1,path.length());
-
-		if (checked)
-			path = "*" + path;
-
-		undo_redo->create_action(TTR("Toggle AutoLoad Globals"));
-		undo_redo->add_do_property(Globals::get_singleton(),base,path);
-		undo_redo->add_undo_property(Globals::get_singleton(),base,Globals::get_singleton()->get(base));
-		undo_redo->add_do_method(Globals::get_singleton(),"set_order",base,order); // keep order, as config order matters for these
-		undo_redo->add_undo_method(Globals::get_singleton(),"set_order",base,order);
-		undo_redo->add_do_method(this,"_update_autoload");
-		undo_redo->add_undo_method(this,"_update_autoload");
-		undo_redo->add_do_method(this,"_settings_changed");
-		undo_redo->add_undo_method(this,"_settings_changed");
-		undo_redo->commit_action();
-	}
-
-	updating_autoload = false;
-}
-
-void ProjectSettings::_autoload_add() {
-
-	String name = autoload_add_name->get_text();
-	if (!name.is_valid_identifier()) {
-		message->set_text(TTR("Invalid name.")+"\n"+TTR("Valid characters:")+" a-z, A-Z, 0-9 or _");
-		message->popup_centered(Size2(300,100));
-		return;
-
-	}
-
-	if (ObjectTypeDB::type_exists(name)) {
-
-		message->set_text(TTR("Invalid name. Must not collide with an existing engine class name."));
-		message->popup_centered(Size2(300,100));
-		return;
-
-	}
-
-	for(int i=0;i<Variant::VARIANT_MAX;i++) {
-		if (Variant::get_type_name(Variant::Type(i))==name) {
-
-			message->set_text(TTR("Invalid name. Must not collide with an existing buit-in type name."));
-			message->popup_centered(Size2(300,100));
-			return;
-
-		}
-	}
-
-	for(int i=0;i<GlobalConstants::get_global_constant_count();i++) {
-
-		if (GlobalConstants::get_global_constant_name(i)==name) {
-
-			message->set_text(TTR("Invalid name. Must not collide with an existing global constant name."));
-			message->popup_centered(Size2(300,100));
-			return;
-		}
-
-	}
-
-	String path = autoload_add_path->get_text();
-	if (!FileAccess::exists(path)) {
-		message->set_text("Invalid Path.\nFile does not exist.");
-		message->popup_centered(Size2(300,100));
-		return;
-
-	}
-	if (!path.begins_with("res://")) {
-		message->set_text("Invalid Path.\nNot in resource path.");
-		message->popup_centered(Size2(300,100));
-		return;
-
-	}
-
-	undo_redo->create_action(TTR("Add Autoload"));
-	name = "autoload/"+name;
-	undo_redo->add_do_property(Globals::get_singleton(),name,"*"+path);
-	if (Globals::get_singleton()->has(name))
-		undo_redo->add_undo_property(Globals::get_singleton(),name,Globals::get_singleton()->get(name));
-	else
-		undo_redo->add_undo_property(Globals::get_singleton(),name,Variant());
-
-	undo_redo->add_do_method(Globals::get_singleton(),"set_persisting",name,true);
-	undo_redo->add_do_method(this,"_update_autoload");
-	undo_redo->add_undo_method(this,"_update_autoload");
-	undo_redo->add_do_method(this,"_settings_changed");
-	undo_redo->add_undo_method(this,"_settings_changed");
-	undo_redo->commit_action();
-
-	autoload_add_path->set_text("");
-	autoload_add_name->set_text("");
-
-	//autoload_file_open->popup_centered_ratio();
-}
-
-void ProjectSettings::_autoload_delete(Object *p_item,int p_column, int p_button) {
-
-
-	TreeItem *ti=p_item->cast_to<TreeItem>();
-	String name = "autoload/"+ti->get_text(0);
-
-	if (p_button==0) {
-		//delete
-		int order = Globals::get_singleton()->get_order(name);
-		undo_redo->create_action(TTR("Remove Autoload"));
-		undo_redo->add_do_property(Globals::get_singleton(),name,Variant());
-		undo_redo->add_undo_property(Globals::get_singleton(),name,Globals::get_singleton()->get(name));
-		undo_redo->add_undo_method(Globals::get_singleton(),"set_persisting",name,true);
-		undo_redo->add_undo_method(Globals::get_singleton(),"set_order",name,order);
-		undo_redo->add_do_method(this,"_update_autoload");
-		undo_redo->add_undo_method(this,"_update_autoload");
-		undo_redo->add_do_method(this,"_settings_changed");
-		undo_redo->add_undo_method(this,"_settings_changed");
-		undo_redo->commit_action();
-	} else {
-
-		TreeItem *swap = NULL;
-
-		if (p_button==1) {
-			swap=ti->get_prev();
-		} else if (p_button==2) {
-			swap=ti->get_next();
-		}
-		if (!swap)
-			return;
-
-		String swap_name= "autoload/"+swap->get_text(0);
-
-		int order = Globals::get_singleton()->get_order(name);
-		int swap_order = Globals::get_singleton()->get_order(swap_name);
-
-		undo_redo->create_action(TTR("Move Autoload"));
-		undo_redo->add_do_method(Globals::get_singleton(),"set_order",swap_name,order);
-		undo_redo->add_do_method(Globals::get_singleton(),"set_order",name,swap_order);
-		undo_redo->add_undo_method(Globals::get_singleton(),"set_order",swap_name,swap_order);
-		undo_redo->add_undo_method(Globals::get_singleton(),"set_order",name,order);
-		undo_redo->add_do_method(this,"_update_autoload");
-		undo_redo->add_undo_method(this,"_update_autoload");
-		undo_redo->add_do_method(this,"_settings_changed");
-		undo_redo->add_undo_method(this,"_settings_changed");
-		undo_redo->commit_action();
-
-	}
-
-}
-
-void ProjectSettings::_autoload_selected() {
-	TreeItem *ti = autoload_list->get_selected();
-
-	if (!ti)
-		return;
-
-	selected_autoload = "autoload/"+ti->get_text(0);
-}
-
 void ProjectSettings::_translation_delete(Object *p_item,int p_column, int p_button) {
 
 	TreeItem *ti = p_item->cast_to<TreeItem>();
@@ -1393,55 +1152,6 @@ void ProjectSettings::_update_translations() {
 
 }
 
-void ProjectSettings::_update_autoload() {
-
-	if (updating_autoload)
-		return;
-
-	updating_autoload=true;
-
-	autoload_list->clear();
-	TreeItem *root = autoload_list->create_item();
-	autoload_list->set_hide_root(true);
-
-	List<PropertyInfo> props;
-	Globals::get_singleton()->get_property_list(&props);
-
-	for(List<PropertyInfo>::Element *E=props.front();E;E=E->next()) {
-
-		const PropertyInfo &pi=E->get();
-		if (!pi.name.begins_with("autoload/"))
-			continue;
-
-		String name = pi.name.get_slice("/",1);
-		String path = Globals::get_singleton()->get(pi.name);
-
-		if (name=="")
-			continue;
-		bool global=false;
-		if (path.begins_with("*")) {
-			path=path.substr(1,path.length());
-			global=true;
-		}
-		TreeItem *t = autoload_list->create_item(root);
-		t->set_text(0,name);
-		t->set_editable(0,true);
-		t->set_text(1,path);
-		t->set_cell_mode(2,TreeItem::CELL_MODE_CHECK);
-		t->set_editable(2,true);
-		t->set_text(2,TTR("Enable"));
-		t->set_checked(2,global);
-		t->add_button(3,get_icon("MoveUp","EditorIcons"),1);
-		t->add_button(3,get_icon("MoveDown","EditorIcons"),2);
-		t->add_button(3,get_icon("Del","EditorIcons"),0);
-
-
-	}
-
-	updating_autoload=false;
-
-}
-
 void ProjectSettings::_toggle_search_bar(bool p_pressed) {
 
 	globals_editor->get_property_editor()->set_use_filter(p_pressed);
@@ -1508,14 +1218,6 @@ void ProjectSettings::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_translation_res_delete"),&ProjectSettings::_translation_res_delete);
 	ObjectTypeDB::bind_method(_MD("_translation_res_option_delete"),&ProjectSettings::_translation_res_option_delete);
 
-	ObjectTypeDB::bind_method(_MD("_autoload_add"),&ProjectSettings::_autoload_add);
-	ObjectTypeDB::bind_method(_MD("_autoload_file_open"),&ProjectSettings::_autoload_file_open);
-	ObjectTypeDB::bind_method(_MD("_autoload_file_callback"),&ProjectSettings::_autoload_file_callback);
-	ObjectTypeDB::bind_method(_MD("_update_autoload"),&ProjectSettings::_update_autoload);
-	ObjectTypeDB::bind_method(_MD("_autoload_delete"),&ProjectSettings::_autoload_delete);
-	ObjectTypeDB::bind_method(_MD("_autoload_edited"),&ProjectSettings::_autoload_edited);
-	ObjectTypeDB::bind_method(_MD("_autoload_selected"),&ProjectSettings::_autoload_selected);
-
 	ObjectTypeDB::bind_method(_MD("_clear_search_box"),&ProjectSettings::_clear_search_box);
 	ObjectTypeDB::bind_method(_MD("_toggle_search_bar"),&ProjectSettings::_toggle_search_bar);
 
@@ -1858,69 +1560,10 @@ ProjectSettings::ProjectSettings(EditorData *p_data) {
 
 
 	{
-		VBoxContainer *avb = memnew( VBoxContainer );
-		tab_container->add_child(avb);
-		avb->set_name(TTR("AutoLoad"));
-		HBoxContainer *ahb = memnew( HBoxContainer);
-		avb->add_child(ahb);
-
-
-		VBoxContainer *avb_path = memnew( VBoxContainer );
-		avb_path->set_h_size_flags(SIZE_EXPAND_FILL);
-		HBoxContainer *ahb_path = memnew( HBoxContainer );
-		autoload_add_path = memnew(LineEdit);
-		autoload_add_path->set_h_size_flags(SIZE_EXPAND_FILL);
-		ahb_path->add_child(autoload_add_path);
-		Button *browseaa = memnew( Button("..") );
-		ahb_path->add_child(browseaa);
-		browseaa->connect("pressed",this,"_autoload_file_open");
-
-		avb_path->add_margin_child(TTR("Path:"),ahb_path);
-		ahb->add_child(avb_path);
-
-		VBoxContainer *avb_name = memnew( VBoxContainer );
-		avb_name->set_h_size_flags(SIZE_EXPAND_FILL);
-
-		HBoxContainer *ahb_name = memnew( HBoxContainer );
-		autoload_add_name = memnew(LineEdit);
-		autoload_add_name->set_h_size_flags(SIZE_EXPAND_FILL);
-		ahb_name->add_child(autoload_add_name);
-		avb_name->add_margin_child(TTR("Node Name:"),ahb_name);
-		Button *addaa = memnew( Button(TTR("Add")) );
-		ahb_name->add_child(addaa);
-		addaa->connect("pressed",this,"_autoload_add");
-
-		ahb->add_child(avb_name);
-
-		autoload_list = memnew( Tree );
-		autoload_list->set_v_size_flags(SIZE_EXPAND_FILL);
-		avb->add_margin_child(TTR("List:"),autoload_list,true);
-
-		autoload_file_open=memnew( EditorFileDialog );
-		add_child(autoload_file_open);
-		autoload_file_open->set_mode(EditorFileDialog::MODE_OPEN_FILE);
-		autoload_file_open->connect("file_selected",this,"_autoload_file_callback");
-
-		autoload_list->set_columns(4);
-		autoload_list->set_column_titles_visible(true);
-		autoload_list->set_column_title(0,TTR("Name"));
-		autoload_list->set_column_expand(0,true);
-		autoload_list->set_column_min_width(0,100);
-		autoload_list->set_column_title(1,TTR("Path"));
-		autoload_list->set_column_expand(1,true);
-		autoload_list->set_column_min_width(1,100);
-		autoload_list->set_column_title(2,TTR("Singleton"));
-		autoload_list->set_column_expand(2,false);
-		autoload_list->set_column_min_width(2,80);
-		autoload_list->set_column_expand(3,false);
-		autoload_list->set_column_min_width(3,80);
-
-		autoload_list->connect("button_pressed",this,"_autoload_delete");
-		autoload_list->connect("item_edited",this,"_autoload_edited");
-		autoload_list->connect("cell_selected", this, "_autoload_selected");
-
-		updating_autoload=false;
-
+		autoload_settings = memnew( EditorAutoloadSettings );
+		autoload_settings->set_name(TTR("AutoLoad"));
+		tab_container->add_child(autoload_settings);
+		autoload_settings->connect("autoload_changed", this, "_settings_changed");
 	}
 
 	{
diff --git a/tools/editor/project_settings.h b/tools/editor/project_settings.h
index 79e1acf75e..46e98f69ad 100644
--- a/tools/editor/project_settings.h
+++ b/tools/editor/project_settings.h
@@ -34,6 +34,7 @@
 #include "undo_redo.h"
 #include "editor_data.h"
 #include "scene/gui/tab_container.h"
+#include "editor_autoload_settings.h"
 #include "editor_plugin_settings.h"
 
 //#include "project_export_settings.h"
@@ -88,26 +89,10 @@ class ProjectSettings : public AcceptDialog {
 	Tree *translation_remap;
 	Tree *translation_remap_options;
 
-
-	Tree *autoload_list;
-	String selected_autoload;
-	EditorFileDialog *autoload_file_open;
-	LineEdit *autoload_add_name;
-	LineEdit *autoload_add_path;
-
+	EditorAutoloadSettings *autoload_settings;
 
 	EditorPluginSettings *plugin_settings;
 
-	void _update_autoload();
-	void _autoload_file_callback(const String& p_path);
-	void _autoload_add();
-	void _autoload_edited();
-	void _autoload_file_open();
-	void _autoload_delete(Object *p_item,int p_column, int p_button);
-	void _autoload_selected();
-	bool updating_autoload;
-
-
 	void _item_selected();
 	void _item_adds(String);
 	void _item_add();
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp
index 246785932d..ceb62d5ff0 100644
--- a/tools/editor/property_editor.cpp
+++ b/tools/editor/property_editor.cpp
@@ -389,7 +389,6 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 				List<String> names;
 				names.push_back("value:");
 				config_value_editors(1,1,50,names);
-				Vector3 vec=v;
 				value_editor[0]->set_text( String::num(v) );
 			}
 
@@ -436,7 +435,6 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 				List<String> names;
 				names.push_back("string:");
 				config_value_editors(1,1,50,names);
-				Vector3 vec=v;
 				value_editor[0]->set_text( v );
 			}
 
@@ -612,6 +610,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 			color_picker->set_edit_alpha(hint!=PROPERTY_HINT_COLOR_NO_ALPHA);
 			color_picker->set_color(v);
 			set_size( Size2(300*EDSCALE, color_picker->get_combined_minimum_size().height+10*EDSCALE));
+			color_picker->set_focus_on_line_edit();
 			/*
 			int ofs=80;
 			int m=10;
@@ -2980,10 +2979,8 @@ void PropertyEditor::update_tree() {
 				else
 					item->set_cell_mode( 1, TreeItem::CELL_MODE_RANGE_EXPRESSION );
 
-				if (p.hint==PROPERTY_HINT_SPRITE_FRAME) {
-					item->set_range_config(1,0,99999,1);
 
-				} else if (p.hint==PROPERTY_HINT_RANGE || p.hint==PROPERTY_HINT_EXP_RANGE) {
+				if (p.hint==PROPERTY_HINT_SPRITE_FRAME || p.hint==PROPERTY_HINT_RANGE || p.hint==PROPERTY_HINT_EXP_RANGE) {
 
 					int c = p.hint_string.get_slice_count(",");
 					float min=0,max=100,step=1;
@@ -3346,7 +3343,6 @@ void PropertyEditor::update_tree() {
 				String type;
 				if (p.hint==PROPERTY_HINT_RESOURCE_TYPE)
 					type=p.hint_string;
-				bool notnil=false;
 
 				if (obj->get( p.name ).get_type() == Variant::NIL || obj->get( p.name ).operator RefPtr().is_null()) {
 					item->set_text(1,"<null>");
@@ -3369,8 +3365,7 @@ void PropertyEditor::update_tree() {
 
 					} else {
 						item->set_text(1,"<"+res->get_type()+">");
-					};
-					notnil=true;
+					}
 
 					if (has_icon(res->get_type(),"EditorIcons")) {
 						type=res->get_type();
@@ -4192,6 +4187,8 @@ public:
 void SectionedPropertyEditor::_bind_methods() {
 
 	ObjectTypeDB::bind_method("_section_selected",&SectionedPropertyEditor::_section_selected);
+
+	ObjectTypeDB::bind_method("update_category_list", &SectionedPropertyEditor::update_category_list);
 }
 
 void SectionedPropertyEditor::_section_selected(int p_which) {
diff --git a/tools/editor/quick_open.cpp b/tools/editor/quick_open.cpp
index fc2a2241ab..e18dc584d5 100644
--- a/tools/editor/quick_open.cpp
+++ b/tools/editor/quick_open.cpp
@@ -109,16 +109,27 @@ void EditorQuickOpen::_sbox_input(const InputEvent& p_ie) {
 
 }
 
-void EditorQuickOpen::_parse_fs(EditorFileSystemDirectory *efsd) {
+float EditorQuickOpen::_path_cmp(String search, String path) const {
+
+	if (search == path) {
+		return 1.2f;
+	}
+	if (path.findn(search) != -1) {
+		return 1.1f;
+	}
+	return path.to_lower().similarity(search.to_lower());
+}
+
+void EditorQuickOpen::_parse_fs(EditorFileSystemDirectory *efsd, Vector< Pair< String, Ref<Texture> > > &list) {
 
 	if (!add_directories) {
 		for(int i=0;i<efsd->get_subdir_count();i++) {
 
-			_parse_fs(efsd->get_subdir(i));
+			_parse_fs(efsd->get_subdir(i), list);
 		}
 	}
 
-	TreeItem *root = search_options->get_root();
+	String search_text = search_box->get_text();
 
 	if (add_directories) {
 		String path = efsd->get_path();
@@ -126,11 +137,27 @@ void EditorQuickOpen::_parse_fs(EditorFileSystemDirectory *efsd) {
 			path+="/";
 		if (path!="res://") {
 			path=path.substr(6,path.length());
-			if (search_box->get_text().is_subsequence_ofi(path)) {
-				TreeItem *ti = search_options->create_item(root);
-				ti->set_text(0,path);
-				Ref<Texture> icon = get_icon("folder","FileDialog");
-				ti->set_icon(0,icon);
+			if (search_text.is_subsequence_ofi(path)) {
+				Pair< String, Ref<Texture> > pair;
+				pair.first = path;
+				pair.second = get_icon("folder", "FileDialog");
+
+				if (search_text != String() && list.size() > 0) {
+
+					float this_sim = _path_cmp(search_text, path);
+					float other_sim = _path_cmp(list[0].first, path);
+					int pos = 1;
+
+					while (pos < list.size() && this_sim <= other_sim) {
+						other_sim = _path_cmp(list[pos++].first, path);
+					}
+
+					pos = this_sim >= other_sim ? pos - 1 : pos;
+					list.insert(pos, pair);
+
+				} else {
+					list.push_back(pair);
+				}
 			}
 		}
 	}
@@ -138,12 +165,29 @@ void EditorQuickOpen::_parse_fs(EditorFileSystemDirectory *efsd) {
 
 		String file = efsd->get_file_path(i);
 		file=file.substr(6,file.length());
-		if (ObjectTypeDB::is_type(efsd->get_file_type(i),base_type) && (search_box->get_text().is_subsequence_ofi(file))) {
 
-			TreeItem *ti = search_options->create_item(root);
-			ti->set_text(0,file);
-			Ref<Texture> icon = get_icon( (has_icon(efsd->get_file_type(i),ei)?efsd->get_file_type(i):ot),ei);
-			ti->set_icon(0,icon);
+		if (ObjectTypeDB::is_type(efsd->get_file_type(i),base_type) && (search_text.is_subsequence_ofi(file))) {
+			Pair< String, Ref<Texture> > pair;
+			pair.first = file;
+			pair.second = get_icon((has_icon(efsd->get_file_type(i), ei) ? efsd->get_file_type(i) : ot), ei);
+
+			if (search_text != String() && list.size() > 0) {
+
+				float this_sim = _path_cmp(search_text, file);
+				float other_sim = _path_cmp(list[0].first, file);
+				int pos = 1;
+
+				while (pos < list.size() && this_sim <= other_sim) {
+					other_sim = _path_cmp(list[pos++].first, file);
+				}
+
+				pos = this_sim >= other_sim ? pos - 1 : pos;
+				list.insert(pos, pair);
+
+			} else {
+
+				list.push_back(pair);
+			}
 		}
 	}
 
@@ -151,7 +195,7 @@ void EditorQuickOpen::_parse_fs(EditorFileSystemDirectory *efsd) {
 	if (add_directories) {
 		for(int i=0;i<efsd->get_subdir_count();i++) {
 
-			_parse_fs(efsd->get_subdir(i));
+			_parse_fs(efsd->get_subdir(i), list);
 		}
 	}
 
@@ -159,10 +203,18 @@ void EditorQuickOpen::_parse_fs(EditorFileSystemDirectory *efsd) {
 
 void EditorQuickOpen::_update_search() {
 
-
 	search_options->clear();
 	TreeItem *root = search_options->create_item();
-	_parse_fs(EditorFileSystem::get_singleton()->get_filesystem());
+	EditorFileSystemDirectory *efsd = EditorFileSystem::get_singleton()->get_filesystem();
+	Vector< Pair< String, Ref<Texture> > > list;
+
+	_parse_fs(efsd, list);
+
+	for (int i = 0; i < list.size(); i++) {
+		TreeItem *ti = search_options->create_item(root);
+		ti->set_text(0, list[i].first);
+		ti->set_icon(0, list[i].second);
+	}
 
 	if (root->get_children()) {
 		TreeItem *ti = root->get_children();
diff --git a/tools/editor/quick_open.h b/tools/editor/quick_open.h
index 520f7e569d..c253f7606e 100644
--- a/tools/editor/quick_open.h
+++ b/tools/editor/quick_open.h
@@ -32,6 +32,7 @@
 #include "scene/gui/dialogs.h"
 #include "scene/gui/tree.h"
 #include "editor_file_system.h"
+#include "pair.h"
 class EditorQuickOpen : public ConfirmationDialog {
 
 	OBJ_TYPE(EditorQuickOpen,ConfirmationDialog )
@@ -47,7 +48,8 @@ class EditorQuickOpen : public ConfirmationDialog {
 	void _update_search();
 
 	void _sbox_input(const InputEvent& p_ie);
-	void _parse_fs(EditorFileSystemDirectory *efsd);
+	void _parse_fs(EditorFileSystemDirectory *efsd, Vector< Pair< String,Ref <Texture> > > &list);
+	float _path_cmp(String search, String path) const;
 
 
 	void _confirmed();
diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp
index 30ffdf6664..2e7d65eadc 100644
--- a/tools/editor/scene_tree_dock.cpp
+++ b/tools/editor/scene_tree_dock.cpp
@@ -39,16 +39,20 @@
 #include "multi_node_edit.h"
 #include "tools/editor/plugins/animation_player_editor_plugin.h"
 #include "animation_editor.h"
-
+#include "scene/main/viewport.h"
 
 
 
 void SceneTreeDock::_unhandled_key_input(InputEvent p_event) {
 
+	if (get_viewport()->get_modal_stack_top())
+		return; //ignore because of modal window
+
 	uint32_t sc = p_event.key.get_scancode_with_modifiers();
 	if (!p_event.key.pressed || p_event.key.echo)
 		return;
 
+
 	if (ED_IS_SHORTCUT("scene_tree/add_child_node", p_event)) {
 		_tool_selected(TOOL_NEW);
 	}
@@ -239,7 +243,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 
 			//if (!_validate_no_foreign())
 			//	break;
-			create_dialog->popup_centered_ratio();
+			create_dialog->popup(true);
 		} break;
 		case TOOL_INSTANCE: {
 
@@ -277,7 +281,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 		} break;
 		case TOOL_REPLACE: {
 
-			create_dialog->popup_centered_ratio();
+			create_dialog->popup(false);
 		} break;
 		case TOOL_CONNECT: {
 
@@ -378,11 +382,8 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 				ERR_FAIL_COND(!top_node->get_parent());
 				ERR_FAIL_COND(!bottom_node->get_parent());
 
-				int top_node_pos = top_node->get_index();
 				int bottom_node_pos = bottom_node->get_index();
-
-				int top_node_pos_next = top_node_pos + (MOVING_DOWN ? 1 : -1);
-				int bottom_node_pos_next = bottom_node_pos + (MOVING_DOWN ? 1 : -1);
+				int top_node_pos_next = top_node->get_index() + (MOVING_DOWN ? 1 : -1);
 
 				editor_data->get_undo_redo().add_do_method(top_node->get_parent(), "move_child", top_node, top_node_pos_next);
 				editor_data->get_undo_redo().add_undo_method(bottom_node->get_parent(), "move_child", bottom_node, bottom_node_pos);
@@ -1065,6 +1066,8 @@ void SceneTreeDock::_do_reparent(Node* p_new_parent,int p_position_in_parent,Vec
 
 	List<Pair<NodePath,NodePath> > path_renames;
 
+	int inc=0;
+
 	for(int ni=0;ni<p_nodes.size();ni++) {
 
 		//no undo for now, sorry
@@ -1081,12 +1084,16 @@ void SceneTreeDock::_do_reparent(Node* p_new_parent,int p_position_in_parent,Vec
 		}
 
 
+		if (new_parent==node->get_parent() && node->get_index() < p_position_in_parent+ni) {
+			//if child will generate a gap when moved, adjust
+			inc--;
+		}
 
 		editor_data->get_undo_redo().add_do_method(node->get_parent(),"remove_child",node);
 		editor_data->get_undo_redo().add_do_method(new_parent,"add_child",node);
 
 		if (p_position_in_parent>=0)
-			editor_data->get_undo_redo().add_do_method(new_parent,"move_child",node,p_position_in_parent+ni);
+			editor_data->get_undo_redo().add_do_method(new_parent,"move_child",node,p_position_in_parent+inc);
 
 		ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
 		String new_name = new_parent->validate_child_name(node->get_name());
@@ -1098,17 +1105,8 @@ void SceneTreeDock::_do_reparent(Node* p_new_parent,int p_position_in_parent,Vec
 				editor_data->get_undo_redo().add_do_method(node,"set_global_transform",node->cast_to<Node2D>()->get_global_transform());
 			if (node->cast_to<Spatial>())
 				editor_data->get_undo_redo().add_do_method(node,"set_global_transform",node->cast_to<Spatial>()->get_global_transform());
-			if (node->cast_to<Control>()) {
-				bool can_do_it=false;
-				Control *c=node->cast_to<Control>();
-				if (c->get_parent()->cast_to<Container>())
-					can_do_it=false;
-				for(int i=0;i<4;i++) {
-					if (c->get_anchor(Margin(i))!=ANCHOR_BEGIN)
-						can_do_it=false;
-				}
+			if (node->cast_to<Control>())
 				editor_data->get_undo_redo().add_do_method(node,"set_global_pos",node->cast_to<Control>()->get_global_pos());
-			}
 		}
 
 		editor_data->get_undo_redo().add_do_method(this,"_set_owners",edited_scene,owners);
@@ -1118,6 +1116,8 @@ void SceneTreeDock::_do_reparent(Node* p_new_parent,int p_position_in_parent,Vec
 
 		editor_data->get_undo_redo().add_undo_method(new_parent,"remove_child",node);
 
+		inc++;
+
 	}
 
 	//add and move in a second step.. (so old order is preserved)
@@ -1149,17 +1149,8 @@ void SceneTreeDock::_do_reparent(Node* p_new_parent,int p_position_in_parent,Vec
 				editor_data->get_undo_redo().add_undo_method(node,"set_transform",node->cast_to<Node2D>()->get_transform());
 			if (node->cast_to<Spatial>())
 				editor_data->get_undo_redo().add_undo_method(node,"set_transform",node->cast_to<Spatial>()->get_transform());
-			if (node->cast_to<Control>()) {
-				bool can_do_it=false;
-				Control *c=node->cast_to<Control>();
-				if (c->get_parent()->cast_to<Container>())
-					can_do_it=false;
-				for(int i=0;i<4;i++) {
-					if (c->get_anchor(Margin(i))!=ANCHOR_BEGIN)
-						can_do_it=false;
-				}
+			if (node->cast_to<Control>())
 				editor_data->get_undo_redo().add_undo_method(node,"set_pos",node->cast_to<Control>()->get_pos());
-			}
 		}
 
 
@@ -1539,7 +1530,7 @@ static bool _has_visible_children(Node* p_node) {
 	for(int i=0;i<p_node->get_child_count();i++) {
 
 		Node* child = p_node->get_child(i);
-		if (!_is_node_visible(p_node))
+		if (!_is_node_visible(child))
 			continue;
 
 		return true;
@@ -1551,9 +1542,9 @@ static bool _has_visible_children(Node* p_node) {
 
 
 
-static Node* _find_last_visible(Node*p_node) {
+static Node* _find_last_visible(Node* p_node) {
 
-	Node*last=NULL;
+	Node* last=NULL;
 
 	bool collapsed = p_node->has_meta("_editor_collapsed") ? (bool)p_node->get_meta("_editor_collapsed") : false;
 
@@ -1579,7 +1570,7 @@ static Node* _find_last_visible(Node*p_node) {
 }
 
 
-void SceneTreeDock::_normalize_drop(Node*& to_node, int &to_pos,int p_type) {
+void SceneTreeDock::_normalize_drop(Node*& to_node, int &to_pos, int p_type) {
 
 	to_pos=-1;
 
@@ -1620,6 +1611,7 @@ void SceneTreeDock::_normalize_drop(Node*& to_node, int &to_pos,int p_type) {
 			//just insert over this node because nothing is above at the same level
 			to_pos=to_node->get_index();
 			to_node=to_node->get_parent();
+
 		}
 
 	} else if (p_type==1) {
@@ -1646,12 +1638,13 @@ void SceneTreeDock::_normalize_drop(Node*& to_node, int &to_pos,int p_type) {
 						break;
 					}
 				}
-
 				if (lower_sibling) {
 					to_pos=lower_sibling->get_index();
 				}
 
 				to_node=to_node->get_parent();
+
+
 			}
 #if 0
 				//quite complicated, look for next visible in tree
diff --git a/tools/editor/scene_tree_dock.h b/tools/editor/scene_tree_dock.h
index 60bec9b4f4..51041a235b 100644
--- a/tools/editor/scene_tree_dock.h
+++ b/tools/editor/scene_tree_dock.h
@@ -139,7 +139,7 @@ class SceneTreeDock : public VBoxContainer {
 
 	void _fill_path_renames(Vector<StringName> base_path,Vector<StringName> new_base_path,Node * p_node, List<Pair<NodePath,NodePath> > *p_renames);
 
-	void _normalize_drop(Node*& to_node, int &to_pos,int p_type);
+	void _normalize_drop(Node*& to_node, int &to_pos, int p_type);
 
 	void _nodes_dragged(Array p_nodes,NodePath p_to,int p_type);
 	void _files_dropped(Vector<String> p_files,NodePath p_to,int p_type);
diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp
index a155f0c0cf..f174bc2f1b 100644
--- a/tools/editor/scene_tree_editor.cpp
+++ b/tools/editor/scene_tree_editor.cpp
@@ -302,8 +302,15 @@ bool SceneTreeEditor::_add_nodes(Node *p_node,TreeItem *p_parent) {
 
 	item->set_selectable(0,true);
 	if (can_rename) {
-
-		bool collapsed = p_node->has_meta("_editor_collapsed") ? (bool)p_node->get_meta("_editor_collapsed") : false;
+#ifdef ENABLE_DEPRECATED
+		if (p_node->has_meta("_editor_collapsed")) {
+			//remove previous way of storing folding, which did not get along with scene inheritance and instancing
+			if ((bool)p_node->get_meta("_editor_collapsed"))
+				p_node->set_display_folded(true);
+			p_node->set_meta("_editor_collapsed",Variant());
+		}
+#endif
+		bool collapsed = p_node->is_displayed_folded();
 		if (collapsed)
 			item->set_collapsed(true);
 	}
@@ -896,10 +903,7 @@ void SceneTreeEditor::_cell_collapsed(Object *p_obj) {
 	Node *n=get_node(np);
 	ERR_FAIL_COND(!n);
 
-	if (collapsed)
-		n->set_meta("_editor_collapsed",true);
-	else
-		n->set_meta("_editor_collapsed",Variant());
+	n->set_display_folded(collapsed);
 
 }
 
diff --git a/tools/editor/scenes_dock.cpp b/tools/editor/scenes_dock.cpp
index 44832c84eb..75c983994e 100644
--- a/tools/editor/scenes_dock.cpp
+++ b/tools/editor/scenes_dock.cpp
@@ -37,6 +37,8 @@
 
 #include "editor_settings.h"
 #include "scene/main/viewport.h"
+
+
 bool ScenesDock::_create_tree(TreeItem *p_parent,EditorFileSystemDirectory *p_dir) {
 
 
@@ -57,60 +59,8 @@ bool ScenesDock::_create_tree(TreeItem *p_parent,EditorFileSystemDirectory *p_di
 		item->select(0);
 	}
 
-
-	//item->set_custom_bg_color(0,get_color("prop_subsection","Editor"));
-
-	bool has_items=false;
-
-	for(int i=0;i<p_dir->get_subdir_count();i++) {
-
-		if (_create_tree(item,p_dir->get_subdir(i)))
-			has_items=true;
-	}
-#if 0
-	for (int i=0;i<p_dir->get_file_count();i++) {
-
-		String file_name = p_dir->get_file(i);
-		String file_path = p_dir->get_file_path(i);
-
-		// ScenesDockFilter::FILTER_PATH
-		String search_from = file_path.right(6); // trim "res://"
-		if (file_filter == ScenesDockFilter::FILTER_NAME)
-			 search_from = file_name;
-		else if (file_filter == ScenesDockFilter::FILTER_FOLDER)
-			search_from = file_path.right(6).get_base_dir();
-
-		if (search_term!="" && search_from.findn(search_term)==-1)
-			continue;
-
-		bool isfave = favorites.has(file_path);
-		if (button_favorite->is_pressed() && !isfave)
-			continue;
-
-		TreeItem *fitem = tree->create_item(item);
-		fitem->set_cell_mode(0,TreeItem::CELL_MODE_CHECK);
-		fitem->set_editable(0,true);
-		fitem->set_checked(0,isfave);
-		fitem->set_text(0,file_name);
-
-		Ref<Texture> icon = get_icon( (has_icon(p_dir->get_file_type(i),"EditorIcons")?p_dir->get_file_type(i):String("Object")),"EditorIcons");
-		fitem->set_icon(0, icon );
-
-
-		fitem->set_metadata(0,file_path);
-		//if (p_dir->files[i]->icon.is_valid()) {
-//			fitem->set_icon(0,p_dir->files[i]->icon);
-//		}
-		has_items=true;
-
-	}
-#endif
-	/*if (!has_items) {
-
-		memdelete(item);
-		return false;
-
-	}*/
+	for(int i=0;i<p_dir->get_subdir_count();i++)
+		_create_tree(item,p_dir->get_subdir(i));
 
 	return true;
 }
@@ -164,12 +114,14 @@ void ScenesDock::_notification(int p_what) {
 				if (split_mode) {
 
 					file_list_vb->hide();
+					tree->set_custom_minimum_size(Size2(0,0));
 					tree->set_v_size_flags(SIZE_EXPAND_FILL);
 					button_back->show();
 				} else {
 
 					tree->show();
 					file_list_vb->show();
+					tree->set_custom_minimum_size(Size2(0,200)*EDSCALE);
 					tree->set_v_size_flags(SIZE_FILL);
 					button_back->hide();
 					if (!EditorFileSystem::get_singleton()->is_scanning()) {
@@ -187,6 +139,7 @@ void ScenesDock::_notification(int p_what) {
 			initialized=true;
 
 			EditorFileSystem::get_singleton()->connect("filesystem_changed",this,"_fs_changed");
+			EditorResourcePreview::get_singleton()->connect("preview_invalidated",this,"_preview_invalidated");
 
 			button_reload->set_icon( get_icon("Reload","EditorIcons"));
 			button_favorite->set_icon( get_icon("Favorites","EditorIcons"));
@@ -661,6 +614,27 @@ void ScenesDock::_go_to_dir(const String& p_dir){
 
 
 }
+
+void ScenesDock::_preview_invalidated(const String& p_path) {
+
+	if (p_path.get_base_dir()==path && search_box->get_text()==String() && file_list_vb->is_visible()) {
+
+
+		for(int i=0;i<files->get_item_count();i++) {
+
+			if (files->get_item_metadata(i)==p_path) {
+				//re-request preview
+				Array udata;
+				udata.resize(2);
+				udata[0]=i;
+				udata[1]=files->get_item_text(i);
+				EditorResourcePreview::get_singleton()->queue_resource_preview(p_path,this,"_thumbnail_done",udata);
+				break;
+			}
+		}
+	}
+}
+
 void ScenesDock::_fs_changed() {
 
 	button_hist_prev->set_disabled(history_pos==0);
@@ -1618,6 +1592,9 @@ void ScenesDock::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("drop_data_fw"), &ScenesDock::drop_data_fw);
 	ObjectTypeDB::bind_method(_MD("_files_list_rmb_select"),&ScenesDock::_files_list_rmb_select);
 
+	ObjectTypeDB::bind_method(_MD("_preview_invalidated"),&ScenesDock::_preview_invalidated);
+
+
 	ADD_SIGNAL(MethodInfo("instance"));
 	ADD_SIGNAL(MethodInfo("open"));
 
@@ -1668,7 +1645,7 @@ ScenesDock::ScenesDock(EditorNode *p_editor) {
 
 	button_favorite->set_focus_mode(FOCUS_NONE);
 
-	Control *spacer = memnew( Control);
+//	Control *spacer = memnew( Control);
 
 
 
@@ -1702,7 +1679,6 @@ ScenesDock::ScenesDock(EditorNode *p_editor) {
 
 	tree->set_hide_root(true);
 	split_box->add_child(tree);
-	tree->set_custom_minimum_size(Size2(0,200)*EDSCALE);
 	tree->set_drag_forwarding(this);
 
 
diff --git a/tools/editor/scenes_dock.h b/tools/editor/scenes_dock.h
index ed24711abb..0973fce250 100644
--- a/tools/editor/scenes_dock.h
+++ b/tools/editor/scenes_dock.h
@@ -168,6 +168,8 @@ class ScenesDock : public VBoxContainer {
 	bool can_drop_data_fw(const Point2& p_point,const Variant& p_data,Control* p_from) const;
 	void drop_data_fw(const Point2& p_point,const Variant& p_data,Control* p_from);
 
+	void _preview_invalidated(const String& p_path);
+
 protected:
 	void _notification(int p_what);
 	static void _bind_methods();
diff --git a/tools/editor/script_editor_debugger.cpp b/tools/editor/script_editor_debugger.cpp
index 6d8f54d88f..fc746bc21d 100644
--- a/tools/editor/script_editor_debugger.cpp
+++ b/tools/editor/script_editor_debugger.cpp
@@ -819,7 +819,6 @@ void ScriptEditorDebugger::_performance_draw() {
 	if(which.empty())
 		return;
 
-	Color graph_color=get_color("font_color","TextEdit");
 	Ref<StyleBox> graph_sb = get_stylebox("normal","TextEdit");
 	Ref<Font> graph_font = get_font("font","TextEdit");
 
diff --git a/tools/editor/settings_config_dialog.cpp b/tools/editor/settings_config_dialog.cpp
index e1a2ea162e..f436e369af 100644
--- a/tools/editor/settings_config_dialog.cpp
+++ b/tools/editor/settings_config_dialog.cpp
@@ -97,11 +97,24 @@ void EditorSettingsDialog::_clear_search_box() {
 	property_editor->get_property_editor()->update_tree();
 }
 
+void EditorSettingsDialog::_clear_shortcut_search_box() {
+	if (shortcut_search_box->get_text()=="")
+		return;
+
+	shortcut_search_box->clear();
+}
+
+void EditorSettingsDialog::_filter_shortcuts(const String& p_filter) {
+	shortcut_filter = p_filter;
+	_update_shortcuts();
+}
+
 void EditorSettingsDialog::_notification(int p_what) {
 
 	if (p_what==NOTIFICATION_ENTER_TREE) {
 
 		clear_button->set_icon(get_icon("Close","EditorIcons"));
+		shortcut_clear_button->set_icon(get_icon("Close","EditorIcons"));
 	}
 }
 
@@ -137,26 +150,30 @@ void EditorSettingsDialog::_update_shortcuts() {
 			sections[section_name]=section;
 			section->set_custom_bg_color(0,get_color("prop_subsection","Editor"));
 			section->set_custom_bg_color(1,get_color("prop_subsection","Editor"));
-
 		}
 
-		TreeItem *item = shortcuts->create_item(section);
-
-
-		item->set_text(0,sc->get_name());
-		item->set_text(1,sc->get_as_text());
-		if (!sc->is_shortcut(original) && !(sc->get_shortcut().type==InputEvent::NONE && original.type==InputEvent::NONE)) {
-			item->add_button(1,get_icon("Reload","EditorIcons"),2);
+		if (shortcut_filter.is_subsequence_ofi(sc->get_name())) {
+			TreeItem *item = shortcuts->create_item(section);
+
+			item->set_text(0,sc->get_name());
+			item->set_text(1,sc->get_as_text());
+			if (!sc->is_shortcut(original) && !(sc->get_shortcut().type==InputEvent::NONE && original.type==InputEvent::NONE)) {
+				item->add_button(1,get_icon("Reload","EditorIcons"),2);
+			}
+			item->add_button(1,get_icon("Edit","EditorIcons"),0);
+			item->add_button(1,get_icon("Close","EditorIcons"),1);
+			item->set_tooltip(0,E->get());
+			item->set_metadata(0,E->get());
 		}
-		item->add_button(1,get_icon("Edit","EditorIcons"),0);
-		item->add_button(1,get_icon("Close","EditorIcons"),1);
-		item->set_tooltip(0,E->get());
-		item->set_metadata(0,E->get());
 	}
 
-
-
-
+	// remove sections with no shortcuts
+	for(Map<String,TreeItem*>::Element *E=sections.front();E;E=E->next()) {
+		TreeItem *section = E->get();
+		if (section->get_children() == NULL) {
+			root->remove_child(section);
+		}
+	}
 }
 
 void EditorSettingsDialog::_shortcut_button_pressed(Object* p_item,int p_column,int p_idx) {
@@ -265,7 +282,9 @@ void EditorSettingsDialog::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_settings_save"),&EditorSettingsDialog::_settings_save);
 	ObjectTypeDB::bind_method(_MD("_settings_changed"),&EditorSettingsDialog::_settings_changed);
 	ObjectTypeDB::bind_method(_MD("_clear_search_box"),&EditorSettingsDialog::_clear_search_box);
+	ObjectTypeDB::bind_method(_MD("_clear_shortcut_search_box"),&EditorSettingsDialog::_clear_shortcut_search_box);
 	ObjectTypeDB::bind_method(_MD("_shortcut_button_pressed"),&EditorSettingsDialog::_shortcut_button_pressed);
+	ObjectTypeDB::bind_method(_MD("_filter_shortcuts"),&EditorSettingsDialog::_filter_shortcuts);
 	ObjectTypeDB::bind_method(_MD("_update_shortcuts"),&EditorSettingsDialog::_update_shortcuts);
 	ObjectTypeDB::bind_method(_MD("_press_a_key_confirm"),&EditorSettingsDialog::_press_a_key_confirm);
 	ObjectTypeDB::bind_method(_MD("_wait_for_key"),&EditorSettingsDialog::_wait_for_key);
@@ -311,6 +330,23 @@ EditorSettingsDialog::EditorSettingsDialog() {
 	tabs->add_child(vbc);
 	vbc->set_name(TTR("Shortcuts"));
 
+	hbc = memnew( HBoxContainer );
+	hbc->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	vbc->add_child(hbc);
+
+	l = memnew( Label );
+	l->set_text(TTR("Search:")+" ");
+	hbc->add_child(l);
+
+	shortcut_search_box = memnew( LineEdit );
+	shortcut_search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	hbc->add_child(shortcut_search_box);
+	shortcut_search_box->connect("text_changed", this, "_filter_shortcuts");
+
+	shortcut_clear_button = memnew( ToolButton );
+	hbc->add_child(shortcut_clear_button);
+	shortcut_clear_button->connect("pressed",this,"_clear_shortcut_search_box");
+
 	shortcuts = memnew( Tree );
 	vbc->add_margin_child("Shortcut List:",shortcuts,true);
 	shortcuts->set_columns(2);
diff --git a/tools/editor/settings_config_dialog.h b/tools/editor/settings_config_dialog.h
index c930de6a77..68a2b008f0 100644
--- a/tools/editor/settings_config_dialog.h
+++ b/tools/editor/settings_config_dialog.h
@@ -45,7 +45,9 @@ class EditorSettingsDialog : public AcceptDialog {
 	TabContainer *tabs;
 
 	LineEdit *search_box;
+	LineEdit *shortcut_search_box;
 	ToolButton *clear_button;
+	ToolButton *shortcut_clear_button;
 	SectionedPropertyEditor *property_editor;
 
 	Timer *timer;
@@ -56,6 +58,7 @@ class EditorSettingsDialog : public AcceptDialog {
 	Label *press_a_key_label;
 	InputEvent last_wait_for_key;
 	String shortcut_configured;
+	String shortcut_filter;
 
 	virtual void cancel_pressed();
 	virtual void ok_pressed();
@@ -69,8 +72,11 @@ class EditorSettingsDialog : public AcceptDialog {
 	void _press_a_key_confirm();
 	void _wait_for_key(const InputEvent& p_event);
 
+	void _clear_shortcut_search_box();
 	void _clear_search_box();
 
+	void _filter_shortcuts(const String& p_filter);
+
 	void _update_shortcuts();
 	void _shortcut_button_pressed(Object* p_item,int p_column,int p_idx);
 
diff --git a/tools/editor/spatial_editor_gizmos.cpp b/tools/editor/spatial_editor_gizmos.cpp
index 1ca62d3a63..480d33fd0a 100644
--- a/tools/editor/spatial_editor_gizmos.cpp
+++ b/tools/editor/spatial_editor_gizmos.cpp
@@ -424,16 +424,11 @@ bool EditorSpatialGizmo::intersect_ray(const Camera *p_camera,const Point2& p_po
 		}
 		Transform ti=t.affine_inverse();
 
-		Vector3 ray_from=ti.xform(p_camera->project_ray_origin(p_point));
-		Vector3 ray_dir=t.basis.xform_inv(p_camera->project_ray_normal(p_point)).normalized();
-		Vector3 ray_to = ray_from+ray_dir*4096;
 
 		float min_d=1e20;
 		int idx=-1;
 
 		for(int i=0;i<secondary_handles.size();i++) {
-#if 1
-
 
 			Vector3 hpos = t.xform(secondary_handles[i]);
 			Vector2 p = p_camera->unproject_position(hpos);
@@ -449,31 +444,7 @@ bool EditorSpatialGizmo::intersect_ray(const Camera *p_camera,const Point2& p_po
 					idx=i+handles.size();
 
 				}
-
 			}
-
-#else
-			AABB aabb;
-			aabb.pos=Vector3(-1,-1,-1)*HANDLE_HALF_SIZE;
-			aabb.size=aabb.pos*-2;
-			aabb.pos+=secondary_handles[i];
-
-
-			Vector3 rpos,rnorm;
-
-			if (aabb.intersects_segment(ray_from,ray_to,&rpos,&rnorm)) {
-
-				real_t dp = ray_dir.dot(rpos);
-				if (dp<min_d) {
-
-					r_pos=t.xform(rpos);
-					r_normal=ti.basis.xform_inv(rnorm).normalized();
-					min_d=dp;
-					idx=i+handles.size();
-
-				}
-			}
-#endif
 		}
 
 		if (p_sec_first && idx!=-1) {
@@ -486,9 +457,6 @@ bool EditorSpatialGizmo::intersect_ray(const Camera *p_camera,const Point2& p_po
 
 		for(int i=0;i<handles.size();i++) {
 
-#if 1
-
-
 			Vector3 hpos = t.xform(handles[i]);
 			Vector2 p = p_camera->unproject_position(hpos);
 			if (p.distance_to(p_point)<SpatialEditorGizmos::singleton->handle_t->get_width()*0.6) {
@@ -503,32 +471,7 @@ bool EditorSpatialGizmo::intersect_ray(const Camera *p_camera,const Point2& p_po
 					idx=i;
 
 				}
-
-			}
-
-#else
-
-			AABB aabb;
-			aabb.pos=Vector3(-1,-1,-1)*HANDLE_HALF_SIZE;
-			aabb.size=aabb.pos*-2;
-			aabb.pos+=handles[i];
-
-
-			Vector3 rpos,rnorm;
-
-			if (aabb.intersects_segment(ray_from,ray_to,&rpos,&rnorm)) {
-
-				real_t dp = ray_dir.dot(rpos);
-				if (dp<min_d) {
-
-					r_pos=t.xform(rpos);
-					r_normal=ti.basis.xform_inv(rnorm).normalized();
-					min_d=dp;
-					idx=i;
-
-				}
 			}
-#endif
 		}
 
 		if (idx>=0) {
@@ -612,9 +555,6 @@ bool EditorSpatialGizmo::intersect_ray(const Camera *p_camera,const Point2& p_po
 		Vector3 ray_dir=ai.basis.xform(p_camera->project_ray_normal(p_point)).normalized();
 		Vector3 rpos,rnorm;
 
-#if 1
-
-
 
 		if (collision_mesh->intersect_ray(ray_from,ray_dir,rpos,rnorm)) {
 
@@ -622,16 +562,6 @@ bool EditorSpatialGizmo::intersect_ray(const Camera *p_camera,const Point2& p_po
 			r_normal=gt.basis.xform(rnorm).normalized();
 			return true;
 		}
-#else
-
-		if (collision_mesh->intersect_segment(ray_from,ray_from+ray_dir*4906.0,rpos,rnorm)) {
-
-			r_pos=gt.xform(rpos);
-			r_normal=gt.basis.xform(rnorm).normalized();
-			return true;
-		}
-
-#endif
 	}
 
 	return false;
@@ -693,12 +623,11 @@ void EditorSpatialGizmo::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("add_unscaled_billboard","material:Material","default_scale"),&EditorSpatialGizmo::add_unscaled_billboard,DEFVAL(1));
 	ObjectTypeDB::bind_method(_MD("add_handles","handles","billboard","secondary"),&EditorSpatialGizmo::add_handles,DEFVAL(false),DEFVAL(false));
 	ObjectTypeDB::bind_method(_MD("set_spatial_node","node:Spatial"),&EditorSpatialGizmo::_set_spatial_node);
+	ObjectTypeDB::bind_method(_MD("clear"),&EditorSpatialGizmo::clear);
 
 	BIND_VMETHOD( MethodInfo("redraw"));
 	BIND_VMETHOD( MethodInfo(Variant::STRING,"get_handle_name",PropertyInfo(Variant::INT,"index")));
-	{
-		BIND_VMETHOD( MethodInfo("get_handle_value:Variant",PropertyInfo(Variant::INT,"index")));
-	}
+	BIND_VMETHOD( MethodInfo("get_handle_value:Variant",PropertyInfo(Variant::INT,"index")));
 	BIND_VMETHOD( MethodInfo("set_handle",PropertyInfo(Variant::INT,"index"),PropertyInfo(Variant::OBJECT,"camera:Camera"),PropertyInfo(Variant::VECTOR2,"point")));
 	MethodInfo cm = MethodInfo("commit_handle",PropertyInfo(Variant::INT,"index"),PropertyInfo(Variant::NIL,"restore:Variant"),PropertyInfo(Variant::BOOL,"cancel"));
 	cm.default_arguments.push_back(false);
@@ -2250,7 +2179,6 @@ void VisibilityNotifierGizmo::set_handle(int p_idx,Camera *p_camera, const Point
 	if (d<0.001)
 		d=0.001;
 
-	Vector3 he = aabb.size;
 	aabb.pos[p_idx]=(aabb.pos[p_idx]+aabb.size[p_idx]*0.5)-d;
 	aabb.size[p_idx]=d*2;
 	notifier->set_aabb(aabb);
@@ -2456,8 +2384,6 @@ void HingeJointSpatialGizmo::redraw() {
 	if (p3d->get_flag(HingeJoint::FLAG_USE_LIMIT) && ll<ul) {
 
 		const int points = 32;
-		float step = (ul-ll)/points;
-
 
 		for(int i=0;i<points;i++) {
 
@@ -2573,8 +2499,6 @@ void SliderJointSpatialGizmo::redraw() {
 	if (ll<ul) {
 
 		const int points = 32;
-		float step = (ul-ll)/points;
-
 
 		for(int i=0;i<points;i++) {
 
@@ -2641,7 +2565,6 @@ SliderJointSpatialGizmo::SliderJointSpatialGizmo(SliderJoint* p_p3d) {
 void ConeTwistJointSpatialGizmo::redraw() {
 
 	clear();
-	float cs = 0.25;
 	Vector<Vector3> points;
 
 	float r = 1.0;
@@ -2837,8 +2760,6 @@ void Generic6DOFJointSpatialGizmo::redraw() {
 		if (enable_ang && ll<=ul) {
 
 			const int points = 32;
-			float step = (ul-ll)/points;
-
 
 			for(int i=0;i<points;i++) {
 
diff --git a/tools/export/blender25/godot_export_manager.py b/tools/export/blender25/godot_export_manager.py
index a249611c71..c91f55b51c 100644
--- a/tools/export/blender25/godot_export_manager.py
+++ b/tools/export/blender25/godot_export_manager.py
@@ -18,23 +18,27 @@
 
 # Script copyright (c) Andreas Esau
 
+import bpy
+from bpy.props import (StringProperty, BoolProperty, EnumProperty,
+                       FloatProperty, IntProperty, CollectionProperty)
+import os
+from bpy.app.handlers import persistent
+from mathutils import Matrix
+
 bl_info = {
     "name": "Godot Export Manager",
     "author": "Andreas Esau",
     "version": (1, 0),
     "blender": (2, 7, 0),
     "location": "Scene Properties > Godot Export Manager",
-    "description": "Godot Export Manager uses the Better Collada Exporter to manage Export Groups and automatically export the objects groups to Collada Files.",
+    "description": "Godot Export Manager uses the Better Collada Exporter"
+    "to manage Export Groups and automatically export the objects groups"
+    "to Collada Files.",
     "warning": "",
     "wiki_url": ("http://www.godotengine.org"),
     "tracker_url": "",
     "category": "Import-Export"}
 
-import bpy
-from bpy.props import StringProperty, BoolProperty, EnumProperty, FloatProperty, FloatVectorProperty, IntProperty, CollectionProperty, PointerProperty
-import os
-from bpy.app.handlers import persistent
-from mathutils import Vector, Matrix
 
 class godot_export_manager(bpy.types.Panel):
     bl_label = "Godot Export Manager"
@@ -44,8 +48,8 @@ class godot_export_manager(bpy.types.Panel):
 
     bpy.types.Scene.godot_export_on_save = BoolProperty(default=False)
 
-    ### draw function for all ui elements
     def draw(self, context):
+        """ Draw function for all ui elements """
         layout = self.layout
         split = self.layout.split()
         scene = bpy.data.scenes[0]
@@ -54,38 +58,43 @@ class godot_export_manager(bpy.types.Panel):
 
         row = layout.row()
         col = row.column()
-        col.prop(scene,"godot_export_on_save",text="Export Groups on save")
+        col.prop(scene, "godot_export_on_save", text="Export Groups on save")
 
         row = layout.row()
         col = row.column(align=True)
-        op = col.operator("scene.godot_add_objects_to_group",text="Add selected objects to Group",icon="COPYDOWN")
-
-        op = col.operator("scene.godot_delete_objects_from_group",text="Delete selected objects from Group",icon="PASTEDOWN")
-
+        op = col.operator("scene.godot_add_objects_to_group",
+                          text="Add selected objects to Group",
+                          icon="COPYDOWN")
 
+        op = col.operator("scene.godot_delete_objects_from_group",
+                          text="Delete selected objects from Group",
+                          icon="PASTEDOWN")
 
         row = layout.row()
         col = row.column()
         col.label(text="Export Groups:")
 
-
         row = layout.row()
         col = row.column()
 
-        col.template_list("UI_List_Godot","dummy",scene, "godot_export_groups", scene, "godot_export_groups_index",rows=1,maxrows=10,type='DEFAULT')
+        col.template_list("UI_List_Godot", "dummy", scene,
+                          "godot_export_groups", scene,
+                          "godot_export_groups_index", rows=1, maxrows=10,
+                          type='DEFAULT')
 
         col = row.column(align=True)
-        col.operator("scene.godot_add_export_group",text="",icon="ZOOMIN")
-        col.operator("scene.godot_delete_export_group",text="",icon="ZOOMOUT")
-        col.operator("scene.godot_export_all_groups",text="",icon="EXPORT")
+        col.operator("scene.godot_add_export_group", text="", icon="ZOOMIN")
+        col.operator("scene.godot_delete_export_group", text="",
+                     icon="ZOOMOUT")
+        col.operator("scene.godot_export_all_groups", text="", icon="EXPORT")
 
         if len(scene.godot_export_groups) > 0:
             row = layout.row()
             col = row.column()
             group = scene.godot_export_groups[scene.godot_export_groups_index]
-            col.prop(group,"name",text="Group Name")
-            col.prop(group,"export_name",text="Export Name")
-            col.prop(group,"export_path",text="Export Filepath")
+            col.prop(group, "name", text="Group Name")
+            col.prop(group, "export_name", text="Export Name")
+            col.prop(group, "export_path", text="Export Filepath")
 
             row = layout.row()
             col = row.column()
@@ -94,41 +103,46 @@ class godot_export_manager(bpy.types.Panel):
             col.label(text="Export Settings:")
 
             col = col.row(align=True)
-            col.prop(group,"apply_loc",toggle=True,icon="MAN_TRANS")
-            col.prop(group,"apply_rot",toggle=True,icon="MAN_ROT")
-            col.prop(group,"apply_scale",toggle=True,icon="MAN_SCALE")
+            col.prop(group, "apply_loc", toggle=True, icon="MAN_TRANS")
+            col.prop(group, "apply_rot", toggle=True, icon="MAN_ROT")
+            col.prop(group, "apply_scale", toggle=True, icon="MAN_SCALE")
 
             row = layout.row()
             col = row.column()
 
-            col.prop(group,"use_include_particle_duplicates")
-            col.prop(group,"use_mesh_modifiers")
-            col.prop(group,"use_tangent_arrays")
-            col.prop(group,"use_triangles")
-            col.prop(group,"use_copy_images")
-            col.prop(group,"use_active_layers")
-            col.prop(group,"use_anim")
-            col.prop(group,"use_anim_action_all")
-            col.prop(group,"use_anim_skip_noexp")
-            col.prop(group,"use_anim_optimize")
-            col.prop(group,"anim_optimize_precision")
-            col.prop(group,"use_metadata")
-
-### Custom template_list look
+            col.prop(group, "use_include_particle_duplicates")
+            col.prop(group, "use_mesh_modifiers")
+            col.prop(group, "use_tangent_arrays")
+            col.prop(group, "use_triangles")
+            col.prop(group, "use_copy_images")
+            col.prop(group, "use_active_layers")
+            col.prop(group, "use_anim")
+            col.prop(group, "use_anim_action_all")
+            col.prop(group, "use_anim_skip_noexp")
+            col.prop(group, "use_anim_optimize")
+            col.prop(group, "anim_optimize_precision")
+            col.prop(group, "use_metadata")
+
+
 class UI_List_Godot(bpy.types.UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    """ Custom template_list look """
+    def draw_item(self, context, layout, data, item, icon, active_data,
+                  active_propname, index):
         ob = data
         slot = item
         col = layout.row(align=True)
 
-        col.label(text=item.name,icon="GROUP")
-        col.prop(item,"active",text="")
+        col.label(text=item.name, icon="GROUP")
+        col.prop(item, "active", text="")
 
-        op = col.operator("scene.godot_select_group_objects",text="",emboss=False,icon="RESTRICT_SELECT_OFF")
+        op = col.operator("scene.godot_select_group_objects",
+                          text="", emboss=False, icon="RESTRICT_SELECT_OFF")
         op.idx = index
-        op = col.operator("scene.godot_export_group",text="",emboss=False,icon="EXPORT")
+        op = col.operator("scene.godot_export_group", text="", emboss=False,
+                          icon="EXPORT")
         op.idx = index
 
+
 class add_objects_to_group(bpy.types.Operator):
     bl_idname = "scene.godot_add_objects_to_group"
     bl_label = "Add Objects to Group"
@@ -136,34 +150,37 @@ class add_objects_to_group(bpy.types.Operator):
 
     undo = BoolProperty(default=True)
 
-    def execute(self,context):
+    def execute(self, context):
         scene = context.scene
 
         objects_str = ""
         if len(scene.godot_export_groups) > 0:
-            for i,object in enumerate(context.selected_objects):
-                if object.name not in scene.godot_export_groups[scene.godot_export_groups_index].nodes:
-                    node = scene.godot_export_groups[scene.godot_export_groups_index].nodes.add()
+            for i, object in enumerate(context.selected_objects):
+                if object.name not in scene.godot_export_groups[
+                        scene.godot_export_groups_index].nodes:
+                    node = scene.godot_export_groups[
+                        scene.godot_export_groups_index].nodes.add()
                     node.name = object.name
                     if i == 0:
                         objects_str += object.name
                     else:
                         objects_str += ", "+object.name
 
-
-            self.report({'INFO'}, objects_str + " added to group." )
+            self.report({'INFO'}, objects_str + " added to group.")
             if self.undo:
                 bpy.ops.ed.undo_push(message="Objects added to group")
         else:
-            self.report({'WARNING'}, "Create a group first." )
-        return{'FINISHED'}
+            self.report({'WARNING'}, "Create a group first.")
+
+        return {'FINISHED'}
+
 
 class del_objects_from_group(bpy.types.Operator):
     bl_idname = "scene.godot_delete_objects_from_group"
     bl_label = "Delete Objects from Group"
     bl_description = "Delets the selected Objects from the active group below."
 
-    def execute(self,context):
+    def execute(self, context):
         scene = context.scene
 
         if len(scene.godot_export_groups) > 0:
@@ -174,23 +191,25 @@ class del_objects_from_group(bpy.types.Operator):
 
             objects_str = ""
             j = 0
-            for i,node in enumerate(scene.godot_export_groups[scene.godot_export_groups_index].nodes):
+            for i, node in enumerate(scene.godot_export_groups[
+                    scene.godot_export_groups_index].nodes):
                 if node.name in selected_objects:
-                    scene.godot_export_groups[scene.godot_export_groups_index].nodes.remove(i)
-
+                    scene.godot_export_groups[
+                        scene.godot_export_groups_index].nodes.remove(i)
 
                     if j == 0:
                             objects_str += object.name
                     else:
                         objects_str += ", "+object.name
-                    j+=1
-
+                    j += 1
 
-            self.report({'INFO'}, objects_str + " deleted from group." )
+            self.report({'INFO'}, objects_str + " deleted from group.")
             bpy.ops.ed.undo_push(message="Objects deleted from group")
         else:
-            self.report({'WARNING'}, "There is no group to delete from." )
-        return{'FINISHED'}
+            self.report({'WARNING'}, "There is no group to delete from.")
+
+        return {'FINISHED'}
+
 
 class select_group_objects(bpy.types.Operator):
     bl_idname = "scene.godot_select_group_objects"
@@ -199,7 +218,7 @@ class select_group_objects(bpy.types.Operator):
 
     idx = IntProperty()
 
-    def execute(self,context):
+    def execute(self, context):
         scene = context.scene
         for object in context.scene.objects:
             object.select = False
@@ -207,76 +226,82 @@ class select_group_objects(bpy.types.Operator):
             if node.name in bpy.data.objects:
                 bpy.data.objects[node.name].select = True
                 context.scene.objects.active = bpy.data.objects[node.name]
-        return{'FINISHED'}
+
+        return {'FINISHED'}
+
 
 class export_groups_autosave(bpy.types.Operator):
     bl_idname = "scene.godot_export_groups_autosave"
     bl_label = "Export All Groups"
     bl_description = "Exports all groups to Collada."
 
-    def execute(self,context):
+    def execute(self, context):
         scene = context.scene
         if scene.godot_export_on_save:
             for i in range(len(scene.godot_export_groups)):
                 if scene.godot_export_groups[i].active:
                     bpy.ops.scene.godot_export_group(idx=i)
-        self.report({'INFO'}, "All Groups exported." )
+        self.report({'INFO'}, "All Groups exported.")
         bpy.ops.ed.undo_push(message="Export all Groups")
-        return{'FINISHED'}
+
+        return {'FINISHED'}
+
 
 class export_all_groups(bpy.types.Operator):
     bl_idname = "scene.godot_export_all_groups"
     bl_label = "Export All Groups"
     bl_description = "Exports all groups to Collada."
 
-    def execute(self,context):
+    def execute(self, context):
         scene = context.scene
 
-        for i in range(0,len(scene.godot_export_groups)):
-            bpy.ops.scene.godot_export_group(idx=i,export_all=True)
+        for i in range(0, len(scene.godot_export_groups)):
+            bpy.ops.scene.godot_export_group(idx=i, export_all=True)
 
-        self.report({'INFO'}, "All Groups exported." )
-        return{'FINISHED'}
+        self.report({'INFO'}, "All Groups exported.")
+
+        return {'FINISHED'}
 
 
 class export_group(bpy.types.Operator):
     bl_idname = "scene.godot_export_group"
     bl_label = "Export Group"
-    bl_description = "Exports the active group to destination folder as Collada file."
+    bl_description = "Exports the active group to destination folder"\
+                     " as Collada file."
 
     idx = IntProperty(default=0)
     export_all = BoolProperty(default=False)
 
-
-    def copy_object_recursive(self,ob,parent,single_user = True):
+    def copy_object_recursive(self, ob, parent, single_user=True):
         new_ob = bpy.data.objects[ob.name].copy()
-        if single_user or ob.type=="ARMATURE":
+        if single_user or ob.type == "ARMATURE":
             new_mesh_data = new_ob.data.copy()
             new_ob.data = new_mesh_data
         bpy.context.scene.objects.link(new_ob)
 
         if ob != parent:
-           new_ob.parent = parent
+            new_ob.parent = parent
         else:
             new_ob.parent = None
 
         for child in ob.children:
-            self.copy_object_recursive(child,new_ob,single_user)
+            self.copy_object_recursive(child, new_ob, single_user)
         new_ob.select = True
+
         return new_ob
 
-    def delete_object(self,ob):
-        if ob != None:
+    def delete_object(self, ob):
+        if ob is not None:
             for child in ob.children:
                 self.delete_object(child)
             bpy.context.scene.objects.unlink(ob)
             bpy.data.objects.remove(ob)
 
-    def convert_group_to_node(self,group):
-        if group.dupli_group != None:
+    def convert_group_to_node(self, group):
+        if group.dupli_group is not None:
             for object in group.dupli_group.objects:
-                if object.parent == None:
-                    object = self.copy_object_recursive(object,object,True)
+                if object.parent is None:
+                    object = self.copy_object_recursive(object, object, True)
                     matrix = Matrix(object.matrix_local)
                     object.matrix_local = Matrix()
                     object.matrix_local *= group.matrix_local
@@ -284,7 +309,7 @@ class export_group(bpy.types.Operator):
 
             self.delete_object(group)
 
-    def execute(self,context):
+    def execute(self, context):
 
         scene = context.scene
         group = context.scene.godot_export_groups
@@ -292,7 +317,7 @@ class export_group(bpy.types.Operator):
         if not group[self.idx].active and self.export_all:
             return{'FINISHED'}
 
-        for i,object in enumerate(group[self.idx].nodes):
+        for i, object in enumerate(group[self.idx].nodes):
             if object.name in bpy.data.objects:
                 pass
             else:
@@ -300,21 +325,21 @@ class export_group(bpy.types.Operator):
         bpy.ops.ed.undo_push(message="Clear not existent Group Nodes.")
 
         path = group[self.idx].export_path
-        if (path.find("//")==0 or path.find("\\\\")==0):
-            #if relative, convert to absolute
+        if (path.find("//") == 0 or path.find("\\\\") == 0):
+            # If relative, convert to absolute
             path = bpy.path.abspath(path)
-            path = path.replace("\\","/")
+            path = path.replace("\\", "/")
 
-        ### if path exists and group export name is set the group will be exported
-        if os.path.exists(path) and  group[self.idx].export_name != "":
-
-            context.scene.layers = [True,True,True,True,True,True,True,True,True,True,True,True,True,True,True,True,True,True,True,True]
+        # If path exists and group export name is set the group will be
+        # exported
+        if os.path.exists(path) and group[self.idx].export_name != "":
 
+            context.scene.layers = [True] * 20
 
             if group[self.idx].export_name.endswith(".dae"):
-                path = os.path.join(path,group[self.idx].export_name)
+                path = os.path.join(path, group[self.idx].export_name)
             else:
-                path = os.path.join(path,group[self.idx].export_name+".dae")
+                path = os.path.join(path, group[self.idx].export_name+".dae")
 
             hide_select = []
             for object in context.scene.objects:
@@ -323,17 +348,19 @@ class export_group(bpy.types.Operator):
                 object.select = False
             context.scene.objects.active = None
 
-            ### make particle duplicates, parent and select them
+            # Make particle duplicates, parent and select them
             nodes_to_be_added = []
             if group[self.idx].use_include_particle_duplicates:
-                for i,object in enumerate(group[self.idx].nodes):
+                for i, object in enumerate(group[self.idx].nodes):
                     if bpy.data.objects[object.name].type != "EMPTY":
-                        context.scene.objects.active = bpy.data.objects[object.name]
+                        context.scene.objects.active = bpy.data.objects[
+                            object.name]
                         bpy.data.objects[object.name].select = True
                         bpy.ops.object.duplicates_make_real()
                         for object in context.selected_objects:
                             nodes_to_be_added.append(object)
-                        bpy.ops.object.parent_set(type="OBJECT", keep_transform=False)
+                        bpy.ops.object.parent_set(type="OBJECT",
+                                                  keep_transform=False)
 
                         for object in context.selected_objects:
                             object.select = False
@@ -342,17 +369,35 @@ class export_group(bpy.types.Operator):
             for object in nodes_to_be_added:
                 object.select = True
 
-            ### select all other nodes from the group
-            for i,object in enumerate(group[self.idx].nodes):
+            # Select all other nodes from the group
+            for i, object in enumerate(group[self.idx].nodes):
                 if bpy.data.objects[object.name].type == "EMPTY":
                     self.convert_group_to_node(bpy.data.objects[object.name])
                 else:
                     bpy.data.objects[object.name].select = True
 
-            bpy.ops.object.transform_apply(location=group[self.idx].apply_loc, rotation=group[self.idx].apply_rot, scale=group[self.idx].apply_scale)
-            bpy.ops.export_scene.dae(check_existing=True, filepath=path, filter_glob="*.dae", object_types=group[self.idx].object_types, use_export_selected=group[self.idx].use_export_selected, use_mesh_modifiers=group[self.idx].use_mesh_modifiers, use_tangent_arrays=group[self.idx].use_tangent_arrays, use_triangles=group[self.idx].use_triangles, use_copy_images=group[self.idx].use_copy_images, use_active_layers=group[self.idx].use_active_layers, use_anim=group[self.idx].use_anim, use_anim_action_all=group[self.idx].use_anim_action_all, use_anim_skip_noexp=group[self.idx].use_anim_skip_noexp, use_anim_optimize=group[self.idx].use_anim_optimize, anim_optimize_precision=group[self.idx].anim_optimize_precision, use_metadata=group[self.idx].use_metadata)
-
-            self.report({'INFO'}, '"'+group[self.idx].name+'"' + " Group exported." )
+            bpy.ops.object.transform_apply(location=group[self.idx].apply_loc,
+                                           rotation=group[self.idx].apply_rot,
+                                           scale=group[self.idx].apply_scale)
+            bpy.ops.export_scene.dae(
+                check_existing=True, filepath=path, filter_glob="*.dae",
+                object_types=group[self.idx].object_types,
+                use_export_selected=group[self.idx].use_export_selected,
+                use_mesh_modifiers=group[self.idx].use_mesh_modifiers,
+                use_tangent_arrays=group[self.idx].use_tangent_arrays,
+                use_triangles=group[self.idx].use_triangles,
+                use_copy_images=group[self.idx].use_copy_images,
+                use_active_layers=group[self.idx].use_active_layers,
+                use_anim=group[self.idx].use_anim,
+                use_anim_action_all=group[self.idx].use_anim_action_all,
+                use_anim_skip_noexp=group[self.idx].use_anim_skip_noexp,
+                use_anim_optimize=group[self.idx].use_anim_optimize,
+                anim_optimize_precision=group[
+                    self.idx].anim_optimize_precision,
+                use_metadata=group[self.idx].use_metadata)
+
+            self.report({'INFO'},
+                        '"' + group[self.idx].name + '" Group exported.')
             msg = "Export Group "+group[self.idx].name
 
             bpy.ops.ed.undo_push(message="")
@@ -360,15 +405,18 @@ class export_group(bpy.types.Operator):
             bpy.ops.ed.undo_push(message=msg)
 
         else:
-            self.report({'INFO'}, "Define Export Name and Export Path." )
+            self.report({'INFO'}, "Define Export Name and Export Path.")
+
         return{'FINISHED'}
 
+
 class add_export_group(bpy.types.Operator):
     bl_idname = "scene.godot_add_export_group"
     bl_label = "Adds a new export Group"
-    bl_description = "Creates a new Export Group with the selected Objects assigned to it."
+    bl_description = "Creates a new Export Group with the selected"\
+                     " Objects assigned to it."
 
-    def execute(self,context):
+    def execute(self, context):
         scene = context.scene
 
         item = scene.godot_export_groups.add()
@@ -378,8 +426,10 @@ class add_export_group(bpy.types.Operator):
             node.name = object.name
         scene.godot_export_groups_index = len(scene.godot_export_groups)-1
         bpy.ops.ed.undo_push(message="Create New Export Group")
+
         return{'FINISHED'}
 
+
 class del_export_group(bpy.types.Operator):
     bl_idname = "scene.godot_delete_export_group"
     bl_label = "Delets the selected export Group"
@@ -387,49 +437,100 @@ class del_export_group(bpy.types.Operator):
 
     def invoke(self, context, event):
         wm = context.window_manager
-        return wm.invoke_confirm(self,event)
 
-    def execute(self,context):
+        return wm.invoke_confirm(self, event)
+
+    def execute(self, context):
         scene = context.scene
 
         scene.godot_export_groups.remove(scene.godot_export_groups_index)
         if scene.godot_export_groups_index > 0:
             scene.godot_export_groups_index -= 1
         bpy.ops.ed.undo_push(message="Delete Export Group")
-        return{'FINISHED'}
+
+        return {'FINISHED'}
+
 
 class godot_node_list(bpy.types.PropertyGroup):
     name = StringProperty()
 
+
 class godot_export_groups(bpy.types.PropertyGroup):
     name = StringProperty(name="Group Name")
     export_name = StringProperty(name="scene_name")
     nodes = CollectionProperty(type=godot_node_list)
     export_path = StringProperty(subtype="DIR_PATH")
-    active = BoolProperty(default=True,description="Export Group")
-
-    object_types = EnumProperty(name="Object Types",options={'ENUM_FLAG'},items=(('EMPTY', "Empty", ""),('CAMERA', "Camera", ""),('LAMP', "Lamp", ""),('ARMATURE', "Armature", ""),('MESH', "Mesh", ""),('CURVE', "Curve", ""),),default={'EMPTY', 'CAMERA', 'LAMP', 'ARMATURE', 'MESH','CURVE'})
+    active = BoolProperty(default=True, description="Export Group")
+
+    object_types = EnumProperty(name="Object Types", options={'ENUM_FLAG'},
+                                items=(('EMPTY', "Empty", ""),
+                                       ('CAMERA', "Camera", ""),
+                                       ('LAMP', "Lamp", ""),
+                                       ('ARMATURE', "Armature", ""),
+                                       ('MESH', "Mesh", ""),
+                                       ('CURVE', "Curve", ""), ),
+                                default={'EMPTY', 'CAMERA', 'LAMP',
+                                         'ARMATURE', 'MESH', 'CURVE'})
+
+    apply_scale = BoolProperty(name="Apply Scale",
+                               description="Apply Scale before export.",
+                               default=False)
+    apply_rot = BoolProperty(name="Apply Rotation",
+                             description="Apply Rotation before export.",
+                             default=False)
+    apply_loc = BoolProperty(name="Apply Location",
+                             description="Apply Location before export.",
+                             default=False)
+
+    use_export_selected = BoolProperty(name="Selected Objects",
+                                       description="Export only selected"
+                                       "objects (and visible in active layers "
+                                       "if that applies).", default=True)
+    use_mesh_modifiers = BoolProperty(name="Apply Modifiers",
+                                      description="Apply modifiers to mesh"
+                                      " objects (on a copy!).", default=True)
+    use_tangent_arrays = BoolProperty(name="Tangent Arrays",
+                                      description="Export Tangent and Binormal"
+                                      " arrays (for normalmapping).",
+                                      default=False)
+    use_triangles = BoolProperty(name="Triangulate",
+                                 description="Export Triangles instead of"
+                                 " Polygons.", default=False)
+
+    use_copy_images = BoolProperty(name="Copy Images",
+                                   description="Copy Images (create images/ "
+                                   "subfolder)", default=False)
+    use_active_layers = BoolProperty(name="Active Layers",
+                                     description="Export only objects on the"
+                                     " active layers.", default=True)
+    use_anim = BoolProperty(name="Export Animation",
+                            description="Export keyframe animation",
+                            default=False)
+    use_anim_action_all = BoolProperty(name="All Actions",
+                                       description=("Export all actions for "
+                                                    "the first armature found"
+                                                    " in separate DAE files"),
+                                       default=False)
+    use_anim_skip_noexp = BoolProperty(name="Skip (-noexp) Actions",
+                                       description="Skip exporting of"
+                                       " actions whose name end in (-noexp)."
+                                       " Useful to skip control animations.",
+                                       default=True)
+    use_anim_optimize = BoolProperty(name="Optimize Keyframes",
+                                     description="Remove double keyframes",
+                                     default=True)
+
+    anim_optimize_precision = FloatProperty(
+        name="Precision", description=("Tolerence for comparing double "
+                                       "keyframes (higher for greater "
+                                       "accuracy)"), min=1, max=16,
+        soft_min=1, soft_max=16, default=6.0)
+
+    use_metadata = BoolProperty(name="Use Metadata", default=True,
+                                options={'HIDDEN'})
+    use_include_particle_duplicates = BoolProperty(
+        name="Include Particle Duplicates", default=True)
 
-    apply_scale = BoolProperty(name="Apply Scale",description="Apply Scale before export.",default=False)
-    apply_rot = BoolProperty(name="Apply Rotation",description="Apply Rotation before export.",default=False)
-    apply_loc = BoolProperty(name="Apply Location",description="Apply Location before export.",default=False)
-
-    use_export_selected = BoolProperty(name="Selected Objects",description="Export only selected objects (and visible in active layers if that applies).",default=True)
-    use_mesh_modifiers = BoolProperty(name="Apply Modifiers",description="Apply modifiers to mesh objects (on a copy!).",default=True)
-    use_tangent_arrays = BoolProperty(name="Tangent Arrays",description="Export Tangent and Binormal arrays (for normalmapping).",default=False)
-    use_triangles = BoolProperty(name="Triangulate",description="Export Triangles instead of Polygons.",default=False)
-
-    use_copy_images = BoolProperty(name="Copy Images",description="Copy Images (create images/ subfolder)",default=False)
-    use_active_layers = BoolProperty(name="Active Layers",description="Export only objects on the active layers.",default=True)
-    use_anim = BoolProperty(name="Export Animation",description="Export keyframe animation",default=False)
-    use_anim_action_all = BoolProperty(name="All Actions",description=("Export all actions for the first armature found in separate DAE files"),default=False)
-    use_anim_skip_noexp = BoolProperty(name="Skip (-noexp) Actions",description="Skip exporting of actions whose name end in (-noexp). Useful to skip control animations.",default=True)
-    use_anim_optimize = BoolProperty(name="Optimize Keyframes",description="Remove double keyframes",default=True)
-
-    anim_optimize_precision = FloatProperty(name="Precision",description=("Tolerence for comparing double keyframes (higher for greater accuracy)"),min=1, max=16,soft_min=1, soft_max=16,default=6.0)
-
-    use_metadata = BoolProperty(name="Use Metadata",default=True,options={'HIDDEN'})
-    use_include_particle_duplicates = BoolProperty(name="Include Particle Duplicates",default=True)
 
 def register():
     bpy.utils.register_class(godot_export_manager)
@@ -445,8 +546,10 @@ def register():
     bpy.utils.register_class(select_group_objects)
     bpy.utils.register_class(UI_List_Godot)
 
-    bpy.types.Scene.godot_export_groups = CollectionProperty(type=godot_export_groups)
-    bpy.types.Scene.godot_export_groups_index = IntProperty(default=0,min=0)
+    bpy.types.Scene.godot_export_groups = CollectionProperty(
+        type=godot_export_groups)
+    bpy.types.Scene.godot_export_groups_index = IntProperty(default=0, min=0)
+
 
 def unregister():
     bpy.utils.unregister_class(godot_export_manager)
@@ -462,6 +565,7 @@ def unregister():
     bpy.utils.unregister_class(select_group_objects)
     bpy.utils.unregister_class(UI_List_Godot)
 
+
 @persistent
 def auto_export(dummy):
     bpy.ops.scene.godot_export_groups_autosave()
diff --git a/tools/export/blender25/io_scene_dae/__init__.py b/tools/export/blender25/io_scene_dae/__init__.py
index a1a0eabbbe..0b82e1537b 100644
--- a/tools/export/blender25/io_scene_dae/__init__.py
+++ b/tools/export/blender25/io_scene_dae/__init__.py
@@ -18,35 +18,30 @@
 
 # <pep8-80 compliant>
 
+import bpy
+from bpy.props import StringProperty, BoolProperty, FloatProperty, EnumProperty
+
+from bpy_extras.io_utils import ExportHelper
 bl_info = {
     "name": "Better Collada Exporter",
     "author": "Juan Linietsky",
     "blender": (2, 5, 8),
     "api": 38691,
     "location": "File > Import-Export",
-    "description": ("Export DAE Scenes, This plugin actually works better! otherwise contact me."),
+    "description": ("Export DAE Scenes, This plugin actually works better! "
+                    "otherwise contact me."),
     "warning": "",
     "wiki_url": ("http://www.godotengine.org"),
     "tracker_url": "",
     "support": 'OFFICIAL',
     "category": "Import-Export"}
 
-
 if "bpy" in locals():
     import imp
     if "export_dae" in locals():
         imp.reload(export_dae)
 
 
-import bpy
-from bpy.props import StringProperty, BoolProperty, FloatProperty, EnumProperty
-
-from bpy_extras.io_utils import (ExportHelper,
-                                 path_reference_mode,
-                                 axis_conversion,
-                                 )
-
-
 class ExportDAE(bpy.types.Operator, ExportHelper):
     '''Selection to DAE'''
     bl_idname = "export_scene.dae"
@@ -59,90 +54,94 @@ class ExportDAE(bpy.types.Operator, ExportHelper):
     # List of operator properties, the attributes will be assigned
     # to the class instance from the operator settings before calling.
 
-
     object_types = EnumProperty(
-            name="Object Types",
-            options={'ENUM_FLAG'},
-            items=(('EMPTY', "Empty", ""),
-                   ('CAMERA', "Camera", ""),
-                   ('LAMP', "Lamp", ""),
-                   ('ARMATURE', "Armature", ""),
-                   ('MESH', "Mesh", ""),
-                   ('CURVE', "Curve", ""),
-                   ),
-            default={'EMPTY', 'CAMERA', 'LAMP', 'ARMATURE', 'MESH','CURVE'},
-            )
+        name="Object Types",
+        options={'ENUM_FLAG'},
+        items=(('EMPTY', "Empty", ""),
+               ('CAMERA', "Camera", ""),
+               ('LAMP', "Lamp", ""),
+               ('ARMATURE', "Armature", ""),
+               ('MESH', "Mesh", ""),
+               ('CURVE', "Curve", ""),
+               ),
+        default={'EMPTY', 'CAMERA', 'LAMP', 'ARMATURE', 'MESH', 'CURVE'},
+        )
 
     use_export_selected = BoolProperty(
-            name="Selected Objects",
-            description="Export only selected objects (and visible in active layers if that applies).",
-            default=False,
-            )
+        name="Selected Objects",
+        description="Export only selected objects (and visible in active "
+                    "layers if that applies).",
+        default=False,
+        )
     use_mesh_modifiers = BoolProperty(
-            name="Apply Modifiers",
-            description="Apply modifiers to mesh objects (on a copy!).",
-	    default=False,
-            )
+        name="Apply Modifiers",
+        description="Apply modifiers to mesh objects (on a copy!).",
+        default=False,
+        )
     use_tangent_arrays = BoolProperty(
-	    name="Tangent Arrays",
-	    description="Export Tangent and Binormal arrays (for normalmapping).",
-	    default=False,
-	    )
+        name="Tangent Arrays",
+        description="Export Tangent and Binormal arrays "
+                    "(for normalmapping).",
+        default=False,
+        )
     use_triangles = BoolProperty(
-	    name="Triangulate",
-	    description="Export Triangles instead of Polygons.",
-	    default=False,
-	    )
+        name="Triangulate",
+        description="Export Triangles instead of Polygons.",
+        default=False,
+        )
 
     use_copy_images = BoolProperty(
-            name="Copy Images",
-            description="Copy Images (create images/ subfolder)",
-            default=False,
-            )
+        name="Copy Images",
+        description="Copy Images (create images/ subfolder)",
+        default=False,
+        )
     use_active_layers = BoolProperty(
-            name="Active Layers",
-            description="Export only objects on the active layers.",
-            default=True,
-            )
+        name="Active Layers",
+        description="Export only objects on the active layers.",
+        default=True,
+        )
     use_anim = BoolProperty(
-            name="Export Animation",
-            description="Export keyframe animation",
-            default=False,
-            )
+        name="Export Animation",
+        description="Export keyframe animation",
+        default=False,
+        )
     use_anim_action_all = BoolProperty(
-            name="All Actions",
-            description=("Export all actions for the first armature found in separate DAE files"),
-            default=False,
-            )
+        name="All Actions",
+        description=("Export all actions for the first armature found "
+                     "in separate DAE files"),
+        default=False,
+        )
     use_anim_skip_noexp = BoolProperty(
-	    name="Skip (-noexp) Actions",
-	    description="Skip exporting of actions whose name end in (-noexp). Useful to skip control animations.",
-	    default=True,
-	    )
+        name="Skip (-noexp) Actions",
+        description="Skip exporting of actions whose name end in (-noexp)."
+                    " Useful to skip control animations.",
+        default=True,
+        )
     use_anim_optimize = BoolProperty(
-            name="Optimize Keyframes",
-            description="Remove double keyframes",
-            default=True,
-            )
+        name="Optimize Keyframes",
+        description="Remove double keyframes",
+        default=True,
+        )
 
     anim_optimize_precision = FloatProperty(
-            name="Precision",
-            description=("Tolerence for comparing double keyframes "
-                        "(higher for greater accuracy)"),
-            min=1, max=16,
-            soft_min=1, soft_max=16,
-            default=6.0,
-            )
+        name="Precision",
+        description=("Tolerence for comparing double keyframes "
+                     "(higher for greater accuracy)"),
+        min=1, max=16,
+        soft_min=1, soft_max=16,
+        default=6.0,
+        )
 
     use_metadata = BoolProperty(
-            name="Use Metadata",
-            default=True,
-            options={'HIDDEN'},
-            )
+        name="Use Metadata",
+        default=True,
+        options={'HIDDEN'},
+        )
 
     @property
     def check_extension(self):
-        return True#return self.batch_mode == 'OFF'
+        # return self.batch_mode == 'OFF'
+        return True
 
     def check(self, context):
         return True
diff --git a/tools/export/blender25/io_scene_dae/export_dae.py b/tools/export/blender25/io_scene_dae/export_dae.py
index 2f7d1ddd86..9f8458c0da 100644
--- a/tools/export/blender25/io_scene_dae/export_dae.py
+++ b/tools/export/blender25/io_scene_dae/export_dae.py
@@ -46,1679 +46,1878 @@ import bpy
 import bmesh
 from mathutils import Vector, Matrix
 
-#according to collada spec, order matters
-S_ASSET=0
-S_IMGS=1
-S_FX=2
-S_MATS=3
-S_GEOM=4
-S_MORPH=5
-S_SKIN=6
-S_CONT=7
-S_CAMS=8
-S_LAMPS=9
-S_ANIM_CLIPS=10
-S_NODES=11
-S_ANIM=12
-
-CMP_EPSILON=0.0001
+# According to collada spec, order matters
+S_ASSET = 0
+S_IMGS = 1
+S_FX = 2
+S_MATS = 3
+S_GEOM = 4
+S_MORPH = 5
+S_SKIN = 6
+S_CONT = 7
+S_CAMS = 8
+S_LAMPS = 9
+S_ANIM_CLIPS = 10
+S_NODES = 11
+S_ANIM = 12
+
+CMP_EPSILON = 0.0001
+
 
 def snap_tup(tup):
-	ret=()
-	for x in tup:
-		ret+=( x-math.fmod(x,0.0001), )
+    ret = ()
+    for x in tup:
+        ret += (x - math.fmod(x, 0.0001), )
 
-	return tup
+    return tup
 
 
 def strmtx(mtx):
-	s=" "
-	for x in range(4):
-		for y in range(4):
-			s+=str(mtx[x][y])
-			s+=" "
-	s+=" "
-	return s
-
-def numarr(a,mult=1.0):
-	s=" "
-	for x in a:
-		s+=" "+str(x*mult)
-	s+=" "
-	return s
-
-def numarr_alpha(a,mult=1.0):
-	s=" "
-	for x in a:
-		s+=" "+str(x*mult)
-	if len(a) == 3:
-		s+=" 1.0"
-	s+=" "
-	return s
-
-def strarr(arr):
-	s=" "
-	for x in arr:
-		s+=" "+str(x)
-	s+=" "
-	return s
-
-class DaeExporter:
-
-	def validate_id(self,d):
-		if (d.find("id-")==0):
-			return "z"+d
-		return d
-
-
-	def new_id(self,t):
-		self.last_id+=1
-		return "id-"+t+"-"+str(self.last_id)
-
-	class Vertex:
-
-		def close_to(v):
-			if ( (self.vertex-v.vertex).length() > CMP_EPSILON ):
-				return False
-			if ( (self.normal-v.normal).length() > CMP_EPSILON ):
-				return False
-			if ( (self.uv-v.uv).length() > CMP_EPSILON ):
-				return False
-			if ( (self.uv2-v.uv2).length() > CMP_EPSILON ):
-				return False
-
-			return True
-
-		def get_tup(self):
-			tup = (self.vertex.x,self.vertex.y,self.vertex.z,self.normal.x,self.normal.y,self.normal.z)
-			for t in self.uv:
-				tup = tup + (t.x,t.y)
-			if (self.color!=None):
-				tup = tup + (self.color.x,self.color.y,self.color.z)
-			if (self.tangent!=None):
-				tup = tup + (self.tangent.x,self.tangent.y,self.tangent.z)
-			if (self.bitangent!=None):
-				tup = tup + (self.bitangent.x,self.bitangent.y,self.bitangent.z)
-			for t in self.bones:
-				tup = tup + (float(t),)
-			for t in self.weights:
-				tup = tup + (float(t),)
-
-			return tup
-
-		def __init__(self):
-			self.vertex = Vector( (0.0,0.0,0.0) )
-			self.normal = Vector( (0.0,0.0,0.0) )
-			self.tangent = None
-			self.bitangent = None
-			self.color = None
-			self.uv = []
-			self.uv2 = Vector( (0.0,0.0) )
-			self.bones=[]
-			self.weights=[]
-
-
-	def writel(self,section,indent,text):
-		if (not (section in self.sections)):
-			self.sections[section]=[]
-		line=""
-		for x in range(indent):
-			line+="\t"
-		line+=text
-		self.sections[section].append(line)
-
-
-	def export_image(self,image):
-		if (image in self.image_cache):
-			return self.image_cache[image]
-
-		imgpath = image.filepath
-		if (imgpath.find("//")==0 or imgpath.find("\\\\")==0):
-			#if relative, convert to absolute
-			imgpath = bpy.path.abspath(imgpath)
-
-		#path is absolute, now do something!
-
-		if (self.config["use_copy_images"]):
-			#copy image
-			basedir = os.path.dirname(self.path)+"/images"
-			if (not os.path.isdir(basedir)):
-				os.makedirs(basedir)
-
-			if os.path.isfile(imgpath):
-				dstfile=basedir+"/"+os.path.basename(imgpath)
-
-				if (not os.path.isfile(dstfile)):
-					shutil.copy(imgpath,dstfile)
-				imgpath="images/"+os.path.basename(imgpath)
-			else:
-				### if file is not found save it as png file in the destination folder
-				img_tmp_path = image.filepath
-				if img_tmp_path.endswith((".bmp",".rgb",".png",".jpeg",".jpg",".jp2",".tga",".cin",".dpx",".exr",".hdr",".tif")):
-					image.filepath = basedir+"/"+os.path.basename(img_tmp_path)
-				else:
-					image.filepath = basedir+"/"+image.name+".png"
-
-				dstfile=basedir+"/"+os.path.basename(image.filepath)
-
-				if (not os.path.isfile(dstfile)):
-
-					image.save()
-				imgpath="images/"+os.path.basename(image.filepath)
-				image.filepath = img_tmp_path
-
-		else:
-			#export relative, always, no one wants absolute paths.
-			try:
-				imgpath = os.path.relpath(imgpath,os.path.dirname(self.path)).replace("\\","/") # export unix compatible always
-
-			except:
-				pass #fails sometimes, not sure why
-
-
-		imgid = self.new_id("image")
-
-		print("FOR: "+imgpath)
-
-#		if (not os.path.isfile(imgpath)):
-#			print("NOT FILE?")
-#			if imgpath.endswith((".bmp",".rgb",".png",".jpeg",".jpg",".jp2",".tga",".cin",".dpx",".exr",".hdr",".tif")):
-#				imgpath="images/"+os.path.basename(imgpath)
-#			else:
-#				imgpath="images/"+image.name+".png"
-
-		self.writel(S_IMGS,1,'<image id="'+imgid+'" name="'+image.name+'">')
-		self.writel(S_IMGS,2,'<init_from>'+imgpath+'</init_from>')
-		self.writel(S_IMGS,1,'</image>')
-		self.image_cache[image]=imgid
-		return imgid
-
-	def export_material(self,material,double_sided_hint=True):
-
-		if (material in self.material_cache):
-			return self.material_cache[material]
-
-		fxid = self.new_id("fx")
-		self.writel(S_FX,1,'<effect id="'+fxid+'" name="'+material.name+'-fx">')
-		self.writel(S_FX,2,'<profile_COMMON>')
-
-		#Find and fetch the textures and create sources
-		sampler_table={}
-		diffuse_tex=None
-		specular_tex=None
-		emission_tex=None
-		normal_tex=None
-		for i in range(len(material.texture_slots)):
-			ts=material.texture_slots[i]
-			if (not ts):
-				continue
-			if (not ts.use):
-				continue
-			if (not ts.texture):
-				continue
-			if (ts.texture.type!="IMAGE"):
-				continue
-
-			if (ts.texture.image==None):
-				continue
-
-			#image
-			imgid = self.export_image(ts.texture.image)
-
-			#surface
-			surface_sid = self.new_id("fx_surf")
-			self.writel(S_FX,3,'<newparam sid="'+surface_sid+'">')
-			self.writel(S_FX,4,'<surface type="2D">')
-			self.writel(S_FX,5,'<init_from>'+imgid+'</init_from>') #this is sooo weird
-			self.writel(S_FX,5,'<format>A8R8G8B8</format>')
-			self.writel(S_FX,4,'</surface>')
-			self.writel(S_FX,3,'</newparam>')
-			#sampler, collada sure likes it difficult
-			sampler_sid = self.new_id("fx_sampler")
-			self.writel(S_FX,3,'<newparam sid="'+sampler_sid+'">')
-			self.writel(S_FX,4,'<sampler2D>')
-			self.writel(S_FX,5,'<source>'+surface_sid+'</source>')
-			self.writel(S_FX,4,'</sampler2D>')
-			self.writel(S_FX,3,'</newparam>')
-			sampler_table[i]=sampler_sid
-
-			if (ts.use_map_color_diffuse and diffuse_tex==None):
-				diffuse_tex=sampler_sid
-			if (ts.use_map_color_spec and specular_tex==None):
-				specular_tex=sampler_sid
-			if (ts.use_map_emit and emission_tex==None):
-				emission_tex=sampler_sid
-			if (ts.use_map_normal and normal_tex==None):
-				normal_tex=sampler_sid
-
-		self.writel(S_FX,3,'<technique sid="common">')
-		shtype="blinn"
-		self.writel(S_FX,4,'<'+shtype+'>')
-		#ambient? from where?
-
-		self.writel(S_FX,5,'<emission>')
-		if (emission_tex!=None):
-			self.writel(S_FX,6,'<texture texture="'+emission_tex+'" texcoord="CHANNEL1"/>')
-		else:
-			self.writel(S_FX,6,'<color>'+numarr_alpha(material.diffuse_color,material.emit)+' </color>') # not totally right but good enough
-		self.writel(S_FX,5,'</emission>')
-
-		self.writel(S_FX,5,'<ambient>')
-		self.writel(S_FX,6,'<color>'+numarr_alpha(self.scene.world.ambient_color,material.ambient)+' </color>')
-		self.writel(S_FX,5,'</ambient>')
-
-		self.writel(S_FX,5,'<diffuse>')
-		if (diffuse_tex!=None):
-			self.writel(S_FX,6,'<texture texture="'+diffuse_tex+'" texcoord="CHANNEL1"/>')
-		else:
-			self.writel(S_FX,6,'<color>'+numarr_alpha(material.diffuse_color,material.diffuse_intensity)+'</color>')
-		self.writel(S_FX,5,'</diffuse>')
-
-		self.writel(S_FX,5,'<specular>')
-		if (specular_tex!=None):
-			self.writel(S_FX,6,'<texture texture="'+specular_tex+'" texcoord="CHANNEL1"/>')
-		else:
-			self.writel(S_FX,6,'<color>'+numarr_alpha(material.specular_color,material.specular_intensity)+'</color>')
-		self.writel(S_FX,5,'</specular>')
-
-		self.writel(S_FX,5,'<shininess>')
-		self.writel(S_FX,6,'<float>'+str(material.specular_hardness)+'</float>')
-		self.writel(S_FX,5,'</shininess>')
-
-		self.writel(S_FX,5,'<reflective>')
-		self.writel(S_FX,6,'<color>'+numarr_alpha(material.mirror_color)+'</color>')
-		self.writel(S_FX,5,'</reflective>')
-
-		if (material.use_transparency):
-			self.writel(S_FX,5,'<transparency>')
-			self.writel(S_FX,6,'<float>'+str(material.alpha)+'</float>')
-			self.writel(S_FX,5,'</transparency>')
-
-		self.writel(S_FX,5,'<index_of_refraction>')
-		self.writel(S_FX,6,'<float>'+str(material.specular_ior)+'</float>')
-		self.writel(S_FX,5,'</index_of_refraction>')
-
-		self.writel(S_FX,4,'</'+shtype+'>')
-
-		self.writel(S_FX,4,'<extra>')
-		self.writel(S_FX,5,'<technique profile="FCOLLADA">')
-		if (normal_tex):
-			self.writel(S_FX,6,'<bump bumptype="NORMALMAP">')
-			self.writel(S_FX,7,'<texture texture="'+normal_tex+'" texcoord="CHANNEL1"/>')
-			self.writel(S_FX,6,'</bump>')
-
-		self.writel(S_FX,5,'</technique>')
-		self.writel(S_FX,5,'<technique profile="GOOGLEEARTH">')
-		self.writel(S_FX,6,'<double_sided>'+["0","1"][double_sided_hint]+"</double_sided>")
-		self.writel(S_FX,5,'</technique>')
-
-		if (material.use_shadeless):
-			self.writel(S_FX,5,'<technique profile="GODOT">')
-			self.writel(S_FX,6,'<unshaded>1</unshaded>')
-			self.writel(S_FX,5,'</technique>')
-
-		self.writel(S_FX,4,'</extra>')
-
-		self.writel(S_FX,3,'</technique>')
-		self.writel(S_FX,2,'</profile_COMMON>')
-		self.writel(S_FX,1,'</effect>')
-
-		# Also export blender material in all it's glory (if set as active)
-
-
-		#Material
-		matid = self.new_id("material")
-		self.writel(S_MATS,1,'<material id="'+matid+'" name="'+material.name+'">')
-		self.writel(S_MATS,2,'<instance_effect url="#'+fxid+'"/>')
-		self.writel(S_MATS,1,'</material>')
-
-		self.material_cache[material]=matid
-		return matid
-
-
-	def export_mesh(self,node,armature=None,skeyindex=-1,skel_source=None,custom_name=None):
-
-		mesh = node.data
-
-
-		if (node.data in self.mesh_cache):
-			return self.mesh_cache[mesh]
-
-		if (skeyindex==-1 and mesh.shape_keys!=None and len(mesh.shape_keys.key_blocks)):
-			values=[]
-			morph_targets=[]
-			md=None
-			for k in range(0,len(mesh.shape_keys.key_blocks)):
-			    shape = node.data.shape_keys.key_blocks[k]
-			    values+=[shape.value] #save value
-			    shape.value=0
-
-			mid = self.new_id("morph")
-
-			for k in range(0,len(mesh.shape_keys.key_blocks)):
-
-				shape = node.data.shape_keys.key_blocks[k]
-				node.show_only_shape_key=True
-				node.active_shape_key_index = k
-				shape.value = 1.0
-				mesh.update()
-				"""
-				oldval = shape.value
-				shape.value = 1.0
-
-				"""
-				p = node.data
-				v = node.to_mesh(bpy.context.scene, True, "RENDER")
-				node.data = v
-#				self.export_node(node,il,shape.name)
-				node.data.update()
-				if (armature and k==0):
-					md=self.export_mesh(node,armature,k,mid,shape.name)
-				else:
-					md=self.export_mesh(node,None,k,None,shape.name)
-
-				node.data = p
-				node.data.update()
-				shape.value = 0.0
-				morph_targets.append(md)
-
-				"""
-				shape.value = oldval
-				"""
-			node.show_only_shape_key=False
-			node.active_shape_key_index = 0
-
-
-			self.writel(S_MORPH,1,'<controller id="'+mid+'" name="">')
-			#if ("skin_id" in morph_targets[0]):
-			#	self.writel(S_MORPH,2,'<morph source="#'+morph_targets[0]["skin_id"]+'" method="NORMALIZED">')
-			#else:
-			self.writel(S_MORPH,2,'<morph source="#'+morph_targets[0]["id"]+'" method="NORMALIZED">')
-
-			self.writel(S_MORPH,3,'<source id="'+mid+'-morph-targets">')
-			self.writel(S_MORPH,4,'<IDREF_array id="'+mid+'-morph-targets-array" count="'+str(len(morph_targets)-1)+'">')
-			marr=""
-			warr=""
-			for i in range(len(morph_targets)):
-				if (i==0):
-				    continue
-				elif (i>1):
-					marr+=" "
-
-				if ("skin_id" in morph_targets[i]):
-					marr+=morph_targets[i]["skin_id"]
-				else:
-					marr+=morph_targets[i]["id"]
-
-				warr+=" 0"
-
-			self.writel(S_MORPH,5,marr)
-			self.writel(S_MORPH,4,'</IDREF_array>')
-			self.writel(S_MORPH,4,'<technique_common>')
-			self.writel(S_MORPH,5,'<accessor source="#'+mid+'-morph-targets-array" count="'+str(len(morph_targets)-1)+'" stride="1">')
-			self.writel(S_MORPH,6,'<param name="MORPH_TARGET" type="IDREF"/>')
-			self.writel(S_MORPH,5,'</accessor>')
-			self.writel(S_MORPH,4,'</technique_common>')
-			self.writel(S_MORPH,3,'</source>')
-
-			self.writel(S_MORPH,3,'<source id="'+mid+'-morph-weights">')
-			self.writel(S_MORPH,4,'<float_array id="'+mid+'-morph-weights-array" count="'+str(len(morph_targets)-1)+'" >')
-			self.writel(S_MORPH,5,warr)
-			self.writel(S_MORPH,4,'</float_array>')
-			self.writel(S_MORPH,4,'<technique_common>')
-			self.writel(S_MORPH,5,'<accessor source="#'+mid+'-morph-weights-array" count="'+str(len(morph_targets)-1)+'" stride="1">')
-			self.writel(S_MORPH,6,'<param name="MORPH_WEIGHT" type="float"/>')
-			self.writel(S_MORPH,5,'</accessor>')
-			self.writel(S_MORPH,4,'</technique_common>')
-			self.writel(S_MORPH,3,'</source>')
-
-			self.writel(S_MORPH,3,'<targets>')
-			self.writel(S_MORPH,4,'<input semantic="MORPH_TARGET" source="#'+mid+'-morph-targets"/>')
-			self.writel(S_MORPH,4,'<input semantic="MORPH_WEIGHT" source="#'+mid+'-morph-weights"/>')
-			self.writel(S_MORPH,3,'</targets>')
-			self.writel(S_MORPH,2,'</morph>')
-			self.writel(S_MORPH,1,'</controller>')
-			if (armature!=None):
-
-				self.armature_for_morph[node]=armature
-
-			meshdata={}
-			if (armature):
-				meshdata = morph_targets[0]
-				meshdata["morph_id"]=mid
-			else:
-				meshdata["id"]=morph_targets[0]["id"]
-				meshdata["morph_id"]=mid
-				meshdata["material_assign"]=morph_targets[0]["material_assign"]
-
-
-
-			self.mesh_cache[node.data]=meshdata
-			return meshdata
-
-		apply_modifiers = len(node.modifiers) and self.config["use_mesh_modifiers"]
-
-		name_to_use = mesh.name
-		#print("name to use: "+mesh.name)
-		if (custom_name!=None and custom_name!=""):
-			name_to_use=custom_name
-
-		mesh=node.to_mesh(self.scene,apply_modifiers,"RENDER") #is this allright?
-
-		triangulate=self.config["use_triangles"]
-		if (triangulate):
-			bm = bmesh.new()
-			bm.from_mesh(mesh)
-			bmesh.ops.triangulate(bm, faces=bm.faces)
-			bm.to_mesh(mesh)
-			bm.free()
-
-
-		mesh.update(calc_tessface=True)
-		vertices=[]
-		vertex_map={}
-		surface_indices={}
-		materials={}
-
-		materials={}
-
-		si=None
-		if (armature!=None):
-			si=self.skeleton_info[armature]
-
-		has_uv=False
-		has_uv2=False
-		has_weights=armature!=None
-		has_tangents=self.config["use_tangent_arrays"] # could detect..
-		has_colors=len(mesh.vertex_colors)
-		mat_assign=[]
-
-		uv_layer_count=len(mesh.uv_textures)
-		if (has_tangents and len(mesh.uv_textures)):
-			try:
-				mesh.calc_tangents()
-			except:
-				self.operator.report({'WARNING'},'CalcTangets failed for mesh "'+mesh.name+'", no tangets will be exported.')
-				#uv_layer_count=0
-				mesh.calc_normals_split()
-				has_tangents=False
-
-		else:
-			mesh.calc_normals_split()
-			has_tangents=False
-
-
-		for fi in range(len(mesh.polygons)):
-			f=mesh.polygons[fi]
-
-			if (not (f.material_index in surface_indices)):
-				surface_indices[f.material_index]=[]
-				#print("Type: "+str(type(f.material_index)))
-				#print("IDX: "+str(f.material_index)+"/"+str(len(mesh.materials)))
-
-				try:
-					#Bizarre blender behavior i don't understand, so catching exception
-					mat = mesh.materials[f.material_index]
-				except:
-					mat= None
-
-				if (mat!=None):
-					materials[f.material_index]=self.export_material( mat,mesh.show_double_sided )
-				else:
-					materials[f.material_index]=None #weird, has no material?
-
-			indices = surface_indices[f.material_index]
-			vi=[]
-			#vertices always 3
-			"""
-			if (len(f.vertices)==3):
-				vi.append(0)
-				vi.append(1)
-				vi.append(2)
-			elif (len(f.vertices)==4):
-				#todo, should use shortest path
-				vi.append(0)
-				vi.append(1)
-				vi.append(2)
-				vi.append(0)
-				vi.append(2)
-				vi.append(3)
-			"""
-
-			for lt in range(f.loop_total):
-				loop_index = f.loop_start + lt
-				ml = mesh.loops[loop_index]
-				mv = mesh.vertices[ml.vertex_index]
-
-				v = self.Vertex()
-				v.vertex = Vector( mv.co )
-
-				for xt in mesh.uv_layers:
-					v.uv.append( Vector( xt.data[loop_index].uv ) )
-
-				if (has_colors):
-					v.color = Vector( mesh.vertex_colors[0].data[loop_index].color )
-
-				v.normal = Vector( ml.normal )
-
-				if (has_tangents):
-					v.tangent = Vector( ml.tangent )
-					v.bitangent = Vector( ml.bitangent )
-
-
-			       # if (armature):
-			       #         v.vertex = node.matrix_world * v.vertex
-
-				#v.color=Vertex(mv. ???
-
-				if (armature!=None):
-					wsum=0.0
-					zero_bones=[]
-
-					for vg in mv.groups:
-						if vg.group >= len(node.vertex_groups):
-							continue;
-						name = node.vertex_groups[vg.group].name
-
-						if (name in si["bone_index"]):
-							#could still put the weight as 0.0001 maybe
-							if (vg.weight>0.001): #blender has a lot of zero weight stuff
-								v.bones.append(si["bone_index"][name])
-								v.weights.append(vg.weight)
-								wsum+=vg.weight
-					if (wsum==0.0):
-						if not self.wrongvtx_report:
-							self.operator.report({'WARNING'},'Mesh for object "'+node.name+'" has unassigned weights. This may look wrong in exported model.')
-							self.wrongvtx_report=True
-
-						#blender can have bones assigned that weight zero so they remain local
-						#this is the best it can be done?
-						v.bones.append(0)
-						v.weights.append(1)
-
-
-
-
-				tup = v.get_tup()
-				idx = 0
-				if (skeyindex==-1 and tup in vertex_map): #do not optmize if using shapekeys
-					idx = vertex_map[tup]
-				else:
-					idx = len(vertices)
-					vertices.append(v)
-					vertex_map[tup]=idx
-
-				vi.append(idx)
-
-			if (len(vi)>2):
-				#only triangles and above
-				indices.append(vi)
-
-
-		meshid = self.new_id("mesh")
-		self.writel(S_GEOM,1,'<geometry id="'+meshid+'" name="'+name_to_use+'">')
-
-		self.writel(S_GEOM,2,'<mesh>')
-
-
-		# Vertex Array
-		self.writel(S_GEOM,3,'<source id="'+meshid+'-positions">')
-		float_values=""
-		for v in vertices:
-			 float_values+=" "+str(v.vertex.x)+" "+str(v.vertex.y)+" "+str(v.vertex.z)
-		self.writel(S_GEOM,4,'<float_array id="'+meshid+'-positions-array" count="'+str(len(vertices)*3)+'">'+float_values+'</float_array>')
-		self.writel(S_GEOM,4,'<technique_common>')
-		self.writel(S_GEOM,4,'<accessor source="#'+meshid+'-positions-array" count="'+str(len(vertices))+'" stride="3">')
-		self.writel(S_GEOM,5,'<param name="X" type="float"/>')
-		self.writel(S_GEOM,5,'<param name="Y" type="float"/>')
-		self.writel(S_GEOM,5,'<param name="Z" type="float"/>')
-		self.writel(S_GEOM,4,'</accessor>')
-		self.writel(S_GEOM,4,'</technique_common>')
-		self.writel(S_GEOM,3,'</source>')
-
-		# Normal Array
-
-		self.writel(S_GEOM,3,'<source id="'+meshid+'-normals">')
-		float_values=""
-		for v in vertices:
-			 float_values+=" "+str(v.normal.x)+" "+str(v.normal.y)+" "+str(v.normal.z)
-		self.writel(S_GEOM,4,'<float_array id="'+meshid+'-normals-array" count="'+str(len(vertices)*3)+'">'+float_values+'</float_array>')
-		self.writel(S_GEOM,4,'<technique_common>')
-		self.writel(S_GEOM,4,'<accessor source="#'+meshid+'-normals-array" count="'+str(len(vertices))+'" stride="3">')
-		self.writel(S_GEOM,5,'<param name="X" type="float"/>')
-		self.writel(S_GEOM,5,'<param name="Y" type="float"/>')
-		self.writel(S_GEOM,5,'<param name="Z" type="float"/>')
-		self.writel(S_GEOM,4,'</accessor>')
-		self.writel(S_GEOM,4,'</technique_common>')
-		self.writel(S_GEOM,3,'</source>')
-
-		if (has_tangents):
-			self.writel(S_GEOM,3,'<source id="'+meshid+'-tangents">')
-			float_values=""
-			for v in vertices:
-				float_values+=" "+str(v.tangent.x)+" "+str(v.tangent.y)+" "+str(v.tangent.z)
-			self.writel(S_GEOM,4,'<float_array id="'+meshid+'-tangents-array" count="'+str(len(vertices)*3)+'">'+float_values+'</float_array>')
-			self.writel(S_GEOM,4,'<technique_common>')
-			self.writel(S_GEOM,4,'<accessor source="#'+meshid+'-tangents-array" count="'+str(len(vertices))+'" stride="3">')
-			self.writel(S_GEOM,5,'<param name="X" type="float"/>')
-			self.writel(S_GEOM,5,'<param name="Y" type="float"/>')
-			self.writel(S_GEOM,5,'<param name="Z" type="float"/>')
-			self.writel(S_GEOM,4,'</accessor>')
-			self.writel(S_GEOM,4,'</technique_common>')
-			self.writel(S_GEOM,3,'</source>')
-
-			self.writel(S_GEOM,3,'<source id="'+meshid+'-bitangents">')
-			float_values=""
-			for v in vertices:
-				float_values+=" "+str(v.bitangent.x)+" "+str(v.bitangent.y)+" "+str(v.bitangent.z)
-			self.writel(S_GEOM,4,'<float_array id="'+meshid+'-bitangents-array" count="'+str(len(vertices)*3)+'">'+float_values+'</float_array>')
-			self.writel(S_GEOM,4,'<technique_common>')
-			self.writel(S_GEOM,4,'<accessor source="#'+meshid+'-bitangents-array" count="'+str(len(vertices))+'" stride="3">')
-			self.writel(S_GEOM,5,'<param name="X" type="float"/>')
-			self.writel(S_GEOM,5,'<param name="Y" type="float"/>')
-			self.writel(S_GEOM,5,'<param name="Z" type="float"/>')
-			self.writel(S_GEOM,4,'</accessor>')
-			self.writel(S_GEOM,4,'</technique_common>')
-			self.writel(S_GEOM,3,'</source>')
-
-
-
-		# UV Arrays
-
-		for uvi in range(uv_layer_count):
-
-			self.writel(S_GEOM,3,'<source id="'+meshid+'-texcoord-'+str(uvi)+'">')
-			float_values=""
-			for v in vertices:
-				try:
-					float_values+=" "+str(v.uv[uvi].x)+" "+str(v.uv[uvi].y)
-				except:
-					# I don't understand this weird multi-uv-layer API, but with this it seems to works
-					float_values+=" 0 0 "
-
-			self.writel(S_GEOM,4,'<float_array id="'+meshid+'-texcoord-'+str(uvi)+'-array" count="'+str(len(vertices)*2)+'">'+float_values+'</float_array>')
-			self.writel(S_GEOM,4,'<technique_common>')
-			self.writel(S_GEOM,4,'<accessor source="#'+meshid+'-texcoord-'+str(uvi)+'-array" count="'+str(len(vertices))+'" stride="2">')
-			self.writel(S_GEOM,5,'<param name="S" type="float"/>')
-			self.writel(S_GEOM,5,'<param name="T" type="float"/>')
-			self.writel(S_GEOM,4,'</accessor>')
-			self.writel(S_GEOM,4,'</technique_common>')
-			self.writel(S_GEOM,3,'</source>')
-
-		# Color Arrays
-
-		if (has_colors):
-			self.writel(S_GEOM,3,'<source id="'+meshid+'-colors">')
-			float_values=""
-			for v in vertices:
-				float_values+=" "+str(v.color.x)+" "+str(v.color.y)+" "+str(v.color.z)
-			self.writel(S_GEOM,4,'<float_array id="'+meshid+'-colors-array" count="'+str(len(vertices)*3)+'">'+float_values+'</float_array>')
-			self.writel(S_GEOM,4,'<technique_common>')
-			self.writel(S_GEOM,4,'<accessor source="#'+meshid+'-colors-array" count="'+str(len(vertices))+'" stride="3">')
-			self.writel(S_GEOM,5,'<param name="X" type="float"/>')
-			self.writel(S_GEOM,5,'<param name="Y" type="float"/>')
-			self.writel(S_GEOM,5,'<param name="Z" type="float"/>')
-			self.writel(S_GEOM,4,'</accessor>')
-			self.writel(S_GEOM,4,'</technique_common>')
-			self.writel(S_GEOM,3,'</source>')
-
-		# Triangle Lists
-		self.writel(S_GEOM,3,'<vertices id="'+meshid+'-vertices">')
-		self.writel(S_GEOM,4,'<input semantic="POSITION" source="#'+meshid+'-positions"/>')
-		self.writel(S_GEOM,3,'</vertices>')
-
-		prim_type=""
-		if (triangulate):
-			prim_type="triangles"
-		else:
-			prim_type="polygons"
-
-
-		for m in surface_indices:
-			indices = surface_indices[m]
-			mat = materials[m]
-
-			if (mat!=None):
-				matref = self.new_id("trimat")
-				self.writel(S_GEOM,3,'<'+prim_type+' count="'+str(int(len(indices)))+'" material="'+matref+'">') # todo material
-				mat_assign.append( (mat,matref) )
-			else:
-				self.writel(S_GEOM,3,'<'+prim_type+' count="'+str(int(len(indices)))+'">') # todo material
-
-
-			self.writel(S_GEOM,4,'<input semantic="VERTEX" source="#'+meshid+'-vertices" offset="0"/>')
-			self.writel(S_GEOM,4,'<input semantic="NORMAL" source="#'+meshid+'-normals" offset="0"/>')
-
-			for uvi in range(uv_layer_count):
-				self.writel(S_GEOM,4,'<input semantic="TEXCOORD" source="#'+meshid+'-texcoord-'+str(uvi)+'" offset="0" set="'+str(uvi)+'"/>')
-
-			if (has_colors):
-				self.writel(S_GEOM,4,'<input semantic="COLOR" source="#'+meshid+'-colors" offset="0"/>')
-			if (has_tangents):
-				self.writel(S_GEOM,4,'<input semantic="TEXTANGENT" source="#'+meshid+'-tangents" offset="0"/>')
-				self.writel(S_GEOM,4,'<input semantic="TEXBINORMAL" source="#'+meshid+'-bitangents" offset="0"/>')
-
-			if (triangulate):
-				int_values="<p>"
-				for p in indices:
-					for i in p:
-						int_values+=" "+str(i)
-				int_values+=" </p>"
-				self.writel(S_GEOM,4,int_values)
-			else:
-				for p in indices:
-					int_values="<p>"
-					for i in p:
-						int_values+=" "+str(i)
-					int_values+=" </p>"
-					self.writel(S_GEOM,4,int_values)
-
-			self.writel(S_GEOM,3,'</'+prim_type+'>')
-
-
-		self.writel(S_GEOM,2,'</mesh>')
-		self.writel(S_GEOM,1,'</geometry>')
-
-
-		meshdata={}
-		meshdata["id"]=meshid
-		meshdata["material_assign"]=mat_assign
-		if (skeyindex==-1):
-			self.mesh_cache[node.data]=meshdata
-
-
-		# Export armature data (if armature exists)
-
-		if (armature!=None and (skel_source!=None or skeyindex==-1)):
-
-			contid = self.new_id("controller")
-
-			self.writel(S_SKIN,1,'<controller id="'+contid+'">')
-			if (skel_source!=None):
-				self.writel(S_SKIN,2,'<skin source="#'+skel_source+'">')
-			else:
-				self.writel(S_SKIN,2,'<skin source="#'+meshid+'">')
-
-			self.writel(S_SKIN,3,'<bind_shape_matrix>'+strmtx(node.matrix_world)+'</bind_shape_matrix>')
-			#Joint Names
-			self.writel(S_SKIN,3,'<source id="'+contid+'-joints">')
-			name_values=""
-			for v in si["bone_names"]:
-				name_values+=" "+v
-
-			self.writel(S_SKIN,4,'<Name_array id="'+contid+'-joints-array" count="'+str(len(si["bone_names"]))+'">'+name_values+'</Name_array>')
-			self.writel(S_SKIN,4,'<technique_common>')
-			self.writel(S_SKIN,4,'<accessor source="#'+contid+'-joints-array" count="'+str(len(si["bone_names"]))+'" stride="1">')
-			self.writel(S_SKIN,5,'<param name="JOINT" type="Name"/>')
-			self.writel(S_SKIN,4,'</accessor>')
-			self.writel(S_SKIN,4,'</technique_common>')
-			self.writel(S_SKIN,3,'</source>')
-			#Pose Matrices!
-			self.writel(S_SKIN,3,'<source id="'+contid+'-bind_poses">')
-			pose_values=""
-			for v in si["bone_bind_poses"]:
-				pose_values+=" "+strmtx(v)
-
-			self.writel(S_SKIN,4,'<float_array id="'+contid+'-bind_poses-array" count="'+str(len(si["bone_bind_poses"])*16)+'">'+pose_values+'</float_array>')
-			self.writel(S_SKIN,4,'<technique_common>')
-			self.writel(S_SKIN,4,'<accessor source="#'+contid+'-bind_poses-array" count="'+str(len(si["bone_bind_poses"]))+'" stride="16">')
-			self.writel(S_SKIN,5,'<param name="TRANSFORM" type="float4x4"/>')
-			self.writel(S_SKIN,4,'</accessor>')
-			self.writel(S_SKIN,4,'</technique_common>')
-			self.writel(S_SKIN,3,'</source>')
-			#Skin Weights!
-			self.writel(S_SKIN,3,'<source id="'+contid+'-skin_weights">')
-			skin_weights=""
-			skin_weights_total=0
-			for v in vertices:
-				skin_weights_total+=len(v.weights)
-				for w in v.weights:
-					skin_weights+=" "+str(w)
-
-			self.writel(S_SKIN,4,'<float_array id="'+contid+'-skin_weights-array" count="'+str(skin_weights_total)+'">'+skin_weights+'</float_array>')
-			self.writel(S_SKIN,4,'<technique_common>')
-			self.writel(S_SKIN,4,'<accessor source="#'+contid+'-skin_weights-array" count="'+str(skin_weights_total)+'" stride="1">')
-			self.writel(S_SKIN,5,'<param name="WEIGHT" type="float"/>')
-			self.writel(S_SKIN,4,'</accessor>')
-			self.writel(S_SKIN,4,'</technique_common>')
-			self.writel(S_SKIN,3,'</source>')
-
-
-			self.writel(S_SKIN,3,'<joints>')
-			self.writel(S_SKIN,4,'<input semantic="JOINT" source="#'+contid+'-joints"/>')
-			self.writel(S_SKIN,4,'<input semantic="INV_BIND_MATRIX" source="#'+contid+'-bind_poses"/>')
-			self.writel(S_SKIN,3,'</joints>')
-			self.writel(S_SKIN,3,'<vertex_weights count="'+str(len(vertices))+'">')
-			self.writel(S_SKIN,4,'<input semantic="JOINT" source="#'+contid+'-joints" offset="0"/>')
-			self.writel(S_SKIN,4,'<input semantic="WEIGHT" source="#'+contid+'-skin_weights" offset="1"/>')
-			vcounts=""
-			vs=""
-			vcount=0
-			for v in vertices:
-				vcounts+=" "+str(len(v.weights))
-				for b in v.bones:
-					vs+=" "+str(b)
-					vs+=" "+str(vcount)
-					vcount+=1
-			self.writel(S_SKIN,4,'<vcount>'+vcounts+'</vcount>')
-			self.writel(S_SKIN,4,'<v>'+vs+'</v>')
-			self.writel(S_SKIN,3,'</vertex_weights>')
-
-
-			self.writel(S_SKIN,2,'</skin>')
-			self.writel(S_SKIN,1,'</controller>')
-			meshdata["skin_id"]=contid
-
-
-		return meshdata
-
-
-	def export_mesh_node(self,node,il):
-
-		if (node.data==None):
-			return
-		armature=None
-		armcount=0
-		for n in node.modifiers:
-			if (n.type=="ARMATURE"):
-				armcount+=1
-
-		if (node.parent!=None):
-			if (node.parent.type=="ARMATURE"):
-				armature=node.parent
-				if (armcount>1):
-					self.operator.report({'WARNING'},'Object "'+node.name+'" refers to more than one armature! This is unsupported.')
-				if (armcount==0):
-					self.operator.report({'WARNING'},'Object "'+node.name+'" is child of an armature, but has no armature modifier.')
-
-
-		if (armcount>0 and not armature):
-			self.operator.report({'WARNING'},'Object "'+node.name+'" has armature modifier, but is not a child of an armature. This is unsupported.')
-
-
-		if (node.data.shape_keys!=None):
-				sk = node.data.shape_keys
-				if (sk.animation_data):
-					#print("HAS ANIM")
-					#print("DRIVERS: "+str(len(sk.animation_data.drivers)))
-					for d in sk.animation_data.drivers:
-						if (d.driver):
-							for v in d.driver.variables:
-								for t in v.targets:
-									if (t.id!=None and t.id.name in self.scene.objects):
-										#print("LINKING "+str(node)+" WITH "+str(t.id.name))
-										self.armature_for_morph[node]=self.scene.objects[t.id.name]
-
-
-		meshdata = self.export_mesh(node,armature)
-		close_controller=False
-
-		if ("skin_id" in meshdata):
-			close_controller=True
-			self.writel(S_NODES,il,'<instance_controller url="#'+meshdata["skin_id"]+'">')
-			for sn in self.skeleton_info[armature]["skeleton_nodes"]:
-				self.writel(S_NODES,il+1,'<skeleton>#'+sn+'</skeleton>')
-		elif ("morph_id" in meshdata):
-			self.writel(S_NODES,il,'<instance_controller url="#'+meshdata["morph_id"]+'">')
-			close_controller=True
-		elif (armature==None):
-			self.writel(S_NODES,il,'<instance_geometry url="#'+meshdata["id"]+'">')
-
-
-		if (len(meshdata["material_assign"])>0):
-
-			self.writel(S_NODES,il+1,'<bind_material>')
-			self.writel(S_NODES,il+2,'<technique_common>')
-			for m in meshdata["material_assign"]:
-				self.writel(S_NODES,il+3,'<instance_material symbol="'+m[1]+'" target="#'+m[0]+'"/>')
-
-			self.writel(S_NODES,il+2,'</technique_common>')
-			self.writel(S_NODES,il+1,'</bind_material>')
-
-		if (close_controller):
-			self.writel(S_NODES,il,'</instance_controller>')
-		else:
-			self.writel(S_NODES,il,'</instance_geometry>')
-
-
-	def export_armature_bone(self,bone,il,si):
-		boneid = self.new_id("bone")
-		boneidx = si["bone_count"]
-		si["bone_count"]+=1
-		bonesid = si["id"]+"-"+str(boneidx)
-		if (bone.name in self.used_bones):
-			if (self.config["use_anim_action_all"]):
-				self.operator.report({'WARNING'},'Bone name "'+bone.name+'" used in more than one skeleton. Actions might export wrong.')
-		else:
-			self.used_bones.append(bone.name)
-
-		si["bone_index"][bone.name]=boneidx
-		si["bone_ids"][bone]=boneid
-		si["bone_names"].append(bonesid)
-		self.writel(S_NODES,il,'<node id="'+boneid+'" sid="'+bonesid+'" name="'+bone.name+'" type="JOINT">')
-		il+=1
-		xform = bone.matrix_local
-		si["bone_bind_poses"].append((si["armature_xform"] * xform).inverted())
-
-		if (bone.parent!=None):
-			xform = bone.parent.matrix_local.inverted() * xform
-		else:
-			si["skeleton_nodes"].append(boneid)
-
-		self.writel(S_NODES,il,'<matrix sid="transform">'+strmtx(xform)+'</matrix>')
-		for c in bone.children:
-			self.export_armature_bone(c,il,si)
-		il-=1
-		self.writel(S_NODES,il,'</node>')
-
-
-	def export_armature_node(self,node,il):
-
-		if (node.data==None):
-			return
-
-		self.skeletons.append(node)
-
-		armature = node.data
-		self.skeleton_info[node]={ "bone_count":0, "id":self.new_id("skelbones"),"name":node.name, "bone_index":{},"bone_ids":{},"bone_names":[],"bone_bind_poses":[],"skeleton_nodes":[],"armature_xform":node.matrix_world }
-
-
-
-		for b in armature.bones:
-			if (b.parent!=None):
-				continue
-			self.export_armature_bone(b,il,self.skeleton_info[node])
-
-		if (node.pose):
-			for b in node.pose.bones:
-				for x in b.constraints:
-					if (x.type=='ACTION'):
-						self.action_constraints.append(x.action)
-
-
-	def export_camera_node(self,node,il):
-
-		if (node.data==None):
-			return
-
-		camera=node.data
-		camid=self.new_id("camera")
-		self.writel(S_CAMS,1,'<camera id="'+camid+'" name="'+camera.name+'">')
-		self.writel(S_CAMS,2,'<optics>')
-		self.writel(S_CAMS,3,'<technique_common>')
-		if (camera.type=="PERSP"):
-			self.writel(S_CAMS,4,'<perspective>')
-			self.writel(S_CAMS,5,'<yfov> '+str(math.degrees(camera.angle))+' </yfov>') # I think?
-			self.writel(S_CAMS,5,'<aspect_ratio> '+str(self.scene.render.resolution_x / self.scene.render.resolution_y)+' </aspect_ratio>')
-			self.writel(S_CAMS,5,'<znear> '+str(camera.clip_start)+' </znear>')
-			self.writel(S_CAMS,5,'<zfar> '+str(camera.clip_end)+' </zfar>')
-			self.writel(S_CAMS,4,'</perspective>')
-		else:
-			self.writel(S_CAMS,4,'<orthographic>')
-			self.writel(S_CAMS,5,'<xmag> '+str(camera.ortho_scale*0.5)+' </xmag>') # I think?
-			self.writel(S_CAMS,5,'<aspect_ratio> '+str(self.scene.render.resolution_x / self.scene.render.resolution_y)+' </aspect_ratio>')
-			self.writel(S_CAMS,5,'<znear> '+str(camera.clip_start)+' </znear>')
-			self.writel(S_CAMS,5,'<zfar> '+str(camera.clip_end)+' </zfar>')
-			self.writel(S_CAMS,4,'</orthographic>')
-
-		self.writel(S_CAMS,3,'</technique_common>')
-		self.writel(S_CAMS,2,'</optics>')
-		self.writel(S_CAMS,1,'</camera>')
-
-
-		self.writel(S_NODES,il,'<instance_camera url="#'+camid+'"/>')
-
-	def export_lamp_node(self,node,il):
-
-		if (node.data==None):
-			return
-
-		light=node.data
-		lightid=self.new_id("light")
-		self.writel(S_LAMPS,1,'<light id="'+lightid+'" name="'+light.name+'">')
-		#self.writel(S_LAMPS,2,'<optics>')
-		self.writel(S_LAMPS,3,'<technique_common>')
-
-		if (light.type=="POINT"):
-			self.writel(S_LAMPS,4,'<point>')
-			self.writel(S_LAMPS,5,'<color>'+strarr(light.color)+'</color>')
-			att_by_distance = 2.0 / light.distance # convert to linear attenuation
-			self.writel(S_LAMPS,5,'<linear_attenuation>'+str(att_by_distance)+'</linear_attenuation>')
-			if (light.use_sphere):
-				self.writel(S_LAMPS,5,'<zfar>'+str(light.distance)+'</zfar>')
-
-			self.writel(S_LAMPS,4,'</point>')
-		elif (light.type=="SPOT"):
-			self.writel(S_LAMPS,4,'<spot>')
-			self.writel(S_LAMPS,5,'<color>'+strarr(light.color)+'</color>')
-			att_by_distance = 2.0 / light.distance # convert to linear attenuation
-			self.writel(S_LAMPS,5,'<linear_attenuation>'+str(att_by_distance)+'</linear_attenuation>')
-			self.writel(S_LAMPS,5,'<falloff_angle>'+str(math.degrees(light.spot_size/2))+'</falloff_angle>')
-			self.writel(S_LAMPS,4,'</spot>')
-
-
-		else: #write a sun lamp for everything else (not supported)
-			self.writel(S_LAMPS,4,'<directional>')
-			self.writel(S_LAMPS,5,'<color>'+strarr(light.color)+'</color>')
-			self.writel(S_LAMPS,4,'</directional>')
-
-
-		self.writel(S_LAMPS,3,'</technique_common>')
-		#self.writel(S_LAMPS,2,'</optics>')
-		self.writel(S_LAMPS,1,'</light>')
-
-
-		self.writel(S_NODES,il,'<instance_light url="#'+lightid+'"/>')
-
-	def export_empty_node(self,node,il):
-
-		self.writel(S_NODES,4,'<extra>')
-		self.writel(S_NODES,5,'<technique profile="GODOT">')
-		self.writel(S_NODES,6,'<empty_draw_type>'+node.empty_draw_type+'</empty_draw_type>')
-		self.writel(S_NODES,5,'</technique>')
-		self.writel(S_NODES,4,'</extra>')
-
-
-	def export_curve(self,curve):
-
-		splineid = self.new_id("spline")
-
-		self.writel(S_GEOM,1,'<geometry id="'+splineid+'" name="'+curve.name+'">')
-		self.writel(S_GEOM,2,'<spline closed="0">')
-
-		points=[]
-		interps=[]
-		handles_in=[]
-		handles_out=[]
-		tilts=[]
-
-		for cs in curve.splines:
-
-			if (cs.type=="BEZIER"):
-				for s in cs.bezier_points:
-					points.append(s.co[0])
-					points.append(s.co[1])
-					points.append(s.co[2])
-
-
-					handles_in.append(s.handle_left[0])
-					handles_in.append(s.handle_left[1])
-					handles_in.append(s.handle_left[2])
-
-					handles_out.append(s.handle_right[0])
-					handles_out.append(s.handle_right[1])
-					handles_out.append(s.handle_right[2])
-
-
-					tilts.append(s.tilt)
-					interps.append("BEZIER")
-			else:
-
-				for s in cs.points:
-					points.append(s.co[0])
-					points.append(s.co[1])
-					points.append(s.co[2])
-					handles_in.append(s.co[0])
-					handles_in.append(s.co[1])
-					handles_in.append(s.co[2])
-					handles_out.append(s.co[0])
-					handles_out.append(s.co[1])
-					handles_out.append(s.co[2])
-					tilts.append(s.tilt)
-					interps.append("LINEAR")
-
-
-
-
-		self.writel(S_GEOM,3,'<source id="'+splineid+'-positions">')
-		position_values=""
-		for x in points:
-			position_values+=" "+str(x)
-		self.writel(S_GEOM,4,'<float_array id="'+splineid+'-positions-array" count="'+str(len(points))+'">'+position_values+'</float_array>')
-		self.writel(S_GEOM,4,'<technique_common>')
-		self.writel(S_GEOM,4,'<accessor source="#'+splineid+'-positions-array" count="'+str(len(points)/3)+'" stride="3">')
-		self.writel(S_GEOM,5,'<param name="X" type="float"/>')
-		self.writel(S_GEOM,5,'<param name="Y" type="float"/>')
-		self.writel(S_GEOM,5,'<param name="Z" type="float"/>')
-		self.writel(S_GEOM,4,'</accessor>')
-		self.writel(S_GEOM,3,'</source>')
-
-		self.writel(S_GEOM,3,'<source id="'+splineid+'-intangents">')
-		intangent_values=""
-		for x in handles_in:
-			intangent_values+=" "+str(x)
-		self.writel(S_GEOM,4,'<float_array id="'+splineid+'-intangents-array" count="'+str(len(points))+'">'+intangent_values+'</float_array>')
-		self.writel(S_GEOM,4,'<technique_common>')
-		self.writel(S_GEOM,4,'<accessor source="#'+splineid+'-intangents-array" count="'+str(len(points)/3)+'" stride="3">')
-		self.writel(S_GEOM,5,'<param name="X" type="float"/>')
-		self.writel(S_GEOM,5,'<param name="Y" type="float"/>')
-		self.writel(S_GEOM,5,'<param name="Z" type="float"/>')
-		self.writel(S_GEOM,4,'</accessor>')
-		self.writel(S_GEOM,3,'</source>')
-
-		self.writel(S_GEOM,3,'<source id="'+splineid+'-outtangents">')
-		outtangent_values=""
-		for x in handles_out:
-			outtangent_values+=" "+str(x)
-		self.writel(S_GEOM,4,'<float_array id="'+splineid+'-outtangents-array" count="'+str(len(points))+'">'+outtangent_values+'</float_array>')
-		self.writel(S_GEOM,4,'<technique_common>')
-		self.writel(S_GEOM,4,'<accessor source="#'+splineid+'-outtangents-array" count="'+str(len(points)/3)+'" stride="3">')
-		self.writel(S_GEOM,5,'<param name="X" type="float"/>')
-		self.writel(S_GEOM,5,'<param name="Y" type="float"/>')
-		self.writel(S_GEOM,5,'<param name="Z" type="float"/>')
-		self.writel(S_GEOM,4,'</accessor>')
-		self.writel(S_GEOM,3,'</source>')
-
-		self.writel(S_GEOM,3,'<source id="'+splineid+'-interpolations">')
-		interpolation_values=""
-		for x in interps:
-			interpolation_values+=" "+x
-		self.writel(S_GEOM,4,'<Name_array id="'+splineid+'-interpolations-array" count="'+str(len(interps))+'">'+interpolation_values+'</Name_array>')
-		self.writel(S_GEOM,4,'<technique_common>')
-		self.writel(S_GEOM,4,'<accessor source="#'+splineid+'-interpolations-array" count="'+str(len(interps))+'" stride="1">')
-		self.writel(S_GEOM,5,'<param name="INTERPOLATION" type="name"/>')
-		self.writel(S_GEOM,4,'</accessor>')
-		self.writel(S_GEOM,3,'</source>')
-
-
-		self.writel(S_GEOM,3,'<source id="'+splineid+'-tilts">')
-		tilt_values=""
-		for x in tilts:
-			tilt_values+=" "+str(x)
-		self.writel(S_GEOM,4,'<float_array id="'+splineid+'-tilts-array" count="'+str(len(tilts))+'">'+tilt_values+'</float_array>')
-		self.writel(S_GEOM,4,'<technique_common>')
-		self.writel(S_GEOM,4,'<accessor source="#'+splineid+'-tilts-array" count="'+str(len(tilts))+'" stride="1">')
-		self.writel(S_GEOM,5,'<param name="TILT" type="float"/>')
-		self.writel(S_GEOM,4,'</accessor>')
-		self.writel(S_GEOM,3,'</source>')
-
-		self.writel(S_GEOM,3,'<control_vertices>')
-		self.writel(S_GEOM,4,'<input semantic="POSITION" source="#'+splineid+'-positions"/>')
-		self.writel(S_GEOM,4,'<input semantic="IN_TANGENT" source="#'+splineid+'-intangents"/>')
-		self.writel(S_GEOM,4,'<input semantic="OUT_TANGENT" source="#'+splineid+'-outtangents"/>')
-		self.writel(S_GEOM,4,'<input semantic="INTERPOLATION" source="#'+splineid+'-interpolations"/>')
-		self.writel(S_GEOM,4,'<input semantic="TILT" source="#'+splineid+'-tilts"/>')
-		self.writel(S_GEOM,3,'</control_vertices>')
-
-
-		self.writel(S_GEOM,2,'</spline>')
-		self.writel(S_GEOM,1,'</geometry>')
-
-		return splineid
-
-	def export_curve_node(self,node,il):
-
-		if (node.data==None):
-			return
-		curveid = self.export_curve(node.data)
-
-		self.writel(S_NODES,il,'<instance_geometry url="#'+curveid+'">')
-		self.writel(S_NODES,il,'</instance_geometry>')
-
-
-
-	def export_node(self,node,il):
-		if (not node in self.valid_nodes):
-			return
-		prev_node = bpy.context.scene.objects.active
-		bpy.context.scene.objects.active = node
-
-		self.writel(S_NODES,il,'<node id="'+self.validate_id(node.name)+'" name="'+node.name+'" type="NODE">')
-		il+=1
-
-		self.writel(S_NODES,il,'<matrix sid="transform">'+strmtx(node.matrix_local)+'</matrix>')
-		#print("NODE TYPE: "+node.type+" NAME: "+node.name)
-		if (node.type=="MESH"):
-			self.export_mesh_node(node,il)
-		elif (node.type=="CURVE"):
-			self.export_curve_node(node,il)
-		elif (node.type=="ARMATURE"):
-			self.export_armature_node(node,il)
-		elif (node.type=="CAMERA"):
-			self.export_camera_node(node,il)
-		elif (node.type=="LAMP"):
-			self.export_lamp_node(node,il)
-		elif (node.type=="EMPTY"):
-			self.export_empty_node(node,il)
-
-		for x in node.children:
-			self.export_node(x,il)
-
-		il-=1
-		self.writel(S_NODES,il,'</node>')
-		bpy.context.scene.objects.active = prev_node #make previous node active again
-
-	def is_node_valid(self,node):
-		if (not node.type in self.config["object_types"]):
-			return False
-		if (self.config["use_active_layers"]):
-			valid=False
-			#print("NAME: "+node.name)
-			for i in range(20):
-				if (node.layers[i] and  self.scene.layers[i]):
-					valid=True
-					break
-			if (not valid):
-				return False
-
-		if (self.config["use_export_selected"] and not node.select):
-			return False
-
-		return True
-
-
-	def export_scene(self):
-
-
-		self.writel(S_NODES,0,'<library_visual_scenes>')
-		self.writel(S_NODES,1,'<visual_scene id="'+self.scene_name+'" name="scene">')
-
-		#validate nodes
-		for obj in self.scene.objects:
-			if (obj in self.valid_nodes):
-				continue
-			if (self.is_node_valid(obj)):
-				n = obj
-				while (n!=None):
-					if (not n in self.valid_nodes):
-						self.valid_nodes.append(n)
-					n=n.parent
-
-
-
-		for obj in self.scene.objects:
-			if (obj in self.valid_nodes and obj.parent==None):
-				self.export_node(obj,2)
-
-		self.writel(S_NODES,1,'</visual_scene>')
-		self.writel(S_NODES,0,'</library_visual_scenes>')
-
-	def export_asset(self):
-
-
-		self.writel(S_ASSET,0,'<asset>')
-		# Why is this time stuff mandatory?, no one could care less...
-		self.writel(S_ASSET,1,'<contributor>')
-		self.writel(S_ASSET,2,'<author> Anonymous </author>') #Who made Collada, the FBI ?
-		self.writel(S_ASSET,2,'<authoring_tool> Collada Exporter for Blender 2.6+, by Juan Linietsky (juan@codenix.com) </authoring_tool>') #Who made Collada, the FBI ?
-		self.writel(S_ASSET,1,'</contributor>')
-		self.writel(S_ASSET,1,'<created>'+time.strftime("%Y-%m-%dT%H:%M:%SZ     ")+'</created>')
-		self.writel(S_ASSET,1,'<modified>'+time.strftime("%Y-%m-%dT%H:%M:%SZ")+'</modified>')
-		self.writel(S_ASSET,1,'<unit meter="1.0" name="meter"/>')
-		self.writel(S_ASSET,1,'<up_axis>Z_UP</up_axis>')
-		self.writel(S_ASSET,0,'</asset>')
-
-
-	def export_animation_transform_channel(self,target,keys,matrices=True):
-
-		frame_total=len(keys)
-		anim_id=self.new_id("anim")
-		self.writel(S_ANIM,1,'<animation id="'+anim_id+'">')
-		source_frames = ""
-		source_transforms = ""
-		source_interps = ""
-
-		for k in keys:
-			source_frames += " "+str(k[0])
-			if (matrices):
-				source_transforms += " "+strmtx(k[1])
-			else:
-				source_transforms += " "+str(k[1])
-
-			source_interps +=" LINEAR"
-
-
-		# Time Source
-		self.writel(S_ANIM,2,'<source id="'+anim_id+'-input">')
-		self.writel(S_ANIM,3,'<float_array id="'+anim_id+'-input-array" count="'+str(frame_total)+'">'+source_frames+'</float_array>')
-		self.writel(S_ANIM,3,'<technique_common>')
-		self.writel(S_ANIM,4,'<accessor source="#'+anim_id+'-input-array" count="'+str(frame_total)+'" stride="1">')
-		self.writel(S_ANIM,5,'<param name="TIME" type="float"/>')
-		self.writel(S_ANIM,4,'</accessor>')
-		self.writel(S_ANIM,3,'</technique_common>')
-		self.writel(S_ANIM,2,'</source>')
-
-		if (matrices):
-			# Transform Source
-			self.writel(S_ANIM,2,'<source id="'+anim_id+'-transform-output">')
-			self.writel(S_ANIM,3,'<float_array id="'+anim_id+'-transform-output-array" count="'+str(frame_total*16)+'">'+source_transforms+'</float_array>')
-			self.writel(S_ANIM,3,'<technique_common>')
-			self.writel(S_ANIM,4,'<accessor source="#'+anim_id+'-transform-output-array" count="'+str(frame_total)+'" stride="16">')
-			self.writel(S_ANIM,5,'<param name="TRANSFORM" type="float4x4"/>')
-			self.writel(S_ANIM,4,'</accessor>')
-			self.writel(S_ANIM,3,'</technique_common>')
-			self.writel(S_ANIM,2,'</source>')
-		else:
-			# Value Source
-			self.writel(S_ANIM,2,'<source id="'+anim_id+'-transform-output">')
-			self.writel(S_ANIM,3,'<float_array id="'+anim_id+'-transform-output-array" count="'+str(frame_total)+'">'+source_transforms+'</float_array>')
-			self.writel(S_ANIM,3,'<technique_common>')
-			self.writel(S_ANIM,4,'<accessor source="#'+anim_id+'-transform-output-array" count="'+str(frame_total)+'" stride="1">')
-			self.writel(S_ANIM,5,'<param name="X" type="float"/>')
-			self.writel(S_ANIM,4,'</accessor>')
-			self.writel(S_ANIM,3,'</technique_common>')
-			self.writel(S_ANIM,2,'</source>')
-
-		# Interpolation Source
-		self.writel(S_ANIM,2,'<source id="'+anim_id+'-interpolation-output">')
-		self.writel(S_ANIM,3,'<Name_array id="'+anim_id+'-interpolation-output-array" count="'+str(frame_total)+'">'+source_interps+'</Name_array>')
-		self.writel(S_ANIM,3,'<technique_common>')
-		self.writel(S_ANIM,4,'<accessor source="#'+anim_id+'-interpolation-output-array" count="'+str(frame_total)+'" stride="1">')
-		self.writel(S_ANIM,5,'<param name="INTERPOLATION" type="Name"/>')
-		self.writel(S_ANIM,4,'</accessor>')
-		self.writel(S_ANIM,3,'</technique_common>')
-		self.writel(S_ANIM,2,'</source>')
-
-		self.writel(S_ANIM,2,'<sampler id="'+anim_id+'-sampler">')
-		self.writel(S_ANIM,3,'<input semantic="INPUT" source="#'+anim_id+'-input"/>')
-		self.writel(S_ANIM,3,'<input semantic="OUTPUT" source="#'+anim_id+'-transform-output"/>')
-		self.writel(S_ANIM,3,'<input semantic="INTERPOLATION" source="#'+anim_id+'-interpolation-output"/>')
-		self.writel(S_ANIM,2,'</sampler>')
-		if (matrices):
-			self.writel(S_ANIM,2,'<channel source="#'+anim_id+'-sampler" target="'+target+'/transform"/>')
-		else:
-			self.writel(S_ANIM,2,'<channel source="#'+anim_id+'-sampler" target="'+target+'"/>')
-		self.writel(S_ANIM,1,'</animation>')
-
-		return [anim_id]
-
-
-	def export_animation(self,start,end,allowed=None):
-
-		#Blender -> Collada frames needs a little work
-		#Collada starts from 0, blender usually from 1
-		#The last frame must be included also
-
-		frame_orig = self.scene.frame_current
-
-		frame_len = 1.0 / self.scene.render.fps
-		frame_total = end - start + 1
-		frame_sub = 0
-		if (start>0):
-			frame_sub=start*frame_len
-
-		tcn = []
-		xform_cache={}
-		blend_cache={}
-		# Change frames first, export objects last
-		# This improves performance enormously
-
-		#print("anim from: "+str(start)+" to "+str(end)+" allowed: "+str(allowed))
-		for t in range(start,end+1):
-			self.scene.frame_set(t)
-			key = t * frame_len - frame_sub
-#			print("Export Anim Frame "+str(t)+"/"+str(self.scene.frame_end+1))
-
-			for node in self.scene.objects:
-
-				if (not node in self.valid_nodes):
-					continue
-				if (allowed!=None and not (node in allowed)):
-					if (node.type=="MESH" and node.data!=None and (node in self.armature_for_morph) and (self.armature_for_morph[node] in allowed)):
-						pass #all good you pass with flying colors for morphs inside of action
-					else:
-						#print("fail "+str((node in self.armature_for_morph)))
-						continue
-				if (node.type=="MESH" and node.data!=None and node.data.shape_keys!=None and (node.data in self.mesh_cache) and len(node.data.shape_keys.key_blocks)):
-					target = self.mesh_cache[node.data]["morph_id"]
-					for i in range(len(node.data.shape_keys.key_blocks)):
-
-						if (i==0):
-							continue
-
-						name=target+"-morph-weights("+str(i-1)+")"
-						if (not (name in blend_cache)):
-							blend_cache[name]=[]
-
-						blend_cache[name].append( (key,node.data.shape_keys.key_blocks[i].value) )
-
-
-				if (node.type=="MESH" and node.parent and node.parent.type=="ARMATURE"):
-
-					continue #In Collada, nodes that have skin modifier must not export animation, animate the skin instead.
-
-				if (len(node.constraints)>0 or node.animation_data!=None):
-					#If the node has constraints, or animation data, then export a sampled animation track
-					name=self.validate_id(node.name)
-					if (not (name in xform_cache)):
-						xform_cache[name]=[]
-
-					mtx = node.matrix_world.copy()
-					if (node.parent):
-						mtx = node.parent.matrix_world.inverted() * mtx
-
-					xform_cache[name].append( (key,mtx) )
-
-				if (node.type=="ARMATURE"):
-					#All bones exported for now
-
-					for bone in node.data.bones:
-
-						bone_name=self.skeleton_info[node]["bone_ids"][bone]
-
-						if (not (bone_name in xform_cache)):
-							#print("has bone: "+bone_name)
-							xform_cache[bone_name]=[]
-
-						posebone = node.pose.bones[bone.name]
-						parent_posebone=None
-
-						mtx = posebone.matrix.copy()
-						if (bone.parent):
-							parent_posebone=node.pose.bones[bone.parent.name]
-							parent_invisible=False
-
-							for i in range(3):
-								if (parent_posebone.scale[i]==0.0):
-								    parent_invisible=True
-
-							if (not parent_invisible):
-								mtx = parent_posebone.matrix.inverted() * mtx
-
-
-						xform_cache[bone_name].append( (key,mtx) )
-
-		self.scene.frame_set(frame_orig)
-
-		#export animation xml
-		for nid in xform_cache:
-			tcn+=self.export_animation_transform_channel(nid,xform_cache[nid],True)
-		for nid in blend_cache:
-			tcn+=self.export_animation_transform_channel(nid,blend_cache[nid],False)
-
-		return tcn
-
-	def export_animations(self):
-		tmp_mat = []
-		for s in self.skeletons:
-			tmp_bone_mat = []
-			for bone in s.pose.bones:
-				tmp_bone_mat.append(Matrix(bone.matrix_basis))
-				bone.matrix_basis = Matrix()
-			tmp_mat.append([Matrix(s.matrix_local),tmp_bone_mat])
-
-		self.writel(S_ANIM,0,'<library_animations>')
-
+    s = " "
+    for x in range(4):
+        for y in range(4):
+            s += str(mtx[x][y])
+            s += " "
+    s += " "
+    return s
 
-		if (self.config["use_anim_action_all"] and len(self.skeletons)):
 
-			cached_actions = {}
+def numarr(a, mult=1.0):
+    s = " "
+    for x in a:
+        s += " " + str(x * mult)
+    s += " "
+    return s
 
-			for s in self.skeletons:
-				if s.animation_data and s.animation_data.action:
-					cached_actions[s] = s.animation_data.action.name
 
-
-			self.writel(S_ANIM_CLIPS,0,'<library_animation_clips>')
-
-			for x in bpy.data.actions[:]:
-				if x.users==0 or x in self.action_constraints:
-					continue
-				if (self.config["use_anim_skip_noexp"] and x.name.endswith("-noexp")):
-					continue
-
-				bones=[]
-				#find bones used
-				for p in x.fcurves:
-					dp = str(p.data_path)
-					base = "pose.bones[\""
-					if (dp.find(base)==0):
-						dp=dp[len(base):]
-						if (dp.find('"')!=-1):
-							dp=dp[:dp.find('"')]
-							if (not dp in bones):
-								bones.append(dp)
-
-				allowed_skeletons=[]
-				for i,y in enumerate(self.skeletons):
-					if (y.animation_data):
-						for z in y.pose.bones:
-							if (z.bone.name in bones):
-								if (not y in allowed_skeletons):
-									allowed_skeletons.append(y)
-						y.animation_data.action=x;
-
-						y.matrix_local = tmp_mat[i][0]
-						for j,bone in enumerate(s.pose.bones):
-							bone.matrix_basis = Matrix()
-
-
-				#print("allowed skeletons "+str(allowed_skeletons))
-
-				#print(str(x))
-
-				tcn = self.export_animation(int(x.frame_range[0]),int(x.frame_range[1]+0.5),allowed_skeletons)
-				framelen=(1.0/self.scene.render.fps)
-				start = x.frame_range[0]*framelen
-				end = x.frame_range[1]*framelen
-				#print("Export anim: "+x.name)
-				self.writel(S_ANIM_CLIPS,1,'<animation_clip name="'+x.name+'" start="'+str(start)+'" end="'+str(end)+'">')
-				for z in tcn:
-					self.writel(S_ANIM_CLIPS,2,'<instance_animation url="#'+z+'"/>')
-				self.writel(S_ANIM_CLIPS,1,'</animation_clip>')
-				if (len(tcn)==0):
-					self.operator.report({'WARNING'},'Animation clip "'+x.name+'" contains no tracks.')
-
-
-
-			self.writel(S_ANIM_CLIPS,0,'</library_animation_clips>')
-
-
-			for i,s in enumerate(self.skeletons):
-				if (s.animation_data==None):
-					continue
-				if s in cached_actions:
-					s.animation_data.action = bpy.data.actions[cached_actions[s]]
-				else:
-					s.animation_data.action = None
-					for j,bone in enumerate(s.pose.bones):
-						bone.matrix_basis = tmp_mat[i][1][j]
-
-		else:
-			self.export_animation(self.scene.frame_start,self.scene.frame_end)
-
-
-
-		self.writel(S_ANIM,0,'</library_animations>')
-
-	def export(self):
-
-		self.writel(S_GEOM,0,'<library_geometries>')
-		self.writel(S_CONT,0,'<library_controllers>')
-		self.writel(S_CAMS,0,'<library_cameras>')
-		self.writel(S_LAMPS,0,'<library_lights>')
-		self.writel(S_IMGS,0,'<library_images>')
-		self.writel(S_MATS,0,'<library_materials>')
-		self.writel(S_FX,0,'<library_effects>')
-
-
-		self.skeletons=[]
-		self.action_constraints=[]
-		self.export_asset()
-		self.export_scene()
-
-		self.writel(S_GEOM,0,'</library_geometries>')
-
-		#morphs always go before skin controllers
-		if S_MORPH in self.sections:
-			for l in self.sections[S_MORPH]:
-				self.writel(S_CONT,0,l)
-			del self.sections[S_MORPH]
-
-		#morphs always go before skin controllers
-		if S_SKIN in self.sections:
-			for l in self.sections[S_SKIN]:
-				self.writel(S_CONT,0,l)
-			del self.sections[S_SKIN]
-
-		self.writel(S_CONT,0,'</library_controllers>')
-		self.writel(S_CAMS,0,'</library_cameras>')
-		self.writel(S_LAMPS,0,'</library_lights>')
-		self.writel(S_IMGS,0,'</library_images>')
-		self.writel(S_MATS,0,'</library_materials>')
-		self.writel(S_FX,0,'</library_effects>')
-
-		if (self.config["use_anim"]):
-		    self.export_animations()
-
-		try:
-			f = open(self.path,"wb")
-		except:
-			return False
-
-		f.write(bytes('<?xml version="1.0" encoding="utf-8"?>\n',"UTF-8"))
-		f.write(bytes('<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1">\n',"UTF-8"))
-
-
-		s=[]
-		for x in self.sections.keys():
-			s.append(x)
-		s.sort()
-		for x in s:
-			for l in self.sections[x]:
-				f.write(bytes(l+"\n","UTF-8"))
-
-		f.write(bytes('<scene>\n',"UTF-8"))
-		f.write(bytes('\t<instance_visual_scene url="#'+self.scene_name+'" />\n',"UTF-8"))
-		f.write(bytes('</scene>\n',"UTF-8"))
-		f.write(bytes('</COLLADA>\n',"UTF-8"))
-		return True
-
-	def __init__(self,path,kwargs,operator):
-		self.operator=operator
-		self.scene=bpy.context.scene
-		self.last_id=0
-		self.scene_name=self.new_id("scene")
-		self.sections={}
-		self.path=path
-		self.mesh_cache={}
-		self.curve_cache={}
-		self.material_cache={}
-		self.image_cache={}
-		self.skeleton_info={}
-		self.config=kwargs
-		self.valid_nodes=[]
-		self.armature_for_morph={}
-		self.used_bones=[]
-		self.wrongvtx_report=False
-
-
-
-
-
-
-
-def save(operator, context,
-	filepath="",
-	use_selection=False,
-	**kwargs
-	):
-
-	exp = DaeExporter(filepath,kwargs,operator)
-	exp.export()
+def numarr_alpha(a, mult=1.0):
+    s = " "
+    for x in a:
+        s += " " + str(x * mult)
+    if len(a) == 3:
+        s += " 1.0"
+    s += " "
+    return s
 
 
+def strarr(arr):
+    s = " "
+    for x in arr:
+        s += " " + str(x)
+    s += " "
+    return s
 
-	return {'FINISHED'}  # so the script wont run after we have batch exported.
 
+class DaeExporter:
 
+    def validate_id(self, d):
+        if (d.find("id-") == 0):
+            return "z" + d
+        return d
+
+    def new_id(self, t):
+        self.last_id += 1
+        return "id-" + t + "-" + str(self.last_id)
+
+    class Vertex:
+
+        def close_to(self, v):
+            if self.vertex - v.vertex.length() > CMP_EPSILON:
+                return False
+            if self.normal - v.normal.length() > CMP_EPSILON:
+                return False
+            if self.uv - v.uv.length() > CMP_EPSILON:
+                return False
+            if self.uv2 - v.uv2.length() > CMP_EPSILON:
+                return False
+
+            return True
+
+        def get_tup(self):
+            tup = (self.vertex.x, self.vertex.y, self.vertex.z, self.normal.x,
+                   self.normal.y, self.normal.z)
+            for t in self.uv:
+                tup = tup + (t.x, t.y)
+            if self.color is not None:
+                tup = tup + (self.color.x, self.color.y, self.color.z)
+            if self.tangent is not None:
+                tup = tup + (self.tangent.x, self.tangent.y, self.tangent.z)
+            if self.bitangent is not None:
+                tup = tup + (self.bitangent.x, self.bitangent.y,
+                             self.bitangent.z)
+            for t in self.bones:
+                tup = tup + (float(t), )
+            for t in self.weights:
+                tup = tup + (float(t), )
+
+            return tup
+
+        def __init__(self):
+            self.vertex = Vector((0.0, 0.0, 0.0))
+            self.normal = Vector((0.0, 0.0, 0.0))
+            self.tangent = None
+            self.bitangent = None
+            self.color = None
+            self.uv = []
+            self.uv2 = Vector((0.0, 0.0))
+            self.bones = []
+            self.weights = []
+
+    def writel(self, section, indent, text):
+        if (not (section in self.sections)):
+            self.sections[section] = []
+        line = ""
+        for x in range(indent):
+            line += "\t"
+        line += text
+        self.sections[section].append(line)
+
+    def export_image(self, image):
+        if (image in self.image_cache):
+            return self.image_cache[image]
+
+        imgpath = image.filepath
+        if (imgpath.find("//") == 0 or imgpath.find("\\\\") == 0):
+            # If relative, convert to absolute
+            imgpath = bpy.path.abspath(imgpath)
+
+        # Path is absolute, now do something!
+
+        if (self.config["use_copy_images"]):
+            # copy image
+            basedir = os.path.dirname(self.path) + "/images"
+            if (not os.path.isdir(basedir)):
+                os.makedirs(basedir)
+
+            if os.path.isfile(imgpath):
+                dstfile = basedir + "/" + os.path.basename(imgpath)
+
+                if not os.path.isfile(dstfile):
+                    shutil.copy(imgpath, dstfile)
+                imgpath = "images/" + os.path.basename(imgpath)
+            else:
+                # If file is not found save it as png file in the destination
+                # folder
+                img_tmp_path = image.filepath
+                if img_tmp_path.endswith((".bmp", ".rgb", ".png", ".jpeg",
+                                          ".jpg", ".jp2", ".tga", ".cin",
+                                          ".dpx", ".exr", ".hdr", ".tif")):
+                    image.filepath = basedir + "/" + \
+                        os.path.basename(img_tmp_path)
+                else:
+                    image.filepath = basedir + "/" + image.name + ".png"
+
+                dstfile = basedir + "/" + os.path.basename(image.filepath)
+
+                if not os.path.isfile(dstfile):
+                    image.save()
+                imgpath = "images/" + os.path.basename(image.filepath)
+                image.filepath = img_tmp_path
+
+        else:
+            # Export relative, always, no one wants absolute paths.
+            try:
+                # Export unix compatible always
+                imgpath = os.path.relpath(
+                    imgpath, os.path.dirname(self.path)).replace("\\", "/")
+
+            except:
+                # Fails sometimes, not sure why
+                pass
+
+        imgid = self.new_id("image")
+
+        print("FOR: " + imgpath)
+
+#        if (not os.path.isfile(imgpath)):
+#            print("NOT FILE?")
+#            if imgpath.endswith((".bmp", ".rgb", ".png", ".jpeg", ".jpg",
+#                                 ".jp2", ".tga", ".cin", ".dpx", ".exr",
+#                                 ".hdr", ".tif")):
+#                imgpath="images/"+os.path.basename(imgpath)
+#            else:
+#                imgpath="images/"+image.name+".png"
+
+        self.writel(S_IMGS, 1, '<image id="' + imgid +
+                    '" name="' + image.name + '">')
+        self.writel(S_IMGS, 2, '<init_from>' + imgpath + '</init_from>')
+        self.writel(S_IMGS, 1, '</image>')
+        self.image_cache[image] = imgid
+        return imgid
+
+    def export_material(self, material, double_sided_hint=True):
+        if (material in self.material_cache):
+            return self.material_cache[material]
+
+        fxid = self.new_id("fx")
+        self.writel(S_FX, 1, '<effect id="' + fxid + '" name="' +
+                    material.name + '-fx">')
+        self.writel(S_FX, 2, '<profile_COMMON>')
+
+        # Find and fetch the textures and create sources
+        sampler_table = {}
+        diffuse_tex = None
+        specular_tex = None
+        emission_tex = None
+        normal_tex = None
+        for i in range(len(material.texture_slots)):
+            ts = material.texture_slots[i]
+            if not ts:
+                continue
+            if not ts.use:
+                continue
+            if not ts.texture:
+                continue
+            if ts.texture.type != "IMAGE":
+                continue
+
+            if ts.texture.image is None:
+                continue
+
+            # Image
+            imgid = self.export_image(ts.texture.image)
+
+            # Surface
+            surface_sid = self.new_id("fx_surf")
+            self.writel(S_FX, 3, '<newparam sid="' + surface_sid + '">')
+            self.writel(S_FX, 4, '<surface type="2D">')
+            # This is sooo weird
+            self.writel(S_FX, 5, '<init_from>' + imgid + '</init_from>')
+            self.writel(S_FX, 5, '<format>A8R8G8B8</format>')
+            self.writel(S_FX, 4, '</surface>')
+            self.writel(S_FX, 3, '</newparam>')
+            # Sampler, collada sure likes it difficult
+            sampler_sid = self.new_id("fx_sampler")
+            self.writel(S_FX, 3, '<newparam sid="' + sampler_sid + '">')
+            self.writel(S_FX, 4, '<sampler2D>')
+            self.writel(S_FX, 5, '<source>' + surface_sid + '</source>')
+            self.writel(S_FX, 4, '</sampler2D>')
+            self.writel(S_FX, 3, '</newparam>')
+            sampler_table[i] = sampler_sid
+
+            if ts.use_map_color_diffuse and diffuse_tex is None:
+                diffuse_tex = sampler_sid
+            if ts.use_map_color_spec and specular_tex is None:
+                specular_tex = sampler_sid
+            if ts.use_map_emit and emission_tex is None:
+                emission_tex = sampler_sid
+            if ts.use_map_normal and normal_tex is None:
+                normal_tex = sampler_sid
+
+        self.writel(S_FX, 3, '<technique sid="common">')
+        shtype = "blinn"
+        self.writel(S_FX, 4, '<' + shtype + '>')
+        # Ambient? from where?
+
+        self.writel(S_FX, 5, '<emission>')
+        if emission_tex is not None:
+            self.writel(S_FX, 6, '<texture texture="' + emission_tex +
+                        '" texcoord="CHANNEL1"/>')
+        else:
+            self.writel(S_FX, 6, '<color>' +
+                        numarr_alpha(material.diffuse_color, material.emit) +
+                        ' </color>')  # not totally right but good enough
+        self.writel(S_FX, 5, '</emission>')
+
+        self.writel(S_FX, 5, '<ambient>')
+        self.writel(S_FX, 6, '<color>' +
+                    numarr_alpha(self.scene.world.ambient_color,
+                                 material.ambient) + ' </color>')
+        self.writel(S_FX, 5, '</ambient>')
+
+        self.writel(S_FX, 5, '<diffuse>')
+        if diffuse_tex is not None:
+            self.writel(S_FX, 6, '<texture texture="' + diffuse_tex +
+                        '" texcoord="CHANNEL1"/>')
+        else:
+            self.writel(S_FX, 6,
+                        '<color>' + numarr_alpha(material.diffuse_color,
+                                                 material.diffuse_intensity) +
+                        '</color>')
+        self.writel(S_FX, 5, '</diffuse>')
+
+        self.writel(S_FX, 5, '<specular>')
+        if specular_tex is not None:
+            self.writel(S_FX, 6, '<texture texture="' + specular_tex +
+                        '" texcoord="CHANNEL1"/>')
+        else:
+            self.writel(S_FX, 6, '<color>' + numarr_alpha(
+                material.specular_color, material.specular_intensity) +
+                '</color>')
+        self.writel(S_FX, 5, '</specular>')
+
+        self.writel(S_FX, 5, '<shininess>')
+        self.writel(S_FX, 6, '<float>' + str(material.specular_hardness) +
+                    '</float>')
+        self.writel(S_FX, 5, '</shininess>')
+
+        self.writel(S_FX, 5, '<reflective>')
+        self.writel(S_FX, 6, '<color>' + numarr_alpha(material.mirror_color) +
+                    '</color>')
+        self.writel(S_FX, 5, '</reflective>')
+
+        if (material.use_transparency):
+            self.writel(S_FX, 5, '<transparency>')
+            self.writel(S_FX, 6, '<float>' + str(material.alpha) + '</float>')
+            self.writel(S_FX, 5, '</transparency>')
+
+        self.writel(S_FX, 5, '<index_of_refraction>')
+        self.writel(S_FX, 6, '<float>' + str(material.specular_ior) +
+                    '</float>')
+        self.writel(S_FX, 5, '</index_of_refraction>')
+
+        self.writel(S_FX, 4, '</' + shtype + '>')
+
+        self.writel(S_FX, 4, '<extra>')
+        self.writel(S_FX, 5, '<technique profile="FCOLLADA">')
+        if (normal_tex):
+            self.writel(S_FX, 6, '<bump bumptype="NORMALMAP">')
+            self.writel(S_FX, 7, '<texture texture="' + normal_tex +
+                        '" texcoord="CHANNEL1"/>')
+            self.writel(S_FX, 6, '</bump>')
+
+        self.writel(S_FX, 5, '</technique>')
+        self.writel(S_FX, 5, '<technique profile="GOOGLEEARTH">')
+        self.writel(S_FX, 6, '<double_sided>' + ["0", "1"][double_sided_hint] +
+                    "</double_sided>")
+        self.writel(S_FX, 5, '</technique>')
+
+        if (material.use_shadeless):
+            self.writel(S_FX, 5, '<technique profile="GODOT">')
+            self.writel(S_FX, 6, '<unshaded>1</unshaded>')
+            self.writel(S_FX, 5, '</technique>')
+
+        self.writel(S_FX, 4, '</extra>')
+
+        self.writel(S_FX, 3, '</technique>')
+        self.writel(S_FX, 2, '</profile_COMMON>')
+        self.writel(S_FX, 1, '</effect>')
+
+        # Also export blender material in all it's glory (if set as active)
+
+        # Material
+        matid = self.new_id("material")
+        self.writel(S_MATS, 1, '<material id="' + matid + '" name="' +
+                    material.name + '">')
+        self.writel(S_MATS, 2, '<instance_effect url="#' + fxid + '"/>')
+        self.writel(S_MATS, 1, '</material>')
+
+        self.material_cache[material] = matid
+        return matid
+
+    def export_mesh(self, node, armature=None, skeyindex=-1, skel_source=None,
+                    custom_name=None):
+        mesh = node.data
+
+        if (node.data in self.mesh_cache):
+            return self.mesh_cache[mesh]
+
+        if (skeyindex == -1 and mesh.shape_keys is not None and len(
+                mesh.shape_keys.key_blocks)):
+            values = []
+            morph_targets = []
+            md = None
+            for k in range(0, len(mesh.shape_keys.key_blocks)):
+                shape = node.data.shape_keys.key_blocks[k]
+                values += [shape.value]  # save value
+                shape.value = 0
+
+            mid = self.new_id("morph")
+
+            for k in range(0, len(mesh.shape_keys.key_blocks)):
+
+                shape = node.data.shape_keys.key_blocks[k]
+                node.show_only_shape_key = True
+                node.active_shape_key_index = k
+                shape.value = 1.0
+                mesh.update()
+                """
+                oldval = shape.value
+                shape.value = 1.0
+
+                """
+                p = node.data
+                v = node.to_mesh(bpy.context.scene, True, "RENDER")
+                node.data = v
+#                self.export_node(node, il, shape.name)
+                node.data.update()
+                if (armature and k == 0):
+                    md = self.export_mesh(node, armature, k, mid, shape.name)
+                else:
+                    md = self.export_mesh(node, None, k, None, shape.name)
+
+                node.data = p
+                node.data.update()
+                shape.value = 0.0
+                morph_targets.append(md)
+
+                """
+                shape.value = oldval
+                """
+            node.show_only_shape_key = False
+            node.active_shape_key_index = 0
+
+            self.writel(S_MORPH, 1, '<controller id="' + mid + '" name="">')
+            # if ("skin_id" in morph_targets[0]):
+            #    self.writel(S_MORPH, 2, '<morph source="#'+morph_targets[0][
+            #    "skin_id"]+'" method="NORMALIZED">')
+            # else:
+            self.writel(S_MORPH, 2, '<morph source="#' +
+                        morph_targets[0]["id"] + '" method="NORMALIZED">')
+
+            self.writel(S_MORPH, 3, '<source id="' + mid + '-morph-targets">')
+            self.writel(S_MORPH, 4, '<IDREF_array id="' + mid +
+                        '-morph-targets-array" count="' +
+                        str(len(morph_targets) - 1) + '">')
+            marr = ""
+            warr = ""
+            for i in range(len(morph_targets)):
+                if (i == 0):
+                    continue
+                elif (i > 1):
+                    marr += " "
+
+                if ("skin_id" in morph_targets[i]):
+                    marr += morph_targets[i]["skin_id"]
+                else:
+                    marr += morph_targets[i]["id"]
+
+                warr += " 0"
+
+            self.writel(S_MORPH, 5, marr)
+            self.writel(S_MORPH, 4, '</IDREF_array>')
+            self.writel(S_MORPH, 4, '<technique_common>')
+            self.writel(S_MORPH, 5, '<accessor source="#' + mid +
+                        '-morph-targets-array" count="' +
+                        str(len(morph_targets) - 1) + '" stride="1">')
+            self.writel(
+                S_MORPH, 6, '<param name="MORPH_TARGET" type="IDREF"/>')
+            self.writel(S_MORPH, 5, '</accessor>')
+            self.writel(S_MORPH, 4, '</technique_common>')
+            self.writel(S_MORPH, 3, '</source>')
+
+            self.writel(S_MORPH, 3, '<source id="' + mid + '-morph-weights">')
+            self.writel(S_MORPH, 4, '<float_array id="' + mid +
+                        '-morph-weights-array" count="' +
+                        str(len(morph_targets) - 1) + '" >')
+            self.writel(S_MORPH, 5, warr)
+            self.writel(S_MORPH, 4, '</float_array>')
+            self.writel(S_MORPH, 4, '<technique_common>')
+            self.writel(S_MORPH, 5, '<accessor source="#' + mid +
+                        '-morph-weights-array" count="' +
+                        str(len(morph_targets) - 1) + '" stride="1">')
+            self.writel(
+                S_MORPH, 6, '<param name="MORPH_WEIGHT" type="float"/>')
+            self.writel(S_MORPH, 5, '</accessor>')
+            self.writel(S_MORPH, 4, '</technique_common>')
+            self.writel(S_MORPH, 3, '</source>')
+
+            self.writel(S_MORPH, 3, '<targets>')
+            self.writel(
+                S_MORPH, 4, '<input semantic="MORPH_TARGET" source="#' + mid +
+                '-morph-targets"/>')
+            self.writel(
+                S_MORPH, 4, '<input semantic="MORPH_WEIGHT" source="#' + mid +
+                '-morph-weights"/>')
+            self.writel(S_MORPH, 3, '</targets>')
+            self.writel(S_MORPH, 2, '</morph>')
+            self.writel(S_MORPH, 1, '</controller>')
+            if armature is not None:
+
+                self.armature_for_morph[node] = armature
+
+            meshdata = {}
+            if (armature):
+                meshdata = morph_targets[0]
+                meshdata["morph_id"] = mid
+            else:
+                meshdata["id"] = morph_targets[0]["id"]
+                meshdata["morph_id"] = mid
+                meshdata["material_assign"] = morph_targets[
+                    0]["material_assign"]
+
+            self.mesh_cache[node.data] = meshdata
+            return meshdata
+
+        apply_modifiers = len(node.modifiers) and self.config[
+            "use_mesh_modifiers"]
+
+        name_to_use = mesh.name
+        # print("name to use: "+mesh.name)
+        if (custom_name is not None and custom_name != ""):
+            name_to_use = custom_name
+
+        mesh = node.to_mesh(self.scene, apply_modifiers,
+                            "RENDER")  # is this allright?
+
+        triangulate = self.config["use_triangles"]
+        if (triangulate):
+            bm = bmesh.new()
+            bm.from_mesh(mesh)
+            bmesh.ops.triangulate(bm, faces=bm.faces)
+            bm.to_mesh(mesh)
+            bm.free()
+
+        mesh.update(calc_tessface=True)
+        vertices = []
+        vertex_map = {}
+        surface_indices = {}
+        materials = {}
+
+        materials = {}
+
+        si = None
+        if armature is not None:
+            si = self.skeleton_info[armature]
+
+        has_uv = False
+        has_uv2 = False
+        has_weights = armature is not None
+        has_tangents = self.config["use_tangent_arrays"]  # could detect..
+        has_colors = len(mesh.vertex_colors)
+        mat_assign = []
+
+        uv_layer_count = len(mesh.uv_textures)
+        if has_tangents and len(mesh.uv_textures):
+            try:
+                mesh.calc_tangents()
+            except:
+                self.operator.report(
+                    {'WARNING'}, 'CalcTangets failed for mesh "' + mesh.name +
+                    '", no tangets will be exported.')
+                # uv_layer_count=0
+                mesh.calc_normals_split()
+                has_tangents = False
+
+        else:
+            mesh.calc_normals_split()
+            has_tangents = False
+
+        for fi in range(len(mesh.polygons)):
+            f = mesh.polygons[fi]
+
+            if not (f.material_index in surface_indices):
+                surface_indices[f.material_index] = []
+                # print("Type: " + str(type(f.material_index)))
+                # print("IDX: " + str(f.material_index) + "/" + str(
+                #     len(mesh.materials)))
+
+                try:
+                    # Bizarre blender behavior i don't understand,
+                    # so catching exception
+                    mat = mesh.materials[f.material_index]
+                except:
+                    mat = None
+
+                if (mat is not None):
+                    materials[f.material_index] = self.export_material(
+                        mat, mesh.show_double_sided)
+                else:
+                    # weird, has no material?
+                    materials[f.material_index] = None
+
+            indices = surface_indices[f.material_index]
+            vi = []
+            # Vertices always 3
+            """
+            if (len(f.vertices)==3):
+                vi.append(0)
+                vi.append(1)
+                vi.append(2)
+            elif (len(f.vertices)==4):
+                #todo, should use shortest path
+                vi.append(0)
+                vi.append(1)
+                vi.append(2)
+                vi.append(0)
+                vi.append(2)
+                vi.append(3)
+            """
+
+            for lt in range(f.loop_total):
+                loop_index = f.loop_start + lt
+                ml = mesh.loops[loop_index]
+                mv = mesh.vertices[ml.vertex_index]
+
+                v = self.Vertex()
+                v.vertex = Vector(mv.co)
+
+                for xt in mesh.uv_layers:
+                    v.uv.append(Vector(xt.data[loop_index].uv))
+
+                if (has_colors):
+                    v.color = Vector(
+                        mesh.vertex_colors[0].data[loop_index].color)
+
+                v.normal = Vector(ml.normal)
+
+                if (has_tangents):
+                    v.tangent = Vector(ml.tangent)
+                    v.bitangent = Vector(ml.bitangent)
+
+                    # if (armature):
+                    #         v.vertex = node.matrix_world * v.vertex
+
+                # v.color=Vertex(mv. ???
+
+                if armature is not None:
+                    wsum = 0.0
+                    zero_bones = []
+
+                    for vg in mv.groups:
+                        if vg.group >= len(node.vertex_groups):
+                            continue
+                        name = node.vertex_groups[vg.group].name
+
+                        if (name in si["bone_index"]):
+                            # could still put the weight as 0.0001 maybe
+                            # blender has a lot of zero weight stuff
+                            if (vg.weight > 0.001):
+                                v.bones.append(si["bone_index"][name])
+                                v.weights.append(vg.weight)
+                                wsum += vg.weight
+                    if (wsum == 0.0):
+                        if not self.wrongvtx_report:
+                            self.operator.report(
+                                {'WARNING'}, 'Mesh for object "' + node.name +
+                                '" has unassigned weights. '
+                                'This may look wrong in exported model.')
+                            self.wrongvtx_report = True
+
+                        # blender can have bones assigned that weight zero
+                        # so they remain local
+                        # this is the best it can be done?
+                        v.bones.append(0)
+                        v.weights.append(1)
+
+                tup = v.get_tup()
+                idx = 0
+                # do not optmize if using shapekeys
+                if (skeyindex == -1 and tup in vertex_map):
+                    idx = vertex_map[tup]
+                else:
+                    idx = len(vertices)
+                    vertices.append(v)
+                    vertex_map[tup] = idx
+
+                vi.append(idx)
+
+            if (len(vi) > 2):
+                # only triangles and above
+                indices.append(vi)
+
+        meshid = self.new_id("mesh")
+        self.writel(S_GEOM, 1, '<geometry id="' + meshid +
+                    '" name="' + name_to_use + '">')
+
+        self.writel(S_GEOM, 2, '<mesh>')
+
+        # Vertex Array
+        self.writel(S_GEOM, 3, '<source id="' + meshid + '-positions">')
+        float_values = ""
+        for v in vertices:
+            float_values += " " + str(v.vertex.x) + " " + \
+                str(v.vertex.y) + " " + str(v.vertex.z)
+        self.writel(S_GEOM, 4, '<float_array id="' + meshid +
+                    '-positions-array" count="' +
+                    str(len(vertices) * 3) + '">' + float_values +
+                    '</float_array>')
+        self.writel(S_GEOM, 4, '<technique_common>')
+        self.writel(S_GEOM, 4, '<accessor source="#' + meshid +
+                    '-positions-array" count="' + str(len(vertices)) +
+                    '" stride="3">')
+        self.writel(S_GEOM, 5, '<param name="X" type="float"/>')
+        self.writel(S_GEOM, 5, '<param name="Y" type="float"/>')
+        self.writel(S_GEOM, 5, '<param name="Z" type="float"/>')
+        self.writel(S_GEOM, 4, '</accessor>')
+        self.writel(S_GEOM, 4, '</technique_common>')
+        self.writel(S_GEOM, 3, '</source>')
+
+        # Normal Array
+
+        self.writel(S_GEOM, 3, '<source id="' + meshid + '-normals">')
+        float_values = ""
+        for v in vertices:
+            float_values += " " + str(v.normal.x) + " " + \
+                str(v.normal.y) + " " + str(v.normal.z)
+        self.writel(S_GEOM, 4, '<float_array id="' + meshid +
+                    '-normals-array" count="' +
+                    str(len(vertices) * 3) + '">' + float_values +
+                    '</float_array>')
+        self.writel(S_GEOM, 4, '<technique_common>')
+        self.writel(S_GEOM, 4, '<accessor source="#' + meshid +
+                    '-normals-array" count="' + str(len(vertices)) +
+                    '" stride="3">')
+        self.writel(S_GEOM, 5, '<param name="X" type="float"/>')
+        self.writel(S_GEOM, 5, '<param name="Y" type="float"/>')
+        self.writel(S_GEOM, 5, '<param name="Z" type="float"/>')
+        self.writel(S_GEOM, 4, '</accessor>')
+        self.writel(S_GEOM, 4, '</technique_common>')
+        self.writel(S_GEOM, 3, '</source>')
+
+        if (has_tangents):
+            self.writel(S_GEOM, 3, '<source id="' + meshid + '-tangents">')
+            float_values = ""
+            for v in vertices:
+                float_values += " " + \
+                    str(v.tangent.x) + " " + \
+                    str(v.tangent.y) + " " + str(v.tangent.z)
+            self.writel(S_GEOM, 4, '<float_array id="' + meshid +
+                        '-tangents-array" count="' +
+                        str(len(vertices) * 3) + '">' + float_values +
+                        '</float_array>')
+            self.writel(S_GEOM, 4, '<technique_common>')
+            self.writel(S_GEOM, 4, '<accessor source="#' + meshid +
+                        '-tangents-array" count="' + str(len(vertices)) +
+                        '" stride="3">')
+            self.writel(S_GEOM, 5, '<param name="X" type="float"/>')
+            self.writel(S_GEOM, 5, '<param name="Y" type="float"/>')
+            self.writel(S_GEOM, 5, '<param name="Z" type="float"/>')
+            self.writel(S_GEOM, 4, '</accessor>')
+            self.writel(S_GEOM, 4, '</technique_common>')
+            self.writel(S_GEOM, 3, '</source>')
+
+            self.writel(S_GEOM, 3, '<source id="' + meshid + '-bitangents">')
+            float_values = ""
+            for v in vertices:
+                float_values += " " + \
+                    str(v.bitangent.x) + " " + \
+                    str(v.bitangent.y) + " " + str(v.bitangent.z)
+            self.writel(S_GEOM, 4, '<float_array id="' + meshid +
+                        '-bitangents-array" count="' +
+                        str(len(vertices) * 3) + '">' + float_values +
+                        '</float_array>')
+            self.writel(S_GEOM, 4, '<technique_common>')
+            self.writel(S_GEOM, 4, '<accessor source="#' + meshid +
+                        '-bitangents-array" count="' + str(len(vertices)) +
+                        '" stride="3">')
+            self.writel(S_GEOM, 5, '<param name="X" type="float"/>')
+            self.writel(S_GEOM, 5, '<param name="Y" type="float"/>')
+            self.writel(S_GEOM, 5, '<param name="Z" type="float"/>')
+            self.writel(S_GEOM, 4, '</accessor>')
+            self.writel(S_GEOM, 4, '</technique_common>')
+            self.writel(S_GEOM, 3, '</source>')
+
+        # UV Arrays
+
+        for uvi in range(uv_layer_count):
+
+            self.writel(S_GEOM, 3, '<source id="' + meshid +
+                        '-texcoord-' + str(uvi) + '">')
+            float_values = ""
+            for v in vertices:
+                try:
+                    float_values += " " + \
+                        str(v.uv[uvi].x) + " " + str(v.uv[uvi].y)
+                except:
+                    # I don't understand this weird multi-uv-layer API, but
+                    # with this it seems to works
+                    float_values += " 0 0 "
+
+            self.writel(S_GEOM, 4, '<float_array id="' + meshid +
+                        '-texcoord-' + str(uvi) +
+                        '-array" count="' + str(len(vertices) * 2) + '">' +
+                        float_values + '</float_array>')
+            self.writel(S_GEOM, 4, '<technique_common>')
+            self.writel(S_GEOM, 4, '<accessor source="#' + meshid +
+                        '-texcoord-' +
+                        str(uvi) + '-array" count="' + str(len(vertices)) +
+                        '" stride="2">')
+            self.writel(S_GEOM, 5, '<param name="S" type="float"/>')
+            self.writel(S_GEOM, 5, '<param name="T" type="float"/>')
+            self.writel(S_GEOM, 4, '</accessor>')
+            self.writel(S_GEOM, 4, '</technique_common>')
+            self.writel(S_GEOM, 3, '</source>')
+
+        # Color Arrays
+
+        if (has_colors):
+            self.writel(S_GEOM, 3, '<source id="' + meshid + '-colors">')
+            float_values = ""
+            for v in vertices:
+                float_values += " " + \
+                    str(v.color.x) + " " + \
+                    str(v.color.y) + " " + str(v.color.z)
+            self.writel(S_GEOM, 4, '<float_array id="' + meshid +
+                        '-colors-array" count="' +
+                        str(len(vertices) * 3) + '">' + float_values +
+                        '</float_array>')
+            self.writel(S_GEOM, 4, '<technique_common>')
+            self.writel(S_GEOM, 4, '<accessor source="#' + meshid +
+                        '-colors-array" count="' + str(len(vertices)) +
+                        '" stride="3">')
+            self.writel(S_GEOM, 5, '<param name="X" type="float"/>')
+            self.writel(S_GEOM, 5, '<param name="Y" type="float"/>')
+            self.writel(S_GEOM, 5, '<param name="Z" type="float"/>')
+            self.writel(S_GEOM, 4, '</accessor>')
+            self.writel(S_GEOM, 4, '</technique_common>')
+            self.writel(S_GEOM, 3, '</source>')
+
+        # Triangle Lists
+        self.writel(S_GEOM, 3, '<vertices id="' + meshid + '-vertices">')
+        self.writel(
+            S_GEOM, 4, '<input semantic="POSITION" source="#' + meshid +
+            '-positions"/>')
+        self.writel(S_GEOM, 3, '</vertices>')
+
+        prim_type = ""
+        if (triangulate):
+            prim_type = "triangles"
+        else:
+            prim_type = "polygons"
+
+        for m in surface_indices:
+            indices = surface_indices[m]
+            mat = materials[m]
+
+            if (mat is not None):
+                matref = self.new_id("trimat")
+                self.writel(S_GEOM, 3, '<' + prim_type + ' count="' + str(
+                    int(len(indices))) + '" material="' + matref +
+                            '">')  # todo material
+                mat_assign.append((mat, matref))
+            else:
+                self.writel(S_GEOM, 3, '<' + prim_type + ' count="' +
+                            str(int(len(indices))) + '">')  # todo material
+
+            self.writel(S_GEOM, 4, '<input semantic="VERTEX" source="#' +
+                        meshid + '-vertices" offset="0"/>')
+            self.writel(S_GEOM, 4, '<input semantic="NORMAL" source="#' +
+                        meshid + '-normals" offset="0"/>')
+
+            for uvi in range(uv_layer_count):
+                self.writel(S_GEOM, 4, '<input semantic="TEXCOORD" source="#' +
+                            meshid +
+                            '-texcoord-' + str(uvi) + '" offset="0" set="' +
+                            str(uvi) + '"/>')
+
+            if (has_colors):
+                self.writel(S_GEOM, 4, '<input semantic="COLOR" source="#' +
+                            meshid + '-colors" offset="0"/>')
+            if (has_tangents):
+                self.writel(S_GEOM, 4,
+                            '<input semantic="TEXTANGENT" source="#' +
+                            meshid + '-tangents" offset="0"/>')
+                self.writel(S_GEOM, 4,
+                            '<input semantic="TEXBINORMAL" source="#' +
+                            meshid + '-bitangents" offset="0"/>')
+
+            if (triangulate):
+                int_values = "<p>"
+                for p in indices:
+                    for i in p:
+                        int_values += " " + str(i)
+                int_values += " </p>"
+                self.writel(S_GEOM, 4, int_values)
+            else:
+                for p in indices:
+                    int_values = "<p>"
+                    for i in p:
+                        int_values += " " + str(i)
+                    int_values += " </p>"
+                    self.writel(S_GEOM, 4, int_values)
+
+            self.writel(S_GEOM, 3, '</' + prim_type + '>')
+
+        self.writel(S_GEOM, 2, '</mesh>')
+        self.writel(S_GEOM, 1, '</geometry>')
+
+        meshdata = {}
+        meshdata["id"] = meshid
+        meshdata["material_assign"] = mat_assign
+        if (skeyindex == -1):
+            self.mesh_cache[node.data] = meshdata
+
+        # Export armature data (if armature exists)
+
+        if (armature is not None and (
+                skel_source is not None or skeyindex == -1)):
+
+            contid = self.new_id("controller")
+
+            self.writel(S_SKIN, 1, '<controller id="' + contid + '">')
+            if (skel_source is not None):
+                self.writel(S_SKIN, 2, '<skin source="#' + skel_source + '">')
+            else:
+                self.writel(S_SKIN, 2, '<skin source="#' + meshid + '">')
+
+            self.writel(S_SKIN, 3, '<bind_shape_matrix>' +
+                        strmtx(node.matrix_world) + '</bind_shape_matrix>')
+            # Joint Names
+            self.writel(S_SKIN, 3, '<source id="' + contid + '-joints">')
+            name_values = ""
+            for v in si["bone_names"]:
+                name_values += " " + v
+
+            self.writel(S_SKIN, 4, '<Name_array id="' + contid +
+                        '-joints-array" count="' +
+                        str(len(si["bone_names"])) + '">' + name_values +
+                        '</Name_array>')
+            self.writel(S_SKIN, 4, '<technique_common>')
+            self.writel(S_SKIN, 4, '<accessor source="#' + contid +
+                        '-joints-array" count="' + str(len(si["bone_names"])) +
+                        '" stride="1">')
+            self.writel(S_SKIN, 5, '<param name="JOINT" type="Name"/>')
+            self.writel(S_SKIN, 4, '</accessor>')
+            self.writel(S_SKIN, 4, '</technique_common>')
+            self.writel(S_SKIN, 3, '</source>')
+            # Pose Matrices!
+            self.writel(S_SKIN, 3, '<source id="' + contid + '-bind_poses">')
+            pose_values = ""
+            for v in si["bone_bind_poses"]:
+                pose_values += " " + strmtx(v)
+
+            self.writel(S_SKIN, 4, '<float_array id="' + contid +
+                        '-bind_poses-array" count="' +
+                        str(len(si["bone_bind_poses"]) * 16) + '">' +
+                        pose_values + '</float_array>')
+            self.writel(S_SKIN, 4, '<technique_common>')
+            self.writel(S_SKIN, 4, '<accessor source="#' + contid +
+                        '-bind_poses-array" count="' +
+                        str(len(si["bone_bind_poses"])) + '" stride="16">')
+            self.writel(S_SKIN, 5, '<param name="TRANSFORM" type="float4x4"/>')
+            self.writel(S_SKIN, 4, '</accessor>')
+            self.writel(S_SKIN, 4, '</technique_common>')
+            self.writel(S_SKIN, 3, '</source>')
+            # Skin Weights!
+            self.writel(S_SKIN, 3, '<source id="' + contid + '-skin_weights">')
+            skin_weights = ""
+            skin_weights_total = 0
+            for v in vertices:
+                skin_weights_total += len(v.weights)
+                for w in v.weights:
+                    skin_weights += " " + str(w)
+
+            self.writel(S_SKIN, 4, '<float_array id="' + contid +
+                        '-skin_weights-array" count="' +
+                        str(skin_weights_total) + '">' + skin_weights +
+                        '</float_array>')
+            self.writel(S_SKIN, 4, '<technique_common>')
+            self.writel(S_SKIN, 4, '<accessor source="#' + contid +
+                        '-skin_weights-array" count="' +
+                        str(skin_weights_total) + '" stride="1">')
+            self.writel(S_SKIN, 5, '<param name="WEIGHT" type="float"/>')
+            self.writel(S_SKIN, 4, '</accessor>')
+            self.writel(S_SKIN, 4, '</technique_common>')
+            self.writel(S_SKIN, 3, '</source>')
+
+            self.writel(S_SKIN, 3, '<joints>')
+            self.writel(
+                S_SKIN, 4, '<input semantic="JOINT" source="#' + contid +
+                '-joints"/>')
+            self.writel(
+                S_SKIN, 4, '<input semantic="INV_BIND_MATRIX" source="#' +
+                contid + '-bind_poses"/>')
+            self.writel(S_SKIN, 3, '</joints>')
+            self.writel(S_SKIN, 3, '<vertex_weights count="' +
+                        str(len(vertices)) + '">')
+            self.writel(S_SKIN, 4, '<input semantic="JOINT" source="#' +
+                        contid + '-joints" offset="0"/>')
+            self.writel(S_SKIN, 4, '<input semantic="WEIGHT" source="#' +
+                        contid + '-skin_weights" offset="1"/>')
+            vcounts = ""
+            vs = ""
+            vcount = 0
+            for v in vertices:
+                vcounts += " " + str(len(v.weights))
+                for b in v.bones:
+                    vs += " " + str(b)
+                    vs += " " + str(vcount)
+                    vcount += 1
+            self.writel(S_SKIN, 4, '<vcount>' + vcounts + '</vcount>')
+            self.writel(S_SKIN, 4, '<v>' + vs + '</v>')
+            self.writel(S_SKIN, 3, '</vertex_weights>')
+
+            self.writel(S_SKIN, 2, '</skin>')
+            self.writel(S_SKIN, 1, '</controller>')
+            meshdata["skin_id"] = contid
+
+        return meshdata
+
+    def export_mesh_node(self, node, il):
+        if (node.data is None):
+            return
+
+        armature = None
+        armcount = 0
+        for n in node.modifiers:
+            if (n.type == "ARMATURE"):
+                armcount += 1
+
+        if (node.parent is not None):
+            if (node.parent.type == "ARMATURE"):
+                armature = node.parent
+                if (armcount > 1):
+                    self.operator.report({'WARNING'}, 'Object "' + node.name +
+                                         '" refers to more than one armature! '
+                                         'This is unsupported.')
+                if (armcount == 0):
+                    self.operator.report({'WARNING'}, 'Object "' + node.name +
+                                         '" is child of an armature, but has '
+                                         'no armature modifier.')
+
+        if (armcount > 0 and not armature):
+            self.operator.report({'WARNING'}, 'Object "' + node.name +
+                                 '" has armature modifier, but is not a child '
+                                 'of an armature. This is unsupported.')
+
+        if (node.data.shape_keys is not None):
+            sk = node.data.shape_keys
+            if (sk.animation_data):
+                    # print("HAS ANIM")
+                    # print("DRIVERS: "+str(len(sk.animation_data.drivers)))
+                for d in sk.animation_data.drivers:
+                    if (d.driver):
+                        for v in d.driver.variables:
+                            for t in v.targets:
+                                if (t.id is not None and
+                                        t.id.name in self.scene.objects):
+                                    # print("LINKING " + str(node) + " WITH " +
+                                    #     str(t.id.name))
+                                    self.armature_for_morph[
+                                        node] = self.scene.objects[t.id.name]
+
+        meshdata = self.export_mesh(node, armature)
+        close_controller = False
+
+        if ("skin_id" in meshdata):
+            close_controller = True
+            self.writel(S_NODES, il, '<instance_controller url="#' +
+                        meshdata["skin_id"] + '">')
+            for sn in self.skeleton_info[armature]["skeleton_nodes"]:
+                self.writel(S_NODES, il + 1, '<skeleton>#' +
+                            sn + '</skeleton>')
+        elif ("morph_id" in meshdata):
+            self.writel(S_NODES, il, '<instance_controller url="#' +
+                        meshdata["morph_id"] + '">')
+            close_controller = True
+        elif (armature is None):
+            self.writel(S_NODES, il, '<instance_geometry url="#' +
+                        meshdata["id"] + '">')
+
+        if (len(meshdata["material_assign"]) > 0):
+
+            self.writel(S_NODES, il + 1, '<bind_material>')
+            self.writel(S_NODES, il + 2, '<technique_common>')
+            for m in meshdata["material_assign"]:
+                self.writel(S_NODES, il + 3, '<instance_material symbol="' +
+                            m[1] + '" target="#' + m[0] + '"/>')
+
+            self.writel(S_NODES, il + 2, '</technique_common>')
+            self.writel(S_NODES, il + 1, '</bind_material>')
+
+        if (close_controller):
+            self.writel(S_NODES, il, '</instance_controller>')
+        else:
+            self.writel(S_NODES, il, '</instance_geometry>')
+
+    def export_armature_bone(self, bone, il, si):
+        boneid = self.new_id("bone")
+        boneidx = si["bone_count"]
+        si["bone_count"] += 1
+        bonesid = si["id"] + "-" + str(boneidx)
+        if (bone.name in self.used_bones):
+            if (self.config["use_anim_action_all"]):
+                self.operator.report({'WARNING'}, 'Bone name "' + bone.name +
+                                     '" used in more than one skeleton. '
+                                     'Actions might export wrong.')
+        else:
+            self.used_bones.append(bone.name)
+
+        si["bone_index"][bone.name] = boneidx
+        si["bone_ids"][bone] = boneid
+        si["bone_names"].append(bonesid)
+        self.writel(S_NODES, il, '<node id="' + boneid + '" sid="' +
+                    bonesid + '" name="' + bone.name + '" type="JOINT">')
+        il += 1
+        xform = bone.matrix_local
+        si["bone_bind_poses"].append((si["armature_xform"] * xform).inverted())
+
+        if (bone.parent is not None):
+            xform = bone.parent.matrix_local.inverted() * xform
+        else:
+            si["skeleton_nodes"].append(boneid)
+
+        self.writel(S_NODES, il, '<matrix sid="transform">' +
+                    strmtx(xform) + '</matrix>')
+        for c in bone.children:
+            self.export_armature_bone(c, il, si)
+        il -= 1
+        self.writel(S_NODES, il, '</node>')
+
+    def export_armature_node(self, node, il):
+        if (node.data is None):
+            return
+
+        self.skeletons.append(node)
+
+        armature = node.data
+        self.skeleton_info[node] = {
+            "bone_count": 0,
+            "id": self.new_id("skelbones"),
+            "name": node.name, "bone_index": {},
+            "bone_ids": {}, "bone_names": [], "bone_bind_poses": [],
+            "skeleton_nodes": [],
+            "armature_xform": node.matrix_world}
+
+        for b in armature.bones:
+            if (b.parent is not None):
+                continue
+            self.export_armature_bone(b, il, self.skeleton_info[node])
+
+        if (node.pose):
+            for b in node.pose.bones:
+                for x in b.constraints:
+                    if (x.type == 'ACTION'):
+                        self.action_constraints.append(x.action)
+
+    def export_camera_node(self, node, il):
+        if (node.data is None):
+            return
+
+        camera = node.data
+        camid = self.new_id("camera")
+        self.writel(S_CAMS, 1, '<camera id="' + camid +
+                    '" name="' + camera.name + '">')
+        self.writel(S_CAMS, 2, '<optics>')
+        self.writel(S_CAMS, 3, '<technique_common>')
+        if (camera.type == "PERSP"):
+            self.writel(S_CAMS, 4, '<perspective>')
+            self.writel(S_CAMS, 5, '<yfov> ' +
+                        # I think?
+                        str(math.degrees(camera.angle)) + ' </yfov>')
+            self.writel(S_CAMS, 5, '<aspect_ratio> ' +
+                        str(self.scene.render.resolution_x /
+                            self.scene.render.resolution_y) +
+                        ' </aspect_ratio>')
+            self.writel(S_CAMS, 5, '<znear> ' +
+                        str(camera.clip_start) + ' </znear>')
+            self.writel(S_CAMS, 5, '<zfar> ' +
+                        str(camera.clip_end) + ' </zfar>')
+            self.writel(S_CAMS, 4, '</perspective>')
+        else:
+            self.writel(S_CAMS, 4, '<orthographic>')
+            self.writel(S_CAMS, 5, '<xmag> ' +
+                        str(camera.ortho_scale * 0.5) + ' </xmag>')  # I think?
+            self.writel(S_CAMS, 5, '<aspect_ratio> ' + str(
+                self.scene.render.resolution_x /
+                self.scene.render.resolution_y) + ' </aspect_ratio>')
+            self.writel(S_CAMS, 5, '<znear> ' +
+                        str(camera.clip_start) + ' </znear>')
+            self.writel(S_CAMS, 5, '<zfar> ' +
+                        str(camera.clip_end) + ' </zfar>')
+            self.writel(S_CAMS, 4, '</orthographic>')
+
+        self.writel(S_CAMS, 3, '</technique_common>')
+        self.writel(S_CAMS, 2, '</optics>')
+        self.writel(S_CAMS, 1, '</camera>')
+
+        self.writel(S_NODES, il, '<instance_camera url="#' + camid + '"/>')
+
+    def export_lamp_node(self, node, il):
+        if (node.data is None):
+            return
+
+        light = node.data
+        lightid = self.new_id("light")
+        self.writel(S_LAMPS, 1, '<light id="' + lightid +
+                    '" name="' + light.name + '">')
+        # self.writel(S_LAMPS, 2, '<optics>')
+        self.writel(S_LAMPS, 3, '<technique_common>')
+
+        if (light.type == "POINT"):
+            self.writel(S_LAMPS, 4, '<point>')
+            self.writel(S_LAMPS, 5, '<color>' +
+                        strarr(light.color) + '</color>')
+            # convert to linear attenuation
+            att_by_distance = 2.0 / light.distance
+            self.writel(S_LAMPS, 5, '<linear_attenuation>' +
+                        str(att_by_distance) + '</linear_attenuation>')
+            if (light.use_sphere):
+                self.writel(S_LAMPS, 5, '<zfar>' +
+                            str(light.distance) + '</zfar>')
+
+            self.writel(S_LAMPS, 4, '</point>')
+        elif (light.type == "SPOT"):
+            self.writel(S_LAMPS, 4, '<spot>')
+            self.writel(S_LAMPS, 5, '<color>' +
+                        strarr(light.color) + '</color>')
+            # convert to linear attenuation
+            att_by_distance = 2.0 / light.distance
+            self.writel(S_LAMPS, 5, '<linear_attenuation>' +
+                        str(att_by_distance) + '</linear_attenuation>')
+            self.writel(S_LAMPS, 5, '<falloff_angle>' +
+                        str(math.degrees(light.spot_size / 2)) +
+                        '</falloff_angle>')
+            self.writel(S_LAMPS, 4, '</spot>')
+
+        else:  # write a sun lamp for everything else (not supported)
+            self.writel(S_LAMPS, 4, '<directional>')
+            self.writel(S_LAMPS, 5, '<color>' +
+                        strarr(light.color) + '</color>')
+            self.writel(S_LAMPS, 4, '</directional>')
+
+        self.writel(S_LAMPS, 3, '</technique_common>')
+        # self.writel(S_LAMPS, 2, '</optics>')
+        self.writel(S_LAMPS, 1, '</light>')
+
+        self.writel(S_NODES, il, '<instance_light url="#' + lightid + '"/>')
+
+    def export_empty_node(self, node, il):
+        self.writel(S_NODES, 4, '<extra>')
+        self.writel(S_NODES, 5, '<technique profile="GODOT">')
+        self.writel(S_NODES, 6, '<empty_draw_type>' +
+                    node.empty_draw_type + '</empty_draw_type>')
+        self.writel(S_NODES, 5, '</technique>')
+        self.writel(S_NODES, 4, '</extra>')
+
+    def export_curve(self, curve):
+        splineid = self.new_id("spline")
+
+        self.writel(S_GEOM, 1, '<geometry id="' +
+                    splineid + '" name="' + curve.name + '">')
+        self.writel(S_GEOM, 2, '<spline closed="0">')
+
+        points = []
+        interps = []
+        handles_in = []
+        handles_out = []
+        tilts = []
+
+        for cs in curve.splines:
+
+            if (cs.type == "BEZIER"):
+                for s in cs.bezier_points:
+                    points.append(s.co[0])
+                    points.append(s.co[1])
+                    points.append(s.co[2])
+
+                    handles_in.append(s.handle_left[0])
+                    handles_in.append(s.handle_left[1])
+                    handles_in.append(s.handle_left[2])
+
+                    handles_out.append(s.handle_right[0])
+                    handles_out.append(s.handle_right[1])
+                    handles_out.append(s.handle_right[2])
+
+                    tilts.append(s.tilt)
+                    interps.append("BEZIER")
+            else:
+
+                for s in cs.points:
+                    points.append(s.co[0])
+                    points.append(s.co[1])
+                    points.append(s.co[2])
+                    handles_in.append(s.co[0])
+                    handles_in.append(s.co[1])
+                    handles_in.append(s.co[2])
+                    handles_out.append(s.co[0])
+                    handles_out.append(s.co[1])
+                    handles_out.append(s.co[2])
+                    tilts.append(s.tilt)
+                    interps.append("LINEAR")
+
+        self.writel(S_GEOM, 3, '<source id="' + splineid + '-positions">')
+        position_values = ""
+        for x in points:
+            position_values += " " + str(x)
+        self.writel(S_GEOM, 4, '<float_array id="' + splineid +
+                    '-positions-array" count="' +
+                    str(len(points)) + '">' + position_values +
+                    '</float_array>')
+        self.writel(S_GEOM, 4, '<technique_common>')
+        self.writel(S_GEOM, 4, '<accessor source="#' + splineid +
+                    '-positions-array" count="' + str(len(points) / 3) +
+                    '" stride="3">')
+        self.writel(S_GEOM, 5, '<param name="X" type="float"/>')
+        self.writel(S_GEOM, 5, '<param name="Y" type="float"/>')
+        self.writel(S_GEOM, 5, '<param name="Z" type="float"/>')
+        self.writel(S_GEOM, 4, '</accessor>')
+        self.writel(S_GEOM, 3, '</source>')
+
+        self.writel(S_GEOM, 3, '<source id="' + splineid + '-intangents">')
+        intangent_values = ""
+        for x in handles_in:
+            intangent_values += " " + str(x)
+        self.writel(S_GEOM, 4, '<float_array id="' + splineid +
+                    '-intangents-array" count="' +
+                    str(len(points)) + '">' + intangent_values +
+                    '</float_array>')
+        self.writel(S_GEOM, 4, '<technique_common>')
+        self.writel(S_GEOM, 4, '<accessor source="#' + splineid +
+                    '-intangents-array" count="' + str(len(points) / 3) +
+                    '" stride="3">')
+        self.writel(S_GEOM, 5, '<param name="X" type="float"/>')
+        self.writel(S_GEOM, 5, '<param name="Y" type="float"/>')
+        self.writel(S_GEOM, 5, '<param name="Z" type="float"/>')
+        self.writel(S_GEOM, 4, '</accessor>')
+        self.writel(S_GEOM, 3, '</source>')
+
+        self.writel(S_GEOM, 3, '<source id="' + splineid + '-outtangents">')
+        outtangent_values = ""
+        for x in handles_out:
+            outtangent_values += " " + str(x)
+        self.writel(S_GEOM, 4, '<float_array id="' + splineid +
+                    '-outtangents-array" count="' +
+                    str(len(points)) + '">' + outtangent_values +
+                    '</float_array>')
+        self.writel(S_GEOM, 4, '<technique_common>')
+        self.writel(S_GEOM, 4, '<accessor source="#' + splineid +
+                    '-outtangents-array" count="' + str(len(points) / 3) +
+                    '" stride="3">')
+        self.writel(S_GEOM, 5, '<param name="X" type="float"/>')
+        self.writel(S_GEOM, 5, '<param name="Y" type="float"/>')
+        self.writel(S_GEOM, 5, '<param name="Z" type="float"/>')
+        self.writel(S_GEOM, 4, '</accessor>')
+        self.writel(S_GEOM, 3, '</source>')
+
+        self.writel(S_GEOM, 3, '<source id="' + splineid + '-interpolations">')
+        interpolation_values = ""
+        for x in interps:
+            interpolation_values += " " + x
+        self.writel(S_GEOM, 4, '<Name_array id="' + splineid +
+                    '-interpolations-array" count="' +
+                    str(len(interps)) + '">' + interpolation_values +
+                    '</Name_array>')
+        self.writel(S_GEOM, 4, '<technique_common>')
+        self.writel(S_GEOM, 4, '<accessor source="#' + splineid +
+                    '-interpolations-array" count="' + str(len(interps)) +
+                    '" stride="1">')
+        self.writel(S_GEOM, 5, '<param name="INTERPOLATION" type="name"/>')
+        self.writel(S_GEOM, 4, '</accessor>')
+        self.writel(S_GEOM, 3, '</source>')
+
+        self.writel(S_GEOM, 3, '<source id="' + splineid + '-tilts">')
+        tilt_values = ""
+        for x in tilts:
+            tilt_values += " " + str(x)
+        self.writel(S_GEOM, 4, '<float_array id="' + splineid +
+                    '-tilts-array" count="' +
+                    str(len(tilts)) + '">' + tilt_values + '</float_array>')
+        self.writel(S_GEOM, 4, '<technique_common>')
+        self.writel(S_GEOM, 4, '<accessor source="#' + splineid +
+                    '-tilts-array" count="' + str(len(tilts)) +
+                    '" stride="1">')
+        self.writel(S_GEOM, 5, '<param name="TILT" type="float"/>')
+        self.writel(S_GEOM, 4, '</accessor>')
+        self.writel(S_GEOM, 3, '</source>')
+
+        self.writel(S_GEOM, 3, '<control_vertices>')
+        self.writel(
+            S_GEOM, 4, '<input semantic="POSITION" source="#' + splineid +
+            '-positions"/>')
+        self.writel(S_GEOM, 4, '<input semantic="IN_TANGENT" source="#' +
+                    splineid + '-intangents"/>')
+        self.writel(S_GEOM, 4, '<input semantic="OUT_TANGENT" source="#' +
+                    splineid + '-outtangents"/>')
+        self.writel(S_GEOM, 4, '<input semantic="INTERPOLATION" source="#' +
+                    splineid + '-interpolations"/>')
+        self.writel(S_GEOM, 4, '<input semantic="TILT" source="#' +
+                    splineid + '-tilts"/>')
+        self.writel(S_GEOM, 3, '</control_vertices>')
+
+        self.writel(S_GEOM, 2, '</spline>')
+        self.writel(S_GEOM, 1, '</geometry>')
+
+        return splineid
+
+    def export_curve_node(self, node, il):
+        if (node.data is None):
+            return
+
+        curveid = self.export_curve(node.data)
+
+        self.writel(S_NODES, il, '<instance_geometry url="#' + curveid + '">')
+        self.writel(S_NODES, il, '</instance_geometry>')
+
+    def export_node(self, node, il):
+        if (node not in self.valid_nodes):
+            return
+
+        prev_node = bpy.context.scene.objects.active
+        bpy.context.scene.objects.active = node
+
+        self.writel(S_NODES, il, '<node id="' + self.validate_id(node.name) +
+                    '" name="' + node.name + '" type="NODE">')
+        il += 1
+
+        self.writel(S_NODES, il, '<matrix sid="transform">' +
+                    strmtx(node.matrix_local) + '</matrix>')
+        # print("NODE TYPE: "+node.type+" NAME: "+node.name)
+        if (node.type == "MESH"):
+            self.export_mesh_node(node, il)
+        elif (node.type == "CURVE"):
+            self.export_curve_node(node, il)
+        elif (node.type == "ARMATURE"):
+            self.export_armature_node(node, il)
+        elif (node.type == "CAMERA"):
+            self.export_camera_node(node, il)
+        elif (node.type == "LAMP"):
+            self.export_lamp_node(node, il)
+        elif (node.type == "EMPTY"):
+            self.export_empty_node(node, il)
+
+        for x in node.children:
+            self.export_node(x, il)
+
+        il -= 1
+        self.writel(S_NODES, il, '</node>')
+        # make previous node active again
+        bpy.context.scene.objects.active = prev_node
+
+    def is_node_valid(self, node):
+        if (node.type not in self.config["object_types"]):
+            return False
+
+        if (self.config["use_active_layers"]):
+            valid = False
+            # print("NAME: "+node.name)
+            for i in range(20):
+                if (node.layers[i] and self.scene.layers[i]):
+                    valid = True
+                    break
+            if (not valid):
+                return False
+
+        if (self.config["use_export_selected"] and not node.select):
+            return False
+
+        return True
+
+    def export_scene(self):
+        self.writel(S_NODES, 0, '<library_visual_scenes>')
+        self.writel(S_NODES, 1, '<visual_scene id="' +
+                    self.scene_name + '" name="scene">')
+
+        # validate nodes
+        for obj in self.scene.objects:
+            if (obj in self.valid_nodes):
+                continue
+            if (self.is_node_valid(obj)):
+                n = obj
+                while (n is not None):
+                    if (n not in self.valid_nodes):
+                        self.valid_nodes.append(n)
+                    n = n.parent
+
+        for obj in self.scene.objects:
+            if (obj in self.valid_nodes and obj.parent is None):
+                self.export_node(obj, 2)
+
+        self.writel(S_NODES, 1, '</visual_scene>')
+        self.writel(S_NODES, 0, '</library_visual_scenes>')
+
+    def export_asset(self):
+        self.writel(S_ASSET, 0, '<asset>')
+        # Why is this time stuff mandatory?, no one could care less...
+        self.writel(S_ASSET, 1, '<contributor>')
+        # Who made Collada, the FBI ?
+        self.writel(S_ASSET, 2, '<author> Anonymous </author>')
+        # Who made Collada, the FBI ?
+        self.writel(
+            S_ASSET, 2, '<authoring_tool> Collada Exporter for Blender 2.6+, '
+            'by Juan Linietsky (juan@codenix.com) </authoring_tool>')
+        self.writel(S_ASSET, 1, '</contributor>')
+        self.writel(S_ASSET, 1, '<created>' +
+                    time.strftime("%Y-%m-%dT%H:%M:%SZ     ") + '</created>')
+        self.writel(S_ASSET, 1, '<modified>' +
+                    time.strftime("%Y-%m-%dT%H:%M:%SZ") + '</modified>')
+        self.writel(S_ASSET, 1, '<unit meter="1.0" name="meter"/>')
+        self.writel(S_ASSET, 1, '<up_axis>Z_UP</up_axis>')
+        self.writel(S_ASSET, 0, '</asset>')
+
+    def export_animation_transform_channel(self, target, keys, matrices=True):
+        frame_total = len(keys)
+        anim_id = self.new_id("anim")
+        self.writel(S_ANIM, 1, '<animation id="' + anim_id + '">')
+        source_frames = ""
+        source_transforms = ""
+        source_interps = ""
+
+        for k in keys:
+            source_frames += " " + str(k[0])
+            if (matrices):
+                source_transforms += " " + strmtx(k[1])
+            else:
+                source_transforms += " " + str(k[1])
+
+            source_interps += " LINEAR"
+
+        # Time Source
+        self.writel(S_ANIM, 2, '<source id="' + anim_id + '-input">')
+        self.writel(S_ANIM, 3, '<float_array id="' + anim_id +
+                    '-input-array" count="' +
+                    str(frame_total) + '">' + source_frames + '</float_array>')
+        self.writel(S_ANIM, 3, '<technique_common>')
+        self.writel(S_ANIM, 4, '<accessor source="#' + anim_id +
+                    '-input-array" count="' + str(frame_total) +
+                    '" stride="1">')
+        self.writel(S_ANIM, 5, '<param name="TIME" type="float"/>')
+        self.writel(S_ANIM, 4, '</accessor>')
+        self.writel(S_ANIM, 3, '</technique_common>')
+        self.writel(S_ANIM, 2, '</source>')
+
+        if (matrices):
+            # Transform Source
+            self.writel(S_ANIM, 2, '<source id="' +
+                        anim_id + '-transform-output">')
+            self.writel(S_ANIM, 3, '<float_array id="' + anim_id +
+                        '-transform-output-array" count="' +
+                        str(frame_total * 16) + '">' + source_transforms +
+                        '</float_array>')
+            self.writel(S_ANIM, 3, '<technique_common>')
+            self.writel(S_ANIM, 4, '<accessor source="#' + anim_id +
+                        '-transform-output-array" count="' + str(frame_total) +
+                        '" stride="16">')
+            self.writel(S_ANIM, 5, '<param name="TRANSFORM" type="float4x4"/>')
+            self.writel(S_ANIM, 4, '</accessor>')
+            self.writel(S_ANIM, 3, '</technique_common>')
+            self.writel(S_ANIM, 2, '</source>')
+        else:
+            # Value Source
+            self.writel(S_ANIM, 2, '<source id="' +
+                        anim_id + '-transform-output">')
+            self.writel(S_ANIM, 3, '<float_array id="' + anim_id +
+                        '-transform-output-array" count="' +
+                        str(frame_total) + '">' + source_transforms +
+                        '</float_array>')
+            self.writel(S_ANIM, 3, '<technique_common>')
+            self.writel(S_ANIM, 4, '<accessor source="#' + anim_id +
+                        '-transform-output-array" count="' + str(frame_total) +
+                        '" stride="1">')
+            self.writel(S_ANIM, 5, '<param name="X" type="float"/>')
+            self.writel(S_ANIM, 4, '</accessor>')
+            self.writel(S_ANIM, 3, '</technique_common>')
+            self.writel(S_ANIM, 2, '</source>')
+
+        # Interpolation Source
+        self.writel(S_ANIM, 2, '<source id="' +
+                    anim_id + '-interpolation-output">')
+        self.writel(S_ANIM, 3, '<Name_array id="' + anim_id +
+                    '-interpolation-output-array" count="' +
+                    str(frame_total) + '">' + source_interps + '</Name_array>')
+        self.writel(S_ANIM, 3, '<technique_common>')
+        self.writel(S_ANIM, 4, '<accessor source="#' + anim_id +
+                    '-interpolation-output-array" count="' + str(frame_total) +
+                    '" stride="1">')
+        self.writel(S_ANIM, 5, '<param name="INTERPOLATION" type="Name"/>')
+        self.writel(S_ANIM, 4, '</accessor>')
+        self.writel(S_ANIM, 3, '</technique_common>')
+        self.writel(S_ANIM, 2, '</source>')
+
+        self.writel(S_ANIM, 2, '<sampler id="' + anim_id + '-sampler">')
+        self.writel(S_ANIM, 3, '<input semantic="INPUT" source="#' +
+                    anim_id + '-input"/>')
+        self.writel(S_ANIM, 3, '<input semantic="OUTPUT" source="#' +
+                    anim_id + '-transform-output"/>')
+        self.writel(S_ANIM, 3, '<input semantic="INTERPOLATION" source="#' +
+                    anim_id + '-interpolation-output"/>')
+        self.writel(S_ANIM, 2, '</sampler>')
+        if (matrices):
+            self.writel(S_ANIM, 2, '<channel source="#' + anim_id +
+                        '-sampler" target="' + target + '/transform"/>')
+        else:
+            self.writel(S_ANIM, 2, '<channel source="#' +
+                        anim_id + '-sampler" target="' + target + '"/>')
+        self.writel(S_ANIM, 1, '</animation>')
+
+        return [anim_id]
+
+    def export_animation(self, start, end, allowed=None):
+        # Blender -> Collada frames needs a little work
+        # Collada starts from 0, blender usually from 1
+        # The last frame must be included also
+
+        frame_orig = self.scene.frame_current
+
+        frame_len = 1.0 / self.scene.render.fps
+        frame_total = end - start + 1
+        frame_sub = 0
+        if (start > 0):
+            frame_sub = start * frame_len
+
+        tcn = []
+        xform_cache = {}
+        blend_cache = {}
+        # Change frames first, export objects last
+        # This improves performance enormously
+
+        # print("anim from: " + str(start) + " to " + str(end) + " allowed: " +
+        #     str(allowed))
+        for t in range(start, end + 1):
+            self.scene.frame_set(t)
+            key = t * frame_len - frame_sub
+#            print("Export Anim Frame "+str(t)+"/"+str(self.scene.frame_end+1))
+
+            for node in self.scene.objects:
+
+                if (node not in self.valid_nodes):
+                    continue
+                if (allowed is not None and not (node in allowed)):
+                    if (node.type == "MESH" and node.data is not None and
+                        (node in self.armature_for_morph) and (
+                            self.armature_for_morph[node] in allowed)):
+                        # all good you pass with flying colors for morphs
+                        # inside of action
+                        pass
+                    else:
+                        # print("fail "+str((node in self.armature_for_morph)))
+                        continue
+                if (node.type == "MESH" and node.data is not None and
+                    node.data.shape_keys is not None and (
+                        node.data in self.mesh_cache) and len(
+                            node.data.shape_keys.key_blocks)):
+                    target = self.mesh_cache[node.data]["morph_id"]
+                    for i in range(len(node.data.shape_keys.key_blocks)):
+
+                        if (i == 0):
+                            continue
+
+                        name = target + "-morph-weights(" + str(i - 1) + ")"
+                        if (not (name in blend_cache)):
+                            blend_cache[name] = []
+
+                        blend_cache[name].append(
+                            (key, node.data.shape_keys.key_blocks[i].value))
+
+                if (node.type == "MESH" and node.parent and
+                        node.parent.type == "ARMATURE"):
+
+                    # In Collada, nodes that have skin modifier must not export
+                    # animation, animate the skin instead.
+                    continue
+
+                if (len(node.constraints) > 0 or
+                        node.animation_data is not None):
+                    # If the node has constraints, or animation data, then
+                    # export a sampled animation track
+                    name = self.validate_id(node.name)
+                    if (not (name in xform_cache)):
+                        xform_cache[name] = []
+
+                    mtx = node.matrix_world.copy()
+                    if (node.parent):
+                        mtx = node.parent.matrix_world.inverted() * mtx
+
+                    xform_cache[name].append((key, mtx))
+
+                if (node.type == "ARMATURE"):
+                    # All bones exported for now
+
+                    for bone in node.data.bones:
+
+                        bone_name = self.skeleton_info[node]["bone_ids"][bone]
+
+                        if (not (bone_name in xform_cache)):
+                            # print("has bone: " + bone_name)
+                            xform_cache[bone_name] = []
+
+                        posebone = node.pose.bones[bone.name]
+                        parent_posebone = None
+
+                        mtx = posebone.matrix.copy()
+                        if (bone.parent):
+                            parent_posebone = node.pose.bones[bone.parent.name]
+                            parent_invisible = False
+
+                            for i in range(3):
+                                if (parent_posebone.scale[i] == 0.0):
+                                    parent_invisible = True
+
+                            if (not parent_invisible):
+                                mtx = parent_posebone.matrix.inverted() * mtx
+
+                        xform_cache[bone_name].append((key, mtx))
+
+        self.scene.frame_set(frame_orig)
+
+        # export animation xml
+        for nid in xform_cache:
+            tcn += self.export_animation_transform_channel(
+                nid, xform_cache[nid], True)
+        for nid in blend_cache:
+            tcn += self.export_animation_transform_channel(
+                nid, blend_cache[nid], False)
+
+        return tcn
+
+    def export_animations(self):
+        tmp_mat = []
+        for s in self.skeletons:
+            tmp_bone_mat = []
+            for bone in s.pose.bones:
+                tmp_bone_mat.append(Matrix(bone.matrix_basis))
+                bone.matrix_basis = Matrix()
+            tmp_mat.append([Matrix(s.matrix_local), tmp_bone_mat])
+
+        self.writel(S_ANIM, 0, '<library_animations>')
+
+        if (self.config["use_anim_action_all"] and len(self.skeletons)):
+
+            cached_actions = {}
+
+            for s in self.skeletons:
+                if s.animation_data and s.animation_data.action:
+                    cached_actions[s] = s.animation_data.action.name
+
+            self.writel(S_ANIM_CLIPS, 0, '<library_animation_clips>')
+
+            for x in bpy.data.actions[:]:
+                if x.users == 0 or x in self.action_constraints:
+                    continue
+                if (self.config["use_anim_skip_noexp"] and
+                        x.name.endswith("-noexp")):
+                    continue
+
+                bones = []
+                # find bones used
+                for p in x.fcurves:
+                    dp = str(p.data_path)
+                    base = "pose.bones[\""
+                    if (dp.find(base) == 0):
+                        dp = dp[len(base):]
+                        if (dp.find('"') != -1):
+                            dp = dp[:dp.find('"')]
+                            if (dp not in bones):
+                                bones.append(dp)
+
+                allowed_skeletons = []
+                for i, y in enumerate(self.skeletons):
+                    if (y.animation_data):
+                        for z in y.pose.bones:
+                            if (z.bone.name in bones):
+                                if (y not in allowed_skeletons):
+                                    allowed_skeletons.append(y)
+                        y.animation_data.action = x
+
+                        y.matrix_local = tmp_mat[i][0]
+                        for j, bone in enumerate(s.pose.bones):
+                            bone.matrix_basis = Matrix()
+
+                # print("allowed skeletons "+str(allowed_skeletons))
+
+                # print(str(x))
+
+                tcn = self.export_animation(int(x.frame_range[0]), int(
+                    x.frame_range[1] + 0.5), allowed_skeletons)
+                framelen = (1.0 / self.scene.render.fps)
+                start = x.frame_range[0] * framelen
+                end = x.frame_range[1] * framelen
+                # print("Export anim: "+x.name)
+                self.writel(
+                    S_ANIM_CLIPS, 1, '<animation_clip name="' + x.name +
+                    '" start="' + str(start) + '" end="' + str(end) + '">')
+                for z in tcn:
+                    self.writel(S_ANIM_CLIPS, 2,
+                                '<instance_animation url="#' + z + '"/>')
+                self.writel(S_ANIM_CLIPS, 1, '</animation_clip>')
+                if (len(tcn) == 0):
+                    self.operator.report(
+                        {'WARNING'}, 'Animation clip "' + x.name +
+                        '" contains no tracks.')
+
+            self.writel(S_ANIM_CLIPS, 0, '</library_animation_clips>')
+
+            for i, s in enumerate(self.skeletons):
+                if (s.animation_data is None):
+                    continue
+                if s in cached_actions:
+                    s.animation_data.action = bpy.data.actions[
+                        cached_actions[s]]
+                else:
+                    s.animation_data.action = None
+                    for j, bone in enumerate(s.pose.bones):
+                        bone.matrix_basis = tmp_mat[i][1][j]
+
+        else:
+            self.export_animation(self.scene.frame_start, self.scene.frame_end)
+
+        self.writel(S_ANIM, 0, '</library_animations>')
+
+    def export(self):
+        self.writel(S_GEOM, 0, '<library_geometries>')
+        self.writel(S_CONT, 0, '<library_controllers>')
+        self.writel(S_CAMS, 0, '<library_cameras>')
+        self.writel(S_LAMPS, 0, '<library_lights>')
+        self.writel(S_IMGS, 0, '<library_images>')
+        self.writel(S_MATS, 0, '<library_materials>')
+        self.writel(S_FX, 0, '<library_effects>')
+
+        self.skeletons = []
+        self.action_constraints = []
+        self.export_asset()
+        self.export_scene()
+
+        self.writel(S_GEOM, 0, '</library_geometries>')
+
+        # morphs always go before skin controllers
+        if S_MORPH in self.sections:
+            for l in self.sections[S_MORPH]:
+                self.writel(S_CONT, 0, l)
+            del self.sections[S_MORPH]
+
+        # morphs always go before skin controllers
+        if S_SKIN in self.sections:
+            for l in self.sections[S_SKIN]:
+                self.writel(S_CONT, 0, l)
+            del self.sections[S_SKIN]
+
+        self.writel(S_CONT, 0, '</library_controllers>')
+        self.writel(S_CAMS, 0, '</library_cameras>')
+        self.writel(S_LAMPS, 0, '</library_lights>')
+        self.writel(S_IMGS, 0, '</library_images>')
+        self.writel(S_MATS, 0, '</library_materials>')
+        self.writel(S_FX, 0, '</library_effects>')
+
+        if (self.config["use_anim"]):
+            self.export_animations()
+
+        try:
+            f = open(self.path, "wb")
+        except:
+            return False
+
+        f.write(bytes('<?xml version="1.0" encoding="utf-8"?>\n', "UTF-8"))
+        f.write(bytes(
+            '<COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" '
+            'version="1.4.1">\n', "UTF-8"))
+
+        s = []
+        for x in self.sections.keys():
+            s.append(x)
+        s.sort()
+        for x in s:
+            for l in self.sections[x]:
+                f.write(bytes(l + "\n", "UTF-8"))
+
+        f.write(bytes('<scene>\n', "UTF-8"))
+        f.write(bytes('\t<instance_visual_scene url="#' +
+                      self.scene_name + '" />\n', "UTF-8"))
+        f.write(bytes('</scene>\n', "UTF-8"))
+        f.write(bytes('</COLLADA>\n', "UTF-8"))
+        return True
+
+    def __init__(self, path, kwargs, operator):
+        self.operator = operator
+        self.scene = bpy.context.scene
+        self.last_id = 0
+        self.scene_name = self.new_id("scene")
+        self.sections = {}
+        self.path = path
+        self.mesh_cache = {}
+        self.curve_cache = {}
+        self.material_cache = {}
+        self.image_cache = {}
+        self.skeleton_info = {}
+        self.config = kwargs
+        self.valid_nodes = []
+        self.armature_for_morph = {}
+        self.used_bones = []
+        self.wrongvtx_report = False
+
+
+def save(operator, context, filepath="", use_selection=False, **kwargs):
+    exp = DaeExporter(filepath, kwargs, operator)
+    exp.export()
+
+    return {'FINISHED'}  # so the script wont run after we have batch exported.
diff --git a/tools/translations/ar.po b/tools/translations/ar.po
index 772404006a..a6c34268b1 100644
--- a/tools/translations/ar.po
+++ b/tools/translations/ar.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor\n"
-"PO-Revision-Date: 2016-06-19 08:49+0000\n"
+"PO-Revision-Date: 2016-06-20 11:18+0000\n"
 "Last-Translator: Mohammmad Khashashneh <mohammad.rasmi@gmail.com>\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/godot-engine/"
 "godot/ar/>\n"
@@ -64,7 +64,7 @@ msgid ""
 "order for AnimatedSprite to display frames."
 msgstr ""
 "ليتم إظهار الأطر (اللقطات) في الAnimatedSprite (النقوش المتحركة), يجب تكوين "
-"مصدر لها من نوع  SpriteFrames و ضبط خاصية الFrames (الأطر) بها. "
+"مصدر لها من نوع  SpriteFrames و ضبط خاصية الFrames (الأطر) بها."
 
 #: scene/2d/canvas_modulate.cpp
 msgid ""
@@ -640,10 +640,6 @@ msgid "Change Anim Loop"
 msgstr ""
 
 #: tools/editor/animation_editor.cpp
-msgid "Change Anim Loop Interpolation"
-msgstr ""
-
-#: tools/editor/animation_editor.cpp
 msgid "Anim Create Typed Value Key"
 msgstr ""
 
@@ -684,10 +680,6 @@ msgid "Enable/Disable looping in animation."
 msgstr ""
 
 #: tools/editor/animation_editor.cpp
-msgid "Enable/Disable interpolation when looping animation."
-msgstr ""
-
-#: tools/editor/animation_editor.cpp
 msgid "Add new tracks."
 msgstr ""
 
@@ -952,7 +944,7 @@ msgid "Method in target Node must be specified!"
 msgstr ""
 
 #: tools/editor/connections_dialog.cpp
-msgid "Conect To Node:"
+msgid "Connect To Node:"
 msgstr ""
 
 #: tools/editor/connections_dialog.cpp tools/editor/groups_editor.cpp
@@ -1165,6 +1157,46 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Back"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Forward"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Refresh"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Hidden Files"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Favorite"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Mode"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Focus Path"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Mode Favorite Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Mode Favorite Down"
+msgstr ""
+
 #: tools/editor/editor_file_dialog.cpp tools/editor/scenes_dock.cpp
 msgid "Favorites:"
 msgstr ""
@@ -1418,8 +1450,23 @@ msgstr ""
 
 #: tools/editor/editor_node.cpp
 msgid ""
-"No main scene has ever been defined.\n"
-"Select one from \"Project Settings\" under the 'application' category."
+"No main scene has ever been defined, select one?\n"
+"You can change it later in later in \"Project Settings\" under the "
+"'application' category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' does not exist, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' is not a scene file, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
 msgstr ""
 
 #: tools/editor/editor_node.cpp
@@ -1512,6 +1559,10 @@ msgid ""
 "(Unsaved changes will be lost)"
 msgstr ""
 
+#: tools/editor/editor_node.cpp
+msgid "Pick a Manu Scene"
+msgstr ""
+
 #: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
 msgid "Ugh"
 msgstr ""
@@ -1535,7 +1586,7 @@ msgid "Save Layout"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
-msgid "Load Layout"
+msgid "Delete Layout"
 msgstr ""
 
 #: tools/editor/editor_node.cpp tools/editor/project_export.cpp
@@ -1543,10 +1594,6 @@ msgid "Default"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
-msgid "Delete Layout"
-msgstr ""
-
-#: tools/editor/editor_node.cpp
 msgid "Switch Scene Tab"
 msgstr ""
 
@@ -1576,6 +1623,14 @@ msgid "Distraction Free Mode"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
+msgid "Next tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Previous tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
 msgid "Operations with scene files."
 msgstr ""
 
@@ -2118,6 +2173,12 @@ msgid "No target font resource!"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"Invalid file extension.\n"
+"Please use .fnt."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Can't load/process source font."
 msgstr ""
 
@@ -2353,7 +2414,7 @@ msgid "Couldn't load post-import script:"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
-msgid "Invalid/broken script for post-import:"
+msgid "Invalid/broken script for post-import (check console):"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -3016,13 +3077,11 @@ msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Offset:"
 msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Step:"
 msgstr ""
 
@@ -3138,7 +3197,6 @@ msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Show Grid"
 msgstr ""
 
@@ -3391,6 +3449,10 @@ msgid "MeshInstance lacks a Mesh!"
 msgstr ""
 
 #: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh has not surface to create outlines from!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
 msgid "Could not create outline!"
 msgstr ""
 
@@ -3752,17 +3814,14 @@ msgid "Clear UV"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Snap"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Enable Snap"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid"
 msgstr ""
 
@@ -4598,17 +4657,43 @@ msgid "StyleBox Preview:"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Texture Region Editor"
+msgid "Snap Mode:"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Scale Region Editor"
+msgid "<None>"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid ""
-"No texture in this node.\n"
-"Set a texture to be able to edit region."
+msgid "Pixel Snap"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Grid Snap"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Auto Slice"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Offset:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Step:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Separation:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region Editor"
 msgstr ""
 
 #: tools/editor/plugins/theme_editor_plugin.cpp
@@ -5670,31 +5755,27 @@ msgid "Error duplicating scene to save it."
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "New Scene Root"
-msgstr ""
-
-#: tools/editor/scene_tree_dock.cpp
-msgid "Inherit Scene"
+msgid "Edit Groups"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Add Child Node"
+msgid "Edit Connections"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Instance Child Scene"
+msgid "Delete Node(s)"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Change Type"
+msgid "Add Child Node"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Groups"
+msgid "Instance Child Scene"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Connections"
+msgid "Change Type"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
@@ -5710,10 +5791,6 @@ msgid "Save Branch as Scene"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Delete Node(s)"
-msgstr ""
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add/Create a New Node"
 msgstr ""
 
diff --git a/tools/translations/bg.po b/tools/translations/bg.po
new file mode 100644
index 0000000000..247585d5a3
--- /dev/null
+++ b/tools/translations/bg.po
@@ -0,0 +1,6213 @@
+# Bulgarian translation of the Godot Engine editor
+# Copyright (C) 2016 Juan Linietsky, Ariel Manzur and the Godot community
+# This file is distributed under the same license as the Godot source code.
+#
+# Bojidar Marinov <bojidar.marinov.bg@gmail.com>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Godot Engine editor\n"
+"PO-Revision-Date: 2016-06-27 15:36+0000\n"
+"Last-Translator: Bojidar Marinov <bojidar.marinov.bg@gmail.com>\n"
+"Language-Team: Bulgarian <https://hosted.weblate.org/projects/godot-engine/"
+"godot/bg/>\n"
+"Language: bg\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 2.7-dev\n"
+
+#: modules/gdscript/gd_functions.cpp
+msgid "Invalid type argument to convert(), use TYPE_* constants."
+msgstr ""
+"Невалиден агрумент тип на convert(), използвайте константите започващи с "
+"TYPE_*."
+
+#: modules/gdscript/gd_functions.cpp
+msgid "Not enough bytes for decoding bytes, or invalid format."
+msgstr "Недостатъчно байтове за декодиране на байтовете, или невалиден формат."
+
+#: modules/gdscript/gd_functions.cpp
+msgid "step argument is zero!"
+msgstr "Стъпката на range() е нула!"
+
+#: modules/gdscript/gd_functions.cpp
+#, fuzzy
+msgid "Not a script with an instance"
+msgstr "Скриптът няма инстанция"
+
+#: modules/gdscript/gd_functions.cpp
+#, fuzzy
+msgid "Not based on a script"
+msgstr "Обектът не е базиран на скрипт"
+
+#: modules/gdscript/gd_functions.cpp
+#, fuzzy
+msgid "Not based on a resource file"
+msgstr "Обектът не е базиран на ресурсен файл"
+
+#: modules/gdscript/gd_functions.cpp
+#, fuzzy
+msgid "Invalid instance dictionary format (missing @path)"
+msgstr "Невалиден формат на инстанцията в речника (липсва @path)"
+
+#: modules/gdscript/gd_functions.cpp
+msgid "Invalid instance dictionary format (can't load script at @path)"
+msgstr ""
+"Невалиден формат на инстанцията в речника (скриптът в @path не може да бъде "
+"зареден)"
+
+#: modules/gdscript/gd_functions.cpp
+msgid "Invalid instance dictionary format (invalid script at @path)"
+msgstr ""
+"Невалиден формат на инстанцията в речника (скриптът в @path е невалиден)"
+
+#: modules/gdscript/gd_functions.cpp
+#, fuzzy
+msgid "Invalid instance dictionary (invalid subclasses)"
+msgstr "Невалиден формат на инстанцията в речника (невалиден подклас)"
+
+#: scene/2d/animated_sprite.cpp
+msgid ""
+"A SpriteFrames resource must be created or set in the 'Frames' property in "
+"order for AnimatedSprite to display frames."
+msgstr ""
+"За да може AnimatedSprite да показва кадри, първо трябва да му се даде "
+"SpriteFrames ресурс в парамертъра 'Frames'."
+
+#: scene/2d/canvas_modulate.cpp
+#, fuzzy
+msgid ""
+"Only one visible CanvasModulate is allowed per scene (or set of instanced "
+"scenes). The first created one will work, while the rest will be ignored."
+msgstr ""
+"Може да има само един видим CanvasModulate на сцене (или няколко "
+"инстанцирани сцени). Само първият ще работи, а всички останали - игнорирани."
+
+#: scene/2d/collision_polygon_2d.cpp
+msgid ""
+"CollisionPolygon2D only serves to provide a collision shape to a "
+"CollisionObject2D derived node. Please only use it as a child of Area2D, "
+"StaticBody2D, RigidBody2D, KinematicBody2D, etc. to give them a shape."
+msgstr ""
+"CollisionPolygon2D служи само за да даде форма за колизии на "
+"CollisionObject2D. Моля, използвайте го само като наследник на Area2D, "
+"StaticBody2D, RigidBody2D, KinematicBody2D, и т.н. за да им дадете форма."
+
+#: scene/2d/collision_polygon_2d.cpp
+msgid "An empty CollisionPolygon2D has no effect on collision."
+msgstr "Празен CollisionPolygon2D няма никакъв ефект на колизията."
+
+#: scene/2d/collision_shape_2d.cpp
+msgid ""
+"CollisionShape2D only serves to provide a collision shape to a "
+"CollisionObject2D derived node. Please only use it as a child of Area2D, "
+"StaticBody2D, RigidBody2D, KinematicBody2D, etc. to give them a shape."
+msgstr ""
+"CollisionShape2D служи само за да даде форма за колизии на "
+"CollisionObject2D. Моля, използвайте го само като наследник на Area2D, "
+"StaticBody2D, RigidBody2D, KinematicBody2D, и т.н. за да им дадете форма."
+
+#: scene/2d/collision_shape_2d.cpp
+#, fuzzy
+msgid ""
+"A shape must be provided for CollisionShape2D to function. Please create a "
+"shape resource for it!"
+msgstr ""
+"За да работи CollisionShape2D, е нужно да му се даде форма. Моля, създайте "
+"му Shape2D ресурс."
+
+#: scene/2d/light_2d.cpp
+msgid ""
+"A texture with the shape of the light must be supplied to the 'texture' "
+"property."
+msgstr ""
+"Тесктура с нужната форма на светлината трябва да бъде дадена в параметъра "
+"'texture'."
+
+#: scene/2d/light_occluder_2d.cpp
+msgid ""
+"An occluder polygon must be set (or drawn) for this occluder to take effect."
+msgstr ""
+"Затъмняващият многоъгълник трябва да бъде зададен (или нарисуван) за да може "
+"да работи тази сянка."
+
+#: scene/2d/light_occluder_2d.cpp
+msgid "The occluder polygon for this occluder is empty. Please draw a polygon!"
+msgstr "Затъмняващият многоъгълник е празен. Моля, нарисувайте един."
+
+#: scene/2d/navigation_polygon.cpp
+msgid ""
+"A NavigationPolygon resource must be set or created for this node to work. "
+"Please set a property or draw a polygon."
+msgstr ""
+"На този нод трябва да бъде даден един NavigationPolygon ресурс. Моля, "
+"задайте или нарисувайте един многоъгълник."
+
+#: scene/2d/navigation_polygon.cpp
+msgid ""
+"NavigationPolygonInstance must be a child or grandchild to a Navigation2D "
+"node. It only provides navigation data."
+msgstr ""
+"NavigationPolygonInstance трябва да бъде наследник или наследник на "
+"наследник на Navigation2D. Той само дава навигационна информация."
+
+#: scene/2d/parallax_layer.cpp
+msgid ""
+"ParallaxLayer node only works when set as child of a ParallaxBackground node."
+msgstr "ParallaxLayer работи само когато е наследник на ParallaxBackground."
+
+#: scene/2d/particles_2d.cpp
+msgid "Path property must point to a valid Particles2D node to work."
+msgstr ""
+"Параметъра 'Path' трябва да сочи към работещ Particles2D нод за да работи."
+
+#: scene/2d/path_2d.cpp
+msgid "PathFollow2D only works when set as a child of a Path2D node."
+msgstr "PathFollow2D работи само когато е наследник на Path2D."
+
+#: scene/2d/remote_transform_2d.cpp
+msgid "Path property must point to a valid Node2D node to work."
+msgstr "Параметъра 'Path' трябва да сочи към Node2D нод за да работи."
+
+#: scene/2d/sample_player_2d.cpp scene/audio/sample_player.cpp
+msgid ""
+"A SampleLibrary resource must be created or set in the 'samples' property in "
+"order for SamplePlayer to play sound."
+msgstr ""
+"За да изпълнява звук, SamplePlayer трябва да има един SampleLibrary ресурс в "
+"параметъра 'samples'."
+
+#: scene/2d/sprite.cpp
+msgid ""
+"Path property must point to a valid Viewport node to work. Such Viewport "
+"must be set to 'render target' mode."
+msgstr ""
+"Параметъра 'Path' трябва да сочи към валиден Viewport нод за да работи. Този "
+"Viewport трябва да бъде настройен в режим 'рендъринг цел'(render target)."
+
+#: scene/2d/sprite.cpp
+msgid ""
+"The Viewport set in the path property must be set as 'render target' in "
+"order for this sprite to work."
+msgstr ""
+
+#: scene/2d/visibility_notifier_2d.cpp
+msgid ""
+"VisibilityEnable2D works best when used with the edited scene root directly "
+"as parent."
+msgstr ""
+
+#: scene/3d/body_shape.cpp
+msgid ""
+"CollisionShape only serves to provide a collision shape to a CollisionObject "
+"derived node. Please only use it as a child of Area, StaticBody, RigidBody, "
+"KinematicBody, etc. to give them a shape."
+msgstr ""
+
+#: scene/3d/body_shape.cpp
+msgid ""
+"A shape must be provided for CollisionShape to function. Please create a "
+"shape resource for it!"
+msgstr ""
+
+#: scene/3d/collision_polygon.cpp
+msgid ""
+"CollisionPolygon only serves to provide a collision shape to a "
+"CollisionObject derived node. Please only use it as a child of Area, "
+"StaticBody, RigidBody, KinematicBody, etc. to give them a shape."
+msgstr ""
+
+#: scene/3d/collision_polygon.cpp
+msgid "An empty CollisionPolygon has no effect on collision."
+msgstr ""
+
+#: scene/3d/navigation_mesh.cpp
+msgid "A NavigationMesh resource must be set or created for this node to work."
+msgstr ""
+
+#: scene/3d/navigation_mesh.cpp
+msgid ""
+"NavigationMeshInstance must be a child or grandchild to a Navigation node. "
+"It only provides navigation data."
+msgstr ""
+
+#: scene/3d/scenario_fx.cpp
+msgid ""
+"Only one WorldEnvironment is allowed per scene (or set of instanced scenes)."
+msgstr ""
+
+#: scene/3d/spatial_sample_player.cpp
+msgid ""
+"A SampleLibrary resource must be created or set in the 'samples' property in "
+"order for SpatialSamplePlayer to play sound."
+msgstr ""
+
+#: scene/3d/sprite_3d.cpp
+msgid ""
+"A SpriteFrames resource must be created or set in the 'Frames' property in "
+"order for AnimatedSprite3D to display frames."
+msgstr ""
+
+#: scene/gui/dialogs.cpp tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Cancel"
+msgstr ""
+
+#: scene/gui/dialogs.cpp
+msgid "OK"
+msgstr ""
+
+#: scene/gui/dialogs.cpp
+msgid "Alert!"
+msgstr ""
+
+#: scene/gui/dialogs.cpp
+msgid "Please Confirm..."
+msgstr ""
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+msgid "File Exists, Overwrite?"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+msgid "All Recognized"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+msgid "All Files (*)"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+#: tools/editor/editor_help.cpp tools/editor/editor_node.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp tools/editor/quick_open.cpp
+#: tools/editor/scenes_dock.cpp
+msgid "Open"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp
+msgid "Open a File"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp
+msgid "Open File(s)"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp
+msgid "Open a Directory"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp
+msgid "Open a File or Directory"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+#: tools/editor/editor_node.cpp
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Save"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+msgid "Save a File"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_dir_dialog.cpp
+#: tools/editor/editor_file_dialog.cpp
+msgid "Create Folder"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+#: tools/editor/project_settings.cpp tools/editor/script_create_dialog.cpp
+msgid "Path:"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+msgid "Directories & Files:"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+#: tools/editor/script_editor_debugger.cpp
+msgid "File:"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+msgid "Filter:"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_dir_dialog.cpp
+#: tools/editor/editor_file_dialog.cpp tools/editor/editor_plugin_settings.cpp
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Name:"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_dir_dialog.cpp
+#: tools/editor/editor_file_dialog.cpp
+msgid "Could not create folder."
+msgstr ""
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+msgid "Must use a valid extension."
+msgstr ""
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+#: tools/editor/settings_config_dialog.cpp
+msgid "Shift+"
+msgstr ""
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+#: tools/editor/settings_config_dialog.cpp
+msgid "Alt+"
+msgstr ""
+
+#: scene/gui/input_action.cpp
+msgid "Ctrl+"
+msgstr ""
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+#: tools/editor/settings_config_dialog.cpp
+msgid "Meta+"
+msgstr ""
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+msgid "Device"
+msgstr ""
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+msgid "Button"
+msgstr ""
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+msgid "Left Button."
+msgstr ""
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+msgid "Right Button."
+msgstr ""
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+msgid "Middle Button."
+msgstr ""
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+msgid "Wheel Up."
+msgstr ""
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+msgid "Wheel Down."
+msgstr ""
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+msgid "Axis"
+msgstr ""
+
+#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Cut"
+msgstr ""
+
+#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/property_editor.cpp tools/editor/resources_dock.cpp
+msgid "Copy"
+msgstr ""
+
+#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+#: tools/editor/property_editor.cpp tools/editor/resources_dock.cpp
+msgid "Paste"
+msgstr ""
+
+#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/project_export.cpp
+msgid "Select All"
+msgstr ""
+
+#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp tools/editor/editor_log.cpp
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+#: tools/editor/plugins/rich_text_editor_plugin.cpp
+#: tools/editor/property_editor.cpp tools/editor/script_editor_debugger.cpp
+msgid "Clear"
+msgstr ""
+
+#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp tools/editor/editor_node.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Undo"
+msgstr ""
+
+#: scene/gui/popup.cpp
+msgid ""
+"Popups will hide by default unless you call popup() or any of the popup*() "
+"functions. Making them visible for editing is fine though, but they will "
+"hide upon running."
+msgstr ""
+
+#: scene/main/viewport.cpp
+msgid ""
+"This viewport is not set as render target. If you intend for it to display "
+"its contents directly to the screen, make it a child of a Control so it can "
+"obtain a size. Otherwise, make it a RenderTarget and assign its internal "
+"texture to some node for display."
+msgstr ""
+
+#: scene/resources/dynamic_font.cpp
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Error initializing FreeType."
+msgstr ""
+
+#: scene/resources/dynamic_font.cpp
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Unknown font format."
+msgstr ""
+
+#: scene/resources/dynamic_font.cpp
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Error loading font."
+msgstr ""
+
+#: scene/resources/dynamic_font.cpp
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Invalid font size."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Disabled"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "All Selection"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Move Add Key"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Change Transition"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Change Transform"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Change Value"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Change Call"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Add Track"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Move Anim Track Up"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Move Anim Track Down"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Remove Anim Track"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Duplicate Keys"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Set Transitions to:"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Track Rename"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Track Change Interpolation"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Track Change Value Mode"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Edit Node Curve"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Edit Selection Curve"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Delete Keys"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Continuous"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Discrete"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Trigger"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Add Key"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Move Keys"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Scale Selection"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Scale From Cursor"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Duplicate Selection"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Duplicate Transposed"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Goto Next Step"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Goto Prev Step"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp tools/editor/property_editor.cpp
+msgid "Linear"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Constant"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "In"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Out"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "In-Out"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Out-In"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Transitions"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Optimize Animation"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Clean-Up Animation"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Create NEW track for %s and insert key?"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Create %d NEW tracks and insert keys?"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp tools/editor/create_dialog.cpp
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+#: tools/editor/plugins/particles_editor_plugin.cpp
+#: tools/editor/project_manager.cpp tools/editor/script_create_dialog.cpp
+msgid "Create"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Create & Insert"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Insert Track & Key"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Insert Key"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Change Anim Len"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Change Anim Loop"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Create Typed Value Key"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Insert"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Scale Keys"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Add Call Track"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Animation zoom."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Length (s):"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Animation length (in seconds)."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Step (s):"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Cursor step snap (in seconds)."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Enable/Disable looping in animation."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Add new tracks."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Move current track up."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Move current track down."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Remove selected track."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Track tools"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Enable editing of individual keys by clicking them."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim. Optimizer"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Max. Linear Error:"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Max. Angular Error:"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Max Optimizable Angle:"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Optimize"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Key"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Transition"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Scale Ratio:"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Call Functions in Which Node?"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Remove invalid keys"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Remove unresolved and empty tracks"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Clean-up all animations"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Clean-Up Animation(s) (NO UNDO!)"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Clean-Up"
+msgstr ""
+
+#: tools/editor/array_property_edit.cpp
+msgid "Resize Array"
+msgstr ""
+
+#: tools/editor/array_property_edit.cpp
+msgid "Change Array Value Type"
+msgstr ""
+
+#: tools/editor/array_property_edit.cpp
+msgid "Change Array Value"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp tools/editor/create_dialog.cpp
+#: tools/editor/editor_help.cpp tools/editor/editor_node.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp tools/editor/quick_open.cpp
+#: tools/editor/settings_config_dialog.cpp
+msgid "Search:"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+msgid "Sort:"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+msgid "Reverse"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+#: tools/editor/project_settings.cpp
+msgid "Category:"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+msgid "All"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+msgid "Site:"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+msgid "Support.."
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+msgid "Official"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+msgid "Community"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+msgid "Testing"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+msgid "Assets ZIP File"
+msgstr ""
+
+#: tools/editor/call_dialog.cpp
+msgid "Method List For '%s':"
+msgstr ""
+
+#: tools/editor/call_dialog.cpp
+msgid "Call"
+msgstr ""
+
+#: tools/editor/call_dialog.cpp tools/editor/connections_dialog.cpp
+#: tools/editor/import_settings.cpp
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+#: tools/editor/project_settings.cpp tools/editor/property_editor.cpp
+#: tools/editor/run_settings_dialog.cpp tools/editor/settings_config_dialog.cpp
+msgid "Close"
+msgstr ""
+
+#: tools/editor/call_dialog.cpp
+msgid "Method List:"
+msgstr ""
+
+#: tools/editor/call_dialog.cpp
+msgid "Arguments:"
+msgstr ""
+
+#: tools/editor/call_dialog.cpp
+msgid "Return:"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Go to Line"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Line Number:"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "No Matches"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Replaced %d Ocurrence(s)."
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Replace"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Replace All"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Match Case"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Whole Words"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Selection Only"
+msgstr ""
+
+#: tools/editor/code_editor.cpp tools/editor/editor_help.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/project_settings.cpp
+msgid "Search"
+msgstr ""
+
+#: tools/editor/code_editor.cpp tools/editor/editor_help.cpp
+msgid "Find"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Next"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Replaced %d ocurrence(s)."
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Not found!"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Replace By"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Case Sensitive"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Backwards"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Prompt On Replace"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Skip"
+msgstr ""
+
+#: tools/editor/code_editor.cpp tools/editor/script_editor_debugger.cpp
+msgid "Line:"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Col:"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Method in target Node must be specified!"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Connect To Node:"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp tools/editor/groups_editor.cpp
+#: tools/editor/plugins/item_list_editor_plugin.cpp
+#: tools/editor/plugins/theme_editor_plugin.cpp
+#: tools/editor/project_settings.cpp
+msgid "Add"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp tools/editor/dependency_editor.cpp
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+#: tools/editor/plugins/theme_editor_plugin.cpp
+#: tools/editor/project_manager.cpp
+msgid "Remove"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Add Extra Call Argument:"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Extra Call Arguments:"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Path to Node:"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Make Function"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Deferred"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Oneshot"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Connect"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Connect '%s' to '%s'"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Connecting Signal:"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Create Subscription"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Connect.."
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Disconnect"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp tools/editor/node_dock.cpp
+msgid "Signals"
+msgstr ""
+
+#: tools/editor/create_dialog.cpp
+msgid "Create New"
+msgstr ""
+
+#: tools/editor/create_dialog.cpp tools/editor/editor_help.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp tools/editor/quick_open.cpp
+msgid "Matches:"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Search Replacement For:"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Dependencies For:"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid ""
+"Scene '%s' is currently being edited.\n"
+"Changes will not take effect unless reloaded."
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid ""
+"Resource '%s' is in use.\n"
+"Changes will take effect when reloaded."
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Dependencies"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Resource"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp tools/editor/project_manager.cpp
+#: tools/editor/project_settings.cpp
+msgid "Path"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Dependencies:"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Fix Broken"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Dependency Editor"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Search Replacement Resource:"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Owners Of:"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid ""
+"The files being removed are required by other resources in order for them to "
+"work.\n"
+"Remove them anyway? (no undo)"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Remove selected files from the project? (no undo)"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Error loading:"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Scene failed to load due to missing dependencies:"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Open Anyway"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Which action should be taken?"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Fix Dependencies"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Errors loading!"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Permanently delete %d item(s)? (No undo!)"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Owns"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Resources Without Explicit Ownership:"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp tools/editor/editor_node.cpp
+msgid "Orphan Resource Explorer"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Delete selected files?"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp tools/editor/editor_node.cpp
+#: tools/editor/plugins/item_list_editor_plugin.cpp
+#: tools/editor/scenes_dock.cpp
+msgid "Delete"
+msgstr ""
+
+#: tools/editor/editor_data.cpp
+msgid "Updating Scene"
+msgstr ""
+
+#: tools/editor/editor_data.cpp
+msgid "Storing local changes.."
+msgstr ""
+
+#: tools/editor/editor_data.cpp
+msgid "Updating scene.."
+msgstr ""
+
+#: tools/editor/editor_dir_dialog.cpp
+msgid "Choose a Directory"
+msgstr ""
+
+#: tools/editor/editor_dir_dialog.cpp
+msgid "Choose"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Back"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Forward"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Refresh"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Hidden Files"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Favorite"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Mode"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Focus Path"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Mode Favorite Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Mode Favorite Down"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp tools/editor/scenes_dock.cpp
+msgid "Favorites:"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Recent:"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Preview:"
+msgstr ""
+
+#: tools/editor/editor_file_system.cpp
+msgid "Cannot go into subdir:"
+msgstr ""
+
+#: tools/editor/editor_file_system.cpp
+msgid "ScanSources"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Search Classes"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Class List:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp tools/editor/property_editor.cpp
+msgid "Class:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp tools/editor/scene_tree_editor.cpp
+#: tools/editor/script_create_dialog.cpp
+msgid "Inherits:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Inherited by:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Brief Description:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Public Methods:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Members:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "GUI Theme Items:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Signals:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Constants:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp tools/editor/script_editor_debugger.cpp
+msgid "Description:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Method Description:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Search Text"
+msgstr ""
+
+#: tools/editor/editor_import_export.cpp
+msgid "Added:"
+msgstr ""
+
+#: tools/editor/editor_import_export.cpp
+msgid "Removed:"
+msgstr ""
+
+#: tools/editor/editor_import_export.cpp tools/editor/project_export.cpp
+msgid "Error saving atlas:"
+msgstr ""
+
+#: tools/editor/editor_import_export.cpp
+msgid "Could not save atlas subtexture:"
+msgstr ""
+
+#: tools/editor/editor_import_export.cpp
+msgid "Storing File:"
+msgstr ""
+
+#: tools/editor/editor_import_export.cpp
+msgid "Packing"
+msgstr ""
+
+#: tools/editor/editor_import_export.cpp
+msgid "Exporting for %s"
+msgstr ""
+
+#: tools/editor/editor_import_export.cpp
+msgid "Setting Up.."
+msgstr ""
+
+#: tools/editor/editor_log.cpp
+msgid " Output:"
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/editor_reimport_dialog.cpp
+msgid "Re-Importing"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Importing:"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Node From Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/scenes_dock.cpp
+msgid "Re-Import.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/resources_dock.cpp
+msgid "Error saving resource!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/resources_dock.cpp
+msgid "Save Resource As.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
+msgid "I see.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Can't open file for writing:"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Requested file format unknown:"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Error while saving."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Saving Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Analyzing"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Creating Thumbnail"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Failed to load resource."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Can't load MeshLibrary for merging!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Error saving MeshLibrary!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Can't load TileSet for merging!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Error saving TileSet!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Can't open export templates zip."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Loading Export Templates"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Error trying to save layout!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Default editor layout overridden."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Layout name not found!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Restored default layout to base settings."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Copy Params"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Paste Params"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+msgid "Paste Resource"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Copy Resource"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Make Built-In"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Make Sub-Resources Unique"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Open in Help"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "There is no defined scene to run."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"No main scene has ever been defined, select one?\n"
+"You can change it later in later in \"Project Settings\" under the "
+"'application' category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' does not exist, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' is not a scene file, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Current scene was never saved, please save it prior to running."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Could not start subprocess!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Open Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Open Base Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Quick Open Scene.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Quick Open Script.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Yes"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Close scene? (Unsaved changes will be lost)"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Save Scene As.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "This scene has never been saved. Save before running?"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Please save the scene first."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Save Translatable Strings"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Export Mesh Library"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Export Tile Set"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Quit"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Exit the editor?"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Current scene not saved. Open anyway?"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Can't reload a scene that was never saved."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Revert"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "This action cannot be undone. Revert anyway?"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Quick Run Scene.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Open Project Manager? \n"
+"(Unsaved changes will be lost)"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Pick a Manu Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
+msgid "Ugh"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Error loading scene, it must be inside the project path. Use 'Import' to "
+"open the scene, then save it inside the project path."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Error loading scene."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Scene '%s' has broken dependencies:"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Save Layout"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Delete Layout"
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/project_export.cpp
+msgid "Default"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Switch Scene Tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "%d more file(s)"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "%d more file(s) or folder(s)"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Go to previously opened scene."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Fullscreen Mode"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Distraction Free Mode"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Next tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Previous tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Operations with scene files."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "New Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "New Inherited Scene.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Open Scene.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Save Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Close Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Close Goto Prev. Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Open Recent"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Quick Filter Files.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Convert To.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Translatable Strings.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "MeshLibrary.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "TileSet.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Redo"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Run Script"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Project Settings"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Revert Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Quit to Project List"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Import assets to the project."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+#: tools/editor/project_manager.cpp
+msgid "Import"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Miscellaneous project or scene-wide tools."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Tools"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Export the project to many platforms."
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/project_export.cpp
+msgid "Export"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Play the project."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Play"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Pause the scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Pause Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Stop the scene."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Stop"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Play the edited scene."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Play Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Play custom scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Debug options"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Deploy with Remote Debug"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"When exporting or deploying, the resulting executable will attempt to "
+"connect to the IP of this computer in order to be debugged."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Small Deploy with Network FS"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"When this option is enabled, export or deploy will produce a minimal "
+"executable.\n"
+"The filesystem will be provided from the project by the editor over the "
+"network.\n"
+"On Android, deploy will use the USB cable for faster performance. This "
+"option speeds up testing for games with a large footprint."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Visible Collision Shapes"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Collision shapes and raycast nodes (for 2D and 3D) will be visible on the "
+"running game if this option is turned on."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Visible Navigation"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Navigation meshes and polygons will be visible on the running game if this "
+"option is turned on."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Sync Scene Changes"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"When this option is turned on, any changes made to the scene in the editor "
+"will be replicated in the running game.\n"
+"When used remotely on a device, this is more efficient with network "
+"filesystem."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Sync Script Changes"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"When this option is turned on, any script that is saved will be reloaded on "
+"the running game.\n"
+"When used remotely on a device, this is more efficient with network "
+"filesystem."
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Settings"
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/settings_config_dialog.cpp
+msgid "Editor Settings"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Editor Layout"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Install Export Templates"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "About"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Alerts when an external resource has changed."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Spins when the editor window repaints!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Update Always"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Update Changes"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Inspector"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Create a new resource in memory and edit it."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Load an existing resource from disk and edit it."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Save the currently edited resource."
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/plugins/script_editor_plugin.cpp
+msgid "Save As.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Go to the previous edited object in history."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Go to the next edited object in history."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "History of recently edited objects."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Object properties."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "FileSystem"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Output"
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/editor_reimport_dialog.cpp
+#: tools/editor/import_settings.cpp
+msgid "Re-Import"
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/editor_plugin_settings.cpp
+msgid "Update"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Thanks from the Godot community!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Thanks!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Import Templates From ZIP File"
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/project_export.cpp
+msgid "Export Project"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Export Library"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Merge With Existing"
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/project_export.cpp
+msgid "Password:"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Open & Run a Script"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Load Errors"
+msgstr ""
+
+#: tools/editor/editor_plugin_settings.cpp
+msgid "Installed Plugins:"
+msgstr ""
+
+#: tools/editor/editor_plugin_settings.cpp
+msgid "Version:"
+msgstr ""
+
+#: tools/editor/editor_plugin_settings.cpp
+msgid "Author:"
+msgstr ""
+
+#: tools/editor/editor_plugin_settings.cpp
+msgid "Status:"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Stop Profiling"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Start Profiling"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Measure:"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Frame Time (sec)"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Average Time (sec)"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Frame %"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Fixed Frame %"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp tools/editor/script_editor_debugger.cpp
+msgid "Time:"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Inclusive"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Self"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Frame #:"
+msgstr ""
+
+#: tools/editor/editor_reimport_dialog.cpp
+msgid "Please wait for scan to complete."
+msgstr ""
+
+#: tools/editor/editor_reimport_dialog.cpp
+msgid "Current scene must be saved to re-import."
+msgstr ""
+
+#: tools/editor/editor_reimport_dialog.cpp
+msgid "Save & Re-Import"
+msgstr ""
+
+#: tools/editor/editor_reimport_dialog.cpp
+msgid "Re-Import Changed Resources"
+msgstr ""
+
+#: tools/editor/editor_run_script.cpp
+msgid "Write your logic in the _run() method."
+msgstr ""
+
+#: tools/editor/editor_run_script.cpp
+msgid "There is an edited scene already."
+msgstr ""
+
+#: tools/editor/editor_run_script.cpp
+msgid "Couldn't instance script:"
+msgstr ""
+
+#: tools/editor/editor_run_script.cpp
+msgid "Did you forget the 'tool' keyword?"
+msgstr ""
+
+#: tools/editor/editor_run_script.cpp
+msgid "Couldn't run script:"
+msgstr ""
+
+#: tools/editor/editor_run_script.cpp
+msgid "Did you forget the '_run' method?"
+msgstr ""
+
+#: tools/editor/editor_settings.cpp
+msgid "Default (Same as Editor)"
+msgstr ""
+
+#: tools/editor/editor_sub_scene.cpp
+msgid "Select Node(s) to Import"
+msgstr ""
+
+#: tools/editor/editor_sub_scene.cpp
+msgid "Scene Path:"
+msgstr ""
+
+#: tools/editor/editor_sub_scene.cpp
+msgid "Import From Node:"
+msgstr ""
+
+#: tools/editor/file_type_cache.cpp
+msgid "Can't open file_type_cache.cch for writing, not saving file type cache!"
+msgstr ""
+
+#: tools/editor/groups_editor.cpp
+msgid "Add to Group"
+msgstr ""
+
+#: tools/editor/groups_editor.cpp
+msgid "Remove from Group"
+msgstr ""
+
+#: tools/editor/import_settings.cpp
+msgid "Imported Resources"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+msgid "No bit masks to import!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Target path is empty."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Target path must be a complete resource path."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Target path must exist."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+msgid "Save path is empty!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+msgid "Import BitMasks"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Source Texture(s):"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Target Path:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Accept"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+msgid "Bit Mask"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "No source font file!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "No target font resource!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"Invalid file extension.\n"
+"Please use .fnt."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Can't load/process source font."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Couldn't save font."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Source Font:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Source Font Size:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Dest Resource:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "The quick brown fox jumps over the lazy dog."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Test:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Options:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Font Import"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"This file is already a Godot font file, please supply a BMFont type file "
+"instead."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Failed opening as BMFont file."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Invalid font custom source."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Font"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+msgid "No meshes to import!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+msgid "Single Mesh Import"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+msgid "Source Mesh(es):"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+msgid "Surface %d"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+msgid "No samples to import!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+msgid "Import Audio Samples"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+msgid "Source Sample(s):"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+msgid "Audio Sample"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "New Clip"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Animation Options"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Flags"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Bake FPS:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Optimizer"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Max Linear Error"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Max Angular Error"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Max Angle"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Clips"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+#: tools/editor/project_manager.cpp tools/editor/project_settings.cpp
+msgid "Name"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Start(s)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "End(s)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Loop"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Filters"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Source path is empty."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Couldn't load post-import script."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Invalid/broken script for post-import."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Error importing scene."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Import 3D Scene"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Source Scene:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Same as Target Scene"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Shared"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Target Texture Folder:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Post-Process Script:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Custom Root Node Type:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Auto"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "The Following Files are Missing:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Import Anyway"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Import & Open"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Edited scene has not been saved, open imported scene anyway?"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+msgid "Import Scene"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Importing Scene.."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Running Custom Script.."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Couldn't load post-import script:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Invalid/broken script for post-import (check console):"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Error running post-import script:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Import Image:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Can't import a file over itself:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Couldn't localize path: %s (already local)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Saving.."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "3D Scene Animation"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Uncompressed"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Compress Lossless (PNG)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Compress Lossy (WebP)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Compress (VRAM)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Texture Format"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Texture Compression Quality (WebP):"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Texture Options"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Please specify some files!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "At least one file needed for Atlas."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Error importing:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Only one file is required for large texture."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Max Texture Size:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Import Textures for Atlas (2D)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Cell Size:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Large Texture"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Import Large Textures (2D)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Source Texture"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Base Atlas Texture"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Source Texture(s)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Import Textures for 2D"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Import Textures for 3D"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Import Textures"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "2D Texture"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "3D Texture"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Atlas Texture"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid ""
+"NOTICE: Importing 2D textures is not mandatory. Just copy png/jpg files to "
+"the project."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Crop empty space."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Texture"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Import Large Texture"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Load Source Image"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Slicing"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Inserting"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Saving"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Couldn't save large texture:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Build Atlas For:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Loading Image:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Couldn't load image:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Converting Images"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Cropping Images"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Blitting Images"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Couldn't save atlas image:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Couldn't save converted texture:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Invalid source!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Invalid translation source!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Column"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+#: tools/editor/script_create_dialog.cpp
+msgid "Language"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "No items to import!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "No target path!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Import Translations"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Couldn't import!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Import Translation"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Source CSV:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Ignore First Row"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Compress"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Add to Project (engine.cfg)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Import Languages:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Translation"
+msgstr ""
+
+#: tools/editor/multi_node_edit.cpp
+msgid "MultiNode Set"
+msgstr ""
+
+#: tools/editor/node_dock.cpp
+msgid "Node"
+msgstr ""
+
+#: tools/editor/node_dock.cpp
+msgid "Groups"
+msgstr ""
+
+#: tools/editor/node_dock.cpp
+msgid "Select a Node to edit Signals and Groups."
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Toggle Autoplay"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "New Animation Name:"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "New Anim"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Change Animation Name:"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Remove Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "ERROR: Invalid animation name!"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "ERROR: Animation name already exists!"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Rename Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Add Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Blend Next Changed"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Change Blend Time"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Load Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Duplicate Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "ERROR: No animation to copy!"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "ERROR: No animation resource on clipboard!"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Pasted Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Paste Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "ERROR: No animation to edit!"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Play selected animation backwards from current pos. (A)"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Play selected animation backwards from end. (Shift+A)"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Stop animation playback. (S)"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Play selected animation from start. (Shift+D)"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Play selected animation from current pos. (D)"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Animation position (in seconds)."
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Scale animation playback globally for the node."
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Create new animation in player."
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Load animation from disk."
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Load an animation from disk."
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Save the current animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Save As"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Display list of animations in player."
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Autoplay on Load"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Edit Target Blend Times"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Animation Tools"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Copy Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Create New Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Animation Name:"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+#: tools/editor/property_editor.cpp tools/editor/script_create_dialog.cpp
+msgid "Error!"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Blend Times:"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Next (Auto Queue):"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Cross-Animation Blend Times"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "New name:"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Scale:"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Fade In (s):"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Fade Out (s):"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Blend"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Mix"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Auto Restart:"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Restart (s):"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Random Restart (s):"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Start!"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Amount:"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Blend:"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Blend 0:"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Blend 1:"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "X-Fade Time (s):"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Current:"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Add Input"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Clear Auto-Advance"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Set Auto-Advance"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Delete Input"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Rename"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Animation tree is valid."
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Animation tree is invalid."
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Animation Node"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "OneShot Node"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Mix Node"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Blend2 Node"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Blend3 Node"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Blend4 Node"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "TimeScale Node"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "TimeSeek Node"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Transition Node"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Import Animations.."
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Edit Node Filters"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Filters.."
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Parsing %d Triangles:"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Triangle #"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Light Baker Setup:"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Parsing Geometry"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Fixing Lights"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Making BVH"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Creating Light Octree"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Creating Octree Texture"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Transfer to Lightmaps:"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Allocating Texture #"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Baking Triangle #"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Post-Processing Texture #"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_editor_plugin.cpp
+msgid "BakedLightInstance does not contain a BakedLight resource."
+msgstr ""
+
+#: tools/editor/plugins/baked_light_editor_plugin.cpp
+msgid "Bake!"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_editor_plugin.cpp
+msgid "Reset the lightmap octree baking process (start over)."
+msgstr ""
+
+#: tools/editor/plugins/camera_editor_plugin.cpp
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Preview"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Configure Snap"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Grid Offset:"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Grid Step:"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Rotation Offset:"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Rotation Step:"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Move Pivot"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Move Action"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Edit IK Chain"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Edit CanvasItem"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Change Anchors"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Zoom (%):"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Paste Pose"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Select Mode (Q)"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Drag: Rotate"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Alt+Drag: Move"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Press 'v' to Change Pivot, 'Shift+v' to Drag Pivot (while moving)."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Alt+RMB: Depth list selection"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Move Mode (W)"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Rotate Mode (E)"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid ""
+"Show a list of all objects at the position clicked\n"
+"(same as Alt+RMB in select mode)."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Click to change object's rotation pivot."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Pan Mode"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Lock the selected object in place (can't be moved)."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Unlock the selected object (can be moved)."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Makes sure the object's children are not selectable."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Restores the object's children's ability to be selected."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/project_manager.cpp
+msgid "Edit"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Use Snap"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Show Grid"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Use Rotation Snap"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Snap Relative"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Configure Snap.."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Use Pixel Snap"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Expand to Parent"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Skeleton.."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Make Bones"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Clear Bones"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Make IK Chain"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Clear IK Chain"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "View"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Zoom In"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Zoom Out"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Zoom Reset"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Zoom Set.."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Center Selection"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Frame Selection"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Anchor"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Insert Keys (Ins)"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Insert Key"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Insert Key (Existing Tracks)"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Copy Pose"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Clear Pose"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Set a Value"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Snap (Pixels):"
+msgstr ""
+
+#: tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Create Poly"
+msgstr ""
+
+#: tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/collision_polygon_editor_plugin.cpp
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Edit Poly"
+msgstr ""
+
+#: tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/collision_polygon_editor_plugin.cpp
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Edit Poly (Remove Point)"
+msgstr ""
+
+#: tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+msgid "Create a new polygon from scratch."
+msgstr ""
+
+#: tools/editor/plugins/collision_polygon_editor_plugin.cpp
+msgid "Create Poly3D"
+msgstr ""
+
+#: tools/editor/plugins/collision_shape_2d_editor_plugin.cpp
+msgid "Set Handle"
+msgstr ""
+
+#: tools/editor/plugins/color_ramp_editor_plugin.cpp
+msgid "Add/Remove Color Ramp Point"
+msgstr ""
+
+#: tools/editor/plugins/color_ramp_editor_plugin.cpp
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Modify Color Ramp"
+msgstr ""
+
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+msgid "Creating Mesh Library"
+msgstr ""
+
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+msgid "Thumbnail.."
+msgstr ""
+
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+msgid "Remove item %d?"
+msgstr ""
+
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+#: tools/editor/plugins/theme_editor_plugin.cpp
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
+msgid "Add Item"
+msgstr ""
+
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+msgid "Remove Selected Item"
+msgstr ""
+
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+msgid "Import from Scene"
+msgstr ""
+
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+msgid "Update from Scene"
+msgstr ""
+
+#: tools/editor/plugins/item_list_editor_plugin.cpp
+msgid "Item %d"
+msgstr ""
+
+#: tools/editor/plugins/item_list_editor_plugin.cpp
+msgid "Items"
+msgstr ""
+
+#: tools/editor/plugins/item_list_editor_plugin.cpp
+msgid "Item List Editor"
+msgstr ""
+
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+msgid "Create Occluder Polygon"
+msgstr ""
+
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+msgid "Edit existing polygon:"
+msgstr ""
+
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+msgid "LMB: Move Point."
+msgstr ""
+
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+msgid "Ctrl+LMB: Split Segment."
+msgstr ""
+
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+msgid "RMB: Erase Point."
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh is empty!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Static Trimesh Body"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Static Convex Body"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "This doesn't work on scene root!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Trimesh Shape"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Convex Shape"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Navigation Mesh"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "MeshInstance lacks a Mesh!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh has not surface to create outlines from!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Could not create outline!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Outline"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Trimesh Static Body"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Convex Static Body"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Trimesh Collision Sibling"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Convex Collision Sibling"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Outline Mesh.."
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Outline Mesh"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Outline Size:"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "No mesh source specified (and no MultiMesh set in node)."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "No mesh source specified (and MultiMesh contains no Mesh)."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Mesh source is invalid (invalid path)."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Mesh source is invalid (not a MeshInstance)."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Mesh source is invalid (contains no Mesh resource)."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "No surface source specified."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Surface source is invalid (invalid path)."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Surface source is invalid (no geometry)."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Surface source is invalid (no faces)."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Parent has no solid faces to populate."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Couldn't map area."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Select a Source Mesh:"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Select a Target Surface:"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Populate Surface"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Populate MultiMesh"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Target Surface:"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Source Mesh:"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "X-Axis"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Y-Axis"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Z-Axis"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Mesh Up Axis:"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Random Rotation:"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Random Tilt:"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Random Scale:"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Populate"
+msgstr ""
+
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+msgid "Create Navigation Polygon"
+msgstr ""
+
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+msgid "Remove Poly And Point"
+msgstr ""
+
+#: tools/editor/plugins/particles_2d_editor_plugin.cpp
+msgid "Error loading image:"
+msgstr ""
+
+#: tools/editor/plugins/particles_2d_editor_plugin.cpp
+msgid "No pixels with transparency > 128 in image.."
+msgstr ""
+
+#: tools/editor/plugins/particles_2d_editor_plugin.cpp
+msgid "Set Emission Mask"
+msgstr ""
+
+#: tools/editor/plugins/particles_2d_editor_plugin.cpp
+msgid "Clear Emission Mask"
+msgstr ""
+
+#: tools/editor/plugins/particles_2d_editor_plugin.cpp
+msgid "Load Emission Mask"
+msgstr ""
+
+#: tools/editor/plugins/particles_2d_editor_plugin.cpp
+msgid "Generated Point Count:"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Node does not contain geometry."
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Node does not contain geometry (faces)."
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Faces contain no area!"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "No faces!"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Generate AABB"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Create Emitter From Mesh"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Create Emitter From Node"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Clear Emitter"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Create Emitter"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Emission Positions:"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Emission Fill:"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Surface"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Volume"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+msgid "Remove Point from Curve"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Add Point to Curve"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+msgid "Move Point in Curve"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+msgid "Move In-Control in Curve"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+msgid "Move Out-Control in Curve"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Select Points"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Shift+Drag: Select Control Points"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Click: Add Point"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Right Click: Delete Point"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+msgid "Select Control Points (Shift+Drag)"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Add Point (in empty space)"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Split Segment (in curve)"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Delete Point"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Close Curve"
+msgstr ""
+
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Curve Point #"
+msgstr ""
+
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Set Curve Point Pos"
+msgstr ""
+
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Set Curve In Pos"
+msgstr ""
+
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Set Curve Out Pos"
+msgstr ""
+
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Split Path"
+msgstr ""
+
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Remove Path Point"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Create UV Map"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Transform UV Map"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Polygon 2D UV Editor"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Move Point"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Ctrl: Rotate"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Shift: Move All"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Shift+Ctrl: Scale"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Move Polygon"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Rotate Polygon"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Scale Polygon"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Polygon->UV"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "UV->Polygon"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Clear UV"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Snap"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Enable Snap"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Grid"
+msgstr ""
+
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+msgid "ERROR: Couldn't load resource!"
+msgstr ""
+
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+msgid "Add Resource"
+msgstr ""
+
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+msgid "Rename Resource"
+msgstr ""
+
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Delete Resource"
+msgstr ""
+
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+msgid "Resource clipboard is empty!"
+msgstr ""
+
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Load Resource"
+msgstr ""
+
+#: tools/editor/plugins/rich_text_editor_plugin.cpp
+msgid "Parse BBCode"
+msgstr ""
+
+#: tools/editor/plugins/sample_editor_plugin.cpp
+msgid "Length:"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Open Sample File(s)"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "ERROR: Couldn't load sample!"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Add Sample"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Rename Sample"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Delete Sample"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "16 Bits"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "8 Bits"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Stereo"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Mono"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+#: tools/editor/script_editor_debugger.cpp
+msgid "Format"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Pitch"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Error while saving theme"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Error saving"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Error importing theme"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Error importing"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Import Theme"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Save Theme As.."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/project_export.cpp
+msgid "File"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/property_editor.cpp
+msgid "New"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Save All"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "History Prev"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "History Next"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Reload Theme"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Save Theme"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Save Theme As"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/scene_tree_dock.cpp
+msgid "Move Up"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/scene_tree_dock.cpp
+msgid "Move Down"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Indent Left"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Indent Right"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Toggle Comment"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Clone Down"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Complete Symbol"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Trim Trailing Whitespace"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Auto Indent"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Soft Reload Script"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Find.."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Find Next"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Find Previous"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Replace.."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Goto Function.."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Goto Line.."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Debug"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Toggle Breakpoint"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Remove All Breakpoints"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Goto Next Breakpoint"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Goto Previous Breakpoint"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/script_editor_debugger.cpp
+msgid "Step Over"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/script_editor_debugger.cpp
+msgid "Step Into"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/script_editor_debugger.cpp
+msgid "Break"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/script_editor_debugger.cpp
+msgid "Continue"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Keep Debugger Open"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Window"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Move Left"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Move Right"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Help"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Contextual Help"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Tutorials"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Open https://godotengine.org at tutorials section."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Classes"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Search the class hierarchy."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Search Help"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Search the reference documentation."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Go to previous edited document."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Go to next edited document."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Create Script"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid ""
+"The following files are newer on disk.\n"
+"What action should be taken?:"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Reload"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Resave"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/script_editor_debugger.cpp
+msgid "Debugger"
+msgstr ""
+
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Vertex"
+msgstr ""
+
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Fragment"
+msgstr ""
+
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Lighting"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Scalar Constant"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Vec Constant"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change RGB Constant"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Scalar Operator"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Vec Operator"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Vec Scalar Operator"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change RGB Operator"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Toggle Rot Only"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Scalar Function"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Vec Function"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Scalar Uniform"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Vec Uniform"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change RGB Uniform"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Default Value"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change XForm Uniform"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Texture Uniform"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Cubemap Uniform"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Comment"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Add/Remove to Color Ramp"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Add/Remove to Curve Map"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Modify Curve Map"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Input Name"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Connect Graph Nodes"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Disconnect Graph Nodes"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Remove Shader Graph Node"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Move Shader Graph Node"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Duplicate Graph Node(s)"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Delete Shader Graph Node(s)"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Error: Cyclic Connection Link"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Error: Missing Input Connections"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Add Shader Graph Node"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Orthogonal"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Perspective"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Transform Aborted."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "X-Axis Transform."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Y-Axis Transform."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Z-Axis Transform."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "View Plane Transform."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Scaling to %s%%."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Rotating %s degrees."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Bottom View."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Bottom"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Top View."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Top"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Rear View."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Rear"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Front View."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Front"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Left View."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Left"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Right View."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Right"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Keying is disabled (no key inserted)."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Animation Key Inserted."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Align with view"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Top (Num7)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Bottom (Shift+Num7)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Left (Num3)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Right (Shift+Num3)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Front (Num1)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Rear (Shift+Num1)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Perspective (Num5)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Orthogonal (Num5)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Environment"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Audio Listener"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Gizmos"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Selection (F)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Align with view (Ctrl+Shift+F)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "XForm Dialog"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "No scene selected to instance!"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Instance at Cursor"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Could not instance scene!"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Scale Mode (R)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Transform"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Local Coords"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Transform Dialog.."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Use Default Light"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Use Default sRGB"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "1 Viewport"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "2 Viewports"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "2 Viewports (Alt)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "3 Viewports"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "3 Viewports (Alt)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "4 Viewports"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Display Normal"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Display Wireframe"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Display Overdraw"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Display Shadeless"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "View Origin"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "View Grid"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Snap Settings"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Translate Snap:"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Rotate Snap (deg.):"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Scale Snap (%):"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Viewport Settings"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Default Light Normal:"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Ambient Light Color:"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Perspective FOV (deg.):"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "View Z-Near:"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "View Z-Far:"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Transform Change"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Translate:"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Rotate (deg.):"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Scale (ratio):"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Transform Type"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Pre"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Post"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "ERROR: Couldn't load frame resource!"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Add Frame"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Resource clipboard is empty or not a texture!"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Paste Frame"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Add Empty"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Change Animation Loop"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Change Animation FPS"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "(empty)"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Animations"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Speed (FPS):"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Animation Frames"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Insert Empty (Before)"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Insert Empty (After)"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Up"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Down"
+msgstr ""
+
+#: tools/editor/plugins/style_box_editor_plugin.cpp
+msgid "StyleBox Preview:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Snap Mode:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "<None>"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Pixel Snap"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Grid Snap"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Auto Slice"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Offset:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Step:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Separation:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region Editor"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Can't save theme to file:"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Add All Items"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Add All"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
+msgid "Remove Item"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Add Class Items"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Remove Class Items"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Create Empty Template"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Create Empty Editor Template"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "CheckBox Radio1"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "CheckBox Radio2"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Item"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Check Item"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Checked Item"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Has"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Many"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp tools/editor/project_export.cpp
+msgid "Options"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Have,Many,Several,Options!"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Tab 1"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Tab 2"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Tab 3"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+#: tools/editor/project_settings.cpp tools/editor/scene_tree_editor.cpp
+#: tools/editor/script_editor_debugger.cpp
+msgid "Type:"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Data Type:"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Icon"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Style"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Color"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Paint TileMap"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+#: tools/editor/scene_tree_dock.cpp
+msgid "Duplicate"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Erase TileMap"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Erase selection"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Find tile"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Transpose"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Mirror X"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Mirror Y"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Bucket"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Pick Tile"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Select"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Rotate 0 degrees"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Rotate 90 degrees"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Rotate 180 degrees"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Rotate 270 degrees"
+msgstr ""
+
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
+msgid "Could not find tile:"
+msgstr ""
+
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
+msgid "Item name or ID:"
+msgstr ""
+
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
+msgid "Create from scene?"
+msgstr ""
+
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
+msgid "Merge from scene?"
+msgstr ""
+
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
+msgid "Create from Scene"
+msgstr ""
+
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
+msgid "Merge from Scene"
+msgstr ""
+
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
+#: tools/editor/script_editor_debugger.cpp
+msgid "Error"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Edit Script Options"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Please export outside the project folder!"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Error exporting project!"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Error writing the project PCK!"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "No exporter for platform '%s' yet."
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Include"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Change Image Group"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Group name can't be empty!"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Invalid character in group name!"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Group name already exists!"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Add Image Group"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Delete Image Group"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Atlas Preview"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Project Export Settings"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Target"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Export to Platform"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Resources"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Export selected resources (including dependencies)."
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Export all resources in the project."
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Export all files in the project directory."
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Export Mode:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Resources to Export:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Action"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid ""
+"Filters to export non-resource files (comma-separated, e.g.: *.json, *.txt):"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Filters to exclude from export (comma-separated, e.g.: *.json, *.txt):"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Convert text scenes to binary on export."
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Images"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Keep Original"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Compress for Disk (Lossy, WebP)"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Compress for RAM (BC/PVRTC/ETC)"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Convert Images (*.png):"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Compress for Disk (Lossy) Quality:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Shrink All Images:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Compress Formats:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Image Groups"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Groups:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Compress Disk"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Compress RAM"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Compress Mode:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Lossy Quality:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Atlas:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Shrink By:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Preview Atlas"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Image Filter:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Images:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Select None"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Group"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Samples"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Sample Conversion Mode: (.wav files):"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Keep"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Compress (RAM - IMA-ADPCM)"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Sampling Rate Limit (Hz):"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Trim"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Trailing Silence:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Script"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Script Export Mode:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Text"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Compiled"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Encrypted (Provide Key Below)"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Script Encryption Key (256-bits as hex):"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Export PCK/Zip"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Export Project PCK"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Export.."
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Project Export"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Export Preset:"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Invalid project path, the path must exist!"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Invalid project path, engine.cfg must not exist."
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Invalid project path, engine.cfg must exist."
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Imported Project"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Invalid project path (changed anything?)."
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Couldn't create engine.cfg in project path."
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Import Existing Project"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Project Path (Must Exist):"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Project Name:"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Create New Project"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Project Path:"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Browse"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "New Game Project"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "That's a BINGO!"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Unnamed Project"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Are you sure to open more than one projects?"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Are you sure to run more than one projects?"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Remove project from the list? (Folder contents will not be modified)"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Project Manager"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Project List"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Run"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Scan"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "New Project"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Exit"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Key "
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Joy Button"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Joy Axis"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Mouse Button"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Invalid action (anything goes but '/' or ':')."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Action '%s' already exists!"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Rename Input Action Event"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Add Input Action Event"
+msgstr ""
+
+#: tools/editor/project_settings.cpp tools/editor/settings_config_dialog.cpp
+msgid "Control+"
+msgstr ""
+
+#: tools/editor/project_settings.cpp tools/editor/settings_config_dialog.cpp
+msgid "Press a Key.."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Mouse Button Index:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Left Button"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Right Button"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Middle Button"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Wheel Up Button"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Wheel Down Button"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Button 6"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Button 7"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Button 8"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Button 9"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Joystick Axis Index:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Joystick Button Index:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Add Input Action"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Erase Input Action Event"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Toggle Persisting"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Error saving settings."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Settings saved OK."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Add Translation"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Invalid name."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Valid characters:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Invalid name. Must not collide with an existing engine class name."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Invalid name. Must not collide with an existing buit-in type name."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Invalid name. Must not collide with an existing global constant name."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Autoload '%s' already exists!"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Rename Autoload"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Toggle AutoLoad Globals"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Add Autoload"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Remove Autoload"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Move Autoload"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Remove Translation"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Add Remapped Path"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Resource Remap Add Remap"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Change Resource Remap Language"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Remove Resource Remap"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Remove Resource Remap Option"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Enable"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Project Settings (engine.cfg)"
+msgstr ""
+
+#: tools/editor/project_settings.cpp tools/editor/settings_config_dialog.cpp
+msgid "General"
+msgstr ""
+
+#: tools/editor/project_settings.cpp tools/editor/property_editor.cpp
+msgid "Property:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Del"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Copy To Platform.."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Input Map"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Action:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Device:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Index:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Localization"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Translations"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Translations:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Add.."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Remaps"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Resources:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Remaps by Locale:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Locale"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "AutoLoad"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Node Name:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "List:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Singleton"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Plugins"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Preset.."
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Ease In"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Ease Out"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Zero"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Easing In-Out"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Easing Out-In"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "File.."
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Dir.."
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Load"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Assign"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Error loading file: Not a resource!"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Couldn't load image"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Bit %d, val %d."
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "On"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Set"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Properties:"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Global"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Sections:"
+msgstr ""
+
+#: tools/editor/pvrtc_compress.cpp
+msgid "Could not execute PVRTC tool:"
+msgstr ""
+
+#: tools/editor/pvrtc_compress.cpp
+msgid "Can't load back converted image using PVRTC tool:"
+msgstr ""
+
+#: tools/editor/reparent_dialog.cpp tools/editor/scene_tree_dock.cpp
+msgid "Reparent Node"
+msgstr ""
+
+#: tools/editor/reparent_dialog.cpp
+msgid "Reparent Location (Select new Parent):"
+msgstr ""
+
+#: tools/editor/reparent_dialog.cpp
+msgid "Keep Global Transform"
+msgstr ""
+
+#: tools/editor/reparent_dialog.cpp tools/editor/scene_tree_dock.cpp
+msgid "Reparent"
+msgstr ""
+
+#: tools/editor/resources_dock.cpp
+msgid "Create New Resource"
+msgstr ""
+
+#: tools/editor/resources_dock.cpp
+msgid "Open Resource"
+msgstr ""
+
+#: tools/editor/resources_dock.cpp
+msgid "Save Resource"
+msgstr ""
+
+#: tools/editor/resources_dock.cpp
+msgid "Resource Tools"
+msgstr ""
+
+#: tools/editor/resources_dock.cpp
+msgid "Make Local"
+msgstr ""
+
+#: tools/editor/run_settings_dialog.cpp
+msgid "Run Mode:"
+msgstr ""
+
+#: tools/editor/run_settings_dialog.cpp
+msgid "Current Scene"
+msgstr ""
+
+#: tools/editor/run_settings_dialog.cpp
+msgid "Main Scene"
+msgstr ""
+
+#: tools/editor/run_settings_dialog.cpp
+msgid "Main Scene Arguments:"
+msgstr ""
+
+#: tools/editor/run_settings_dialog.cpp
+msgid "Scene Run Settings"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "OK :("
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "No parent to instance a child at."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Error loading scene from %s"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Error instancing scene from %s"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Ok"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid ""
+"Cannot instance the scene '%s' because the current scene exists within one "
+"of its nodes."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Instance Scene(s)"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "This operation can't be done on the tree root."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Move Node In Parent"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Move Nodes In Parent"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Duplicate Node(s)"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Delete Node(s)?"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "This operation can't be done without a scene."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "This operation requires a single selected node."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "This operation can't be done on instanced scenes."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Save New Scene As.."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Makes Sense!"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Can't operate on nodes from a foreign scene!"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Can't operate on nodes the current scene inherits from!"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Remove Node(s)"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Create Node"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid ""
+"Couldn't save new scene. Likely dependencies (instances) couldn't be "
+"satisfied."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Error saving scene."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Error duplicating scene to save it."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Edit Groups"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Edit Connections"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Delete Node(s)"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Add Child Node"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Instance Child Scene"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Change Type"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Add Script"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Merge From Scene"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Save Branch as Scene"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Add/Create a New Node"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid ""
+"Instance a scene file as a Node. Creates an inherited scene if no root node "
+"exists."
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid ""
+"This item cannot be made visible because the parent is hidden. Unhide the "
+"parent first."
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Toggle Spatial Visible"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Toggle CanvasItem Visible"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Instance:"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Invalid node name, the following characters are not allowed:"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Rename Node"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Scene Tree (Nodes):"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Editable Children"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Load As Placeholder"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Discard Instancing"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Open in Editor"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Clear Inheritance"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Clear Inheritance? (No Undo!)"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Clear!"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Select a Node"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Same source and destination files, doing nothing."
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Same source and destination paths, doing nothing."
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Can't move directories to within themselves."
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Can't operate on '..'"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Pick New Name and Location For:"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "No files selected!"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Instance"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Edit Dependencies.."
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "View Owners.."
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Copy Path"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Rename or Move.."
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Move To.."
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Info"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Show In File Manager"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Previous Directory"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Next Directory"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Re-Scan Filesystem"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Toggle folder status as Favorite"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Instance the selected scene(s) as child of the selected node."
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Move"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Invalid parent class name"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Valid chars:"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Invalid class name"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Valid name"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "N/A"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Class name is invalid!"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Parent class name is invalid!"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Invalid path!"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Could not create script in filesystem."
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Path is empty"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Path is not local"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Invalid base path"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "File exists"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Invalid extension"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Valid path"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Class Name:"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Built-In Script"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Create Node Script"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Bytes:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Warning"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Error:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Source:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Function:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Errors"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Child Process Connected"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Inspect Previous Instance"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Inspect Next Instance"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Stack Frames"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Variable"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Errors:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Stack Trace (if applicable):"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Remote Inspector"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Live Scene Tree:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Remote Object Properties: "
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Profiler"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Monitor"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Value"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Monitors"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "List of Video Memory Usage by Resource:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Total:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Video Mem"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Resource Path"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Type"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Usage"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Misc"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Clicked Control:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Clicked Control Type:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Live Edit Root:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Set From Tree"
+msgstr ""
+
+#: tools/editor/settings_config_dialog.cpp
+msgid "Shortcuts"
+msgstr ""
+
+#: tools/editor/spatial_editor_gizmos.cpp
+msgid "Change Light Radius"
+msgstr ""
+
+#: tools/editor/spatial_editor_gizmos.cpp
+msgid "Change Camera FOV"
+msgstr ""
+
+#: tools/editor/spatial_editor_gizmos.cpp
+msgid "Change Camera Size"
+msgstr ""
+
+#: tools/editor/spatial_editor_gizmos.cpp
+msgid "Change Sphere Shape Radius"
+msgstr ""
+
+#: tools/editor/spatial_editor_gizmos.cpp
+msgid "Change Box Shape Extents"
+msgstr ""
+
+#: tools/editor/spatial_editor_gizmos.cpp
+msgid "Change Capsule Shape Radius"
+msgstr ""
+
+#: tools/editor/spatial_editor_gizmos.cpp
+msgid "Change Capsule Shape Height"
+msgstr ""
+
+#: tools/editor/spatial_editor_gizmos.cpp
+msgid "Change Ray Shape Length"
+msgstr ""
+
+#: tools/editor/spatial_editor_gizmos.cpp
+msgid "Change Notifier Extents"
+msgstr ""
diff --git a/tools/translations/cs.po b/tools/translations/cs.po
index 8a1e596942..9a482216ec 100644
--- a/tools/translations/cs.po
+++ b/tools/translations/cs.po
@@ -631,10 +631,6 @@ msgid "Change Anim Loop"
 msgstr ""
 
 #: tools/editor/animation_editor.cpp
-msgid "Change Anim Loop Interpolation"
-msgstr ""
-
-#: tools/editor/animation_editor.cpp
 msgid "Anim Create Typed Value Key"
 msgstr ""
 
@@ -675,10 +671,6 @@ msgid "Enable/Disable looping in animation."
 msgstr ""
 
 #: tools/editor/animation_editor.cpp
-msgid "Enable/Disable interpolation when looping animation."
-msgstr ""
-
-#: tools/editor/animation_editor.cpp
 msgid "Add new tracks."
 msgstr ""
 
@@ -943,7 +935,7 @@ msgid "Method in target Node must be specified!"
 msgstr ""
 
 #: tools/editor/connections_dialog.cpp
-msgid "Conect To Node:"
+msgid "Connect To Node:"
 msgstr ""
 
 #: tools/editor/connections_dialog.cpp tools/editor/groups_editor.cpp
@@ -1156,6 +1148,46 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Back"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Forward"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Refresh"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Hidden Files"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Favorite"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Mode"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Focus Path"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Mode Favorite Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Mode Favorite Down"
+msgstr ""
+
 #: tools/editor/editor_file_dialog.cpp tools/editor/scenes_dock.cpp
 msgid "Favorites:"
 msgstr ""
@@ -1409,8 +1441,23 @@ msgstr ""
 
 #: tools/editor/editor_node.cpp
 msgid ""
-"No main scene has ever been defined.\n"
-"Select one from \"Project Settings\" under the 'application' category."
+"No main scene has ever been defined, select one?\n"
+"You can change it later in later in \"Project Settings\" under the "
+"'application' category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' does not exist, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' is not a scene file, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
 msgstr ""
 
 #: tools/editor/editor_node.cpp
@@ -1503,6 +1550,10 @@ msgid ""
 "(Unsaved changes will be lost)"
 msgstr ""
 
+#: tools/editor/editor_node.cpp
+msgid "Pick a Manu Scene"
+msgstr ""
+
 #: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
 msgid "Ugh"
 msgstr ""
@@ -1526,7 +1577,7 @@ msgid "Save Layout"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
-msgid "Load Layout"
+msgid "Delete Layout"
 msgstr ""
 
 #: tools/editor/editor_node.cpp tools/editor/project_export.cpp
@@ -1534,10 +1585,6 @@ msgid "Default"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
-msgid "Delete Layout"
-msgstr ""
-
-#: tools/editor/editor_node.cpp
 msgid "Switch Scene Tab"
 msgstr ""
 
@@ -1567,6 +1614,14 @@ msgid "Distraction Free Mode"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
+msgid "Next tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Previous tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
 msgid "Operations with scene files."
 msgstr ""
 
@@ -2109,6 +2164,12 @@ msgid "No target font resource!"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"Invalid file extension.\n"
+"Please use .fnt."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Can't load/process source font."
 msgstr ""
 
@@ -2344,7 +2405,7 @@ msgid "Couldn't load post-import script:"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
-msgid "Invalid/broken script for post-import:"
+msgid "Invalid/broken script for post-import (check console):"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -3007,13 +3068,11 @@ msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Offset:"
 msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Step:"
 msgstr ""
 
@@ -3129,7 +3188,6 @@ msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Show Grid"
 msgstr ""
 
@@ -3382,6 +3440,10 @@ msgid "MeshInstance lacks a Mesh!"
 msgstr ""
 
 #: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh has not surface to create outlines from!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
 msgid "Could not create outline!"
 msgstr ""
 
@@ -3743,17 +3805,14 @@ msgid "Clear UV"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Snap"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Enable Snap"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid"
 msgstr ""
 
@@ -4589,17 +4648,43 @@ msgid "StyleBox Preview:"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Texture Region Editor"
+msgid "Snap Mode:"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Scale Region Editor"
+msgid "<None>"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid ""
-"No texture in this node.\n"
-"Set a texture to be able to edit region."
+msgid "Pixel Snap"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Grid Snap"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Auto Slice"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Offset:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Step:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Separation:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region Editor"
 msgstr ""
 
 #: tools/editor/plugins/theme_editor_plugin.cpp
@@ -5661,31 +5746,27 @@ msgid "Error duplicating scene to save it."
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "New Scene Root"
-msgstr ""
-
-#: tools/editor/scene_tree_dock.cpp
-msgid "Inherit Scene"
+msgid "Edit Groups"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Add Child Node"
+msgid "Edit Connections"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Instance Child Scene"
+msgid "Delete Node(s)"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Change Type"
+msgid "Add Child Node"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Groups"
+msgid "Instance Child Scene"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Connections"
+msgid "Change Type"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
@@ -5701,10 +5782,6 @@ msgid "Save Branch as Scene"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Delete Node(s)"
-msgstr ""
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add/Create a New Node"
 msgstr ""
 
diff --git a/tools/translations/de.po b/tools/translations/de.po
index b9c1c070d8..208b4d1bc5 100644
--- a/tools/translations/de.po
+++ b/tools/translations/de.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2016-06-14 12:29+0000\n"
-"Last-Translator: Timo Schwarzer <account@timoschwarzer.com>\n"
+"PO-Revision-Date: 2016-06-27 09:01+0000\n"
+"Last-Translator: danjo <atze@libra.uberspace.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/godot-engine/"
 "godot/de/>\n"
 "Language: de\n"
@@ -598,18 +598,16 @@ msgid "Anim Delete Keys"
 msgstr "Anim Schlüsselbilder löschen"
 
 #: tools/editor/animation_editor.cpp
-#, fuzzy
 msgid "Continuous"
-msgstr "Fortfahren"
+msgstr "Fortlaufend"
 
 #: tools/editor/animation_editor.cpp
-#, fuzzy
 msgid "Discrete"
-msgstr "Trennen"
+msgstr "Einzeln"
 
 #: tools/editor/animation_editor.cpp
 msgid "Trigger"
-msgstr ""
+msgstr "Auslöser"
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Add Key"
@@ -719,11 +717,6 @@ msgid "Change Anim Loop"
 msgstr "Ändere Animationswiederholung"
 
 #: tools/editor/animation_editor.cpp
-#, fuzzy
-msgid "Change Anim Loop Interpolation"
-msgstr "Ändere Animationswiederholung"
-
-#: tools/editor/animation_editor.cpp
 msgid "Anim Create Typed Value Key"
 msgstr "Animation Erstelle Typed Value Key"
 
@@ -764,11 +757,6 @@ msgid "Enable/Disable looping in animation."
 msgstr "Aktivieren / Deaktivieren der Schleife (Loop)."
 
 #: tools/editor/animation_editor.cpp
-#, fuzzy
-msgid "Enable/Disable interpolation when looping animation."
-msgstr "Aktivieren / Deaktivieren der Schleife (Loop)."
-
-#: tools/editor/animation_editor.cpp
 msgid "Add new tracks."
 msgstr "Neue Spuren hinzufügen."
 
@@ -1035,7 +1023,7 @@ msgstr "Methode in Ziel-Node muss angegeben werden!"
 
 #: tools/editor/connections_dialog.cpp
 #, fuzzy
-msgid "Conect To Node:"
+msgid "Connect To Node:"
 msgstr "Verbinde Zu Node:"
 
 #: tools/editor/connections_dialog.cpp tools/editor/groups_editor.cpp
@@ -1258,6 +1246,50 @@ msgstr "Wähle ein Verzeichnis"
 msgid "Choose"
 msgstr "Wählen"
 
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Back"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Forward"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Refresh"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Hidden Files"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Toggle Favorite"
+msgstr "Favoriten:"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Toggle Mode"
+msgstr "Autoplay Umschalten"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Focus Path"
+msgstr "Pfad kopieren"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Mode Favorite Up"
+msgstr "Favoriten:"
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Mode Favorite Down"
+msgstr ""
+
 #: tools/editor/editor_file_dialog.cpp tools/editor/scenes_dock.cpp
 msgid "Favorites:"
 msgstr "Favoriten:"
@@ -1512,9 +1544,31 @@ msgid "There is no defined scene to run."
 msgstr "Es ist keine zu startende Szene definiert."
 
 #: tools/editor/editor_node.cpp
+#, fuzzy
+msgid ""
+"No main scene has ever been defined, select one?\n"
+"You can change it later in later in \"Project Settings\" under the "
+"'application' category."
+msgstr ""
+"Es ist keine Hauptszene definiert worden.\n"
+"Wähle eine in den \"Projekt Einstellungen\" in der 'Applikation' Kategorie."
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid ""
+"Selected scene '%s' does not exist, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+"Es ist keine Hauptszene definiert worden.\n"
+"Wähle eine in den \"Projekt Einstellungen\" in der 'Applikation' Kategorie."
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
 msgid ""
-"No main scene has ever been defined.\n"
-"Select one from \"Project Settings\" under the 'application' category."
+"Selected scene '%s' is not a scene file, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
 msgstr ""
 "Es ist keine Hauptszene definiert worden.\n"
 "Wähle eine in den \"Projekt Einstellungen\" in der 'Applikation' Kategorie."
@@ -1615,6 +1669,11 @@ msgstr ""
 "Projektmanager Öffnen?\n"
 "(Nichtgespeicherte Änderungen gehen verloren)"
 
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Pick a Manu Scene"
+msgstr "Hauptszene"
+
 #: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
 msgid "Ugh"
 msgstr "Ugh"
@@ -1641,18 +1700,14 @@ msgid "Save Layout"
 msgstr "Layout Speichern"
 
 #: tools/editor/editor_node.cpp
-msgid "Load Layout"
-msgstr "Layout Laden"
+msgid "Delete Layout"
+msgstr "Layout Löschen"
 
 #: tools/editor/editor_node.cpp tools/editor/project_export.cpp
 msgid "Default"
 msgstr "Standard"
 
 #: tools/editor/editor_node.cpp
-msgid "Delete Layout"
-msgstr "Layout Löschen"
-
-#: tools/editor/editor_node.cpp
 msgid "Switch Scene Tab"
 msgstr "Wechsle Szenen Tab"
 
@@ -1682,6 +1737,15 @@ msgid "Distraction Free Mode"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Next tab"
+msgstr "Nächste"
+
+#: tools/editor/editor_node.cpp
+msgid "Previous tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
 msgid "Operations with scene files."
 msgstr "Operationen mit Szenen Dateien."
 
@@ -1711,7 +1775,7 @@ msgstr "Schließen Zu Vorh. Szene Gehen"
 
 #: tools/editor/editor_node.cpp
 msgid "Open Recent"
-msgstr "Aktuelle Öffnen"
+msgstr "Zuletzt benutzte Scenen"
 
 #: tools/editor/editor_node.cpp
 msgid "Quick Filter Files.."
@@ -2246,6 +2310,12 @@ msgid "No target font resource!"
 msgstr "Keine Ziel Font Ressource!"
 
 #: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"Invalid file extension.\n"
+"Please use .fnt."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Can't load/process source font."
 msgstr "Quell Font kann nicht geladen/verarbeitet werden."
 
@@ -2485,7 +2555,8 @@ msgid "Couldn't load post-import script:"
 msgstr "Post-Import Skript konnte nicht geladen werden:"
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
-msgid "Invalid/broken script for post-import:"
+#, fuzzy
+msgid "Invalid/broken script for post-import (check console):"
 msgstr "Fehlerhaftes Skript für Post-Import:"
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -3152,13 +3223,11 @@ msgstr "Einrasten konfigurieren"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Offset:"
 msgstr "Gitterverschiebung:"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Step:"
 msgstr "Gitterabstand:"
 
@@ -3283,7 +3352,6 @@ msgstr "Einrasten aktivieren"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Show Grid"
 msgstr "Raster anzeigen"
 
@@ -3536,6 +3604,10 @@ msgid "MeshInstance lacks a Mesh!"
 msgstr ""
 
 #: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh has not surface to create outlines from!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
 msgid "Could not create outline!"
 msgstr ""
 
@@ -3897,17 +3969,14 @@ msgid "Clear UV"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Snap"
 msgstr "Einrasten"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Enable Snap"
 msgstr "Einrasten aktivieren"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid"
 msgstr "Raster"
 
@@ -4743,19 +4812,52 @@ msgid "StyleBox Preview:"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Texture Region Editor"
-msgstr "Texturbegrenzungseditor"
+#, fuzzy
+msgid "Snap Mode:"
+msgstr "Export-Modus:"
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Scale Region Editor"
-msgstr "Skalierungsbegrenzungseditor"
+msgid "<None>"
+msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid ""
-"No texture in this node.\n"
-"Set a texture to be able to edit region."
+#, fuzzy
+msgid "Pixel Snap"
+msgstr "Einrasten an Pixeln aktivieren"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Grid Snap"
+msgstr "Gitterabstand:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Auto Slice"
 msgstr ""
 
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Offset:"
+msgstr "Gitterverschiebung:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Step:"
+msgstr "Schritte (s):"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Separation:"
+msgstr "Version:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Texture Region"
+msgstr "Texturbegrenzungseditor"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region Editor"
+msgstr "Texturbegrenzungseditor"
+
 #: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Can't save theme to file:"
 msgstr ""
@@ -5144,8 +5246,9 @@ msgid "Group"
 msgstr "Gruppe"
 
 #: tools/editor/project_export.cpp
+#, fuzzy
 msgid "Samples"
-msgstr "Beispiele"
+msgstr "Samples"
 
 #: tools/editor/project_export.cpp
 msgid "Sample Conversion Mode: (.wav files):"
@@ -5822,31 +5925,27 @@ msgid "Error duplicating scene to save it."
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "New Scene Root"
-msgstr ""
-
-#: tools/editor/scene_tree_dock.cpp
-msgid "Inherit Scene"
+msgid "Edit Groups"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Add Child Node"
+msgid "Edit Connections"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Instance Child Scene"
+msgid "Delete Node(s)"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Change Type"
+msgid "Add Child Node"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Groups"
+msgid "Instance Child Scene"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Connections"
+msgid "Change Type"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
@@ -5862,10 +5961,6 @@ msgid "Save Branch as Scene"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Delete Node(s)"
-msgstr ""
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add/Create a New Node"
 msgstr ""
 
@@ -6253,6 +6348,19 @@ msgstr ""
 msgid "Change Notifier Extents"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Change Anim Loop Interpolation"
+#~ msgstr "Ändere Animationswiederholung"
+
+#~ msgid "Enable/Disable interpolation when looping animation."
+#~ msgstr "Aktivieren/Deaktivieren Interpolation, wenn Schleife aktiviert."
+
+#~ msgid "Load Layout"
+#~ msgstr "Layout Laden"
+
+#~ msgid "Scale Region Editor"
+#~ msgstr "Skalierungsbegrenzungseditor"
+
 #~ msgid "Binds (Extra Params):"
 #~ msgstr "Bindungen (Extra Parameter):"
 
diff --git a/tools/translations/de_CH.po b/tools/translations/de_CH.po
index eb5e1be880..4404ca02df 100644
--- a/tools/translations/de_CH.po
+++ b/tools/translations/de_CH.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor\n"
-"PO-Revision-Date: 2016-06-12 13:27+0000\n"
+"PO-Revision-Date: 2016-06-22 14:54+0000\n"
 "Last-Translator: Christian Fisch <christian.fiesel@gmail.com>\n"
 "Language-Team: Swiss High German <https://hosted.weblate.org/projects/godot-"
 "engine/godot/de_CH/>\n"
@@ -58,7 +58,6 @@ msgid "Invalid instance dictionary (invalid subclasses)"
 msgstr ""
 
 #: scene/2d/animated_sprite.cpp
-#, fuzzy
 msgid ""
 "A SpriteFrames resource must be created or set in the 'Frames' property in "
 "order for AnimatedSprite to display frames."
@@ -222,7 +221,7 @@ msgstr ""
 
 #: scene/gui/dialogs.cpp tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Cancel"
-msgstr ""
+msgstr "Abbrechen"
 
 #: scene/gui/dialogs.cpp
 msgid "OK"
@@ -230,15 +229,15 @@ msgstr "Okay"
 
 #: scene/gui/dialogs.cpp
 msgid "Alert!"
-msgstr ""
+msgstr "Alert!"
 
 #: scene/gui/dialogs.cpp
 msgid "Please Confirm..."
-msgstr ""
+msgstr "Bitte bestätigen..."
 
 #: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
 msgid "File Exists, Overwrite?"
-msgstr ""
+msgstr "Datei existiert, Überschreiben?"
 
 #: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
 msgid "All Recognized"
@@ -246,41 +245,41 @@ msgstr ""
 
 #: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
 msgid "All Files (*)"
-msgstr ""
+msgstr "Alle Dateien (*)"
 
 #: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
 #: tools/editor/editor_help.cpp tools/editor/editor_node.cpp
 #: tools/editor/plugins/script_editor_plugin.cpp tools/editor/quick_open.cpp
 #: tools/editor/scenes_dock.cpp
 msgid "Open"
-msgstr ""
+msgstr "Öffnen"
 
 #: scene/gui/file_dialog.cpp
 msgid "Open a File"
-msgstr ""
+msgstr "Datei öffnen"
 
 #: scene/gui/file_dialog.cpp
 msgid "Open File(s)"
-msgstr ""
+msgstr "Datei(en) öffnen"
 
 #: scene/gui/file_dialog.cpp
 msgid "Open a Directory"
-msgstr ""
+msgstr "Verzeichnis öffnen"
 
 #: scene/gui/file_dialog.cpp
 msgid "Open a File or Directory"
-msgstr ""
+msgstr "Datei oder Verzeichnis öffnen"
 
 #: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
 #: tools/editor/editor_node.cpp
 #: tools/editor/plugins/animation_player_editor_plugin.cpp
 #: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Save"
-msgstr ""
+msgstr "Speichern"
 
 #: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
 msgid "Save a File"
-msgstr ""
+msgstr "Datei speichern"
 
 #: scene/gui/file_dialog.cpp tools/editor/editor_dir_dialog.cpp
 #: tools/editor/editor_file_dialog.cpp
@@ -431,8 +430,9 @@ msgstr ""
 
 #: scene/resources/dynamic_font.cpp
 #: tools/editor/io_plugins/editor_font_import_plugin.cpp
+#, fuzzy
 msgid "Error initializing FreeType."
-msgstr ""
+msgstr "Fehler bei der FreeType Inizialisierung."
 
 #: scene/resources/dynamic_font.cpp
 #: tools/editor/io_plugins/editor_font_import_plugin.cpp
@@ -515,7 +515,7 @@ msgstr ""
 
 #: tools/editor/animation_editor.cpp
 msgid "Edit Node Curve"
-msgstr ""
+msgstr "Node Kurve editieren"
 
 #: tools/editor/animation_editor.cpp
 msgid "Edit Selection Curve"
@@ -645,10 +645,6 @@ msgid "Change Anim Loop"
 msgstr ""
 
 #: tools/editor/animation_editor.cpp
-msgid "Change Anim Loop Interpolation"
-msgstr ""
-
-#: tools/editor/animation_editor.cpp
 msgid "Anim Create Typed Value Key"
 msgstr ""
 
@@ -689,10 +685,6 @@ msgid "Enable/Disable looping in animation."
 msgstr ""
 
 #: tools/editor/animation_editor.cpp
-msgid "Enable/Disable interpolation when looping animation."
-msgstr ""
-
-#: tools/editor/animation_editor.cpp
 msgid "Add new tracks."
 msgstr ""
 
@@ -750,7 +742,7 @@ msgstr ""
 
 #: tools/editor/animation_editor.cpp
 msgid "Call Functions in Which Node?"
-msgstr ""
+msgstr "Im welchem Node soll die Funktion aufgerufen werden?"
 
 #: tools/editor/animation_editor.cpp
 msgid "Remove invalid keys"
@@ -954,11 +946,12 @@ msgstr ""
 
 #: tools/editor/connections_dialog.cpp
 msgid "Method in target Node must be specified!"
-msgstr ""
+msgstr "Die Methode muss im Ziel Node definiert werden!"
 
 #: tools/editor/connections_dialog.cpp
-msgid "Conect To Node:"
-msgstr ""
+#, fuzzy
+msgid "Connect To Node:"
+msgstr "Verbindung zu Node:"
 
 #: tools/editor/connections_dialog.cpp tools/editor/groups_editor.cpp
 #: tools/editor/plugins/item_list_editor_plugin.cpp
@@ -984,7 +977,7 @@ msgstr ""
 
 #: tools/editor/connections_dialog.cpp
 msgid "Path to Node:"
-msgstr ""
+msgstr "Pfad zum Node:"
 
 #: tools/editor/connections_dialog.cpp
 msgid "Make Function"
@@ -1170,6 +1163,46 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Back"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Forward"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Refresh"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Hidden Files"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Favorite"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Mode"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Focus Path"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Mode Favorite Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Mode Favorite Down"
+msgstr ""
+
 #: tools/editor/editor_file_dialog.cpp tools/editor/scenes_dock.cpp
 msgid "Favorites:"
 msgstr ""
@@ -1293,7 +1326,7 @@ msgstr ""
 
 #: tools/editor/editor_node.cpp
 msgid "Node From Scene"
-msgstr ""
+msgstr "Node von Szene"
 
 #: tools/editor/editor_node.cpp tools/editor/scenes_dock.cpp
 msgid "Re-Import.."
@@ -1423,8 +1456,23 @@ msgstr ""
 
 #: tools/editor/editor_node.cpp
 msgid ""
-"No main scene has ever been defined.\n"
-"Select one from \"Project Settings\" under the 'application' category."
+"No main scene has ever been defined, select one?\n"
+"You can change it later in later in \"Project Settings\" under the "
+"'application' category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' does not exist, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' is not a scene file, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
 msgstr ""
 
 #: tools/editor/editor_node.cpp
@@ -1517,6 +1565,10 @@ msgid ""
 "(Unsaved changes will be lost)"
 msgstr ""
 
+#: tools/editor/editor_node.cpp
+msgid "Pick a Manu Scene"
+msgstr ""
+
 #: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
 msgid "Ugh"
 msgstr ""
@@ -1540,7 +1592,7 @@ msgid "Save Layout"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
-msgid "Load Layout"
+msgid "Delete Layout"
 msgstr ""
 
 #: tools/editor/editor_node.cpp tools/editor/project_export.cpp
@@ -1548,10 +1600,6 @@ msgid "Default"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
-msgid "Delete Layout"
-msgstr ""
-
-#: tools/editor/editor_node.cpp
 msgid "Switch Scene Tab"
 msgstr ""
 
@@ -1581,6 +1629,14 @@ msgid "Distraction Free Mode"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
+msgid "Next tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Previous tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
 msgid "Operations with scene files."
 msgstr ""
 
@@ -2026,7 +2082,7 @@ msgstr ""
 
 #: tools/editor/editor_sub_scene.cpp
 msgid "Select Node(s) to Import"
-msgstr ""
+msgstr "Selektiere Node(s) zum Importieren aus"
 
 #: tools/editor/editor_sub_scene.cpp
 msgid "Scene Path:"
@@ -2034,7 +2090,7 @@ msgstr ""
 
 #: tools/editor/editor_sub_scene.cpp
 msgid "Import From Node:"
-msgstr ""
+msgstr "Importiere von folgendem Node:"
 
 #: tools/editor/file_type_cache.cpp
 msgid "Can't open file_type_cache.cch for writing, not saving file type cache!"
@@ -2123,6 +2179,12 @@ msgid "No target font resource!"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"Invalid file extension.\n"
+"Please use .fnt."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Can't load/process source font."
 msgstr ""
 
@@ -2199,7 +2261,7 @@ msgstr ""
 
 #: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
 msgid "Surface %d"
-msgstr ""
+msgstr "Oberfläche %d"
 
 #: tools/editor/io_plugins/editor_sample_import_plugin.cpp
 msgid "No samples to import!"
@@ -2358,7 +2420,7 @@ msgid "Couldn't load post-import script:"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
-msgid "Invalid/broken script for post-import:"
+msgid "Invalid/broken script for post-import (check console):"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -2617,20 +2679,22 @@ msgid "Translation"
 msgstr ""
 
 #: tools/editor/multi_node_edit.cpp
+#, fuzzy
 msgid "MultiNode Set"
-msgstr ""
+msgstr "MultiNode Set"
 
 #: tools/editor/node_dock.cpp
 msgid "Node"
-msgstr ""
+msgstr "Node"
 
 #: tools/editor/node_dock.cpp
 msgid "Groups"
 msgstr ""
 
 #: tools/editor/node_dock.cpp
+#, fuzzy
 msgid "Select a Node to edit Signals and Groups."
-msgstr ""
+msgstr "Selektiere ein Node um deren Signale und Gruppen zu ändern."
 
 #: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Toggle Autoplay"
@@ -2904,39 +2968,39 @@ msgstr ""
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Animation Node"
-msgstr ""
+msgstr "Animations-Node"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "OneShot Node"
-msgstr ""
+msgstr "OneShot-Node"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Mix Node"
-msgstr ""
+msgstr "Mix-Node"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Blend2 Node"
-msgstr ""
+msgstr "Blend2-Node"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Blend3 Node"
-msgstr ""
+msgstr "Blend3-Node"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Blend4 Node"
-msgstr ""
+msgstr "Blend4-Node"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "TimeScale Node"
-msgstr ""
+msgstr "TimeScale-Node"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "TimeSeek Node"
-msgstr ""
+msgstr "TimeSeek-Node"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Transition Node"
-msgstr ""
+msgstr "Transition-Node"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Import Animations.."
@@ -2944,7 +3008,7 @@ msgstr ""
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Edit Node Filters"
-msgstr ""
+msgstr "Node Filter editieren"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Filters.."
@@ -3021,13 +3085,11 @@ msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Offset:"
 msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Step:"
 msgstr ""
 
@@ -3143,7 +3205,6 @@ msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Show Grid"
 msgstr ""
 
@@ -3396,6 +3457,10 @@ msgid "MeshInstance lacks a Mesh!"
 msgstr ""
 
 #: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh has not surface to create outlines from!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
 msgid "Could not create outline!"
 msgstr ""
 
@@ -3453,19 +3518,20 @@ msgstr ""
 
 #: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "No surface source specified."
-msgstr ""
+msgstr "Keine Oberflächen Quelle spezifiziert."
 
 #: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Surface source is invalid (invalid path)."
-msgstr ""
+msgstr "Oberflächen Quelle is invalid (invalider Pfad)."
 
 #: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Surface source is invalid (no geometry)."
-msgstr ""
+msgstr "Oberflächen Quelle is invalid (keine Form)."
 
 #: tools/editor/plugins/multimesh_editor_plugin.cpp
+#, fuzzy
 msgid "Surface source is invalid (no faces)."
-msgstr ""
+msgstr "Oberflächen Quelle is invalid (kein Face)"
 
 #: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Parent has no solid faces to populate."
@@ -3481,7 +3547,7 @@ msgstr ""
 
 #: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Select a Target Surface:"
-msgstr ""
+msgstr "Wähle eine Ziel Oberfläche aus:"
 
 #: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Populate Surface"
@@ -3493,7 +3559,7 @@ msgstr ""
 
 #: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Target Surface:"
-msgstr ""
+msgstr "Ziel Oberfläche:"
 
 #: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Source Mesh:"
@@ -3549,15 +3615,16 @@ msgstr ""
 
 #: tools/editor/plugins/particles_2d_editor_plugin.cpp
 msgid "Set Emission Mask"
-msgstr ""
+msgstr "Emissions-Maske setzen"
 
 #: tools/editor/plugins/particles_2d_editor_plugin.cpp
+#, fuzzy
 msgid "Clear Emission Mask"
-msgstr ""
+msgstr "Inhalt der Emissions-Masken löschen"
 
 #: tools/editor/plugins/particles_2d_editor_plugin.cpp
 msgid "Load Emission Mask"
-msgstr ""
+msgstr "Emissions-Maske laden"
 
 #: tools/editor/plugins/particles_2d_editor_plugin.cpp
 msgid "Generated Point Count:"
@@ -3569,15 +3636,15 @@ msgstr ""
 
 #: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Node does not contain geometry (faces)."
-msgstr ""
+msgstr "Node enthält keine Geometrie (Flächen)."
 
 #: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Faces contain no area!"
-msgstr ""
+msgstr "Flächen enthalten keinen Bereich!"
 
 #: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "No faces!"
-msgstr ""
+msgstr "Keine Flächen!"
 
 #: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Generate AABB"
@@ -3609,7 +3676,7 @@ msgstr ""
 
 #: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Surface"
-msgstr ""
+msgstr "Oberfläche"
 
 #: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Volume"
@@ -3757,17 +3824,14 @@ msgid "Clear UV"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Snap"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Enable Snap"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid"
 msgstr ""
 
@@ -4528,7 +4592,7 @@ msgstr ""
 
 #: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Transform Type"
-msgstr ""
+msgstr "Transformationstyp"
 
 #: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Pre"
@@ -4603,17 +4667,43 @@ msgid "StyleBox Preview:"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Texture Region Editor"
+msgid "Snap Mode:"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Scale Region Editor"
+msgid "<None>"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid ""
-"No texture in this node.\n"
-"Set a texture to be able to edit region."
+msgid "Pixel Snap"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Grid Snap"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Auto Slice"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Offset:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Step:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Separation:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region Editor"
 msgstr ""
 
 #: tools/editor/plugins/theme_editor_plugin.cpp
@@ -5588,7 +5678,7 @@ msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Error instancing scene from %s"
-msgstr ""
+msgstr "Fehler beim Instanzieren der %s Szene"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Ok"
@@ -5602,11 +5692,12 @@ msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Instance Scene(s)"
-msgstr ""
+msgstr "Instanziere Szene(n)"
 
 #: tools/editor/scene_tree_dock.cpp
+#, fuzzy
 msgid "This operation can't be done on the tree root."
-msgstr ""
+msgstr "Das funktioniert nicht beim obersten Node. (tree root)"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Move Node In Parent"
@@ -5618,27 +5709,27 @@ msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Duplicate Node(s)"
-msgstr ""
+msgstr "Node(s) duplizieren"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Delete Node(s)?"
-msgstr ""
+msgstr "Node(s) löschen?"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "This operation can't be done without a scene."
-msgstr ""
+msgstr "Ohne eine Szene kann das nicht funktionieren."
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "This operation requires a single selected node."
-msgstr ""
+msgstr "Bitte nur ein Node selektieren."
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "This operation can't be done on instanced scenes."
-msgstr ""
+msgstr "Das funktioniert nicht bei einer instanzierten Szene."
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Save New Scene As.."
-msgstr ""
+msgstr "Neue Szene speichern als..."
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Makes Sense!"
@@ -5654,11 +5745,11 @@ msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Remove Node(s)"
-msgstr ""
+msgstr "Node(s) entfernen"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Create Node"
-msgstr ""
+msgstr "Node erstellen"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid ""
@@ -5668,19 +5759,23 @@ msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Error saving scene."
-msgstr ""
+msgstr "Szene kann nicht gespeichert werden."
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Error duplicating scene to save it."
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "New Scene Root"
+msgid "Edit Groups"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Inherit Scene"
-msgstr ""
+msgid "Edit Connections"
+msgstr "Connections editieren"
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Delete Node(s)"
+msgstr "Node(s) löschen"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Add Child Node"
@@ -5692,19 +5787,11 @@ msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Change Type"
-msgstr ""
-
-#: tools/editor/scene_tree_dock.cpp
-msgid "Edit Groups"
-msgstr ""
-
-#: tools/editor/scene_tree_dock.cpp
-msgid "Edit Connections"
-msgstr ""
+msgstr "Typ ändern"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Add Script"
-msgstr ""
+msgstr "Script hinzufügen"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Merge From Scene"
@@ -5715,10 +5802,6 @@ msgid "Save Branch as Scene"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Delete Node(s)"
-msgstr ""
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add/Create a New Node"
 msgstr ""
 
diff --git a/tools/translations/es.po b/tools/translations/es.po
index 3f727d18c3..d43e181f46 100644
--- a/tools/translations/es.po
+++ b/tools/translations/es.po
@@ -699,10 +699,6 @@ msgid "Change Anim Loop"
 msgstr "Cambiar Loop de Anim"
 
 #: tools/editor/animation_editor.cpp
-msgid "Change Anim Loop Interpolation"
-msgstr "Cambiar Interpolación de Loop de Anim"
-
-#: tools/editor/animation_editor.cpp
 msgid "Anim Create Typed Value Key"
 msgstr "Crear Clave de Valor Tipado para Anim"
 
@@ -743,10 +739,6 @@ msgid "Enable/Disable looping in animation."
 msgstr "Activar/Desactivar loopeo en la animación."
 
 #: tools/editor/animation_editor.cpp
-msgid "Enable/Disable interpolation when looping animation."
-msgstr "Activar/Desactivar interpolación al loopear animación."
-
-#: tools/editor/animation_editor.cpp
 msgid "Add new tracks."
 msgstr "Agregar nuevos tracks."
 
@@ -1011,7 +1003,8 @@ msgid "Method in target Node must be specified!"
 msgstr "El método en el Nodo objetivo debe ser especificado!"
 
 #: tools/editor/connections_dialog.cpp
-msgid "Conect To Node:"
+#, fuzzy
+msgid "Connect To Node:"
 msgstr "Conectar a Nodo:"
 
 #: tools/editor/connections_dialog.cpp tools/editor/groups_editor.cpp
@@ -1230,6 +1223,51 @@ msgstr "Elegí un Directorio"
 msgid "Choose"
 msgstr "Elegir"
 
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Back"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Forward"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Refresh"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Hidden Files"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Toggle Favorite"
+msgstr "Act/Desact. Breakpoint"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Toggle Mode"
+msgstr "Act/Desact. Comentario"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Focus Path"
+msgstr "Copiar Ruta"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Mode Favorite Up"
+msgstr "Favoritos:"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Mode Favorite Down"
+msgstr "Bajar"
+
 #: tools/editor/editor_file_dialog.cpp tools/editor/scenes_dock.cpp
 msgid "Favorites:"
 msgstr "Favoritos:"
@@ -1484,16 +1522,39 @@ msgid "There is no defined scene to run."
 msgstr "No hay escena definida para ejecutar."
 
 #: tools/editor/editor_node.cpp
+#, fuzzy
+msgid ""
+"No main scene has ever been defined, select one?\n"
+"You can change it later in later in \"Project Settings\" under the "
+"'application' category."
+msgstr ""
+"No se ha definido ninguna escena principal.\n"
+"Seleccioná una de \"Ajustes del Proyecto\" bajo la categoria 'aplicacion'."
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid ""
+"Selected scene '%s' does not exist, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+"No se ha definido ninguna escena principal.\n"
+"Seleccioná una de \"Ajustes del Proyecto\" bajo la categoria 'aplicacion'."
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
 msgid ""
-"No main scene has ever been defined.\n"
-"Select one from \"Project Settings\" under the 'application' category."
+"Selected scene '%s' is not a scene file, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
 msgstr ""
 "No se ha definido ninguna escena principal.\n"
 "Seleccioná una de \"Ajustes del Proyecto\" bajo la categoria 'aplicacion'."
 
 #: tools/editor/editor_node.cpp
 msgid "Current scene was never saved, please save it prior to running."
-msgstr "La escena actual nunca se guardó. Favor de guardarla antes de ejecutar."
+msgstr ""
+"La escena actual nunca se guardó. Favor de guardarla antes de ejecutar."
 
 #: tools/editor/editor_node.cpp
 msgid "Could not start subprocess!"
@@ -1581,6 +1642,11 @@ msgid ""
 "(Unsaved changes will be lost)"
 msgstr "Abrir el Gestor de Proyectos? (Los cambios sin guardar se perderán)"
 
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Pick a Manu Scene"
+msgstr "Escena Principal"
+
 #: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
 msgid "Ugh"
 msgstr "Ugh"
@@ -1607,18 +1673,14 @@ msgid "Save Layout"
 msgstr "Guardar Layout"
 
 #: tools/editor/editor_node.cpp
-msgid "Load Layout"
-msgstr "Cargar Layout"
+msgid "Delete Layout"
+msgstr "Eliminar Layout"
 
 #: tools/editor/editor_node.cpp tools/editor/project_export.cpp
 msgid "Default"
 msgstr "Por Defecto"
 
 #: tools/editor/editor_node.cpp
-msgid "Delete Layout"
-msgstr "Eliminar Layout"
-
-#: tools/editor/editor_node.cpp
 msgid "Switch Scene Tab"
 msgstr "Cambiar Pestaña de Escena"
 
@@ -1648,6 +1710,16 @@ msgid "Distraction Free Mode"
 msgstr "Modo Sin Distracciones"
 
 #: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Next tab"
+msgstr "Siguiente"
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Previous tab"
+msgstr "Directorio Previo"
+
+#: tools/editor/editor_node.cpp
 msgid "Operations with scene files."
 msgstr "Operaciones con archivos de escena."
 
@@ -2212,6 +2284,12 @@ msgid "No target font resource!"
 msgstr "Sin recurso de tipografías de destino!"
 
 #: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"Invalid file extension.\n"
+"Please use .fnt."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Can't load/process source font."
 msgstr "No se puede cargar/procesar la tipografía de origen."
 
@@ -2451,7 +2529,8 @@ msgid "Couldn't load post-import script:"
 msgstr "No se pudo cargar el script post importación:"
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
-msgid "Invalid/broken script for post-import:"
+#, fuzzy
+msgid "Invalid/broken script for post-import (check console):"
 msgstr "Script para post importación inválido/roto:"
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -3119,13 +3198,11 @@ msgstr "Configurar Snap"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Offset:"
 msgstr "Offset de Grilla:"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Step:"
 msgstr "Setp de Grilla:"
 
@@ -3245,7 +3322,6 @@ msgstr "Usar Snap"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Show Grid"
 msgstr "Mostrar la Grilla"
 
@@ -3498,6 +3574,10 @@ msgid "MeshInstance lacks a Mesh!"
 msgstr "A MeshInstance le falta un Mesh!"
 
 #: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh has not surface to create outlines from!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
 msgid "Could not create outline!"
 msgstr "No se pudo crear el outline!"
 
@@ -3860,17 +3940,14 @@ msgid "Clear UV"
 msgstr "Limpiar UV"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Snap"
 msgstr "Esnapear"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Enable Snap"
 msgstr "Activar Snap"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid"
 msgstr "Grilla"
 
@@ -4708,20 +4785,51 @@ msgid "StyleBox Preview:"
 msgstr "Vista Previa de StyleBox:"
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Texture Region Editor"
-msgstr "Editor de Regiones de Texturas"
+#, fuzzy
+msgid "Snap Mode:"
+msgstr "Modo de Ejecución:"
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Scale Region Editor"
-msgstr "Editor de Regiones de Escalado"
+msgid "<None>"
+msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid ""
-"No texture in this node.\n"
-"Set a texture to be able to edit region."
+#, fuzzy
+msgid "Pixel Snap"
+msgstr "Usar Pixel Snap"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Grid Snap"
+msgstr "Setp de Grilla:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Auto Slice"
 msgstr ""
-"Sin textura en este nodo.\n"
-"Asigná una textura para poder editar la región."
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Offset:"
+msgstr "Offset de Grilla:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Step:"
+msgstr "Paso (s):"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Separation:"
+msgstr "Selecciones:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Texture Region"
+msgstr "Editor de Regiones de Texturas"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region Editor"
+msgstr "Editor de Regiones de Texturas"
 
 #: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Can't save theme to file:"
@@ -5018,8 +5126,8 @@ msgstr ""
 #: tools/editor/project_export.cpp
 msgid "Filters to exclude from export (comma-separated, e.g.: *.json, *.txt):"
 msgstr ""
-"Filtros para excluir de la exportación (separados por comas, ej: *.json, "
-"*.txt):"
+"Filtros para excluir de la exportación (separados por comas, ej: *.json, *."
+"txt):"
 
 #: tools/editor/project_export.cpp
 msgid "Convert text scenes to binary on export."
@@ -5772,7 +5880,8 @@ msgstr "No se puede operar sobre los nodos de una escena externa!"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Can't operate on nodes the current scene inherits from!"
-msgstr "No se puede operar sobre los nodos de los cual hereda la escena actual!"
+msgstr ""
+"No se puede operar sobre los nodos de los cual hereda la escena actual!"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Remove Node(s)"
@@ -5799,12 +5908,16 @@ msgid "Error duplicating scene to save it."
 msgstr "Error al duplicar escena para guardarla."
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "New Scene Root"
-msgstr "Nueva Raíz de Escena"
+msgid "Edit Groups"
+msgstr "Editar Grupos"
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Edit Connections"
+msgstr "Editar Conexiones"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Inherit Scene"
-msgstr "Heredar Escena"
+msgid "Delete Node(s)"
+msgstr "Eliminar Nodo(s)"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Add Child Node"
@@ -5819,14 +5932,6 @@ msgid "Change Type"
 msgstr "Cambiar Tipo"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Groups"
-msgstr "Editar Grupos"
-
-#: tools/editor/scene_tree_dock.cpp
-msgid "Edit Connections"
-msgstr "Editar Conexiones"
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add Script"
 msgstr "Agregar Script"
 
@@ -5839,10 +5944,6 @@ msgid "Save Branch as Scene"
 msgstr "Guardar Rama como Escena"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Delete Node(s)"
-msgstr "Eliminar Nodo(s)"
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add/Create a New Node"
 msgstr "Agregar/Crear un Nuevo Nodo"
 
@@ -6235,6 +6336,31 @@ msgstr "Cambiar Largo de Shape Rayo"
 msgid "Change Notifier Extents"
 msgstr "Cambiar Alcances de Notificadores"
 
+#~ msgid "Change Anim Loop Interpolation"
+#~ msgstr "Cambiar Interpolación de Loop de Anim"
+
+#~ msgid "Enable/Disable interpolation when looping animation."
+#~ msgstr "Activar/Desactivar interpolación al loopear animación."
+
+#~ msgid "Load Layout"
+#~ msgstr "Cargar Layout"
+
+#~ msgid "Scale Region Editor"
+#~ msgstr "Editor de Regiones de Escalado"
+
+#~ msgid ""
+#~ "No texture in this node.\n"
+#~ "Set a texture to be able to edit region."
+#~ msgstr ""
+#~ "Sin textura en este nodo.\n"
+#~ "Asigná una textura para poder editar la región."
+
+#~ msgid "New Scene Root"
+#~ msgstr "Nueva Raíz de Escena"
+
+#~ msgid "Inherit Scene"
+#~ msgstr "Heredar Escena"
+
 #~ msgid "Binds (Extra Params):"
 #~ msgstr "Binds (Parametros Extra):"
 
diff --git a/tools/translations/es_AR.po b/tools/translations/es_AR.po
index e9dc591b98..cca5745688 100644
--- a/tools/translations/es_AR.po
+++ b/tools/translations/es_AR.po
@@ -10,8 +10,8 @@ msgstr ""
 "POT-Creation-Date: \n"
 "PO-Revision-Date: 2016-06-19 12:39+0000\n"
 "Last-Translator: Lisandro Lorea <lisandrolorea@gmail.com>\n"
-"Language-Team: Spanish (Argentina) <https://hosted.weblate.org/projects"
-"/godot-engine/godot/es_AR/>\n"
+"Language-Team: Spanish (Argentina) <https://hosted.weblate.org/projects/"
+"godot-engine/godot/es_AR/>\n"
 "Language: es_AR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -699,10 +699,6 @@ msgid "Change Anim Loop"
 msgstr "Cambiar Loop de Anim"
 
 #: tools/editor/animation_editor.cpp
-msgid "Change Anim Loop Interpolation"
-msgstr "Cambiar Interpolación de Loop de Anim"
-
-#: tools/editor/animation_editor.cpp
 msgid "Anim Create Typed Value Key"
 msgstr "Crear Clave de Valor Tipado para Anim"
 
@@ -743,10 +739,6 @@ msgid "Enable/Disable looping in animation."
 msgstr "Activar/Desactivar loopeo en la animación."
 
 #: tools/editor/animation_editor.cpp
-msgid "Enable/Disable interpolation when looping animation."
-msgstr "Activar/Desactivar interpolación al loopear animación."
-
-#: tools/editor/animation_editor.cpp
 msgid "Add new tracks."
 msgstr "Agregar nuevos tracks."
 
@@ -1011,7 +1003,8 @@ msgid "Method in target Node must be specified!"
 msgstr "El método en el Nodo objetivo debe ser especificado!"
 
 #: tools/editor/connections_dialog.cpp
-msgid "Conect To Node:"
+#, fuzzy
+msgid "Connect To Node:"
 msgstr "Conectar a Nodo:"
 
 #: tools/editor/connections_dialog.cpp tools/editor/groups_editor.cpp
@@ -1230,6 +1223,51 @@ msgstr "Elegí un Directorio"
 msgid "Choose"
 msgstr "Elegir"
 
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Back"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Forward"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Refresh"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Hidden Files"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Toggle Favorite"
+msgstr "Act/Desact. Breakpoint"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Toggle Mode"
+msgstr "Act/Desact. Comentario"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Focus Path"
+msgstr "Copiar Ruta"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Mode Favorite Up"
+msgstr "Favoritos:"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Mode Favorite Down"
+msgstr "Bajar"
+
 #: tools/editor/editor_file_dialog.cpp tools/editor/scenes_dock.cpp
 msgid "Favorites:"
 msgstr "Favoritos:"
@@ -1484,9 +1522,31 @@ msgid "There is no defined scene to run."
 msgstr "No hay escena definida para ejecutar."
 
 #: tools/editor/editor_node.cpp
+#, fuzzy
+msgid ""
+"No main scene has ever been defined, select one?\n"
+"You can change it later in later in \"Project Settings\" under the "
+"'application' category."
+msgstr ""
+"No se ha definido ninguna escena principal.\n"
+"Seleccioná una de \"Ajustes del Proyecto\" bajo la categoria 'aplicacion'."
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
 msgid ""
-"No main scene has ever been defined.\n"
-"Select one from \"Project Settings\" under the 'application' category."
+"Selected scene '%s' does not exist, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+"No se ha definido ninguna escena principal.\n"
+"Seleccioná una de \"Ajustes del Proyecto\" bajo la categoria 'aplicacion'."
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid ""
+"Selected scene '%s' is not a scene file, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
 msgstr ""
 "No se ha definido ninguna escena principal.\n"
 "Seleccioná una de \"Ajustes del Proyecto\" bajo la categoria 'aplicacion'."
@@ -1582,6 +1642,11 @@ msgid ""
 "(Unsaved changes will be lost)"
 msgstr "Abrir el Gestor de Proyectos? (Los cambios sin guardar se perderán)"
 
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Pick a Manu Scene"
+msgstr "Escena Principal"
+
 #: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
 msgid "Ugh"
 msgstr "Ugh"
@@ -1608,18 +1673,14 @@ msgid "Save Layout"
 msgstr "Guardar Layout"
 
 #: tools/editor/editor_node.cpp
-msgid "Load Layout"
-msgstr "Cargar Layout"
+msgid "Delete Layout"
+msgstr "Eliminar Layout"
 
 #: tools/editor/editor_node.cpp tools/editor/project_export.cpp
 msgid "Default"
 msgstr "Por Defecto"
 
 #: tools/editor/editor_node.cpp
-msgid "Delete Layout"
-msgstr "Eliminar Layout"
-
-#: tools/editor/editor_node.cpp
 msgid "Switch Scene Tab"
 msgstr "Cambiar Pestaña de Escena"
 
@@ -1649,6 +1710,16 @@ msgid "Distraction Free Mode"
 msgstr "Modo Sin Distracciones"
 
 #: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Next tab"
+msgstr "Siguiente"
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Previous tab"
+msgstr "Directorio Previo"
+
+#: tools/editor/editor_node.cpp
 msgid "Operations with scene files."
 msgstr "Operaciones con archivos de escena."
 
@@ -2213,6 +2284,12 @@ msgid "No target font resource!"
 msgstr "Sin recurso de tipografías de destino!"
 
 #: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"Invalid file extension.\n"
+"Please use .fnt."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Can't load/process source font."
 msgstr "No se puede cargar/procesar la tipografía de origen."
 
@@ -2452,7 +2529,8 @@ msgid "Couldn't load post-import script:"
 msgstr "No se pudo cargar el script post importación:"
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
-msgid "Invalid/broken script for post-import:"
+#, fuzzy
+msgid "Invalid/broken script for post-import (check console):"
 msgstr "Script para post importación inválido/roto:"
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -3120,13 +3198,11 @@ msgstr "Configurar Snap"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Offset:"
 msgstr "Offset de Grilla:"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Step:"
 msgstr "Setp de Grilla:"
 
@@ -3246,7 +3322,6 @@ msgstr "Usar Snap"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Show Grid"
 msgstr "Mostrar la Grilla"
 
@@ -3499,6 +3574,10 @@ msgid "MeshInstance lacks a Mesh!"
 msgstr "A MeshInstance le falta un Mesh!"
 
 #: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh has not surface to create outlines from!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
 msgid "Could not create outline!"
 msgstr "No se pudo crear el outline!"
 
@@ -3861,17 +3940,14 @@ msgid "Clear UV"
 msgstr "Limpiar UV"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Snap"
 msgstr "Esnapear"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Enable Snap"
 msgstr "Activar Snap"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid"
 msgstr "Grilla"
 
@@ -4709,20 +4785,51 @@ msgid "StyleBox Preview:"
 msgstr "Vista Previa de StyleBox:"
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Texture Region Editor"
-msgstr "Editor de Regiones de Texturas"
+#, fuzzy
+msgid "Snap Mode:"
+msgstr "Modo de Ejecución:"
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Scale Region Editor"
-msgstr "Editor de Regiones de Escalado"
+msgid "<None>"
+msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid ""
-"No texture in this node.\n"
-"Set a texture to be able to edit region."
+#, fuzzy
+msgid "Pixel Snap"
+msgstr "Usar Pixel Snap"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Grid Snap"
+msgstr "Setp de Grilla:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Auto Slice"
 msgstr ""
-"Sin textura en este nodo.\n"
-"Asigná una textura para poder editar la región."
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Offset:"
+msgstr "Offset de Grilla:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Step:"
+msgstr "Paso (s):"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Separation:"
+msgstr "Selecciones:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Texture Region"
+msgstr "Editor de Regiones de Texturas"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region Editor"
+msgstr "Editor de Regiones de Texturas"
 
 #: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Can't save theme to file:"
@@ -5801,12 +5908,16 @@ msgid "Error duplicating scene to save it."
 msgstr "Error al duplicar escena para guardarla."
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "New Scene Root"
-msgstr "Nueva Raíz de Escena"
+msgid "Edit Groups"
+msgstr "Editar Grupos"
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Edit Connections"
+msgstr "Editar Conexiones"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Inherit Scene"
-msgstr "Heredar Escena"
+msgid "Delete Node(s)"
+msgstr "Eliminar Nodo(s)"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Add Child Node"
@@ -5821,14 +5932,6 @@ msgid "Change Type"
 msgstr "Cambiar Tipo"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Groups"
-msgstr "Editar Grupos"
-
-#: tools/editor/scene_tree_dock.cpp
-msgid "Edit Connections"
-msgstr "Editar Conexiones"
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add Script"
 msgstr "Agregar Script"
 
@@ -5841,10 +5944,6 @@ msgid "Save Branch as Scene"
 msgstr "Guardar Rama como Escena"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Delete Node(s)"
-msgstr "Eliminar Nodo(s)"
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add/Create a New Node"
 msgstr "Agregar/Crear un Nuevo Nodo"
 
@@ -6237,6 +6336,31 @@ msgstr "Cambiar Largo de Shape Rayo"
 msgid "Change Notifier Extents"
 msgstr "Cambiar Alcances de Notificadores"
 
+#~ msgid "Change Anim Loop Interpolation"
+#~ msgstr "Cambiar Interpolación de Loop de Anim"
+
+#~ msgid "Enable/Disable interpolation when looping animation."
+#~ msgstr "Activar/Desactivar interpolación al loopear animación."
+
+#~ msgid "Load Layout"
+#~ msgstr "Cargar Layout"
+
+#~ msgid "Scale Region Editor"
+#~ msgstr "Editor de Regiones de Escalado"
+
+#~ msgid ""
+#~ "No texture in this node.\n"
+#~ "Set a texture to be able to edit region."
+#~ msgstr ""
+#~ "Sin textura en este nodo.\n"
+#~ "Asigná una textura para poder editar la región."
+
+#~ msgid "New Scene Root"
+#~ msgstr "Nueva Raíz de Escena"
+
+#~ msgid "Inherit Scene"
+#~ msgstr "Heredar Escena"
+
 #~ msgid "Binds (Extra Params):"
 #~ msgstr "Binds (Parametros Extra):"
 
diff --git a/tools/translations/fr.po b/tools/translations/fr.po
index 386a7e6170..24a8790ca0 100644
--- a/tools/translations/fr.po
+++ b/tools/translations/fr.po
@@ -2,6 +2,7 @@
 # Copyright (C) 2016 Juan Linietsky, Ariel Manzur and the Godot community
 # This file is distributed under the same license as the Godot source code.
 #
+# Chenebel Dorian <LoubiTek54@gmail.com>, 2016.
 # derderder77 <derderder77380@gmail.com>, 2016.
 # finkiki <specialpopol@gmx.fr>, 2016.
 # Hugo Locurcio <hugo.l@openmailbox.org>, 2016.
@@ -11,10 +12,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2016-06-19 13:17+0000\n"
-"Last-Translator: Rémi Verschelde <akien@godotengine.org>\n"
-"Language-Team: French <https://hosted.weblate.org/projects/godot-"
-"engine/godot/fr/>\n"
+"PO-Revision-Date: 2016-06-25 18:35+0000\n"
+"Last-Translator: Chenebel Dorian <LoubiTek54@gmail.com>\n"
+"Language-Team: French <https://hosted.weblate.org/projects/godot-engine/"
+"godot/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,11 +25,11 @@ msgstr ""
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Invalid type argument to convert(), use TYPE_* constants."
-msgstr ""
+msgstr "Argument invalide de type convertir(), utiliser le TYPE * constantes."
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Not enough bytes for decoding bytes, or invalid format."
-msgstr ""
+msgstr "Pas assez d'octets pour les octets de décodage, ou format non valide."
 
 #: modules/gdscript/gd_functions.cpp
 msgid "step argument is zero!"
@@ -523,43 +524,43 @@ msgstr "Toute la sélection"
 
 #: tools/editor/animation_editor.cpp
 msgid "Move Add Key"
-msgstr "Déplacer Ajouter Clé"
+msgstr "Mouvement Ajouter une clé"
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Change Transition"
-msgstr "Anim Modifier Transition"
+msgstr "Animation Changer la transition"
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Change Transform"
-msgstr "Anim Modifier Transform"
+msgstr "Animation Changer la transformation"
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Change Value"
-msgstr "Anim Modifier Valeur"
+msgstr "Animation Changer la valeur"
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Change Call"
-msgstr "Anim Modifier Appel"
+msgstr "Animation Changer l'appel"
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Add Track"
-msgstr "Anim Ajouter Piste"
+msgstr "Animation Ajouter une piste"
 
 #: tools/editor/animation_editor.cpp
 msgid "Move Anim Track Up"
-msgstr "Monter Piste Anim"
+msgstr "Monter la piste d'animation"
 
 #: tools/editor/animation_editor.cpp
 msgid "Move Anim Track Down"
-msgstr "Descendre Piste Anim"
+msgstr "Descendre la piste d'animation"
 
 #: tools/editor/animation_editor.cpp
 msgid "Remove Anim Track"
-msgstr "Supprimer Piste Anim"
+msgstr "Supprimer la piste d'animation"
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Duplicate Keys"
-msgstr "Anim Dupliquer Clés"
+msgstr "Animation Dupliquer les clés"
 
 #: tools/editor/animation_editor.cpp
 msgid "Set Transitions to:"
@@ -567,27 +568,27 @@ msgstr "Définir les transitions à :"
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Track Rename"
-msgstr ""
+msgstr "Renommer la piste d'animation"
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Track Change Interpolation"
-msgstr ""
+msgstr "Modifier l'interpolation de la piste d'animation"
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Track Change Value Mode"
-msgstr ""
+msgstr "Modifier le mode de valeur de la piste d'animation"
 
 #: tools/editor/animation_editor.cpp
 msgid "Edit Node Curve"
-msgstr ""
+msgstr "Modifier Courbe du Noeud"
 
 #: tools/editor/animation_editor.cpp
 msgid "Edit Selection Curve"
-msgstr ""
+msgstr "Modifier la courbe de sélection"
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Delete Keys"
-msgstr ""
+msgstr "Animation Supprimer les clés"
 
 #: tools/editor/animation_editor.cpp
 msgid "Continuous"
@@ -603,11 +604,11 @@ msgstr ""
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Add Key"
-msgstr ""
+msgstr "Animation Ajouter une clé"
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Move Keys"
-msgstr ""
+msgstr "Animation Déplacer les clés"
 
 #: tools/editor/animation_editor.cpp
 msgid "Scale Selection"
@@ -690,15 +691,15 @@ msgstr "Créer"
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Create & Insert"
-msgstr ""
+msgstr "Animation Créer et insérer"
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Insert Track & Key"
-msgstr ""
+msgstr "Animation Insérer une piste et une clé"
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Insert Key"
-msgstr ""
+msgstr "Animation Inserer une clé"
 
 #: tools/editor/animation_editor.cpp
 msgid "Change Anim Len"
@@ -706,20 +707,15 @@ msgstr ""
 
 #: tools/editor/animation_editor.cpp
 msgid "Change Anim Loop"
-msgstr ""
-
-#: tools/editor/animation_editor.cpp
-#, fuzzy
-msgid "Change Anim Loop Interpolation"
-msgstr "Changer l'interpolation de l'animation bouclée"
+msgstr "Changer l'animation de la boucle"
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Create Typed Value Key"
-msgstr ""
+msgstr "Animation Créer une clé pour une valeur typée"
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Insert"
-msgstr ""
+msgstr "Insérer une animation"
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Scale Keys"
@@ -727,7 +723,7 @@ msgstr ""
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Add Call Track"
-msgstr ""
+msgstr "Animation ajouter une piste d'appel"
 
 #: tools/editor/animation_editor.cpp
 msgid "Animation zoom."
@@ -747,15 +743,11 @@ msgstr "Pas (s) :"
 
 #: tools/editor/animation_editor.cpp
 msgid "Cursor step snap (in seconds)."
-msgstr ""
+msgstr "Pas du curseur (en secondes)."
 
 #: tools/editor/animation_editor.cpp
 msgid "Enable/Disable looping in animation."
-msgstr ""
-
-#: tools/editor/animation_editor.cpp
-msgid "Enable/Disable interpolation when looping animation."
-msgstr ""
+msgstr "Activer/Désactiver le bouclage de l'animation."
 
 #: tools/editor/animation_editor.cpp
 msgid "Add new tracks."
@@ -883,11 +875,11 @@ msgstr "Support…"
 
 #: tools/editor/asset_library_editor_plugin.cpp
 msgid "Official"
-msgstr ""
+msgstr "Officiel"
 
 #: tools/editor/asset_library_editor_plugin.cpp
 msgid "Community"
-msgstr ""
+msgstr "Communauté"
 
 #: tools/editor/asset_library_editor_plugin.cpp
 msgid "Testing"
@@ -1022,7 +1014,8 @@ msgid "Method in target Node must be specified!"
 msgstr "La méthode du nœud cible doit être spécifiée !"
 
 #: tools/editor/connections_dialog.cpp
-msgid "Conect To Node:"
+#, fuzzy
+msgid "Connect To Node:"
 msgstr "Connecter au nœud :"
 
 #: tools/editor/connections_dialog.cpp tools/editor/groups_editor.cpp
@@ -1241,6 +1234,51 @@ msgstr "Choisir un répertoire"
 msgid "Choose"
 msgstr "Choisir"
 
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Back"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Forward"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Refresh"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Hidden Files"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Toggle Favorite"
+msgstr "Déplacer le favori vers le haut"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Toggle Mode"
+msgstr "Commenter/décommenter"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Focus Path"
+msgstr "Copier le chemin"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Mode Favorite Up"
+msgstr "Déplacer le favori vers le haut"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Mode Favorite Down"
+msgstr "Déplacer le favori vers le bas"
+
 #: tools/editor/editor_file_dialog.cpp tools/editor/scenes_dock.cpp
 msgid "Favorites:"
 msgstr "Favoris :"
@@ -1496,8 +1534,23 @@ msgstr "Il n'y a pas de scène définie pour être lancée."
 
 #: tools/editor/editor_node.cpp
 msgid ""
-"No main scene has ever been defined.\n"
-"Select one from \"Project Settings\" under the 'application' category."
+"No main scene has ever been defined, select one?\n"
+"You can change it later in later in \"Project Settings\" under the "
+"'application' category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' does not exist, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' is not a scene file, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
 msgstr ""
 
 #: tools/editor/editor_node.cpp
@@ -1595,6 +1648,11 @@ msgstr ""
 "Ouvrir le gestionnaire de projets ?\n"
 "(les modifications non sauvegardées seront perdues)"
 
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Pick a Manu Scene"
+msgstr "Scène principale"
+
 #: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
 msgid "Ugh"
 msgstr "Oups"
@@ -1621,18 +1679,14 @@ msgid "Save Layout"
 msgstr "Enregistrer la disposition"
 
 #: tools/editor/editor_node.cpp
-msgid "Load Layout"
-msgstr "Charger la disposition"
+msgid "Delete Layout"
+msgstr "Supprimer la disposition"
 
 #: tools/editor/editor_node.cpp tools/editor/project_export.cpp
 msgid "Default"
 msgstr "Par défaut"
 
 #: tools/editor/editor_node.cpp
-msgid "Delete Layout"
-msgstr "Supprimer la disposition"
-
-#: tools/editor/editor_node.cpp
 msgid "Switch Scene Tab"
 msgstr "Basculer entre les onglets de scène"
 
@@ -1662,6 +1716,16 @@ msgid "Distraction Free Mode"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Next tab"
+msgstr "Suivant"
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Previous tab"
+msgstr "Répertoire précédent"
+
+#: tools/editor/editor_node.cpp
 msgid "Operations with scene files."
 msgstr "Opérations avec les fichiers de scène."
 
@@ -2207,6 +2271,12 @@ msgid "No target font resource!"
 msgstr "Pas de ressource de police de destination !"
 
 #: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"Invalid file extension.\n"
+"Please use .fnt."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Can't load/process source font."
 msgstr "Impossible de charger ou traiter la police source."
 
@@ -2446,7 +2516,8 @@ msgid "Couldn't load post-import script:"
 msgstr "Impossible de charger le script de post-importation :"
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
-msgid "Invalid/broken script for post-import:"
+#, fuzzy
+msgid "Invalid/broken script for post-import (check console):"
 msgstr "Script de post-importation invalide ou cassé :"
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -3111,13 +3182,11 @@ msgstr "Configurer la grille"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Offset:"
 msgstr "Décalage de la grille :"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Step:"
 msgstr "Pas de la grille :"
 
@@ -3233,7 +3302,6 @@ msgstr "Aligner sur la grille"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Show Grid"
 msgstr "Afficher la grille"
 
@@ -3486,6 +3554,10 @@ msgid "MeshInstance lacks a Mesh!"
 msgstr "Le MeshInstance n'a pas de maillage !"
 
 #: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh has not surface to create outlines from!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
 msgid "Could not create outline!"
 msgstr "Impossible de créer le contour !"
 
@@ -3847,17 +3919,14 @@ msgid "Clear UV"
 msgstr "Effacer l'UV"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Snap"
 msgstr "Aligner"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Enable Snap"
 msgstr "Activer l'alignement"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid"
 msgstr "Grille"
 
@@ -4054,7 +4123,7 @@ msgstr "Trouver le suivant"
 #: tools/editor/plugins/script_editor_plugin.cpp
 #: tools/editor/plugins/shader_editor_plugin.cpp
 msgid "Find Previous"
-msgstr ""
+msgstr "trouver précédente"
 
 #: tools/editor/plugins/script_editor_plugin.cpp
 #: tools/editor/plugins/shader_editor_plugin.cpp
@@ -4696,19 +4765,52 @@ msgid "StyleBox Preview:"
 msgstr "Aperçu de la StyleBox :"
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Texture Region Editor"
-msgstr "Éditeur de région de texture"
+#, fuzzy
+msgid "Snap Mode:"
+msgstr "Mode d'exécution :"
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Scale Region Editor"
+msgid "<None>"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid ""
-"No texture in this node.\n"
-"Set a texture to be able to edit region."
+#, fuzzy
+msgid "Pixel Snap"
+msgstr "Aligner au pixel près"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Grid Snap"
+msgstr "Pas de la grille :"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Auto Slice"
 msgstr ""
 
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Offset:"
+msgstr "Décalage de la grille :"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Step:"
+msgstr "Pas (s) :"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Separation:"
+msgstr "Sections :"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Texture Region"
+msgstr "Éditeur de région de texture"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region Editor"
+msgstr "Éditeur de région de texture"
+
 #: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Can't save theme to file:"
 msgstr "Impossible d'enregistrer le thème dans le fichier :"
@@ -5783,12 +5885,16 @@ msgid "Error duplicating scene to save it."
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "New Scene Root"
-msgstr "Nouvelle racine de la scène"
+msgid "Edit Groups"
+msgstr "Modifier les groupes"
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Edit Connections"
+msgstr "Modifier les connexions"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Inherit Scene"
-msgstr "Hériter la scène"
+msgid "Delete Node(s)"
+msgstr "Supprimer nœud(s)"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Add Child Node"
@@ -5803,14 +5909,6 @@ msgid "Change Type"
 msgstr "Changer le type"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Groups"
-msgstr "Modifier les groupes"
-
-#: tools/editor/scene_tree_dock.cpp
-msgid "Edit Connections"
-msgstr "Modifier les connexions"
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add Script"
 msgstr "Ajouter un script"
 
@@ -5823,10 +5921,6 @@ msgid "Save Branch as Scene"
 msgstr "Sauvegarder la branche comme scène"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Delete Node(s)"
-msgstr "Supprimer nœud(s)"
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add/Create a New Node"
 msgstr "Ajouter un nouveau nœud"
 
@@ -6218,6 +6312,21 @@ msgstr "Changer la longueur d'une forme en rayon"
 msgid "Change Notifier Extents"
 msgstr "Changer les extents d'un notificateur"
 
+#~ msgid "Change Anim Loop Interpolation"
+#~ msgstr "Changer l'interpolation de la boucle d'animation"
+
+#~ msgid "Enable/Disable interpolation when looping animation."
+#~ msgstr "Activer/Désactiver l'interpolation lors de la boucle d'animation."
+
+#~ msgid "Load Layout"
+#~ msgstr "Charger la disposition"
+
+#~ msgid "New Scene Root"
+#~ msgstr "Nouvelle racine de la scène"
+
+#~ msgid "Inherit Scene"
+#~ msgstr "Hériter la scène"
+
 #~ msgid "Method In Node:"
 #~ msgstr "Méthode dans le nœud :"
 
@@ -6266,12 +6375,6 @@ msgstr "Changer les extents d'un notificateur"
 #~ msgid "Next Time:"
 #~ msgstr "Les prochaines fois :"
 
-#~ msgid "Move Favorite Up"
-#~ msgstr "Déplacer le favori vers le haut"
-
-#~ msgid "Move Favorite Down"
-#~ msgstr "Déplacer le favori vers le bas"
-
 #~ msgid "%d frames"
 #~ msgstr "%d images"
 
diff --git a/tools/translations/it.po b/tools/translations/it.po
index dfb0eb522a..f41289656c 100644
--- a/tools/translations/it.po
+++ b/tools/translations/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2016-06-19 09:39+0000\n"
+"PO-Revision-Date: 2016-06-22 15:28+0000\n"
 "Last-Translator: Dario Bonfanti <bonfi.96@hotmail.it>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/godot-engine/"
 "godot/it/>\n"
@@ -21,45 +21,46 @@ msgstr ""
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Invalid type argument to convert(), use TYPE_* constants."
-msgstr ""
+msgstr "Argomento tipo invalido per convert(), usare le costanti TYPE_*."
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Not enough bytes for decoding bytes, or invalid format."
 msgstr ""
+"Non vi sono abbastanza bytes per i bytes di decodifica, oppure formato "
+"invalido."
 
 #: modules/gdscript/gd_functions.cpp
 msgid "step argument is zero!"
-msgstr ""
+msgstr "step argument è zero!"
 
 #: modules/gdscript/gd_functions.cpp
-#, fuzzy
 msgid "Not a script with an instance"
-msgstr "Nessuna scena da istanziare selezionata!"
+msgstr "Non è uno script con un istanza"
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Not based on a script"
-msgstr ""
+msgstr "Non si basa su uno script"
 
 #: modules/gdscript/gd_functions.cpp
-#, fuzzy
 msgid "Not based on a resource file"
-msgstr "Nessuna risorsa font di destinazione!"
+msgstr "Non si basa su un file risorsa"
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Invalid instance dictionary format (missing @path)"
-msgstr ""
+msgstr "Istanza invalida formato dizionario (manca @path)"
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Invalid instance dictionary format (can't load script at @path)"
 msgstr ""
+"Istanza invalida formato dizionario (impossibile caricare script in @path)"
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Invalid instance dictionary format (invalid script at @path)"
-msgstr ""
+msgstr "Istanza invalida formato dizionario (script invalido in @path)"
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Invalid instance dictionary (invalid subclasses)"
-msgstr ""
+msgstr "Istanza invalida formato dizionario (sottoclassi invalide)"
 
 #: scene/2d/animated_sprite.cpp
 msgid ""
@@ -589,18 +590,16 @@ msgid "Anim Delete Keys"
 msgstr "Anim Elimina Key"
 
 #: tools/editor/animation_editor.cpp
-#, fuzzy
 msgid "Continuous"
-msgstr "Continua"
+msgstr "Continuo"
 
 #: tools/editor/animation_editor.cpp
-#, fuzzy
 msgid "Discrete"
-msgstr "Disconnetti"
+msgstr "Discreto"
 
 #: tools/editor/animation_editor.cpp
 msgid "Trigger"
-msgstr ""
+msgstr "Attivazione"
 
 #: tools/editor/animation_editor.cpp
 msgid "Anim Add Key"
@@ -710,11 +709,6 @@ msgid "Change Anim Loop"
 msgstr "Cambia Loop Animazione"
 
 #: tools/editor/animation_editor.cpp
-#, fuzzy
-msgid "Change Anim Loop Interpolation"
-msgstr "Cambia Loop Animazione"
-
-#: tools/editor/animation_editor.cpp
 msgid "Anim Create Typed Value Key"
 msgstr "Anim Crea Typed Value Key"
 
@@ -755,11 +749,6 @@ msgid "Enable/Disable looping in animation."
 msgstr "Attiva/Disattiva loop animazione."
 
 #: tools/editor/animation_editor.cpp
-#, fuzzy
-msgid "Enable/Disable interpolation when looping animation."
-msgstr "Attiva/Disattiva loop animazione."
-
-#: tools/editor/animation_editor.cpp
 msgid "Add new tracks."
 msgstr "Aggiungi nuova traccia."
 
@@ -1025,8 +1014,8 @@ msgstr "Il Metodo nel nodo di target deve essere specificato!"
 
 #: tools/editor/connections_dialog.cpp
 #, fuzzy
-msgid "Conect To Node:"
-msgstr "Collega A Nodo:"
+msgid "Connect To Node:"
+msgstr "Connetti A Nodo:"
 
 #: tools/editor/connections_dialog.cpp tools/editor/groups_editor.cpp
 #: tools/editor/plugins/item_list_editor_plugin.cpp
@@ -1044,17 +1033,15 @@ msgstr "Rimuovi"
 
 #: tools/editor/connections_dialog.cpp
 msgid "Add Extra Call Argument:"
-msgstr ""
+msgstr "Aggiungi Argomento Extra di Chiamata:"
 
 #: tools/editor/connections_dialog.cpp
-#, fuzzy
 msgid "Extra Call Arguments:"
-msgstr "Argomenti:"
+msgstr "Argomenti Chiamata Extra:"
 
 #: tools/editor/connections_dialog.cpp
-#, fuzzy
 msgid "Path to Node:"
-msgstr "Percorso Al Nodo:"
+msgstr "Percorso a Nodo:"
 
 #: tools/editor/connections_dialog.cpp
 msgid "Make Function"
@@ -1077,9 +1064,8 @@ msgid "Connect '%s' to '%s'"
 msgstr "Connetti '%s' a '%s'"
 
 #: tools/editor/connections_dialog.cpp
-#, fuzzy
 msgid "Connecting Signal:"
-msgstr "Connessioni:"
+msgstr "Connessione Segnali:"
 
 #: tools/editor/connections_dialog.cpp
 msgid "Create Subscription"
@@ -1248,6 +1234,51 @@ msgstr "Scegli una Directory"
 msgid "Choose"
 msgstr "Scegli"
 
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Back"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Forward"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Refresh"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Hidden Files"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Toggle Favorite"
+msgstr "Sposta Preferito Su"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Toggle Mode"
+msgstr "Cambia a Commento"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Focus Path"
+msgstr "Copia Percorso"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Mode Favorite Up"
+msgstr "Sposta Preferito Su"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Mode Favorite Down"
+msgstr "Sposta Preferito Giù"
+
 #: tools/editor/editor_file_dialog.cpp tools/editor/scenes_dock.cpp
 msgid "Favorites:"
 msgstr "Preferiti:"
@@ -1502,9 +1533,33 @@ msgid "There is no defined scene to run."
 msgstr "Non c'è nessuna scena definita da eseguire."
 
 #: tools/editor/editor_node.cpp
+#, fuzzy
+msgid ""
+"No main scene has ever been defined, select one?\n"
+"You can change it later in later in \"Project Settings\" under the "
+"'application' category."
+msgstr ""
+"Nessuna scena principale è mai stata definita.\n"
+"Selezionane una da \"Impostazioni Progetto\" sotto la categoria "
+"'applicazioni'."
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
 msgid ""
-"No main scene has ever been defined.\n"
-"Select one from \"Project Settings\" under the 'application' category."
+"Selected scene '%s' does not exist, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+"Nessuna scena principale è mai stata definita.\n"
+"Selezionane una da \"Impostazioni Progetto\" sotto la categoria "
+"'applicazioni'."
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid ""
+"Selected scene '%s' is not a scene file, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
 msgstr ""
 "Nessuna scena principale è mai stata definita.\n"
 "Selezionane una da \"Impostazioni Progetto\" sotto la categoria "
@@ -1604,6 +1659,11 @@ msgstr ""
 "Aprire la Gestione Progetti?\n"
 "(I cambiamenti non salvati saranno persi)"
 
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Pick a Manu Scene"
+msgstr "Scena Principale"
+
 #: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
 msgid "Ugh"
 msgstr "Ugh"
@@ -1630,18 +1690,14 @@ msgid "Save Layout"
 msgstr "Salva layout"
 
 #: tools/editor/editor_node.cpp
-msgid "Load Layout"
-msgstr "Carica Layout"
+msgid "Delete Layout"
+msgstr "Elimina Layout"
 
 #: tools/editor/editor_node.cpp tools/editor/project_export.cpp
 msgid "Default"
 msgstr "Default"
 
 #: tools/editor/editor_node.cpp
-msgid "Delete Layout"
-msgstr "Elimina Layout"
-
-#: tools/editor/editor_node.cpp
 msgid "Switch Scene Tab"
 msgstr "Cambia Tab di Scena"
 
@@ -1664,11 +1720,21 @@ msgstr "Vai alla scena precedentemente aperta."
 
 #: tools/editor/editor_node.cpp
 msgid "Fullscreen Mode"
-msgstr ""
+msgstr "Modalità Fullscreen"
 
 #: tools/editor/editor_node.cpp
 msgid "Distraction Free Mode"
-msgstr ""
+msgstr "Modalità Senza Distrazioni"
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Next tab"
+msgstr "Successivo"
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Previous tab"
+msgstr "Directory Precedente"
 
 #: tools/editor/editor_node.cpp
 msgid "Operations with scene files."
@@ -2235,6 +2301,12 @@ msgid "No target font resource!"
 msgstr "Nessuna risorsa font di destinazione!"
 
 #: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"Invalid file extension.\n"
+"Please use .fnt."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Can't load/process source font."
 msgstr "Impossibile caricare/processare il font sorgente."
 
@@ -2473,7 +2545,8 @@ msgid "Couldn't load post-import script:"
 msgstr "Impossibile caricare lo script di post-import:"
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
-msgid "Invalid/broken script for post-import:"
+#, fuzzy
+msgid "Invalid/broken script for post-import (check console):"
 msgstr "Script di post-import invalido/non funzionante:"
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -2858,9 +2931,8 @@ msgid "Create new animation in player."
 msgstr "Crea nuova animazione nel player."
 
 #: tools/editor/plugins/animation_player_editor_plugin.cpp
-#, fuzzy
 msgid "Load animation from disk."
-msgstr "Carica un'animazione da disco."
+msgstr "Carica animazione da disco."
 
 #: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Load an animation from disk."
@@ -2871,9 +2943,8 @@ msgid "Save the current animation"
 msgstr "Salva l'animazione corrente"
 
 #: tools/editor/plugins/animation_player_editor_plugin.cpp
-#, fuzzy
 msgid "Save As"
-msgstr "Salva Come.."
+msgstr "Salva Come"
 
 #: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Display list of animations in player."
@@ -3141,13 +3212,11 @@ msgstr "Configura Snap"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Offset:"
 msgstr "Offset Griglia:"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Step:"
 msgstr "Step Griglia:"
 
@@ -3267,7 +3336,6 @@ msgstr "Usa lo Snap"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Show Grid"
 msgstr "Mostra Griglia"
 
@@ -3520,6 +3588,10 @@ msgid "MeshInstance lacks a Mesh!"
 msgstr "MeshInstance manca di una Mesh!"
 
 #: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh has not surface to create outlines from!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
 msgid "Could not create outline!"
 msgstr "Impossiblile creare outline!"
 
@@ -3883,17 +3955,14 @@ msgid "Clear UV"
 msgstr "Cancella UV"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Snap"
 msgstr "Snap"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Enable Snap"
 msgstr "Abilita Snap"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid"
 msgstr "Griglia"
 
@@ -4073,9 +4142,8 @@ msgid "Auto Indent"
 msgstr "Auto Indenta"
 
 #: tools/editor/plugins/script_editor_plugin.cpp
-#, fuzzy
 msgid "Soft Reload Script"
-msgstr "Ricarica Tool Script"
+msgstr "Ricarica Script Soft"
 
 #: tools/editor/plugins/script_editor_plugin.cpp
 #: tools/editor/plugins/shader_editor_plugin.cpp
@@ -4167,9 +4235,8 @@ msgid "Help"
 msgstr "Aiuto"
 
 #: tools/editor/plugins/script_editor_plugin.cpp
-#, fuzzy
 msgid "Contextual Help"
-msgstr "Contestuale"
+msgstr "Aiuto Contestuale"
 
 #: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Tutorials"
@@ -4733,20 +4800,51 @@ msgid "StyleBox Preview:"
 msgstr "Anteprima StyleBox:"
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Texture Region Editor"
-msgstr "Editor Regioni Texture"
+#, fuzzy
+msgid "Snap Mode:"
+msgstr "Modalità esecuzione:"
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Scale Region Editor"
-msgstr "Scala Editor Regioni"
+msgid "<None>"
+msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid ""
-"No texture in this node.\n"
-"Set a texture to be able to edit region."
+#, fuzzy
+msgid "Pixel Snap"
+msgstr "Usa Snap a Pixel"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Grid Snap"
+msgstr "Step Griglia:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Auto Slice"
 msgstr ""
-"Nessuna texture in questo nodo.\n"
-"Imposta una texture per poter modificare la regione."
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Offset:"
+msgstr "Offset Griglia:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Step:"
+msgstr "Step (s):"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Separation:"
+msgstr "Sezioni:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Texture Region"
+msgstr "Editor Regioni Texture"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region Editor"
+msgstr "Editor Regioni Texture"
 
 #: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Can't save theme to file:"
@@ -4774,14 +4872,12 @@ msgid "Remove Class Items"
 msgstr "Rimuovi Elementi di Classe"
 
 #: tools/editor/plugins/theme_editor_plugin.cpp
-#, fuzzy
 msgid "Create Empty Template"
-msgstr "Crea Template"
+msgstr "Crea Template Vuota"
 
 #: tools/editor/plugins/theme_editor_plugin.cpp
-#, fuzzy
 msgid "Create Empty Editor Template"
-msgstr "Crea Template"
+msgstr "Crea Template Editor Vuota"
 
 #: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "CheckBox Radio1"
@@ -4867,28 +4963,24 @@ msgid "Erase TileMap"
 msgstr "Cancella TileMap"
 
 #: tools/editor/plugins/tile_map_editor_plugin.cpp
-#, fuzzy
 msgid "Erase selection"
-msgstr "Elimina Selezione"
+msgstr "Cancella selezione"
 
 #: tools/editor/plugins/tile_map_editor_plugin.cpp
-#, fuzzy
 msgid "Find tile"
-msgstr "Trova Successivo"
+msgstr "Trova tile"
 
 #: tools/editor/plugins/tile_map_editor_plugin.cpp
 msgid "Transpose"
 msgstr "Trasponi"
 
 #: tools/editor/plugins/tile_map_editor_plugin.cpp
-#, fuzzy
 msgid "Mirror X"
-msgstr "Specchia X (A)"
+msgstr "Specchia X"
 
 #: tools/editor/plugins/tile_map_editor_plugin.cpp
-#, fuzzy
 msgid "Mirror Y"
-msgstr "Specchia Y (A)"
+msgstr "Specchia Y"
 
 #: tools/editor/plugins/tile_map_editor_plugin.cpp
 msgid "Bucket"
@@ -5829,12 +5921,16 @@ msgid "Error duplicating scene to save it."
 msgstr "Errore duplicando la scena per salvarla."
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "New Scene Root"
-msgstr "Nuova Scena di Root"
+msgid "Edit Groups"
+msgstr "Modifica Gruppi"
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Edit Connections"
+msgstr "Modifica Connessioni"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Inherit Scene"
-msgstr "Eredita Scena"
+msgid "Delete Node(s)"
+msgstr "Elimina Nodo(i)"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Add Child Node"
@@ -5849,14 +5945,6 @@ msgid "Change Type"
 msgstr "Cambia Tipo"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Groups"
-msgstr "Modifica Gruppi"
-
-#: tools/editor/scene_tree_dock.cpp
-msgid "Edit Connections"
-msgstr "Modifica Connessioni"
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add Script"
 msgstr "Aggiungi Script"
 
@@ -5869,10 +5957,6 @@ msgid "Save Branch as Scene"
 msgstr "Salva Ramo come Scena"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Delete Node(s)"
-msgstr "Elimina Nodo(i)"
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add/Create a New Node"
 msgstr "Aggiungi/Crea un Nuovo Nodo"
 
@@ -5926,7 +6010,7 @@ msgstr "Carica come placeholder"
 
 #: tools/editor/scene_tree_editor.cpp
 msgid "Discard Instancing"
-msgstr ""
+msgstr "Scarta Istanziamento"
 
 #: tools/editor/scene_tree_editor.cpp
 msgid "Open in Editor"
@@ -6266,6 +6350,31 @@ msgstr "Cambia lunghezza Ray Shape"
 msgid "Change Notifier Extents"
 msgstr "Cambia Estensione di Notifier"
 
+#~ msgid "Change Anim Loop Interpolation"
+#~ msgstr "Cambia Interpolazione Loop Animazione"
+
+#~ msgid "Enable/Disable interpolation when looping animation."
+#~ msgstr "Attiva/Disattiva interpolazione durante loop animazione."
+
+#~ msgid "Load Layout"
+#~ msgstr "Carica Layout"
+
+#~ msgid "Scale Region Editor"
+#~ msgstr "Scala Editor Regioni"
+
+#~ msgid ""
+#~ "No texture in this node.\n"
+#~ "Set a texture to be able to edit region."
+#~ msgstr ""
+#~ "Nessuna texture in questo nodo.\n"
+#~ "Imposta una texture per poter modificare la regione."
+
+#~ msgid "New Scene Root"
+#~ msgstr "Nuova Scena di Root"
+
+#~ msgid "Inherit Scene"
+#~ msgstr "Eredita Scena"
+
 #~ msgid "Binds (Extra Params):"
 #~ msgstr "Lega (Parametri Extra):"
 
@@ -6305,12 +6414,6 @@ msgstr "Cambia Estensione di Notifier"
 #~ msgid "Plugin List:"
 #~ msgstr "Lista Plugin:"
 
-#~ msgid "Move Favorite Up"
-#~ msgstr "Sposta Preferito Su"
-
-#~ msgid "Move Favorite Down"
-#~ msgstr "Sposta Preferito Giù"
-
 #~ msgid "%d frames"
 #~ msgstr "%d frames"
 
diff --git a/tools/translations/ja.po b/tools/translations/ja.po
new file mode 100644
index 0000000000..4b6a1c8a28
--- /dev/null
+++ b/tools/translations/ja.po
@@ -0,0 +1,6182 @@
+# Japanese translation of the Godot Engine editor
+# Copyright (C) 2016 Juan Linietsky, Ariel Manzur and the Godot community
+# This file is distributed under the same license as the Godot source code.
+#
+# hopping tappy (たっぴさん) <hopping.tappy@gmail.com>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Godot Engine editor\n"
+"PO-Revision-Date: 2016-06-20 19:30+0000\n"
+"Last-Translator: hopping tappy (たっぴさん) <hopping.tappy@gmail.com>\n"
+"Language-Team: Japanese <https://hosted.weblate.org/projects/godot-engine/"
+"godot/ja/>\n"
+"Language: ja\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 2.7-dev\n"
+
+#: modules/gdscript/gd_functions.cpp
+#, fuzzy
+msgid "Invalid type argument to convert(), use TYPE_* constants."
+msgstr "Convert()に対して無効な型の引数です。TYPE_* 定数を使ってください。"
+
+#: modules/gdscript/gd_functions.cpp
+#, fuzzy
+msgid "Not enough bytes for decoding bytes, or invalid format."
+msgstr "デコードバイトのバイトは十分ではありません。または無効な形式です。"
+
+#: modules/gdscript/gd_functions.cpp
+msgid "step argument is zero!"
+msgstr "ステップ引数はゼロです！"
+
+#: modules/gdscript/gd_functions.cpp
+msgid "Not a script with an instance"
+msgstr ""
+
+#: modules/gdscript/gd_functions.cpp
+msgid "Not based on a script"
+msgstr ""
+
+#: modules/gdscript/gd_functions.cpp
+msgid "Not based on a resource file"
+msgstr ""
+
+#: modules/gdscript/gd_functions.cpp
+#, fuzzy
+msgid "Invalid instance dictionary format (missing @path)"
+msgstr "無効なインスタンス辞書形式です ( @path が見つかりません)"
+
+#: modules/gdscript/gd_functions.cpp
+#, fuzzy
+msgid "Invalid instance dictionary format (can't load script at @path)"
+msgstr "無効なインスタンス辞書形式です (@path でスクリプトを読み込めません)"
+
+#: modules/gdscript/gd_functions.cpp
+#, fuzzy
+msgid "Invalid instance dictionary format (invalid script at @path)"
+msgstr "無効なインスタンス辞書形式です (@path で無効なスクリプト)"
+
+#: modules/gdscript/gd_functions.cpp
+#, fuzzy
+msgid "Invalid instance dictionary (invalid subclasses)"
+msgstr "無効なインスタンス辞書です (無効なサブクラス)"
+
+#: scene/2d/animated_sprite.cpp
+msgid ""
+"A SpriteFrames resource must be created or set in the 'Frames' property in "
+"order for AnimatedSprite to display frames."
+msgstr ""
+
+#: scene/2d/canvas_modulate.cpp
+msgid ""
+"Only one visible CanvasModulate is allowed per scene (or set of instanced "
+"scenes). The first created one will work, while the rest will be ignored."
+msgstr ""
+
+#: scene/2d/collision_polygon_2d.cpp
+msgid ""
+"CollisionPolygon2D only serves to provide a collision shape to a "
+"CollisionObject2D derived node. Please only use it as a child of Area2D, "
+"StaticBody2D, RigidBody2D, KinematicBody2D, etc. to give them a shape."
+msgstr ""
+
+#: scene/2d/collision_polygon_2d.cpp
+msgid "An empty CollisionPolygon2D has no effect on collision."
+msgstr ""
+
+#: scene/2d/collision_shape_2d.cpp
+msgid ""
+"CollisionShape2D only serves to provide a collision shape to a "
+"CollisionObject2D derived node. Please only use it as a child of Area2D, "
+"StaticBody2D, RigidBody2D, KinematicBody2D, etc. to give them a shape."
+msgstr ""
+
+#: scene/2d/collision_shape_2d.cpp
+msgid ""
+"A shape must be provided for CollisionShape2D to function. Please create a "
+"shape resource for it!"
+msgstr ""
+
+#: scene/2d/light_2d.cpp
+msgid ""
+"A texture with the shape of the light must be supplied to the 'texture' "
+"property."
+msgstr ""
+
+#: scene/2d/light_occluder_2d.cpp
+msgid ""
+"An occluder polygon must be set (or drawn) for this occluder to take effect."
+msgstr ""
+
+#: scene/2d/light_occluder_2d.cpp
+msgid "The occluder polygon for this occluder is empty. Please draw a polygon!"
+msgstr ""
+
+#: scene/2d/navigation_polygon.cpp
+msgid ""
+"A NavigationPolygon resource must be set or created for this node to work. "
+"Please set a property or draw a polygon."
+msgstr ""
+
+#: scene/2d/navigation_polygon.cpp
+msgid ""
+"NavigationPolygonInstance must be a child or grandchild to a Navigation2D "
+"node. It only provides navigation data."
+msgstr ""
+
+#: scene/2d/parallax_layer.cpp
+msgid ""
+"ParallaxLayer node only works when set as child of a ParallaxBackground node."
+msgstr ""
+
+#: scene/2d/particles_2d.cpp
+msgid "Path property must point to a valid Particles2D node to work."
+msgstr ""
+
+#: scene/2d/path_2d.cpp
+msgid "PathFollow2D only works when set as a child of a Path2D node."
+msgstr ""
+
+#: scene/2d/remote_transform_2d.cpp
+msgid "Path property must point to a valid Node2D node to work."
+msgstr ""
+
+#: scene/2d/sample_player_2d.cpp scene/audio/sample_player.cpp
+msgid ""
+"A SampleLibrary resource must be created or set in the 'samples' property in "
+"order for SamplePlayer to play sound."
+msgstr ""
+
+#: scene/2d/sprite.cpp
+msgid ""
+"Path property must point to a valid Viewport node to work. Such Viewport "
+"must be set to 'render target' mode."
+msgstr ""
+
+#: scene/2d/sprite.cpp
+msgid ""
+"The Viewport set in the path property must be set as 'render target' in "
+"order for this sprite to work."
+msgstr ""
+
+#: scene/2d/visibility_notifier_2d.cpp
+msgid ""
+"VisibilityEnable2D works best when used with the edited scene root directly "
+"as parent."
+msgstr ""
+
+#: scene/3d/body_shape.cpp
+msgid ""
+"CollisionShape only serves to provide a collision shape to a CollisionObject "
+"derived node. Please only use it as a child of Area, StaticBody, RigidBody, "
+"KinematicBody, etc. to give them a shape."
+msgstr ""
+
+#: scene/3d/body_shape.cpp
+msgid ""
+"A shape must be provided for CollisionShape to function. Please create a "
+"shape resource for it!"
+msgstr ""
+
+#: scene/3d/collision_polygon.cpp
+msgid ""
+"CollisionPolygon only serves to provide a collision shape to a "
+"CollisionObject derived node. Please only use it as a child of Area, "
+"StaticBody, RigidBody, KinematicBody, etc. to give them a shape."
+msgstr ""
+
+#: scene/3d/collision_polygon.cpp
+msgid "An empty CollisionPolygon has no effect on collision."
+msgstr ""
+
+#: scene/3d/navigation_mesh.cpp
+msgid "A NavigationMesh resource must be set or created for this node to work."
+msgstr ""
+
+#: scene/3d/navigation_mesh.cpp
+msgid ""
+"NavigationMeshInstance must be a child or grandchild to a Navigation node. "
+"It only provides navigation data."
+msgstr ""
+
+#: scene/3d/scenario_fx.cpp
+msgid ""
+"Only one WorldEnvironment is allowed per scene (or set of instanced scenes)."
+msgstr ""
+
+#: scene/3d/spatial_sample_player.cpp
+msgid ""
+"A SampleLibrary resource must be created or set in the 'samples' property in "
+"order for SpatialSamplePlayer to play sound."
+msgstr ""
+
+#: scene/3d/sprite_3d.cpp
+msgid ""
+"A SpriteFrames resource must be created or set in the 'Frames' property in "
+"order for AnimatedSprite3D to display frames."
+msgstr ""
+
+#: scene/gui/dialogs.cpp tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Cancel"
+msgstr "キャンセル"
+
+#: scene/gui/dialogs.cpp
+msgid "OK"
+msgstr "決定"
+
+#: scene/gui/dialogs.cpp
+msgid "Alert!"
+msgstr "警告!"
+
+#: scene/gui/dialogs.cpp
+msgid "Please Confirm..."
+msgstr "確認してください。"
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+msgid "File Exists, Overwrite?"
+msgstr "ファイルが既に存在します。上書きしますか？"
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+msgid "All Recognized"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+msgid "All Files (*)"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+#: tools/editor/editor_help.cpp tools/editor/editor_node.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp tools/editor/quick_open.cpp
+#: tools/editor/scenes_dock.cpp
+msgid "Open"
+msgstr "開く"
+
+#: scene/gui/file_dialog.cpp
+msgid "Open a File"
+msgstr "ファイルを開く"
+
+#: scene/gui/file_dialog.cpp
+msgid "Open File(s)"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp
+msgid "Open a Directory"
+msgstr "ディレクトリを開く"
+
+#: scene/gui/file_dialog.cpp
+msgid "Open a File or Directory"
+msgstr "ファイルまたはディレクトリを開く"
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+#: tools/editor/editor_node.cpp
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Save"
+msgstr "保存"
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+msgid "Save a File"
+msgstr "ファイルを保存"
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_dir_dialog.cpp
+#: tools/editor/editor_file_dialog.cpp
+msgid "Create Folder"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+#: tools/editor/project_settings.cpp tools/editor/script_create_dialog.cpp
+msgid "Path:"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+msgid "Directories & Files:"
+msgstr ""
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+#: tools/editor/script_editor_debugger.cpp
+msgid "File:"
+msgstr "ファイル:"
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+msgid "Filter:"
+msgstr "フィルター:"
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_dir_dialog.cpp
+#: tools/editor/editor_file_dialog.cpp tools/editor/editor_plugin_settings.cpp
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Name:"
+msgstr "名前:"
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_dir_dialog.cpp
+#: tools/editor/editor_file_dialog.cpp
+msgid "Could not create folder."
+msgstr "フォルダを作成できませんでした。"
+
+#: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
+msgid "Must use a valid extension."
+msgstr "有効な拡張子を使用する必要があります。"
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+#: tools/editor/settings_config_dialog.cpp
+msgid "Shift+"
+msgstr "Shift+"
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+#: tools/editor/settings_config_dialog.cpp
+msgid "Alt+"
+msgstr "Alt+"
+
+#: scene/gui/input_action.cpp
+msgid "Ctrl+"
+msgstr "Ctrl+"
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+#: tools/editor/settings_config_dialog.cpp
+msgid "Meta+"
+msgstr "Meta+"
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+msgid "Device"
+msgstr "デバイス"
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+msgid "Button"
+msgstr "ボタン"
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+msgid "Left Button."
+msgstr "左クリック"
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+msgid "Right Button."
+msgstr "右クリック"
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+msgid "Middle Button."
+msgstr "中クリック"
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+msgid "Wheel Up."
+msgstr "ホイール上"
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+msgid "Wheel Down."
+msgstr "ホイール下"
+
+#: scene/gui/input_action.cpp tools/editor/project_settings.cpp
+msgid "Axis"
+msgstr "アナログ"
+
+#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Cut"
+msgstr "切り取り"
+
+#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/property_editor.cpp tools/editor/resources_dock.cpp
+msgid "Copy"
+msgstr "コピー"
+
+#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+#: tools/editor/property_editor.cpp tools/editor/resources_dock.cpp
+msgid "Paste"
+msgstr "貼り付け"
+
+#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/project_export.cpp
+msgid "Select All"
+msgstr "すべて選択"
+
+#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp tools/editor/editor_log.cpp
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+#: tools/editor/plugins/rich_text_editor_plugin.cpp
+#: tools/editor/property_editor.cpp tools/editor/script_editor_debugger.cpp
+msgid "Clear"
+msgstr "削除"
+
+#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp tools/editor/editor_node.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Undo"
+msgstr "元に戻す"
+
+#: scene/gui/popup.cpp
+msgid ""
+"Popups will hide by default unless you call popup() or any of the popup*() "
+"functions. Making them visible for editing is fine though, but they will "
+"hide upon running."
+msgstr ""
+
+#: scene/main/viewport.cpp
+msgid ""
+"This viewport is not set as render target. If you intend for it to display "
+"its contents directly to the screen, make it a child of a Control so it can "
+"obtain a size. Otherwise, make it a RenderTarget and assign its internal "
+"texture to some node for display."
+msgstr ""
+
+#: scene/resources/dynamic_font.cpp
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Error initializing FreeType."
+msgstr ""
+
+#: scene/resources/dynamic_font.cpp
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Unknown font format."
+msgstr "不明なフォント形式です。"
+
+#: scene/resources/dynamic_font.cpp
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Error loading font."
+msgstr ""
+
+#: scene/resources/dynamic_font.cpp
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Invalid font size."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Disabled"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "All Selection"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Move Add Key"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Change Transition"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Change Transform"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Change Value"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Change Call"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Add Track"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Move Anim Track Up"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Move Anim Track Down"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Remove Anim Track"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Duplicate Keys"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Set Transitions to:"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Track Rename"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Track Change Interpolation"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Track Change Value Mode"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Edit Node Curve"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Edit Selection Curve"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Delete Keys"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Continuous"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Discrete"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Trigger"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Add Key"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Move Keys"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Scale Selection"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Scale From Cursor"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Duplicate Selection"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Duplicate Transposed"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Goto Next Step"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Goto Prev Step"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp tools/editor/property_editor.cpp
+msgid "Linear"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Constant"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "In"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Out"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "In-Out"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Out-In"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Transitions"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Optimize Animation"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Clean-Up Animation"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Create NEW track for %s and insert key?"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Create %d NEW tracks and insert keys?"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp tools/editor/create_dialog.cpp
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+#: tools/editor/plugins/particles_editor_plugin.cpp
+#: tools/editor/project_manager.cpp tools/editor/script_create_dialog.cpp
+msgid "Create"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Create & Insert"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Insert Track & Key"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Insert Key"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Change Anim Len"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Change Anim Loop"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Create Typed Value Key"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Insert"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Scale Keys"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim Add Call Track"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Animation zoom."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Length (s):"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Animation length (in seconds)."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Step (s):"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Cursor step snap (in seconds)."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Enable/Disable looping in animation."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Add new tracks."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Move current track up."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Move current track down."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Remove selected track."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Track tools"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Enable editing of individual keys by clicking them."
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Anim. Optimizer"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Max. Linear Error:"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Max. Angular Error:"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Max Optimizable Angle:"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Optimize"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Key"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Transition"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Scale Ratio:"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Call Functions in Which Node?"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Remove invalid keys"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Remove unresolved and empty tracks"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Clean-up all animations"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Clean-Up Animation(s) (NO UNDO!)"
+msgstr ""
+
+#: tools/editor/animation_editor.cpp
+msgid "Clean-Up"
+msgstr ""
+
+#: tools/editor/array_property_edit.cpp
+msgid "Resize Array"
+msgstr ""
+
+#: tools/editor/array_property_edit.cpp
+msgid "Change Array Value Type"
+msgstr ""
+
+#: tools/editor/array_property_edit.cpp
+msgid "Change Array Value"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp tools/editor/create_dialog.cpp
+#: tools/editor/editor_help.cpp tools/editor/editor_node.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp tools/editor/quick_open.cpp
+#: tools/editor/settings_config_dialog.cpp
+msgid "Search:"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+msgid "Sort:"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+msgid "Reverse"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+#: tools/editor/project_settings.cpp
+msgid "Category:"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+msgid "All"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+msgid "Site:"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+msgid "Support.."
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+msgid "Official"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+msgid "Community"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+msgid "Testing"
+msgstr ""
+
+#: tools/editor/asset_library_editor_plugin.cpp
+msgid "Assets ZIP File"
+msgstr ""
+
+#: tools/editor/call_dialog.cpp
+msgid "Method List For '%s':"
+msgstr ""
+
+#: tools/editor/call_dialog.cpp
+msgid "Call"
+msgstr ""
+
+#: tools/editor/call_dialog.cpp tools/editor/connections_dialog.cpp
+#: tools/editor/import_settings.cpp
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+#: tools/editor/project_settings.cpp tools/editor/property_editor.cpp
+#: tools/editor/run_settings_dialog.cpp tools/editor/settings_config_dialog.cpp
+msgid "Close"
+msgstr ""
+
+#: tools/editor/call_dialog.cpp
+msgid "Method List:"
+msgstr ""
+
+#: tools/editor/call_dialog.cpp
+msgid "Arguments:"
+msgstr ""
+
+#: tools/editor/call_dialog.cpp
+msgid "Return:"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Go to Line"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Line Number:"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "No Matches"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Replaced %d Ocurrence(s)."
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Replace"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Replace All"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Match Case"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Whole Words"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Selection Only"
+msgstr ""
+
+#: tools/editor/code_editor.cpp tools/editor/editor_help.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/project_settings.cpp
+msgid "Search"
+msgstr ""
+
+#: tools/editor/code_editor.cpp tools/editor/editor_help.cpp
+msgid "Find"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Next"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Replaced %d ocurrence(s)."
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Not found!"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Replace By"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Case Sensitive"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Backwards"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Prompt On Replace"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Skip"
+msgstr ""
+
+#: tools/editor/code_editor.cpp tools/editor/script_editor_debugger.cpp
+msgid "Line:"
+msgstr ""
+
+#: tools/editor/code_editor.cpp
+msgid "Col:"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Method in target Node must be specified!"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Connect To Node:"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp tools/editor/groups_editor.cpp
+#: tools/editor/plugins/item_list_editor_plugin.cpp
+#: tools/editor/plugins/theme_editor_plugin.cpp
+#: tools/editor/project_settings.cpp
+msgid "Add"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp tools/editor/dependency_editor.cpp
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+#: tools/editor/plugins/theme_editor_plugin.cpp
+#: tools/editor/project_manager.cpp
+msgid "Remove"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Add Extra Call Argument:"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Extra Call Arguments:"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Path to Node:"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Make Function"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Deferred"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Oneshot"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Connect"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Connect '%s' to '%s'"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Connecting Signal:"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Create Subscription"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+msgid "Connect.."
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Disconnect"
+msgstr ""
+
+#: tools/editor/connections_dialog.cpp tools/editor/node_dock.cpp
+msgid "Signals"
+msgstr ""
+
+#: tools/editor/create_dialog.cpp
+msgid "Create New"
+msgstr ""
+
+#: tools/editor/create_dialog.cpp tools/editor/editor_help.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp tools/editor/quick_open.cpp
+msgid "Matches:"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Search Replacement For:"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Dependencies For:"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid ""
+"Scene '%s' is currently being edited.\n"
+"Changes will not take effect unless reloaded."
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid ""
+"Resource '%s' is in use.\n"
+"Changes will take effect when reloaded."
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Dependencies"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Resource"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp tools/editor/project_manager.cpp
+#: tools/editor/project_settings.cpp
+msgid "Path"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Dependencies:"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Fix Broken"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Dependency Editor"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Search Replacement Resource:"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Owners Of:"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid ""
+"The files being removed are required by other resources in order for them to "
+"work.\n"
+"Remove them anyway? (no undo)"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Remove selected files from the project? (no undo)"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Error loading:"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Scene failed to load due to missing dependencies:"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Open Anyway"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Which action should be taken?"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Fix Dependencies"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Errors loading!"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Permanently delete %d item(s)? (No undo!)"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Owns"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Resources Without Explicit Ownership:"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp tools/editor/editor_node.cpp
+msgid "Orphan Resource Explorer"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp
+msgid "Delete selected files?"
+msgstr ""
+
+#: tools/editor/dependency_editor.cpp tools/editor/editor_node.cpp
+#: tools/editor/plugins/item_list_editor_plugin.cpp
+#: tools/editor/scenes_dock.cpp
+msgid "Delete"
+msgstr ""
+
+#: tools/editor/editor_data.cpp
+msgid "Updating Scene"
+msgstr ""
+
+#: tools/editor/editor_data.cpp
+msgid "Storing local changes.."
+msgstr ""
+
+#: tools/editor/editor_data.cpp
+msgid "Updating scene.."
+msgstr ""
+
+#: tools/editor/editor_dir_dialog.cpp
+msgid "Choose a Directory"
+msgstr ""
+
+#: tools/editor/editor_dir_dialog.cpp
+msgid "Choose"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Back"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Forward"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Refresh"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Hidden Files"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Favorite"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Mode"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Focus Path"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Mode Favorite Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Mode Favorite Down"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp tools/editor/scenes_dock.cpp
+msgid "Favorites:"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Recent:"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Preview:"
+msgstr ""
+
+#: tools/editor/editor_file_system.cpp
+msgid "Cannot go into subdir:"
+msgstr ""
+
+#: tools/editor/editor_file_system.cpp
+msgid "ScanSources"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Search Classes"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Class List:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp tools/editor/property_editor.cpp
+msgid "Class:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp tools/editor/scene_tree_editor.cpp
+#: tools/editor/script_create_dialog.cpp
+msgid "Inherits:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Inherited by:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Brief Description:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Public Methods:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Members:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "GUI Theme Items:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Signals:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Constants:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp tools/editor/script_editor_debugger.cpp
+msgid "Description:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Method Description:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Search Text"
+msgstr ""
+
+#: tools/editor/editor_import_export.cpp
+msgid "Added:"
+msgstr ""
+
+#: tools/editor/editor_import_export.cpp
+msgid "Removed:"
+msgstr ""
+
+#: tools/editor/editor_import_export.cpp tools/editor/project_export.cpp
+msgid "Error saving atlas:"
+msgstr ""
+
+#: tools/editor/editor_import_export.cpp
+msgid "Could not save atlas subtexture:"
+msgstr ""
+
+#: tools/editor/editor_import_export.cpp
+msgid "Storing File:"
+msgstr ""
+
+#: tools/editor/editor_import_export.cpp
+msgid "Packing"
+msgstr ""
+
+#: tools/editor/editor_import_export.cpp
+msgid "Exporting for %s"
+msgstr ""
+
+#: tools/editor/editor_import_export.cpp
+msgid "Setting Up.."
+msgstr ""
+
+#: tools/editor/editor_log.cpp
+msgid " Output:"
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/editor_reimport_dialog.cpp
+msgid "Re-Importing"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Importing:"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Node From Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/scenes_dock.cpp
+msgid "Re-Import.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/resources_dock.cpp
+msgid "Error saving resource!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/resources_dock.cpp
+msgid "Save Resource As.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
+msgid "I see.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Can't open file for writing:"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Requested file format unknown:"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Error while saving."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Saving Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Analyzing"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Creating Thumbnail"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Failed to load resource."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Can't load MeshLibrary for merging!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Error saving MeshLibrary!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Can't load TileSet for merging!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Error saving TileSet!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Can't open export templates zip."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Loading Export Templates"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Error trying to save layout!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Default editor layout overridden."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Layout name not found!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Restored default layout to base settings."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Copy Params"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Paste Params"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+msgid "Paste Resource"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Copy Resource"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Make Built-In"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Make Sub-Resources Unique"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Open in Help"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "There is no defined scene to run."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"No main scene has ever been defined, select one?\n"
+"You can change it later in later in \"Project Settings\" under the "
+"'application' category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' does not exist, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' is not a scene file, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Current scene was never saved, please save it prior to running."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Could not start subprocess!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Open Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Open Base Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Quick Open Scene.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Quick Open Script.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Yes"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Close scene? (Unsaved changes will be lost)"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Save Scene As.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "This scene has never been saved. Save before running?"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Please save the scene first."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Save Translatable Strings"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Export Mesh Library"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Export Tile Set"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Quit"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Exit the editor?"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Current scene not saved. Open anyway?"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Can't reload a scene that was never saved."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Revert"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "This action cannot be undone. Revert anyway?"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Quick Run Scene.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Open Project Manager? \n"
+"(Unsaved changes will be lost)"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Pick a Manu Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
+msgid "Ugh"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Error loading scene, it must be inside the project path. Use 'Import' to "
+"open the scene, then save it inside the project path."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Error loading scene."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Scene '%s' has broken dependencies:"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Save Layout"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Delete Layout"
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/project_export.cpp
+msgid "Default"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Switch Scene Tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "%d more file(s)"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "%d more file(s) or folder(s)"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Go to previously opened scene."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Fullscreen Mode"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Distraction Free Mode"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Next tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Previous tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Operations with scene files."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "New Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "New Inherited Scene.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Open Scene.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Save Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Close Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Close Goto Prev. Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Open Recent"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Quick Filter Files.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Convert To.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Translatable Strings.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "MeshLibrary.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "TileSet.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Redo"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Run Script"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Project Settings"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Revert Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Quit to Project List"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Import assets to the project."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+#: tools/editor/project_manager.cpp
+msgid "Import"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Miscellaneous project or scene-wide tools."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Tools"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Export the project to many platforms."
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/project_export.cpp
+msgid "Export"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Play the project."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Play"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Pause the scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Pause Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Stop the scene."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Stop"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Play the edited scene."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Play Scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Play custom scene"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Debug options"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Deploy with Remote Debug"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"When exporting or deploying, the resulting executable will attempt to "
+"connect to the IP of this computer in order to be debugged."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Small Deploy with Network FS"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"When this option is enabled, export or deploy will produce a minimal "
+"executable.\n"
+"The filesystem will be provided from the project by the editor over the "
+"network.\n"
+"On Android, deploy will use the USB cable for faster performance. This "
+"option speeds up testing for games with a large footprint."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Visible Collision Shapes"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Collision shapes and raycast nodes (for 2D and 3D) will be visible on the "
+"running game if this option is turned on."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Visible Navigation"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Navigation meshes and polygons will be visible on the running game if this "
+"option is turned on."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Sync Scene Changes"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"When this option is turned on, any changes made to the scene in the editor "
+"will be replicated in the running game.\n"
+"When used remotely on a device, this is more efficient with network "
+"filesystem."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Sync Script Changes"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"When this option is turned on, any script that is saved will be reloaded on "
+"the running game.\n"
+"When used remotely on a device, this is more efficient with network "
+"filesystem."
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Settings"
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/settings_config_dialog.cpp
+msgid "Editor Settings"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Editor Layout"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Install Export Templates"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "About"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Alerts when an external resource has changed."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Spins when the editor window repaints!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Update Always"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Update Changes"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Inspector"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Create a new resource in memory and edit it."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Load an existing resource from disk and edit it."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Save the currently edited resource."
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/plugins/script_editor_plugin.cpp
+msgid "Save As.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Go to the previous edited object in history."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Go to the next edited object in history."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "History of recently edited objects."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Object properties."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "FileSystem"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Output"
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/editor_reimport_dialog.cpp
+#: tools/editor/import_settings.cpp
+msgid "Re-Import"
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/editor_plugin_settings.cpp
+msgid "Update"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Thanks from the Godot community!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Thanks!"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Import Templates From ZIP File"
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/project_export.cpp
+msgid "Export Project"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Export Library"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Merge With Existing"
+msgstr ""
+
+#: tools/editor/editor_node.cpp tools/editor/project_export.cpp
+msgid "Password:"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Open & Run a Script"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Load Errors"
+msgstr ""
+
+#: tools/editor/editor_plugin_settings.cpp
+msgid "Installed Plugins:"
+msgstr ""
+
+#: tools/editor/editor_plugin_settings.cpp
+msgid "Version:"
+msgstr ""
+
+#: tools/editor/editor_plugin_settings.cpp
+msgid "Author:"
+msgstr ""
+
+#: tools/editor/editor_plugin_settings.cpp
+msgid "Status:"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Stop Profiling"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Start Profiling"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Measure:"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Frame Time (sec)"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Average Time (sec)"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Frame %"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Fixed Frame %"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp tools/editor/script_editor_debugger.cpp
+msgid "Time:"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Inclusive"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Self"
+msgstr ""
+
+#: tools/editor/editor_profiler.cpp
+msgid "Frame #:"
+msgstr ""
+
+#: tools/editor/editor_reimport_dialog.cpp
+msgid "Please wait for scan to complete."
+msgstr ""
+
+#: tools/editor/editor_reimport_dialog.cpp
+msgid "Current scene must be saved to re-import."
+msgstr ""
+
+#: tools/editor/editor_reimport_dialog.cpp
+msgid "Save & Re-Import"
+msgstr ""
+
+#: tools/editor/editor_reimport_dialog.cpp
+msgid "Re-Import Changed Resources"
+msgstr ""
+
+#: tools/editor/editor_run_script.cpp
+msgid "Write your logic in the _run() method."
+msgstr ""
+
+#: tools/editor/editor_run_script.cpp
+msgid "There is an edited scene already."
+msgstr ""
+
+#: tools/editor/editor_run_script.cpp
+msgid "Couldn't instance script:"
+msgstr ""
+
+#: tools/editor/editor_run_script.cpp
+msgid "Did you forget the 'tool' keyword?"
+msgstr ""
+
+#: tools/editor/editor_run_script.cpp
+msgid "Couldn't run script:"
+msgstr ""
+
+#: tools/editor/editor_run_script.cpp
+msgid "Did you forget the '_run' method?"
+msgstr ""
+
+#: tools/editor/editor_settings.cpp
+msgid "Default (Same as Editor)"
+msgstr ""
+
+#: tools/editor/editor_sub_scene.cpp
+msgid "Select Node(s) to Import"
+msgstr ""
+
+#: tools/editor/editor_sub_scene.cpp
+msgid "Scene Path:"
+msgstr ""
+
+#: tools/editor/editor_sub_scene.cpp
+msgid "Import From Node:"
+msgstr ""
+
+#: tools/editor/file_type_cache.cpp
+msgid "Can't open file_type_cache.cch for writing, not saving file type cache!"
+msgstr ""
+
+#: tools/editor/groups_editor.cpp
+msgid "Add to Group"
+msgstr ""
+
+#: tools/editor/groups_editor.cpp
+msgid "Remove from Group"
+msgstr ""
+
+#: tools/editor/import_settings.cpp
+msgid "Imported Resources"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+msgid "No bit masks to import!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Target path is empty."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Target path must be a complete resource path."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Target path must exist."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+msgid "Save path is empty!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+msgid "Import BitMasks"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Source Texture(s):"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Target Path:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Accept"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+msgid "Bit Mask"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "No source font file!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "No target font resource!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"Invalid file extension.\n"
+"Please use .fnt."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Can't load/process source font."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Couldn't save font."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Source Font:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Source Font Size:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Dest Resource:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "The quick brown fox jumps over the lazy dog."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Test:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Options:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Font Import"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"This file is already a Godot font file, please supply a BMFont type file "
+"instead."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Failed opening as BMFont file."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Invalid font custom source."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Font"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+msgid "No meshes to import!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+msgid "Single Mesh Import"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+msgid "Source Mesh(es):"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+msgid "Surface %d"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+msgid "No samples to import!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+msgid "Import Audio Samples"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+msgid "Source Sample(s):"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+msgid "Audio Sample"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "New Clip"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Animation Options"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Flags"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Bake FPS:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Optimizer"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Max Linear Error"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Max Angular Error"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Max Angle"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Clips"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+#: tools/editor/project_manager.cpp tools/editor/project_settings.cpp
+msgid "Name"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Start(s)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "End(s)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Loop"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Filters"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Source path is empty."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Couldn't load post-import script."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Invalid/broken script for post-import."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Error importing scene."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Import 3D Scene"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Source Scene:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Same as Target Scene"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Shared"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Target Texture Folder:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Post-Process Script:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Custom Root Node Type:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Auto"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "The Following Files are Missing:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Import Anyway"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Import & Open"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Edited scene has not been saved, open imported scene anyway?"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+msgid "Import Scene"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Importing Scene.."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Running Custom Script.."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Couldn't load post-import script:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Invalid/broken script for post-import (check console):"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Error running post-import script:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Import Image:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Can't import a file over itself:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Couldn't localize path: %s (already local)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Saving.."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "3D Scene Animation"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Uncompressed"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Compress Lossless (PNG)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Compress Lossy (WebP)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Compress (VRAM)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Texture Format"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Texture Compression Quality (WebP):"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Texture Options"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Please specify some files!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "At least one file needed for Atlas."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Error importing:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Only one file is required for large texture."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Max Texture Size:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Import Textures for Atlas (2D)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Cell Size:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Large Texture"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Import Large Textures (2D)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Source Texture"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Base Atlas Texture"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Source Texture(s)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Import Textures for 2D"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Import Textures for 3D"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Import Textures"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "2D Texture"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "3D Texture"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Atlas Texture"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid ""
+"NOTICE: Importing 2D textures is not mandatory. Just copy png/jpg files to "
+"the project."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Crop empty space."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Texture"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Import Large Texture"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Load Source Image"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Slicing"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Inserting"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Saving"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Couldn't save large texture:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Build Atlas For:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Loading Image:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Couldn't load image:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Converting Images"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Cropping Images"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Blitting Images"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Couldn't save atlas image:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Couldn't save converted texture:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Invalid source!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Invalid translation source!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Column"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+#: tools/editor/script_create_dialog.cpp
+msgid "Language"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "No items to import!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "No target path!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Import Translations"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Couldn't import!"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Import Translation"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Source CSV:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Ignore First Row"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Compress"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Add to Project (engine.cfg)"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Import Languages:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Translation"
+msgstr ""
+
+#: tools/editor/multi_node_edit.cpp
+msgid "MultiNode Set"
+msgstr ""
+
+#: tools/editor/node_dock.cpp
+msgid "Node"
+msgstr ""
+
+#: tools/editor/node_dock.cpp
+msgid "Groups"
+msgstr ""
+
+#: tools/editor/node_dock.cpp
+msgid "Select a Node to edit Signals and Groups."
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Toggle Autoplay"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "New Animation Name:"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "New Anim"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Change Animation Name:"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Remove Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "ERROR: Invalid animation name!"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "ERROR: Animation name already exists!"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Rename Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Add Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Blend Next Changed"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Change Blend Time"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Load Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Duplicate Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "ERROR: No animation to copy!"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "ERROR: No animation resource on clipboard!"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Pasted Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Paste Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "ERROR: No animation to edit!"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Play selected animation backwards from current pos. (A)"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Play selected animation backwards from end. (Shift+A)"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Stop animation playback. (S)"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Play selected animation from start. (Shift+D)"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Play selected animation from current pos. (D)"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Animation position (in seconds)."
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Scale animation playback globally for the node."
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Create new animation in player."
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Load animation from disk."
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Load an animation from disk."
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Save the current animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Save As"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Display list of animations in player."
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Autoplay on Load"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Edit Target Blend Times"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Animation Tools"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Copy Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Create New Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Animation Name:"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+#: tools/editor/property_editor.cpp tools/editor/script_create_dialog.cpp
+msgid "Error!"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Blend Times:"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Next (Auto Queue):"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Cross-Animation Blend Times"
+msgstr ""
+
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Animation"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "New name:"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Scale:"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Fade In (s):"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Fade Out (s):"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Blend"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Mix"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Auto Restart:"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Restart (s):"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Random Restart (s):"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Start!"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Amount:"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Blend:"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Blend 0:"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Blend 1:"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "X-Fade Time (s):"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Current:"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Add Input"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Clear Auto-Advance"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Set Auto-Advance"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Delete Input"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Rename"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Animation tree is valid."
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Animation tree is invalid."
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Animation Node"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "OneShot Node"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Mix Node"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Blend2 Node"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Blend3 Node"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Blend4 Node"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "TimeScale Node"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "TimeSeek Node"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Transition Node"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Import Animations.."
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Edit Node Filters"
+msgstr ""
+
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Filters.."
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Parsing %d Triangles:"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Triangle #"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Light Baker Setup:"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Parsing Geometry"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Fixing Lights"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Making BVH"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Creating Light Octree"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Creating Octree Texture"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Transfer to Lightmaps:"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Allocating Texture #"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Baking Triangle #"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Post-Processing Texture #"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_editor_plugin.cpp
+msgid "BakedLightInstance does not contain a BakedLight resource."
+msgstr ""
+
+#: tools/editor/plugins/baked_light_editor_plugin.cpp
+msgid "Bake!"
+msgstr ""
+
+#: tools/editor/plugins/baked_light_editor_plugin.cpp
+msgid "Reset the lightmap octree baking process (start over)."
+msgstr ""
+
+#: tools/editor/plugins/camera_editor_plugin.cpp
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Preview"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Configure Snap"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Grid Offset:"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Grid Step:"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Rotation Offset:"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Rotation Step:"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Move Pivot"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Move Action"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Edit IK Chain"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Edit CanvasItem"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Change Anchors"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Zoom (%):"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Paste Pose"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Select Mode (Q)"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Drag: Rotate"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Alt+Drag: Move"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Press 'v' to Change Pivot, 'Shift+v' to Drag Pivot (while moving)."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Alt+RMB: Depth list selection"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Move Mode (W)"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Rotate Mode (E)"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid ""
+"Show a list of all objects at the position clicked\n"
+"(same as Alt+RMB in select mode)."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Click to change object's rotation pivot."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Pan Mode"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Lock the selected object in place (can't be moved)."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Unlock the selected object (can be moved)."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Makes sure the object's children are not selectable."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Restores the object's children's ability to be selected."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/project_manager.cpp
+msgid "Edit"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Use Snap"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Show Grid"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Use Rotation Snap"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Snap Relative"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Configure Snap.."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Use Pixel Snap"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Expand to Parent"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Skeleton.."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Make Bones"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Clear Bones"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Make IK Chain"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Clear IK Chain"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "View"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Zoom In"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Zoom Out"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Zoom Reset"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Zoom Set.."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Center Selection"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Frame Selection"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Anchor"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Insert Keys (Ins)"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Insert Key"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Insert Key (Existing Tracks)"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Copy Pose"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Clear Pose"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Set a Value"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Snap (Pixels):"
+msgstr ""
+
+#: tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Create Poly"
+msgstr ""
+
+#: tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/collision_polygon_editor_plugin.cpp
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Edit Poly"
+msgstr ""
+
+#: tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/collision_polygon_editor_plugin.cpp
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Edit Poly (Remove Point)"
+msgstr ""
+
+#: tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+msgid "Create a new polygon from scratch."
+msgstr ""
+
+#: tools/editor/plugins/collision_polygon_editor_plugin.cpp
+msgid "Create Poly3D"
+msgstr ""
+
+#: tools/editor/plugins/collision_shape_2d_editor_plugin.cpp
+msgid "Set Handle"
+msgstr ""
+
+#: tools/editor/plugins/color_ramp_editor_plugin.cpp
+msgid "Add/Remove Color Ramp Point"
+msgstr ""
+
+#: tools/editor/plugins/color_ramp_editor_plugin.cpp
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Modify Color Ramp"
+msgstr ""
+
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+msgid "Creating Mesh Library"
+msgstr ""
+
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+msgid "Thumbnail.."
+msgstr ""
+
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+msgid "Remove item %d?"
+msgstr ""
+
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+#: tools/editor/plugins/theme_editor_plugin.cpp
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
+msgid "Add Item"
+msgstr ""
+
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+msgid "Remove Selected Item"
+msgstr ""
+
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+msgid "Import from Scene"
+msgstr ""
+
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+msgid "Update from Scene"
+msgstr ""
+
+#: tools/editor/plugins/item_list_editor_plugin.cpp
+msgid "Item %d"
+msgstr ""
+
+#: tools/editor/plugins/item_list_editor_plugin.cpp
+msgid "Items"
+msgstr ""
+
+#: tools/editor/plugins/item_list_editor_plugin.cpp
+msgid "Item List Editor"
+msgstr ""
+
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+msgid "Create Occluder Polygon"
+msgstr ""
+
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+msgid "Edit existing polygon:"
+msgstr ""
+
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+msgid "LMB: Move Point."
+msgstr ""
+
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+msgid "Ctrl+LMB: Split Segment."
+msgstr ""
+
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+msgid "RMB: Erase Point."
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh is empty!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Static Trimesh Body"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Static Convex Body"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "This doesn't work on scene root!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Trimesh Shape"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Convex Shape"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Navigation Mesh"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "MeshInstance lacks a Mesh!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh has not surface to create outlines from!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Could not create outline!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Outline"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Trimesh Static Body"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Convex Static Body"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Trimesh Collision Sibling"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Convex Collision Sibling"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Outline Mesh.."
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Create Outline Mesh"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Outline Size:"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "No mesh source specified (and no MultiMesh set in node)."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "No mesh source specified (and MultiMesh contains no Mesh)."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Mesh source is invalid (invalid path)."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Mesh source is invalid (not a MeshInstance)."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Mesh source is invalid (contains no Mesh resource)."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "No surface source specified."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Surface source is invalid (invalid path)."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Surface source is invalid (no geometry)."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Surface source is invalid (no faces)."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Parent has no solid faces to populate."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Couldn't map area."
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Select a Source Mesh:"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Select a Target Surface:"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Populate Surface"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Populate MultiMesh"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Target Surface:"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Source Mesh:"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "X-Axis"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Y-Axis"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Z-Axis"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Mesh Up Axis:"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Random Rotation:"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Random Tilt:"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Random Scale:"
+msgstr ""
+
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Populate"
+msgstr ""
+
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+msgid "Create Navigation Polygon"
+msgstr ""
+
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+msgid "Remove Poly And Point"
+msgstr ""
+
+#: tools/editor/plugins/particles_2d_editor_plugin.cpp
+msgid "Error loading image:"
+msgstr ""
+
+#: tools/editor/plugins/particles_2d_editor_plugin.cpp
+msgid "No pixels with transparency > 128 in image.."
+msgstr ""
+
+#: tools/editor/plugins/particles_2d_editor_plugin.cpp
+msgid "Set Emission Mask"
+msgstr ""
+
+#: tools/editor/plugins/particles_2d_editor_plugin.cpp
+msgid "Clear Emission Mask"
+msgstr ""
+
+#: tools/editor/plugins/particles_2d_editor_plugin.cpp
+msgid "Load Emission Mask"
+msgstr ""
+
+#: tools/editor/plugins/particles_2d_editor_plugin.cpp
+msgid "Generated Point Count:"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Node does not contain geometry."
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Node does not contain geometry (faces)."
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Faces contain no area!"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "No faces!"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Generate AABB"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Create Emitter From Mesh"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Create Emitter From Node"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Clear Emitter"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Create Emitter"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Emission Positions:"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Emission Fill:"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Surface"
+msgstr ""
+
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "Volume"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+msgid "Remove Point from Curve"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Add Point to Curve"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+msgid "Move Point in Curve"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+msgid "Move In-Control in Curve"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+msgid "Move Out-Control in Curve"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Select Points"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Shift+Drag: Select Control Points"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Click: Add Point"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Right Click: Delete Point"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+msgid "Select Control Points (Shift+Drag)"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Add Point (in empty space)"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Split Segment (in curve)"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Delete Point"
+msgstr ""
+
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Close Curve"
+msgstr ""
+
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Curve Point #"
+msgstr ""
+
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Set Curve Point Pos"
+msgstr ""
+
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Set Curve In Pos"
+msgstr ""
+
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Set Curve Out Pos"
+msgstr ""
+
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Split Path"
+msgstr ""
+
+#: tools/editor/plugins/path_editor_plugin.cpp
+msgid "Remove Path Point"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Create UV Map"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Transform UV Map"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Polygon 2D UV Editor"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Move Point"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Ctrl: Rotate"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Shift: Move All"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Shift+Ctrl: Scale"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Move Polygon"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Rotate Polygon"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Scale Polygon"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Polygon->UV"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "UV->Polygon"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Clear UV"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Snap"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Enable Snap"
+msgstr ""
+
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Grid"
+msgstr ""
+
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+msgid "ERROR: Couldn't load resource!"
+msgstr ""
+
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+msgid "Add Resource"
+msgstr ""
+
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+msgid "Rename Resource"
+msgstr ""
+
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Delete Resource"
+msgstr ""
+
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+msgid "Resource clipboard is empty!"
+msgstr ""
+
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Load Resource"
+msgstr ""
+
+#: tools/editor/plugins/rich_text_editor_plugin.cpp
+msgid "Parse BBCode"
+msgstr ""
+
+#: tools/editor/plugins/sample_editor_plugin.cpp
+msgid "Length:"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Open Sample File(s)"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "ERROR: Couldn't load sample!"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Add Sample"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Rename Sample"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Delete Sample"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "16 Bits"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "8 Bits"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Stereo"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Mono"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+#: tools/editor/script_editor_debugger.cpp
+msgid "Format"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Pitch"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Error while saving theme"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Error saving"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Error importing theme"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Error importing"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Import Theme"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Save Theme As.."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/project_export.cpp
+msgid "File"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/property_editor.cpp
+msgid "New"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Save All"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "History Prev"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "History Next"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Reload Theme"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Save Theme"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Save Theme As"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/scene_tree_dock.cpp
+msgid "Move Up"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/scene_tree_dock.cpp
+msgid "Move Down"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Indent Left"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Indent Right"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Toggle Comment"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Clone Down"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Complete Symbol"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Trim Trailing Whitespace"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Auto Indent"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Soft Reload Script"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Find.."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Find Next"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Find Previous"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Replace.."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Goto Function.."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Goto Line.."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Debug"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Toggle Breakpoint"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Remove All Breakpoints"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Goto Next Breakpoint"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Goto Previous Breakpoint"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/script_editor_debugger.cpp
+msgid "Step Over"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/script_editor_debugger.cpp
+msgid "Step Into"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/script_editor_debugger.cpp
+msgid "Break"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/script_editor_debugger.cpp
+msgid "Continue"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Keep Debugger Open"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Window"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Move Left"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Move Right"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Help"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Contextual Help"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Tutorials"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Open https://godotengine.org at tutorials section."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Classes"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Search the class hierarchy."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Search Help"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Search the reference documentation."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Go to previous edited document."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Go to next edited document."
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Create Script"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid ""
+"The following files are newer on disk.\n"
+"What action should be taken?:"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Reload"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Resave"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/script_editor_debugger.cpp
+msgid "Debugger"
+msgstr ""
+
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Vertex"
+msgstr ""
+
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Fragment"
+msgstr ""
+
+#: tools/editor/plugins/shader_editor_plugin.cpp
+msgid "Lighting"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Scalar Constant"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Vec Constant"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change RGB Constant"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Scalar Operator"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Vec Operator"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Vec Scalar Operator"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change RGB Operator"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Toggle Rot Only"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Scalar Function"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Vec Function"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Scalar Uniform"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Vec Uniform"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change RGB Uniform"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Default Value"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change XForm Uniform"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Texture Uniform"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Cubemap Uniform"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Comment"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Add/Remove to Color Ramp"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Add/Remove to Curve Map"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Modify Curve Map"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Input Name"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Connect Graph Nodes"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Disconnect Graph Nodes"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Remove Shader Graph Node"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Move Shader Graph Node"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Duplicate Graph Node(s)"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Delete Shader Graph Node(s)"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Error: Cyclic Connection Link"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Error: Missing Input Connections"
+msgstr ""
+
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Add Shader Graph Node"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Orthogonal"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Perspective"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Transform Aborted."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "X-Axis Transform."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Y-Axis Transform."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Z-Axis Transform."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "View Plane Transform."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Scaling to %s%%."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Rotating %s degrees."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Bottom View."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Bottom"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Top View."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Top"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Rear View."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Rear"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Front View."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Front"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Left View."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Left"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Right View."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Right"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Keying is disabled (no key inserted)."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Animation Key Inserted."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Align with view"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Top (Num7)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Bottom (Shift+Num7)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Left (Num3)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Right (Shift+Num3)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Front (Num1)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Rear (Shift+Num1)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Perspective (Num5)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Orthogonal (Num5)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Environment"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Audio Listener"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Gizmos"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Selection (F)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Align with view (Ctrl+Shift+F)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "XForm Dialog"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "No scene selected to instance!"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Instance at Cursor"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Could not instance scene!"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Scale Mode (R)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Transform"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Local Coords"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Transform Dialog.."
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Use Default Light"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Use Default sRGB"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "1 Viewport"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "2 Viewports"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "2 Viewports (Alt)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "3 Viewports"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "3 Viewports (Alt)"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "4 Viewports"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Display Normal"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Display Wireframe"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Display Overdraw"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Display Shadeless"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "View Origin"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "View Grid"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Snap Settings"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Translate Snap:"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Rotate Snap (deg.):"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Scale Snap (%):"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Viewport Settings"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Default Light Normal:"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Ambient Light Color:"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Perspective FOV (deg.):"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "View Z-Near:"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "View Z-Far:"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Transform Change"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Translate:"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Rotate (deg.):"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Scale (ratio):"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Transform Type"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Pre"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Post"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "ERROR: Couldn't load frame resource!"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Add Frame"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Resource clipboard is empty or not a texture!"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Paste Frame"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Add Empty"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Change Animation Loop"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Change Animation FPS"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "(empty)"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Animations"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Speed (FPS):"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Animation Frames"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Insert Empty (Before)"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Insert Empty (After)"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Up"
+msgstr ""
+
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "Down"
+msgstr ""
+
+#: tools/editor/plugins/style_box_editor_plugin.cpp
+msgid "StyleBox Preview:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Snap Mode:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "<None>"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Pixel Snap"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Grid Snap"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Auto Slice"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Offset:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Step:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Separation:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region Editor"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Can't save theme to file:"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Add All Items"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Add All"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
+msgid "Remove Item"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Add Class Items"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Remove Class Items"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Create Empty Template"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Create Empty Editor Template"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "CheckBox Radio1"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "CheckBox Radio2"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Item"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Check Item"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Checked Item"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Has"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Many"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp tools/editor/project_export.cpp
+msgid "Options"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Have,Many,Several,Options!"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Tab 1"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Tab 2"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Tab 3"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+#: tools/editor/project_settings.cpp tools/editor/scene_tree_editor.cpp
+#: tools/editor/script_editor_debugger.cpp
+msgid "Type:"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Data Type:"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Icon"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Style"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Color"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Paint TileMap"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+#: tools/editor/scene_tree_dock.cpp
+msgid "Duplicate"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Erase TileMap"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Erase selection"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Find tile"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Transpose"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Mirror X"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Mirror Y"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Bucket"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Pick Tile"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Select"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Rotate 0 degrees"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Rotate 90 degrees"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Rotate 180 degrees"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Rotate 270 degrees"
+msgstr ""
+
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
+msgid "Could not find tile:"
+msgstr ""
+
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
+msgid "Item name or ID:"
+msgstr ""
+
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
+msgid "Create from scene?"
+msgstr ""
+
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
+msgid "Merge from scene?"
+msgstr ""
+
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
+msgid "Create from Scene"
+msgstr ""
+
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
+msgid "Merge from Scene"
+msgstr ""
+
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
+#: tools/editor/script_editor_debugger.cpp
+msgid "Error"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Edit Script Options"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Please export outside the project folder!"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Error exporting project!"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Error writing the project PCK!"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "No exporter for platform '%s' yet."
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Include"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Change Image Group"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Group name can't be empty!"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Invalid character in group name!"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Group name already exists!"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Add Image Group"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Delete Image Group"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Atlas Preview"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Project Export Settings"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Target"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Export to Platform"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Resources"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Export selected resources (including dependencies)."
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Export all resources in the project."
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Export all files in the project directory."
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Export Mode:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Resources to Export:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Action"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid ""
+"Filters to export non-resource files (comma-separated, e.g.: *.json, *.txt):"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Filters to exclude from export (comma-separated, e.g.: *.json, *.txt):"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Convert text scenes to binary on export."
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Images"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Keep Original"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Compress for Disk (Lossy, WebP)"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Compress for RAM (BC/PVRTC/ETC)"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Convert Images (*.png):"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Compress for Disk (Lossy) Quality:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Shrink All Images:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Compress Formats:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Image Groups"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Groups:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Compress Disk"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Compress RAM"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Compress Mode:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Lossy Quality:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Atlas:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Shrink By:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Preview Atlas"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Image Filter:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Images:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Select None"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Group"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Samples"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Sample Conversion Mode: (.wav files):"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Keep"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Compress (RAM - IMA-ADPCM)"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Sampling Rate Limit (Hz):"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Trim"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Trailing Silence:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Script"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Script Export Mode:"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Text"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Compiled"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Encrypted (Provide Key Below)"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Script Encryption Key (256-bits as hex):"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Export PCK/Zip"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Export Project PCK"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Export.."
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Project Export"
+msgstr ""
+
+#: tools/editor/project_export.cpp
+msgid "Export Preset:"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Invalid project path, the path must exist!"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Invalid project path, engine.cfg must not exist."
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Invalid project path, engine.cfg must exist."
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Imported Project"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Invalid project path (changed anything?)."
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Couldn't create engine.cfg in project path."
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Import Existing Project"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Project Path (Must Exist):"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Project Name:"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Create New Project"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Project Path:"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Browse"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "New Game Project"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "That's a BINGO!"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Unnamed Project"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Are you sure to open more than one projects?"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Are you sure to run more than one projects?"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Remove project from the list? (Folder contents will not be modified)"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Project Manager"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Project List"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Run"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Scan"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "New Project"
+msgstr ""
+
+#: tools/editor/project_manager.cpp
+msgid "Exit"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Key "
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Joy Button"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Joy Axis"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Mouse Button"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Invalid action (anything goes but '/' or ':')."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Action '%s' already exists!"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Rename Input Action Event"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Add Input Action Event"
+msgstr ""
+
+#: tools/editor/project_settings.cpp tools/editor/settings_config_dialog.cpp
+msgid "Control+"
+msgstr ""
+
+#: tools/editor/project_settings.cpp tools/editor/settings_config_dialog.cpp
+msgid "Press a Key.."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Mouse Button Index:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Left Button"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Right Button"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Middle Button"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Wheel Up Button"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Wheel Down Button"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Button 6"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Button 7"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Button 8"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Button 9"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Joystick Axis Index:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Joystick Button Index:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Add Input Action"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Erase Input Action Event"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Toggle Persisting"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Error saving settings."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Settings saved OK."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Add Translation"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Invalid name."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Valid characters:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Invalid name. Must not collide with an existing engine class name."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Invalid name. Must not collide with an existing buit-in type name."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Invalid name. Must not collide with an existing global constant name."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Autoload '%s' already exists!"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Rename Autoload"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Toggle AutoLoad Globals"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Add Autoload"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Remove Autoload"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Move Autoload"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Remove Translation"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Add Remapped Path"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Resource Remap Add Remap"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Change Resource Remap Language"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Remove Resource Remap"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Remove Resource Remap Option"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Enable"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Project Settings (engine.cfg)"
+msgstr ""
+
+#: tools/editor/project_settings.cpp tools/editor/settings_config_dialog.cpp
+msgid "General"
+msgstr ""
+
+#: tools/editor/project_settings.cpp tools/editor/property_editor.cpp
+msgid "Property:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Del"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Copy To Platform.."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Input Map"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Action:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Device:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Index:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Localization"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Translations"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Translations:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Add.."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Remaps"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Resources:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Remaps by Locale:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Locale"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "AutoLoad"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Node Name:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "List:"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Singleton"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Plugins"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Preset.."
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Ease In"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Ease Out"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Zero"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Easing In-Out"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Easing Out-In"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "File.."
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Dir.."
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Load"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Assign"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Error loading file: Not a resource!"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Couldn't load image"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Bit %d, val %d."
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "On"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Set"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Properties:"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Global"
+msgstr ""
+
+#: tools/editor/property_editor.cpp
+msgid "Sections:"
+msgstr ""
+
+#: tools/editor/pvrtc_compress.cpp
+msgid "Could not execute PVRTC tool:"
+msgstr ""
+
+#: tools/editor/pvrtc_compress.cpp
+msgid "Can't load back converted image using PVRTC tool:"
+msgstr ""
+
+#: tools/editor/reparent_dialog.cpp tools/editor/scene_tree_dock.cpp
+msgid "Reparent Node"
+msgstr ""
+
+#: tools/editor/reparent_dialog.cpp
+msgid "Reparent Location (Select new Parent):"
+msgstr ""
+
+#: tools/editor/reparent_dialog.cpp
+msgid "Keep Global Transform"
+msgstr ""
+
+#: tools/editor/reparent_dialog.cpp tools/editor/scene_tree_dock.cpp
+msgid "Reparent"
+msgstr ""
+
+#: tools/editor/resources_dock.cpp
+msgid "Create New Resource"
+msgstr ""
+
+#: tools/editor/resources_dock.cpp
+msgid "Open Resource"
+msgstr ""
+
+#: tools/editor/resources_dock.cpp
+msgid "Save Resource"
+msgstr ""
+
+#: tools/editor/resources_dock.cpp
+msgid "Resource Tools"
+msgstr ""
+
+#: tools/editor/resources_dock.cpp
+msgid "Make Local"
+msgstr ""
+
+#: tools/editor/run_settings_dialog.cpp
+msgid "Run Mode:"
+msgstr ""
+
+#: tools/editor/run_settings_dialog.cpp
+msgid "Current Scene"
+msgstr ""
+
+#: tools/editor/run_settings_dialog.cpp
+msgid "Main Scene"
+msgstr ""
+
+#: tools/editor/run_settings_dialog.cpp
+msgid "Main Scene Arguments:"
+msgstr ""
+
+#: tools/editor/run_settings_dialog.cpp
+msgid "Scene Run Settings"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "OK :("
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "No parent to instance a child at."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Error loading scene from %s"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Error instancing scene from %s"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Ok"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid ""
+"Cannot instance the scene '%s' because the current scene exists within one "
+"of its nodes."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Instance Scene(s)"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "This operation can't be done on the tree root."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Move Node In Parent"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Move Nodes In Parent"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Duplicate Node(s)"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Delete Node(s)?"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "This operation can't be done without a scene."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "This operation requires a single selected node."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "This operation can't be done on instanced scenes."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Save New Scene As.."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Makes Sense!"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Can't operate on nodes from a foreign scene!"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Can't operate on nodes the current scene inherits from!"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Remove Node(s)"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Create Node"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid ""
+"Couldn't save new scene. Likely dependencies (instances) couldn't be "
+"satisfied."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Error saving scene."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Error duplicating scene to save it."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Edit Groups"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Edit Connections"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Delete Node(s)"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Add Child Node"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Instance Child Scene"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Change Type"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Add Script"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Merge From Scene"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Save Branch as Scene"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Add/Create a New Node"
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
+msgid ""
+"Instance a scene file as a Node. Creates an inherited scene if no root node "
+"exists."
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid ""
+"This item cannot be made visible because the parent is hidden. Unhide the "
+"parent first."
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Toggle Spatial Visible"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Toggle CanvasItem Visible"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Instance:"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Invalid node name, the following characters are not allowed:"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Rename Node"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Scene Tree (Nodes):"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Editable Children"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Load As Placeholder"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Discard Instancing"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Open in Editor"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Clear Inheritance"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Clear Inheritance? (No Undo!)"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Clear!"
+msgstr ""
+
+#: tools/editor/scene_tree_editor.cpp
+msgid "Select a Node"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Same source and destination files, doing nothing."
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Same source and destination paths, doing nothing."
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Can't move directories to within themselves."
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Can't operate on '..'"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Pick New Name and Location For:"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "No files selected!"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Instance"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Edit Dependencies.."
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "View Owners.."
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Copy Path"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Rename or Move.."
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Move To.."
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Info"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Show In File Manager"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Previous Directory"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Next Directory"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Re-Scan Filesystem"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Toggle folder status as Favorite"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Instance the selected scene(s) as child of the selected node."
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
+msgid "Move"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Invalid parent class name"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Valid chars:"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Invalid class name"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Valid name"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "N/A"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Class name is invalid!"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Parent class name is invalid!"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Invalid path!"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Could not create script in filesystem."
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Path is empty"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Path is not local"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Invalid base path"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "File exists"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Invalid extension"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Valid path"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Class Name:"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Built-In Script"
+msgstr ""
+
+#: tools/editor/script_create_dialog.cpp
+msgid "Create Node Script"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Bytes:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Warning"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Error:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Source:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Function:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Errors"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Child Process Connected"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Inspect Previous Instance"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Inspect Next Instance"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Stack Frames"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Variable"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Errors:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Stack Trace (if applicable):"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Remote Inspector"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Live Scene Tree:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Remote Object Properties: "
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Profiler"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Monitor"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Value"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Monitors"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "List of Video Memory Usage by Resource:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Total:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Video Mem"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Resource Path"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Type"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Usage"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Misc"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Clicked Control:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Clicked Control Type:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Live Edit Root:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Set From Tree"
+msgstr ""
+
+#: tools/editor/settings_config_dialog.cpp
+msgid "Shortcuts"
+msgstr ""
+
+#: tools/editor/spatial_editor_gizmos.cpp
+msgid "Change Light Radius"
+msgstr ""
+
+#: tools/editor/spatial_editor_gizmos.cpp
+msgid "Change Camera FOV"
+msgstr ""
+
+#: tools/editor/spatial_editor_gizmos.cpp
+msgid "Change Camera Size"
+msgstr ""
+
+#: tools/editor/spatial_editor_gizmos.cpp
+msgid "Change Sphere Shape Radius"
+msgstr ""
+
+#: tools/editor/spatial_editor_gizmos.cpp
+msgid "Change Box Shape Extents"
+msgstr ""
+
+#: tools/editor/spatial_editor_gizmos.cpp
+msgid "Change Capsule Shape Radius"
+msgstr ""
+
+#: tools/editor/spatial_editor_gizmos.cpp
+msgid "Change Capsule Shape Height"
+msgstr ""
+
+#: tools/editor/spatial_editor_gizmos.cpp
+msgid "Change Ray Shape Length"
+msgstr ""
+
+#: tools/editor/spatial_editor_gizmos.cpp
+msgid "Change Notifier Extents"
+msgstr ""
diff --git a/tools/translations/ko.po b/tools/translations/ko.po
index 990a9aba82..07c68ef992 100644
--- a/tools/translations/ko.po
+++ b/tools/translations/ko.po
@@ -10,8 +10,8 @@ msgstr ""
 "POT-Creation-Date: \n"
 "PO-Revision-Date: 2016-06-19 13:30+0000\n"
 "Last-Translator: 박한얼 <volzhs@gmail.com>\n"
-"Language-Team: Korean <https://hosted.weblate.org/projects/godot-"
-"engine/godot/ko/>\n"
+"Language-Team: Korean <https://hosted.weblate.org/projects/godot-engine/"
+"godot/ko/>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,8 @@ msgstr ""
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Invalid type argument to convert(), use TYPE_* constants."
-msgstr "convert()하기 위한 인자 타입이 유효하지 않습니다, TYPE_* 상수를 사용하세요."
+msgstr ""
+"convert()하기 위한 인자 타입이 유효하지 않습니다, TYPE_* 상수를 사용하세요."
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Not enough bytes for decoding bytes, or invalid format."
@@ -49,11 +50,13 @@ msgstr "유효하지 않은 인스턴스 Dictionary 형식 (@path 없음)"
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Invalid instance dictionary format (can't load script at @path)"
-msgstr "유효하지 않은 인스턴스 Dictionary 형식 (@path 에서 스크립트를 로드할 수 없음)"
+msgstr ""
+"유효하지 않은 인스턴스 Dictionary 형식 (@path 에서 스크립트를 로드할 수 없음)"
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Invalid instance dictionary format (invalid script at @path)"
-msgstr "유효하지 않은 인스턴스 Dictionary 형식 (@path의 스크립트가 유효하지 않음)"
+msgstr ""
+"유효하지 않은 인스턴스 Dictionary 형식 (@path의 스크립트가 유효하지 않음)"
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Invalid instance dictionary (invalid subclasses)"
@@ -687,10 +690,6 @@ msgid "Change Anim Loop"
 msgstr "애니메이션 루프 변경"
 
 #: tools/editor/animation_editor.cpp
-msgid "Change Anim Loop Interpolation"
-msgstr "애니메이션 루프 보간 변경"
-
-#: tools/editor/animation_editor.cpp
 msgid "Anim Create Typed Value Key"
 msgstr "애니메이션 타입지정 값 키 만들기"
 
@@ -731,10 +730,6 @@ msgid "Enable/Disable looping in animation."
 msgstr "애니메이션 루프 활성화/비활성화."
 
 #: tools/editor/animation_editor.cpp
-msgid "Enable/Disable interpolation when looping animation."
-msgstr "애니메이션 루프 시 보간 활성화/비활성화."
-
-#: tools/editor/animation_editor.cpp
 msgid "Add new tracks."
 msgstr "새 트랙 추가."
 
@@ -999,7 +994,8 @@ msgid "Method in target Node must be specified!"
 msgstr "대상 노드의 함수를 명시해야합니다!"
 
 #: tools/editor/connections_dialog.cpp
-msgid "Conect To Node:"
+#, fuzzy
+msgid "Connect To Node:"
 msgstr "연결할 노드:"
 
 #: tools/editor/connections_dialog.cpp tools/editor/groups_editor.cpp
@@ -1218,6 +1214,51 @@ msgstr "디렉토리 선택"
 msgid "Choose"
 msgstr "선택"
 
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Back"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Forward"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Refresh"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Hidden Files"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Toggle Favorite"
+msgstr "중단점 토글"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Toggle Mode"
+msgstr "주석 토글"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Focus Path"
+msgstr "경로 복사"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Mode Favorite Up"
+msgstr "즐겨찾기:"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Mode Favorite Down"
+msgstr "아래로 이동"
+
 #: tools/editor/editor_file_dialog.cpp tools/editor/scenes_dock.cpp
 msgid "Favorites:"
 msgstr "즐겨찾기:"
@@ -1471,9 +1512,31 @@ msgid "There is no defined scene to run."
 msgstr "실행하기 위해 정의된 씬이 없습니다."
 
 #: tools/editor/editor_node.cpp
+#, fuzzy
+msgid ""
+"No main scene has ever been defined, select one?\n"
+"You can change it later in later in \"Project Settings\" under the "
+"'application' category."
+msgstr ""
+"메인 씬이 지정되지 않았습니다.\n"
+"\"프로젝트 설정\"의 'Application' 항목에서 씬을 하나 선택해 주세요."
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid ""
+"Selected scene '%s' does not exist, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+"메인 씬이 지정되지 않았습니다.\n"
+"\"프로젝트 설정\"의 'Application' 항목에서 씬을 하나 선택해 주세요."
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
 msgid ""
-"No main scene has ever been defined.\n"
-"Select one from \"Project Settings\" under the 'application' category."
+"Selected scene '%s' is not a scene file, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
 msgstr ""
 "메인 씬이 지정되지 않았습니다.\n"
 "\"프로젝트 설정\"의 'Application' 항목에서 씬을 하나 선택해 주세요."
@@ -1570,6 +1633,11 @@ msgstr ""
 "프로젝트 매니저를 실행하시겠습니까?\n"
 "(저장하지 않은 변경사항은 사라집니다.)"
 
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Pick a Manu Scene"
+msgstr "메인 씬"
+
 #: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
 msgid "Ugh"
 msgstr "오우"
@@ -1595,18 +1663,14 @@ msgid "Save Layout"
 msgstr "레이아웃 저장"
 
 #: tools/editor/editor_node.cpp
-msgid "Load Layout"
-msgstr "레이아웃 로드"
+msgid "Delete Layout"
+msgstr "레이아웃 삭제"
 
 #: tools/editor/editor_node.cpp tools/editor/project_export.cpp
 msgid "Default"
 msgstr "Default"
 
 #: tools/editor/editor_node.cpp
-msgid "Delete Layout"
-msgstr "레이아웃 삭제"
-
-#: tools/editor/editor_node.cpp
 msgid "Switch Scene Tab"
 msgstr "씬 탭 전환"
 
@@ -1636,6 +1700,16 @@ msgid "Distraction Free Mode"
 msgstr "초집중 모드"
 
 #: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Next tab"
+msgstr "다음"
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Previous tab"
+msgstr "이전 디렉토리"
+
+#: tools/editor/editor_node.cpp
 msgid "Operations with scene files."
 msgstr "씬 파일 동작."
 
@@ -2198,6 +2272,12 @@ msgid "No target font resource!"
 msgstr "폰트 리소스 경로가 없습니다!"
 
 #: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"Invalid file extension.\n"
+"Please use .fnt."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Can't load/process source font."
 msgstr "소스 폰트를 로드/처리할 수 없습니다."
 
@@ -2433,7 +2513,8 @@ msgid "Couldn't load post-import script:"
 msgstr "가져오기 후 실행할 스크립트를 로드할 수 없습니다:"
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
-msgid "Invalid/broken script for post-import:"
+#, fuzzy
+msgid "Invalid/broken script for post-import (check console):"
 msgstr "가져오기 후 실행할 스크립트가 유효하지 않거나 깨져있습니다:"
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -3098,13 +3179,11 @@ msgstr "스냅 설정"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Offset:"
 msgstr "그리드 오프셋:"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Step:"
 msgstr "그리드 스텝:"
 
@@ -3222,7 +3301,6 @@ msgstr "스냅 사용"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Show Grid"
 msgstr "그리드 보이기"
 
@@ -3475,6 +3553,10 @@ msgid "MeshInstance lacks a Mesh!"
 msgstr "MeshInstance에 메쉬가 없습니다!"
 
 #: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh has not surface to create outlines from!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
 msgid "Could not create outline!"
 msgstr "외곽선을 만들수 없습니다!"
 
@@ -3836,17 +3918,14 @@ msgid "Clear UV"
 msgstr "UV 정리"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Snap"
 msgstr "스냅"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Enable Snap"
 msgstr "스냅 활성화"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid"
 msgstr "그리드"
 
@@ -4685,20 +4764,51 @@ msgid "StyleBox Preview:"
 msgstr "StyleBox 미리보기:"
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Texture Region Editor"
-msgstr "텍스쳐 구역 편집기"
+#, fuzzy
+msgid "Snap Mode:"
+msgstr "실행 모드:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "<None>"
+msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Scale Region Editor"
-msgstr "스케일 구역 편집기"
+#, fuzzy
+msgid "Pixel Snap"
+msgstr "픽셀 스냅 사용"
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid ""
-"No texture in this node.\n"
-"Set a texture to be able to edit region."
+#, fuzzy
+msgid "Grid Snap"
+msgstr "그리드 스텝:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Auto Slice"
 msgstr ""
-"이 노드에 텍스쳐가 없습니다.\n"
-"구역을 편집하기 위해서는 텍스쳐를 지정해야합니다."
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Offset:"
+msgstr "그리드 오프셋:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Step:"
+msgstr "단계 (초):"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Separation:"
+msgstr "부문:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Texture Region"
+msgstr "텍스쳐 구역 편집기"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region Editor"
+msgstr "텍스쳐 구역 편집기"
 
 #: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Can't save theme to file:"
@@ -5763,12 +5873,16 @@ msgid "Error duplicating scene to save it."
 msgstr "저장하기 위해 씬을 복제하는 중에 에러가 발생했습니다."
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "New Scene Root"
-msgstr "새로운 씬 루트"
+msgid "Edit Groups"
+msgstr "그룹 편집"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Inherit Scene"
-msgstr "상속 씬"
+msgid "Edit Connections"
+msgstr "연결 편집"
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Delete Node(s)"
+msgstr "노드 삭제"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Add Child Node"
@@ -5783,14 +5897,6 @@ msgid "Change Type"
 msgstr "타입 변경"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Groups"
-msgstr "그룹 편집"
-
-#: tools/editor/scene_tree_dock.cpp
-msgid "Edit Connections"
-msgstr "연결 편집"
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add Script"
 msgstr "스크립트 추가"
 
@@ -5803,10 +5909,6 @@ msgid "Save Branch as Scene"
 msgstr "선택 노드를 다른 씬으로 저장"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Delete Node(s)"
-msgstr "노드 삭제"
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add/Create a New Node"
 msgstr "새 노드 추가/생성"
 
@@ -6197,6 +6299,31 @@ msgstr "Ray Shape 길이 변경"
 msgid "Change Notifier Extents"
 msgstr "Notifier 범위 변경"
 
+#~ msgid "Change Anim Loop Interpolation"
+#~ msgstr "애니메이션 루프 보간 변경"
+
+#~ msgid "Enable/Disable interpolation when looping animation."
+#~ msgstr "애니메이션 루프 시 보간 활성화/비활성화."
+
+#~ msgid "Load Layout"
+#~ msgstr "레이아웃 로드"
+
+#~ msgid "Scale Region Editor"
+#~ msgstr "스케일 구역 편집기"
+
+#~ msgid ""
+#~ "No texture in this node.\n"
+#~ "Set a texture to be able to edit region."
+#~ msgstr ""
+#~ "이 노드에 텍스쳐가 없습니다.\n"
+#~ "구역을 편집하기 위해서는 텍스쳐를 지정해야합니다."
+
+#~ msgid "New Scene Root"
+#~ msgstr "새로운 씬 루트"
+
+#~ msgid "Inherit Scene"
+#~ msgstr "상속 씬"
+
 #~ msgid "Binds (Extra Params):"
 #~ msgstr "바인드 (추가 파라미터):"
 
diff --git a/tools/translations/pt_BR.po b/tools/translations/pt_BR.po
index dadd54d273..24c42d350a 100644
--- a/tools/translations/pt_BR.po
+++ b/tools/translations/pt_BR.po
@@ -11,8 +11,8 @@ msgstr ""
 "POT-Creation-Date: 2016-05-30\n"
 "PO-Revision-Date: 2016-06-20 01:48+0000\n"
 "Last-Translator: George Marques <georgemjesus@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects"
-"/godot-engine/godot/pt_BR/>\n"
+"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
+"godot-engine/godot/pt_BR/>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -701,10 +701,6 @@ msgid "Change Anim Loop"
 msgstr "Mudar Loop da Animação"
 
 #: tools/editor/animation_editor.cpp
-msgid "Change Anim Loop Interpolation"
-msgstr "Mudar Interpolação do Loop da Animação"
-
-#: tools/editor/animation_editor.cpp
 msgid "Anim Create Typed Value Key"
 msgstr "Criar Chave com Valor Definido"
 
@@ -745,10 +741,6 @@ msgid "Enable/Disable looping in animation."
 msgstr "Habilitar/Desabilitar loop de animação."
 
 #: tools/editor/animation_editor.cpp
-msgid "Enable/Disable interpolation when looping animation."
-msgstr "Habilitar/Desabilitar interpolação quando repetindo a animação."
-
-#: tools/editor/animation_editor.cpp
 msgid "Add new tracks."
 msgstr "Adicionar novas trilhas."
 
@@ -1013,7 +1005,8 @@ msgid "Method in target Node must be specified!"
 msgstr "O método no Nó destino precisa ser especificado!"
 
 #: tools/editor/connections_dialog.cpp
-msgid "Conect To Node:"
+#, fuzzy
+msgid "Connect To Node:"
 msgstr "Conectar ao Nó:"
 
 #: tools/editor/connections_dialog.cpp tools/editor/groups_editor.cpp
@@ -1233,6 +1226,51 @@ msgstr "Escolha um Diretório"
 msgid "Choose"
 msgstr "Escolher"
 
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Back"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Forward"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Refresh"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Hidden Files"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Toggle Favorite"
+msgstr "Mover Favorito Acima"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Toggle Mode"
+msgstr "Alternar Comentário"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Focus Path"
+msgstr "Copiar Caminho"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Mode Favorite Up"
+msgstr "Mover Favorito Acima"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Mode Favorite Down"
+msgstr "Mover Favorito Abaixo"
+
 #: tools/editor/editor_file_dialog.cpp tools/editor/scenes_dock.cpp
 msgid "Favorites:"
 msgstr "Favoritos:"
@@ -1487,9 +1525,31 @@ msgid "There is no defined scene to run."
 msgstr "Não há cena definida para rodar."
 
 #: tools/editor/editor_node.cpp
+#, fuzzy
 msgid ""
-"No main scene has ever been defined.\n"
-"Select one from \"Project Settings\" under the 'application' category."
+"No main scene has ever been defined, select one?\n"
+"You can change it later in later in \"Project Settings\" under the "
+"'application' category."
+msgstr ""
+"A cena principal não foi definida.\n"
+"Selecione uma nas \"Configurações do Projeto\" na categoria \"application\"."
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid ""
+"Selected scene '%s' does not exist, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+"A cena principal não foi definida.\n"
+"Selecione uma nas \"Configurações do Projeto\" na categoria \"application\"."
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid ""
+"Selected scene '%s' is not a scene file, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
 msgstr ""
 "A cena principal não foi definida.\n"
 "Selecione uma nas \"Configurações do Projeto\" na categoria \"application\"."
@@ -1586,6 +1646,11 @@ msgstr ""
 "Abrir Gerenciador de Projetos?\n"
 "(Mudanças não salvas serão perdidas)"
 
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Pick a Manu Scene"
+msgstr "Cena Principal"
+
 #: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
 msgid "Ugh"
 msgstr "Ugh"
@@ -1611,18 +1676,14 @@ msgid "Save Layout"
 msgstr "Salvar Layout"
 
 #: tools/editor/editor_node.cpp
-msgid "Load Layout"
-msgstr "Carregar Layout"
+msgid "Delete Layout"
+msgstr "Excluir Layout"
 
 #: tools/editor/editor_node.cpp tools/editor/project_export.cpp
 msgid "Default"
 msgstr "Padrão"
 
 #: tools/editor/editor_node.cpp
-msgid "Delete Layout"
-msgstr "Excluir Layout"
-
-#: tools/editor/editor_node.cpp
 msgid "Switch Scene Tab"
 msgstr "Trocar Guia de Cena"
 
@@ -1652,6 +1713,16 @@ msgid "Distraction Free Mode"
 msgstr "Modo Sem Distrações"
 
 #: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Next tab"
+msgstr "Próximo"
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Previous tab"
+msgstr "Diretório Anterior"
+
+#: tools/editor/editor_node.cpp
 msgid "Operations with scene files."
 msgstr "Operações com arquivos de cena."
 
@@ -2215,6 +2286,12 @@ msgid "No target font resource!"
 msgstr "Falta recurso de fonte destino!"
 
 #: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"Invalid file extension.\n"
+"Please use .fnt."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Can't load/process source font."
 msgstr "Não se pôde carregar/processar fonte de origem."
 
@@ -2454,7 +2531,8 @@ msgid "Couldn't load post-import script:"
 msgstr "Não se pôde carregar script pós-importação:"
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
-msgid "Invalid/broken script for post-import:"
+#, fuzzy
+msgid "Invalid/broken script for post-import (check console):"
 msgstr "Script pós-importação inválido/quebrado:"
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -3122,13 +3200,11 @@ msgstr "Configurar o Snap"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Offset:"
 msgstr "Deslocamento da grade:"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Step:"
 msgstr "Passo de grade:"
 
@@ -3248,7 +3324,6 @@ msgstr "Usar Snap"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Show Grid"
 msgstr "Mostrar Grade"
 
@@ -3501,6 +3576,10 @@ msgid "MeshInstance lacks a Mesh!"
 msgstr "Falta uma MeshInstance na Mesh!"
 
 #: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh has not surface to create outlines from!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
 msgid "Could not create outline!"
 msgstr "Não se pôde criar contorno!"
 
@@ -3863,17 +3942,14 @@ msgid "Clear UV"
 msgstr "Limpar UV"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Snap"
 msgstr "Snap"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Enable Snap"
 msgstr "Ativar Snap"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid"
 msgstr "Grade"
 
@@ -4711,20 +4787,51 @@ msgid "StyleBox Preview:"
 msgstr "Pré-Visualização do StyleBox:"
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Texture Region Editor"
-msgstr "Editor de Região da Textura"
+#, fuzzy
+msgid "Snap Mode:"
+msgstr "Modo de Início:"
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Scale Region Editor"
-msgstr "Editor de Região de Escala"
+msgid "<None>"
+msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid ""
-"No texture in this node.\n"
-"Set a texture to be able to edit region."
+#, fuzzy
+msgid "Pixel Snap"
+msgstr "Usar Snap de Pixel"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Grid Snap"
+msgstr "Passo de grade:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Auto Slice"
 msgstr ""
-"Sem textura nesse nó.\n"
-"Defina uma textura para poder editar essa região."
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Offset:"
+msgstr "Deslocamento da grade:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Step:"
+msgstr "Passo (s):"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Separation:"
+msgstr "Seções:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Texture Region"
+msgstr "Editor de Região da Textura"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region Editor"
+msgstr "Editor de Região da Textura"
 
 #: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Can't save theme to file:"
@@ -5796,12 +5903,16 @@ msgid "Error duplicating scene to save it."
 msgstr "Erro duplicando cena ao salvar."
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "New Scene Root"
-msgstr "Nova Raiz de Cena"
+msgid "Edit Groups"
+msgstr "Editar Grupos"
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Edit Connections"
+msgstr "Editar Conexões"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Inherit Scene"
-msgstr "Herdar Cena"
+msgid "Delete Node(s)"
+msgstr "Excluir Nó(s)"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Add Child Node"
@@ -5816,14 +5927,6 @@ msgid "Change Type"
 msgstr "Alterar Tipo"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Groups"
-msgstr "Editar Grupos"
-
-#: tools/editor/scene_tree_dock.cpp
-msgid "Edit Connections"
-msgstr "Editar Conexões"
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add Script"
 msgstr "Adicionar Script"
 
@@ -5836,10 +5939,6 @@ msgid "Save Branch as Scene"
 msgstr "Salvar Ramo como Cena"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Delete Node(s)"
-msgstr "Excluir Nó(s)"
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add/Create a New Node"
 msgstr "Adicionar/Criar um Novo Nó"
 
@@ -6231,6 +6330,31 @@ msgstr "Mudar o tamanho do Shape Ray"
 msgid "Change Notifier Extents"
 msgstr "Alterar a Extensão do Notificador"
 
+#~ msgid "Change Anim Loop Interpolation"
+#~ msgstr "Mudar Interpolação do Loop da Animação"
+
+#~ msgid "Enable/Disable interpolation when looping animation."
+#~ msgstr "Habilitar/Desabilitar interpolação quando repetindo a animação."
+
+#~ msgid "Load Layout"
+#~ msgstr "Carregar Layout"
+
+#~ msgid "Scale Region Editor"
+#~ msgstr "Editor de Região de Escala"
+
+#~ msgid ""
+#~ "No texture in this node.\n"
+#~ "Set a texture to be able to edit region."
+#~ msgstr ""
+#~ "Sem textura nesse nó.\n"
+#~ "Defina uma textura para poder editar essa região."
+
+#~ msgid "New Scene Root"
+#~ msgstr "Nova Raiz de Cena"
+
+#~ msgid "Inherit Scene"
+#~ msgstr "Herdar Cena"
+
 #~ msgid "Binds (Extra Params):"
 #~ msgstr "Ligações (Parâmetros Extra):"
 
@@ -6288,12 +6412,6 @@ msgstr "Alterar a Extensão do Notificador"
 #~ msgid "Next Time:"
 #~ msgstr "Next Time:"
 
-#~ msgid "Move Favorite Up"
-#~ msgstr "Mover Favorito Acima"
-
-#~ msgid "Move Favorite Down"
-#~ msgstr "Mover Favorito Abaixo"
-
 #~ msgid "%d frames"
 #~ msgstr "%d quadros"
 
diff --git a/tools/translations/ru.po b/tools/translations/ru.po
index 63fb6c4177..97ac24c5b7 100644
--- a/tools/translations/ru.po
+++ b/tools/translations/ru.po
@@ -3,23 +3,24 @@
 # This file is distributed under the same license as the Godot source code.
 #
 # DimOkGamer <dimokgamer@gmail.com>, 2016.
+# Maxim Kim <habamax@gmail.com>, 2016.
 # Maxim toby3d Lebedev <mail@toby3d.ru>, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2016-06-19 17:29+0300\n"
-"Last-Translator: DimOkGamer <dimokgamer@gmail.com>\n"
-"Language-Team: Russian <https://hosted.weblate.org/projects/godot-"
-"engine/godot/ru/>\n"
+"PO-Revision-Date: 2016-06-27 12:43+0000\n"
+"Last-Translator: Maxim Kim <habamax@gmail.com>\n"
+"Language-Team: Russian <https://hosted.weblate.org/projects/godot-engine/"
+"godot/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
-"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Poedit 1.8.8\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 2.7-dev\n"
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Invalid type argument to convert(), use TYPE_* constants."
@@ -136,7 +137,7 @@ msgid ""
 "A NavigationPolygon resource must be set or created for this node to work. "
 "Please set a property or draw a polygon."
 msgstr ""
-"Ресурс NavigationPolygon должен быть установлен или создан для этого нода. "
+"Ресурс NavigationPolygon должен быть установлен или создан для этого узла. "
 "Пожалуйста, установите свойство или нарисуйте многоугольник."
 
 #: scene/2d/navigation_polygon.cpp
@@ -144,20 +145,21 @@ msgid ""
 "NavigationPolygonInstance must be a child or grandchild to a Navigation2D "
 "node. It only provides navigation data."
 msgstr ""
-"NavigationPolygonInstance должен быть ребёнком или внуком нода Navigation2D. "
-"Он обеспечивает только навигационные данные."
+"NavigationPolygonInstance должен быть ребёнком или внуком узла Navigation2D. "
+"Он предоставляет только навигационные данные."
 
 #: scene/2d/parallax_layer.cpp
 msgid ""
 "ParallaxLayer node only works when set as child of a ParallaxBackground node."
 msgstr ""
-"Нод ParallaxLayer работает только при установке его в качестве дочернего "
+"Узел ParallaxLayer работает только при установке его в качестве дочернего "
 "узла ParallaxBackground."
 
 #: scene/2d/particles_2d.cpp
 msgid "Path property must point to a valid Particles2D node to work."
 msgstr ""
-"Свойство Path должен указывать на действительный нод Particles2D для работы."
+"Для корректной работы свойство Path должно указывать на действующий узел "
+"Particles2D."
 
 #: scene/2d/path_2d.cpp
 msgid "PathFollow2D only works when set as a child of a Path2D node."
@@ -167,7 +169,9 @@ msgstr ""
 
 #: scene/2d/remote_transform_2d.cpp
 msgid "Path property must point to a valid Node2D node to work."
-msgstr "Свойство Path должен указывать на действительный нод Node2D для работы."
+msgstr ""
+"Для корректной работы свойство Path должно указывать на действующий узел "
+"Node2D."
 
 #: scene/2d/sample_player_2d.cpp scene/audio/sample_player.cpp
 msgid ""
@@ -182,24 +186,24 @@ msgid ""
 "Path property must point to a valid Viewport node to work. Such Viewport "
 "must be set to 'render target' mode."
 msgstr ""
-"Для работы, параметр Path должен указывать на действительный Нод Viewport. "
-"Такой Viewport должен быть установлен в качестве цели рендеринга."
+"Для корректной работы свойство Path должно указывать на действующий узел "
+"Viewport. Такой Viewport должен быть установлен в режим 'цель рендеринга'."
 
 #: scene/2d/sprite.cpp
 msgid ""
 "The Viewport set in the path property must be set as 'render target' in "
 "order for this sprite to work."
 msgstr ""
-"Области просмотра установленная в свойстве path должна быть назначена \""
-"целью визуализации\" для того, чтобы этот спрайт работал."
+"Области просмотра установленная в свойстве path должна быть назначена "
+"\"целью визуализации\" для того, чтобы этот спрайт работал."
 
 #: scene/2d/visibility_notifier_2d.cpp
 msgid ""
 "VisibilityEnable2D works best when used with the edited scene root directly "
 "as parent."
 msgstr ""
-"VisibilityEnable2D работает лучше, когда используется, как дочерний нод "
-"корня."
+"VisibilityEnable2D работает наилучшим образом при использовании корня "
+"редактируемой сцены, как прямого родителя."
 
 #: scene/3d/body_shape.cpp
 msgid ""
@@ -235,15 +239,16 @@ msgstr "Пустой CollisionPolygon не влияет на столкнове�
 
 #: scene/3d/navigation_mesh.cpp
 msgid "A NavigationMesh resource must be set or created for this node to work."
-msgstr "Ресурс NavigationMesh должен быть установлен или создан для этого нода."
+msgstr ""
+"Ресурс NavigationMesh должен быть установлен или создан для этого узла."
 
 #: scene/3d/navigation_mesh.cpp
 msgid ""
 "NavigationMeshInstance must be a child or grandchild to a Navigation node. "
 "It only provides navigation data."
 msgstr ""
-"NavigationMeshInstance должен быть ребёнком или внуком нода Navigation. Он "
-"обеспечивает только навигационные данные."
+"NavigationMeshInstance должен быть дочерним или под-дочерним узлом "
+"Navigation. Он предоставляет только навигационные данные."
 
 #: scene/3d/scenario_fx.cpp
 msgid ""
@@ -483,7 +488,7 @@ msgstr ""
 "использовать его, чтобы отобразить его содержимое прямо на экране, сделать "
 "его потомком Control'а, чтобы он мог получить размер. В противном случае, "
 "сделайте его  целью рендеринга и передайте его внутренние текстуры какому-то "
-"другому Ноду для отображения."
+"другому узлу для отображения."
 
 #: scene/resources/dynamic_font.cpp
 #: tools/editor/io_plugins/editor_font_import_plugin.cpp
@@ -701,10 +706,6 @@ msgid "Change Anim Loop"
 msgstr "Изменено зацикливание анимации"
 
 #: tools/editor/animation_editor.cpp
-msgid "Change Anim Loop Interpolation"
-msgstr "Изменена интерполяция анимации"
-
-#: tools/editor/animation_editor.cpp
 msgid "Anim Create Typed Value Key"
 msgstr "Создан ключ с вводимым значением"
 
@@ -745,10 +746,6 @@ msgid "Enable/Disable looping in animation."
 msgstr "Включить/отключить зацикливание в анимации."
 
 #: tools/editor/animation_editor.cpp
-msgid "Enable/Disable interpolation when looping animation."
-msgstr "Включить/отключить интерполяцию при зацикливании анимации."
-
-#: tools/editor/animation_editor.cpp
 msgid "Add new tracks."
 msgstr "Добавить новые дорожки."
 
@@ -806,7 +803,7 @@ msgstr "Коэффициент масштабирования:"
 
 #: tools/editor/animation_editor.cpp
 msgid "Call Functions in Which Node?"
-msgstr "Вызвать функцию в каком ноде?"
+msgstr "Вызвать функции в каком узле?"
 
 #: tools/editor/animation_editor.cpp
 msgid "Remove invalid keys"
@@ -1010,11 +1007,12 @@ msgstr "Стлб:"
 
 #: tools/editor/connections_dialog.cpp
 msgid "Method in target Node must be specified!"
-msgstr "Метод должен быть указан в целевом Ноде!"
+msgstr "Метод должен быть указан в целевом Узле!"
 
 #: tools/editor/connections_dialog.cpp
-msgid "Conect To Node:"
-msgstr "Присоединить к ноду:"
+#, fuzzy
+msgid "Connect To Node:"
+msgstr "Присоединить к узлу:"
 
 #: tools/editor/connections_dialog.cpp tools/editor/groups_editor.cpp
 #: tools/editor/plugins/item_list_editor_plugin.cpp
@@ -1040,7 +1038,7 @@ msgstr "Дополнительные параметры вызова:"
 
 #: tools/editor/connections_dialog.cpp
 msgid "Path to Node:"
-msgstr "Путь к ноду:"
+msgstr "Путь к Узлу:"
 
 #: tools/editor/connections_dialog.cpp
 msgid "Make Function"
@@ -1232,6 +1230,51 @@ msgstr "Выбрать каталог"
 msgid "Choose"
 msgstr "Выбрать"
 
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Back"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Forward"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Refresh"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Hidden Files"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Toggle Favorite"
+msgstr "Точка остановки"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Toggle Mode"
+msgstr "Переключить комментарий"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Focus Path"
+msgstr "Копировать путь"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Mode Favorite Up"
+msgstr "Избранное:"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Mode Favorite Down"
+msgstr "Переместить вниз"
+
 #: tools/editor/editor_file_dialog.cpp tools/editor/scenes_dock.cpp
 msgid "Favorites:"
 msgstr "Избранное:"
@@ -1355,7 +1398,7 @@ msgstr "Импортируется:"
 
 #: tools/editor/editor_node.cpp
 msgid "Node From Scene"
-msgstr "Нод со сцены"
+msgstr "Узел со сцены"
 
 #: tools/editor/editor_node.cpp tools/editor/scenes_dock.cpp
 msgid "Re-Import.."
@@ -1486,9 +1529,33 @@ msgid "There is no defined scene to run."
 msgstr "Нет определённой сцены, чтобы работать."
 
 #: tools/editor/editor_node.cpp
+#, fuzzy
+msgid ""
+"No main scene has ever been defined, select one?\n"
+"You can change it later in later in \"Project Settings\" under the "
+"'application' category."
+msgstr ""
+"Не назначена главная сцена.\n"
+"Укажите её в параметре \"main_scene\" расположенном\n"
+"в \"Настройки проекта - Основное - application\"."
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid ""
+"Selected scene '%s' does not exist, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+"Не назначена главная сцена.\n"
+"Укажите её в параметре \"main_scene\" расположенном\n"
+"в \"Настройки проекта - Основное - application\"."
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
 msgid ""
-"No main scene has ever been defined.\n"
-"Select one from \"Project Settings\" under the 'application' category."
+"Selected scene '%s' is not a scene file, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
 msgstr ""
 "Не назначена главная сцена.\n"
 "Укажите её в параметре \"main_scene\" расположенном\n"
@@ -1586,6 +1653,11 @@ msgstr ""
 "Открыть менеджер проектов? \n"
 "(Несохранённые изменения будут потеряны.)"
 
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Pick a Manu Scene"
+msgstr "Главная сцена"
+
 #: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
 msgid "Ugh"
 msgstr "Ясно"
@@ -1612,18 +1684,14 @@ msgid "Save Layout"
 msgstr "Сохранить макет"
 
 #: tools/editor/editor_node.cpp
-msgid "Load Layout"
-msgstr "Загрузить макет"
+msgid "Delete Layout"
+msgstr "Удалить макет"
 
 #: tools/editor/editor_node.cpp tools/editor/project_export.cpp
 msgid "Default"
 msgstr "По-умолчанию"
 
 #: tools/editor/editor_node.cpp
-msgid "Delete Layout"
-msgstr "Удалить макет"
-
-#: tools/editor/editor_node.cpp
 msgid "Switch Scene Tab"
 msgstr "Смена вкладки со сценой"
 
@@ -1653,6 +1721,16 @@ msgid "Distraction Free Mode"
 msgstr "Свободный режим"
 
 #: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Next tab"
+msgstr "Следующий"
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Previous tab"
+msgstr "Предыдущий каталог"
+
+#: tools/editor/editor_node.cpp
 msgid "Operations with scene files."
 msgstr "Операции с файлами сцены."
 
@@ -1839,7 +1917,7 @@ msgid ""
 "Collision shapes and raycast nodes (for 2D and 3D) will be visible on the "
 "running game if this option is turned on."
 msgstr ""
-"Когда эта опция включена, области соприкосновений и ноды Raycast(в 2D и 3D) "
+"Когда эта опция включена, области соприкосновений и узлы Raycast(в 2D и 3D) "
 "будут видимыми в запущенной игре."
 
 #: tools/editor/editor_node.cpp
@@ -2117,7 +2195,7 @@ msgstr "По-умолчанию (как редактор)"
 
 #: tools/editor/editor_sub_scene.cpp
 msgid "Select Node(s) to Import"
-msgstr "Выберите нод(ы) для импорта"
+msgstr "Выберите Узлы(ы) для импорта"
 
 #: tools/editor/editor_sub_scene.cpp
 msgid "Scene Path:"
@@ -2125,7 +2203,7 @@ msgstr "Путь к сцене:"
 
 #: tools/editor/editor_sub_scene.cpp
 msgid "Import From Node:"
-msgstr "Импортировать из нода:"
+msgstr "Импортировать из Узла:"
 
 #: tools/editor/file_type_cache.cpp
 msgid "Can't open file_type_cache.cch for writing, not saving file type cache!"
@@ -2216,6 +2294,12 @@ msgid "No target font resource!"
 msgstr "Нет целевого ресурса шрифта!"
 
 #: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"Invalid file extension.\n"
+"Please use .fnt."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Can't load/process source font."
 msgstr "Не удалось загрузить/исполнить исходный шрифт."
 
@@ -2415,7 +2499,7 @@ msgstr "Скрипт пост-процесса:"
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Custom Root Node Type:"
-msgstr "Настраиваемый тип корневого нода:"
+msgstr "Настраиваемый тип корневого узла:"
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Auto"
@@ -2457,7 +2541,8 @@ msgid "Couldn't load post-import script:"
 msgstr "Не могу загрузить скрипт для пост-импорта:"
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
-msgid "Invalid/broken script for post-import:"
+#, fuzzy
+msgid "Invalid/broken script for post-import (check console):"
 msgstr "Повреждённый/сломанный скрипт для пост-импорта:"
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -2719,11 +2804,11 @@ msgstr "Перевод"
 
 #: tools/editor/multi_node_edit.cpp
 msgid "MultiNode Set"
-msgstr "Мульти нодовый набор"
+msgstr "Мульти-узловый набор"
 
 #: tools/editor/node_dock.cpp
 msgid "Node"
-msgstr "Нод"
+msgstr "Узел"
 
 #: tools/editor/node_dock.cpp
 msgid "Groups"
@@ -2731,9 +2816,7 @@ msgstr "Группы"
 
 #: tools/editor/node_dock.cpp
 msgid "Select a Node to edit Signals and Groups."
-msgstr ""
-"Выберите нод для редактирования\n"
-"сигналов и групп."
+msgstr "Выберите узел для редактирования сигналов и групп."
 
 #: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Toggle Autoplay"
@@ -3010,39 +3093,39 @@ msgstr "Дерево анимации не действительно."
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Animation Node"
-msgstr "Animation нод"
+msgstr "Animation узел"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "OneShot Node"
-msgstr "OneShot нод"
+msgstr "OneShot узел"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Mix Node"
-msgstr "Mix нод"
+msgstr "Mix узел"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Blend2 Node"
-msgstr "Blend2 нод"
+msgstr "Blend2 узел"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Blend3 Node"
-msgstr "Blend3 нод"
+msgstr "Blend3 узел"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Blend4 Node"
-msgstr "Blend4 нод"
+msgstr "Blend4 узел"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "TimeScale Node"
-msgstr "TimeScale нод"
+msgstr "TimeScale узел"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "TimeSeek Node"
-msgstr "TimeSeek нод"
+msgstr "TimeSeek узел"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Transition Node"
-msgstr "Transition нод"
+msgstr "Transition узел"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Import Animations.."
@@ -3050,7 +3133,7 @@ msgstr "Импортировать анимации.."
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Edit Node Filters"
-msgstr "Редактировать фильтры нода"
+msgstr "Редактировать фильтры узла"
 
 #: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Filters.."
@@ -3127,13 +3210,11 @@ msgstr "Настроить привязку"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Offset:"
 msgstr "Отступ сетку:"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Step:"
 msgstr "Шаг сетки:"
 
@@ -3253,7 +3334,6 @@ msgstr "Использовать привязку"
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Show Grid"
 msgstr "Показать сетку"
 
@@ -3506,6 +3586,10 @@ msgid "MeshInstance lacks a Mesh!"
 msgstr "В MeshInstance нет полисетки!"
 
 #: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh has not surface to create outlines from!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
 msgid "Could not create outline!"
 msgstr "Невозможно создать контур!"
 
@@ -3543,7 +3627,7 @@ msgstr "Размер обводки:"
 
 #: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "No mesh source specified (and no MultiMesh set in node)."
-msgstr "Не указана исходная полисетка (и мульти полисетка не указана в ноде)."
+msgstr "Не указан источник полисетки (и мульти полисетка не указана в узле)."
 
 #: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "No mesh source specified (and MultiMesh contains no Mesh)."
@@ -3675,11 +3759,11 @@ msgstr "Количество создаваемых точек:"
 
 #: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Node does not contain geometry."
-msgstr "Нод не содержит геометрии."
+msgstr "Узел не содержит геометрии."
 
 #: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Node does not contain geometry (faces)."
-msgstr "Нод не содержит геометрии (грани)."
+msgstr "Узел не содержит геометрии (грани)."
 
 #: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Faces contain no area!"
@@ -3699,7 +3783,7 @@ msgstr "Создать излучатель из полисетки"
 
 #: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Create Emitter From Node"
-msgstr "Создать излучатель из нода"
+msgstr "Создать излучатель из узла"
 
 #: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Clear Emitter"
@@ -3867,17 +3951,14 @@ msgid "Clear UV"
 msgstr "Очистить UV"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Snap"
 msgstr "Привязка"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Enable Snap"
 msgstr "Активировать привязку"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid"
 msgstr "Сетка"
 
@@ -4488,7 +4569,7 @@ msgstr "Вещицы"
 
 #: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Selection (F)"
-msgstr "Показать выбранный нод (F)"
+msgstr "Показать выбранный узел (F)"
 
 #: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Align with view (Ctrl+Shift+F)"
@@ -4715,20 +4796,51 @@ msgid "StyleBox Preview:"
 msgstr "StyleBox предпросмотр:"
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Texture Region Editor"
-msgstr "Редактор области текстуры"
+#, fuzzy
+msgid "Snap Mode:"
+msgstr "Режим запуска:"
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Scale Region Editor"
-msgstr "Редактор масштабируемой области текстуры"
+msgid "<None>"
+msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid ""
-"No texture in this node.\n"
-"Set a texture to be able to edit region."
+#, fuzzy
+msgid "Pixel Snap"
+msgstr "Использовать попиксельную привязку"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Grid Snap"
+msgstr "Шаг сетки:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Auto Slice"
 msgstr ""
-"В этом ноде нет текстуры.\n"
-"Выберите текстуру, чтобы редактировать область."
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Offset:"
+msgstr "Отступ сетку:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Step:"
+msgstr "Шаг (сек.):"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Separation:"
+msgstr "Разделы:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Texture Region"
+msgstr "Редактор области текстуры"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region Editor"
+msgstr "Редактор области текстуры"
 
 #: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Can't save theme to file:"
@@ -5019,8 +5131,8 @@ msgstr "Действие"
 msgid ""
 "Filters to export non-resource files (comma-separated, e.g.: *.json, *.txt):"
 msgstr ""
-"Фильтр для экспорта не ресурсных файлов (через запятую, например: *.json, "
-"*.txt):"
+"Фильтр для экспорта не ресурсных файлов (через запятую, например: *.json, *."
+"txt):"
 
 #: tools/editor/project_export.cpp
 msgid "Filters to exclude from export (comma-separated, e.g.: *.json, *.txt):"
@@ -5546,7 +5658,7 @@ msgstr "Автозагрузка"
 
 #: tools/editor/project_settings.cpp
 msgid "Node Name:"
-msgstr "Имя Нода:"
+msgstr "Имя Узла:"
 
 #: tools/editor/project_settings.cpp
 msgid "List:"
@@ -5644,7 +5756,7 @@ msgstr ""
 
 #: tools/editor/reparent_dialog.cpp tools/editor/scene_tree_dock.cpp
 msgid "Reparent Node"
-msgstr "Переподчинить нод"
+msgstr "Переподчинить узел"
 
 #: tools/editor/reparent_dialog.cpp
 msgid "Reparent Location (Select new Parent):"
@@ -5724,7 +5836,7 @@ msgid ""
 "of its nodes."
 msgstr ""
 "Невозможно добавить сцену %s, потому что текущая сцена существует в одном из "
-"его нодов."
+"его узлов."
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Instance Scene(s)"
@@ -5736,19 +5848,19 @@ msgstr "Эта операция не может быть произведена
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Move Node In Parent"
-msgstr "Перемещение нода в Родительский"
+msgstr "Перемещение узла в Родительский"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Move Nodes In Parent"
-msgstr "Перемещение нодов в родительский"
+msgstr "Перемещение узлов в Родительский"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Duplicate Node(s)"
-msgstr "Дублирован нод(ы)"
+msgstr "Дублировать узел(узлы)"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Delete Node(s)?"
-msgstr "Удалить нод(ы)?"
+msgstr "Удалить узел(узлы)?"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "This operation can't be done without a scene."
@@ -5756,7 +5868,7 @@ msgstr "Эта операция не может быть выполнена бе
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "This operation requires a single selected node."
-msgstr "Эта операция требует одного выбранного нода."
+msgstr "Эта операция требует одного выбранного узла."
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "This operation can't be done on instanced scenes."
@@ -5772,19 +5884,19 @@ msgstr "Уууу круто!"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Can't operate on nodes from a foreign scene!"
-msgstr "Не могу работать с нодами из внешней сцены!"
+msgstr "Не могу работать с узлами из внешней сцены!"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Can't operate on nodes the current scene inherits from!"
-msgstr "Невозможно работать с нодами текущей сцены, наследуемой откуда-то!"
+msgstr "Невозможно работать с узлами, от которых унаследована текущая сцена!"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Remove Node(s)"
-msgstr "Удалён нод(ы)"
+msgstr "Удалить узел(узлы)"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Create Node"
-msgstr "Создан нод"
+msgstr "Создать узел"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid ""
@@ -5803,16 +5915,20 @@ msgid "Error duplicating scene to save it."
 msgstr "Ошибка дублирования сцены, чтобы сохранить её."
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "New Scene Root"
-msgstr "Новый корень сцены"
+msgid "Edit Groups"
+msgstr "Редактировать группы"
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Edit Connections"
+msgstr "Редактировать связи"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Inherit Scene"
-msgstr "Унаследовать сцену"
+msgid "Delete Node(s)"
+msgstr "Удалить узел(узлы)"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Add Child Node"
-msgstr "Добавить дочерний нод"
+msgstr "Добавить дочерний узел"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Instance Child Scene"
@@ -5823,14 +5939,6 @@ msgid "Change Type"
 msgstr "Изменить тип"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Groups"
-msgstr "Редактировать группы"
-
-#: tools/editor/scene_tree_dock.cpp
-msgid "Edit Connections"
-msgstr "Редактировать связи"
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add Script"
 msgstr "Добавить скрипт"
 
@@ -5843,10 +5951,6 @@ msgid "Save Branch as Scene"
 msgstr "Сохранить ветку, как сцену"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Delete Node(s)"
-msgstr "Удалить нод(ы)"
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add/Create a New Node"
 msgstr "Добавить/создать новый узел"
 
@@ -5855,7 +5959,7 @@ msgid ""
 "Instance a scene file as a Node. Creates an inherited scene if no root node "
 "exists."
 msgstr ""
-"Добавить файл сцены как нод. Создаёт наследуемую сцену, если корневой узел "
+"Добавить файл сцены как узел. Создаёт наследуемую сцену, если корневой узел "
 "не существует."
 
 #: tools/editor/scene_tree_editor.cpp
@@ -5864,7 +5968,7 @@ msgid ""
 "parent first."
 msgstr ""
 "Этот объект не может быть отображён, потому что его родитель скрыт. "
-"Отобразите сначала родительский нод."
+"Отобразите сначала родительский узел."
 
 #: tools/editor/scene_tree_editor.cpp
 msgid "Toggle Spatial Visible"
@@ -5880,15 +5984,15 @@ msgstr "Экземпляр:"
 
 #: tools/editor/scene_tree_editor.cpp
 msgid "Invalid node name, the following characters are not allowed:"
-msgstr "Недопустимые символы в названии нода:"
+msgstr "Некорректное имя узла, следующие символы недопустимы:"
 
 #: tools/editor/scene_tree_editor.cpp
 msgid "Rename Node"
-msgstr "Нод переименован"
+msgstr "Переименовать узел"
 
 #: tools/editor/scene_tree_editor.cpp
 msgid "Scene Tree (Nodes):"
-msgstr "Дерево сцены (ноды):"
+msgstr "Дерево сцены (Узлы):"
 
 #: tools/editor/scene_tree_editor.cpp
 msgid "Editable Children"
@@ -5920,7 +6024,7 @@ msgstr "Очистить!"
 
 #: tools/editor/scene_tree_editor.cpp
 msgid "Select a Node"
-msgstr "Выберете нод"
+msgstr "Выбрать узел"
 
 #: tools/editor/scenes_dock.cpp
 msgid "Same source and destination files, doing nothing."
@@ -5996,7 +6100,7 @@ msgstr "Переключить статус папки как избранной
 
 #: tools/editor/scenes_dock.cpp
 msgid "Instance the selected scene(s) as child of the selected node."
-msgstr "Добавить выбранную сцену(сцены), как потомка выбранного нода."
+msgstr "Добавить выбранную сцену(сцены), как потомка выбранного узла."
 
 #: tools/editor/scenes_dock.cpp
 msgid "Move"
@@ -6072,7 +6176,7 @@ msgstr "Встроенный Скрипт"
 
 #: tools/editor/script_create_dialog.cpp
 msgid "Create Node Script"
-msgstr "Создать скрипт для нода"
+msgstr "Создать скрипт для узла"
 
 #: tools/editor/script_editor_debugger.cpp
 msgid "Bytes:"
@@ -6184,11 +6288,11 @@ msgstr "Прочее"
 
 #: tools/editor/script_editor_debugger.cpp
 msgid "Clicked Control:"
-msgstr "Нажатый нод:"
+msgstr "Нажатый элемент управления:"
 
 #: tools/editor/script_editor_debugger.cpp
 msgid "Clicked Control Type:"
-msgstr "Тип нажатого нода:"
+msgstr "Тип нажатого элемента управления:"
 
 #: tools/editor/script_editor_debugger.cpp
 msgid "Live Edit Root:"
@@ -6196,7 +6300,7 @@ msgstr "Редактирование корня в реальном времен
 
 #: tools/editor/script_editor_debugger.cpp
 msgid "Set From Tree"
-msgstr "Установить из дерева нодов"
+msgstr "Установить из дерева"
 
 #: tools/editor/settings_config_dialog.cpp
 msgid "Shortcuts"
@@ -6238,6 +6342,31 @@ msgstr "Изменена длинна луча"
 msgid "Change Notifier Extents"
 msgstr "Изменены границы уведомителя"
 
+#~ msgid "Change Anim Loop Interpolation"
+#~ msgstr "Изменена интерполяция анимации"
+
+#~ msgid "Enable/Disable interpolation when looping animation."
+#~ msgstr "Включить/отключить интерполяцию при зацикливании анимации."
+
+#~ msgid "Load Layout"
+#~ msgstr "Загрузить макет"
+
+#~ msgid "Scale Region Editor"
+#~ msgstr "Редактор масштабируемой области текстуры"
+
+#~ msgid ""
+#~ "No texture in this node.\n"
+#~ "Set a texture to be able to edit region."
+#~ msgstr ""
+#~ "В этом узле нет текстуры.\n"
+#~ "Выберите текстуру, чтобы редактировать область."
+
+#~ msgid "New Scene Root"
+#~ msgstr "Новый корень сцены"
+
+#~ msgid "Inherit Scene"
+#~ msgstr "Унаследовать сцену"
+
 #~ msgid "Binds (Extra Params):"
 #~ msgstr "Связи (необязательные параметры):"
 
diff --git a/tools/translations/sk.po b/tools/translations/sk.po
index b21333b7f8..94ce24b46c 100644
--- a/tools/translations/sk.po
+++ b/tools/translations/sk.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2016 Juan Linietsky, Ariel Manzur and the Godot community
 # This file is distributed under the same license as the Godot source code.
 #
-# lablazer <avojtus@centrum.sk>, 2016.
+# J08nY <johnenter@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor\n"
-"PO-Revision-Date: 2016-06-11 11:23+0000\n"
-"Last-Translator: lablazer <avojtus@centrum.sk>\n"
+"PO-Revision-Date: 2016-06-25 14:16+0000\n"
+"Last-Translator: J08nY <johnenter@gmail.com>\n"
 "Language-Team: Slovak <https://hosted.weblate.org/projects/godot-engine/"
 "godot/sk/>\n"
 "Language: sk\n"
@@ -19,15 +19,15 @@ msgstr ""
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Invalid type argument to convert(), use TYPE_* constants."
-msgstr ""
+msgstr "Chybný argument convert(), použite TYPE_* konštanty."
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Not enough bytes for decoding bytes, or invalid format."
-msgstr ""
+msgstr "Nedostatok bajtov na dekódovanie, možný chybný formát."
 
 #: modules/gdscript/gd_functions.cpp
 msgid "step argument is zero!"
-msgstr ""
+msgstr "argument \"step\"/krok je nulový!"
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Not a script with an instance"
@@ -241,7 +241,7 @@ msgstr ""
 
 #: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
 msgid "All Recognized"
-msgstr ""
+msgstr "Všetko rozpoznané"
 
 #: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
 msgid "All Files (*)"
@@ -252,64 +252,64 @@ msgstr ""
 #: tools/editor/plugins/script_editor_plugin.cpp tools/editor/quick_open.cpp
 #: tools/editor/scenes_dock.cpp
 msgid "Open"
-msgstr ""
+msgstr "Otvoriť"
 
 #: scene/gui/file_dialog.cpp
 msgid "Open a File"
-msgstr ""
+msgstr "Otvoriť súbor"
 
 #: scene/gui/file_dialog.cpp
 msgid "Open File(s)"
-msgstr ""
+msgstr "Otvoriť súbor(y)"
 
 #: scene/gui/file_dialog.cpp
 msgid "Open a Directory"
-msgstr ""
+msgstr "Otvorit priečinok"
 
 #: scene/gui/file_dialog.cpp
 msgid "Open a File or Directory"
-msgstr ""
+msgstr "Otvoriť súbor / priečinok"
 
 #: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
 #: tools/editor/editor_node.cpp
 #: tools/editor/plugins/animation_player_editor_plugin.cpp
 #: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Save"
-msgstr ""
+msgstr "Uložiť"
 
 #: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
 msgid "Save a File"
-msgstr ""
+msgstr "Uložiť súbor"
 
 #: scene/gui/file_dialog.cpp tools/editor/editor_dir_dialog.cpp
 #: tools/editor/editor_file_dialog.cpp
 msgid "Create Folder"
-msgstr ""
+msgstr "Vytvoriť adresár"
 
 #: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
 #: tools/editor/io_plugins/editor_font_import_plugin.cpp
 #: tools/editor/project_settings.cpp tools/editor/script_create_dialog.cpp
 msgid "Path:"
-msgstr ""
+msgstr "Cesta:"
 
 #: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
 msgid "Directories & Files:"
-msgstr ""
+msgstr "Priečinky a Súbory:"
 
 #: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
 #: tools/editor/script_editor_debugger.cpp
 msgid "File:"
-msgstr ""
+msgstr "Súbor:"
 
 #: scene/gui/file_dialog.cpp tools/editor/editor_file_dialog.cpp
 msgid "Filter:"
-msgstr ""
+msgstr "Filter:"
 
 #: scene/gui/file_dialog.cpp tools/editor/editor_dir_dialog.cpp
 #: tools/editor/editor_file_dialog.cpp tools/editor/editor_plugin_settings.cpp
 #: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Name:"
-msgstr ""
+msgstr "Meno:"
 
 #: scene/gui/file_dialog.cpp tools/editor/editor_dir_dialog.cpp
 #: tools/editor/editor_file_dialog.cpp
@@ -323,29 +323,29 @@ msgstr ""
 #: scene/gui/input_action.cpp tools/editor/project_settings.cpp
 #: tools/editor/settings_config_dialog.cpp
 msgid "Shift+"
-msgstr ""
+msgstr "Shift+"
 
 #: scene/gui/input_action.cpp tools/editor/project_settings.cpp
 #: tools/editor/settings_config_dialog.cpp
 msgid "Alt+"
-msgstr ""
+msgstr "Alt+"
 
 #: scene/gui/input_action.cpp
 msgid "Ctrl+"
-msgstr ""
+msgstr "Ctrl+"
 
 #: scene/gui/input_action.cpp tools/editor/project_settings.cpp
 #: tools/editor/settings_config_dialog.cpp
 msgid "Meta+"
-msgstr ""
+msgstr "Meta+"
 
 #: scene/gui/input_action.cpp tools/editor/project_settings.cpp
 msgid "Device"
-msgstr ""
+msgstr "Zariadenie"
 
 #: scene/gui/input_action.cpp tools/editor/project_settings.cpp
 msgid "Button"
-msgstr ""
+msgstr "Tlačidlo"
 
 #: scene/gui/input_action.cpp tools/editor/project_settings.cpp
 msgid "Left Button."
@@ -369,7 +369,7 @@ msgstr ""
 
 #: scene/gui/input_action.cpp tools/editor/project_settings.cpp
 msgid "Axis"
-msgstr ""
+msgstr "Os"
 
 #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
 #: tools/editor/plugins/script_editor_plugin.cpp
@@ -382,7 +382,7 @@ msgstr ""
 #: tools/editor/plugins/shader_editor_plugin.cpp
 #: tools/editor/property_editor.cpp tools/editor/resources_dock.cpp
 msgid "Copy"
-msgstr ""
+msgstr "Kopírovať"
 
 #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
 #: tools/editor/plugins/resource_preloader_editor_plugin.cpp
@@ -391,7 +391,7 @@ msgstr ""
 #: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 #: tools/editor/property_editor.cpp tools/editor/resources_dock.cpp
 msgid "Paste"
-msgstr ""
+msgstr "Vložiť"
 
 #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp
 #: tools/editor/plugins/script_editor_plugin.cpp
@@ -411,7 +411,7 @@ msgstr ""
 #: tools/editor/plugins/script_editor_plugin.cpp
 #: tools/editor/plugins/shader_editor_plugin.cpp
 msgid "Undo"
-msgstr ""
+msgstr "Späť"
 
 #: scene/gui/popup.cpp
 msgid ""
@@ -454,7 +454,7 @@ msgstr ""
 
 #: tools/editor/animation_editor.cpp
 msgid "All Selection"
-msgstr ""
+msgstr "Všetky vybrané"
 
 #: tools/editor/animation_editor.cpp
 msgid "Move Add Key"
@@ -644,10 +644,6 @@ msgid "Change Anim Loop"
 msgstr ""
 
 #: tools/editor/animation_editor.cpp
-msgid "Change Anim Loop Interpolation"
-msgstr ""
-
-#: tools/editor/animation_editor.cpp
 msgid "Anim Create Typed Value Key"
 msgstr ""
 
@@ -688,10 +684,6 @@ msgid "Enable/Disable looping in animation."
 msgstr ""
 
 #: tools/editor/animation_editor.cpp
-msgid "Enable/Disable interpolation when looping animation."
-msgstr ""
-
-#: tools/editor/animation_editor.cpp
 msgid "Add new tracks."
 msgstr ""
 
@@ -809,7 +801,7 @@ msgstr ""
 
 #: tools/editor/asset_library_editor_plugin.cpp
 msgid "Site:"
-msgstr ""
+msgstr "Stránka:"
 
 #: tools/editor/asset_library_editor_plugin.cpp
 msgid "Support.."
@@ -821,7 +813,7 @@ msgstr ""
 
 #: tools/editor/asset_library_editor_plugin.cpp
 msgid "Community"
-msgstr ""
+msgstr "Komunita"
 
 #: tools/editor/asset_library_editor_plugin.cpp
 msgid "Testing"
@@ -956,7 +948,7 @@ msgid "Method in target Node must be specified!"
 msgstr ""
 
 #: tools/editor/connections_dialog.cpp
-msgid "Conect To Node:"
+msgid "Connect To Node:"
 msgstr ""
 
 #: tools/editor/connections_dialog.cpp tools/editor/groups_editor.cpp
@@ -1169,6 +1161,46 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Back"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Forward"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Refresh"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Hidden Files"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Favorite"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Mode"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Focus Path"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Mode Favorite Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Mode Favorite Down"
+msgstr ""
+
 #: tools/editor/editor_file_dialog.cpp tools/editor/scenes_dock.cpp
 msgid "Favorites:"
 msgstr ""
@@ -1195,11 +1227,11 @@ msgstr ""
 
 #: tools/editor/editor_help.cpp
 msgid "Class List:"
-msgstr ""
+msgstr "Zoznam tried:"
 
 #: tools/editor/editor_help.cpp tools/editor/property_editor.cpp
 msgid "Class:"
-msgstr ""
+msgstr "Trieda:"
 
 #: tools/editor/editor_help.cpp tools/editor/scene_tree_editor.cpp
 #: tools/editor/script_create_dialog.cpp
@@ -1228,15 +1260,15 @@ msgstr ""
 
 #: tools/editor/editor_help.cpp
 msgid "Signals:"
-msgstr ""
+msgstr "Signály:"
 
 #: tools/editor/editor_help.cpp
 msgid "Constants:"
-msgstr ""
+msgstr "Konštanty:"
 
 #: tools/editor/editor_help.cpp tools/editor/script_editor_debugger.cpp
 msgid "Description:"
-msgstr ""
+msgstr "Popis:"
 
 #: tools/editor/editor_help.cpp
 msgid "Method Description:"
@@ -1422,8 +1454,23 @@ msgstr ""
 
 #: tools/editor/editor_node.cpp
 msgid ""
-"No main scene has ever been defined.\n"
-"Select one from \"Project Settings\" under the 'application' category."
+"No main scene has ever been defined, select one?\n"
+"You can change it later in later in \"Project Settings\" under the "
+"'application' category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' does not exist, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' is not a scene file, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
 msgstr ""
 
 #: tools/editor/editor_node.cpp
@@ -1516,6 +1563,10 @@ msgid ""
 "(Unsaved changes will be lost)"
 msgstr ""
 
+#: tools/editor/editor_node.cpp
+msgid "Pick a Manu Scene"
+msgstr ""
+
 #: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
 msgid "Ugh"
 msgstr ""
@@ -1539,7 +1590,7 @@ msgid "Save Layout"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
-msgid "Load Layout"
+msgid "Delete Layout"
 msgstr ""
 
 #: tools/editor/editor_node.cpp tools/editor/project_export.cpp
@@ -1547,10 +1598,6 @@ msgid "Default"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
-msgid "Delete Layout"
-msgstr ""
-
-#: tools/editor/editor_node.cpp
 msgid "Switch Scene Tab"
 msgstr ""
 
@@ -1580,6 +1627,14 @@ msgid "Distraction Free Mode"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
+msgid "Next tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Previous tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
 msgid "Operations with scene files."
 msgstr ""
 
@@ -2122,6 +2177,12 @@ msgid "No target font resource!"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"Invalid file extension.\n"
+"Please use .fnt."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Can't load/process source font."
 msgstr ""
 
@@ -2357,7 +2418,7 @@ msgid "Couldn't load post-import script:"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
-msgid "Invalid/broken script for post-import:"
+msgid "Invalid/broken script for post-import (check console):"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -3020,13 +3081,11 @@ msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Offset:"
 msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Step:"
 msgstr ""
 
@@ -3142,7 +3201,6 @@ msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Show Grid"
 msgstr ""
 
@@ -3395,6 +3453,10 @@ msgid "MeshInstance lacks a Mesh!"
 msgstr ""
 
 #: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh has not surface to create outlines from!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
 msgid "Could not create outline!"
 msgstr ""
 
@@ -3756,17 +3818,14 @@ msgid "Clear UV"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Snap"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Enable Snap"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid"
 msgstr ""
 
@@ -4602,17 +4661,44 @@ msgid "StyleBox Preview:"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Texture Region Editor"
+msgid "Snap Mode:"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Scale Region Editor"
+msgid "<None>"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid ""
-"No texture in this node.\n"
-"Set a texture to be able to edit region."
+msgid "Pixel Snap"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Grid Snap"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Auto Slice"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Offset:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Step:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Separation:"
+msgstr "Popis:"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region Editor"
 msgstr ""
 
 #: tools/editor/plugins/theme_editor_plugin.cpp
@@ -5674,31 +5760,27 @@ msgid "Error duplicating scene to save it."
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "New Scene Root"
-msgstr ""
-
-#: tools/editor/scene_tree_dock.cpp
-msgid "Inherit Scene"
+msgid "Edit Groups"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Add Child Node"
+msgid "Edit Connections"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Instance Child Scene"
+msgid "Delete Node(s)"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Change Type"
+msgid "Add Child Node"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Groups"
+msgid "Instance Child Scene"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Connections"
+msgid "Change Type"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
@@ -5714,10 +5796,6 @@ msgid "Save Branch as Scene"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Delete Node(s)"
-msgstr ""
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add/Create a New Node"
 msgstr ""
 
diff --git a/tools/translations/tools.pot b/tools/translations/tools.pot
index 854f8fef78..a5385f3bad 100644
--- a/tools/translations/tools.pot
+++ b/tools/translations/tools.pot
@@ -631,10 +631,6 @@ msgid "Change Anim Loop"
 msgstr ""
 
 #: tools/editor/animation_editor.cpp
-msgid "Change Anim Loop Interpolation"
-msgstr ""
-
-#: tools/editor/animation_editor.cpp
 msgid "Anim Create Typed Value Key"
 msgstr ""
 
@@ -675,10 +671,6 @@ msgid "Enable/Disable looping in animation."
 msgstr ""
 
 #: tools/editor/animation_editor.cpp
-msgid "Enable/Disable interpolation when looping animation."
-msgstr ""
-
-#: tools/editor/animation_editor.cpp
 msgid "Add new tracks."
 msgstr ""
 
@@ -1156,6 +1148,46 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Back"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Forward"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Refresh"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Hidden Files"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Favorite"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Mode"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Focus Path"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Move Favorite Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Move Favorite Down"
+msgstr ""
+
 #: tools/editor/editor_file_dialog.cpp tools/editor/scenes_dock.cpp
 msgid "Favorites:"
 msgstr ""
@@ -1409,8 +1441,23 @@ msgstr ""
 
 #: tools/editor/editor_node.cpp
 msgid ""
-"No main scene has ever been defined.\n"
-"Select one from \"Project Settings\" under the 'application' category."
+"No main scene has ever been defined, select one?\n"
+"You can change it later in later in \"Project Settings\" under the "
+"'application' category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' does not exist, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' is not a scene file, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
 msgstr ""
 
 #: tools/editor/editor_node.cpp
@@ -1503,6 +1550,10 @@ msgid ""
 "(Unsaved changes will be lost)"
 msgstr ""
 
+#: tools/editor/editor_node.cpp
+msgid "Pick a Manu Scene"
+msgstr ""
+
 #: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
 msgid "Ugh"
 msgstr ""
@@ -1563,6 +1614,14 @@ msgid "Distraction Free Mode"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
+msgid "Next tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Previous tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
 msgid "Operations with scene files."
 msgstr ""
 
@@ -2346,7 +2405,7 @@ msgid "Couldn't load post-import script:"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
-msgid "Invalid/broken script for post-import:"
+msgid "Invalid/broken script for post-import (check console):"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -3009,13 +3068,11 @@ msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Offset:"
 msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Step:"
 msgstr ""
 
@@ -3131,7 +3188,6 @@ msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Show Grid"
 msgstr ""
 
@@ -3384,6 +3440,10 @@ msgid "MeshInstance lacks a Mesh!"
 msgstr ""
 
 #: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh has not surface to create outlines from!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
 msgid "Could not create outline!"
 msgstr ""
 
@@ -3745,17 +3805,14 @@ msgid "Clear UV"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Snap"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Enable Snap"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid"
 msgstr ""
 
@@ -4591,17 +4648,43 @@ msgid "StyleBox Preview:"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Texture Region Editor"
+msgid "Snap Mode:"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Scale Region Editor"
+msgid "<None>"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid ""
-"No texture in this node.\n"
-"Set a texture to be able to edit region."
+msgid "Pixel Snap"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Grid Snap"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Auto Slice"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Offset:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Step:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Separation:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region Editor"
 msgstr ""
 
 #: tools/editor/plugins/theme_editor_plugin.cpp
diff --git a/tools/translations/zh_CN.po b/tools/translations/zh_CN.po
index 70b7845f9d..87d58db19e 100644
--- a/tools/translations/zh_CN.po
+++ b/tools/translations/zh_CN.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the Godot source code.
 #
 # Geequlim <geequlim@gmail.com>, 2016.
+# 纯洁的坏蛋 <tqj.zyy@gmail.com>, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2016-06-11 11:37+0000\n"
-"Last-Translator: Geequlim <geequlim@gmail.com>\n"
+"PO-Revision-Date: 2016-06-25 17:02+0000\n"
+"Last-Translator: 纯洁的坏蛋 <tqj.zyy@gmail.com>\n"
 "Language-Team: Chinese (China) <https://hosted.weblate.org/projects/godot-"
 "engine/godot/zh_CN/>\n"
 "Language: zh_CN\n"
@@ -29,29 +30,28 @@ msgstr ""
 
 #: modules/gdscript/gd_functions.cpp
 msgid "step argument is zero!"
-msgstr ""
+msgstr "step参数为0！"
 
 #: modules/gdscript/gd_functions.cpp
-#, fuzzy
 msgid "Not a script with an instance"
-msgstr "没有选用要实例化的场景！"
+msgstr "脚本没有实例化"
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Not based on a script"
-msgstr ""
+msgstr "没有基于脚本"
 
 #: modules/gdscript/gd_functions.cpp
-#, fuzzy
 msgid "Not based on a resource file"
-msgstr "请设置目标字体资源！"
+msgstr "不是一个资源文件"
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Invalid instance dictionary format (missing @path)"
-msgstr ""
+msgstr "实例字典格式不正确（缺少@path）"
 
 #: modules/gdscript/gd_functions.cpp
+#, fuzzy
 msgid "Invalid instance dictionary format (can't load script at @path)"
-msgstr ""
+msgstr "实例字典格式不正确（无法加载脚本@path）"
 
 #: modules/gdscript/gd_functions.cpp
 msgid "Invalid instance dictionary format (invalid script at @path)"
@@ -676,11 +676,6 @@ msgid "Change Anim Loop"
 msgstr "修改动画循环"
 
 #: tools/editor/animation_editor.cpp
-#, fuzzy
-msgid "Change Anim Loop Interpolation"
-msgstr "修改动画循环"
-
-#: tools/editor/animation_editor.cpp
 msgid "Anim Create Typed Value Key"
 msgstr ""
 
@@ -721,11 +716,6 @@ msgid "Enable/Disable looping in animation."
 msgstr "启用/禁用循环"
 
 #: tools/editor/animation_editor.cpp
-#, fuzzy
-msgid "Enable/Disable interpolation when looping animation."
-msgstr "启用/禁用循环"
-
-#: tools/editor/animation_editor.cpp
 msgid "Add new tracks."
 msgstr "新建轨道"
 
@@ -991,7 +981,7 @@ msgstr "必须设置方法的对象节点！"
 
 #: tools/editor/connections_dialog.cpp
 #, fuzzy
-msgid "Conect To Node:"
+msgid "Connect To Node:"
 msgstr "连接到节点："
 
 #: tools/editor/connections_dialog.cpp tools/editor/groups_editor.cpp
@@ -1207,6 +1197,51 @@ msgstr "选择目录"
 msgid "Choose"
 msgstr "选择"
 
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Back"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Forward"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Refresh"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Hidden Files"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Toggle Favorite"
+msgstr "切换断点"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Toggle Mode"
+msgstr "切换注释"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Focus Path"
+msgstr "拷贝路径"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Mode Favorite Up"
+msgstr "收藏："
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Mode Favorite Down"
+msgstr "向下移动"
+
 #: tools/editor/editor_file_dialog.cpp tools/editor/scenes_dock.cpp
 msgid "Favorites:"
 msgstr "收藏："
@@ -1459,9 +1494,31 @@ msgid "There is no defined scene to run."
 msgstr "没有设置要执行的场景。"
 
 #: tools/editor/editor_node.cpp
+#, fuzzy
+msgid ""
+"No main scene has ever been defined, select one?\n"
+"You can change it later in later in \"Project Settings\" under the "
+"'application' category."
+msgstr ""
+"尚未定义主场景。\n"
+"请在项目设置的application分类下设置选择主场景。"
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid ""
+"Selected scene '%s' does not exist, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+"尚未定义主场景。\n"
+"请在项目设置的application分类下设置选择主场景。"
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
 msgid ""
-"No main scene has ever been defined.\n"
-"Select one from \"Project Settings\" under the 'application' category."
+"Selected scene '%s' is not a scene file, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
 msgstr ""
 "尚未定义主场景。\n"
 "请在项目设置的application分类下设置选择主场景。"
@@ -1556,6 +1613,11 @@ msgid ""
 "(Unsaved changes will be lost)"
 msgstr "退出到项目管理窗口(未保存的修改将丢失)？"
 
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Pick a Manu Scene"
+msgstr "主场景"
+
 #: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
 msgid "Ugh"
 msgstr "额"
@@ -1580,18 +1642,14 @@ msgid "Save Layout"
 msgstr "保存布局"
 
 #: tools/editor/editor_node.cpp
-msgid "Load Layout"
-msgstr "加载布局"
+msgid "Delete Layout"
+msgstr "删除布局"
 
 #: tools/editor/editor_node.cpp tools/editor/project_export.cpp
 msgid "Default"
 msgstr "默认"
 
 #: tools/editor/editor_node.cpp
-msgid "Delete Layout"
-msgstr "删除布局"
-
-#: tools/editor/editor_node.cpp
 msgid "Switch Scene Tab"
 msgstr "切换场景标签页"
 
@@ -1621,6 +1679,16 @@ msgid "Distraction Free Mode"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Next tab"
+msgstr "下一项"
+
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Previous tab"
+msgstr "上一个目录："
+
+#: tools/editor/editor_node.cpp
 msgid "Operations with scene files."
 msgstr "操作场景文件。"
 
@@ -2172,6 +2240,12 @@ msgid "No target font resource!"
 msgstr "请设置目标字体资源！"
 
 #: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"Invalid file extension.\n"
+"Please use .fnt."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Can't load/process source font."
 msgstr "无法加载/处理源字体。"
 
@@ -2409,7 +2483,7 @@ msgid "Couldn't load post-import script:"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
-msgid "Invalid/broken script for post-import:"
+msgid "Invalid/broken script for post-import (check console):"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -3075,13 +3149,11 @@ msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Offset:"
 msgstr "网格偏移量："
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Step:"
 msgstr "网格大小："
 
@@ -3197,7 +3269,6 @@ msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Show Grid"
 msgstr "显示网格"
 
@@ -3450,6 +3521,10 @@ msgid "MeshInstance lacks a Mesh!"
 msgstr ""
 
 #: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh has not surface to create outlines from!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
 msgid "Could not create outline!"
 msgstr ""
 
@@ -3811,17 +3886,14 @@ msgid "Clear UV"
 msgstr "清除UV"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Snap"
 msgstr "吸附"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Enable Snap"
 msgstr "启用吸附"
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid"
 msgstr "网格"
 
@@ -4661,18 +4733,50 @@ msgid "StyleBox Preview:"
 msgstr "StyleBox预览："
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Texture Region Editor"
-msgstr "纹理区域编辑"
+#, fuzzy
+msgid "Snap Mode:"
+msgstr "运行模式："
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Scale Region Editor"
-msgstr "缩放区域编辑"
+msgid "<None>"
+msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid ""
-"No texture in this node.\n"
-"Set a texture to be able to edit region."
-msgstr "此节点没有贴图，请先为它设置贴图后再试。"
+msgid "Pixel Snap"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Grid Snap"
+msgstr "网格大小："
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Auto Slice"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Offset:"
+msgstr "网格偏移量："
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Step:"
+msgstr "步长（秒）"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Separation:"
+msgstr "选项："
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+#, fuzzy
+msgid "Texture Region"
+msgstr "纹理区域编辑"
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region Editor"
+msgstr "纹理区域编辑"
 
 #: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Can't save theme to file:"
@@ -5739,12 +5843,16 @@ msgid "Error duplicating scene to save it."
 msgstr "复制场景出错。"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "New Scene Root"
-msgstr "创建场景根节点"
+msgid "Edit Groups"
+msgstr "编辑分组"
+
+#: tools/editor/scene_tree_dock.cpp
+msgid "Edit Connections"
+msgstr "编辑事件连接"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Inherit Scene"
-msgstr "继承场景"
+msgid "Delete Node(s)"
+msgstr "删除节点"
 
 #: tools/editor/scene_tree_dock.cpp
 msgid "Add Child Node"
@@ -5759,14 +5867,6 @@ msgid "Change Type"
 msgstr "更改类型"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Groups"
-msgstr "编辑分组"
-
-#: tools/editor/scene_tree_dock.cpp
-msgid "Edit Connections"
-msgstr "编辑事件连接"
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add Script"
 msgstr "添加脚本"
 
@@ -5779,10 +5879,6 @@ msgid "Save Branch as Scene"
 msgstr "将分支保存为场景"
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Delete Node(s)"
-msgstr "删除节点"
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add/Create a New Node"
 msgstr "添加/创建节点"
 
@@ -6170,6 +6266,31 @@ msgstr ""
 msgid "Change Notifier Extents"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Change Anim Loop Interpolation"
+#~ msgstr "修改动画循环"
+
+#, fuzzy
+#~ msgid "Enable/Disable interpolation when looping animation."
+#~ msgstr "启用/禁用循环"
+
+#~ msgid "Load Layout"
+#~ msgstr "加载布局"
+
+#~ msgid "Scale Region Editor"
+#~ msgstr "缩放区域编辑"
+
+#~ msgid ""
+#~ "No texture in this node.\n"
+#~ "Set a texture to be able to edit region."
+#~ msgstr "此节点没有贴图，请先为它设置贴图后再试。"
+
+#~ msgid "New Scene Root"
+#~ msgstr "创建场景根节点"
+
+#~ msgid "Inherit Scene"
+#~ msgstr "继承场景"
+
 #~ msgid "Binds (Extra Params):"
 #~ msgstr "绑定（附加参数）："
 
diff --git a/tools/translations/zh_HK.po b/tools/translations/zh_HK.po
index 8f6476594b..e675cf53eb 100644
--- a/tools/translations/zh_HK.po
+++ b/tools/translations/zh_HK.po
@@ -639,10 +639,6 @@ msgid "Change Anim Loop"
 msgstr ""
 
 #: tools/editor/animation_editor.cpp
-msgid "Change Anim Loop Interpolation"
-msgstr ""
-
-#: tools/editor/animation_editor.cpp
 msgid "Anim Create Typed Value Key"
 msgstr ""
 
@@ -683,10 +679,6 @@ msgid "Enable/Disable looping in animation."
 msgstr ""
 
 #: tools/editor/animation_editor.cpp
-msgid "Enable/Disable interpolation when looping animation."
-msgstr ""
-
-#: tools/editor/animation_editor.cpp
 msgid "Add new tracks."
 msgstr ""
 
@@ -952,8 +944,9 @@ msgid "Method in target Node must be specified!"
 msgstr ""
 
 #: tools/editor/connections_dialog.cpp
-msgid "Conect To Node:"
-msgstr ""
+#, fuzzy
+msgid "Connect To Node:"
+msgstr "連到"
 
 #: tools/editor/connections_dialog.cpp tools/editor/groups_editor.cpp
 #: tools/editor/plugins/item_list_editor_plugin.cpp
@@ -1166,6 +1159,49 @@ msgstr "選擇資料夾"
 msgid "Choose"
 msgstr "選擇"
 
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Back"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Forward"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Refresh"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Hidden Files"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Favorite"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Mode"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Focus Path"
+msgstr "複製"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Mode Favorite Up"
+msgstr "上移"
+
+#: tools/editor/editor_file_dialog.cpp
+#, fuzzy
+msgid "Mode Favorite Down"
+msgstr "下移"
+
 #: tools/editor/editor_file_dialog.cpp tools/editor/scenes_dock.cpp
 msgid "Favorites:"
 msgstr ""
@@ -1420,8 +1456,23 @@ msgstr ""
 
 #: tools/editor/editor_node.cpp
 msgid ""
-"No main scene has ever been defined.\n"
-"Select one from \"Project Settings\" under the 'application' category."
+"No main scene has ever been defined, select one?\n"
+"You can change it later in later in \"Project Settings\" under the "
+"'application' category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' does not exist, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' is not a scene file, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
 msgstr ""
 
 #: tools/editor/editor_node.cpp
@@ -1514,6 +1565,11 @@ msgid ""
 "(Unsaved changes will be lost)"
 msgstr ""
 
+#: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Pick a Manu Scene"
+msgstr "儲存場景"
+
 #: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
 msgid "Ugh"
 msgstr ""
@@ -1537,7 +1593,7 @@ msgid "Save Layout"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
-msgid "Load Layout"
+msgid "Delete Layout"
 msgstr ""
 
 #: tools/editor/editor_node.cpp tools/editor/project_export.cpp
@@ -1545,10 +1601,6 @@ msgid "Default"
 msgstr "預設"
 
 #: tools/editor/editor_node.cpp
-msgid "Delete Layout"
-msgstr ""
-
-#: tools/editor/editor_node.cpp
 msgid "Switch Scene Tab"
 msgstr ""
 
@@ -1578,6 +1630,15 @@ msgid "Distraction Free Mode"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
+#, fuzzy
+msgid "Next tab"
+msgstr "下一個"
+
+#: tools/editor/editor_node.cpp
+msgid "Previous tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
 msgid "Operations with scene files."
 msgstr ""
 
@@ -2124,6 +2185,12 @@ msgid "No target font resource!"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"Invalid file extension.\n"
+"Please use .fnt."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Can't load/process source font."
 msgstr ""
 
@@ -2359,7 +2426,7 @@ msgid "Couldn't load post-import script:"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
-msgid "Invalid/broken script for post-import:"
+msgid "Invalid/broken script for post-import (check console):"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -3023,13 +3090,11 @@ msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Offset:"
 msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Step:"
 msgstr ""
 
@@ -3145,7 +3210,6 @@ msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Show Grid"
 msgstr ""
 
@@ -3398,6 +3462,10 @@ msgid "MeshInstance lacks a Mesh!"
 msgstr ""
 
 #: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh has not surface to create outlines from!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
 msgid "Could not create outline!"
 msgstr ""
 
@@ -3759,17 +3827,14 @@ msgid "Clear UV"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Snap"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Enable Snap"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid"
 msgstr ""
 
@@ -4605,17 +4670,43 @@ msgid "StyleBox Preview:"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Texture Region Editor"
+msgid "Snap Mode:"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Scale Region Editor"
+msgid "<None>"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid ""
-"No texture in this node.\n"
-"Set a texture to be able to edit region."
+msgid "Pixel Snap"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Grid Snap"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Auto Slice"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Offset:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Step:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Separation:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region Editor"
 msgstr ""
 
 #: tools/editor/plugins/theme_editor_plugin.cpp
@@ -5677,31 +5768,27 @@ msgid "Error duplicating scene to save it."
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "New Scene Root"
-msgstr ""
-
-#: tools/editor/scene_tree_dock.cpp
-msgid "Inherit Scene"
+msgid "Edit Groups"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Add Child Node"
+msgid "Edit Connections"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Instance Child Scene"
+msgid "Delete Node(s)"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Change Type"
+msgid "Add Child Node"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Groups"
+msgid "Instance Child Scene"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Connections"
+msgid "Change Type"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
@@ -5717,10 +5804,6 @@ msgid "Save Branch as Scene"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Delete Node(s)"
-msgstr ""
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add/Create a New Node"
 msgstr ""
 
diff --git a/tools/translations/zh_TW.po b/tools/translations/zh_TW.po
index 64399c4826..f2d1b44987 100644
--- a/tools/translations/zh_TW.po
+++ b/tools/translations/zh_TW.po
@@ -643,10 +643,6 @@ msgid "Change Anim Loop"
 msgstr ""
 
 #: tools/editor/animation_editor.cpp
-msgid "Change Anim Loop Interpolation"
-msgstr ""
-
-#: tools/editor/animation_editor.cpp
 msgid "Anim Create Typed Value Key"
 msgstr ""
 
@@ -687,10 +683,6 @@ msgid "Enable/Disable looping in animation."
 msgstr ""
 
 #: tools/editor/animation_editor.cpp
-msgid "Enable/Disable interpolation when looping animation."
-msgstr ""
-
-#: tools/editor/animation_editor.cpp
 msgid "Add new tracks."
 msgstr ""
 
@@ -955,7 +947,7 @@ msgid "Method in target Node must be specified!"
 msgstr ""
 
 #: tools/editor/connections_dialog.cpp
-msgid "Conect To Node:"
+msgid "Connect To Node:"
 msgstr ""
 
 #: tools/editor/connections_dialog.cpp tools/editor/groups_editor.cpp
@@ -1168,6 +1160,46 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Back"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Forward"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Go Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Refresh"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Hidden Files"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Favorite"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Toggle Mode"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Focus Path"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Mode Favorite Up"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
+msgid "Mode Favorite Down"
+msgstr ""
+
 #: tools/editor/editor_file_dialog.cpp tools/editor/scenes_dock.cpp
 msgid "Favorites:"
 msgstr ""
@@ -1421,8 +1453,23 @@ msgstr ""
 
 #: tools/editor/editor_node.cpp
 msgid ""
-"No main scene has ever been defined.\n"
-"Select one from \"Project Settings\" under the 'application' category."
+"No main scene has ever been defined, select one?\n"
+"You can change it later in later in \"Project Settings\" under the "
+"'application' category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' does not exist, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid ""
+"Selected scene '%s' is not a scene file, select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
 msgstr ""
 
 #: tools/editor/editor_node.cpp
@@ -1515,6 +1562,10 @@ msgid ""
 "(Unsaved changes will be lost)"
 msgstr ""
 
+#: tools/editor/editor_node.cpp
+msgid "Pick a Manu Scene"
+msgstr ""
+
 #: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
 msgid "Ugh"
 msgstr ""
@@ -1538,7 +1589,7 @@ msgid "Save Layout"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
-msgid "Load Layout"
+msgid "Delete Layout"
 msgstr ""
 
 #: tools/editor/editor_node.cpp tools/editor/project_export.cpp
@@ -1546,10 +1597,6 @@ msgid "Default"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
-msgid "Delete Layout"
-msgstr ""
-
-#: tools/editor/editor_node.cpp
 msgid "Switch Scene Tab"
 msgstr ""
 
@@ -1579,6 +1626,14 @@ msgid "Distraction Free Mode"
 msgstr ""
 
 #: tools/editor/editor_node.cpp
+msgid "Next tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
+msgid "Previous tab"
+msgstr ""
+
+#: tools/editor/editor_node.cpp
 msgid "Operations with scene files."
 msgstr ""
 
@@ -2121,6 +2176,12 @@ msgid "No target font resource!"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"Invalid file extension.\n"
+"Please use .fnt."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Can't load/process source font."
 msgstr ""
 
@@ -2356,7 +2417,7 @@ msgid "Couldn't load post-import script:"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
-msgid "Invalid/broken script for post-import:"
+msgid "Invalid/broken script for post-import (check console):"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -3019,13 +3080,11 @@ msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Offset:"
 msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid Step:"
 msgstr ""
 
@@ -3141,7 +3200,6 @@ msgstr ""
 
 #: tools/editor/plugins/canvas_item_editor_plugin.cpp
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Show Grid"
 msgstr ""
 
@@ -3394,6 +3452,10 @@ msgid "MeshInstance lacks a Mesh!"
 msgstr ""
 
 #: tools/editor/plugins/mesh_instance_editor_plugin.cpp
+msgid "Mesh has not surface to create outlines from!"
+msgstr ""
+
+#: tools/editor/plugins/mesh_instance_editor_plugin.cpp
 msgid "Could not create outline!"
 msgstr ""
 
@@ -3755,17 +3817,14 @@ msgid "Clear UV"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Snap"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Enable Snap"
 msgstr ""
 
 #: tools/editor/plugins/polygon_2d_editor_plugin.cpp
-#: tools/editor/plugins/texture_region_editor_plugin.cpp
 msgid "Grid"
 msgstr ""
 
@@ -4601,17 +4660,43 @@ msgid "StyleBox Preview:"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Texture Region Editor"
+msgid "Snap Mode:"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid "Scale Region Editor"
+msgid "<None>"
 msgstr ""
 
 #: tools/editor/plugins/texture_region_editor_plugin.cpp
-msgid ""
-"No texture in this node.\n"
-"Set a texture to be able to edit region."
+msgid "Pixel Snap"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Grid Snap"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Auto Slice"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Offset:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Step:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Separation:"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region"
+msgstr ""
+
+#: tools/editor/plugins/texture_region_editor_plugin.cpp
+msgid "Texture Region Editor"
 msgstr ""
 
 #: tools/editor/plugins/theme_editor_plugin.cpp
@@ -5673,31 +5758,27 @@ msgid "Error duplicating scene to save it."
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "New Scene Root"
-msgstr ""
-
-#: tools/editor/scene_tree_dock.cpp
-msgid "Inherit Scene"
+msgid "Edit Groups"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Add Child Node"
+msgid "Edit Connections"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Instance Child Scene"
+msgid "Delete Node(s)"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Change Type"
+msgid "Add Child Node"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Groups"
+msgid "Instance Child Scene"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Edit Connections"
+msgid "Change Type"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
@@ -5713,10 +5794,6 @@ msgid "Save Branch as Scene"
 msgstr ""
 
 #: tools/editor/scene_tree_dock.cpp
-msgid "Delete Node(s)"
-msgstr ""
-
-#: tools/editor/scene_tree_dock.cpp
 msgid "Add/Create a New Node"
 msgstr ""