diff --git a/languages/coblocks-js.pot b/languages/coblocks-js.pot
index 246fa2c7535..285e1a8a135 100644
--- a/languages/coblocks-js.pot
+++ b/languages/coblocks-js.pot
@@ -7,10 +7,6 @@ msgstr ""
 msgid "99"
 msgstr ""
 
-#: src/blocks/accordion/accordion-item/components/controls.js:34
-msgid "Display open"
-msgstr ""
-
 #: src/blocks/accordion/accordion-item/components/edit.js:72
 msgid "Add accordion title..."
 msgstr ""
@@ -33,24 +29,21 @@ msgstr ""
 
 #: src/blocks/accordion/accordion-item/components/inspector.js:80
 #: src/blocks/alert/components/inspector.js:57
-#: src/blocks/click-to-tweet/components/inspector.js:69
-#: src/blocks/dynamic-separator/components/inspector.js:64
+#: src/blocks/dynamic-separator/inspector.js:60
 #: src/blocks/features/components/inspector.js:182
 #: src/blocks/features/feature/components/inspector.js:102
-#: src/blocks/form/components/submit-button.js:121
 #: src/blocks/gallery-carousel/inspector.js:172
 #: src/blocks/gallery-masonry/inspector.js:191
-#: src/blocks/gallery-stacked/inspector.js:204
 #: src/blocks/hero/components/inspector.js:140
-#: src/blocks/highlight/components/inspector.js:67
 #: src/blocks/icon/components/inspector.js:354
 #: src/blocks/media-card/components/inspector.js:131
 #: src/blocks/pricing-table/pricing-table-item/components/inspector.js:61
 #: src/blocks/row/column/components/inspector.js:142
 #: src/blocks/row/components/inspector.js:224
+#: src/blocks/row/components/inspector.js:211
 #: src/blocks/shape-divider/components/inspector.js:96
-#: src/blocks/social/components/inspector.js:191
-#: src/extensions/colors/index.js:63
+#: src/blocks/social/components/inspector.js:202
+#: src/extensions/colors/index.js:59
 msgid "Color Settings"
 msgstr ""
 
@@ -60,18 +53,18 @@ msgstr ""
 #: src/blocks/features/feature/components/inspector.js:120
 #: src/blocks/gallery-carousel/inspector.js:83
 #: src/blocks/gallery-masonry/inspector.js:101
-#: src/blocks/gallery-stacked/inspector.js:99
 #: src/blocks/hero/components/inspector.js:154
-#: src/blocks/highlight/components/inspector.js:73
 #: src/blocks/icon/components/inspector.js:379
 #: src/blocks/media-card/components/inspector.js:145
 #: src/blocks/pricing-table/pricing-table-item/components/inspector.js:66
 #: src/blocks/row/column/components/inspector.js:148
 #: src/blocks/row/components/inspector.js:243
+#: src/blocks/row/components/inspector.js:227
 #: src/blocks/shape-divider/components/inspector.js:107
-#: src/blocks/social/components/inspector.js:99
+#: src/blocks/social/components/inspector.js:100
+#: src/components/background/index.js:90
 #: src/components/background/panel.js:117
-#: src/extensions/colors/index.js:50
+#: src/extensions/colors/index.js:47
 msgid "Background Color"
 msgstr ""
 
@@ -108,7 +101,6 @@ msgstr ""
 #: src/blocks/media-card/index.js:38
 #: src/blocks/pricing-table/index.js:33
 #: src/blocks/pricing-table/pricing-table-item/index.js:32
-#: src/blocks/social/index.js:26
 msgid "coblocks"
 msgstr ""
 
@@ -144,33 +136,6 @@ msgstr ""
 msgid "Organize content within collapsable accordion items."
 msgstr ""
 
-#: src/blocks/alert/components/controls.js:101
-msgid "Warning"
-msgstr ""
-
-#: src/blocks/alert/components/controls.js:106
-msgid "Error"
-msgstr ""
-
-#: src/blocks/alert/components/controls.js:82
-msgid "Alert Type"
-msgstr ""
-
-#: src/blocks/alert/components/controls.js:86
-#: src/components/font-family/index.js:20
-#: src/components/typography-controls/index.js:116
-#: src/extensions/list-styles/index.js:15
-msgid "Default"
-msgstr ""
-
-#: src/blocks/alert/components/controls.js:91
-msgid "Info"
-msgstr ""
-
-#: src/blocks/alert/components/controls.js:96
-msgid "Success"
-msgstr ""
-
 #: src/blocks/alert/components/edit.js:84
 msgid "Write title..."
 msgstr ""
@@ -180,16 +145,15 @@ msgid "Write text..."
 msgstr ""
 
 #: src/blocks/alert/components/inspector.js:67
-#: src/blocks/click-to-tweet/components/inspector.js:75
 #: src/blocks/features/components/inspector.js:204
 #: src/blocks/features/feature/components/inspector.js:124
 #: src/blocks/hero/components/inspector.js:159
-#: src/blocks/highlight/components/inspector.js:78
 #: src/blocks/pricing-table/pricing-table-item/components/inspector.js:71
 #: src/blocks/row/column/components/inspector.js:153
 #: src/blocks/row/components/inspector.js:248
-#: src/blocks/social/components/inspector.js:91
-#: src/extensions/colors/index.js:57
+#: src/blocks/row/components/inspector.js:232
+#: src/blocks/social/components/inspector.js:92
+#: src/extensions/colors/index.js:54
 msgid "Text Color"
 msgstr ""
 
@@ -209,14 +173,6 @@ msgstr ""
 msgid "Provide contextual feedback messages."
 msgstr ""
 
-#: src/blocks/author/components/controls.js:48
-msgid "Edit image"
-msgstr ""
-
-#: src/blocks/author/components/controls.js:56
-msgid "Remove image"
-msgstr ""
-
 #: src/blocks/author/components/edit.js:110
 msgid "Drop to add as avatar"
 msgstr ""
@@ -257,9 +213,8 @@ msgstr ""
 #: src/blocks/features/components/inspector.js:95
 #: src/blocks/icon/components/inspector.js:159
 #: src/blocks/row/components/inspector.js:114
-#: src/blocks/social/components/inspector.js:77
-#: src/components/dimensions-control/index.js:444
-#: src/components/size-control/index.js:120
+#: src/blocks/row/components/inspector.js:101
+#: src/blocks/social/components/inspector.js:78
 msgid "Small"
 msgstr ""
 
@@ -267,9 +222,8 @@ msgstr ""
 #: src/blocks/features/components/inspector.js:96
 #: src/blocks/icon/components/inspector.js:164
 #: src/blocks/row/components/inspector.js:115
-#: src/blocks/social/components/inspector.js:78
-#: src/components/dimensions-control/index.js:449
-#: src/components/size-control/index.js:124
+#: src/blocks/row/components/inspector.js:102
+#: src/blocks/social/components/inspector.js:79
 msgid "Medium"
 msgstr ""
 
@@ -277,16 +231,14 @@ msgstr ""
 #: src/blocks/features/components/inspector.js:97
 #: src/blocks/icon/components/inspector.js:169
 #: src/blocks/row/components/inspector.js:116
-#: src/blocks/social/components/inspector.js:79
-#: src/components/dimensions-control/index.js:454
-#: src/components/size-control/index.js:67
+#: src/blocks/row/components/inspector.js:103
+#: src/blocks/social/components/inspector.js:80
 msgid "Large"
 msgstr ""
 
 #: src/blocks/buttons/components/inspector.js:41
 #: src/blocks/icon/components/inspector.js:173
 #: src/blocks/row/components/inspector.js:117
-#: src/components/dimensions-control/index.js:458
 msgid "Huge"
 msgstr ""
 
@@ -302,9 +254,7 @@ msgstr ""
 #: src/blocks/buttons/components/inspector.js:63
 #: src/blocks/features/components/inspector.js:173
 #: src/blocks/gallery-carousel/inspector.js:144
-#: src/blocks/gallery-stacked/inspector.js:155
 #: src/blocks/row/components/inspector.js:215
-#: src/components/responsive-tabs-control/index.js:34
 msgid "Gutter"
 msgstr ""
 
@@ -345,31 +295,11 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: src/blocks/click-to-tweet/components/edit.js:119
-msgid "Add button..."
-msgstr ""
-
-# the text of the click to tweet element
-#: src/blocks/click-to-tweet/components/edit.js:92
-msgid "Add a quote to tweet..."
-msgstr ""
-
-#: src/blocks/click-to-tweet/components/inspector.js:61
-#: src/blocks/highlight/components/inspector.js:59
-msgid "Text Settings"
-msgstr ""
-
-#: src/blocks/click-to-tweet/components/inspector.js:80
-#: src/blocks/form/components/submit-button.js:130
-msgid "Button Color"
-msgstr ""
-
 #: src/blocks/click-to-tweet/index.js:28
 msgid "Click to Tweet"
 msgstr ""
 
 #: src/blocks/click-to-tweet/index.js:33
-#: src/blocks/social/index.js:25
 msgid "share"
 msgstr ""
 
@@ -385,25 +315,6 @@ msgstr ""
 msgid "Add a quote for readers to tweet via Twitter."
 msgstr ""
 
-#: src/blocks/dynamic-separator/components/inspector.js:47
-msgid "Dynamic HR Settings"
-msgstr ""
-
-#: src/blocks/dynamic-separator/components/inspector.js:48
-#: src/blocks/gallery-carousel/inspector.js:149
-#: src/blocks/hero/components/inspector.js:117
-#: src/blocks/map/components/inspector.js:148
-msgid "Height in pixels"
-msgstr ""
-
-#: src/blocks/dynamic-separator/components/inspector.js:56
-msgid "Height for the dynamic separator element in pixels."
-msgstr ""
-
-#: src/blocks/dynamic-separator/components/inspector.js:70
-msgid "Color"
-msgstr ""
-
 #: src/blocks/dynamic-separator/index.js:27
 msgid "Dynamic HR"
 msgstr ""
@@ -414,24 +325,30 @@ msgid "hr"
 msgstr ""
 
 #: src/blocks/dynamic-separator/index.js:33
-#: src/blocks/shape-divider/index.js:71
-msgid "separator"
+msgid "spacer"
 msgstr ""
 
 #: src/blocks/dynamic-separator/index.js:54
 msgid "Add a resizable spacer between other blocks."
 msgstr ""
 
-#: src/blocks/dynamic-separator/index.js:61
-msgid "Dot"
+#: src/blocks/dynamic-separator/inspector.js:43
+msgid "Dynamic HR Settings"
 msgstr ""
 
