diff --git a/development/cpp/core_types.rst b/development/cpp/core_types.rst
index 1fab9b632..1808ca653 100644
--- a/development/cpp/core_types.rst
+++ b/development/cpp/core_types.rst
@@ -79,7 +79,7 @@ should not be used. Instead, a few other ones are provided.
 
 For C-style allocation, Godot provides a few macros:
 
-.. code:: cpp
+.. code-block:: none
 
     memalloc()
     memrealloc()
@@ -90,7 +90,7 @@ library.
 
 For C++-style allocation, special macros are provided:
 
-.. code:: cpp
+.. code-block:: none
 
     memnew( Class / Class(args) )
     memdelete( instance )
@@ -152,7 +152,7 @@ pointers, like this:
 .. code:: cpp
 
     for(List<int>::Element *E=somelist.front();E;E=E->next()) {
-        print_line(E->get()); //print the element
+        print_line(E->get()); // print the element
     }
 
 The Vector<> class also has a few nice features:
diff --git a/development/cpp/custom_resource_format_loaders.rst b/development/cpp/custom_resource_format_loaders.rst
index e0e63897c..1d4e1d10c 100644
--- a/development/cpp/custom_resource_format_loaders.rst
+++ b/development/cpp/custom_resource_format_loaders.rst
@@ -252,7 +252,7 @@ Loading it on GDScript
 ----------------------
 
 
-.. code::
+.. code-block:: json
 
     {
       "savefilename" : "demo.mjson",
diff --git a/development/cpp/introduction_to_godot_development.rst b/development/cpp/introduction_to_godot_development.rst
index 4b83dc90a..e1371aaf8 100644
--- a/development/cpp/introduction_to_godot_development.rst
+++ b/development/cpp/introduction_to_godot_development.rst
@@ -26,7 +26,7 @@ project. To launch a project directly, you need to run the editor by
 passing the ``-e`` argument to Godot Engine's binary from within your
 project's folder. Typically:
 
-.. code:: bash
+.. code-block:: none
 
     $ cd ~/myproject
     $ gdb godot
@@ -34,7 +34,7 @@ project's folder. Typically:
 
 Or:
 
-.. code:: bash
+.. code-block:: none
 
     $ gdb godot
     > run -e --path ~/myproject
diff --git a/tutorials/plugins/android/android_plugin.rst b/tutorials/plugins/android/android_plugin.rst
index 54b144d5a..973373919 100644
--- a/tutorials/plugins/android/android_plugin.rst
+++ b/tutorials/plugins/android/android_plugin.rst
@@ -65,7 +65,7 @@ Android directories
 
 Inside your plugin folder, you can use the standard folders as if they were from an Android Gradle project. Examples of this are:
 
-::
+.. code-block:: none
 
    src/ - For Java source code, same as in your Android project
    res/ - For resources
@@ -91,19 +91,19 @@ AndroidManifest.conf
 
 This file allows to insert bits of chunk into *AndroidManifest.xml*, the following are supported tags and are entirely optional:
 
-::
+.. code-block:: none
 
    [user_permissions]
 
 Any bit of text below this tag is inserted inside the <manifest> tag of the file. This is often used for permission tags.
 
-::
+.. code-block:: none
 
    [application]
 
 Any bit of text below this tag inside the <application> tag of the file. Many SDKs require this.
 
-::
+.. code-block:: none
 
    [application_attribs]
 
@@ -114,7 +114,7 @@ gradle.conf
 
 This file allows to insert bits of chunk into *build.gradle*, the following are supported and are entirely optional:
 
-::
+.. code-block:: none
 
    [buildscript_repositories]
 
@@ -122,21 +122,21 @@ This file allows to insert bits of chunk into *build.gradle*, the following are
 Any bit of text below this tag is inserted inside the buildscript.repositories section of the build file.
 
 
-::
+.. code-block:: none
 
    [buildscript_dependencies]
 
 
 Any bit of text below this tag is inserted inside the buildscript.dependencies section of the build file.
 
-::
+.. code-block:: none
 
    [allprojects_repositories]
 
 
 Any bit of text below this tag is inserted inside the allprojects.repositories section of the build file.
 
-::
+.. code-block:: none
 
    [dependencies]
 
@@ -144,14 +144,14 @@ Any bit of text below this tag is inserted inside the allprojects.repositories s
 Any bit of text below this tag is inserted inside the dependencies section of the build file.
 
 
-::
+.. code-block:: none
 
    [android_defaultconfig]
 
 
 Any bit of text below this tag is inserted inside the android.defaultconfig section of the build file.
 
-::
+.. code-block:: none
 
    [global]
 
@@ -290,7 +290,7 @@ entire Java API from GDScript.
 
 It's simple to use and it's used like this:
 
-::
+.. code-block:: none
 
     class = JavaClassWrapper.wrap(<javaclass as text>)