fossasia · CloudyPadmal · Dec 21, 2018 · Dec 21, 2018
diff --git a/README.md b/README.md
@@ -23,37 +23,51 @@ Please join us on the following channels:
 
 ## Screenshots
 
+  <table>
+      <tr>
+       <td><img src="/docs/images/view_device_not_found.png"></td>
+       <td><img src="/docs/images/view_initialization.png"></td>
+       <td><img src="/docs/images/view_home_screen.png"></td>
+       <td><img src="/docs/images/view_instrument_panel.png"></td>
+      </tr>
+  </table>
+  <table>
+      <tr>
+       <td><img src="/docs/images/instrument_oscilloscope_guide.png"></td>
+       <td><img src="/docs/images/instrument_logic_analyzer_guide.png"></td>
+      </tr>
+    </table>
   <table>
     <tr>
-     <td><img src="/docs/images/view_home_screen.png"></td>
+     <td><img src="/docs/images/view_about_us.png"></td>
      <td><img src="/docs/images/view_navigation_drawer.png"></td>
-     <td><img src="/docs/images/view_instruement_panel.png"></td>
      <td><img src="/docs/images/view_pin_layout.png"></td>
+     <td><img src="/docs/images/view_pin_detail_dialog.png"></td>
     </tr>
   </table>
   <table>
     <tr>
-     <td><img src="/docs/images/screenshot_3.png"></td>
-     <td><img src="/docs/images/screenshot_audio_jack.png"></td>
+     <td><img src="/docs/images/instrument_oscilloscope_channelparam.png"></td>
+     <td><img src="/docs/images/instrument_oscilloscope_audiojack.png"></td>
     </tr>
   </table>
   <table>
     <tr>
-     <td><img src="/docs/images/wave_generator_view.png"></td>
-     <td><img src="/docs/images/view_logic_analyzer.png"></td>
+     <td><img src="/docs/images/instrument_wavegenerator_view.png"></td>
+     <td><img src="/docs/images/instrument_logic_analyzer_view.png"></td>
     </tr>
   </table>
   <table>
     <tr>
-     <td><img src="/docs/images/view_power_source.png"></td>
-     <td><img src="/docs/images/view_guide_box.png"></td>
-     <td><img src="/docs/images/view_lux_meter.png"></td>
+     <td><img src="/docs/images/instrument_power_source_view.png"></td>
+     <td><img src="/docs/images/instrument_luxmeter_guide.png"></td>
+     <td><img src="/docs/images/instrument_multimeter_view.png"></td>
     </tr>
   </table>
   <table>
     <tr>
+     <td><img src="/docs/images/instrument_barometer_view.png"></td>
      <td><img src="/docs/images/view_log_map_location.png"></td>
-     <td><img src="/docs/images/view_barometer.png"></td>
      <td><img src="/docs/images/view_data_logger.png"></td>
     </tr>
   </table>

diff --git a/docs/Lux meter.md b/docs/Lux meter.md
@@ -19,14 +19,14 @@ The layout of the oscilloscope graphical user interface contains two main parts.
 
 <table>
     <tr>
-        <td><img src="/docs/images/lux_meter_dialog_box.png"></td>
-        <td><img src="/docs/images/lux_meter_data_1.png"></td>
+        <td><img src="/docs/images/instrument_luxmeter_guide.png"></td>
+        <td><img src="/docs/images/instrument_luxmeter_view.png"></td>
     </tr>
 </table>
 <table>
     <tr>
-        <td><img src="/docs/images/lux_meter_data_2.png"></td>
-        <td><img src="/docs/images/lux_meter_configure.png"></td>
+        <td><img src="/docs/images/instrument_luxmeter_config.png"></td>
+        <td><img src="/docs/images/view_datalogger_play.png"></td>
     </tr>
 </table>
 

diff --git a/docs/Oscilloscope.md b/docs/Oscilloscope.md
@@ -22,14 +22,14 @@ The layout of the oscilloscope graphical user interface contains three main part
 
 <table>
     <tr>
-        <td><img src="/docs/images/oscilloscope_channel_params.png"></td>
-        <td><img src="/docs/images/oscilloscope_data_analysis.png"></td>
+        <td><img src="/docs/images/instrument_oscilloscope_channelparam.png"></td>
+        <td><img src="/docs/images/instrument_oscilloscope_dataanalysis.png"></td>
     </tr>
 </table>
 <table>
     <tr>
-        <td><img src="/docs/images/oscilloscope_timebase_and_trigger.png"></td>
-        <td><img src="/docs/images/oscilloscope_xy_plot.png"></td>
+        <td><img src="/docs/images/instrument_oscilloscope_timebase.png"></td>
+        <td><img src="/docs/images/instrument_oscilloscope_xyplot.png"></td>
     </tr>
 </table>
 