-#: src/blocks/dynamic-separator/index.js:62
-msgid "Line"
+#: src/blocks/dynamic-separator/inspector.js:44
+#: src/blocks/gallery-carousel/inspector.js:149
+#: src/blocks/hero/components/inspector.js:117
+#: src/blocks/map/components/inspector.js:136
+msgid "Height in pixels"
 msgstr ""
 
-#: src/blocks/dynamic-separator/index.js:63
-msgid "Fullwidth"
+#: src/blocks/dynamic-separator/inspector.js:52
+msgid "Height for the dynamic separator element in pixels."
+msgstr ""
+
+#: src/blocks/dynamic-separator/inspector.js:66
+msgid "Color"
 msgstr ""
 
 #: src/blocks/features/components/edit.js:88
@@ -451,7 +368,6 @@ msgstr ""
 #: src/blocks/features/components/inspector.js:131
 #: src/blocks/row/column/components/inspector.js:108
 #: src/blocks/row/components/inspector.js:170
-#: src/components/dimensions-control/index.js:308
 msgid "Margin"
 msgstr ""
 
@@ -462,6 +378,7 @@ msgstr ""
 #: src/blocks/media-card/components/inspector.js:69
 #: src/blocks/row/column/components/inspector.js:120
 #: src/blocks/row/components/inspector.js:193
+#: src/blocks/row/components/inspector.js:180
 #: src/components/background/panel.js:159
 msgid "Padding"
 msgstr ""
@@ -525,16 +442,8 @@ msgstr ""
 msgid "Toggle to add a last name field."
 msgstr ""
 
-#: src/blocks/form/components/submit-button.js:110
-msgid "Add text…"
-msgstr ""
-
-#: src/blocks/form/components/submit-button.js:138
-msgid "Button Text Color"
-msgstr ""
-
 #: src/blocks/form/edit.js:107
-#: src/blocks/social/components/inspector.js:169
+#: src/blocks/social/components/inspector.js:180
 msgid "Email"
 msgstr ""
 
@@ -594,45 +503,46 @@ msgstr ""
 msgid "Form Settings"
 msgstr ""
 
-#: src/blocks/form/edit.js:388
+#: src/blocks/form/edit.js:389
 msgid "Google reCAPTCHA"
 msgstr ""
 
-#: src/blocks/form/edit.js:389
+#: src/blocks/form/edit.js:393
 msgid "Add your reCAPTCHA site and secret keys to protect your form from spam."
 msgstr ""
 
-#: src/blocks/form/edit.js:392
+#: src/blocks/form/edit.js:396
 msgid "Generate keys"
 msgstr ""
 
-#: src/blocks/form/edit.js:392
+#: src/blocks/form/edit.js:396
 msgid "My keys"
 msgstr ""
 
-#: src/blocks/form/edit.js:393
+#: src/blocks/form/edit.js:397
 msgid "Get help"
 msgstr ""
 
-#: src/blocks/form/edit.js:397
+#: src/blocks/form/edit.js:401
 msgid "Site Key"
 msgstr ""
 
-#: src/blocks/form/edit.js:403
+#: src/blocks/form/edit.js:407
 msgid "Secret Key"
 msgstr ""
 
-#: src/blocks/form/edit.js:414
+#: src/blocks/form/edit.js:418
+#: src/components/block-gallery/gallery-image.js:222
 msgid "Saving"
 msgstr ""
 
-#: src/blocks/form/edit.js:414
-#: src/blocks/map/components/inspector.js:223
+#: src/blocks/form/edit.js:418
+#: src/blocks/map/components/inspector.js:224
 msgid "Save"
 msgstr ""
 
-#: src/blocks/form/edit.js:425
-#: src/blocks/map/components/inspector.js:231
+#: src/blocks/form/edit.js:429
+#: src/blocks/map/components/inspector.js:232
 msgid "Remove"
 msgstr ""
 
@@ -682,13 +592,6 @@ msgstr ""
 msgid "Edit gallery"
 msgstr ""
 
-#: src/blocks/gallery-carousel/edit.js:339
-#: src/blocks/gif/components/edit.js:252
-#: src/blocks/gist/components/edit.js:108
-#: src/components/block-gallery/gallery-image.js:191
-msgid "Write caption…"
-msgstr ""
-
 #: src/blocks/gallery-carousel/index.js:29
 msgid "Carousel"
 msgstr ""
@@ -711,27 +614,23 @@ msgstr ""
 
 #: src/blocks/gallery-carousel/inspector.js:126
 #: src/blocks/gallery-masonry/inspector.js:141
-#: src/blocks/gallery-stacked/inspector.js:144
 msgid "%s Settings"
 msgstr ""
 
 #: src/blocks/gallery-carousel/inspector.js:131
 #: src/blocks/icon/components/inspector.js:202
-#: src/components/typography-controls/index.js:214
 msgid "Size"
 msgstr ""
 
 #: src/blocks/gallery-carousel/inspector.js:157
 #: src/blocks/gallery-masonry/inspector.js:151
-#: src/blocks/gallery-stacked/inspector.js:159
-#: src/blocks/social/components/inspector.js:117
+#: src/blocks/social/components/inspector.js:119
 #: src/components/background/panel.js:169
 msgid "Rounded Corners"
 msgstr ""
 
 #: src/blocks/gallery-carousel/inspector.js:91
 #: src/blocks/gallery-masonry/inspector.js:109
-#: src/blocks/gallery-stacked/inspector.js:107
 msgid "Caption Color"
 msgstr ""
 
@@ -752,7 +651,6 @@ msgid "Add rounded corners to the gallery items."
 msgstr ""
 
 #: src/blocks/gallery-masonry/inspector.js:160
-#: src/blocks/gallery-stacked/inspector.js:175
 msgid "Captions"
 msgstr ""
 
@@ -761,23 +659,19 @@ msgid "Caption Style"
 msgstr ""
 
 #: src/blocks/gallery-masonry/inspector.js:175
-#: src/blocks/gallery-stacked/inspector.js:188
 #: src/blocks/icon/components/inspector.js:336
 msgid "Link Settings"
 msgstr ""
 
 #: src/blocks/gallery-masonry/inspector.js:179
-#: src/blocks/gallery-stacked/inspector.js:192
 msgid "Link To"
 msgstr ""
 
 #: src/blocks/gallery-masonry/inspector.js:58
-#: src/blocks/gallery-stacked/inspector.js:56
 msgid "Showing captions for each media item."
 msgstr ""
 
 #: src/blocks/gallery-masonry/inspector.js:58
-#: src/blocks/gallery-stacked/inspector.js:56
 msgid "Toggle to show media captions."
 msgstr ""
 
@@ -789,26 +683,6 @@ msgstr ""
 msgid "Display multiple images in an single column stacked gallery."
 msgstr ""
 
-#: src/blocks/gallery-stacked/inspector.js:147
-msgid "Fullwidth Images"
-msgstr ""
-
-#: src/blocks/gallery-stacked/inspector.js:147
-msgid "Fullwidth Image"
-msgstr ""
-
-#: src/blocks/gallery-stacked/inspector.js:169
-msgid "Box Shadow"
-msgstr ""
-
-#: src/blocks/gallery-stacked/inspector.js:52
-msgid "Fullwidth images are enabled."
-msgstr ""
-
-#: src/blocks/gallery-stacked/inspector.js:52
-msgid "Toggle to fill the available gallery area with completely fullwidth images."
-msgstr ""
-
 #: src/blocks/gif/components/controls.js:46
 msgid "Remove gif"
 msgstr ""
@@ -817,6 +691,12 @@ msgstr ""
 msgid "This gif has an empty alt attribute"
 msgstr ""
 
+#: src/blocks/gif/components/edit.js:252
+#: src/blocks/gist/components/edit.js:108
+#: src/components/block-gallery/gallery-image.js:231
+msgid "Write caption…"
+msgstr ""
+
 #: src/blocks/gif/components/edit.js:295
 #: src/blocks/gif/index.js:26
 msgid "Gif"
@@ -932,7 +812,6 @@ msgid "Change layout"
 msgstr ""
 
 #: src/blocks/hero/components/edit.js:171
-#: src/blocks/row/column/components/edit.js:88
 #: src/blocks/row/components/edit.js:170
 msgid "Add backround to %s"
 msgstr ""
@@ -952,60 +831,6 @@ msgstr ""
 msgid "Content width in pixels"
 msgstr ""
 
-#: src/blocks/hero/components/layouts.js:12
-#: src/components/background/panel.js:89
-#: src/components/grid-control/index.js:46
-msgid "Top Left"
-msgstr ""
-
-#: src/blocks/hero/components/layouts.js:13
-#: src/components/background/panel.js:90
-#: src/components/grid-control/index.js:47
-msgid "Top Center"
-msgstr ""
-
-#: src/blocks/hero/components/layouts.js:14
-#: src/components/background/panel.js:91
-#: src/components/grid-control/index.js:48
-msgid "Top Right"
-msgstr ""
-
-#: src/blocks/hero/components/layouts.js:15
-#: src/components/background/panel.js:92
-#: src/components/grid-control/index.js:59
-msgid "Center Left"
-msgstr ""
-
-#: src/blocks/hero/components/layouts.js:16
-#: src/components/background/panel.js:93
-#: src/components/grid-control/index.js:60
-msgid "Center Center"
-msgstr ""
-
-#: src/blocks/hero/components/layouts.js:17
-#: src/components/background/panel.js:94
-#: src/components/grid-control/index.js:61
-msgid "Center Right"
-msgstr ""
-
-#: src/blocks/hero/components/layouts.js:18
-#: src/components/background/panel.js:95
-#: src/components/grid-control/index.js:52
-msgid "Bottom Left"
-msgstr ""
-
-#: src/blocks/hero/components/layouts.js:19
-#: src/components/background/panel.js:96
-#: src/components/grid-control/index.js:53
-msgid "Bottom Center"
-msgstr ""
-
-#: src/blocks/hero/components/layouts.js:20
-#: src/components/background/panel.js:97
-#: src/components/grid-control/index.js:54
-msgid "Bottom Right"
-msgstr ""
-
 #: src/blocks/hero/index.js:105
 msgid ""
 "An introductory area of a page accompanied by a small amount of text and a "
@@ -1024,10 +849,6 @@ msgstr ""
 msgid "call to action"
 msgstr ""
 
-#: src/blocks/highlight/components/edit.js:114
-msgid "Add highlighted text..."
-msgstr ""
-
 #: src/blocks/highlight/index.js:26
 msgid "Highlight"
 msgstr ""
@@ -1045,33 +866,27 @@ msgid "Highlight text."
 msgstr ""
 
 #: src/blocks/icon/components/inspector.js:184
