diff --git a/crop-thumbnails.php b/crop-thumbnails.php
index e8c1067..2710f3d 100644
--- a/crop-thumbnails.php
+++ b/crop-thumbnails.php
@@ -1,12 +1,12 @@
 <?php
-/** 
+/**
  * Plugin name: Crop Thumbnails
  * Plugin URI: http://wordpress.org/extend/plugins/crop-thumbnails/
  * Author: Volkmar Kantor
  * Author URI: http://www.totalmedial.de
- * Version: 0.8.4
+ * Version: 0.10.0
  * Description: Crop your thumbnails, the easy way.
- * 
+ *
  * License: GPL v3
  * Copyright 2012  Volkmar Kantor  (email : info@totalmedial.de)
 
@@ -19,19 +19,19 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 //cpt - stands for crop-post-thumbnail
 define('CROP_THUMBS_LANG','cpt_lang');
-define('CROP_THUMBS_VERSION','0.8.4');
+define('CROP_THUMBS_VERSION','0.10.0');
 
 function cpt_plugin_init() {
 	load_plugin_textdomain( CROP_THUMBS_LANG, false, dirname( plugin_basename( __FILE__ ) ) . '/lang/' );
-	
-	__('Crop your thumbnails, the easy way.');//have to be the same as the plugins-description - for automatic integration into poedit 
+
+	__('Crop your thumbnails, the easy way.');//have to be the same as the plugins-description - for automatic integration into poedit
 }
 add_action('plugins_loaded', 'cpt_plugin_init');
 
@@ -46,5 +46,6 @@ function cptGetWpVersion() {
 
 include_once(dirname(__FILE__).'/functions/settings.php');
 include_once(dirname(__FILE__).'/functions/editor.php');
+include_once(dirname(__FILE__).'/functions/backendpreparer.php');
 include_once(dirname(__FILE__).'/functions/save.php');
-?>
\ No newline at end of file
+?>
diff --git a/css/cpt-window.css b/css/cpt-window.css
index b5d16eb..53dabf7 100644
--- a/css/cpt-window.css
+++ b/css/cpt-window.css
@@ -16,6 +16,7 @@
 .thumbnail-list li.active { background-color:#aad6f4; border:1px solid #aad6f4; }
 .thumbnail-list li span { display:block; font-size:0.8em; }
 .thumbnail-list li img { max-width:100%; height: auto; max-height:250px;}
+.thumbnail-list li h3 { font-size:1em; }
 .thumbnail-list li .lowResWarning,
 .thumbnail-list li .badParameterWarning { font-style: italic; color:#990000;}
 
diff --git a/css/options.css b/css/options.css
index bd71b7f..6c2c600 100644
--- a/css/options.css
+++ b/css/options.css
@@ -1,2 +1,15 @@
 .cpt_settings_paypal { border:1px solid #298CBA; border-radius:3px; background-color:#f6f6f6; max-width:30em; padding:0 0.5em; margin:2em 0; text-align:center; }
-.cpt_settings_submit { margin-top:2em; }
\ No newline at end of file
+.cpt_settings_submit { margin-top:2em; }
+
+.cropThumbnailModal.ui-dialog { padding:0; border-radius: 0; border:0; }
+
+/*dialog headline*/
+.cropThumbnailModal.ui-dialog .ui-dialog-title { font-size:13px; font-family:'Open Sans', sans-serif; margin: 0; padding:0 29px 0 10px; line-height: 29px; }
+.cropThumbnailModal.ui-dialog .ui-dialog-titlebar { padding:0; border:0; height: 29px; border-bottom:1px solid #DFDFDF; border-radius: 0; }
+.cropThumbnailModal.ui-dialog .ui-button.ui-dialog-titlebar-close { width: 29px; height: 29px; margin: 0; }
+.cropThumbnailModal.ui-dialog .ui-button.ui-dialog-titlebar-close:before { line-height: 29px; }
+.cropThumbnailModal.ui-dialog .ui-dialog-titlebar-close span { display: none; }
+
+/*dialog content*/
+.cropThumbnailModal.ui-dialog .ui-dialog-content { padding:0; overflow: hidden; }
+.cropThumbnailModal.ui-dialog .ui-dialog-content iframe { width:100%; height: 100%; }
diff --git a/functions/backendpreparer.php b/functions/backendpreparer.php
new file mode 100644
index 0000000..7bb6356
--- /dev/null
+++ b/functions/backendpreparer.php
@@ -0,0 +1,268 @@
+<?php 
+class CropPostThumbnailsBackendPreparer {
+	
+	private $allowedMime = array('image/jpeg','image/png');
+	
+	function __construct() {
+		if ( is_admin() ) {
+			//add style and javascript
+			add_action( 'admin_print_styles', array(&$this, 'adminHeaderCSS') );
+			add_action( 'admin_print_scripts', array(&$this, 'adminHeaderJS') );
+
+			add_filter( 'attachment_fields_to_edit', array($this,'add_button_to_attachment_edit_view'), 10, 2 );
+		}
+	}
+	/**
+	 * For adding the "thickbox"-style in the mediathek
+	 */
+	function adminHeaderCSS() {
+		global $pagenow;
+		if (   $pagenow == 'post.php'
+			|| $pagenow == 'post-new.php'
+			|| $pagenow == 'page.php'
+			|| $pagenow == 'page-new.php'
+			|| $pagenow == 'upload.php') {
+			wp_enqueue_style("wp-jquery-ui-dialog");
+			wp_enqueue_style('crop-thumbnails-options-style',plugins_url('css/options.css',dirname(__FILE__)));
+		}
+	}
+	
+	/**
+	 * For adding the "crop-thumbnail"-link on posts, pages and the mediathek
+	 */
+	function adminHeaderJS() {
+		global $pagenow;
+		if (   $pagenow == 'post.php'
+			|| $pagenow == 'post-new.php'
+			|| $pagenow == 'page.php'
+			|| $pagenow == 'page-new.php'
+			|| $pagenow == 'upload.php') {
+
+			wp_enqueue_script('jquery-ui-dialog');
+			add_action('admin_footer',array($this,'addLinksToAdmin'));
+		}
+	}
+	
+	/**
+	 * adds the links into post-types and the media-library
+	 */
+	function addLinksToAdmin() {
+
+?>
+<script type="text/javascript">
+jQuery(document).ready(function($) {
+	/**
+	 * Provide a global accessable cache-break-function (only available on backend-pages where crop-thumbnail is active --> post-editor, mediathek)
+	 * Calling this function will add a timestamp on the provided Image-Element.
+	 * ATTENTION: using this will also delete all other parameters on the images src-attribute.
+	 * @param {dom-element / jquery-selection} elem
+	 */
+	CROP_THUMBNAILS_DO_CACHE_BREAK = function(elem) {
+		var images = $(elem);
+		for(var i = 0; i<images.length; i++) {
+			var img = $(images[i]);//select image
+			var imageUrl = img.attr('src');
+			var imageUrlArray = imageUrl.split("?");
+			
+			img.attr('src',imageUrlArray[0]+'?&cacheBreak='+(new Date()).getTime());
+		}
+	};
+	
+	/** add link on posts and pages **/
+	if ($('body.post-php, body.page-php, body.page-new.php, body.post-new-php').length > 0) {
+		var post_id_hidden = $('form#post #post_ID');
+		if (post_id_hidden) {
+
+			post_id_hidden = parseInt(post_id_hidden.val());
+
+			/**
+			 * add link on top of editor *
+			 */
+			var buttonContent = '';
+			buttonContent+= '<a ';
+				buttonContent+= 'class="button cropThumbnailBox"  href="#" data-cropthumbnail=\'{"post_id":'+ post_id_hidden +'}\' ';
+				buttonContent+= 'title="<?php esc_attr_e('Crop Thumbnails',CROP_THUMBS_LANG) ?>"';
+			buttonContent+= '>';
+			buttonContent+= '<span class="dashicons dashicons-image-crop" style="color:#82878C;font-size: 14px;vertical-align: middle;"></span>';
+			buttonContent+= '<?php esc_html_e('Crop Thumbnails',CROP_THUMBS_LANG); ?>';
+			buttonContent+= '</a>';
+			$('#wp-content-media-buttons').append(buttonContent);
+
+
+			/**
+			 * add link to featured image box *
+			 */
+			buttonContent = '';
+			buttonContent+= '<a ';
+			buttonContent+= 'class="button cropThumbnailBox" href="#" data-cropthumbnail=\'{"image_by_post_id":'+ post_id_hidden +',"viewmode":"single"}\' ';
+			buttonContent+= 'title="<?php esc_attr_e('Crop Featured Image',CROP_THUMBS_LANG) ?>"';
+			buttonContent+= '>';
+			buttonContent+= '<span class="dashicons dashicons-image-crop" style="color:#82878C;font-size: 14px;vertical-align: middle;"></span>';
+			buttonContent+= '<?php esc_html_e('Crop Featured Image',CROP_THUMBS_LANG); ?>';
+			buttonContent+= '</a>';
+
+
+			var featuredImageLink = $(buttonContent).css({'margin':'5px', 'padding':'5px','display':'inline-block','line-height':'1.2'});
+			$('#postimagediv .inside').after(featuredImageLink);
+			
+			
+			$('body').on('cropThumbnailModalClosed',function() {
+				//lets cache-break the crop-thumbnail-preview-box
+				CROP_THUMBNAILS_DO_CACHE_BREAK($('#postimagediv img'));
+			});
+		}
+	}
+
+	/** add link on mediathek **/
+	if ($('body.upload-php').length > 0) {
+		$('#the-list tr').each(function() {
+			if ($(this).find('td span.media-icon').hasClass('image-icon')) {
+				var post_id = parseInt($(this).attr('id').substr(5));
+				var last_span = $(this).find('.column-title .row-actions span:last-child');
+				last_span.append(' | ');
+
+				var buttonContent = '';
+				buttonContent+= '<a ';
+				buttonContent+= 'class="cropThumbnailBox" href="#" data-cropthumbnail=\'{"image_id":'+ post_id +',"viewmode":"single"}\' ';
+				buttonContent+= 'title="<?php esc_attr_e('Crop Thumbnail',CROP_THUMBS_LANG) ?>"';
+				buttonContent+= '>';
+				buttonContent+= '<span class="dashicons dashicons-image-crop" style="color:#82878C;font-size: 14px;vertical-align: middle;"></span>';
+				buttonContent+= '<?php esc_html_e('Crop Thumbnail',CROP_THUMBS_LANG); ?>';
+				buttonContent+= '</a>';
+
+
+				last_span.parent().append( buttonContent);
+			}
+		});
+		$('body').on('cropThumbnailModalClosed',function() {
+			//lets cache-break the crop-thumbnail-preview-box
+			CROP_THUMBNAILS_DO_CACHE_BREAK($('#the-list tr .media-icon img'));
+		});
+	}
+
+	/**
+	 * Create Listener for click-events with element-class ".cropThumbnailBox".
+	 * Open the modal box.
+	 */
+	$(document).on('click', '.cropThumbnailBox', function(e) {
+		e.preventDefault();
+		
+		<?php
+		/*****************************************************************************/
+		/**
+		 * Theme-Developers can adjust the size of the modal-dialog via filter.
+		 */
+		$modal_window_settings = array(
+			'limitToWidth' => 800, //thats the maximum width the modal can be. On small screens it will be smaller (see offsets), set to FALSE if you want no limit
+			'maxWidthOffset' => 50, //window-width minus "width_offset" equals modal-width
+			'maxHeightOffset' => 100, //window-width minus "height_offset" equals modal-height
+		);
+		$modal_window_settings = apply_filters('crop_thumbnails_modal_window_settings',$modal_window_settings);
+		
+		$jsLimitOutput = '';
+		if($modal_window_settings['limitToWidth']!==false) {
+			$value = abs(intval($modal_window_settings['limitToWidth']));
+			
+			$jsLimitOutput.= 'if(boxViewportWidth>'.$value.') { boxViewportWidth = '.$value.'; }';
+		}
+		/*****************************************************************************/
+		?>
+
+		//modal-box dimensions (will not adjust on viewport change)
+		var boxViewportHeight = $(window).height() - <?php echo abs(intval($modal_window_settings['maxHeightOffset'])); ?>;
+		var boxViewportWidth = window.outerWidth - <?php echo abs(intval($modal_window_settings['maxWidthOffset'])); ?>;
+		
+		<?php echo $jsLimitOutput; ?>
+	
+		
+
+		//get the data from the link
+		var data = $(this).data('cropthumbnail');
+
+		//construct the thickbox-parameter
+		var url = ajaxurl+'?action=croppostthumb_ajax';
+		for(var v in data) {
+			url+='&amp;'+v+'='+data[v];
+		}
+
+		var content = $('<div><iframe src="'+url+'"></iframe></div>');
+		var overlay;
+		var isModalClassInitialSet = $('body').hasClass('modal-open');
+		content.dialog({
+				dialogClass : 'cropThumbnailModal',
+				modal : true,
+				title : $(this).attr('title'),
+				resizable : false,
+				draggable : false,
+				autoOpen : false,
+				closeOnEscape : true,
+				height : boxViewportHeight,
+				width : boxViewportWidth,
+				close : function(event, ui ) {
+					if(overlay!==undefined) {
+						overlay.unbind('click');
+					}
+
+					//remove modal-open class (disable the scrollbars)
+					if(!isModalClassInitialSet) {
+						$('body').removeClass('modal-open');
+					}
+					$(this).dialog('destroy');
+					
+					/**
+					 * We will trigger that the modal of the crop thumbnail is closed.
+					 * So everyone that is up to, could build a cache-breaker on their images.
+					 * HOW-TO cache-break:
+					 * $('body').on('cropThumbnailModalClosed',function() {
+					 *     CROP_THUMBNAILS_DO_CACHE_BREAK( $('.your-image-selector') );
+					 * });
+					 */
+					$('body').trigger('cropThumbnailModalClosed');
+				},
+				open : function(event, ui) {
+					overlay = $('.ui-widget-overlay.ui-front');
+					overlay.click(function() {
+						content.dialog('close');
+					});
+
+					//add body class (disable the scrollbars)
+					$('body').addClass('modal-open');
+
+					//correct the z-index
+					$('.cropThumbnailModal').css('z-index','999999');
+					overlay.css('z-index','999998');
+				}
+			})
+			.dialog('open');
+	});
+});
+</script>
+<?php
+	}
+
+	/**
+	 * Add an field to the attachment edit dialog
+	 * @see http://code.tutsplus.com/tutorials/creating-custom-fields-for-attachments-in-wordpress--net-13076
+	 * @see https://make.wordpress.org/core/2012/12/12/attachment-editing-now-with-full-post-edit-ui/
+	 * @param array $form_fields
+	 * @param object $post
+	 */
+	public function add_button_to_attachment_edit_view( $form_fields, $post ) {
+
+		if(in_array($post->post_mime_type,$this->allowedMime)) {
+			$html = '';
+			$html.= '<a class="button cropThumbnailBox" href="#" data-cropthumbnail=\'{"image_id":'.$post->ID.',"viewmode":"single"}\' ';
+			$html.= 'title="'.esc_attr__('Crop Thumbnail',CROP_THUMBS_LANG).'">';
+			$html.= '<span class="dashicons dashicons-image-crop" style="color:#82878C;font-size: 14px;vertical-align: middle;"></span>'.esc_html__('Crop Thumbnail',CROP_THUMBS_LANG);
+			$html.= '</a>';
+
+			$form_fields['cropthumbnails'] = array(
+				'label' => '<small>Crop Thumbnails</small>',//no i18n cause it should be obvious what plugin is used here
+				'input' => 'html',
+				'html' => $html
+			);
+		}
+		return $form_fields;
+	}
+}
+$cpt_postView = new CropPostThumbnailsBackendPreparer();
diff --git a/functions/editor.php b/functions/editor.php
index 8fdd363..16eb7a4 100644
--- a/functions/editor.php
+++ b/functions/editor.php
@@ -1,20 +1,20 @@
 <?php
+
+/**
+ * Contains all code inside the croping-window
+ */
 class CropPostThumbnailsEditor {
-	
+
 	private $debugOutput = '';
-	
+
+	private $allowedMime = array('image/jpeg','image/png');
+
 	function __construct() {
-		if ( is_admin() ) {
-			//add style and javascript
-			add_action( 'admin_print_styles', array(&$this, 'adminHeaderCSS') );
-			add_action( 'admin_print_scripts', array(&$this, 'adminHeaderJS') );
-		}
-		
 		/* for the html inside the thickbox */
 		add_action('wp_ajax_croppostthumb_ajax', array($this,'ajaxWindow'));
 	}
-	
-	
+
+
 	/**
 	 * this function is called for/from the thickbox - returns ordanary html
 	 */
@@ -35,7 +35,7 @@ function ajaxWindow() {
 					$id = get_post_thumbnail_id(intval($_REQUEST['image_by_post_id']));
 					if(!empty($id)) {
 						$_REQUEST['image_id'] = $id;
-						$_REQUEST['parent_post_id'] = intval($_REQUEST['image_by_post_id']); 
+						$_REQUEST['parent_post_id'] = intval($_REQUEST['image_by_post_id']);
 						$this->byImageId();
 					} else {
 						$failure_msg = '<div class="listEmptyMsg">'.__('No featured Image set for this post until now.',CROP_THUMBS_LANG).'</div>';
@@ -43,10 +43,10 @@ function ajaxWindow() {
 					break;
 				default:
 					$failure_msg = __('An error happend!',CROP_THUMBS_LANG);
-					break; 
+					break;
 			}
 		}
-		
+
 		if(!empty($failure_msg)) {
 			$windowCssPath = apply_filters('crop_post_thumbnail_window_css', plugins_url('css/cpt-window.css',dirname(__FILE__)));
 			wp_enqueue_style( 'cpt-window',$windowCssPath,array('wp-admin'),CROP_THUMBS_VERSION);
@@ -55,7 +55,7 @@ function ajaxWindow() {
 		}
 		die();//to prevent to send back a "0"
 	}
-	
+
 	/**
 	 * Display a list of images that are attached to this post_id.
 	 * Hightlight the post-thumbnail (if it is attached to this post_id)
@@ -63,17 +63,17 @@ function ajaxWindow() {
 	function listImages() {
 		global $cptSettings;
 		$options = $cptSettings->getOptions();
-		
+
 		$data = $this->loadPostIdData(intval($_REQUEST['post_id']));
-		
+
 		$parent_post_type = '';
 		$_tmp_post = get_post(intval($_REQUEST['post_id']));
 		if(!empty($_tmp_post)) {
 			$parent_post_type = $_tmp_post->post_type;
 		}
-		
+
 		$cptContent = '';
-		
+
 		if($this->shouldBeHiddenOnPostType($options,$parent_post_type)) {
 			 $cptContent = '<div class="postTypeDisabledMsg">'.__('Cropping is disabled for this post-type.',CROP_THUMBS_LANG).'</div>';
 		} elseif($data==false) {
@@ -94,8 +94,8 @@ function listImages() {
 			<?php
 			$cptScript = ob_get_clean();
 			//END the javascript
-			
-			
+
+
 			//the content
 			ob_start();?>
 			<div class="header"><strong><?php _e('Choose the image you want to crop.',CROP_THUMBS_LANG); ?></strong></div>
@@ -109,7 +109,7 @@ function listImages() {
 					<img src="<?php echo $img_data[0].'?'.time(); ?>" />
 				</li>
 			<?php
-				$counter++; 
+				$counter++;
 			endforeach; ?>
 			</ul>
 			<?php
@@ -117,7 +117,7 @@ function listImages() {
 			//END the content
 		}
 		wp_enqueue_script( 'jquery' );
-		
+
 		$windowCssPath = apply_filters('crop_post_thumbnail_window_css', plugins_url('css/cpt-window.css',dirname(__FILE__)));
 		wp_enqueue_style( 'cpt-window',$windowCssPath,array('wp-admin'),CROP_THUMBS_VERSION);
 		include_once( dirname(__FILE__).'/../html/template.php' );
@@ -132,46 +132,46 @@ function listImages() {
 	 */
 	function byImageId() {
 		global $cptSettings,$content_width;
-		
+
 		//make sure $content_width is out of the way
 		$_remember_content_width = $content_width;
 		$content_width = null;
-		
-		
+
+
 		$options = $cptSettings->getOptions();
 		$this->addDebug('options', print_r($options,true));
 		$image_obj = get_post(intval($_REQUEST['image_id']));
-		
+
 		//$post_id_attached holds the id of the post the image is attached to - can be null/empty
 		$post_id_attached = -1;
 		if(!empty($image_obj->post_parent)) {
-			$post_id_attached=$image_obj->post_parent; 
+			$post_id_attached=$image_obj->post_parent;
 		}
-		
+
 		//$current_parent_post_type
 		$current_parent_post_type = '';
 		$current_parent_post_id = -1;
-		
+
 		if(!empty($_REQUEST['parent_post_id'])) {
 			$_tmp = get_post(intval($_REQUEST['parent_post_id']));
 			if(!empty($_tmp)) {
-				$current_parent_post_type = $_tmp->post_type; 
+				$current_parent_post_type = $_tmp->post_type;
 				$current_parent_post_id = $_tmp->ID;
 			}
 		}
-		
+
 		$all_image_sizes = $cptSettings->getImageSizes();
 		$this->addDebug('all_image_sizes', print_r($all_image_sizes,true));
-		
+
 		$orig_img = wp_get_attachment_image_src($image_obj->ID, 'full');
 		$orig_img['gcd'] = $this->gcd($orig_img[1],$orig_img[2]);
 		$orig_img['ratio'] = ($orig_img[1]/$orig_img['gcd']) / ($orig_img[2]/$orig_img['gcd']);
 		$orig_img['print_ratio'] = ($orig_img[1]/$orig_img['gcd']).':'.($orig_img[2]/$orig_img['gcd']);
-		
+
 		$cache_breaker = time();//a additional parameter that will be added to the image-urls to prevent the browser to show a cached image
-		
+
 		$this->addDebug('img-postmeta',print_r(wp_get_attachment_metadata($image_obj->ID, true),true));
-		
+
 		//the javascript
 		ob_start(); ?>
 <script>
@@ -187,7 +187,7 @@ function byImageId() {
 		<?php
 		$cptScript = ob_get_clean();
 		//END the javascript
-		
+
 		/**
 		 * wether or not to show the "back button"
 		 */
@@ -195,16 +195,16 @@ function byImageId() {
 		if(!empty($_REQUEST['viewmode']) && $_REQUEST['viewmode']=='single') {
 			$headline = false;
 		}
-		
+
 		//the content
 		ob_start();
-		
+
 		if($this->shouldBeHiddenOnPostType($options,$current_parent_post_type)) : ?>
 			<div class="cpt-crop-view">
 				<div class="postTypeDisabledMsg"><?php _e('Cropping is disabled for this post-type.',CROP_THUMBS_LANG); ?></div>
 			</div>
 		<?php else : ?>
-		
+
 		<div class="cpt-crop-view">
 			<?php if($headline) :?><div class="header"><a class="back" href="<?php echo admin_url( 'admin-ajax.php'); ?>?action=croppostthumb_ajax&post_id=<?php echo $current_parent_post_id; ?>"><?php _e('back to image-list',CROP_THUMBS_LANG); ?></a></div><?php endif; ?>
 			<div class="waitingWindow hidden"><?php _e('Please wait until the Images are cropped.',CROP_THUMBS_LANG); ?></div>
@@ -227,14 +227,14 @@ function byImageId() {
 					<ul class="thumbnail-list">
 						<?php
 						foreach($all_image_sizes as $img_size_name=>$value) :
-							
+
 							if ($value['height'] == 9999) {
 								$value['height'] = 0;
 							}
 							if ($value['width'] == 9999) {
 								$value['width'] = 0;
 							}
-							
+
 							if(!$this->shouldSizeBeHidden($options,$img_size_name,$value,$current_parent_post_type)) :
 								$ratio = null;			//reset
 								$gcd = null;			//reset
@@ -242,8 +242,8 @@ function byImageId() {
 								$print_cropped = '';	//reset
 								$crop = 0;				//reset
 								$special_warning = '';  //reset
-								
-								
+
+
 								/** define ratio **/
 								if($value['width'] != 0 && $value['height']!=0) {
 									$gcd = $this->gcd($value['width'],$value['height']);//get greatest common divisor
@@ -255,8 +255,8 @@ function byImageId() {
 									$ratio = $orig_img['ratio'];
 									$print_ratio = $orig_img['print_ratio'];
 								}
-								
-								
+
+
 								if(!empty($value['crop'])) {
 									//cropped
 									$print_cropped = ' ('.__('cropped',CROP_THUMBS_LANG).')';
@@ -267,7 +267,7 @@ function byImageId() {
 									$print_cropped = ' ('.__('maximum',CROP_THUMBS_LANG).')';
 									$print_ratio = __('free choice',CROP_THUMBS_LANG);
 									 */
-									 
+
 									$print_cropped = ' ('.__('maximum',CROP_THUMBS_LANG).')';
 									$crop = 1;
 									//keep ratio same as original image
@@ -275,24 +275,24 @@ function byImageId() {
 									$ratio = $orig_img['ratio'];
 									$print_ratio = $orig_img['print_ratio'];
 								}
-								
+
 								$print_dimensions = $value['width'].' '.__('pixel',CROP_THUMBS_LANG).' x '.$value['height'].' '.__('pixel',CROP_THUMBS_LANG).$print_cropped;
-								
+
 								$img_data = wp_get_attachment_image_src($image_obj->ID, $img_size_name);
-								
-								
+
+
 								$_lowResWarning = '';
 								if($this->isLowRes($value,$orig_img)) {
 									$_lowResWarning = ' <span class="lowResWarning">'.__('Original image to small for good crop-quality!',CROP_THUMBS_LANG).'</span>';
 								}
-								
-							?>
-							<li rel="<?php echo $print_ratio; ?>">
-								<strong><?php echo $img_size_name.$_lowResWarning; ?></strong><?php echo $special_warning; ?>
-								<span class="dimensions"><?php _e('Dimensions:',CROP_THUMBS_LANG) ?> <?php echo $print_dimensions; ?></span>
-								<span class="ratio"><?php _e('Ratio:',CROP_THUMBS_LANG) ?> <?php echo $print_ratio; ?></span>
-								<img src="<?php echo $img_data[0]?>?<?php echo $cache_breaker ?>" data-values='{"name":"<?php echo $img_size_name; ?>","width":<?php echo $value['width']; ?>,"height":<?php echo $value['height']; ?>,"ratio":<?php echo number_format($ratio, 13, '.', ''); ?>,"crop":<?php echo $crop ?>}' />
-							</li>
+
+								?>
+								<li rel="<?php echo $print_ratio; ?>">
+									<strong title="<?php esc_attr_e($img_size_name) ?>"><?php echo $value['name'] ?><?php echo $_lowResWarning; ?></strong><?php echo $special_warning; ?>
+									<span class="dimensions"><?php _e('Dimensions:',CROP_THUMBS_LANG) ?> <?php echo $print_dimensions; ?></span>
+									<span class="ratio"><?php _e('Ratio:',CROP_THUMBS_LANG) ?> <?php echo $print_ratio; ?></span>
+									<img src="<?php echo $img_data[0]?>?<?php echo $cache_breaker ?>" data-values='{"name":"<?php echo $img_size_name; ?>","width":<?php echo $value['width']; ?>,"height":<?php echo $value['height']; ?>,"ratio":<?php echo number_format($ratio, 13, '.', ''); ?>,"crop":<?php echo $crop ?>}' />
+								</li>
 							<?php endif; ?>
 						<?php endforeach; ?>
 					</ul>
@@ -304,19 +304,19 @@ function byImageId() {
 		$cptContent = ob_get_clean();
 		$cptContent.= $this->getDebugOutput($options);
 		//END the content
-		
-		
+
+
 		wp_enqueue_script( 'jquery' );
 		wp_enqueue_script( 'my_jcrop', plugins_url('js/jcrop/js/jquery.Jcrop.min.js',dirname(__FILE__)), array(), CROP_THUMBS_VERSION);
 		wp_enqueue_script( 'json2' );
 		wp_enqueue_script( 'cpt-crop',  plugins_url('js/cpt-crop.js',dirname(__FILE__)), array('jquery','my_jcrop','json2'), CROP_THUMBS_VERSION);
-		
+
 		$windowCssPath = apply_filters('crop_post_thumbnail_window_css', plugins_url('css/cpt-window.css',dirname(__FILE__)));
 		wp_enqueue_style( 'cpt-window',$windowCssPath,array('wp-admin'),CROP_THUMBS_VERSION);
 		wp_enqueue_style( 'my_jcrop', plugins_url('js/jcrop/css/jquery.Jcrop.min.css',dirname(__FILE__)), array(), CROP_THUMBS_VERSION);
-		
+
 		include_once( dirname(__FILE__).'/../html/template.php' );
-		
+
 		$content_width = $_remember_content_width;//reset the content-width
 		return true;
 	}
@@ -342,19 +342,19 @@ function shouldSizeBeHidden($options, $img_size_name, $img_size, $post_type='')
 		$_return = false;
 		if(!empty($post_type)) {
 			//we are NOT in the mediathek
-			
+
 			//-if hide_size
 			if(!empty($options['hide_size'][$post_type][$img_size_name])) {
 				$_return = true;
 			}
-	
+
 			//if not a crop-size and allow_non_cropped
 			if(empty($img_size['crop']) && empty($options['allow_non_cropped'])) {
 				$_return = true;
 			}
 		} else {
 			//we are in the mediathek
-			
+
 			//-if not a crop-size and allow_non_cropped
 			if(empty($img_size['crop']) && empty($options['allow_non_cropped'])) {
 				$_return = true;
@@ -375,15 +375,15 @@ function loadPostIdData($post_id) {
 			'post_parent' => intval($post_id)
 		);
 		$images = get_posts($args);
-		
+
 		$post_thumbnail_id = get_post_thumbnail_id( $post_id );
 		if(!isset($post_thumbnail_id)) {
 			$post_thumbnail_id = -1;
 		}
-		
+
 		foreach($images as $key=>$value) {
 			$mime = $value->post_mime_type;
-			if(	$mime !='image/jpeg' AND $mime !='image/png') {
+			if( !in_array($mime,$this->allowedMime) ) {
 				unset($images[$key]);
 			} elseif($value->ID==$post_thumbnail_id) {
 				$images[$key]->is_post_thumbnail = true;
@@ -391,7 +391,7 @@ function loadPostIdData($post_id) {
 		}
 		return $images;
 	}
-	
+
 	/**
 	 * Checks if the thumb-image-dimensions are bigger than the actuall image.
 	 * @param array thumbnail-data from the add_image_size-funtion (width, height)
@@ -404,7 +404,7 @@ function isLowRes($thumb,$orig) {
 		}
 		return false;
 	}
-	
+
 	function isUserPermitted() {
 		$return = false;
 		if(current_user_can('upload_files')) {
@@ -413,42 +413,11 @@ function isUserPermitted() {
 		//TODO maybe add noence (is it needed? there are no file- or db-operations)
 		return $return;
 	}
-	
-	/**
-	 * For adding the "thickbox"-style in the mediathek 
-	 */
-	function adminHeaderCSS() {
-		global $pagenow;
-		if (   $pagenow == 'post.php'
-			|| $pagenow == 'post-new.php'
-			|| $pagenow == 'page.php' 
-			|| $pagenow == 'page-new.php'
-			|| $pagenow == 'upload.php') {
-			wp_enqueue_style( 'thickbox' );
-		}
-	}
-	
-	
-	/**
-	 * For adding the "crop-thumbnail"-link on posts, pages and the mediathek
-	 */
-	function adminHeaderJS() {
-		global $pagenow;
-		if (   $pagenow == 'post.php'
-			|| $pagenow == 'post-new.php'
-			|| $pagenow == 'page.php' 
-			|| $pagenow == 'page-new.php'
-			|| $pagenow == 'upload.php') {
-			
-			wp_enqueue_script('thickbox', false, array('jquery','jquery-ui-tabs'));
-			add_action('admin_footer',array($this,'cptAddLinksToAdmin'));
-		}
-	}
-	
-	
+
+
 	/**
 	 * This is for use inside the plugin only.
-	 * Removes all other styles and scripts, to make sure the crop-thumbnail is not compromited by other plugins 
+	 * Removes all other styles and scripts, to make sure the crop-thumbnail is not compromited by other plugins
 	 */
 	function cleanWPHead() {
 		global $wp_scripts, $wp_styles;
@@ -457,7 +426,7 @@ function cleanWPHead() {
 		remove_all_actions('wp_print_styles');
 		remove_all_actions('wp_print_scripts');
 	}
-	
+
 	/**
 	 * Greatest cummon divisor
 	 */
@@ -472,71 +441,26 @@ function gcd($a, $b) {
 			return $gcd;
 		}
 	}
-	
+
 	function my_gcd($a, $b) {
 		$b = ( $a == 0 )? 0 : $b;
 		return ( $a % $b )? $this->my_gcd($b, abs($a - $b)) : $b;
 	}
-	
-	
+
+
 	function addDebug($title, $output) {
 		$this->debugOutput.= '---'.$title.'---<br />'.$output.'<br />';
 	}
-	
-	
+
+
 	function getDebugOutput($options) {
 		if(!empty($options['debug_data'])) {
 			return '<div class="cpt-debug closed"><a class="cpt-debug-handle" href="#">show debug</a><div class="content">'.nl2br(str_replace("    ","&nbsp;&nbsp;",$this->debugOutput)).'</div></div>';
 		}
 		return '';
 	}
-	
-	
-	/**
-	 * adds the links into post-types and the media-library
-	 */
-	function cptAddLinksToAdmin() {
-?>
-<script type="text/javascript">
-jQuery(document).ready(function($) {
-	var boxViewportHeight = $(window).height() - 100;
-	//add link on posts and pages
-	if ($('body.post-php, body.page-php, body.page-new.php, body.post-new-php').length > 0) {
-		var post_id_hidden = $('form#post #post_ID');
-		if (post_id_hidden) {
-
-			post_id_hidden = parseInt(post_id_hidden.val());
-
-			/** add link on top of editor **/
-			$('#wp-content-media-buttons').append('<a style="margin:0 2em;" class="thickbox" href="' + ajaxurl + '?action=croppostthumb_ajax&amp;post_id=' + post_id_hidden + '&amp;TB_iframe=1&amp;width=800&amp;height=' + boxViewportHeight + '" title="<?php esc_attr_e('Crop Thumbnails',CROP_THUMBS_LANG) ?>"><?php esc_html_e('Crop Thumbnails',CROP_THUMBS_LANG); ?></a>');
-			
-			
-			/** add link to featured image box **/
-			var featuredImageLink = $('<a class="thickbox" href="' + ajaxurl + '?action=croppostthumb_ajax&amp;image_by_post_id=' + post_id_hidden + '&amp;viewmode=single&amp;TB_iframe=1&amp;width=800&amp;height=' + boxViewportHeight + '" title="<?php esc_attr_e('Crop Featured Image',CROP_THUMBS_LANG) ?>"><?php esc_html_e('Crop Featured Image',CROP_THUMBS_LANG); ?></a>')
-				.css({'margin':'5px', 'padding':'5px','display':'inline-block','line-height':'1'})
-				.addClass('button');
-			$('#postimagediv .inside').after(featuredImageLink);
-		}
-	}
-
-	/** add link on mediathek **/
-	if ($('body.upload-php').length > 0) {
-		$('#the-list tr').each(function() {
-			if ($(this).find('td.media-icon img').attr('src').lastIndexOf("/wp-includes/images/") == -1) {
-				var post_id = parseInt($(this).attr('id').substr(5));
-				var last_span = $(this).find('.column-title .row-actions span:last-child');
-				last_span.append(' | ');
-				last_span.parent().append('<a class="thickbox" href="' + ajaxurl + '?action=croppostthumb_ajax&amp;image_id=' + post_id + '&amp;viewmode=single&amp;TB_iframe=1&amp;width=800&amp;height=' + boxViewportHeight + '" title="<?php esc_attr_e('Crop Thumbnail',CROP_THUMBS_LANG) ?>"><?php esc_html_e('Crop Thumbnail',CROP_THUMBS_LANG); ?></a>')
-			}
-		});
-	}
-});
-</script>
-<?php
-	}
 }
 
 
 
 $cpte = new CropPostThumbnailsEditor();
-?>
\ No newline at end of file
diff --git a/functions/settings.php b/functions/settings.php
index b10e6b5..282e111 100644
--- a/functions/settings.php
+++ b/functions/settings.php
@@ -4,7 +4,7 @@ class CropThumbnailsSettings {
 	private $optionsKey = 'crop-post-thumbs';
 	private $cssPrefix = 'cpt_settings_';
 	private $standardSizes = array('thumbnail','medium','large');
-	
+
 	function __construct() {
 		add_action('admin_menu', array($this,'addOptionsPage'));
 		if(is_admin()) {
@@ -12,26 +12,26 @@ function __construct() {
 			add_action('admin_head', array($this,'optionsPageStyle'));
 		}
 	}
-	
+
 	function optionsPageStyle() {
 		if(!empty($_REQUEST['page']) && $_REQUEST['page']=='page-cpt') {
 			wp_enqueue_style('crop-thumbnails-options-style',plugins_url('css/options.css',dirname(__FILE__)));
 		}
 	}
-	
+
 	function addSettingsLinkToPluginPage($links, $file) {
-	    if ($file === 'crop-thumbnails/crop-thumbnails.php'){
-	        $settings_link = '<a href="options-general.php?page=page-cpt" title="">'.__('Settings',CROP_THUMBS_LANG).'</a>';
-	        array_unshift( $links, $settings_link );
-	    }
-	    return $links;
+		if ($file === 'crop-thumbnails/crop-thumbnails.php'){
+			$settings_link = '<a href="options-general.php?page=page-cpt" title="">'.__('Settings',CROP_THUMBS_LANG).'</a>';
+			array_unshift( $links, $settings_link );
+		}
+		return $links;
 	}
-	
+
 	function addOptionsPage() {
 		add_options_page(__('Crop Post Thumbnail Page',CROP_THUMBS_LANG), 'Crop-Thumbnails', 'manage_options', 'page-cpt', array($this,'optionsPage'));
 		add_action('admin_init', array($this,'settingsInitialisation'));
 	}
-	
+
 	function optionsPage() { ?>
 		<div class="wrap">
 		<div id="icon-options-general" class="icon32"><br /></div>
@@ -39,12 +39,12 @@ function optionsPage() { ?>
 			<form action="options.php" method="post">
 				<?php settings_fields($this->uniqeSettingsId); ?>
 				<?php do_settings_sections('page1'); ?>
-				
+
 				<div class="<?php echo $this->cssPrefix ?>submit">
 					<input name="Submit" type="submit" value="<?php esc_attr_e('Save Changes',CROP_THUMBS_LANG); ?>" class="button-primary" />
-				</div> 
+				</div>
 			</form>
-		
+
 			<div class="<?php echo $this->cssPrefix; ?>paypal">
 				<h3><?php _e('Support the plugin-author',CROP_THUMBS_LANG) ?></h3>
 				<p><?php _e('You can support the plugin-author <br />(and let him know you love this plugin) <br />by donating via Paypal. Thanks a lot!',CROP_THUMBS_LANG); ?></p>
@@ -64,10 +64,10 @@ function optionsPage() { ?>
 		</div>
 		<?php
 	}
-	
+
 	function settingsInitialisation(){
 		register_setting( $this->uniqeSettingsId, $this->optionsKey, array($this,'validateSettings') );
-		
+
 		$_sectionID = 'choose_sizes_section';
 		add_settings_section($_sectionID, __('Sizes and Posttypes',CROP_THUMBS_LANG), array($this,'sectionDescriptionChooseSizes'), 'page1');
 		add_settings_field('sizes', __('Choose the image-sizes you want to hide. Choose a post-type to prevent any use of the plugin for these entries.',CROP_THUMBS_LANG), array($this,'callback_choose_size'), 'page1', $_sectionID);
@@ -84,7 +84,7 @@ function settingsInitialisation(){
 		$_tmpID = 'debug_data';
 		add_settings_field($_tmpID, __('Enable Data-Debug.',CROP_THUMBS_LANG), 	array($this,'callback_'.$_tmpID), 'page1', $_sectionID, array( 'label_for' => $this->cssPrefix.$_tmpID ));
 	}
-	
+
 	function sectionDescriptionChooseSizes() {?>
 		<p>
 			<?php _e('Crop-Thumbnails is created to make cropping easy for the user. Often times the user only need to crop one, in dependence of the post-type. But the system will create also all other sizes. So, here you can select for what post-type what sizes should be visible in the plugin interface.',CROP_THUMBS_LANG) ?>
@@ -92,7 +92,7 @@ function sectionDescriptionChooseSizes() {?>
 		</p>
 		<?php
 	}
-	
+
 	function emptySectionDescription() {/*empty*/ }
 
 	function callback_choose_size() {
@@ -101,7 +101,7 @@ function callback_choose_size() {
 		#echo '<pre>'.print_r($options,true).'</pre>';
 		$post_types = $this->getPostTypes();
 		$image_sizes = $this->getImageSizes();
-		
+
 		//output
 		echo '<ul>';
 		foreach($post_types as $post_type=>$value) { ?>
@@ -111,14 +111,14 @@ function callback_choose_size() {
 					<strong><?php echo $value->labels->name; ?></strong>
 				</label>
 				<ul style="margin:1em;">
-				<?php 
-				
+				<?php
+
 				foreach($image_sizes as $thumb_name => $data) :
 					$_checked = false;
 					if(!empty($options['hide_size']) && is_array($options['hide_size']) && !empty($options['hide_size'][$post_type][$thumb_name])) {
 						$_checked = true;
 					}
-					if($data['crop']=='1') : 
+					if($data['crop']=='1') :
 						 ?>
 						<li>
 							<label for="<?php echo $this->cssPrefix.$post_type;?>-<?php echo $thumb_name;?>">
@@ -162,7 +162,7 @@ function callback_debug_js() {
 		if(empty($options[$_id])) { $options[$_id] = ''; }
 		echo '<input name="'.$this->optionsKey.'['.$_id.']" id="'.$this->cssPrefix.$_id.'" type="checkbox" value="1" ' . checked( 1, $options[$_id], false) . ' />';
 	}
-	
+
 	function callback_debug_data() {
 		$options = get_option($this->optionsKey);
 		$_id = 'debug_data';
@@ -172,7 +172,7 @@ function callback_debug_data() {
 
 	function validateSettings($input) {
 		$sizes = $this->getImageSizes();
-		
+
 		$post_types = $this->getPostTypes();
 
 		$storeInDb = array();
@@ -184,8 +184,8 @@ function validateSettings($input) {
 				}
 			}
 		}
-		
-		
+
+
 		//check $input[sizes] --> are post_types correct, are sizes real there
 		if(!empty($input['hide_size'])) {
 			foreach($input['hide_size'] as $_post_type_name=>$size_type) {
@@ -198,27 +198,27 @@ function validateSettings($input) {
 				}
 			}
 		}
-		
+
 		/* Experimental Section */
 		$_tmpID = 'allow_non_cropped';
 		if(!empty($input[$_tmpID])) {
 			$storeInDb[$_tmpID] = 1;
 		}
-		
+
 		/* Advanced Section */
 		$_tmpID = 'debug_js';
 		if(!empty($input[$_tmpID])) {
 			$storeInDb[$_tmpID] = 1;
 		}
-		
+
 		$_tmpID = 'debug_data';
 		if(!empty($input[$_tmpID])) {
 			$storeInDb[$_tmpID] = 1;
 		}
-		
+
 		return $storeInDb;
 	}
-	
+
 /* helper functions **********************************************************************************************/
 
 
@@ -235,54 +235,48 @@ function getPostTypes() {
 
 
 	/**
-	 * Creates an array of all image sizes:
-	 * array[sizename][height]
-	 * array[sizename][width]
-	 * array[sizename][crop] = boolean
-	 *
-	 * Thanks to the ajax_thumbnail_rebuild plugin and post-thumbnail-editor
+	 * <pre>
+	 * Creates an array of all image sizes.
+	 * @return {array} array of all image sizes
+	 *                       array[<sizename>]['height'] = int
+	 *                       array[<sizename>]['width'] = int
+	 *                       array[<sizename>]['crop'] = boolean
+	 *                       array[<sizename>]['name'] = string --> readable name if provided in "image_size_names_choose", else sizename
+	 * </pre>
 	 */
 	function getImageSizes() {
 		global $_wp_additional_image_sizes;//array with the available image sizes
-		$tmp_sizes = get_intermediate_image_sizes();
+		$tmp_sizes = array_flip(get_intermediate_image_sizes());
+		foreach($tmp_sizes as $key=>$value) {
+			$tmp_sizes[$key] = $key;
+		}
+		$tmp_sizes = apply_filters( 'image_size_names_choose', $tmp_sizes );
+		
 		$sizes = array();
-		foreach ($tmp_sizes as $s){
-			//width
-			if ( isset( $_wp_additional_image_sizes[$s]['width'] ) ) {// theme-added size
-				$width = intval( $_wp_additional_image_sizes[$s]['width'] );
-			} else { // default sizes set in options
-				$width = get_option( "{$s}_size_w" );
-			}
-			//height
-			if ( isset( $_wp_additional_image_sizes[$s]['height'] ) ) {// theme-added size
-				$height = intval( $_wp_additional_image_sizes[$s]['height'] );
-			} else { // default sizes set in options
-				$height = get_option( "{$s}_size_h" );
-			}
-			//crop
-			if ( isset( $_wp_additional_image_sizes[$s]['crop'] ) ) {// theme-added size
-				$crop = intval( $_wp_additional_image_sizes[$s]['crop'] );
-			} else { // default sizes set in options
-				$crop = get_option( "{$s}_crop" );
+		foreach( $tmp_sizes as $_size=>$theName ) {
+
+			if ( in_array( $_size, array( 'thumbnail', 'medium', 'large' ) ) ) {
+				$sizes[ $_size ]['width']  = intval(get_option( $_size . '_size_w' ));
+				$sizes[ $_size ]['height'] = intval(get_option( $_size . '_size_h' ));
+				$sizes[ $_size ]['crop']   = (bool) get_option( $_size . '_crop' );
+			} else {
+				$sizes[ $_size ] = array(
+					'width'  => intval($_wp_additional_image_sizes[ $_size ]['width']),
+					'height' => intval($_wp_additional_image_sizes[ $_size ]['height']),
+					'crop'   => (bool) $_wp_additional_image_sizes[ $_size ]['crop']
+				);
 			}
-			//join
-			$sizes[$s] = array(
-				'width'  => $width,
-				'height' => $height,
-				'crop'   => $crop
-			);
+			$sizes[ $_size ]['name'] = $theName;
 		}
-		#print_r($sizes);
 		return $sizes;
 	}
-	
+
 	function getOptions() {
 		return get_option($this->optionsKey);
 	}
-	
+
 	function getNonceBase() {
 		return 'crop-post-thumbnails-nonce-base';
 	}
 }
 $cptSettings = new CropThumbnailsSettings();
-?>
\ No newline at end of file
diff --git a/js/cpt-crop.js b/js/cpt-crop.js
index 8d25e29..60ef8e6 100644
--- a/js/cpt-crop.js
+++ b/js/cpt-crop.js
@@ -1,25 +1,25 @@
 jQuery(document).ready(function($) {
 	var pluginpath = '../wp-content/plugins/crop-thumbnails';
 	var adminAjaxPath = '../wp-admin/admin-ajax.php';
-	
+
 	//setup for ajax connections
 	$.ajaxSetup({type:'POST', url:adminAjaxPath, cache:false, timeout: (30 * 1000)});
-	
+
 	//cropping object: holds jcrop-object and image to use the crop on
 	var cropping = {api:-1, img : $('.selectionArea img')};
-	
+
 	/*needed cause the js-logic is currently not handle the hidden objects in dependence with "select all of the same ratio"*/
 	$('.thumbnail-list li.hidden').remove();
-	
+
 	cropping.img.fadeTo(0, 0.3);
-	
+
 	//handle click on an entry
 	$('.thumbnail-list li').click(function() {
 		selectAllWithSameRatio($(this));
 		activateArea(cropping);
 	});
-	
-	
+
+
 	//handle checkbox for selecting all with same ratio
 	$('#cpt-same-ratio').change(function() {
 		var active = $('.thumbnail-list li.active');
@@ -35,18 +35,18 @@ jQuery(document).ready(function($) {
 			}
 		}
 	});
-	
-	
+
+
 	$('#cpt-deselect').click(function() {
 		$('.thumbnail-list li.active').removeClass('active');
 		deactivateArea(cropping);
 	});
-	
-	
+
+
 	$('#cpt-generate').click(function() {
 		var active = $('.thumbnail-list li.active');
 		if(active.length===0) {
-			alert(cpt_lang['selectOne']);
+			alert(cpt_lang.selectOne);
 			return;
 		}
 		var selection = cropping.api.tellSelect();
@@ -54,27 +54,27 @@ jQuery(document).ready(function($) {
 			doProcessing(active,cropping);
 		}
 	});
-	
-	
+
+
 	$('.cpt-debug .cpt-debug-handle').click(function(e) {
 		e.preventDefault();
 		$('.cpt-debug').toggleClass('closed');
 	});
-	
+
 	/********************************/
 	function doProcessing(active,cropping) {
 		/*console.log('doProcessing');*/
-		
-		var active_array = new Array();
+
+		var active_array = [];
 		active.find('img').each(function() {
 			active_array.push($(this).data('values'));
 		});
-		
+
 		$('.mainWindow').hide();
 		$('.waitingWindow').show();
-		
-		$.ajax({ 
-			data:{ 
+
+		$.ajax({
+			data:{
 				action: 'cptSaveThumbnail',
 				'_ajax_nonce': cpt_ajax_nonce,
 				cookie: encodeURIComponent(document.cookie),
@@ -89,13 +89,13 @@ jQuery(document).ready(function($) {
 			success : function( response ) {
 				try {
 					var result = JSON.parse(response);
-					
-					if(cpt_debug_js) { 
+
+					if(cpt_debug_js) {
 						console.log('Save Function Debug',result.debug);
 					}
-					
+
 					if(typeof result.success == "number") {
-						
+
 						if(result.changed_image_format) {
 							window.location.reload();
 						} else {
@@ -108,11 +108,11 @@ jQuery(document).ready(function($) {
 				} catch(e) {
 					alert(e.message+"\n"+response);
 				}
-				
+
 			}
 		});
 	}
-	
+
 	function doCacheBreaker(number) {
 		$('.thumbnail-list li img').each(function() {
 			var imgurl = $(this).attr('src');
@@ -125,7 +125,7 @@ jQuery(document).ready(function($) {
 			$(this).attr('src',imgurl);
 		});
 	}
-	
+
 	function selectAllWithSameRatio(elem) {
 		$('.thumbnail-list li').removeClass('active');
 		if($('#cpt-same-ratio').attr('checked')==='checked') {
@@ -136,15 +136,15 @@ jQuery(document).ready(function($) {
 			elem.addClass('active');
 		}
 	}
-	
-	
+
+
 	function deactivateArea(c) {
 		if(c.api!=-1) {
 			c.api.release();
 			c.api.disable();
 		}
 	}
-	
+
 	function activateArea(c) {
 		deactivateArea(c);
 		var allActiveThumbs = $('.thumbnail-list li.active img');
@@ -152,8 +152,8 @@ jQuery(document).ready(function($) {
 		var largestHeight = 0;
 		var ratio = 0;
 		var crop = true;
-		
-		
+
+
 		//get the options
 		allActiveThumbs.each(function() {
 			var img_data = $(this).data('values');
@@ -164,13 +164,13 @@ jQuery(document).ready(function($) {
 				//alert(cpt_lang['bug']);
 				//TODO: test if this is still needed
 			}
-			
+
 			//we only need to check in one dimension, cause per definition all selected images have to use the same ratio
 			if(img_data.width > largestWidth) {
 				largestWidth = img_data.width;
-				largestHeight = img_data.height; 
+				largestHeight = img_data.height;
 			}
-			
+
 			//crop also has to be the same on all selected images
 			if(img_data.crop==1) {
 				crop = true;
@@ -185,25 +185,25 @@ jQuery(document).ready(function($) {
 		} else {
 			scale = c.img.data('values').width / largestWidth;
 		}
-		
+
 		var preSelect = [ 0, 0, Math.round(scale*c.img.width()), Math.round(scale*c.img.height()) ];
 		var minSize = [ largestWidth, largestHeight ];
 		// END get the options
-		
+
 		//set the options
-		var options = {}
+		var options = {};
 		options.boxWidth = c.img.width();
 		options.boxHeight = c.img.height();
 		options.trueSize = [cropping.img.data('values').width,c.img.data('values').height];
 		options.aspectRatio = ratio;
 		options.setSelect = preSelect;
-		
+
 		if(largestWidth>cropping.img.data('values').width || largestHeight>cropping.img.data('values').height) {
-			alert(cpt_lang['warningOriginalToSmall']);
+			alert(cpt_lang.warningOriginalToSmall);
 		} else {
 			options.minSize = minSize;
 		}
-		
+
 		//correct some options
 		if(ratio>=0) {
 			//add a offset to move the selection in the middle
@@ -213,24 +213,24 @@ jQuery(document).ready(function($) {
 			//no offset cause in most cases the the selection is needed in the upper corner (human portrait)
 			options.setSelect = [ 0, 0, Math.round(scale*c.img.width()) , cropping.img.data('values').height];
 		}
-		
+
 		if(scale===Infinity) {
 			options.setSelect = [ 0, 0, Math.round(scale*c.img.width()) , cropping.img.data('values').height];
 		}
-		
+
 		//free scaling
 		if(!crop) {
 			options.aspectRatio = false;
 			options.setSelect = [0,0,cropping.img.data('values').width,cropping.img.data('values').height];
 			console.log('free scaling');
 		}
-		
+
 		//debug
-		if(cpt_debug_js) { 
+		if(cpt_debug_js) {
 			console.log('choosed image - data',c.img.data('values'));
-			console.log('JCrop - options',options); 
+			console.log('JCrop - options',options);
 		}
-		
+
 		c.api = $.Jcrop(c.img, options);
 	}
-});
\ No newline at end of file
+});
diff --git a/lang/cpt_lang-de_DE.mo b/lang/cpt_lang-de_DE.mo
index 13f8717..42267a8 100644
Binary files a/lang/cpt_lang-de_DE.mo and b/lang/cpt_lang-de_DE.mo differ
diff --git a/lang/cpt_lang-de_DE.po b/lang/cpt_lang-de_DE.po
index e5b4cb4..1ed96ee 100644
--- a/lang/cpt_lang-de_DE.po
+++ b/lang/cpt_lang-de_DE.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: Crop-Post-Thumbnails\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-10-08 00:31+0100\n"
-"PO-Revision-Date: 2013-10-08 00:33+0100\n"
+"PO-Revision-Date: 2015-09-19 17:32+0100\n"
 "Last-Translator: Volkmar Kantor <volkmar.kantor@gmx.de>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -11,7 +11,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-KeywordsList: __;_e;esc_attr_e;esc_html_e;esc_html__\n"
 "X-Poedit-Basepath: .\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.7.6\n"
+"Language: de_DE\n"
 "X-Poedit-SearchPath-0: ..\n"
 
 #: ../crop-thumbnails.php:34
@@ -61,7 +62,7 @@ msgid ""
 "Warning: the original image is to small to be cropped in good quality with "
 "this thumbnail-size."
 msgstr ""
-"Warung: das Original-Bild ist zu klein um für diese Thumbnail-Größe es in "
+"Warung: das Original-Bild ist zu klein um es für diese Thumbnail-Größe in "
 "guter Qualität zuzuschneiden."
 
 #: ../functions/editor.php:182
diff --git a/readme.txt b/readme.txt
index f02e9db..967819c 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,19 +3,21 @@ Contributors: volkmar-kantor
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=volkmar%2ekantor%40gmx%2ede&lc=DE&item_name=Volkmar%20Kantor%20%2d%20totalmedial%2ede&item_number=crop%2dthumbnails&no_note=0&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHostedGuest
 Tags: post-thumbnails, images, media library
 Requires at least: 3.1
-Tested up to: 3.7.1
+Tested up to: 4.3
 Stable tag: trunk
 License: GPL v3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
-"Crop Thumbnails" made it easy to get exacly that specific image-detail you want to show. Crop your images the simple way.
+"Crop Thumbnails" made it easy to get exacly that specific image-detail you want to show in the automatic cropped post-thumbnails.
 
 == Description ==
 
-The plugin enhance functionality to crop your thumbnails individuell and simple. It add links on backend to enter all images you had attached to a post, page or custom-post.
+The plugin enhance functionality to crop your automatic cropped post-thumbnails individuell and simple. It add links in the backend to enter all images you had attached to a post, page or custom-post.
 In the Crop-Editor you can choose one or more (if they have the same ratio) imagesizes and cut-off the part of the image you want.
 
-It is possible to filter the list of available image-sizes (in dependency to post-types) in the settings (Settings > Crop-Thumbnails).
+Further Features
+* It is possible to filter the list of available image-sizes (in dependency to post-types) in the settings (Settings > Crop-Thumbnails).
+* You could provide your users a custom style for the Editor-Window.
 
 == Installation ==
 
@@ -42,12 +44,10 @@ You can use the built in installer and upgrader, or you can install the plugin m
 = I have cropped the image but the old one is used on the page. =
 If you had viewed your image on the site before, your browser has cached the image. Go tell them to reload the fresh image from the server by hitting "F5".
 
-= I have cropped the image but in the featured-image box in the editor the croped version dont show up =
-Refresh or Update the editor page.  
-Note that the image in the featured-image box will only be a preview, to show what image is choosed. The theme defines what image-size is used on the front-end. 
-
 = Is it possible to crop an non-cropped image-size? =
-Currently not.
+No. The purpose of this plugin is to provide control for the wordpress automatic crop. If you want to crop let's say the full-size image you should
+* a) upload it in a better format in the first place
+* OR b) use the Standard Wordpress-Image editor to crop the image.
 
 = Is it possible to adjust the css-style of the crop-thumbnail window? =
 Yes, for a simple test, copy the css/cpt-window.css file into your template_directory and make some change.
@@ -59,6 +59,24 @@ function myCustomStyle($content) {
 	return $content;
 }`
 
+= Can i make the modal-dialog fullscreen? =
+Yes, i added a filter with some settings for the modal-dialog, so you can adjust the size:
+`add_filter('crop_thumbnails_modal_window_settings','crop_thumbnails_modal_window_settings_override');
+function crop_thumbnails_modal_window_settings_override($param) {
+	$param['limitToWidth'] = false; //You may set a number, then thats the maximum width the modal can be. On small screens it will be smaller (see offsets). Set to FALSE if you want no limit.
+	$param['maxWidthOffset'] = 0; //window-width minus "width_offset" equals modal-width
+	$param['maxHeightOffset'] = 0; //window-width minus "height_offset" equals modal-height
+	return $param;
+}`
+
+= I have show the cropped image in the backend in an custom meta-box. It does not update after the modal-dialog closed. Is there a way to fix this =
+Yeah, there is a way. After the crop-thumbnails-modal closed it triggeres a javascript event on the body element. You could use jQuery to cache-break your cropped thumbnail (in backend-view).
+The event called "cropThumbnailModalClosed". The plugin also provides a global function that could be called (only in post-edit-view and mediathek) to do the cache-break.
+Example-Code:
+`$('body').on('cropThumbnailModalClosed',function() {
+	CROP_THUMBNAILS_DO_CACHE_BREAK( $('.your-image-selector') );
+});`
+
 == Screenshots ==
 
 1. You have access to Crop-Thumbnails on post / page / custom-post-types.
@@ -68,6 +86,20 @@ function myCustomStyle($content) {
 5. Choose what image-sizes should be hidden (for what post-types), for better usability.
 
 == Changelog ==
+
+= 0.10.0 =
+* refactoring some parts of the code to make it more modular
+* adding a cache breaker to the backend, so in post-view and mediathek the image should be refreshed after the modal-dialog closes
+* provide a javascript-event ('cropThumbnailModalClosed') after the modal is closed (see F.A.Q. for details)
+* provide the human-readable Name of the Crop-Size (if available), using the "image_size_names_choose" filter
+* provide some size settings for the modal-dialog - via filter "crop_thumbnails_modal_window_settings"
+* mini language update
+
+= 0.9.0 =
+* add crop-thumbnail-button to the default attachement-screens so i could accessed better
+* change modal-dialog from thickbox to ui-dialog
+* fix the missing crop-thumbnail-button in the attachment-list-view
+
 = 0.8.4 =
 * fix a bug that may occure on some systems with xdebug enabled and low xdebug.max_nesting_level (see: http://wordpress.org/support/topic/error-when-trying-to-crop-a-certain-image)
 * add dutch language (thanks to Max Gruson)
@@ -99,19 +131,19 @@ function myCustomStyle($content) {
 = 0.7.2 =
 * bug fix: change the way the link in the featured Image-Box is set
 * languages: some adjustments
- 
+
 = 0.7.1 =
 * add language: brazilian portuguese (pt_br)
 * bug fix: fixes for the upcoming Wordpress 3.5
 * bug fix: in crop editor, if an original image is larger than a single selected image-size, the predefined selection will now be on maximum possible size
-* bug fix: ensure that other plugins can´t add styles and scripts into the crop-thumbnail-iframe 
+* bug fix: ensure that other plugins can´t add styles and scripts into the crop-thumbnail-iframe
 
 = 0.7.0 =
 * workflow-enhancement: change the way the plugin handled same image-ratios (faster editing and less warnings)
 * the image-size with the biggest dimensions now is used for the min-boundaries (jcrop)
 * if the min-boundaries (jcrop) are bigger than original image the min-boundaries turned off
 
-= 0.6.0 = 
+= 0.6.0 =
 * add a settings link in the plugin-listing
 * add a support-author area in the settings
 * update language files
@@ -121,4 +153,3 @@ function myCustomStyle($content) {
 
 = 0.5.0 =
 * Initial Version
- 
\ No newline at end of file