diff --git a/chrome_point_plus/js/options.js b/chrome_point_plus/js/options.js
index 9a04bcc..68620f6 100644
--- a/chrome_point_plus/js/options.js
+++ b/chrome_point_plus/js/options.js
@@ -1,10 +1,22 @@
 var ppOptions = [
     // Fancybox
-    'option_fancybox', 'option_fancybox_images', 'option_fancybox_videos', 'option_fancybox_posts',
+    'option_fancybox',
+        // Open images in Fancybox
+        'option_fancybox_images',
+        // Open videos in Fancybox
+        'option_fancybox_videos',
+        // Open posts in Fancybox
+        'option_fancybox_posts',
     // CTRL+Enter
     'option_ctrl_enter',
     // Load original images
-    'option_images_load_original', 
+    'option_images_load_original',
+    // Embedding
+    'option_embedding',
+        // Load images from Gelbooru, Danbooru, etc
+        'option_images_load_booru',
+        // Wrap WEBM videos into the <video> tag
+        'option_videos_parse_webm',
     // Fluid layout
     'option_fluid_layout', 
     // Visual editor for posts
@@ -21,13 +33,9 @@ var ppOptions = [
     'option_enlarge_font', 'option_enlarge_font_size',
     // @ before username
     'option_at_before_username',
-    //
-    'option_images_load_booru',
-    //
-    'option_videos_parse_webm',
-    //
+    // Highlight posts with new comments
     'option_other_hightlight_post_comments',
-    //
+    // Show recommendations and unique comments count
     'option_other_show_recommendation_count',
 ];
 
@@ -48,6 +56,8 @@ function pp_save_options() {
     var option_fluid_layout = document.getElementById('option-layout-fluid');
     // Load original images
     var option_images_load_original = document.getElementById('option-images-load-original');
+    // Embedding
+    var option_embedding = document.getElementById('option-embedding');
     // Visual editor for posts
     var option_visual_editor_post = document.getElementById('option-visual-editor-post');
     // Google search
@@ -83,6 +93,7 @@ function pp_save_options() {
             'option_fancybox_posts': option_fancybox_posts.checked,
         'option_fluid_layout': option_fluid_layout.checked,
         'option_images_load_original': option_images_load_original.checked,
+        'option_embedding': option_embedding.checked,
         'option_visual_editor_post': option_visual_editor_post.checked,
         'option_search_with_google': checkbox_search_with_google.checked,
         'option_ws': option_ws.checked,
@@ -144,6 +155,10 @@ function pp_restore_options() {
         if (options.option_images_load_original == true) {
             document.getElementById('option-images-load-original').checked = true;
         }
+        // Embedding
+        if (options.option_embedding == true) {
+            document.getElementById('option-embedding').checked = true;
+        }
         // Visual editor for posts
         if (options.option_visual_editor_post == true) {
             document.getElementById('option-visual-editor-post').checked = true;
diff --git a/chrome_point_plus/js/point-plus.js b/chrome_point_plus/js/point-plus.js
index 563fe4e..e1e46a6 100644
--- a/chrome_point_plus/js/point-plus.js
+++ b/chrome_point_plus/js/point-plus.js
@@ -42,6 +42,18 @@ $(document).ready(function() {
                 });
             }
         }
+        
+        // Embedding
+        if (options.option_embedding == true) {
+            // Load pictures from Booru, Tumblr and some other sites
+            if (options.option_images_load_booru == true){
+                load_all_booru_images();
+            }
+            // Parse webm-links and create video instead
+            if (options.option_videos_parse_webm == true){
+                parse_webm();
+            }
+        }
 
         // Hotkeys
         // Send by CTRL+Enter
@@ -333,14 +345,6 @@ $(document).ready(function() {
             });
         }
 
-        // Load pictures from Booru, Tumblr and some other sites
-        if (options.option_images_load_booru == true){
-            load_all_booru_images();
-        }
-        // Parse webm-links and create video instead
-        if (options.option_videos_parse_webm == true){
-            parse_webm();
-        }
         // Hightlight post with new comments
         if (options.option_other_hightlight_post_comments == true){
             mark_unread_post();
diff --git a/chrome_point_plus/options.html b/chrome_point_plus/options.html
index e3651f8..faaf2d4 100644
--- a/chrome_point_plus/options.html
+++ b/chrome_point_plus/options.html
@@ -39,22 +39,18 @@
                     </div>
 
                     <div class="option">
-                        <input type="checkbox" id="option-images-load-booru"><label for="option-images-load-booru">Load pictures from Booru, Tumblr and some other sites</label>
-                    </div>
-
-                    <div class="option">
-                        <input type="checkbox" id="option-videos-parse-webm"><label for="option-videos-parse-webm">Parse webm-links and create video instead</label>
-                    </div>
-
-                    <div class="option">
-                        <input type="checkbox" id="option-embedding" disabled><label for="option-embedding">Enable embedding</label>
+                        <input type="checkbox" id="option-embedding"><label for="option-embedding">Enable embedding</label>
                         
                         <div class="option">
-                            <input type="checkbox" id="option-embedding-soundcloud"><label for="option-embedding-soundcloud">Soundcloud</label>
+                            <input type="checkbox" id="option-images-load-booru"><label for="option-images-load-booru">Load pictures from Booru, Tumblr and some other sites</label>
+                        </div>
+
+                        <div class="option">
+                            <input type="checkbox" id="option-videos-parse-webm"><label for="option-videos-parse-webm">Parse webm-links and create video instead</label>
                         </div>
                         
                         <div class="option">
-                            <input type="checkbox" id="option-embedding-youtube" disabled><label for="option-embedding-youtube">YouTube</label>
+                            <input type="checkbox" id="option-embedding-soundcloud" disabled="disabled"><label for="option-embedding-soundcloud">Soundcloud</label>
                         </div>
                     </div>
                 </div>