-#: src/blocks/social/components/inspector.js:144
+#: src/blocks/social/components/inspector.js:155
 msgid "Icon Settings"
 msgstr ""
 
 #: src/blocks/icon/components/inspector.js:197
-#: src/components/dimensions-control/index.js:529
 msgid "Turn off advanced %s settings"
 msgstr ""
 
 #: src/blocks/icon/components/inspector.js:199
-#: src/components/dimensions-control/index.js:531
-#: src/components/size-control/index.js:205
 msgid "Reset"
 msgstr ""
 
 #: src/blocks/icon/components/inspector.js:226
-#: src/components/dimensions-control/index.js:772
 msgid "Custom %s size"
 msgstr ""
 
 #: src/blocks/icon/components/inspector.js:254
-#: src/components/dimensions-control/index.js:801
 msgid "Advanced %s settings"
 msgstr ""
 
 #: src/blocks/icon/components/inspector.js:257
-#: src/components/dimensions-control/index.js:804
 msgid "Advanced"
 msgstr ""
 
@@ -1111,16 +926,7 @@ msgstr ""
 msgid "Add a stylized graphic symbol to communicate something more."
 msgstr ""
 
-#: src/blocks/icon/index.js:123
-msgid "Outlined"
-msgstr ""
-
-#: src/blocks/icon/index.js:124
-msgid "Filled"
-msgstr ""
-
 #: src/blocks/icon/index.js:32
-#: src/blocks/social/index.js:39
 msgid "Icon"
 msgstr ""
 
@@ -1137,31 +943,45 @@ msgstr ""
 msgid "Map style"
 msgstr ""
 
-#: src/blocks/map/components/edit.js:131
-msgid "Please enter a location or address."
-msgstr ""
-
 #: src/blocks/map/components/edit.js:163
 msgid "Invalid API key, or too many requests"
 msgstr ""
 
-#: src/blocks/map/components/edit.js:269
-#: src/blocks/map/components/save.js:48
+#: src/blocks/map/components/edit.js:243
 msgid "Google Map"
 msgstr ""
 
-#: src/blocks/map/components/edit.js:270
-msgid "Enter a location or address to drop a pin on a Google map."
+#: src/blocks/map/components/edit.js:244
+msgid "Enter your Google API key to render a map."
+msgstr ""
+
+#: src/blocks/map/components/edit.js:244
+msgid "Enter an address to drop a pin on a Google map."
+msgstr ""
+
+#: src/blocks/map/components/edit.js:250
+msgid "Enter Google API key…"
 msgstr ""
 
-#: src/blocks/map/components/edit.js:276
-msgid "Search for a place or address…"
+#: src/blocks/map/components/edit.js:257
+msgid "Enter address…"
 msgstr ""
 
-#: src/blocks/map/components/edit.js:284
+#: src/blocks/map/components/edit.js:266
+#: src/components/block-gallery/gallery-image.js:222
 msgid "Apply"
 msgstr ""
 
+#: src/blocks/map/components/edit.js:274
+#: src/blocks/map/components/inspector.js:208
+msgid "Retrieve your key"
+msgstr ""
+
+#: src/blocks/map/components/edit.js:274
+#: src/blocks/map/components/inspector.js:209
+msgid "Need help?"
+msgstr ""
+
 #: src/blocks/map/components/inspector.js:101
 msgid "Styles"
 msgstr ""
@@ -1178,12 +998,12 @@ msgstr ""
 msgid "Zoom Level"
 msgstr ""
 
-#: src/blocks/map/components/inspector.js:138
-msgid "Marker Size"
+#: src/blocks/map/components/inspector.js:137
+msgid "Height for the map in pixels"
 msgstr ""
 
-#: src/blocks/map/components/inspector.js:149
-msgid "Height for the map in pixels"
+#: src/blocks/map/components/inspector.js:148
+msgid "Marker Size"
 msgstr ""
 
 #: src/blocks/map/components/inspector.js:163
@@ -1256,14 +1076,6 @@ msgid ""
 "to use the new key."
 msgstr ""
 
-#: src/blocks/map/components/inspector.js:208
-msgid "Retrieve your key"
-msgstr ""
-
-#: src/blocks/map/components/inspector.js:209
-msgid "Need help?"
-msgstr ""
-
 #: src/blocks/map/components/inspector.js:215
 msgid "Enter Google API Key…"
 msgstr ""
@@ -1272,60 +1084,6 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: src/blocks/map/components/inspector.js:224
-msgid "Save"
-msgstr ""
-
-#: src/blocks/map/components/inspector.js:232
-msgid "Remove"
-msgstr ""
-
-#: src/blocks/map/components/styles.js:12
-msgid "Standard"
-msgstr ""
-
-#: src/blocks/map/components/styles.js:16
-msgid "Silver"
-msgstr ""
-
-#: src/blocks/map/components/styles.js:20
-msgid "Retro"
-msgstr ""
-
-#: src/blocks/map/components/styles.js:24
-#: src/components/background/panel.js:114
-#: src/components/block-gallery/options/caption-options.js:10
-msgid "Dark"
-msgstr ""
-
-#: src/blocks/map/components/styles.js:28
-msgid "Night"
-msgstr ""
-
-#: src/blocks/map/components/styles.js:32
-msgid "Aubergine"
-msgstr ""
-
-#: src/blocks/map/index.js:20
-msgid "Map"
-msgstr ""
-
-#: src/blocks/map/index.js:25
-msgid "address"
-msgstr ""
-
-#: src/blocks/map/index.js:26
-msgid "maps"
-msgstr ""
-
-#: src/blocks/map/index.js:27
-msgid "google"
-msgstr ""
-
-#: src/blocks/map/index.js:93
-msgid "Add an address and drop a pin on a Google map."
-msgstr ""
-
 #: src/blocks/media-card/components/controls.js:34
 msgid "Media on right"
 msgstr ""
@@ -1375,6 +1133,7 @@ msgid "Drop to replace media"
 msgstr ""
 
 #: src/blocks/media-card/components/media-container.js:43
+#: src/blocks/menu/menu-item/components/edit.js:156
 msgid "Edit media"
 msgstr ""
 
@@ -1394,6 +1153,22 @@ msgstr ""
 msgid "Add an image or video with an offset card side-by-side."
 msgstr ""
 
+#: src/blocks/menu/menu-item/components/edit.js:113
+msgid "Drop file to replace"
+msgstr ""
+
+#: src/blocks/menu/menu-item/components/edit.js:192
+msgid "Add menu item..."
+msgstr ""
+
+#: src/blocks/menu/menu-item/components/edit.js:199
+msgid "Add description..."
+msgstr ""
+
+#: src/blocks/menu/menu-item/components/edit.js:208
+msgid "$0.00"
+msgstr ""
+
 # %s: number of tables
 #: src/blocks/pricing-table/components/controls.js:44
 msgid "%s Tables"
@@ -1507,7 +1282,6 @@ msgid "Row Layout"
 msgstr ""
 
 #: src/blocks/row/components/edit.js:203
-#: src/blocks/row/index.js:55
 msgid "Row"
 msgstr ""
 
@@ -1533,15 +1307,10 @@ msgid "Back to Columns"
 msgstr ""
 
 #: src/blocks/row/components/inspector.js:113
-#: src/components/block-gallery/options/caption-options.js:12
-#: src/components/block-gallery/options/link-options.js:12
-#: src/components/dimensions-control/index.js:439
-#: src/extensions/list-styles/index.js:21
 msgid "None"
 msgstr ""
 
 #: src/blocks/row/components/inspector.js:132
-#: src/components/grid-control/index.js:135
 msgid "Layout"
 msgstr ""
 
@@ -1549,254 +1318,106 @@ msgstr ""
 msgid "Row Settings"
 msgstr ""
 
-#: src/blocks/row/components/layouts.js:13
-msgid "50/50"
+#: src/blocks/shape-divider/components/controls.js:34
+msgid "Flip horiztonally"
 msgstr ""
 
-#: src/blocks/row/components/layouts.js:14
-msgid "66/33"
+#: src/blocks/shape-divider/components/controls.js:39
+msgid "Flip vertically"
 msgstr ""
 
-#: src/blocks/row/components/layouts.js:15
-msgid "33/66"
+#: src/blocks/shape-divider/components/inspector.js:102
+msgid "Shape Color"
 msgstr ""
 
-#: src/blocks/row/components/layouts.js:16
-msgid "75/25"
+#: src/blocks/shape-divider/components/inspector.js:62
+msgid "Divider Settings"
 msgstr ""
 
-#: src/blocks/row/components/layouts.js:17
-msgid "25/75"
+#: src/blocks/shape-divider/components/inspector.js:64
+msgid "Shape Height in pixels"
 msgstr ""
 
-#: src/blocks/row/components/layouts.js:20
-msgid "33/33/33"
+#: src/blocks/shape-divider/components/inspector.js:76
+msgid "Background Height in pixels"
 msgstr ""
 
-#: src/blocks/row/components/layouts.js:21
-msgid "50/25/25"
+#: src/blocks/shape-divider/components/inspector.js:88
+msgid "Orientation"
 msgstr ""
 
-#: src/blocks/row/components/layouts.js:22
-msgid "25/25/50"
+#: src/blocks/shape-divider/index.js:148
+msgid "Add a shape divider to visually distinquish page sections."
 msgstr ""
 
-#: src/blocks/row/components/layouts.js:23
-msgid "25/50/25"
+#: src/blocks/shape-divider/index.js:65
+msgid "Shape Divider"
 msgstr ""
 
-#: src/blocks/row/components/layouts.js:24
-msgid "20/60/20"
+#: src/blocks/shape-divider/index.js:71
+msgid "separator"
 msgstr ""
 
-#: src/blocks/row/components/layouts.js:27
-msgid "25/25/25/25"
+#: src/blocks/social/components/inspector.js:110
+msgid "Social Settings"
 msgstr ""
 
-#: src/blocks/row/components/layouts.js:28
-msgid "40/20/20/20"
+#: src/blocks/social/components/inspector.js:112
+msgid "Social Colors"
 msgstr ""
 
-#: src/blocks/row/components/layouts.js:29
-msgid "20/20/20/40"
+#: src/blocks/social/components/inspector.js:128
+msgid "Icon Size"
 msgstr ""
 
-#: src/blocks/row/index.js:60
-msgid "rows"
+#: src/blocks/social/components/inspector.js:137
+msgid "Circle Size"
 msgstr ""
 
-#: src/blocks/row/index.js:61
-msgid "columns"
+#: src/blocks/social/components/inspector.js:146
+msgid "Button Size"
 msgstr ""
 