diff --git a/docs/images/instrument_accelerometer_guide.png b/docs/images/instrument_accelerometer_guide.png
diff --git a/docs/images/instrument_accelerometer_view.png b/docs/images/instrument_accelerometer_view.png
diff --git a/docs/images/instrument_barometer_config.png b/docs/images/instrument_barometer_config.png
diff --git a/docs/images/instrument_barometer_guide.png b/docs/images/instrument_barometer_guide.png
diff --git a/docs/images/instrument_barometer_view.png b/docs/images/instrument_barometer_view.png
diff --git a/docs/images/instrument_compass_guide.png b/docs/images/instrument_compass_guide.png
diff --git a/docs/images/instrument_compass_view.png b/docs/images/instrument_compass_view.png
diff --git a/docs/images/instrument_logic_analyzer_guide.png b/docs/images/instrument_logic_analyzer_guide.png
diff --git a/docs/images/instrument_logic_analyzer_view.png b/docs/images/instrument_logic_analyzer_view.png
diff --git a/docs/images/instrument_luxmeter_config.png b/docs/images/instrument_luxmeter_config.png
diff --git a/docs/images/instrument_luxmeter_guide.png b/docs/images/instrument_luxmeter_guide.png
diff --git a/docs/images/instrument_luxmeter_view.png b/docs/images/instrument_luxmeter_view.png
diff --git a/docs/images/instrument_multimeter_guide.png b/docs/images/instrument_multimeter_guide.png
diff --git a/docs/images/instrument_multimeter_view.png b/docs/images/instrument_multimeter_view.png
diff --git a/docs/images/instrument_oscilloscope_audiojack.png b/docs/images/instrument_oscilloscope_audiojack.png
diff --git a/docs/images/instrument_oscilloscope_channelparam.png b/docs/images/instrument_oscilloscope_channelparam.png
diff --git a/docs/images/instrument_oscilloscope_dataanalysis.png b/docs/images/instrument_oscilloscope_dataanalysis.png
diff --git a/docs/images/instrument_oscilloscope_guide.png b/docs/images/instrument_oscilloscope_guide.png
diff --git a/docs/images/instrument_oscilloscope_timebase.png b/docs/images/instrument_oscilloscope_timebase.png
diff --git a/docs/images/instrument_oscilloscope_xyplot.png b/docs/images/instrument_oscilloscope_xyplot.png
diff --git a/docs/images/instrument_power_source_guide.png b/docs/images/instrument_power_source_guide.png
diff --git a/docs/images/instrument_power_source_view.png b/docs/images/instrument_power_source_view.png
diff --git a/docs/images/instrument_wavegenerator_guide.png b/docs/images/instrument_wavegenerator_guide.png
diff --git a/docs/images/instrument_wavegenerator_view.png b/docs/images/instrument_wavegenerator_view.png
diff --git a/docs/images/lux_meter_configure.png b/docs/images/lux_meter_configure.png
diff --git a/docs/images/lux_meter_data_1.png b/docs/images/lux_meter_data_1.png
diff --git a/docs/images/lux_meter_data_2.png b/docs/images/lux_meter_data_2.png
diff --git a/docs/images/lux_meter_dialog_box.png b/docs/images/lux_meter_dialog_box.png
diff --git a/docs/images/oscilloscope_timebase_and_trigger.png b/docs/images/oscilloscope_timebase_and_trigger.png
diff --git a/docs/images/oscilloscope_xy_plot.png b/docs/images/oscilloscope_xy_plot.png
diff --git a/docs/images/screenshot_1.png b/docs/images/screenshot_1.png
diff --git a/docs/images/screenshot_2.png b/docs/images/screenshot_2.png
diff --git a/docs/images/screenshot_3.png b/docs/images/screenshot_3.png
diff --git a/docs/images/screenshot_audio_jack.png b/docs/images/screenshot_audio_jack.png
diff --git a/docs/images/screenshot_control_main.png b/docs/images/screenshot_control_main.png
diff --git a/docs/images/screenshot_experiment_doc.png b/docs/images/screenshot_experiment_doc.png
diff --git a/docs/images/screenshot_experiment_setup.png b/docs/images/screenshot_experiment_setup.png
diff --git a/docs/images/screenshot_initialization.png b/docs/images/screenshot_initialization.png
diff --git a/docs/images/screenshot_logical_analyzer.png b/docs/images/screenshot_logical_analyzer.png
diff --git a/docs/images/screenshot_multilevel_experimentlist.png b/docs/images/screenshot_multilevel_experimentlist.png
diff --git a/docs/images/view_about_us.png b/docs/images/view_about_us.png
diff --git a/docs/images/view_app_settings.png b/docs/images/view_app_settings.png
diff --git a/docs/images/view_barometer.png b/docs/images/view_barometer.png
diff --git a/docs/images/view_data_logger.png b/docs/images/view_data_logger.png
diff --git a/docs/images/view_data_logger2.png b/docs/images/view_data_logger2.png
diff --git a/docs/images/view_datalogger_play.png b/docs/images/view_datalogger_play.png
diff --git a/docs/images/view_device_not_found.png b/docs/images/view_device_not_found.png
diff --git a/docs/images/view_faq.png b/docs/images/view_faq.png
diff --git a/docs/images/view_guide_box.png b/docs/images/view_guide_box.png
diff --git a/docs/images/view_home_screen.png b/docs/images/view_home_screen.png
diff --git a/docs/images/view_initialization.png b/docs/images/view_initialization.png
diff --git a/docs/images/view_instruement_panel.png → docs/images/view_instrument_panel.png b/docs/images/view_instruement_panel.png → docs/images/view_instrument_panel.png
diff --git a/docs/images/view_log_map_location.png b/docs/images/view_log_map_location.png
diff --git a/docs/images/view_logic_analyzer.png b/docs/images/view_logic_analyzer.png
diff --git a/docs/images/view_lux_meter.png b/docs/images/view_lux_meter.png
diff --git a/docs/images/view_navigation_drawer.png b/docs/images/view_navigation_drawer.png
diff --git a/docs/images/view_not_connected_nav_menu.png b/docs/images/view_not_connected_nav_menu.png
diff --git a/docs/images/view_pin_detail_dialog.png b/docs/images/view_pin_detail_dialog.png
diff --git a/docs/images/view_pin_layout.png b/docs/images/view_pin_layout.png
diff --git a/docs/images/view_power_source.png b/docs/images/view_power_source.png
diff --git a/docs/images/wave_generator_view.png b/docs/images/wave_generator_view.png