-#: src/blocks/row/index.js:62
-msgid "layouts"
+#: src/blocks/social/components/inspector.js:158
+msgid " Toggle the sharing links to display from the following social platforms."
 msgstr ""
 
-#: src/blocks/row/index.js:93
-msgid ""
-"Add a structured wrapper for column blocks, then add content blocks you’d "
-"like to the columns."
+#: src/blocks/social/components/inspector.js:160
+msgid "Twitter"
 msgstr ""
 
-#: src/blocks/shape-divider/components/controls.js:34
-#: src/components/orientation/index.js:66
-msgid "Flip horiztonally"
+#: src/blocks/social/components/inspector.js:165
+msgid "Facebook"
 msgstr ""
 
-#: src/blocks/shape-divider/components/controls.js:39
-#: src/components/orientation/index.js:55
-msgid "Flip vertically"
+#: src/blocks/social/components/inspector.js:170
+msgid "Pinterest"
 msgstr ""
 
-#: src/blocks/shape-divider/components/inspector.js:102
-msgid "Shape Color"
+#: src/blocks/social/components/inspector.js:175
+msgid "LinkedIn"
 msgstr ""
 
-#: src/blocks/shape-divider/components/inspector.js:62
-msgid "Divider Settings"
+#: src/blocks/social/components/inspector.js:185
+msgid "Tumblr"
 msgstr ""
 
-#: src/blocks/shape-divider/components/inspector.js:64
-msgid "Shape Height in pixels"
+#: src/blocks/social/components/inspector.js:190
+msgid "Google"
 msgstr ""
 
-#: src/blocks/shape-divider/components/inspector.js:76
-msgid "Background Height in pixels"
+#: src/blocks/social/components/inspector.js:195
+msgid "Reddit"
 msgstr ""
 
-#: src/blocks/shape-divider/components/inspector.js:88
-msgid "Orientation"
-msgstr ""
-
-#: src/blocks/shape-divider/index.js:148
-msgid "Add a shape divider to visually distinquish page sections."
-msgstr ""
-
-#: src/blocks/shape-divider/index.js:160
-msgid "Wavy"
-msgstr ""
-
-#: src/blocks/shape-divider/index.js:161
-msgid "Hills"
-msgstr ""
-
-#: src/blocks/shape-divider/index.js:162
-msgid "Waves"
-msgstr ""
-
-#: src/blocks/shape-divider/index.js:163
-msgid "Angled"
-msgstr ""
-
-#: src/blocks/shape-divider/index.js:164
-msgid "Sloped"
-msgstr ""
-
-#: src/blocks/shape-divider/index.js:165
-msgid "Rounded"
-msgstr ""
-
-#: src/blocks/shape-divider/index.js:166
-msgid "Triangle"
-msgstr ""
-
-#: src/blocks/shape-divider/index.js:167
-msgid "Pointed"
-msgstr ""
-
-#: src/blocks/shape-divider/index.js:65
-msgid "Shape Divider"
-msgstr ""
-
-#: src/blocks/social/components/edit.js:114
-msgid "Share on Twitter"
-msgstr ""
-
-#: src/blocks/social/components/edit.js:122
-msgid "Share on Facebook"
-msgstr ""
-
-#: src/blocks/social/components/edit.js:130
-msgid "Share on Pinterest"
-msgstr ""
-
-#: src/blocks/social/components/edit.js:138
-msgid "Share on LinkedIn"
-msgstr ""
-
-#: src/blocks/social/components/edit.js:146
-msgid "Share via Email"
-msgstr ""
-
-#: src/blocks/social/components/edit.js:154
-msgid "Share on Tumblr"
-msgstr ""
-
-#: src/blocks/social/components/edit.js:162
-msgid "Share on Google"
-msgstr ""
-
-#: src/blocks/social/components/edit.js:170
-msgid "Share on Reddit"
-msgstr ""
-
-#: src/blocks/social/components/inspector.js:108
-msgid "Social Settings"
-msgstr ""
-
-#: src/blocks/social/components/inspector.js:110
-msgid "Social Colors"
-msgstr ""
-
-#: src/blocks/social/components/inspector.js:126
-msgid "Icon Size"
-msgstr ""
-
-#: src/blocks/social/components/inspector.js:135
-msgid "Button Size"
-msgstr ""
-
-#: src/blocks/social/components/inspector.js:147
-msgid " Toggle the sharing links to display from the following social platforms."
-msgstr ""
-
-#: src/blocks/social/components/inspector.js:149
-msgid "Twitter"
-msgstr ""
-
-#: src/blocks/social/components/inspector.js:154
-msgid "Facebook"
-msgstr ""
-
-#: src/blocks/social/components/inspector.js:159
-msgid "Pinterest"
-msgstr ""
-
-#: src/blocks/social/components/inspector.js:164
-msgid "LinkedIn"
-msgstr ""
-
-#: src/blocks/social/components/inspector.js:174
-msgid "Tumblr"
-msgstr ""
-
-#: src/blocks/social/components/inspector.js:179
-msgid "Google"
-msgstr ""
-
-#: src/blocks/social/components/inspector.js:184
-msgid "Reddit"
-msgstr ""
-
-#: src/blocks/social/components/inspector.js:44
-msgid "Social button colors are enabled."
+#: src/blocks/social/components/inspector.js:44
+msgid "Social button colors are enabled."
 msgstr ""
 
 #: src/blocks/social/components/inspector.js:44
 msgid "Toggle to use official colors from each social media platform."
 msgstr ""
 
-#: src/blocks/social/index.js:20
-msgid "Social"
-msgstr ""
-
-#: src/blocks/social/index.js:33
-msgid "Add social sharing buttons to help you get likes and shares."
-msgstr ""
-
-#: src/blocks/social/index.js:38
-msgid "Mask"
-msgstr ""
-
-#: src/blocks/social/index.js:40
-msgid "Text"
-msgstr ""
-
-#: src/blocks/social/index.js:41
-msgid "Icon & Text"
-msgstr ""
-
 #: src/components/background/controls.js:56
 msgid "Edit Background"
 msgstr ""
@@ -1809,505 +1430,290 @@ msgstr ""
 msgid "Background"
 msgstr ""
 
-#: src/components/background/panel.js:101
-msgid "No Repeat"
-msgstr ""
-
-#: src/components/background/panel.js:103
-msgid "Repeat Horizontally"
-msgstr ""
-
-#: src/components/background/panel.js:104
-msgid "Repeat Vertically"
-msgstr ""
-
-#: src/components/background/panel.js:108
-msgid "Auto"
-msgstr ""
-
-#: src/components/background/panel.js:109
-msgid "Cover"
-msgstr ""
-
-#: src/components/background/panel.js:110
-msgid "Contain"
-msgstr ""
-
-#: src/components/background/panel.js:115
-msgid "Gray"
-msgstr ""
-
-#: src/components/background/panel.js:116
-#: src/components/block-gallery/options/caption-options.js:11
-msgid "Light"
-msgstr ""
-
+#: src/components/background/index.js:129
 #: src/components/background/panel.js:126
 msgid "Background Settings"
 msgstr ""
 
+#: src/components/background/index.js:135
 #: src/components/background/panel.js:132
 msgid "Fixed Background"
 msgstr ""
 
+#: src/components/background/index.js:143
 #: src/components/background/panel.js:139
 msgid "Focal Point"
 msgstr ""
 
-#: src/components/background/panel.js:148
-msgid "Background Opacity"
-msgstr ""
-
+#: src/components/background/index.js:154
 #: src/components/background/panel.js:181
 msgid "Repeat"
 msgstr ""
 
+#: src/components/background/index.js:164
 #: src/components/background/panel.js:190
 msgid "Position"
 msgstr ""
 
+#: src/components/background/index.js:173
 #: src/components/background/panel.js:198
 msgid "Display"
 msgstr ""
 
+#: src/components/background/index.js:182
 #: src/components/background/panel.js:206
 msgid "Mute Video"
 msgstr ""
 
+#: src/components/background/index.js:183
 #: src/components/background/panel.js:207
 msgid "Muting the background video."
 msgstr ""
 
+#: src/components/background/index.js:183
 #: src/components/background/panel.js:207
 msgid "Toggle to mute the video."
 msgstr ""
 
+#: src/components/background/index.js:191
 #: src/components/background/panel.js:214
 msgid "Loop Video"
 msgstr ""
 
+#: src/components/background/index.js:192
 #: src/components/background/panel.js:215
 msgid "Looping the background video."
 msgstr ""
 
+#: src/components/background/index.js:192
 #: src/components/background/panel.js:215
 msgid "Toggle to loop the video."
 msgstr ""
 
+#: src/components/background/index.js:202
 #: src/components/background/panel.js:224
 msgid "Remove background"
 msgstr ""
 
+#: src/components/background/index.js:221
 #: src/components/background/panel.js:245
 msgid "Remove "
 msgstr ""
 
-#: src/components/block-gallery/gallery-image.js:183
-msgid "Remove Image"
-msgstr ""
-
-#: src/components/block-gallery/gallery-placeholder.js:74
-msgid "%s Gallery"
+#: src/components/background/index.js:62
+#: src/components/background/panel.js:89
+msgid "Top Left"
 msgstr ""
 
-#: src/components/block-gallery/gallery-placeholder.js:75
-msgid "Drag images, upload new ones or select files from your library."
+#: src/components/background/index.js:63
+#: src/components/background/panel.js:90
+msgid "Top Center"
 msgstr ""
 
-#: src/components/block-gallery/gallery-uploader.js:65
-msgid "Upload an image"
+#: src/components/background/index.js:64
+#: src/components/background/panel.js:91
+msgid "Top Right"
 msgstr ""
 
-#: src/components/block-gallery/options/link-options.js:10
-msgid "Attachment Page"
+#: src/components/background/index.js:65
+#: src/components/background/panel.js:92
+msgid "Center Left"
 msgstr ""
 
-#: src/components/block-gallery/options/link-options.js:11
-msgid "Media File"
+#: src/components/background/index.js:66
+#: src/components/background/panel.js:93
+msgid "Center Center"
 msgstr ""
 
-#: src/components/dimensions-control/index.js:424
-msgid "Pixel"
+#: src/components/background/index.js:67
+#: src/components/background/panel.js:94
+msgid "Center Right"
 msgstr ""
 
-#: src/components/dimensions-control/index.js:428
-msgid "Em"
+#: src/components/background/index.js:68
+#: src/components/background/panel.js:95
+msgid "Bottom Left"
 msgstr ""
 
-#: src/components/dimensions-control/index.js:432
-msgid "Percentage"
+#: src/components/background/index.js:69
+#: src/components/background/panel.js:96
+msgid "Bottom Center"
 msgstr ""
 
-#: src/components/dimensions-control/index.js:506
-msgid "Select Units"
+#: src/components/background/index.js:70
+#: src/components/background/panel.js:97
+msgid "Bottom Right"
 msgstr ""
 
-#: src/components/dimensions-control/index.js:515
-msgid "%s Units"
+#: src/components/background/index.js:74
+#: src/components/background/panel.js:101
+msgid "No Repeat"
 msgstr ""
 
-#: src/components/dimensions-control/index.js:694
-msgid "%s Top"
+#: src/components/background/index.js:76
+#: src/components/background/panel.js:103
+msgid "Repeat Horizontally"
 msgstr ""
 
-#: src/components/dimensions-control/index.js:705
-msgid "%s Right"
+#: src/components/background/index.js:77
+#: src/components/background/panel.js:104
+msgid "Repeat Vertically"
 msgstr ""
 
-#: src/components/dimensions-control/index.js:715
-msgid "%s Bottom"
+#: src/components/background/index.js:81
+#: src/components/background/panel.js:108
+msgid "Auto"
 msgstr ""
 
-#: src/components/dimensions-control/index.js:725
-msgid "%s Left"
+#: src/components/background/index.js:82
+#: src/components/background/panel.js:109
+msgid "Cover"
 msgstr ""
 
-#: src/components/dimensions-control/index.js:731
-msgid "Unsync"
+#: src/components/background/index.js:83
+#: src/components/background/panel.js:110
+msgid "Contain"
 msgstr ""
 
-#: src/components/dimensions-control/index.js:731
-msgid "Sync"
+#: src/components/background/index.js:87
+#: src/components/background/panel.js:114
+msgid "Dark"
 msgstr ""
 
-#: src/components/dimensions-control/index.js:734
-msgid "Sync Units"
+#: src/components/background/index.js:88
+#: src/components/background/panel.js:115
+msgid "Gray"
 msgstr ""
 
-#: src/components/dimensions-control/index.js:752
-msgid "Top"
+#: src/components/background/index.js:89
+#: src/components/background/panel.js:116
+msgid "Light"
 msgstr ""
 
-#: src/components/dimensions-control/index.js:753
-msgid "Right"
+#: src/components/background/index.js:97
+#: src/components/background/panel.js:148
+msgid "Background Opacity"
 msgstr ""
 
-#: src/components/dimensions-control/index.js:754
-msgid "Bottom"
+#: src/components/block-gallery/gallery-image.js:190
+msgid "Move Image Backward"
 msgstr ""
 
-#: src/components/dimensions-control/index.js:755
-msgid "Left"
+#: src/components/block-gallery/gallery-image.js:198
+msgid "Move Image Forward"
 msgstr ""
 
-#: src/components/grid-control/index.js:136
-msgid "Select Layout"
+#: src/components/block-gallery/gallery-image.js:209
+msgid "Remove Image"
 msgstr ""
 
-#: src/components/grid-control/index.js:175
-msgid "Fullscreen"
+#: src/components/block-gallery/gallery-placeholder.js:74
+msgid "%s Gallery"
 msgstr ""
 
-#: src/components/grid-control/index.js:193
-msgid "Fullscreen mode is enabled."
+#: src/components/block-gallery/gallery-placeholder.js:75
+msgid "Drag images, upload new ones or select files from your library."
 msgstr ""
 
-#: src/components/grid-control/index.js:193
-msgid "Toggle to enable fullscreen mode."
+#: src/components/block-gallery/gallery-uploader.js:65
+msgid "Upload an image"
 msgstr ""
 
-#: src/components/inline-color-picker/index.js:33
+#: src/components/inline-color-picker/index.js:21
 msgid "Custom color picker"
 msgstr ""
 
-#: src/components/media-filter-control/index.js:38
-msgid "Original"
-msgstr ""
-
-#: src/components/media-filter-control/index.js:44
-msgid "Grayscale"
-msgstr ""
-
-#: src/components/media-filter-control/index.js:50
-msgid "Sepia"
-msgstr ""
-
-#: src/components/media-filter-control/index.js:56
-msgid "Saturation"
-msgstr ""
-
-#: src/components/media-filter-control/index.js:62
-msgid "Dim"
-msgstr ""
-
-#: src/components/media-filter-control/index.js:68
-msgid "Vintage"
-msgstr ""
-
-#: src/components/media-filter-control/index.js:78
-msgid "Apply filter"
-msgstr ""
-
-#: src/components/orientation/index.js:54
-msgid "Select Orientation"
-msgstr ""
-
-#: src/components/responsive-base-control/index.js:80
-msgid "Height"
-msgstr ""
-
-# Control name
-#: src/components/responsive-tabs-control/index.js:69
-msgid "Mobile %s"
-msgstr ""
-
-#: src/components/size-control/index.js:187
-msgid "Select Size"
-msgstr ""
-
-#: src/components/size-control/index.js:71
-msgid "Extra Large"
-msgstr ""
-
-#: src/components/slider-panel/autoplay-options.js:10
-msgid "One Second"
-msgstr ""
-
-#: src/components/slider-panel/autoplay-options.js:11
-msgid "Two Seconds"
-msgstr ""
-
-#: src/components/slider-panel/autoplay-options.js:12
-msgid "Three Seconds"
-msgstr ""
-
-#: src/components/slider-panel/autoplay-options.js:13
-msgid "Four Seconds"
-msgstr ""
-
-#: src/components/slider-panel/autoplay-options.js:14
-msgid "Five Seconds"
-msgstr ""
-
-#: src/components/slider-panel/autoplay-options.js:15
-msgid "Six Second"
-msgstr ""
-
-#: src/components/slider-panel/autoplay-options.js:16
-msgid "Seven Seconds"
-msgstr ""
-
-#: src/components/slider-panel/autoplay-options.js:17
-msgid "Eight Seconds"
-msgstr ""
-
-#: src/components/slider-panel/autoplay-options.js:18
-msgid "Nine Seconds"
-msgstr ""
-
-#: src/components/slider-panel/autoplay-options.js:19
-msgid "Ten Seconds"
-msgstr ""
-
-#: src/components/slider-panel/index.js:29
-msgid "seconds"
-msgstr ""
-
-#: src/components/slider-panel/index.js:29
-msgid "second"
-msgstr ""
-
-# 1. Speed of the slider, 2: Time until the slide advances
-#: src/components/slider-panel/index.js:32
-msgid "Advancing after %1$d %2$s."
-msgstr ""
-
-# 1. Speed of the slider, 2: Time until the slide advances
-#: src/components/slider-panel/index.js:32
-msgid "Automatically advance to the next slide."
-msgstr ""
-
-#: src/components/slider-panel/index.js:36
-msgid "Dragging and flicking enabled on desktop and mobile devices."
-msgstr ""
-
-#: src/components/slider-panel/index.js:36
-msgid "Toggle to enable drag functionality on desktop and mobile devices."
-msgstr ""
-
-#: src/components/slider-panel/index.js:40
-msgid "Showing slide navigation arrows."
-msgstr ""
-
-#: src/components/slider-panel/index.js:40
-msgid "Toggle to show slide navigation arrows."
-msgstr ""
-
-#: src/components/slider-panel/index.js:44
-msgid "Showing dot navigation arrows."
-msgstr ""
-
-#: src/components/slider-panel/index.js:44
-msgid "Toggle to show dot navigation."
-msgstr ""
-
-#: src/components/slider-panel/index.js:64
-msgid "Slider Settings"
-msgstr ""
-
-#: src/components/slider-panel/index.js:66
-msgid "Autoplay"
-msgstr ""
-
-#: src/components/slider-panel/index.js:72
-msgid "Transition Speed"
-msgstr ""
-
-#: src/components/slider-panel/index.js:80
-msgid "Draggable"
-msgstr ""
-
-#: src/components/slider-panel/index.js:86
-msgid "Arrow Navigation"
-msgstr ""
-
-#: src/components/slider-panel/index.js:92
-msgid "Dot Navigation"
-msgstr ""
-
-#: src/components/typography-controls/index.js:109
-msgid "Bold"
-msgstr ""
-
-#: src/components/typography-controls/index.js:120
-#: src/formats/uppercase/index.js:36
-msgid "Uppercase"
-msgstr ""
-
-#: src/components/typography-controls/index.js:124
-msgid "Lowercase"
-msgstr ""
-
-#: src/components/typography-controls/index.js:128
-msgid "Capitalize"
-msgstr ""
-
-#: src/components/typography-controls/index.js:132
-msgid "Normal"
-msgstr ""
-
-#: src/components/typography-controls/index.js:189
-msgid "Font"
-msgstr ""
-
-#: src/components/typography-controls/index.js:196
-msgid "Weight"
-msgstr ""
-
-#: src/components/typography-controls/index.js:205
-msgid "Transform"
-msgstr ""
-
-#: src/components/typography-controls/index.js:225
-msgid "Line Height"
-msgstr ""
-
-#: src/components/typography-controls/index.js:236
-msgid "Letter Spacing"
-msgstr ""
-
-#: src/components/typography-controls/index.js:248
-msgid "No Top Spacing"
-msgstr ""
-
-#: src/components/typography-controls/index.js:253
-msgid "No Bottom Spacing"
-msgstr ""
-
-#: src/components/typography-controls/index.js:83
-msgid "Change typography"
-msgstr ""
-
-#: src/extensions/advanced-controls/index.js:116
-msgid "Stack on Mobile"
-msgstr ""
-
-#: src/extensions/advanced-controls/index.js:119
-msgid "Responsiveness is enabled."
-msgstr ""
-
-#: src/extensions/advanced-controls/index.js:119
-msgid "Toggle to stack elements on top of each other on smaller viewports."
-msgstr ""
-
-#: src/extensions/advanced-controls/index.js:124
-msgid "Remove Top Spacing"
+#: src/sidebars/block-manager/components/modal.js:139
+msgid "Manage Blocks"
 msgstr ""
 
-#: src/extensions/advanced-controls/index.js:127
-msgid "Top margin is removed on this block."
+#: src/sidebars/block-manager/components/modal.js:143
+msgid "Block Manager"
 msgstr ""
 
-#: src/extensions/advanced-controls/index.js:127
-msgid "Toggle to remove any margin applied to the top of this block."
+#: src/sidebars/block-manager/components/modal.js:145
+msgid "Close"
 msgstr ""
 
-#: src/extensions/advanced-controls/index.js:132
-msgid "Remove Bottom Spacing"
+#: src/sidebars/block-manager/components/modal.js:154
+msgid "Search for a block"
 msgstr ""
 
-#: src/extensions/advanced-controls/index.js:142
-msgid "Bottom margin is removed on this block."
+#: src/sidebars/block-manager/components/options/disable-blocks.js:189
+msgid "This block is added to the page and cannot currently be disabled"
 msgstr ""
 
-#: src/extensions/advanced-controls/index.js:142
-msgid "Toggle to remove any margin applied to the bottom of this block."
+#: src/sidebars/block-manager/components/options/disable-blocks.js:204
+msgid "Disable all"
 msgstr ""
 
-#: src/extensions/button-controls/index.js:76
-msgid "Display Fullwidth"
+#: src/sidebars/block-manager/components/options/disable-blocks.js:250
+msgid "No \"%s\" blocks found."
 msgstr ""
 
-#: src/extensions/button-controls/index.js:79
-msgid "Displaying as full width."
+#: src/blocks/dynamic-separator/index.js:61
+msgctxt "block style"
+msgid "Dot"
 msgstr ""
 
-#: src/extensions/button-controls/index.js:79
-msgid "Toggle to display button as full width."
+#: src/blocks/dynamic-separator/index.js:62
+msgctxt "block style"
+msgid "Line"
 msgstr ""
 
-#: src/extensions/button-styles/index.js:16
-msgid "Circular"
+#: src/blocks/dynamic-separator/index.js:63
+msgctxt "block style"
+msgid "Fullwidth"
 msgstr ""
 
-#: src/extensions/button-styles/index.js:22
-msgid "3D"
+#: src/blocks/icon/index.js:123
+msgctxt "block style"
+msgid "Outlined"
 msgstr ""
 
-#: src/extensions/button-styles/index.js:28
-msgid "Shadow"
+#: src/blocks/icon/index.js:124
+msgctxt "block style"
+msgid "Filled"
 msgstr ""
 
-#: src/extensions/list-styles/index.js:27
-msgid "Checkbox"
+#: src/blocks/shape-divider/index.js:160
+msgctxt "block style"
+msgid "Wavy"
 msgstr ""
 
-#: src/sidebars/block-manager/components/modal.js:138
-msgid "Manage Blocks"
+#: src/blocks/shape-divider/index.js:161
+msgctxt "block style"
+msgid "Hills"
 msgstr ""
 
-#: src/sidebars/block-manager/components/modal.js:142
-msgid "Block Manager"
+#: src/blocks/shape-divider/index.js:162
+msgctxt "block style"
+msgid "Waves"
 msgstr ""
 
-#: src/sidebars/block-manager/components/modal.js:144
-msgid "Close"
+#: src/blocks/shape-divider/index.js:163
+msgctxt "block style"
+msgid "Angled"
 msgstr ""
 
-#: src/sidebars/block-manager/components/modal.js:153
-msgid "Search for a block"
+#: src/blocks/shape-divider/index.js:164
+msgctxt "block style"
+msgid "Sloped"
 msgstr ""
 
-#: src/sidebars/block-manager/components/options/disable-blocks.js:189
-msgid "This block is added to the page and cannot currently be disabled"
+#: src/blocks/shape-divider/index.js:165
+msgctxt "block style"
+msgid "Rounded"
 msgstr ""
 
-#: src/sidebars/block-manager/components/options/disable-blocks.js:204
-msgid "Disable all"
+#: src/blocks/shape-divider/index.js:166
+msgctxt "block style"
+msgid "Triangle"
 msgstr ""
 
-#: src/sidebars/block-manager/components/options/disable-blocks.js:250
-msgid "No \"%s\" blocks found."
+#: src/blocks/shape-divider/index.js:167
+msgctxt "block style"
+msgid "Pointed"
 msgstr ""
 
 #: src/blocks/features/feature/components/edit.js:31
@@ -2377,13 +1783,11 @@ msgid ""
 msgstr ""
 
 #: src/blocks/icon/components/inspector.js:228
-#: src/components/dimensions-control/index.js:774
 msgctxt "size name"
 msgid "Normal"
 msgstr ""
 
 #: src/blocks/icon/components/inspector.js:228
-#: src/components/dimensions-control/index.js:774
 msgctxt "size name"
 msgid "Custom"
 msgstr ""
diff --git a/src/blocks/gallery-masonry/edit.js b/src/blocks/gallery-masonry/edit.js
index 8fc4c575c35..23db9db3e88 100644
--- a/src/blocks/gallery-masonry/edit.js
+++ b/src/blocks/gallery-masonry/edit.js
@@ -249,6 +249,8 @@ class GalleryMasonryEdit extends Component {
 											url={ img.url }
 											alt={ img.alt }
 											id={ img.id }
+											imgLink={ img.imgLink }
+											linkTo={ linkTo }
 											isFirstItem={ index === 0 }
 											isLastItem={ ( index + 1 ) === images.length }
 											isSelected={ isSelected && this.state.selectedImage === index }
diff --git a/src/blocks/gallery-masonry/index.js b/src/blocks/gallery-masonry/index.js
index c34f7095a21..fac8a1298ef 100644
--- a/src/blocks/gallery-masonry/index.js
+++ b/src/blocks/gallery-masonry/index.js
@@ -18,7 +18,6 @@ import { BackgroundAttributes, BackgroundClasses, BackgroundStyles, BackgroundVi
  * WordPress dependencies
  */
 const { __ } = wp.i18n;
-const { createBlock } = wp.blocks;
 const { RichText } = wp.editor;
 
 /**
@@ -67,7 +66,6 @@ const settings = {
 	edit,
 
 	save( { attributes, className } ) {
-
 		const {
 			captions,
 			gridSize,
@@ -75,13 +73,14 @@ const settings = {
 			gutterMobile,
 			images,
 			linkTo,
-			focalPoint,
+			rel,
+			target,
 		} = attributes;
 
 		const innerClasses = classnames(
 			...GalleryClasses( attributes ),
 			...BackgroundClasses( attributes ), {
-				[ `has-gutter` ] : gutter > 0,
+				'has-gutter': gutter > 0,
 			}
 		);
 
@@ -91,8 +90,8 @@ const settings = {
 
 		const masonryClasses = classnames(
 			`has-grid-${ gridSize }`, {
-				[ `has-gutter-${ gutter }` ] : gutter > 0,
-				[ `has-gutter-mobile-${ gutterMobile }` ] : gutterMobile > 0,
+				[ `has-gutter-${ gutter }` ]: gutter > 0,
+				[ `has-gutter-mobile-${ gutterMobile }` ]: gutterMobile > 0,
 			}
 		);
 
@@ -110,7 +109,7 @@ const settings = {
 					<ul
 						className={ masonryClasses }
 						style={ masonryStyles }
-						>
+					>
 						{ images.map( ( image ) => {
 							let href;
 
@@ -123,12 +122,17 @@ const settings = {
 									break;
 							}
 
-							const img = <img src={ image.url } alt={ image.alt } data-id={ image.id } data-link={ image.link } className={ image.id ? `wp-image-${ image.id }` : null } />;
+							// If an image has a custom link, override the linkTo selection.
+							if ( image.imgLink ) {
+								href = image.imgLink;
+							}
+
+							const img = <img src={ image.url } alt={ image.alt } data-id={ image.id } data-imglink={ image.imgLink } data-link={ image.link } className={ image.id ? `wp-image-${ image.id }` : null } />;
 
 							return (
 								<li key={ image.id || image.url } className="coblocks-gallery--item">
 									<figure className="coblocks-gallery--figure">
-										{ href ? <a href={ href }>{ img }</a> : img }
+										{ href ? <a href={ href } target={ target } rel={ rel }>{ img }</a> : img }
 										{ captions && image.caption && image.caption.length > 0 && (
 											<RichText.Content tagName="figcaption" className="coblocks-gallery--caption" value={ image.caption } />
 										) }
diff --git a/src/blocks/gallery-masonry/inspector.js b/src/blocks/gallery-masonry/inspector.js
index 817486f4131..cf3fd848fcb 100644
--- a/src/blocks/gallery-masonry/inspector.js
+++ b/src/blocks/gallery-masonry/inspector.js
@@ -1,18 +1,18 @@
 /**
  * Internal dependencies
  */
-import { title } from './'
+import { title } from './';
 import ResponsiveTabsControl from '../../components/responsive-tabs-control';
-import linkOptions from '../../components/block-gallery/options/link-options';
 import captionOptions from '../../components/block-gallery/options/caption-options';
 import SizeControl from '../../components/size-control';
 import { BackgroundPanel } from '../../components/background';
+import GalleryLinkSettings from '../../components/block-gallery/gallery-link-settings';
 
 /**
  * WordPress dependencies
  */
 const { __, sprintf } = wp.i18n;
-const { Component, Fragment } = wp.element;
+const { Component } = wp.element;
 const { InspectorControls, PanelColorSettings } = wp.editor;
 const { PanelBody, RangeControl, ToggleControl, SelectControl } = wp.components;
 
@@ -20,17 +20,15 @@ const { PanelBody, RangeControl, ToggleControl, SelectControl } = wp.components;
  * Inspector controls
  */
 class Inspector extends Component {
-
-	constructor( props ) {
+	constructor() {
 		super( ...arguments );
 		this.setSizeControl = this.setSizeControl.bind( this );
-		this.setLinkTo = this.setLinkTo.bind( this );
 		this.setRadiusTo = this.setRadiusTo.bind( this );
 		this.setCaptionStyleTo = this.setCaptionStyleTo.bind( this );
 		this.getColors = this.getColors.bind( this );
 	}
 
-	componentDidUpdate( prevProps ) {
+	componentDidUpdate() {
 		if ( this.props.attributes.gutter <= 0 ) {
 			this.props.setAttributes( {
 				radius: 0,
@@ -38,10 +36,6 @@ class Inspector extends Component {
 		}
 	}
 
-	setLinkTo( value ) {
-		this.props.setAttributes( { linkTo: value } );
-	}
-
 	setRadiusTo( value ) {
 		this.props.setAttributes( { radius: value } );
 	}
@@ -59,7 +53,6 @@ class Inspector extends Component {
 	}
 
 	getColors() {
-
 		const {
 			attributes,
 			backgroundColor,
@@ -79,11 +72,10 @@ class Inspector extends Component {
 			{
 				value: backgroundColor.color,
 				onChange: ( nextBackgroundColor ) => {
-
 					setBackgroundColor( nextBackgroundColor );
 
 					// Add default padding, if they are not yet present.
-					if ( ! backgroundPadding && ! backgroundPaddingMobile  ) {
+					if ( ! backgroundPadding && ! backgroundPaddingMobile ) {
 						this.props.setAttributes( {
 							backgroundPadding: 30,
 							backgroundPaddingMobile: 30,
@@ -112,17 +104,15 @@ class Inspector extends Component {
 
 		if ( captions ) {
 			return background.concat( caption );
-		} else {
-			return background;
 		}
+
+		return background;
 	}
 
 	render() {
-
 		const {
 			attributes,
 			setAttributes,
-			isSelected,
 		} = this.props;
 
 		const {
@@ -130,9 +120,6 @@ class Inspector extends Component {
 			captionStyle,
 			gridSize,
 			gutter,
-			images,
-			lightbox,
-			linkTo,
 			radius,
 		} = attributes;
 
@@ -146,7 +133,7 @@ class Inspector extends Component {
 						value={ gridSize }
 						resetValue={ 'xlrg' }
 					/>
-					<ResponsiveTabsControl { ...this.props }/>
+					<ResponsiveTabsControl { ...this.props } />
 					{ gutter > 0 && <RangeControl
 						label={ __( 'Rounded Corners' ) }
 						aria-label={ __( 'Add rounded corners to the gallery items.' ) }
@@ -159,7 +146,7 @@ class Inspector extends Component {
 					<ToggleControl
 						label={ __( 'Captions' ) }
 						checked={ !! captions }
-						onChange={ () => setAttributes( {  captions: ! captions } ) }
+						onChange={ () => setAttributes( { captions: ! captions } ) }
 						help={ this.getCaptionsHelp }
 					/>
 					{ captions &&
@@ -171,30 +158,20 @@ class Inspector extends Component {
 						/>
 					}
 				</PanelBody>
-				{ ! lightbox && <PanelBody
-					title={ __( 'Link Settings' ) }
-					initialOpen={ false }
-					>
-					<SelectControl
-						label={ __( 'Link To' ) }
-						value={ linkTo }
-						options={ linkOptions }
-						onChange={ this.setLinkTo }
-					/>
-				</PanelBody> }
+				<GalleryLinkSettings { ...this.props } />
 				<BackgroundPanel { ...this.props }
- 					hasCaption={ true }
- 					hasOverlay={ true }
- 					hasGalleryControls={ true }
- 				/>
- 				<PanelColorSettings
+					hasCaption={ true }
+					hasOverlay={ true }
+					hasGalleryControls={ true }
+				/>
+				<PanelColorSettings
 					title={ __( 'Color Settings' ) }
 					initialOpen={ false }
 					colorSettings={ this.getColors() }
 				/>
 			</InspectorControls>
-		)
+		);
 	}
-};
+}
 
 export default Inspector;
diff --git a/src/blocks/gallery-masonry/styles/editor.scss b/src/blocks/gallery-masonry/styles/editor.scss
index 757c774c849..64db9284ed7 100644
--- a/src/blocks/gallery-masonry/styles/editor.scss
+++ b/src/blocks/gallery-masonry/styles/editor.scss
@@ -83,4 +83,9 @@
 			padding-top: 48px;
 		}
 	}
+
+	// Tweak the position of the figcaption if Custom URL is set.
+	.components-coblocks-gallery-item__image-link + img + .editor-rich-text {
+		margin-bottom: 34px;
+	}
 }
diff --git a/src/blocks/gallery-stacked/edit.js b/src/blocks/gallery-stacked/edit.js
index 333281c9682..457eaafe7e8 100644
--- a/src/blocks/gallery-stacked/edit.js
+++ b/src/blocks/gallery-stacked/edit.js
@@ -147,6 +147,7 @@ class GalleryStackedEdit extends Component {
 			linkTo,
 			shadow,
 			backgroundImg,
+			target,
 		} = attributes;
 
 		const hasImages = !! images.length;
@@ -205,6 +206,8 @@ class GalleryStackedEdit extends Component {
 										url={ img.url }
 										alt={ img.alt }
 										id={ img.id }
+										imgLink={ img.imgLink }
+										linkTo={ linkTo }
 										gutter={ gutter }
 										gutterMobile={ gutterMobile }
 										marginBottom={ true }
diff --git a/src/blocks/gallery-stacked/index.js b/src/blocks/gallery-stacked/index.js
index 6465c674210..c0fd7880a38 100644
--- a/src/blocks/gallery-stacked/index.js
+++ b/src/blocks/gallery-stacked/index.js
@@ -100,6 +100,8 @@ const settings = {
 			backgroundImg,
 			customBackgroundColor,
 			backgroundColor,
+			target,
+			rel,
 		} = attributes;
 
 		// Body color class and styles.
@@ -154,17 +156,22 @@ const settings = {
 								break;
 						}
 
+						// If an image has a custom link, override the linkTo selection.
+						if ( image.imgLink ) {
+							href = image.imgLink;
+						}
+
 						const imgClasses = classnames(
 							image.id ? [ `wp-image-${ image.id }` ] : null, {
 								[ `has-shadow-${ shadow }` ] : shadow != 'none' || shadow != undefined ,
 						} );
 
-						const img = <img src={ image.url } alt={ image.alt } data-id={ image.id } data-link={ image.link } className={ imgClasses } />;
+						const img = <img src={ image.url } alt={ image.alt } data-id={ image.id } data-imglink={ image.imgLink } data-link={ image.link } className={ imgClasses } />;
 
 						return (
 							<li key={ image.id || image.url } className="coblocks-gallery--item">
 								<figure className={ figureClasses }>
-									{ href ? <a href={ href }>{ img }</a> : img }
+									{ href ? <a href={ href } target={ target } rel={ rel }>{ img }</a> : img }
 									{ captions && image.caption && image.caption.length > 0 && (
 										<RichText.Content tagName="figcaption" className={ captionClasses } value={ image.caption } styles={ captionStyles }/>
 									) }
diff --git a/src/blocks/gallery-stacked/inspector.js b/src/blocks/gallery-stacked/inspector.js
index 0d6a59c84c4..aed387ea2f9 100644
--- a/src/blocks/gallery-stacked/inspector.js
+++ b/src/blocks/gallery-stacked/inspector.js
@@ -6,6 +6,7 @@ import ResponsiveTabsControl from '../../components/responsive-tabs-control';
 import linkOptions from '../../components/block-gallery/options/link-options';
 import SizeControl from '../../components/size-control';
 import { BackgroundPanel } from '../../components/background';
+import GalleryLinkSettings from '../../components/block-gallery/gallery-link-settings';
 
 /**
  * WordPress dependencies
@@ -184,17 +185,7 @@ class Inspector extends Component {
 						/>
 					}
 				</PanelBody>
-				{ ! lightbox && <PanelBody
-					title={ __( 'Link Settings' ) }
-					initialOpen={ false }
-					>
-					<SelectControl
-						label={ __( 'Link To' ) }
-						value={ linkTo }
-						options={ linkOptions }
-						onChange={ this.setLinkTo }
-					/>
-				</PanelBody> }
+				<GalleryLinkSettings { ...this.props } />
 				<BackgroundPanel { ...this.props }
  					hasCaption={ true }
  					hasOverlay={ true }
diff --git a/src/blocks/gallery-stacked/styles/editor.scss b/src/blocks/gallery-stacked/styles/editor.scss
index 529e3cb6f31..1be0e663bdf 100644
--- a/src/blocks/gallery-stacked/styles/editor.scss
+++ b/src/blocks/gallery-stacked/styles/editor.scss
@@ -24,4 +24,9 @@
 	li:last-child .coblocks-gallery--figure {
 		width: 100% !important;
 	}
+
+	// Tweak the position of the figcaption if Custom URL is set.
+	.components-coblocks-gallery-item__image-link + img + .editor-rich-text {
+		margin-bottom: 35px;
+	}
 }
diff --git a/src/components/block-gallery/gallery-image.js b/src/components/block-gallery/gallery-image.js
index e2323331323..23966c05665 100644
--- a/src/components/block-gallery/gallery-image.js
+++ b/src/components/block-gallery/gallery-image.js
@@ -9,8 +9,8 @@ import classnames from 'classnames';
 const { __ } = wp.i18n;
 const { Component, Fragment } = wp.element;
 const { compose } = wp.compose;
-const { IconButton, Spinner } = wp.components;
-const { RichText } = wp.editor;
+const { IconButton, Spinner, TextControl, Dashicon } = wp.components;
+const { RichText, URLInput } = wp.editor;
 const { withSelect } = wp.data;
 const { BACKSPACE, DELETE } = wp.keycodes;
 const { isBlobURL } = wp.blob;
@@ -23,10 +23,12 @@ class GalleryImage extends Component {
 		this.onSelectCaption = this.onSelectCaption.bind( this );
 		this.onKeyDown = this.onKeyDown.bind( this );
 		this.bindContainer = this.bindContainer.bind( this );
+		this.saveCustomLink = this.saveCustomLink.bind( this );
 
 		this.state = {
 			captionSelected: false,
 			captionFocused: false,
+			isSaved: false,
 		};
 	}
 
@@ -70,8 +72,12 @@ class GalleryImage extends Component {
 		}
 	}
 
+	saveCustomLink() {
+		this.setState( { isSaved: true } );
+	}
+
 	componentDidUpdate( prevProps ) {
-		const { isSelected, image, url } = this.props;
+		const { isSelected, image, url, imgLink } = this.props;
 		if ( image && ! url ) {
 			this.props.setAttributes( {
 				url: image.source_url,
@@ -87,6 +93,10 @@ class GalleryImage extends Component {
 				captionFocused: false,
 			} );
 		}
+
+		if ( imgLink && ! isSelected && prevProps.isSelected ) {
+			this.setState( { isSaved: false } );
+		}
 	}
 
 	render() {
@@ -117,19 +127,9 @@ class GalleryImage extends Component {
 			verticalMoving = false,
 			url,
 			'aria-label': ariaLabel,
+			imgLink,
 		} = this.props;
 
-		let href;
-
-		switch ( linkTo ) {
-			case 'media':
-				href = url;
-				break;
-			case 'attachment':
-				href = link;
-				break;
-		}
-
 		const imgClasses = classnames( {
 			[ `has-shadow-${ shadow }` ]: shadow !== 'none' || shadow !== undefined,
 		} );
@@ -147,6 +147,7 @@ class GalleryImage extends Component {
 					className={ imgClasses }
 					alt={ alt }
 					data-id={ id }
+					data-imglink={ imgLink }
 					onClick={ this.onImageClick }
 					tabIndex="0"
 					onKeyDown={ this.onImageClick }
@@ -209,9 +210,21 @@ class GalleryImage extends Component {
 								disabled={ ! isSelected }
 							/>
 						</div>
+						{ linkTo === 'custom' &&
+							<form
+								className="components-coblocks-gallery-item__image-link"
+								onSubmit={ ( event ) => event.preventDefault() }>
+								<Dashicon icon="admin-links" />
+								<URLInput
+									value={ imgLink }
+									onChange={ ( value ) => setAttributes( { imgLink: value } ) }
+								/>
+								<IconButton icon={ this.state.isSaved ? 'saved' : 'editor-break' } label={ this.state.isSaved ? __( 'Saving' ) : __( 'Apply' ) } onClick={ this.saveCustomLink } type="submit" />
+							</form>
+						}
 					</Fragment>
 				}
-				{ href ? <a href={ href }>{ img }</a> : img }
+				{ img }
 				{ ( supportsCaption === true ) && ( ! RichText.isEmpty( caption ) || isSelected ) && captions ? (
 					<RichText
 						tagName="figcaption"
diff --git a/src/components/block-gallery/gallery-link-settings.js b/src/components/block-gallery/gallery-link-settings.js
new file mode 100644
index 00000000000..925b3e9cc1a
--- /dev/null
+++ b/src/components/block-gallery/gallery-link-settings.js
@@ -0,0 +1,93 @@
+/**
+ * Internal dependencies
+ */
+import linkOptions from './options/link-options';
+
+/**
+ * WordPress dependencies
+ */
+const { __ } = wp.i18n;
+const { Component, Fragment } = wp.element;
+const { SelectControl, ToggleControl, PanelBody, TextControl } = wp.components;
+
+class GalleryLinkSettings extends Component {
+	constructor() {
+		super( ...arguments );
+		this.setNewTab = this.setNewTab.bind( this );
+		this.setLinkRel = this.setLinkRel.bind( this );
+		this.setLinkTo = this.setLinkTo.bind( this );
+	}
+
+	setLinkTo( value ) {
+		this.props.setAttributes( { linkTo: value } );
+	}
+
+	setLinkRel( value ) {
+		this.props.setAttributes( { rel: value } );
+	}
+
+	setNewTab( value ) {
+		const { rel } = this.props.attributes;
+		const target = value ? '_blank' : undefined;
+
+		let updatedRel = rel;
+		if ( target && ! rel ) {
+			updatedRel = 'noreferrer noopener';
+		} else if ( ! target && rel === 'noreferrer noopener' ) {
+			updatedRel = undefined;
+		}
+
+		this.props.setAttributes( {
+			target,
+			rel: updatedRel,
+		} );
+	}
+
+	render() {
+		const {
+			attributes,
+			setAttributes,
+		} = this.props;
+
+		const {
+			lightbox,
+			linkTo,
+			target,
+			rel,
+		} = attributes;
+
+		return (
+			<Fragment>
+				{ ! lightbox &&
+					<PanelBody
+						title={ __( 'Link Settings' ) }
+						initialOpen={ false }
+					>
+						<SelectControl
+							label={ __( 'Link To' ) }
+							value={ linkTo }
+							options={ linkOptions }
+							onChange={ this.setLinkTo }
+						/>
+						{ linkTo !== 'none' &&
+							<Fragment>
+								<ToggleControl
+									label={ __( 'Open in New Tab' ) }
+									onChange={ this.setNewTab }
+									checked={ target === '_blank' }
+								/>
+								<TextControl
+									label={ __( 'Link Rel' ) }
+									value={ rel }
+									onChange={ ( value ) => setAttributes( { rel: value } ) }
+								/>
+							</Fragment>
+						}
+					</PanelBody>
+				}
+			</Fragment>
+		);
+	}
+}
+
+export default GalleryLinkSettings;
diff --git a/src/components/block-gallery/options/link-options.js b/src/components/block-gallery/options/link-options.js
index 92cda10e112..4d268164acf 100644
--- a/src/components/block-gallery/options/link-options.js
+++ b/src/components/block-gallery/options/link-options.js
@@ -7,9 +7,11 @@ const { __ } = wp.i18n;
  * Link options.
  */
 const linkOptions = [
-	{ value: 'attachment', label: __( 'Attachment Page' ) },
-	{ value: 'media', label: __( 'Media File' ) },
 	{ value: 'none', label: __( 'None' ) },
+	{ value: 'media', label: __( 'Media File' ) },
+	{ value: 'attachment', label: __( 'Attachment Page' ) },
+	{ value: 'custom', label: __( 'Custom URL' ) },
+
 ];
 
 export default linkOptions;
\ No newline at end of file
diff --git a/src/components/block-gallery/shared/attributes.js b/src/components/block-gallery/shared/attributes.js
index 53ebd945357..156a4d1e379 100644
--- a/src/components/block-gallery/shared/attributes.js
+++ b/src/components/block-gallery/shared/attributes.js
@@ -19,6 +19,11 @@ const GalleryAttributes = {
 				selector: 'img',
 				attribute: 'data-link',
 			},
+			imgLink: {
+				source: 'attribute',
+				selector: 'img',
+				attribute: 'data-imglink',
+			},
 			alt: {
 				source: 'attribute',
 				selector: 'img',
@@ -41,6 +46,13 @@ const GalleryAttributes = {
 		type: 'string',
 		default: 'none',
 	},
+	target: {
+		type: 'string',
+	},
+	rel: {
+		type: 'string',
+		default: '',
+	},
 	align: {
 		type: 'string',
 	},
@@ -103,4 +115,4 @@ const GalleryAttributes = {
 	},
 };
 
-export default GalleryAttributes;
\ No newline at end of file
+export default GalleryAttributes;
diff --git a/src/components/block-gallery/shared/transforms.js b/src/components/block-gallery/shared/transforms.js
index 6fce531fa62..cc6cc3ae6b8 100644
--- a/src/components/block-gallery/shared/transforms.js
+++ b/src/components/block-gallery/shared/transforms.js
@@ -11,26 +11,28 @@ function GalleryTransforms( props ) {
 
 	const transforms = {
 		align: props.align,
+		autoPlay: props.autoPlay,
+		autoPlaySpeed: props.autoPlaySpeed,
+		captionColor: props.captionColor,
+		captions: props.captions,
+		customCaptionColor: props.customCaptionColor,
+		customFontSize: props.customFontSize,
+		draggable: props.draggable,
+		filter: props.filter,
+		fontSize: props.fontSize,
+		gridSize: props.gridSize,
 		gutter: props.gutter,
 		gutterMobile: props.gutterMobile,
-		gridSize: props.gridSize,
+		height: props.height,
 		images: props.images.map( ( image ) => helper.pickRelevantMediaFiles( image ) ),
 		linkTo: props.linkTo,
-		radius: props.radius,
-		shadow: props.shadow,
-		filter: props.filter,
-		height: props.height,
-		primaryCaption: props.primaryCaption,
-		captions: props.captions,
-		captionColor: props.captionColor,
-		customCaptionColor: props.customCaptionColor,
 		pageDots: props.pageDots,
 		prevNextButtons: props.prevNextButtons,
-		autoPlay: props.autoPlay,
-		autoPlaySpeed: props.autoPlaySpeed,
-		draggable: props.draggable,
-		fontSize: props.fontSize,
-		customFontSize: props.customFontSize,
+		primaryCaption: props.primaryCaption,
+		radius: props.radius,
+		rel: props.rel,
+		shadow: props.shadow,
+		target: props.target,
 	};
 
 	return transforms;
diff --git a/src/components/block-gallery/styles/editor.scss b/src/components/block-gallery/styles/editor.scss
index bf3e5588798..5104c98da10 100644
--- a/src/components/block-gallery/styles/editor.scss
+++ b/src/components/block-gallery/styles/editor.scss
@@ -1,5 +1,6 @@
 @import "editor/gallery-item";
 @import "editor/gallery-item-menus";
+@import "editor/gallery-item-link";
 @import "editor/uploader";
 @import "editor/radius";
 @import "editor/flickity-arrows";
diff --git a/src/components/block-gallery/styles/editor/_gallery-item-link.scss b/src/components/block-gallery/styles/editor/_gallery-item-link.scss
new file mode 100644
index 00000000000..f5530cc0de7
--- /dev/null
+++ b/src/components/block-gallery/styles/editor/_gallery-item-link.scss
@@ -0,0 +1,64 @@
+.components-coblocks-gallery-item__image-link {
+	align-items: center;
+	background: theme(primary);
+	bottom: 0;
+	display: flex;
+	flex-wrap: wrap;
+	font-family: $default-font;
+	font-size: 13px;
+	left: 0;
+	line-height: 1.4;
+	position: absolute;
+	right: 0;
+	z-index: 20;
+
+	.dashicon {
+		color: $white;
+	}
+
+	.dashicons-admin-links {
+		margin-left: 11px;
+		margin-right: 9px;
+		width: 16px;
+	}
+
+	.dashicons-editor-break {
+		margin-right: 4px;
+		width: 16px;
+	}
+
+	.components-icon-button {
+		margin-left: 1px;
+		margin-right: 3px;
+		padding: 6px;
+
+		&:not(:disabled):not([aria-disabled="true"]):hover {
+			background: theme(primary) !important;
+			box-shadow: none;
+			color: $white !important;
+			opacity: 0.75;
+		}
+
+		&:focus,
+		&:active {
+			box-shadow: none !important;
+
+			.dashicon {
+				color: $dark-gray-900 !important;
+			}
+		}
+	}
+
+	.block-editor-url-input {
+		flex-grow: 1;
+		padding: 2px;
+		position: relative;
+		width: calc(100% - 73px);
+
+		input[type="text"] {
+			border-radius: 3px;
+			padding: 8px;
+			width: 100%;
+		}
+	}
+}
diff --git a/src/components/block-gallery/styles/editor/_gallery-item.scss b/src/components/block-gallery/styles/editor/_gallery-item.scss
index e7190d47eed..da678806762 100644
--- a/src/components/block-gallery/styles/editor/_gallery-item.scss
+++ b/src/components/block-gallery/styles/editor/_gallery-item.scss
@@ -31,7 +31,7 @@
 		z-index: 2;
 	}
 
-	.components-spinner {
+	> .components-spinner {
 		left: 50%;
 		margin-left: -9px;
 		margin-top: -9px;
diff --git a/src/utils/helper.js b/src/utils/helper.js
index 76bcc3e2572..cfd3865da5d 100644
--- a/src/utils/helper.js
+++ b/src/utils/helper.js
@@ -13,7 +13,7 @@ export function overlayToClass( ratio ) {
 
 // Pick image media attributes.
 export const pickRelevantMediaFiles = ( image ) => {
-	const imageProps = pick( image, [ 'alt', 'id', 'link', 'caption' ] );
+	const imageProps = pick( image, [ 'alt', 'id', 'link', 'caption', 'imgLink' ] );
 	imageProps.url = get( image, [ 'sizes', 'large', 'url' ] ) || get( image, [ 'media_details', 'sizes', 'large', 'source_url' ] ) || image.url;
 	return imageProps;
 };